dotnet · janvorli · Oct 8, 2020 · Sep 29, 2020 · Oct 5, 2020
diff --git a/eng/Subsets.props b/eng/Subsets.props
@@ -85,7 +85,7 @@
     <SubsetName Include="Clr.Tools" Description="Managed tools that support CoreCLR development and testing." />
     <SubsetName Include="Clr.Packages" Description="The projects that produce NuGet packages for the CoreCLR runtime, crossgen, and IL tools." />
     <SubsetName Include="LinuxDac" Condition="$([MSBuild]::IsOsPlatform(Windows))" Description="The cross-OS Windows->libc-based Linux DAC. Skipped on x86." />
-    <SubsetName Include="AlpineDac" Condition="$([MSBuild]::IsOsPlatform(Windows))" OnDemand="true" Description="The cross-OS Windows->musl-libc-based Linux DAC. Skipped on x86 and arm." />
+    <SubsetName Include="AlpineDac" Condition="$([MSBuild]::IsOsPlatform(Windows))" OnDemand="true" Description="The cross-OS Windows->musl-libc-based Linux DAC. Skipped on x86." />
     <SubsetName Include="CrossDacPack" OnDemand="true"
             Description="Packaging of cross OS DAC. Requires all assets needed to be present at a folder specified by $(CrossDacArtifactsDir). See 'Microsoft.CrossOsDiag.Private.CoreCLR.proj' for details." />
 
@@ -140,7 +140,7 @@
     <ProjectToBuild Include="$(CoreClrProjectRoot)runtime.proj" AdditionalProperties="%(AdditionalProperties);CrossDac=linux" Category="clr" />
   </ItemGroup>
 
-  <ItemGroup Condition="$(_subset.Contains('+alpinedac+')) and $([MSBuild]::IsOsPlatform(Windows)) and '$(TargetArchitecture)' != 'x86' and '$(TargetArchitecture)' != 'arm'">
+  <ItemGroup Condition="$(_subset.Contains('+alpinedac+')) and $([MSBuild]::IsOsPlatform(Windows)) and '$(TargetArchitecture)' != 'x86'">
     <ProjectToBuild Include="$(CoreClrProjectRoot)runtime.proj" AdditionalProperties="%(AdditionalProperties);CrossDac=alpine" Category="clr" />
   </ItemGroup>
 

diff --git a/eng/pipelines/common/platform-matrix.yml b/eng/pipelines/common/platform-matrix.yml
@@ -97,6 +97,31 @@ jobs:
         helixQueueGroup: ${{ parameters.helixQueueGroup }}
         ${{ insert }}: ${{ parameters.jobParameters }}
 
+# Linux musl arm
+
+- ${{ if or(containsValue(parameters.platforms, 'Linux_musl_arm'), eq(parameters.platformGroup, 'all')) }}:
+  - template: xplat-setup.yml
+    parameters:
+      jobTemplate: ${{ parameters.jobTemplate }}
+      helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
+      variables: ${{ parameters.variables }}
+      osGroup: Linux
+      osSubgroup: _musl
+      archType: arm
+      platform: Linux_musl_arm
+      container:
+        image: ubuntu-18.04-cross-arm-alpine-20200818211451-14441ae
+        registry: mcr
+      jobParameters:
+        runtimeFlavor: ${{ parameters.runtimeFlavor }}
+        stagedBuild: ${{ parameters.stagedBuild }}
+        buildConfig: ${{ parameters.buildConfig }}
+        ${{ if eq(parameters.passPlatforms, true) }}:
+          platforms: ${{ parameters.platforms }}
+        helixQueueGroup: ${{ parameters.helixQueueGroup }}
+        crossrootfsDir: '/crossrootfs/arm'
+        ${{ insert }}: ${{ parameters.jobParameters }}
+
 # Linux musl arm64
 
 - ${{ if or(containsValue(parameters.platforms, 'Linux_musl_arm64'), eq(parameters.platformGroup, 'all')) }}:

diff --git a/eng/pipelines/coreclr/templates/crossdac-build.yml b/eng/pipelines/coreclr/templates/crossdac-build.yml
@@ -14,7 +14,7 @@ steps:
     # Make the assets available in a single container for the packaging job.
     - ${{ if and(ne(variables['System.TeamProject'], 'public'), ne(variables['Build.Reason'], 'PullRequest')) }}:
       - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
