Merge pull request microsoft#1958 from tyrielv/tyrielv/streamlined-upgrade

Non-disruptive upgrade: staged install with in-process file copy

Author: tyrielv

.github/workflows/build.yaml

@@ -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/upgrade-tests.yaml

@@ -0,0 +1,290 @@
+name: Upgrade Tests
+
+on:
+  workflow_call:
+    inputs:
+      skip:
+        description: 'URL of a previous successful run; if non-empty, all steps are skipped'
+        required: false
+        type: string
+        default: ''
+      lkg_release_tag:
+        description: 'Tag of the last known good release to upgrade from (default: latest release)'
+        required: false
+        type: string
+        default: ''
+
+permissions:
+  contents: read
+  actions: read
+
+jobs:
+  upgrade_test:
+    runs-on: windows-2025
+    name: Upgrade
+    timeout-minutes: 30
+
+    strategy:
+      matrix:
+        configuration: [ Debug ]
+        scenario:
+          - staging-upgrade
+          - clean-upgrade
+          - double-staging
+          - staging-then-clean
+          - mount-safety-deferral
+      fail-fast: false
+
+    steps:
+    - name: Skip this job if there is a previous successful run
+      if: inputs.skip != ''
+      id: skip
+      uses: actions/github-script@v9
+      with:
+        script: |
+          core.info(`Skipping: There already is a successful run: ${{ inputs.skip }}`)
+          return true
+
+    # -- Artifacts --
+
+    - name: Download LKG release installer
+      if: steps.skip.outputs.result != 'true'
+      shell: pwsh
+      env:
+        GITHUB_TOKEN: ${{ github.token }}
+      run: |
+        $tag = "${{ inputs.lkg_release_tag }}"
+        if (-not $tag) {
+          $tag = gh api repos/microsoft/VFSForGit/releases/latest --jq '.tag_name'
+          Write-Host "Auto-detected latest release: $tag"
+        }
+        New-Item -ItemType Directory -Path gvfs-lkg -Force | Out-Null
+        gh release download $tag --repo microsoft/VFSForGit --pattern "SetupGVFS*.exe" --dir gvfs-lkg
+
+    - name: Download Git installer
+      if: steps.skip.outputs.result != 'true'
+      uses: actions/download-artifact@v8
+      with:
+        name: MicrosoftGit
+        path: git
+
+    - name: Download current GVFS installer
+      if: steps.skip.outputs.result != 'true'
+      uses: actions/download-artifact@v8
+      with:
+        name: GVFS_${{ matrix.configuration }}
+        path: gvfs-new
+
+    # -- Setup --
+
+    - name: Install Git
+      if: steps.skip.outputs.result != 'true'
+      shell: cmd
+      run: git\install.bat
+
+    - name: Enable ProjFS
+      if: steps.skip.outputs.result != 'true'
+      shell: pwsh
+      run: |
+        $feature = Get-WindowsOptionalFeature -Online -FeatureName Client-ProjFS
+        if ($feature.State -ne 'Enabled') {
+          Enable-WindowsOptionalFeature -Online -FeatureName Client-ProjFS -NoRestart
+        }
+
+    # -- Test Execution --
+
+    - name: Run upgrade test - ${{ matrix.scenario }}
+      if: steps.skip.outputs.result != 'true'
+      shell: pwsh
+      run: |
+        $ErrorActionPreference = 'Stop'
+
+        $lkgInstaller = (Get-ChildItem gvfs-lkg\SetupGVFS*.exe).FullName
+        $newInstaller = (Get-ChildItem gvfs-new\SetupGVFS*.exe).FullName
+        $installDir = "C:\Program Files\VFS for Git"
+        $testRepo = "https://dev.azure.com/gvfs/ci/_git/ForTests"
+        $enlistment = "C:\gvfs-upgrade-test"
+
+        function Install-GVFS($installer, [string[]]$extraArgs = @()) {
+          $logDir = "C:\temp\gvfs-install-logs"
+          New-Item -ItemType Directory -Path $logDir -Force | Out-Null
+          $logFile = Join-Path $logDir "gvfs-$(Get-Date -Format 'yyyyMMdd-HHmmss').log"
+          $allArgs = @("/VERYSILENT", "/SUPPRESSMSGBOXES", "/NORESTART", "/LOG=$logFile") + $extraArgs
+          Write-Host "Installing: $installer $($allArgs -join ' ')"
+          # Start without -Wait: Inno Setup launches child processes
+          # (e.g. GVFS.Service.UI) that stay running, causing -Wait to
+          # hang. Instead, wait only for the installer process itself.
+          $proc = Start-Process -FilePath $installer -ArgumentList $allArgs -PassThru
+          $proc.WaitForExit()
+          if ($proc.ExitCode -ne 0) {
+            Get-Content $logFile -Tail 30 -ErrorAction SilentlyContinue
+            throw "Installer failed with exit code $($proc.ExitCode)"
+          }
+          Write-Host "Installed successfully"
+        }
+
+        function Assert-ServiceRunning {
+          $svc = sc.exe query GVFS.Service 2>&1 | Select-String "STATE"
+          if ($svc -notmatch "RUNNING") { throw "GVFS.Service is not running: $svc" }
+        }
+
+        function Mount-TestRepo {
+          if (Test-Path $enlistment) {
+            & "$installDir\gvfs.exe" mount $enlistment 2>&1 | Write-Host
+          } else {
+            & "$installDir\gvfs.exe" clone $testRepo $enlistment 2>&1 | Write-Host
+          }
+          if ($LASTEXITCODE -ne 0) { throw "Mount/clone failed" }
+          $mountProc = Get-Process -Name "GVFS.Mount" -ErrorAction SilentlyContinue
+          if (-not $mountProc) { throw "No GVFS.Mount process after mount" }
+          return $mountProc.Id
+        }
+
+        function Assert-MountAlive($expectedPid) {
+          $proc = Get-Process -Id $expectedPid -ErrorAction SilentlyContinue
+          if (-not $proc -or $proc.ProcessName -ne "GVFS.Mount") {
+            throw "Mount process $expectedPid is no longer running"
+          }
+          # Verify the mount is functional by accessing a file
+          $readmePath = Join-Path $enlistment "src\Readme.md"
+          if (-not (Test-Path $readmePath)) {
+            throw "Mount is running but cannot access $readmePath"
+          }
+        }
+
+        function Unmount-TestRepo {
+          & "$installDir\gvfs.exe" unmount $enlistment 2>&1
+          Start-Sleep -Seconds 3
+        }
+
+        function Restart-Service {
+          sc.exe stop GVFS.Service | Out-Null
+          Start-Sleep -Seconds 10
+          sc.exe start GVFS.Service | Out-Null
+          Start-Sleep -Seconds 10
+          Assert-ServiceRunning
+        }
+
+        function Assert-PendingUpgrade($expected) {
+          $exists = Test-Path "$installDir\PendingUpgrade"
+          if ($exists -ne $expected) {
+            throw "PendingUpgrade directory: expected=$expected, actual=$exists"
+          }
+        }
+
+        # =============================================
+        # Test scenarios
+        # =============================================
+
+        switch ("${{ matrix.scenario }}") {
+
+          "staging-upgrade" {
+            Write-Host "=== Scenario: Staging upgrade e2e ==="
+            # Install LKG, mount, staging upgrade, unmount, verify completion
+            Install-GVFS $lkgInstaller
+            Assert-ServiceRunning
+            $mountPid = Mount-TestRepo
+
+            Install-GVFS $newInstaller @("/STAGEIFMOUNTED=true")
+            Assert-MountAlive $mountPid
+            Assert-PendingUpgrade $true
+
+            Unmount-TestRepo
+            Restart-Service
+            Assert-PendingUpgrade $false
+            Write-Host "PASS: Staging upgrade completed"
+          }
+
+          "clean-upgrade" {
+            Write-Host "=== Scenario: Clean upgrade (traditional) ==="
+            Install-GVFS $lkgInstaller
+            Assert-ServiceRunning
+            Mount-TestRepo | Write-Host
+
+            Install-GVFS $newInstaller @("/STAGEIFMOUNTED=false")
+            Assert-PendingUpgrade $false
+            Assert-ServiceRunning
+            Write-Host "PASS: Clean upgrade completed"
+          }
+
+          "double-staging" {
+            Write-Host "=== Scenario: Double staging install ==="
+            # Install LKG, mount, staging install twice, verify second overwrites
+            Install-GVFS $lkgInstaller
+            Assert-ServiceRunning
+            $mountPid = Mount-TestRepo
+
+            Install-GVFS $newInstaller @("/STAGEIFMOUNTED=true")
+            Assert-MountAlive $mountPid
+            Assert-PendingUpgrade $true
+
+            # Second staging install should overwrite PendingUpgrade
+            Install-GVFS $newInstaller @("/STAGEIFMOUNTED=true")
+            Assert-MountAlive $mountPid
+            Assert-PendingUpgrade $true
+
+            Unmount-TestRepo
+            Restart-Service
+            Assert-PendingUpgrade $false
+            Write-Host "PASS: Double staging handled correctly"
+          }
+
+          "staging-then-clean" {
+            Write-Host "=== Scenario: Staging then clean install ==="
+            # Install LKG, mount, staging install, unmount, clean install
+            # Verify PendingUpgrade is cleaned up by clean install
+            Install-GVFS $lkgInstaller
+            Assert-ServiceRunning
+            $mountPid = Mount-TestRepo
+
+            Install-GVFS $newInstaller @("/STAGEIFMOUNTED=true")
+            Assert-MountAlive $mountPid
+            Assert-PendingUpgrade $true
+
+            Unmount-TestRepo
+            # Now clean install — should remove PendingUpgrade
+            Install-GVFS $newInstaller @("/STAGEIFMOUNTED=false")
+            Assert-PendingUpgrade $false
+            Assert-ServiceRunning
+            Write-Host "PASS: Staging then clean install handled correctly"
+          }
+
+          "mount-safety-deferral" {
+            Write-Host "=== Scenario: Mount safety deferral ==="
+            # Install LKG, mount, staging install, restart service WITH mount
+            # running — upgrade should be deferred
+            Install-GVFS $lkgInstaller
+            Assert-ServiceRunning
+            $mountPid = Mount-TestRepo
+
+            Install-GVFS $newInstaller @("/STAGEIFMOUNTED=true")
+            Assert-MountAlive $mountPid
+            Assert-PendingUpgrade $true
+
+            # Restart service WITHOUT unmounting — upgrade should defer
+            Restart-Service
+            Assert-MountAlive $mountPid
+            Assert-PendingUpgrade $true
+            Write-Host "Upgrade correctly deferred while mount running"
+
+            # Now unmount and restart — should complete
+            Unmount-TestRepo
+            Restart-Service
+            Assert-PendingUpgrade $false
+            Write-Host "PASS: Mount safety deferral works correctly"
+          }
+
+          default {
+            throw "Unknown scenario: ${{ matrix.scenario }}"
+          }
+        }
+
+    - name: Upload service logs
+      if: always() && steps.skip.outputs.result != 'true'
+      uses: actions/upload-artifact@v7
+      continue-on-error: true
+      with:
+        name: UpgradeTest_Logs_${{ matrix.scenario }}
+        path: |
+          C:\ProgramData\GVFS\GVFS.Service\Logs\
+          C:\temp\gvfs-install-logs\