Skip to content

Commit fab2c88

Browse files
committed
Fix SupportedRuntimeIdentifiers substitution in Directory.Build.targets.in.
1 parent 576c75c commit fab2c88

File tree

2 files changed

+4
-18
lines changed

2 files changed

+4
-18
lines changed

Directory.Build.props

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -157,23 +157,9 @@
157157
<PropertyGroup>
158158
<BuildArchitecture>$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant())</BuildArchitecture>
159159

160-
<!-- This defines the list of RIDs supported by the ASP.NET Core shared framework. -->
161-
<SupportedRuntimeIdentifiers>
162-
win-x64;
163-
win-x86;
164-
win-arm;
165-
win-arm64;
166-
osx-x64;
167-
osx-arm64;
168-
linux-musl-x64;
169-
linux-musl-arm;
170-
linux-musl-arm64;
171-
linux-x64;
172-
linux-arm;
173-
linux-arm64;
174-
freebsd-x64
175-
</SupportedRuntimeIdentifiers>
176-
160+
<!-- This defines the list of RIDs supported by the ASP.NET Core shared framework.
161+
The list is a semicolon separated list of RIDs. Whitespace may not be added to the property. -->
162+
<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>
177163
<SupportedRuntimeIdentifiers Condition=" '$(PortableBuild)' == 'false' ">$(SupportedRuntimeIdentifiers);$(TargetRuntimeIdentifier)</SupportedRuntimeIdentifiers>
178164

179165
<!-- Playwright provides binaries for Windows (x86 and x64), macOS (x64) and Linux (x64, non musl). We can't use it on other architectures. -->

eng/tools/GenerateFiles/GenerateFiles.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
MicrosoftNETCoreAppRuntimeVersion=$(MicrosoftNETCoreAppRuntimeVersion);
2727
MicrosoftPlaywrightCLIVersion=$(MicrosoftPlaywrightCLIVersion);
2828
LibNetHostAppPackVersion=$(BundledNETCoreAppPackageVersion);
29-
SupportedRuntimeIdentifiers=$(SupportedRuntimeIdentifiers.Trim());
29+
SupportedRuntimeIdentifiers=$([MSBuild]::Escape($(SupportedRuntimeIdentifiers)));
3030
ArtifactsShippingPackagesDir=$(ArtifactsShippingPackagesDir)
3131
</_TemplateProperties>
3232
</PropertyGroup>

0 commit comments

Comments
 (0)