From b75e498821e9d295e03521fb87bb08277245ff68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= <alex.koeplinger@outlook.com>
Date: Tue, 13 Apr 2021 20:06:02 +0200
Subject: [PATCH] Add KnownRuntimePack entries for Mono-based runtime packs

We need this now that we changed the name of the Mono-based runtime packs.

See https://github.com/dotnet/sdk/pull/11824 for the design.

Fixes https://github.com/dotnet/sdk/issues/11227
---
 .../targets/GenerateBundledVersions.targets   | 26 ++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets
index 43e65f87f..6d572f780 100644
--- a/src/redist/targets/GenerateBundledVersions.targets
+++ b/src/redist/targets/GenerateBundledVersions.targets
@@ -105,6 +105,17 @@
 
       <Net50RuntimePackRids Include="
           @(Net50AppHostRids);
+          browser-wasm;
+          " />
+
+      <Net60AppHostRids Include="
+          @(Net50AppHostRids);
+          osx-arm64;
+          "/>
+
+      <Net60RuntimePackRids Include="
+          @(Net50RuntimePackRids);
+          osx-arm64;
           ios-arm64;
           ios-arm;
           iossimulator-arm64;
@@ -119,11 +130,10 @@
           android-arm;
           android-x64;
           android-x86;
-          browser-wasm;
           " />
 
-      <NetCoreAppHostRids Include="@(Net50AppHostRids);osx-arm64" />
-      <NetCoreRuntimePackRids Include="@(Net50RuntimePackRids);osx-arm64" />
+      <NetCoreAppHostRids Include="@(Net60AppHostRids)" />
+      <NetCoreRuntimePackRids Include="@(Net60RuntimePackRids)" />
 
       <AspNetCore30RuntimePackRids Include="
         win-x64;
@@ -269,6 +279,16 @@ Copyright (c) .NET Foundation. All rights reserved.
                         Crossgen2RuntimeIdentifiers="@(Crossgen2SupportedRids, '%3B')"
                         />
 
+    <KnownRuntimePack Include="Microsoft.NETCore.App"
+                      TargetFramework="net6.0"
+                      RuntimeFrameworkName="Microsoft.NETCore.App"
+                      LatestRuntimeFrameworkVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)"
+                      RuntimePackNamePatterns="Microsoft.NETCore.App.Runtime.Mono.**RID**"
+                      RuntimePackRuntimeIdentifiers="@(NetCoreRuntimePackRids, '%3B')"
+                      RuntimePackLabels="Mono"
+                      IsTrimmable="true"
+                      />
+
     <KnownFrameworkReference Include="Microsoft.WindowsDesktop.App"
                               TargetFramework="net6.0"
                               RuntimeFrameworkName="Microsoft.WindowsDesktop.App"