Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add product rid to ILCompiler rids when bundling ILCompiler with the SDK. #18835

Merged
merged 2 commits into from
Mar 6, 2024
Merged

Add product rid to ILCompiler rids when bundling ILCompiler with the SDK. #18835

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
474b06f
Add product rid to ILCompiler rids when bundling ILCompiler with the …
tmds Mar 1, 2024
f46c9a0
PR feedback.
tmds Mar 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/redist/redist.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Copy link
Member Author

@tmds tmds Mar 1, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When we have a mechanism for it, this property will also cause the NuGet packages required for NativeAot to be included in the tarball (similar to BundleRuntimePacks).

</PropertyGroup>

<ItemGroup>
Expand Down
4 changes: 4 additions & 0 deletions src/redist/targets/GenerateBundledVersions.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,6 +380,10 @@
https://github.com/dotnet/runtime/blob/main/src/installer/pkg/projects/Microsoft.DotNet.ILCompiler/ILCompilerRIDs.props -->
<ILCompilerSupportedRids Include="@(Net90ILCompilerSupportedRids)" />

<ILCompilerSupportedRids
Condition="'$(BundleNativeAotCompiler)' == 'true'"
Include="$(ProductMonikerRid)" />
akoeplinger marked this conversation as resolved.
Show resolved Hide resolved

<Net80NativeAOTRuntimePackRids Include="
ios-arm64;
iossimulator-arm64;
Expand Down