Apply PR feedback

Author: dennisameling

.github/workflows/continuous-integration.yml

@@ -13,10 +13,16 @@ jobs:
 # ================================
   windows:
     name: Windows
-    runs-on: windows-latest
+    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        runtime: [win-x86, win-x64, win-arm64]
+        include:
+          - runtime: win-x86
+            os: windows-latest
+          - runtime: win-x64
+            os: windows-latest
+          - runtime: win-arm64
+            os: windows-11-arm
 
     steps:
     - uses: actions/checkout@v6
@@ -36,8 +42,6 @@ jobs:
          --runtime=${{ matrix.runtime }}
 
     - name: Test
-      # GitHub's hosted runners are x64 so can test x64 and x86, but not arm64
-      if: matrix.runtime != 'win-arm64'
       run: |
         dotnet test --verbosity normal `
         --configuration=WindowsRelease `

src/windows/Installer.Windows/Installer.Windows.csproj

@@ -2,6 +2,13 @@
   <!-- Implicit SDK props import -->
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
 
+  <!-- Default RuntimeIdentifier to the host architecture if not specified -->
+  <PropertyGroup Condition="'$(RuntimeIdentifier)' == ''">
+    <RuntimeIdentifier Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)' == 'X64'">win-x64</RuntimeIdentifier>
+    <RuntimeIdentifier Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)' == 'X86'">win-x86</RuntimeIdentifier>
+    <RuntimeIdentifier Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)' == 'Arm64'">win-arm64</RuntimeIdentifier>
+  </PropertyGroup>
+
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>

src/windows/Installer.Windows/layout.ps1

@@ -1,8 +1,24 @@
 # Inputs
-param ([Parameter(Mandatory)] $Configuration, [Parameter(Mandatory)] $Output, [Parameter(Mandatory)] $RuntimeIdentifier, $SymbolOutput)
+param ([Parameter(Mandatory)] $Configuration, [Parameter(Mandatory)] $Output, $RuntimeIdentifier, $SymbolOutput)
 
 Write-Output "Output: $Output"
 
+# Determine a runtime if one was not provided
+if (-not $RuntimeIdentifier) {
+    $arch = $env:PROCESSOR_ARCHITECTURE
+    switch ($arch) {
+        "AMD64" { $RuntimeIdentifier = "win-x64" }
+        "x86"   { $RuntimeIdentifier = "win-x86" }
+        "ARM64" { $RuntimeIdentifier = "win-arm64" }
+        default {
+            Write-Host "Unknown architecture: $arch"
+            exit 1
+        }
+    }
+}
+
+Write-Output "Building for runtime '$RuntimeIdentifier'"
+
 if ($RuntimeIdentifier -ne 'win-x86' -and $RuntimeIdentifier -ne 'win-x64' -and $RuntimeIdentifier -ne 'win-arm64') {
     Write-Host "Unsupported RuntimeIdentifier: $RuntimeIdentifier"
     exit 1