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

Improve GenerateBundledVersions.targets to include only existing RIDs in KnownFrameworkReference (#10222)

Browse source 
Move the Mono-only rids to the KnownRuntimePack.
This commit is contained in:
Alexander Köplinger 2021-04-15 10:22:30 +02:00 • committed by GitHub
parent 331f468469
commit be57cb9130
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -114,6 +114,19 @@
<Net60RuntimePackRids Include="
@(Net50RuntimePackRids);
osx-arm64;
maccatalyst-x64;
maccatalyst-arm64;
" />
<!-- In .NET 6 the browser-wasm runtime pack started using the Mono naming pattern -->
<Net60RuntimePackRids Remove="browser-wasm" />
<NetCoreAppHostRids Include="@(Net60AppHostRids)" />
<NetCoreRuntimePackRids Include="@(Net60RuntimePackRids)" />
<MonoRuntimePackRids Include="
@(NetCoreRuntimePackRids);
browser-wasm;
ios-arm64;
ios-arm;
iossimulator-arm64;
@ -122,16 +135,14 @@
tvos-arm64;
tvossimulator-arm64;
tvossimulator-x64;
maccatalyst-x64;
maccatalyst-arm64;
android-arm64;
android-arm;
android-x64;
android-x86;
" />
<NetCoreAppHostRids Include="@(Net60AppHostRids)" />
<NetCoreRuntimePackRids Include="@(Net60RuntimePackRids)" />
<!-- Mono doesn't support these RIDs -->
<MonoRuntimePackRids Remove="tizen.4.0.0-armel;tizen.5.0.0-armel" />
<AspNetCore30RuntimePackRids Include="
win-x64;
@ -282,7 +293,7 @@ Copyright (c) .NET Foundation. All rights reserved.
RuntimeFrameworkName="Microsoft.NETCore.App"
LatestRuntimeFrameworkVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)"
RuntimePackNamePatterns="Microsoft.NETCore.App.Runtime.Mono.**RID**"
RuntimePackRuntimeIdentifiers="@(NetCoreRuntimePackRids, '%3B')"
RuntimePackRuntimeIdentifiers="@(MonoRuntimePackRids, '%3B')"
RuntimePackLabels="Mono"
IsTrimmable="true"
/>