From 3f45311d065bab2952577c4ee58bfbac50243d18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= <alex.koeplinger@outlook.com>
Date: Tue, 4 May 2021 16:36:09 +0200
Subject: [PATCH 1/2] Download Mono AOT workload .nupkg in
 prepare-artifacts.proj

Fixes the official build failure since the pattern we were using didn't include it.
---
 src/installer/prepare-artifacts.proj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/installer/prepare-artifacts.proj b/src/installer/prepare-artifacts.proj
index a5a67203cc5401..9ec33b8608fffd 100644
--- a/src/installer/prepare-artifacts.proj
+++ b/src/installer/prepare-artifacts.proj
@@ -191,6 +191,7 @@
       <!-- RID-specific framework packs. -->
       <RuntimeNupkgFile
         Include="
+          $(DownloadDirectory)**\Microsoft.NET.Sdk.Mono.Toolchain.Manifest.*.nupkg;
           $(DownloadDirectory)**\Microsoft.*.Runtime.*.nupkg;
           $(DownloadDirectory)**\Microsoft.*.App.Host.*.nupkg;
           $(DownloadDirectory)**\Microsoft.*.App.Crossgen2.*.nupkg"

From a5c4b3c9c855c18d0e79217b29b59c234162047c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= <alex.koeplinger@outlook.com>
Date: Tue, 4 May 2021 18:02:50 +0200
Subject: [PATCH 2/2] PR feedback

---
 src/installer/prepare-artifacts.proj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/installer/prepare-artifacts.proj b/src/installer/prepare-artifacts.proj
index 9ec33b8608fffd..f9651cb7948f78 100644
--- a/src/installer/prepare-artifacts.proj
+++ b/src/installer/prepare-artifacts.proj
@@ -191,7 +191,6 @@
       <!-- RID-specific framework packs. -->
       <RuntimeNupkgFile
         Include="
-          $(DownloadDirectory)**\Microsoft.NET.Sdk.Mono.Toolchain.Manifest.*.nupkg;
           $(DownloadDirectory)**\Microsoft.*.Runtime.*.nupkg;
           $(DownloadDirectory)**\Microsoft.*.App.Host.*.nupkg;
           $(DownloadDirectory)**\Microsoft.*.App.Crossgen2.*.nupkg"
@@ -219,6 +218,7 @@
       -->
       <RidAgnosticNupkgToPublishFile
         Include="
+          $(DownloadDirectory)**\Microsoft.NET.Sdk.Mono.Toolchain.Manifest.*.nupkg;
           $(DownloadDirectory)*\$(PublishRidAgnosticPackagesFromPlatform)\**\*.nupkg;
           $(DownloadDirectory)*\*AllConfigurations\**\*.nupkg"
         Exclude="@(RuntimeNupkgFile);@(DownloadedSymbolNupkgFile)" />