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

Remove win-arm support in net8 (#16496)

Browse source
This commit is contained in:
Marc Paine 2023-05-31 15:55:46 -07:00 • committed by GitHub
commit efa824381d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 37 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -193,10 +193,14 @@
@(Net70AppHostRids); @(Net70AppHostRids);
" /> " />
<NetCoreAppHostRids Remove="win-arm" />
<NetCoreRuntimePackRids Include=" <NetCoreRuntimePackRids Include="
@(Net70RuntimePackRids); @(Net70RuntimePackRids);
" /> " />
<NetCoreRuntimePackRids Remove="win-arm" />
<!-- <!--
In source-build, we build the current RID from source, which may be In source-build, we build the current RID from source, which may be
non-portable and/or not an official RID. non-portable and/or not an official RID.
@ -217,8 +221,8 @@
Condition="'$(BundleRuntimePacks)' == 'true'" Condition="'$(BundleRuntimePacks)' == 'true'"
Include="$(ProductMonikerRid)" /> Include="$(ProductMonikerRid)" />
<MonoRuntimePackRids Include=" <Net60MonoRuntimePackRids Include="
@(NetCoreRuntimePackRids); @(Net60RuntimePackRids);
browser-wasm; browser-wasm;
ios-arm64; ios-arm64;
ios-arm; ios-arm;
@ -235,7 +239,17 @@
" /> " />
<!-- Mono doesn't support these RIDs --> <!-- Mono doesn't support these RIDs -->
<MonoRuntimePackRids Remove="tizen.4.0.0-armel;tizen.5.0.0-armel" /> <Net60MonoRuntimePackRids Remove="tizen.4.0.0-armel;tizen.5.0.0-armel" />
<Net70MonoRuntimePackRids Include="
@(Net60MonoRuntimePackRids);
" />
<MonoRuntimePackRids Include="
@(Net70MonoRuntimePackRids);
" />
<MonoRuntimePackRids Remove="win-arm" />
<AspNetCore30RuntimePackRids Include=" <AspNetCore30RuntimePackRids Include="
win-x64; win-x64;
@ -264,10 +278,18 @@
win-x86; win-x86;
" /> " />
<Crossgen2SupportedRids Include="@(Net60Crossgen2SupportedRids)" /> <Net70Crossgen2SupportedRids Include="@(Net60Crossgen2SupportedRids)" />
<Crossgen2SupportedRids Include="@(Net70Crossgen2SupportedRids)" />
<Crossgen2SupportedRids Remove="win-arm" />
<!-- Match the Crossgen2 RIDs although some are currently not supported in NativeAOT. Its better for the SDK not to block on the RIDs and let NativeAOT manage the experience --> <!-- Match the Crossgen2 RIDs although some are currently not supported in NativeAOT. Its better for the SDK not to block on the RIDs and let NativeAOT manage the experience -->
<ILCompilerSupportedRids Include="@(Net60Crossgen2SupportedRids)" /> <Net70ILCompilerSupportedRids Include="@(Net60Crossgen2SupportedRids)" />
<ILCompilerSupportedRids Include="@(Net70ILCompilerSupportedRids)" />
<ILCompilerSupportedRids Remove="win-arm" />
<NativeAOTRuntimePackRids Include=" <NativeAOTRuntimePackRids Include="
ios-arm64; ios-arm64;
@ -287,6 +309,8 @@
<AspNetCore70RuntimePackRids Include="@(AspNetCore60RuntimePackRids);linux-ppc64le" /> <AspNetCore70RuntimePackRids Include="@(AspNetCore60RuntimePackRids);linux-ppc64le" />
<AspNetCoreRuntimePackRids Include="@(AspNetCore70RuntimePackRids)" /> <AspNetCoreRuntimePackRids Include="@(AspNetCore70RuntimePackRids)" />
<AspNetCore80RuntimePackRids Remove="win-arm" />
<WindowsDesktop30RuntimePackRids Include="win-x64;win-x86" /> <WindowsDesktop30RuntimePackRids Include="win-x64;win-x86" />
<WindowsDesktop31RuntimePackRids Include="@(WindowsDesktop30RuntimePackRids)" /> <WindowsDesktop31RuntimePackRids Include="@(WindowsDesktop30RuntimePackRids)" />
<WindowsDesktop50RuntimePackRids Include="@(WindowsDesktop31RuntimePackRids);win-arm64" /> <WindowsDesktop50RuntimePackRids Include="@(WindowsDesktop31RuntimePackRids);win-arm64" />
@ -545,14 +569,14 @@ Copyright (c) .NET Foundation. All rights reserved.
TargetingPackName="Microsoft.NETCore.App.Ref" TargetingPackName="Microsoft.NETCore.App.Ref"
TargetingPackVersion="$(_NET70TargetingPackVersion)" TargetingPackVersion="$(_NET70TargetingPackVersion)"
RuntimePackNamePatterns="Microsoft.NETCore.App.Runtime.**RID**" RuntimePackNamePatterns="Microsoft.NETCore.App.Runtime.**RID**"
RuntimePackRuntimeIdentifiers="@(NetCoreRuntimePackRids, '%3B')" RuntimePackRuntimeIdentifiers="@(Net70RuntimePackRids, '%3B')"
/> />
<KnownAppHostPack Include="Microsoft.NETCore.App" <KnownAppHostPack Include="Microsoft.NETCore.App"
TargetFramework="net7.0" TargetFramework="net7.0"
AppHostPackNamePattern="Microsoft.NETCore.App.Host.**RID**" AppHostPackNamePattern="Microsoft.NETCore.App.Host.**RID**"
AppHostPackVersion="$(_NET70RuntimePackVersion)" AppHostPackVersion="$(_NET70RuntimePackVersion)"
AppHostRuntimeIdentifiers="@(NetCoreAppHostRids, '%3B')" AppHostRuntimeIdentifiers="@(Net70AppHostRids, '%3B')"
ExcludedRuntimeIdentifiers="android" ExcludedRuntimeIdentifiers="android"
/> />
@ -560,14 +584,14 @@ Copyright (c) .NET Foundation. All rights reserved.
TargetFramework="net7.0" TargetFramework="net7.0"
Crossgen2PackNamePattern="Microsoft.NETCore.App.Crossgen2.**RID**" Crossgen2PackNamePattern="Microsoft.NETCore.App.Crossgen2.**RID**"
Crossgen2PackVersion="$(_NET70RuntimePackVersion)" Crossgen2PackVersion="$(_NET70RuntimePackVersion)"
Crossgen2RuntimeIdentifiers="@(Crossgen2SupportedRids, '%3B')" Crossgen2RuntimeIdentifiers="@(Net70Crossgen2SupportedRids, '%3B')"
/> />
<KnownILCompilerPack Include="Microsoft.DotNet.ILCompiler" <KnownILCompilerPack Include="Microsoft.DotNet.ILCompiler"
TargetFramework="net7.0" TargetFramework="net7.0"
ILCompilerPackNamePattern="runtime.**RID**.Microsoft.DotNet.ILCompiler" ILCompilerPackNamePattern="runtime.**RID**.Microsoft.DotNet.ILCompiler"
ILCompilerPackVersion="$(_NET70RuntimePackVersion)" ILCompilerPackVersion="$(_NET70RuntimePackVersion)"
ILCompilerRuntimeIdentifiers="@(ILCompilerSupportedRids, '%3B')" ILCompilerRuntimeIdentifiers="@(Net70ILCompilerSupportedRids, '%3B')"
/> />
<KnownILLinkPack Include="Microsoft.NET.ILLink.Tasks" <KnownILLinkPack Include="Microsoft.NET.ILLink.Tasks"
@ -583,7 +607,7 @@ Copyright (c) .NET Foundation. All rights reserved.
RuntimeFrameworkName="Microsoft.NETCore.App" RuntimeFrameworkName="Microsoft.NETCore.App"
LatestRuntimeFrameworkVersion="$(_NET70RuntimePackVersion)" LatestRuntimeFrameworkVersion="$(_NET70RuntimePackVersion)"
RuntimePackNamePatterns="Microsoft.NETCore.App.Runtime.Mono.**RID**" RuntimePackNamePatterns="Microsoft.NETCore.App.Runtime.Mono.**RID**"
RuntimePackRuntimeIdentifiers="@(MonoRuntimePackRids, '%3B')" RuntimePackRuntimeIdentifiers="@(Net70MonoRuntimePackRids, '%3B')"
RuntimePackLabels="Mono" RuntimePackLabels="Mono"
/> />
@ -685,7 +709,7 @@ Copyright (c) .NET Foundation. All rights reserved.
TargetingPackName="Microsoft.NETCore.App.Ref" TargetingPackName="Microsoft.NETCore.App.Ref"
TargetingPackVersion="$(_NET60TargetingPackVersion)" TargetingPackVersion="$(_NET60TargetingPackVersion)"
RuntimePackNamePatterns="Microsoft.NETCore.App.Runtime.**RID**" RuntimePackNamePatterns="Microsoft.NETCore.App.Runtime.**RID**"
RuntimePackRuntimeIdentifiers="@(NetCoreRuntimePackRids, '%3B')" RuntimePackRuntimeIdentifiers="@(Net60RuntimePackRids, '%3B')"
/> />
<KnownAppHostPack Include="Microsoft.NETCore.App" <KnownAppHostPack Include="Microsoft.NETCore.App"
@ -700,7 +724,7 @@ Copyright (c) .NET Foundation. All rights reserved.
TargetFramework="net6.0" TargetFramework="net6.0"
Crossgen2PackNamePattern="Microsoft.NETCore.App.Crossgen2.**RID**" Crossgen2PackNamePattern="Microsoft.NETCore.App.Crossgen2.**RID**"
Crossgen2PackVersion="$(_NET60RuntimePackVersion)" Crossgen2PackVersion="$(_NET60RuntimePackVersion)"
Crossgen2RuntimeIdentifiers="@(Crossgen2SupportedRids, '%3B')" Crossgen2RuntimeIdentifiers="@(Net60Crossgen2SupportedRids, '%3B')"
/> />
<KnownILLinkPack Include="Microsoft.NET.ILLink.Tasks" <KnownILLinkPack Include="Microsoft.NET.ILLink.Tasks"
@ -716,7 +740,7 @@ Copyright (c) .NET Foundation. All rights reserved.
RuntimeFrameworkName="Microsoft.NETCore.App" RuntimeFrameworkName="Microsoft.NETCore.App"
LatestRuntimeFrameworkVersion="$(_NET60RuntimePackVersion)" LatestRuntimeFrameworkVersion="$(_NET60RuntimePackVersion)"
RuntimePackNamePatterns="Microsoft.NETCore.App.Runtime.Mono.**RID**" RuntimePackNamePatterns="Microsoft.NETCore.App.Runtime.Mono.**RID**"
RuntimePackRuntimeIdentifiers="@(MonoRuntimePackRids, '%3B')" RuntimePackRuntimeIdentifiers="@(Net60MonoRuntimePackRids, '%3B')"
RuntimePackLabels="Mono" RuntimePackLabels="Mono"
/> />