From c0f4c586c23d65d9c8fad4bd074fbbf0b25ae84c Mon Sep 17 00:00:00 2001
From: Tom Deseyn <tom.deseyn@gmail.com>
Date: Wed, 6 Mar 2024 13:18:13 +0100
Subject: [PATCH] Add product rid to ILCompiler rids when bundling ILCompiler
 with the SDK. (#18835)

---
 src/redist/redist.csproj                           | 1 +
 src/redist/targets/GenerateBundledVersions.targets | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj
index 8006710cd..b0335d8c3 100644
--- a/src/redist/redist.csproj
+++ b/src/redist/redist.csproj
@@ -7,6 +7,7 @@
     <ResolveAssemblyReferencesSilent>true</ResolveAssemblyReferencesSilent>
     <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>none</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
     <BundleRuntimePacks Condition="'$(BundleRuntimePacks)' == '' and '$(DotNetBuildSourceOnly)' == 'true'">true</BundleRuntimePacks>
+    <BundleNativeAotCompiler Condition="'$(BundleNativeAotCompiler)' == '' and '$(DotNetBuildSourceOnly)' == 'true' and '$(SourceBuildUseMonoRuntime)' != 'true'">true</BundleNativeAotCompiler>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets
index bd36c5e06..6130b5eb8 100644
--- a/src/redist/targets/GenerateBundledVersions.targets
+++ b/src/redist/targets/GenerateBundledVersions.targets
@@ -266,6 +266,10 @@
         Condition="'$(BundleRuntimePacks)' == 'true'"
         Include="$(ProductMonikerRid)" />
 
+      <ILCompilerSupportedRids
+        Condition="'$(BundleNativeAotCompiler)' == 'true'"
+        Include="$(ProductMonikerRid)" />
+
       <Net60MonoRuntimePackRids Include="
           @(Net60RuntimePackRids);
           browser-wasm;