[VMR] Light up basic ARM32/ARM64 lanes (#18883)

dotnet · Apr 4, 2024 · 51def0d · 51def0d
1 parent b79e19a
commit 51def0d
Show file tree

Hide file tree

Showing 6 changed files with 91 additions and 13 deletions.
diff --git a/eng/pipelines/templates/stages/vmr-build.yml b/eng/pipelines/templates/stages/vmr-build.yml
@@ -700,19 +700,55 @@ stages:
             targetOS: linux
             targetArchitecture: x64
 
-      # Mariner x64->non-x64 builds are currently broken, see https://github.com/dotnet/source-build/issues/3698
-
-      # - template: ../jobs/vmr-build.yml
-      #   parameters:
-      #     buildName: Mariner_x64_Cross
-      #     isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
-      #     vmrBranch: ${{ variables.VmrBranch }}
-      #     architecture: arm64
-      #     pool: ${{ parameters.pool_Linux }}
-      #     container: ${{ variables.marinerArm64CrossContainer }}
-      #     crossRootFs: '/crossrootfs/arm64'
-      #     targetOS: linux
-      #     targetArchitecture: arm64
+        - template: ../jobs/vmr-build.yml
+          parameters:
+            buildName: Mariner_x64_Cross
+            isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
+            vmrBranch: ${{ variables.VmrBranch }}
+            architecture: arm
+            pool: ${{ parameters.pool_Linux }}
+            container: ${{ variables.marinerArmCrossContainer }}
+            crossRootFs: '/crossrootfs/arm'
+            targetOS: linux
+            targetArchitecture: arm
+
+        - template: ../jobs/vmr-build.yml
+          parameters:
+            buildName: Mariner_x64_Cross_Mono
+            isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
+            vmrBranch: ${{ variables.VmrBranch }}
+            architecture: arm
+            pool: ${{ parameters.pool_Linux }}
+            container: ${{ variables.marinerArmCrossContainer }}
+            crossRootFs: '/crossrootfs/arm'
+            useMonoRuntime: true
+            targetOS: linux
+            targetArchitecture: arm
+
+        - template: ../jobs/vmr-build.yml
+          parameters:
+            buildName: Mariner_x64_Cross
+            isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
+            vmrBranch: ${{ variables.VmrBranch }}
+            architecture: arm64
+            pool: ${{ parameters.pool_Linux }}
+            container: ${{ variables.marinerArm64CrossContainer }}
+            crossRootFs: '/crossrootfs/arm64'
+            targetOS: linux
+            targetArchitecture: arm64
+
+        - template: ../jobs/vmr-build.yml
+          parameters:
+            buildName: Mariner_x64_Cross_Mono
+            isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
+            vmrBranch: ${{ variables.VmrBranch }}
+            architecture: arm64
+            pool: ${{ parameters.pool_Linux }}
+            container: ${{ variables.marinerArm64CrossContainer }}
+            crossRootFs: '/crossrootfs/arm64'
+            useMonoRuntime: true
+            targetOS: linux
+            targetArchitecture: arm64
 
         - template: ../jobs/vmr-build.yml
           parameters:

diff --git a/eng/pipelines/templates/variables/vmr-build.yml b/eng/pipelines/templates/variables/vmr-build.yml
@@ -24,6 +24,8 @@ variables:
   value: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-arm64
 - name: marinerX64CrossContainer
   value: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-amd64
+- name: marinerArmCrossContainer
+  value: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm
 - name: marinerArm64CrossContainer
   value: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm64
 - name: androidCrossContainer

diff --git a/...oft.DotNet.UnifiedBuild.Tests/assets/baselines/MsftToUbSdkAssemblyVersions-linux-arm.diff b/...oft.DotNet.UnifiedBuild.Tests/assets/baselines/MsftToUbSdkAssemblyVersions-linux-arm.diff
diff --git a/...t.DotNet.UnifiedBuild.Tests/assets/baselines/MsftToUbSdkAssemblyVersions-linux-arm64.diff b/...t.DotNet.UnifiedBuild.Tests/assets/baselines/MsftToUbSdkAssemblyVersions-linux-arm64.diff
diff --git a/...test/Microsoft.DotNet.UnifiedBuild.Tests/assets/baselines/MsftToUbSdkFiles-linux-arm.diff b/...test/Microsoft.DotNet.UnifiedBuild.Tests/assets/baselines/MsftToUbSdkFiles-linux-arm.diff
@@ -0,0 +1,20 @@
+diff --git a/msftSdkFiles.txt b/ubSdkFiles.txt
+index ------------
+--- a/msftSdkFiles.txt
++++ b/ubSdkFiles.txt
+@@ ------------ @@
+ ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/
+ ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/
+ ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.dll
++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.Messages.dll
+ ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Security.Cryptography.Pkcs.dll
+ ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Windows.Extensions.dll
+ ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.CodeDom.dll
+@@ ------------ @@
+ ./sdk/x.y.z/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.dll
+ ./sdk/x.y.z/Microsoft.NET.StringTools.dll
+ ./sdk/x.y.z/Microsoft.NETCoreSdk.BundledCliTools.props
+-./sdk/x.y.z/Microsoft.NETCoreSdk.BundledMSBuildInformation.props
+ ./sdk/x.y.z/Microsoft.NETCoreSdk.BundledVersions.props
+ ./sdk/x.y.z/Microsoft.NETFramework.CurrentVersion.props
+ ./sdk/x.y.z/Microsoft.NETFramework.CurrentVersion.targets
diff --git a/...st/Microsoft.DotNet.UnifiedBuild.Tests/assets/baselines/MsftToUbSdkFiles-linux-arm64.diff b/...st/Microsoft.DotNet.UnifiedBuild.Tests/assets/baselines/MsftToUbSdkFiles-linux-arm64.diff
@@ -0,0 +1,20 @@
+diff --git a/msftSdkFiles.txt b/ubSdkFiles.txt
+index ------------
+--- a/msftSdkFiles.txt
++++ b/ubSdkFiles.txt
+@@ ------------ @@
+ ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/
+ ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/
+ ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.dll
++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.Messages.dll
+ ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Security.Cryptography.Pkcs.dll
+ ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Windows.Extensions.dll
+ ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.CodeDom.dll
+@@ ------------ @@
+ ./sdk/x.y.z/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.dll
+ ./sdk/x.y.z/Microsoft.NET.StringTools.dll
+ ./sdk/x.y.z/Microsoft.NETCoreSdk.BundledCliTools.props
+-./sdk/x.y.z/Microsoft.NETCoreSdk.BundledMSBuildInformation.props
+ ./sdk/x.y.z/Microsoft.NETCoreSdk.BundledVersions.props
+ ./sdk/x.y.z/Microsoft.NETFramework.CurrentVersion.props
+ ./sdk/x.y.z/Microsoft.NETFramework.CurrentVersion.targets