Add ARM64 to ADO release pipeline

Restructures the release pipeline to build, ESRP-sign, and publish both
x64 and ARM64 installers in parallel. Uses the same ${{ each }} pattern
as microsoft/git's release pipeline (1ES templates don't support
strategy.matrix).

Changes:
  * .azure-pipelines/release.yml: single Build job replaced with a
    build_matrix parameter that generates Build_x64 and Build_arm64
    jobs. Each job runs on its native pool (GitClientPME-1ESHostedPool-
    intel-pc for x64, GitClientPME-1ESHostedPool-arm64-pc for arm64),
    builds with the arch arg to Build.bat, signs its own payload and
    installer via ESRP, and stages arch-suffixed pipeline artifacts.
    The release stage downloads both Installer_x64 and Installer_arm64
    and publishes both SetupGVFS.<v>.exe and SetupGVFS.<v>-arm64.exe
    as assets on the same draft GitHub Release.
  * scripts/CreateBuildArtifacts.bat: gains an optional 3rd ARCH arg
    (default x64) to select the correct win-<arch> output paths.
  * .github/workflows/build.yaml: passes matrix.architecture to
    CreateBuildArtifacts.bat.

Assisted-by: Claude Opus 4.7
Signed-off-by: Tyrie Vella <tyrielv@gmail.com>

Author: tyrielv

.azure-pipelines/release.yml

@@ -54,6 +54,13 @@ $cppWorkloads = @(
     'Microsoft.VisualStudio.Workload.VCTools'
 )
 