-        - ${{ if notin(parameters.archType, 'x86', 'arm') }}:
+        - ${{ if notin(parameters.archType, 'x86') }}:
           - script: set __TestIntermediateDir=int&&$(Build.SourcesDirectory)/src/coreclr/build-runtime$(scriptExt) $(buildConfig) $(archType) -ci -alpinedac $(officialBuildIdArg)
             displayName: Build Cross OS Linux-musl DAC for Windows
 
@@ -27,15 +27,14 @@ steps:
               !**/sharedFramework/**/*
             TargetFolder: $(buildLinuxDacStagingPath)
 
-        - ${{ if ne(parameters.archType, 'arm') }}:
-          - task: CopyFiles@2
-            displayName: Gather CrossDac Artifacts (Linux_musl)
-            inputs:
-              SourceFolder: $(buildMuslDacRootFolderPath)
-              Contents: |
-                **/*
-                !**/sharedFramework/**/*
-              TargetFolder: '$(buildMuslDacStagingPath)'
+        - task: CopyFiles@2
+          displayName: Gather CrossDac Artifacts (Linux_musl)
+          inputs:
+            SourceFolder: $(buildMuslDacRootFolderPath)
+            Contents: |
+              **/*
+              !**/sharedFramework/**/*
+            TargetFolder: '$(buildMuslDacStagingPath)'
 
       - ${{ if eq(parameters.osGroup, 'Linux') }}:
         - task: CopyFiles@2

diff --git a/eng/pipelines/coreclr/templates/helix-queues-setup.yml b/eng/pipelines/coreclr/templates/helix-queues-setup.yml
@@ -47,6 +47,14 @@ jobs:
       - ${{ if eq(variables['System.TeamProject'], 'internal') }}:
         - (Alpine.312.Amd64)ubuntu.1604.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.12-helix-20200602002622-e06dc59
 
+    # Linux musl arm32
+    # Temporarily disabled until packages for musl-arm32 is available
+    #- ${{ if eq(parameters.platform, 'Linux_musl_arm') }}:
+    #  - ${{ if eq(variables['System.TeamProject'], 'public') }}:
+    #    - (Alpine.312.Arm32.Open)Ubuntu.1804.ArmArch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.12-helix-arm32v7-20200908125213-5bece88
+    #  - ${{ if eq(variables['System.TeamProject'], 'internal') }}:
+    #    - (Alpine.312.Arm32)Ubuntu.1804.ArmArch@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.12-helix-arm32v7-20200908125213-5bece88
+
     # Linux musl arm64
     - ${{ if eq(parameters.platform, 'Linux_musl_arm64') }}:
       - ${{ if eq(variables['System.TeamProject'], 'public') }}:

diff --git a/eng/pipelines/runtime-official.yml b/eng/pipelines/runtime-official.yml
@@ -54,6 +54,7 @@ stages:
       - Linux_arm
       - Linux_arm64
       - Linux_musl_x64
+      - Linux_musl_arm
       - Linux_musl_arm64
       - Windows_NT_x86
       - Windows_NT_x64
@@ -75,6 +76,7 @@ stages:
         - Linux_arm
         - Linux_arm64
         - Linux_musl_x64
+        - Linux_musl_arm
         - Linux_musl_arm64
         - Windows_NT_x64
         - Windows_NT_arm
@@ -104,6 +106,7 @@ stages:
       - Linux_arm64
       - Linux_musl_x64
       - Browser_wasm
+      # - Linux_musl_arm
       # - Linux_musl_arm64
       # - Windows_NT_x64 enable once coreclr.dll has a version header: https://github.com/dotnet/runtime/issues/37503
       # - Windows_NT_x86
@@ -174,6 +177,7 @@ stages:
       - Linux_arm
       - Linux_arm64
       - Linux_musl_x64
+      - Linux_musl_arm
       - Linux_musl_arm64
       - Windows_NT_x86
       - Windows_NT_x64
@@ -215,6 +219,7 @@ stages:
       - Linux_arm
       - Linux_arm64
       - Linux_musl_x64
+      - Linux_musl_arm
       - Linux_musl_arm64
       - Windows_NT_x86
       - Windows_NT_x64

diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml
@@ -142,6 +142,7 @@ jobs:
     - Linux_x64
     - Linux_arm
     - Linux_arm64
+    - Linux_musl_arm
     - Linux_musl_arm64
     - Linux_musl_x64
     - Windows_NT_x86
@@ -207,6 +208,7 @@ jobs:
     - Linux_arm
     - Linux_arm64
     - Linux_musl_x64
+    - Linux_musl_arm
     - Linux_musl_arm64
     - Windows_NT_x64
     - Windows_NT_x86
@@ -523,6 +525,7 @@ jobs:
     buildConfig: Release
     platforms:
     - Linux_arm
+    - Linux_musl_arm
     - Linux_musl_arm64
     - Windows_NT_arm
     - Windows_NT_arm64
@@ -611,6 +614,7 @@ jobs:
     buildConfig: ${{ variables.debugOnPrReleaseOnRolling }}
     platforms:
       - Linux_arm
+      - Linux_musl_arm
       - Linux_musl_arm64
       - Windows_NT_x86
       - Windows_NT_arm

diff --git a/src/coreclr/src/.nuget/Directory.Build.props b/src/coreclr/src/.nuget/Directory.Build.props
@@ -166,6 +166,9 @@
     <OfficialBuildRID Include="linux-arm">
       <Platform>arm</Platform>
     </OfficialBuildRID>
+    <OfficialBuildRID Include="linux-musl-arm">
+      <Platform>arm</Platform>
+    </OfficialBuildRID>
     <OfficialBuildRID Include="linux-arm64">
       <Platform>arm64</Platform>
     </OfficialBuildRID>

diff --git a/...c/.nuget/Microsoft.CrossOsDiag.Private.CoreCLR/Microsoft.CrossOsDiag.Private.CoreCLR.proj b/...c/.nuget/Microsoft.CrossOsDiag.Private.CoreCLR/Microsoft.CrossOsDiag.Private.CoreCLR.proj
@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <BuildIdentityPackage>false</BuildIdentityPackage>
-    <SupportedRids>linux-x64;linux-musl-x64;linux-arm64;linux-musl-arm64;linux-arm;</SupportedRids>
+    <SupportedRids>linux-x64;linux-musl-x64;linux-arm64;linux-musl-arm64;linux-arm;linux-musl-arm</SupportedRids>
   </PropertyGroup>
 
   <Target Name="VerifyCrossDacProperties" BeforeTargets="Build">
@@ -19,6 +19,7 @@
         <AdditionalProperties Condition="'%(Project.PackageTargetRuntime)' == 'linux-arm64'">%(AdditionalProperties);CrossDacBinRoot=$(CrossDacArtifactsDir)/Linux.arm64.$(Configuration)/x64</AdditionalProperties>
         <AdditionalProperties Condition="'%(Project.PackageTargetRuntime)' == 'linux-musl-arm64'">%(AdditionalProperties);CrossDacBinRoot=$(CrossDacArtifactsDir)/Linux_musl.arm64.$(Configuration)/x64</AdditionalProperties>
         <AdditionalProperties Condition="'%(Project.PackageTargetRuntime)' == 'linux-arm'">%(AdditionalProperties);CrossDacBinRoot=$(CrossDacArtifactsDir)/Linux.arm.$(Configuration)/x86</AdditionalProperties>
+        <AdditionalProperties Condition="'%(Project.PackageTargetRuntime)' == 'linux-musl-arm'">%(AdditionalProperties);CrossDacBinRoot=$(CrossDacArtifactsDir)/Linux_musl.arm.$(Configuration)/x86</AdditionalProperties>
       </_projectsToBuild>
     </ItemGroup>
 

diff --git a/src/installer/pkg/projects/netcoreappRIDs.props b/src/installer/pkg/projects/netcoreappRIDs.props
@@ -30,6 +30,9 @@
     <OfficialBuildRID Include="linux-arm64">
       <Platform>arm64</Platform>
     </OfficialBuildRID>
+    <OfficialBuildRID Include="linux-musl-arm">
+      <Platform>arm</Platform>
+    </OfficialBuildRID>
     <OfficialBuildRID Include="linux-musl-arm64">
       <Platform>arm64</Platform>
     </OfficialBuildRID>