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

Only list supported RIDs for ILCompiler (#16545)

Browse source 
Attempting to publish AOT on an unsupported host, or with an
unsupported target RID, will produce an error in the SDK before trying
to restore the ILCompiler packages. This uses the RID list in
`KnownILCompilerPack` as the source of truth for what is considered
supported. Then with improved error reporting
(https://github.com/dotnet/sdk/pull/32943), this will give enough info
to the user about why a scenario isn't supported for aot.

Failing before restore does mean that advanced users who want to test
with unsupported ILC packages need to use a different
workaround. Instead of adding a `PackageReference`, they'll need
something like this:

```xml
<ItemGroup>
  <KnownILCompilerPack Update="@(KnownILCompilerPack)">
    <ILCompilerRuntimeIdentifiers>unsupported-rid</ILCompilerRuntimeIdentifiers>
  </KnownILCompilerPack>
</ItemGroup>
```
This commit is contained in:
Sven Boemer 2023-06-01 08:37:49 -07:00 committed by GitHub
parent 1b4322cee4
commit 5acae40bde
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -284,12 +284,22 @@
<Crossgen2SupportedRids Remove="win-arm" /> <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 --> <Net70ILCompilerSupportedRids Include="
<Net70ILCompilerSupportedRids Include="@(Net60Crossgen2SupportedRids)" /> linux-arm64;
linux-musl-arm64;
linux-musl-x64;
linux-x64;
win-arm64;
win-x64;
" />
<ILCompilerSupportedRids Include="@(Net70ILCompilerSupportedRids)" /> <!-- The subset of ILCompiler target RIDs that are officially supported. Should be a subset of
https://github.com/dotnet/runtime/blob/main/src/installer/pkg/projects/Microsoft.DotNet.ILCompiler/ILCompilerRIDs.props -->
<ILCompilerSupportedRids Remove="win-arm" /> <ILCompilerSupportedRids Include="
@(Net70ILCompilerSupportedRids);
osx-x64;
osx-arm64;
" />
<NativeAOTRuntimePackRids Include=" <NativeAOTRuntimePackRids Include="
ios-arm64; ios-arm64;