From 61d5ba6e3c02fc776f4b80e1f2c196d6ec0f2d1d Mon Sep 17 00:00:00 2001
From: Milos Kotlar <kotlarmilos@gmail.com>
Date: Mon, 27 Jan 2025 11:41:08 +0100
Subject: [PATCH 1/3] Include android runtime packs in the
 NetCoreRuntimePackRids

---
 .../targets/GenerateBundledVersions.targets               | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Installer/redist-installer/targets/GenerateBundledVersions.targets b/src/Installer/redist-installer/targets/GenerateBundledVersions.targets
index 3d0600418a92..a2ad605cedea 100644
--- a/src/Installer/redist-installer/targets/GenerateBundledVersions.targets
+++ b/src/Installer/redist-installer/targets/GenerateBundledVersions.targets
@@ -239,9 +239,15 @@
         linux-musl-loongarch64;
         " />
 
+      <Net10RuntimePackRids Include="
+        @(Net80RuntimePackRids);
+        android-arm64;
+        android-x64;
+        " />
+
       <NetCoreAppHostRids Include="@(Net90AppHostRids)" />
 
-      <NetCoreRuntimePackRids Include="@(Net90RuntimePackRids)" />
+      <NetCoreRuntimePackRids Include="@(Net10RuntimePackRids)" />
 
       <!--
         In source-only builds, we build the current RID from source, which may be

From 6908c8564499a14a03680d4222a8b4de5e240cbd Mon Sep 17 00:00:00 2001
From: Milos Kotlar <kotlarmilos@gmail.com>
Date: Mon, 27 Jan 2025 11:49:17 +0100
Subject: [PATCH 2/3] Fix dotnet version

---
 .../redist-installer/targets/GenerateBundledVersions.targets    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Installer/redist-installer/targets/GenerateBundledVersions.targets b/src/Installer/redist-installer/targets/GenerateBundledVersions.targets
index a2ad605cedea..7817463e95ed 100644
--- a/src/Installer/redist-installer/targets/GenerateBundledVersions.targets
+++ b/src/Installer/redist-installer/targets/GenerateBundledVersions.targets
@@ -240,7 +240,7 @@
         " />
 
       <Net10RuntimePackRids Include="
-        @(Net80RuntimePackRids);
+        @(Net90RuntimePackRids);
         android-arm64;
         android-x64;
         " />

From ede7218a0e9a7e386c4c1629c198b777d33aa0a0 Mon Sep 17 00:00:00 2001
From: Milos Kotlar <kotlarmilos@gmail.com>
Date: Mon, 27 Jan 2025 12:12:47 +0100
Subject: [PATCH 3/3] Fix dotnet version

---
 .../redist-installer/targets/GenerateBundledVersions.targets  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Installer/redist-installer/targets/GenerateBundledVersions.targets b/src/Installer/redist-installer/targets/GenerateBundledVersions.targets
index 7817463e95ed..bdd03fe54465 100644
--- a/src/Installer/redist-installer/targets/GenerateBundledVersions.targets
+++ b/src/Installer/redist-installer/targets/GenerateBundledVersions.targets
@@ -239,7 +239,7 @@
         linux-musl-loongarch64;
         " />
 
-      <Net10RuntimePackRids Include="
+      <Net100RuntimePackRids Include="
         @(Net90RuntimePackRids);
         android-arm64;
         android-x64;
@@ -247,7 +247,7 @@
 
       <NetCoreAppHostRids Include="@(Net90AppHostRids)" />
 
-      <NetCoreRuntimePackRids Include="@(Net10RuntimePackRids)" />
+      <NetCoreRuntimePackRids Include="@(Net100RuntimePackRids)" />
 
       <!--
         In source-only builds, we build the current RID from source, which may be