From a636aa3956b3f9ff34aeac67569dfffdf7f68008 Mon Sep 17 00:00:00 2001
From: Milos Kotlar <kotlarmilos@gmail.com>
Date: Thu, 23 Oct 2025 12:03:35 +0200
Subject: [PATCH 1/2] Add iOS and tvOS runtime identifiers to
 Net110RuntimePackRids

---
 .../targets/GenerateBundledVersions.targets    | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/Layout/redist/targets/GenerateBundledVersions.targets b/src/Layout/redist/targets/GenerateBundledVersions.targets
index b11b330a3539..e232156942bd 100644
--- a/src/Layout/redist/targets/GenerateBundledVersions.targets
+++ b/src/Layout/redist/targets/GenerateBundledVersions.targets
@@ -252,9 +252,23 @@
         android-x64;
         " />
 
+      <Net110RuntimePackRids Include="
+        @(Net100RuntimePackRids);
+        ios-arm64;
+        ios-arm;
+        iossimulator-arm64;
+        iossimulator-x64;
+        iossimulator-x86;
+        tvos-arm64;
+        tvossimulator-arm64;
+        tvossimulator-x64;
+        maccatalyst-x64;
+        maccatalyst-arm64;
+        " />
+
       <NetCoreAppHostRids Include="@(Net90AppHostRids)" />
 
-      <NetCoreRuntimePackRids Include="@(Net100RuntimePackRids)" />
+      <NetCoreRuntimePackRids Include="@(Net110RuntimePackRids)" />
 
       <!--
         In source-only builds, we build the current RID from source, which may be
@@ -692,7 +706,7 @@ Copyright (c) .NET Foundation. All rights reserved.
                               TargetingPackName="Microsoft.NETCore.App.Ref"
                               TargetingPackVersion="$(MicrosoftNETCoreAppRefPackageVersion)"
                               RuntimePackNamePatterns="Microsoft.NETCore.App.Runtime.**RID**"
-                              RuntimePackRuntimeIdentifiers="@(NetCoreRuntimePackRids, '%3B')"
+                              RuntimePackRuntimeIdentifiers="@(Net100RuntimePackRids, '%3B')"
                               />
 
     <KnownAppHostPack Include="Microsoft.NETCore.App"

From e6f95ed5429cf715f9918d7f8df75a39c9ad0244 Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Mon, 27 Oct 2025 11:52:30 +0100
Subject: [PATCH 2/2] Remove 32-bit architectures

---
 src/Layout/redist/targets/GenerateBundledVersions.targets | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Layout/redist/targets/GenerateBundledVersions.targets b/src/Layout/redist/targets/GenerateBundledVersions.targets
index e232156942bd..d7930e4ad125 100644
--- a/src/Layout/redist/targets/GenerateBundledVersions.targets
+++ b/src/Layout/redist/targets/GenerateBundledVersions.targets
@@ -255,10 +255,8 @@
       <Net110RuntimePackRids Include="
         @(Net100RuntimePackRids);
         ios-arm64;
-        ios-arm;
         iossimulator-arm64;
         iossimulator-x64;
-        iossimulator-x86;
         tvos-arm64;
         tvossimulator-arm64;
         tvossimulator-x64;