restore state after build

tools/build/build-installer.ps1

@@ -27,10 +27,12 @@ Runs the pipeline for x64 Release.
 Runs the pipeline for x64 Release with machine-wide installer.
 
 .NOTES
-- Make sure to run this script from a Developer PowerShell (e.g., VS2022 Developer PowerShell).
 - Generated MSIX files will be signed using cert-sign-package.ps1.
-- This script will clean previous outputs under the build directories and installer directory (except *.exe files).
+- This script uses git to manage workspace state:
-- First time run need admin permission to trust the certificate.
+  * Uncommitted changes are stashed before build and popped afterwards.
+  * Version files and manifests modified during build are reverted.
+  * Untracked generated files are cleaned up.
+- Use the -Clean parameter to clean build outputs (bin/obj) and ignored files.
 - The built installer will be placed under: installer/PowerToysSetupVNext/[Platform]/[Configuration]/User[Machine]Setup 
   relative to the solution root directory.
 - To run the full installation in other machines, call "./cert-management.ps1" to export the cert used to sign the packages.
@@ -129,40 +131,39 @@ if ($Clean) {
     RunMSBuild 'PowerToys.slnx' '/t:Clean' $Platform $Configuration
 }
 
-# Set up versioning using versionSetting.ps1 if Version is provided
+# Git Stash Logic to handle workspace cleanup
-# These files will be modified by versionSetting.ps1 and need to be restored after build
+$stashedChanges = $false
-$versionFilesToRestore = @(
+$scriptPathRelative = "tools/build/build-installer.ps1" 
-    "src\Version.props",
-    "src\CmdPalVersion.props",
-    "src\modules\powerrename\PowerRenameContextMenu\AppxManifest.xml",
-    "src\modules\imageresizer\ImageResizerContextMenu\AppxManifest.xml",
-    "src\modules\FileLocksmith\FileLocksmithContextMenu\AppxManifest.xml",
-    "src\modules\NewPlus\NewShellExtensionContextMenu\AppxManifest.xml"
-)
-$versionFileBackups = @{}
 
