mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

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

Browse source
This commit is contained in:
Tom Deseyn 2024-03-06 13:18:13 +01:00 • committed by GitHub
parent d746cee518
commit c0f4c586c2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/redist/redist.csproj
View file

@ -7,6 +7,7 @@
<ResolveAssemblyReferencesSilent>true</ResolveAssemblyReferencesSilent> <ResolveAssemblyReferencesSilent>true</ResolveAssemblyReferencesSilent>
<ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>none</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch> <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>none</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
<BundleRuntimePacks Condition="'$(BundleRuntimePacks)' == '' and '$(DotNetBuildSourceOnly)' == 'true'">true</BundleRuntimePacks> <BundleRuntimePacks Condition="'$(BundleRuntimePacks)' == '' and '$(DotNetBuildSourceOnly)' == 'true'">true</BundleRuntimePacks>
<BundleNativeAotCompiler Condition="'$(BundleNativeAotCompiler)' == '' and '$(DotNetBuildSourceOnly)' == 'true' and '$(SourceBuildUseMonoRuntime)' != 'true'">true</BundleNativeAotCompiler>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

4
src/redist/targets/GenerateBundledVersions.targets
View file

@ -266,6 +266,10 @@
Condition="'$(BundleRuntimePacks)' == 'true'" Condition="'$(BundleRuntimePacks)' == 'true'"
Include="$(ProductMonikerRid)" /> Include="$(ProductMonikerRid)" />
<ILCompilerSupportedRids
Condition="'$(BundleNativeAotCompiler)' == 'true'"
Include="$(ProductMonikerRid)" />
<Net60MonoRuntimePackRids Include=" <Net60MonoRuntimePackRids Include="
@(Net60RuntimePackRids); @(Net60RuntimePackRids);
browser-wasm; browser-wasm;