From f348738b447d935925ea3ee50c8da7f138e29303 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Alexander=20K=C3=B6plinger?= <alex.koeplinger@outlook.com>
Date: Fri, 12 Feb 2021 16:10:45 +0100
Subject: [PATCH] Only use ninja on Windows for Mono cross AOT compiler build
 (#48218)

* Only use ninja on Windows for Mono cross AOT compiler build

Ninja isn't installed on the CentOS Linux Docker image we're using. This got broken by https://github.com/dotnet/runtime/pull/47589.

* Fix Windows leg
---
 eng/pipelines/runtime-official.yml                 | 22 ++++++++++++++++++++++
 .../Microsoft.NETCore.App.MonoCrossAOT.sfxproj     |  2 +-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/eng/pipelines/runtime-official.yml b/eng/pipelines/runtime-official.yml
index b0c32c1..d190ffb 100644
--- a/eng/pipelines/runtime-official.yml
+++ b/eng/pipelines/runtime-official.yml
@@ -153,6 +153,28 @@ stages:
       buildConfig: release
       platforms:
       - Linux_x64
+      jobParameters:
+        buildArgs: -s mono+packs -c $(_BuildConfig)
+                   /p:MonoCrossAOTTargetOS=Android+Browser /p:SkipMonoCrossJitConfigure=true /p:BuildMonoAOTCrossCompilerOnly=true
+        nameSuffix: CrossAOT_Mono
+        runtimeVariant: crossaot
+        dependsOn:
+        - mono_android_offsets
+        - mono_browser_offsets
+        monoCrossAOTTargetOS:
+        - Android
+        - Browser
+        isOfficialBuild: ${{ variables.isOfficialBuild }}
+        extraStepsTemplate: /eng/pipelines/common/upload-intermediate-artifacts-step.yml
+        extraStepsParameters:
+          name: MonoRuntimePacks
+
+  - template: /eng/pipelines/common/platform-matrix.yml
+    parameters:
+      jobTemplate: /eng/pipelines/common/global-build-job.yml
+      runtimeFlavor: mono
+      buildConfig: release
+      platforms:
       - Windows_x64
       jobParameters:
         buildArgs: -s mono+packs -c $(_BuildConfig)
diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.MonoCrossAOT.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.MonoCrossAOT.sfxproj
index 4dcbba9..613a744 100644
--- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.MonoCrossAOT.sfxproj
+++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.MonoCrossAOT.sfxproj
@@ -8,7 +8,7 @@
     <OverridePackageId>Microsoft.NETCore.App.Runtime.AOT.$(RuntimeIdentifier).Cross.$(TargetCrossRid)</OverridePackageId>
     <ArchiveName>dotnet-monocrossaot</ArchiveName>
     <SharedFrameworkHostFileNameOverride>monocrossaot</SharedFrameworkHostFileNameOverride>
-    <RuntimeIdentifiers>linux-x64;osx-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>linux-x64;osx-x64;win-x64</RuntimeIdentifiers>
     <GenerateInstallers>false</GenerateInstallers>
     <PublishReadyToRun>false</PublishReadyToRun>
     <HostJsonTargetPath>tools/</HostJsonTargetPath>
-- 
2.7.4