From 4621c5ddc605d0cfa21e2ab8fec12145165bd25e Mon Sep 17 00:00:00 2001 PatchSource: https://github.com/dotnet/installer/pull/13410 From: Antoine Martin Date: Sun, 13 Mar 2022 23:28:21 +0000 Subject: [PATCH 1/1] musl-build-fiox Musl build fix for installer --- src/SourceBuild/tarball/content/Directory.Build.props | 8 ++++++++ src/SourceBuild/tarball/content/repos/aspnetcore.proj | 2 ++ src/SourceBuild/tarball/content/repos/installer.proj | 3 ++- src/redist/targets/GetRuntimeInformation.targets | 9 +++++++++ 4 files changed, 21 insertions(+), 1 deletion(-) diff --git a/src/SourceBuild/tarball/content/Directory.Build.props b/src/SourceBuild/tarball/content/Directory.Build.props index fdc0999af..ec508d8a9 100644 --- a/src/SourceBuild/tarball/content/Directory.Build.props +++ b/src/SourceBuild/tarball/content/Directory.Build.props @@ -170,7 +170,14 @@ ROOTFS_DIR=$(BaseIntermediatePath)crossrootfs/armel + + + + + true + false + $([System.Runtime.InteropServices.RuntimeInformation]::RuntimeIdentifier) Windows_NT @@ -183,6 +190,7 @@ freebsd-$(Platform) osx-$(Platform) linux-$(Platform) + linux-musl-$(Platform) win-$(Platform) diff --git a/src/SourceBuild/tarball/content/repos/aspnetcore.proj b/src/SourceBuild/tarball/content/repos/aspnetcore.proj index 480f3c713..04694770d 100644 --- a/src/SourceBuild/tarball/content/repos/aspnetcore.proj +++ b/src/SourceBuild/tarball/content/repos/aspnetcore.proj @@ -15,6 +15,8 @@ $(BuildCommandArgs) /p:EnablePackageValidation=false + + $(BuildCommandArgs) --os-name linux-musl $(ProjectDirectory)\eng\build$(ShellExtension) $(BuildCommandArgs) true diff --git a/src/SourceBuild/tarball/content/repos/installer.proj b/src/SourceBuild/tarball/content/repos/installer.proj index 712d7cd14..587384128 100644 --- a/src/SourceBuild/tarball/content/repos/installer.proj +++ b/src/SourceBuild/tarball/content/repos/installer.proj @@ -25,7 +25,8 @@ $(BuildCommandArgs) /p:Rid=$(TargetRid) $(BuildCommandArgs) /p:DOTNET_INSTALL_DIR=$(DotNetCliToolDir) - $(BuildCommandArgs) /p:AspNetCoreSharedFxInstallerRid=linux-$(Platform) + $(BuildCommandArgs) /p:AspNetCoreSharedFxInstallerRid=linux-$(Platform) + $(BuildCommandArgs) /p:AspNetCoreSharedFxInstallerRid=linux-musl-$(Platform) $(BuildCommandArgs) /p:CoreSetupRid=freebsd-x64 /p:PortableBuild=true $(BuildCommandArgs) /p:CoreSetupRid=osx-x64 diff --git a/src/redist/targets/GetRuntimeInformation.targets b/src/redist/targets/GetRuntimeInformation.targets index 5133c3a38..01ac03776 100644 --- a/src/redist/targets/GetRuntimeInformation.targets +++ b/src/redist/targets/GetRuntimeInformation.targets @@ -1,6 +1,13 @@ + + + + + true + false + $([System.Runtime.InteropServices.RuntimeInformation]::RuntimeIdentifier) win-$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture.ToString().ToLowerInvariant) @@ -9,6 +16,8 @@ osx freebsd linux + + $(HostOSName)-musl $(HostOSName) -- 2.34.1