From be57cb9130b2d7ad0e6dc8744b035cbdbc954679 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= <alex.koeplinger@outlook.com>
Date: Thu, 15 Apr 2021 10:22:30 +0200
Subject: [PATCH] Improve GenerateBundledVersions.targets to include only
 existing RIDs in KnownFrameworkReference (#10222)

Move the Mono-only rids to the KnownRuntimePack.
---
 .../targets/GenerateBundledVersions.targets   | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets
index 89198ab3d..a2c9881e3 100644
--- a/src/redist/targets/GenerateBundledVersions.targets
+++ b/src/redist/targets/GenerateBundledVersions.targets
@@ -114,6 +114,19 @@
       <Net60RuntimePackRids Include="
           @(Net50RuntimePackRids);
           osx-arm64;
+          maccatalyst-x64;
+          maccatalyst-arm64;
+          " />
+
+      <!-- In .NET 6 the browser-wasm runtime pack started using the Mono naming pattern -->
+      <Net60RuntimePackRids Remove="browser-wasm" />
+
+      <NetCoreAppHostRids Include="@(Net60AppHostRids)" />
+      <NetCoreRuntimePackRids Include="@(Net60RuntimePackRids)" />
+
+      <MonoRuntimePackRids Include="
+          @(NetCoreRuntimePackRids);
+          browser-wasm;
           ios-arm64;
           ios-arm;
           iossimulator-arm64;
@@ -122,16 +135,14 @@
           tvos-arm64;
           tvossimulator-arm64;
           tvossimulator-x64;
-          maccatalyst-x64;
-          maccatalyst-arm64;
           android-arm64;
           android-arm;
           android-x64;
           android-x86;
           " />
 
-      <NetCoreAppHostRids Include="@(Net60AppHostRids)" />
-      <NetCoreRuntimePackRids Include="@(Net60RuntimePackRids)" />
+      <!-- Mono doesn't support these RIDs -->
+      <MonoRuntimePackRids Remove="tizen.4.0.0-armel;tizen.5.0.0-armel" />
 
       <AspNetCore30RuntimePackRids Include="
         win-x64;
@@ -282,7 +293,7 @@ Copyright (c) .NET Foundation. All rights reserved.
                       RuntimeFrameworkName="Microsoft.NETCore.App"
                       LatestRuntimeFrameworkVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)"
                       RuntimePackNamePatterns="Microsoft.NETCore.App.Runtime.Mono.**RID**"
-                      RuntimePackRuntimeIdentifiers="@(NetCoreRuntimePackRids, '%3B')"
+                      RuntimePackRuntimeIdentifiers="@(MonoRuntimePackRids, '%3B')"
                       RuntimePackLabels="Mono"
                       IsTrimmable="true"
                       />