From 1d18ad3bcbae9ff5e6eff434ee2729e9ff738709 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-fix Musl support for dotnet build --- Directory.Build.props | 4 ++++ Directory.Build.targets | 7 +++++++ repos/aspnetcore.proj | 2 ++ repos/installer.proj | 3 ++- src/redist/targets/GetRuntimeInformation.targets | 9 +++++++++ 5 files changed, 24 insertions(+), 1 deletion(-) diff --git a/Directory.Build.props b/Directory.Build.props index fdc0999af..2c659c200 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -171,6 +171,9 @@ + true + true + $([System.Runtime.InteropServices.RuntimeInformation]::RuntimeIdentifier) Windows_NT @@ -183,6 +186,7 @@ freebsd-$(Platform) osx-$(Platform) linux-$(Platform) + linux-musl-$(Platform) win-$(Platform) diff --git a/Directory.Build.targets b/Directory.Build.targets index 02ff624bc..c7e3bd141 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -10,6 +10,13 @@ + + + + + + diff --git a/repos/aspnetcore.proj b/repos/aspnetcore.proj index 480f3c713..04694770d 100644 --- a/repos/aspnetcore.proj +++ b/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/repos/installer.proj b/repos/installer.proj index 712d7cd14..587384128 100644 --- a/repos/installer.proj +++ b/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 -- 2.34.1