Release M274

.azure-pipelines/release.yml

@@ -1,93 +1,95 @@
-# NOTE: this pipeline definition is not currently used to build releases of VFS for Git.
-# This is still done in the GVFS-Release-RealSign "classic" pipeline.
-
 name: $(date:yy)$(DayOfYear)$(rev:.r)
+trigger: none
+pr: none
 
 variables:
-  signType: test
-  teamName: GVFS
-  configuration: Release
-  signPool: VSEng-MicroBuildVS2019
-  GVFSMajorAndMinorVersion: 1.0
+  GVFSMajorAndMinorVersion: 2.0
   GVFSRevision: $(Build.BuildNumber)
-
-jobs:
-- job: build
-  displayName: Windows Build and Sign
-
-  pool:
-    name: $(signPool)
-
-  steps:
-  - task: ms-vseng.MicroBuildTasks.30666190-6959-11e5-9f96-f56098202fef.MicroBuildSigningPlugin@2
-    displayName: Install signing plugin
-    inputs:
-      signType: '$(SignType)'
-
-  - task: UseDotNet@2
-    displayName: Install .NET SDK
-    inputs:
-      packageType: sdk
-      version: 8.0.413
-
-  - task: CmdLine@2
-    displayName: Build VFS for Git
-    inputs:
-      script: $(Build.Repository.LocalPath)\scripts\Build.bat $(configuration) $(GVFSMajorAndMinorVersion).$(GVFSRevision) detailed
-
-  - task: CmdLine@2
-    displayName: Run unit tests
-    inputs:
-      script: $(Build.Repository.LocalPath)\scripts\RunUnitTests.bat $(configuration)
-
-  - task: CmdLine@2
-    displayName: Create build artifacts
-    inputs:
-      script: $(Build.Repository.LocalPath)\scripts\CreateBuildArtifacts.bat $(configuration) $(Build.ArtifactStagingDirectory)
-
-  - task: PublishBuildArtifacts@1
-    displayName: 'Publish Artifact: Installer'
-    inputs:
-      PathtoPublish: $(Build.ArtifactStagingDirectory)\NuGetPackages
-      ArtifactName: Installer
-
-  - task: PublishBuildArtifacts@1
-    displayName: 'Publish Artifact: FastFetch'
-    inputs:
-      PathtoPublish: $(Build.ArtifactStagingDirectory)\FastFetch
-      ArtifactName: FastFetch
-
-  - task: PublishSymbols@1
-    displayName: Enable Source Server
-    condition: eq(succeeded(), eq(variables['signType'], 'real'))
-    inputs:
-      SearchPattern: '**\*.pdb'
-      SymbolsFolder: $(Build.ArtifactStagingDirectory)\Symbols
-
-  - task: PublishBuildArtifacts@1
-    displayName: 'Publish Artifact: Symbols'
-    inputs:
-      PathtoPublish: $(Build.ArtifactStagingDirectory)\Symbols
-      ArtifactName: Symbols
-
-  - task: ms-vscs-artifact.build-tasks.artifactSymbolTask-1.artifactSymbolTask@0
-    displayName: Publish to Symbols on Symweb
-    condition: eq(succeeded(), eq(variables['signType'], 'real'))
-    inputs:
-      symbolServiceURI: https://microsoft.artifacts.visualstudio.com/DefaultCollection
-      sourcePath: $(Build.ArtifactStagingDirectory)/Symbols
-      expirationInDays: 2065
-      usePat: false
-
-  - task: NuGetCommand@2
-    displayName: Push GVFS.Installers package
-    condition: eq(succeeded(), eq(variables['signType'], 'real'))
-    inputs:
-      command: push
-      packagesToPush: $(Build.ArtifactStagingDirectory)\NuGetPackages\GVFS.Installers.*.nupkg
-      nuGetFeedType: external
-      publishFeedCredentials: '1essharedassets GVFS [PUBLISH]'
-
-  - task: ms-vseng.MicroBuildTasks.521a94ea-9e68-468a-8167-6dcf361ea776.MicroBuildCleanup@1
-    displayName: Send MicroBuild Telemetry
-    condition: always()
+  BuildConfiguration: Release
+  TeamName: GVFS
+
+resources:
+  repositories:
+  - repository: MicroBuildTemplate
+    type: git
+    name: 1ESPipelineTemplates/MicroBuildTemplate
+    ref: refs/tags/release
+
+  - repository: VFSForGit
+    type: github
+    name: microsoft/VFSForGit
+    ref: releases/shipped
+    endpoint: GitHub-VFSForGit
+
+extends:
+  template: azure-pipelines/MicroBuild.1ES.Official.yml@MicroBuildTemplate
+  parameters:
+    pool:
+      name: VSEngSS-MicroBuild2022-1ES
+
+    featureFlags:
+      incrementalSDLBinaryAnalysis: false
+      disableNetworkIsolation: true
+
+    sdl:
+      binskim:
+        enabled: false
+        justificationForDisabling: "Guardian and BinSkim do not support a suppression for InnoSetup installer file"
+      sourceRepositoriesToScan:
+        include:
+        - repository: VFSForGit
+
+    stages:
+      - stage: Release
+
+        jobs:
+        - job: Build
+          templateContext:
+            mb:
+              signing:
+                enabled: true
+                feedSource: 'https://pkgs.dev.azure.com/mseng/_packaging/MicroBuildToolset/nuget/v3/index.json'
+                signType: real
+                signWithProd: true
+
+            outputs:
+              - output: pipelineArtifact
+                targetPath: $(Build.ArtifactStagingDirectory)\GVFS.Installers
+                artifactName: Installer
+              - output: pipelineArtifact
+                targetPath: $(Build.ArtifactStagingDirectory)\FastFetch
+                artifactName: FastFetch
+              - output: pipelineArtifact
+                targetPath: $(Build.ArtifactStagingDirectory)\Symbols
+                artifactName: Symbols
+              - output: pipelineArtifact
+                targetPath: $(Build.ArtifactStagingDirectory)\GVFS.FunctionalTests
+                artifactName: FunctionalTests
+
+          steps:
+            - checkout: VFSForGit
+              displayName: 'Checkout VFS for Git'
+              path: vfsforgit\src
+
+            - task: NuGetToolInstaller@1
+              displayName: 'Use NuGet 6.x'
+              inputs:
+                versionSpec: '6.x'
+
+            - script: |
+                $(Agent.BuildDirectory)\vfsforgit\src\scripts\Build.bat ^
+                  $(BuildConfiguration) ^
+                  $(GVFSMajorAndMinorVersion).$(GVFSRevision) ^
+                  detailed
+              displayName: 'Build and sign ($(BuildConfiguration))'
+
+            - script: |
+                $(Agent.BuildDirectory)\vfsforgit\src\scripts\RunUnitTests.bat ^
+                  $(BuildConfiguration)
+              displayName: 'Run unit tests'
+
+            - script: |
+                $(Agent.BuildDirectory)\vfsforgit\src\scripts\CreateBuildArtifacts.bat ^
+                  $(BuildConfiguration) ^
+                  $(Build.ArtifactStagingDirectory)
+              displayName: 'Create artifacts'

