Skip to content

Commit 4f44fde

Browse files
authored
Make sure we add the System.Private.* assemblies when using the NativeAOT runtime pack as the runtime package. (#114556)
1 parent fdd3d35 commit 4f44fde

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,9 @@ The .NET Foundation licenses this file to you under the MIT license.
158158
<ItemGroup Condition="'$(IlcUseNativeAOTRuntimePackLayout)' == 'true'">
159159
<PrivateSdkAssemblies Include="$(IlcSdkPath)*.dll"/>
160160
<FrameworkAssemblies Include="@(RuntimePackAsset)" Condition="'$(PublishAotUsingRuntimePack)' == 'true' and '%(Extension)' == '.dll'" />
161+
<!-- When we aren't pulling in runtime pack assets, make sure we manually grab the assets that the SDK would select from within the package. -->
161162
<FrameworkAssemblies Include="$(_NETCoreAppRuntimePackPath)lib/**/*.dll" Condition="'$(PublishAotUsingRuntimePack)' != 'true'" />
163+
<FrameworkAssemblies Include="$(IlcFrameworkNativePath)*.dll" Exclude="$(IlcFrameworkNativePath)*.Native.dll;$(IlcFrameworkNativePath)msquic.dll" Condition="'$(PublishAotUsingRuntimePack)' != 'true'" />
162164
<DefaultFrameworkAssemblies Include="@(FrameworkAssemblies)" />
163165
</ItemGroup>
164166

0 commit comments

Comments
 (0)