From 16d9722484ed92c32e887d285aaef104b72637f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= <alex.koeplinger@outlook.com>
Date: Thu, 27 Apr 2023 17:01:03 +0200
Subject: [PATCH] Create KnownRuntimePack entries for NativeAOT

Contributes to https://github.com/dotnet/runtime/issues/81024
---
 .../targets/GenerateBundledVersions.targets   | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets
index 101101712592..f1314ce0642e 100644
--- a/src/redist/targets/GenerateBundledVersions.targets
+++ b/src/redist/targets/GenerateBundledVersions.targets
@@ -263,6 +263,18 @@
       <!-- Match the Crossgen2 RIDs although some are currently not supported in NativeAOT. Its better for the SDK not to block on the RIDs and let NativeAOT manage the experience -->
       <ILCompilerSupportedRids Include="@(Net60Crossgen2SupportedRids)" />
 
+      <NativeAOTRuntimePackRids Include="
+          ios-arm64;
+          iossimulator-arm64;
+          iossimulator-x64;
+          tvos-arm64;
+          tvossimulator-arm64;
+          tvossimulator-x64;
+          maccatalyst-arm64;
+          maccatalyst-x64;
+          "
+          />
+
       <AspNetCore31RuntimePackRids Include="@(AspNetCore30RuntimePackRids)" />
       <AspNetCore50RuntimePackRids Include="@(AspNetCore31RuntimePackRids);linux-musl-arm;win-arm64" />
       <AspNetCore60RuntimePackRids Include="@(AspNetCore50RuntimePackRids);osx-arm64;linux-s390x" />
@@ -403,6 +415,15 @@ Copyright (c) .NET Foundation. All rights reserved.
                          ILCompilerRuntimeIdentifiers="@(ILCompilerSupportedRids, '%3B')"
                          />
 
+    <KnownRuntimePack Include="Microsoft.NETCore.App"
+                      TargetFramework="net8.0"
+                      RuntimeFrameworkName="Microsoft.NETCore.App"
+                      LatestRuntimeFrameworkVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)"
+                      RuntimePackNamePatterns="Microsoft.NETCore.App.Runtime.NativeAOT.**RID**"
+                      RuntimePackRuntimeIdentifiers="@(NativeAOTRuntimePackRids, '%3B')"
+                      RuntimePackLabels="NativeAOT"
+                      />
+
     <KnownILLinkPack Include="Microsoft.NET.ILLink.Tasks"
                      TargetFramework="net8.0"
                      ILLinkPackVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)" />