Skip to content

Commit

Permalink
Fix SupportedRuntimeIdentifiers substitution in Directory.Build.targe…
Browse files Browse the repository at this point in the history
…ts.in. (#48022)

This fixes the native AOT template tests on Linux.
  • Loading branch information
tmds authored May 5, 2023
1 parent c636106 commit 801e24f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 18 deletions.
20 changes: 3 additions & 17 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -161,23 +161,9 @@
<PropertyGroup>
<BuildArchitecture>$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant())</BuildArchitecture>

<!-- This defines the list of RIDs supported by the ASP.NET Core shared framework. -->
<SupportedRuntimeIdentifiers>
win-x64;
win-x86;
win-arm;
win-arm64;
osx-x64;
osx-arm64;
linux-musl-x64;
linux-musl-arm;
linux-musl-arm64;
linux-x64;
linux-arm;
linux-arm64;
freebsd-x64
</SupportedRuntimeIdentifiers>

<!-- This defines the list of RIDs supported by the ASP.NET Core shared framework.
The list is a semicolon separated list of RIDs. Whitespace may not be added to the property. -->
<SupportedRuntimeIdentifiers>win-x64;win-x86;win-arm;win-arm64;osx-x64;osx-arm64;linux-musl-x64;linux-musl-arm;linux-musl-arm64;linux-x64;linux-arm;linux-arm64;freebsd-x64</SupportedRuntimeIdentifiers>
<SupportedRuntimeIdentifiers Condition=" '$(PortableBuild)' == 'false' ">$(SupportedRuntimeIdentifiers);$(TargetRuntimeIdentifier)</SupportedRuntimeIdentifiers>

<!-- Playwright provides binaries for Windows (x86 and x64), macOS (x64) and Linux (x64, non musl). We can't use it on other architectures. -->
Expand Down
2 changes: 1 addition & 1 deletion eng/tools/GenerateFiles/GenerateFiles.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
MicrosoftNETCoreAppRuntimeVersion=$(MicrosoftNETCoreAppRuntimeVersion);
MicrosoftPlaywrightCLIVersion=$(MicrosoftPlaywrightCLIVersion);
LibNetHostAppPackVersion=$(BundledNETCoreAppPackageVersion);
SupportedRuntimeIdentifiers=$(SupportedRuntimeIdentifiers.Trim());
SupportedRuntimeIdentifiers=$([MSBuild]::Escape($(SupportedRuntimeIdentifiers)));
ArtifactsShippingPackagesDir=$(ArtifactsShippingPackagesDir)
</_TemplateProperties>
</PropertyGroup>
Expand Down

0 comments on commit 801e24f

Please sign in to comment.