Merge remote-tracking branch 'origin/main' into maraf/WasmSdkPackNet7Fix

This commit is contained in:
Marek Fišera 2023-10-11 09:51:14 +02:00
commit 4893a31ad7

View file

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