+# ARM64 cross-compilation requires an additional component that is not
+# included in the default C++ workload install. We ensure it's present
+# so that vcpkg and MSBuild can target arm64-windows triplets even when
+# running on an x64 host (or on an ARM64 host that only has the default
+# ARM64 → ARM64 native tools and not the broader "all targets" set).
+$arm64Component = 'Microsoft.VisualStudio.Component.VC.Tools.ARM64'
+
 function Get-VsWhere {
     if (Test-Path $script:vswherePath) {
         return $script:vswherePath
@@ -106,11 +113,20 @@ function Invoke-VsSetup {
 # --- Locate or bootstrap vswhere ---
 $vswhereExe = Get-VsWhere
 
-# --- Quick exit if a VS install with the C++ workload is already present ---
+# --- Quick exit if a VS install with the C++ workload AND arm64 tools is already present ---
+# Check requires a C++ workload (either one) AND the ARM64 component.
+# vswhere -requires with -requiresAny means "any one of the listed components".
+# To enforce AND, we run vswhere with the ARM64 component as a hard requirement
+# and the C++ workloads as a separate check.
 $existing = Find-VsInstall -VswhereExe $vswhereExe -RequiredWorkloads $cppWorkloads
 if ($existing) {
-    Write-Host "VS install with C++ workload already present: $($existing.installationPath) ($($existing.productId))"
-    exit 0
+    # Also check for ARM64 component
+    $arm64Present = Find-VsInstall -VswhereExe $vswhereExe -RequiredWorkloads @($arm64Component)
+    if ($arm64Present) {
+        Write-Host "VS install with C++ workload + ARM64 tools already present: $($existing.installationPath) ($($existing.productId))"
+        exit 0
+    }
+    Write-Host "VS install has C++ workload but missing ARM64 tools; will add..."
 }
 
 # --- Find any VS install (regardless of workloads) ---
@@ -126,6 +142,7 @@ if (-not $install) {
 
     Invoke-VsSetup -ExePath $bootstrapper -Description 'VS Build Tools install' -ArgumentList @(
         '--add', 'Microsoft.VisualStudio.Workload.VCTools',
+        '--add', $arm64Component,
         '--includeRecommended',
         '--quiet',
         '--norestart',
@@ -151,6 +168,7 @@ if (-not $install) {
         'modify',
         '--installPath', $install.installationPath,
         '--add', $workload,
+        '--add', $arm64Component,
         '--includeRecommended',
         '--quiet',
         '--norestart',

.azure-pipelines/scripts/install-vs-cpp-workload.ps1

@@ -304,7 +304,7 @@ jobs:
     - name: Create build artifacts
       if: steps.skip.outputs.result != 'true'
       shell: cmd
-      run: src\scripts\CreateBuildArtifacts.bat ${{ matrix.configuration }} artifacts
+      run: src\scripts\CreateBuildArtifacts.bat ${{ matrix.configuration }} artifacts ${{ matrix.architecture }}
 
     - name: Upload functional tests drop
       if: steps.skip.outputs.result != 'true'

.github/workflows/build.yaml

@@ -112,6 +112,16 @@
     <NativeLibrary Include="secur32.lib" />
   </ItemGroup>
 
+  <!--
+    NativeAOT cross-compilation support. When the build host architecture
+    differs from the target (e.g. x64 host building for arm64), ILCompiler
+    requires an explicit PackageReference for the cross-compile runtime pack.
+    The package is a no-op when host == target architecture.
+  -->
+  <ItemGroup Condition="'$(MSBuildProjectExtension)' == '.csproj'">
+    <PackageReference Include="runtime.win-arm64.Microsoft.DotNet.ILCompiler" />
+  </ItemGroup>
+
   <!--
     Non-AOT projects (tests) need git2.dll for runtime P/Invoke.
     Copy from the vcpkg dynamic build output.

Directory.Build.props

@@ -36,6 +36,11 @@
     <PackageVersion Include="Moq" Version="4.10.1" />
     <PackageVersion Include="NUnit3TestAdapter" Version="3.13.0" />
     <PackageVersion Include="NUnitLite" Version="3.12.0" />
+
+    <!-- NativeAOT cross-compilation: when building on an x64 host targeting
+         arm64, ILCompiler requires an explicit PackageReference for the
+         cross-compile runtime pack. This is a no-op when host == target. -->
+    <PackageVersion Include="runtime.win-arm64.Microsoft.DotNet.ILCompiler" Version="10.0.9" />
   </ItemGroup>
 
 </Project>

Directory.Packages.props

@@ -13,6 +13,14 @@
     -->
     <InstallerArchSuffix Condition="'$(VfsArch)' == 'arm64'">-arm64</InstallerArchSuffix>
     <InstallerArchSuffix Condition="'$(InstallerArchSuffix)' == ''"></InstallerArchSuffix>
+
+    <!--
+      Inno Setup ArchitecturesInstallIn64BitMode / ArchitecturesAllowed value.
+      x64 uses "x64compatible" (allows install on x64 and ARM64-via-Prism).
+      ARM64 uses "arm64" (native ARM64 only).
+    -->
+    <InstallerTargetArch Condition="'$(VfsArch)' == 'arm64'">arm64</InstallerTargetArch>
+    <InstallerTargetArch Condition="'$(InstallerTargetArch)' == ''">x64compatible</InstallerTargetArch>
   </PropertyGroup>
 
   <ItemDefinitionGroup>
@@ -35,7 +43,7 @@
   </ItemGroup>
 
   <Target Name="CreateInstaller" BeforeTargets="Build" Condition="'$(SkipCreateInstaller)' != 'true'">
-    <Exec Command='"$(PkgTools_InnoSetup)\tools\ISCC.exe" /DLayoutDir="$(LayoutPath)" /DGVFSVersion=$(GVFSVersion) /DArchSuffix=$(InstallerArchSuffix) Setup.iss /O"$(OutputPath)"' />
+    <Exec Command='"$(PkgTools_InnoSetup)\tools\ISCC.exe" /DLayoutDir="$(LayoutPath)" /DGVFSVersion=$(GVFSVersion) /DArchSuffix=$(InstallerArchSuffix) /DTargetArch=$(InstallerTargetArch) Setup.iss /O"$(OutputPath)"' />
   </Target>
 
   <Target Name="CleanInstaller" BeforeTargets="AfterClean">

GVFS/GVFS.Installers/GVFS.Installers.csproj

@@ -16,6 +16,18 @@
 #define GVFSStatuscacheTokenFileName "EnableGitStatusCacheToken.dat"
 #define ServiceName "GVFS.Service"
 
+; Architecture directives: x64 builds allow installation on x64 and ARM64
+; (under Prism emulation); ARM64 builds target native ARM64 only.
+; ArchSuffix and TargetArch are set via /D on the ISCC command line from
+; GVFS.Installers.csproj; defaults handle the case where they're not set
+; (e.g. old invocations without the arch parameters).
+#ifndef TargetArch
+#define TargetArch "x64compatible"
+#endif
+#ifndef ArchSuffix
+#define ArchSuffix ""
+#endif
+
 [Setup]
 AppId={{489CA581-F131-4C28-BE04-4FB178933E6D}
 AppName={#MyAppName}
@@ -38,8 +50,8 @@ MinVersion=10.0.17763
 DisableDirPage=yes
 DisableReadyPage=yes
 SetupIconFile="{#LayoutDir}\GitVirtualFileSystem.ico"
-ArchitecturesInstallIn64BitMode=x64compatible
-ArchitecturesAllowed=x64compatible
+ArchitecturesInstallIn64BitMode={#TargetArch}
+ArchitecturesAllowed={#TargetArch}
 WizardImageStretch=no
 WindowResizable=no
 CloseApplications=no

GVFS/GVFS.Installers/Setup.iss

@@ -183,7 +183,7 @@ FOR %%P IN (
     "%VFS_SRCDIR%\GVFS\GVFS.PerfProfiling\GVFS.PerfProfiling.csproj"
 ) DO (
     ECHO Publishing %%~nP...
-    dotnet publish %%P --no-restore -v:%VERBOSITY% -c %CONFIGURATION% /p:VfsArch=%ARCH% || GOTO ERROR
+    dotnet publish %%P -v:%VERBOSITY% -c %CONFIGURATION% /p:VfsArch=%ARCH% || GOTO ERROR
 )
 
 ECHO ^*******************************
@@ -196,7 +196,7 @@ FOR %%P IN (
     "%VFS_SRCDIR%\GVFS\GVFS.Installers\GVFS.Installers.csproj"
 ) DO (
     ECHO Publishing %%~nP...
-    dotnet publish %%P --no-restore -v:%VERBOSITY% -c %CONFIGURATION% /p:VfsArch=%ARCH% || GOTO ERROR
+    dotnet publish %%P -v:%VERBOSITY% -c %CONFIGURATION% /p:VfsArch=%ARCH% || GOTO ERROR
 )
 
 GOTO :EOF

scripts/Build.bat

@@ -14,6 +14,14 @@ IF "%~2"=="" (
     SET OUTROOT=%2
 )
 
+IF "%~3"=="" (
+    SET ARCH=x64
+) ELSE (
+    SET ARCH=%3
+)
+IF /I "%ARCH%"=="ARM64" SET ARCH=arm64
+IF /I "%ARCH%"=="X64"   SET ARCH=x64
+
 IF EXIST %OUTROOT% (
   rmdir /s /q %OUTROOT%
 )
@@ -33,7 +41,7 @@ ECHO ^* Collecting GVFS.Installers *
 ECHO ^******************************
 mkdir %OUTROOT%\GVFS.Installers
 xcopy /S /Y ^
-    %VFS_OUTDIR%\GVFS.Installers\bin\%CONFIGURATION%\win-x64\* ^
+    %VFS_OUTDIR%\GVFS.Installers\bin\%CONFIGURATION%\win-%ARCH%\* ^
     %OUTROOT%\GVFS.Installers\ || GOTO ERROR
 
 ECHO ^************************
@@ -42,24 +50,25 @@ ECHO ^************************
 ECHO Collecting FastFetch...
 mkdir %OUTROOT%\FastFetch
 xcopy /S /Y ^
-    %VFS_OUTDIR%\FastFetch\bin\%CONFIGURATION%\net10.0-windows10.0.17763.0\win-x64\publish\* ^
+    %VFS_OUTDIR%\FastFetch\bin\%CONFIGURATION%\net10.0-windows10.0.17763.0\win-%ARCH%\publish\* ^
     %OUTROOT%\FastFetch\ || GOTO ERROR
 
 ECHO ^***********************************
 ECHO ^* Collecting GVFS.FunctionalTests *
 ECHO ^***********************************
 mkdir %OUTROOT%\GVFS.FunctionalTests
 xcopy /S /Y ^
-    %VFS_OUTDIR%\GVFS.FunctionalTests\bin\%CONFIGURATION%\net10.0-windows10.0.17763.0\win-x64\publish\* ^
+    %VFS_OUTDIR%\GVFS.FunctionalTests\bin\%CONFIGURATION%\net10.0-windows10.0.17763.0\win-%ARCH%\publish\* ^
     %OUTROOT%\GVFS.FunctionalTests\ || GOTO ERROR
 
 GOTO :EOF
 
 :USAGE
-ECHO usage: %~n0%~x0 [^<configuration^>] [^<destination^>]
+ECHO usage: %~n0%~x0 [^<configuration^>] [^<destination^>] [^<arch^>]
 ECHO.
 ECHO   configuration    Solution configuration (default: Debug).
 ECHO   destination      Destination directory to copy artifacts (default: %VFS_PUBLISHDIR%).
+ECHO   arch             Target CPU architecture: x64 or arm64 (default: x64).
 ECHO.
 EXIT 1