.github/workflows/build.yaml

@@ -23,7 +23,7 @@ permissions:
   actions: read
 
 env:
-  GIT_VERSION: ${{ github.event.inputs.git_version || 'v2.53.0.vfs.0.6' }}
+  GIT_VERSION: ${{ github.event.inputs.git_version || 'v2.53.0.vfs.0.7' }}
 
 jobs:
   validate:
@@ -36,7 +36,7 @@ jobs:
     - name: Look for prior successful runs
       id: check
       if: github.event.inputs.git_version == ''
-      uses: actions/github-script@v8
+      uses: actions/github-script@v9
       with:
         github-token: ${{secrets.GITHUB_TOKEN}}
         result-encoding: string
@@ -182,7 +182,7 @@ jobs:
     - name: Skip this job if there is a previous successful run
       if: needs.validate.outputs.skip != ''
       id: skip
-      uses: actions/github-script@v8
+      uses: actions/github-script@v9
       with:
         script: |
           core.info(`Skipping: There already is a successful run: ${{ needs.validate.outputs.skip }}`)
@@ -198,7 +198,7 @@ jobs:
       if: steps.skip.outputs.result != 'true'
       uses: actions/setup-dotnet@v5
       with:
-        dotnet-version: 8.0.413
+        global-json-file: src/global.json
 
     - name: Add MSBuild to PATH
       if: steps.skip.outputs.result != 'true'
@@ -247,10 +247,17 @@ jobs:
     with:
       skip: ${{ needs.validate.outputs.skip }}
 
+  upgrade_tests:
+    name: Upgrade Tests
+    needs: [validate, build]
+    uses: ./.github/workflows/upgrade-tests.yaml
+    with:
+      skip: ${{ needs.validate.outputs.skip }}
+
   result:
     runs-on: ubuntu-latest
     name: Build, Unit and Functional Tests Successful
-    needs: [functional_tests]
+    needs: [functional_tests, upgrade_tests]
 
     steps:
       - name: Success! # for easier identification of successful runs in the Checks Required for Pull Requests

.github/workflows/functional-tests.yaml

@@ -70,7 +70,7 @@ jobs:
     - name: Skip this job if there is a previous successful run
       if: inputs.skip != ''
       id: skip
-      uses: actions/github-script@v8
+      uses: actions/github-script@v9
       with:
         script: |
           core.info(`Skipping: There already is a successful run: ${{ inputs.skip }}`)
@@ -122,6 +122,18 @@ jobs:
       shell: cmd
       run: gvfs\install.bat
 
+    - name: Verify GVFS installation
+      if: steps.skip.outputs.result != 'true'
+      shell: cmd
+      continue-on-error: true
+      run: |
+        echo === GVFS Version ===
+        "C:\Program Files\VFS for Git\GVFS.exe" version
+        echo === Service Status ===
+        sc query GVFS.Service
+        echo === List Mounted ===
+        "C:\Program Files\VFS for Git\GVFS.exe" service --list-mounted
+
     - name: ProjFS details (post-install)
       if: steps.skip.outputs.result != 'true'
       shell: cmd
@@ -141,6 +153,7 @@ jobs:
     - name: Run functional tests
       if: steps.skip.outputs.result != 'true'
       shell: cmd
+      timeout-minutes: 60
       run: |
         SET PATH=C:\Program Files\VFS for Git;%PATH%
         SET GIT_TRACE2_PERF=C:\temp\git-trace2.log