Add support for multiple rids

Author: radical

docs/contributing.md

@@ -35,7 +35,7 @@ Make sure you [build the repo](#build-the-repo) from command line at least once.
 
 The default build includes native builds for `Aspire.Cli` which produces Native AOT binaries for some platforms. These projects are in `eng/clipack/Aspire.Cli.*`.
 
-By default it builds the cli native project for the current Runtime Identifier. A specific RID can be specified too by setting `$(TargetRid)`.
+By default it builds the cli native project for the current Runtime Identifier. A specific RIDs can be specified too by setting `$(TargetRids)` to a colon separated list like `$(TargetRids) = osx-x64:osx-arm64`.
 
 Native build can be disabled with `$(BuildNative) = false`. And to only the native bits use `$(BuildNativeOnly) = true`.
 

eng/Build.props

@@ -1,19 +1,23 @@
-<Project>
+<Project TreatAsLocalProperty="TargetRids">
   <PropertyGroup>
     <_AspireOnlyBuild Condition="'$(DotNetBuildFromSource)' != 'true' and '$(DotNetBuild)' != 'true'">true</_AspireOnlyBuild>
 
     <BuildNative>true</BuildNative>
 
     <BuildRid>$([System.Runtime.InteropServices.RuntimeInformation]::RuntimeIdentifier)</BuildRid>
-    <TargetRid Condition="'$(TargetRid)' == ''">$(BuildRid)</TargetRid>
+
+    <!-- this property is meant only for CI use. Use a colon separate list of RIDs here, like osx-x64:osx-arm64 .
+         It is helpful to allow building the non-aot cli builds on a single CI job -->
+    <TargetRids Condition="'$(TargetRids)' == ''">$(BuildRid)</TargetRids>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(_AspireOnlyBuild)' == 'true' and '$(BuildNativeOnly)' != 'true'">
     <ProjectToBuild Include="$(RepoRoot)src\**\*.csproj" Exclude="$(RepoRoot)src\Aspire.ProjectTemplates\templates\**\*.csproj" />
     <ProjectToBuild Include="$(RepoRoot)eng\dcppack\**\*.csproj" />
     <ProjectToBuild Include="$(RepoRoot)eng\dashboardpack\**\*.csproj" />
 
-    <ProjectToBuild Condition="'$(BuildNative)' == 'true'" Include="$(RepoRoot)eng\clipack\Aspire.Cli.$(TargetRid).csproj" />
+    <_TargetRidItem Include="$(TargetRids.Split(':'))" />
+    <ProjectToBuild Condition="'$(BuildNative)' == 'true'" Include="@(_TargetRidItem -> '$(RepoRoot)eng\clipack\Aspire.Cli.%(Identity).csproj')" />
 
     <ProjectToBuild Include="$(RepoRoot)playground\**\*.csproj" />
 
@@ -27,7 +31,8 @@
   <ItemGroup Condition="'$(_AspireOnlyBuild)' == 'true' and '$(BuildNativeOnly)' == 'true'">
     <ProjectToBuild Include="$(RepoRoot)src\Aspire.Cli\Aspire.Cli.csproj" />
 
-    <ProjectToBuild Include="$(RepoRoot)eng\clipack\Aspire.Cli.$(TargetRid).csproj" />
+    <_TargetRidItem Include="$(TargetRids.Split(':'))" />
+    <ProjectToBuild Include="@(_TargetRidItem -> '$(RepoRoot)eng\clipack\Aspire.Cli.%(Identity).csproj')" />
   </ItemGroup>
 
   <!-- When building from source, we want to use the live repo contents as opposed to cloning the repo. -->

eng/pipelines/azure-pipelines.yml

@@ -134,8 +134,6 @@ extends:
           agentOs: linux
           targetRidsForSameOS:
             - linux-x64
-            - linux-arm64
-            - linux-musl-x64
           # no need to sign ELF binaries on linux
           codeSign: false
           teamName: $(_TeamName)
@@ -207,7 +205,7 @@ extends:
                 inputs:
                   targetType: 'inline'
                   script: |
-                    Get-ChildItem -Path "$(Build.SourcesDirectory)\artifacts\packages" -File -Recurse | Select-Object -ExpandProperty FullName
+                    Get-ChildItem -Path "$(Build.SourcesDirectory)\artifacts\packages" -File -Recurse | Select-Object FullName, @{Name="Size(MB)";Expression={[math]::Round($_.Length/1MB,2)}} | Format-Table -AutoSize
 
               - template: /eng/pipelines/templates/BuildAndTest.yml
                 parameters:
@@ -218,6 +216,14 @@ extends:
                   repoLogPath: $(Build.Arcade.LogsPath)
                   repoTestResultsPath: $(Build.Arcade.TestResultsPath)
                   isWindows: true
+                  targetRids:
+                    # aot
+                    - win-x64
+                    - win-arm64
+                    # non-aot - single file builds
+                    - win-x86
+                    - linux-arm64
+                    - linux-musl-x64
 
       - ${{ if and(notin(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.SourceBranch'], 'refs/heads/main')) }}:
         - template: /eng/common/templates-official/job/onelocbuild.yml@self

eng/pipelines/templates/BuildAndTest.yml

@@ -16,6 +16,8 @@ parameters:
     type: string
   - name: dotnetScript
     type: string
+  - name: targetRids
+    type: object
   - name: runHelixTests
     type: boolean
     default: false
@@ -38,6 +40,7 @@ steps:
               /bl:${{ parameters.repoLogPath }}/build.binlog
               $(_OfficialBuildIdArgs)
               $(_InternalBuildArgs)
+              /p:TargetRids=${{ join(':', parameters.targetRids) }}
               /p:SkipTestProjects=true
       displayName: 🟣Build
 

eng/pipelines/templates/build_sign_native.yml

@@ -67,7 +67,7 @@ jobs:
               --build
               --restore
               /p:BuildNativeOnly=true
-              /p:TargetRid=${{ targetRid }}
+              /p:TargetRids=${{ targetRid }}
               $(_buildArgs)
               ${{ parameters.extraBuildArgs }}
               /bl:$(Build.Arcade.LogsPath)Build.binlog