-# These files are generated by Terminal versioning and need to be cleaned up after build
+# Calculate relative path of this script to exclude it from stash/reset
-$cmdpalGeneratedFiles = @(
+$currentScriptPath = $MyInvocation.MyCommand.Definition
-    "src\modules\cmdpal\Directory.Build.props",
+if ($currentScriptPath.StartsWith($repoRoot)) {
-    "src\modules\cmdpal\Directory.Build.targets",
+    $scriptPathRelative = $currentScriptPath.Substring($repoRoot.Length).TrimStart('\', '/')
-    "src\modules\cmdpal\Microsoft.CmdPal.UI\BuildInfo.xml",
+    $scriptPathRelative = $scriptPathRelative -replace '\\', '/'
-    "src\modules\cmdpal\Microsoft.CmdPal.UI\GeneratedPackage.appxmanifest",
-    "src\modules\cmdpal\ext\ProcessMonitorExtension\BuildInfo.xml",
-    "src\modules\cmdpal\ext\ProcessMonitorExtension\GeneratedPackage.appxmanifest",
-    "src\modules\cmdpal\ext\SamplePagesExtension\BuildInfo.xml",
-    "src\modules\cmdpal\ext\SamplePagesExtension\GeneratedPackage.appxmanifest"
-)
-
-# Backup all version files before any versioning scripts run
-Write-Host "[VERSION] Backing up version files before modification..."
-foreach ($relPath in $versionFilesToRestore) {
-    $fullPath = Join-Path $repoRoot $relPath
-    if (Test-Path $fullPath) {
-        $versionFileBackups[$relPath] = Get-Content $fullPath -Raw
-        Write-Host "  Backed up: $relPath"
-    }
 }
 
+Push-Location $repoRoot
+try {
+    if (git status --porcelain) {
+        Write-Host "[GIT] Uncommitted changes detected. Stashing (excluding this script)..."
+        $stashCountBefore = (git stash list).Count
+        
+        # Exclude the current script from stash so we don't revert it while running
+        git stash push --include-untracked -m "PowerToys Build Auto-Stash" -- . ":(exclude)$scriptPathRelative"
+        
+        $stashCountAfter = (git stash list).Count
+        if ($stashCountAfter -gt $stashCountBefore) {
+            $stashedChanges = $true 
+            Write-Host "[GIT] Changes stashed."
+        } else {
+            Write-Host "[GIT] No changes to stash (likely only this script is modified)."
+        }
+    }
+} finally {
+    Pop-Location
+}
+
+try {
     if ($Version) {
         Write-Host "[VERSION] Setting PowerToys version to $Version using versionSetting.ps1..."
         $versionScript = Join-Path $repoRoot ".pipelines\versionSetting.ps1"
@@ -247,6 +248,98 @@ else {
         Write-Warning "[SIGN] No .msix files found in $msixSearchRoot"
     }
 
+    # Generate DSC v2 manifests (PowerToys.Settings.DSC.Schema.Generator)
+    # The csproj PostBuild event is skipped on ARM64, so we run it manually here if needed.
+    if ($Platform -eq 'arm64') {
+        Write-Host "[DSC] Manually generating DSC v2 manifests for ARM64..."
+
+        # 1. Get Version
+        $versionPropsPath = Join-Path $repoRoot "src\Version.props"
+        [xml]$versionProps = Get-Content $versionPropsPath
+        $ptVersion = $versionProps.Project.PropertyGroup.Version
+        # Directory.Build.props appends .0 to the version for csproj files
+        $ptVersionFull = "$ptVersion.0"
+        
+        # 2. Build the Generator
+        $generatorProj = Join-Path $repoRoot "src\dsc\PowerToys.Settings.DSC.Schema.Generator\PowerToys.Settings.DSC.Schema.Generator.csproj"
+        RunMSBuild $generatorProj "/t:Build" $Platform $Configuration
+
+        # 3. Define paths
+        # The generator output path is in the project's bin folder
+        $generatorExe = Join-Path $repoRoot "src\dsc\PowerToys.Settings.DSC.Schema.Generator\bin\$Platform\$Configuration\PowerToys.Settings.DSC.Schema.Generator.exe"
+        
+        if (-not (Test-Path $generatorExe)) {
+            Write-Warning "Could not find generator at expected path: $generatorExe"
+            Write-Warning "Searching in build output..."
+            $found = Get-ChildItem -Path (Join-Path $repoRoot "$Platform\$Configuration") -Filter "PowerToys.Settings.DSC.Schema.Generator.exe" -Recurse | Select-Object -First 1
+            if ($found) {
+                $generatorExe = $found.FullName
+            }
+        }
+
+        $settingsLibDll = Join-Path $repoRoot "$Platform\$Configuration\WinUI3Apps\PowerToys.Settings.UI.Lib.dll"
+        
+        $dscGenDir = Join-Path $repoRoot "src\dsc\Microsoft.PowerToys.Configure\Generated\Microsoft.PowerToys.Configure\$ptVersionFull"
+        if (-not (Test-Path $dscGenDir)) {
+            New-Item -ItemType Directory -Path $dscGenDir -Force | Out-Null
+        }
+        
+        $outPsm1 = Join-Path $dscGenDir "Microsoft.PowerToys.Configure.psm1"
+        $outPsd1 = Join-Path $dscGenDir "Microsoft.PowerToys.Configure.psd1"
+
+        # 4. Run Generator
+        if (Test-Path $generatorExe) {
+            Write-Host "[DSC] Executing: $generatorExe"
+            
+            $generatorDir = Split-Path -Parent $generatorExe
+            $winUI3AppsDir = Join-Path $repoRoot "$Platform\$Configuration\WinUI3Apps"
+            
+            # Copy dependencies from WinUI3Apps to Generator directory to satisfy WinRT/WinUI3 dependencies
+            # This avoids "Class not registered" errors without polluting the WinUI3Apps directory which is used for packaging.
+            if (Test-Path $winUI3AppsDir) {
+                Write-Host "[DSC] Copying dependencies from $winUI3AppsDir to $generatorDir"
+                Get-ChildItem -Path $winUI3AppsDir -Filter "*.dll" | ForEach-Object {
+                    $destPath = Join-Path $generatorDir $_.Name
+                    if (-not (Test-Path $destPath)) {
+                        Copy-Item -Path $_.FullName -Destination $destPath -Force
+                    }
+                }
+                # Also copy resources.pri if it exists, as it might be needed for resource lookup
+                $priFile = Join-Path $winUI3AppsDir "resources.pri"
+                if (Test-Path $priFile) {
+                    Copy-Item -Path $priFile -Destination $generatorDir -Force
+                }
+            }
+
+            Push-Location $generatorDir
+            try {
+                # Now we can use the local DLLs
+                $localSettingsLibDll = Join-Path $generatorDir "PowerToys.Settings.UI.Lib.dll"
+                
+                if (Test-Path $localSettingsLibDll) {
+                    Write-Host "[DSC] Using local DLL: $localSettingsLibDll"
+                    & $generatorExe $localSettingsLibDll $outPsm1 $outPsd1
+                } else {
+                    # Fallback (shouldn't happen if copy succeeded or build was correct)
+                    Write-Warning "[DSC] Local DLL not found, falling back to: $settingsLibDll"
+                    & $generatorExe $settingsLibDll $outPsm1 $outPsd1
+                }
+
+                if ($LASTEXITCODE -ne 0) {
+                    Write-Error "DSC v2 generation failed with exit code $LASTEXITCODE"
+                    exit 1
+                }
+            } finally {
+                Pop-Location
+            }
+            
+            Write-Host "[DSC] DSC v2 manifests generated successfully."
+        } else {
+            Write-Error "Could not find generator executable at $generatorExe"
+            exit 1
+        }
+    }
+
     # Generate DSC manifest files
     Write-Host '[DSC] Generating DSC manifest files...'
     $dscScriptPath = Join-Path $repoRoot '.\tools\build\generate-dsc-manifests.ps1'
@@ -276,6 +369,12 @@ if ($Clean) {
         }
     }
 
+    # Set NUGET_PACKAGES environment variable if not set, to help wixproj find heat.exe
+    if (-not $env:NUGET_PACKAGES) {
+        $env:NUGET_PACKAGES = Join-Path $env:USERPROFILE ".nuget\packages"
+        Write-Host "[ENV] Set NUGET_PACKAGES to $env:NUGET_PACKAGES"
+    }
+
     RunMSBuild 'installer\PowerToysSetup.slnx' "$commonArgs /t:restore /p:RestorePackagesConfig=true" $Platform $Configuration
 
     RunMSBuild 'installer\PowerToysSetup.slnx' "$commonArgs /m /t:PowerToysInstallerVNext /p:PerUser=$PerUser" $Platform $Configuration
@@ -293,23 +392,28 @@ if (Test-Path $msiEnUsDir) {
 
     RunMSBuild 'installer\PowerToysSetup.slnx' "$commonArgs /m /t:PowerToysBootstrapperVNext /p:PerUser=$PerUser" $Platform $Configuration
 
-# Restore version files if they were backed up
+} finally {
-if ($versionFileBackups.Count -gt 0) {
+    # Restore workspace state using Git
-    Write-Host "[VERSION] Restoring version files to original state..."
+    Write-Host "[GIT] Cleaning up build artifacts..."
-    foreach ($relPath in $versionFileBackups.Keys) {
+    Push-Location $repoRoot
-        $fullPath = Join-Path $repoRoot $relPath
+    try {
-        Set-Content -Path $fullPath -Value $versionFileBackups[$relPath] -NoNewline
+        # Revert all changes EXCEPT the script itself
-        Write-Host "  Restored: $relPath"
+        # This cleans up Version.props, AppxManifests, etc.
-    }
+        git checkout HEAD -- . ":(exclude)$scriptPathRelative"
-}
         
-# Clean up cmdpal generated files from Terminal versioning
+        # Remove untracked files (generated manifests, etc.)
-Write-Host "[CLEANUP] Removing cmdpal generated files..."
+        # -f: force, -d: remove directories, -q: quiet
-foreach ($relPath in $cmdpalGeneratedFiles) {
+        git clean -fd -q
-    $fullPath = Join-Path $repoRoot $relPath
+        
-    if (Test-Path $fullPath) {
+        if ($stashedChanges) {
-        Remove-Item $fullPath -Force
+            Write-Host "[GIT] Restoring stashed changes..."
-        Write-Host "  Removed: $relPath"
+            git stash pop --index
+            if ($LASTEXITCODE -ne 0) {
+                Write-Warning "[GIT] 'git stash pop' reported conflicts or errors. Your changes are in the stash list."
+            }
+        }
+    } finally {
+        Pop-Location
     }
 }