From 369812ef8e8257b3099e980b327aa27678044bf5 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jekoritz@microsoft.com>
Date: Tue, 25 Mar 2025 14:47:51 -0700
Subject: [PATCH 1/2] Don't look at RuntimePackAsset items when using the
 runtime pack layout but not actually using it as a runtime pack. The NAOT
 assemblies won't be there.

---
 .../BuildIntegration/Microsoft.NETCore.Native.targets          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets
index 4418c32fe9a119..65cfff3414bb19 100644
--- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets
+++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets
@@ -157,7 +157,8 @@ The .NET Foundation licenses this file to you under the MIT license.
 
     <ItemGroup Condition="'$(IlcUseNativeAOTRuntimePackLayout)' == 'true'">
       <PrivateSdkAssemblies Include="$(IlcSdkPath)*.dll"/>
-      <FrameworkAssemblies Include="@(RuntimePackAsset)" Condition="'%(Extension)' == '.dll'" />
+      <FrameworkAssemblies Include="@(RuntimePackAsset)" Condition="'$(PublishAotUsingRuntimePack)' == 'true' and '%(Extension)' == '.dll'" />
+      <FrameworkAssemblies Include="$(_NETCoreAppRuntimePackPath)" Condition="'$(PublishAotUsingRuntimePack)' != 'true' and '%(Extension)' == '.dll'" />
       <DefaultFrameworkAssemblies Include="@(FrameworkAssemblies)" />
     </ItemGroup>
 

From 1ac9478043651a06b9f4b9999e0284f199b4a764 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Wed, 26 Mar 2025 13:56:56 -0700
Subject: [PATCH 2/2] Fix path for framework assemblies inside the runtime pack
 layout

---
 .../nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets
index 65cfff3414bb19..743a1021da01e2 100644
--- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets
+++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets
@@ -158,7 +158,7 @@ The .NET Foundation licenses this file to you under the MIT license.
     <ItemGroup Condition="'$(IlcUseNativeAOTRuntimePackLayout)' == 'true'">
       <PrivateSdkAssemblies Include="$(IlcSdkPath)*.dll"/>
       <FrameworkAssemblies Include="@(RuntimePackAsset)" Condition="'$(PublishAotUsingRuntimePack)' == 'true' and '%(Extension)' == '.dll'" />
-      <FrameworkAssemblies Include="$(_NETCoreAppRuntimePackPath)" Condition="'$(PublishAotUsingRuntimePack)' != 'true' and '%(Extension)' == '.dll'" />
+      <FrameworkAssemblies Include="$(_NETCoreAppRuntimePackPath)lib/**/*.dll" Condition="'$(PublishAotUsingRuntimePack)' != 'true'" />
       <DefaultFrameworkAssemblies Include="@(FrameworkAssemblies)" />
     </ItemGroup>