37 lines
2.7 KiB
Diff
37 lines
2.7 KiB
Diff
diff --git a/repos/aspnetcore.proj.orig b/repos/aspnetcore.proj
|
|
index 480f3c7..9b25187 100644
|
|
--- a/repos/aspnetcore.proj.orig
|
|
+++ b/repos/aspnetcore.proj
|
|
@@ -7,6 +7,7 @@
|
|
<!-- The arch flag (defaults to x64) overrides any value of TargetArchitecture that we might set -->
|
|
<BuildCommandArgs>$(BuildCommandArgs) --arch $(Platform)</BuildCommandArgs>
|
|
<BuildCommandArgs>$(BuildCommandArgs) --no-build-repo-tasks</BuildCommandArgs>
|
|
+ <BuildCommandArgs Condition="$(PortableRid.StartsWith('linux-musl')>$(BuildCommandArgs) --os-name linux-musi</BuildCommandArgs>
|
|
<BuildCommandArgs>$(BuildCommandArgs) /p:BuildNodeJs=false</BuildCommandArgs>
|
|
<BuildCommandArgs>$(BuildCommandArgs) /p:PublishCompressedFilesPathPrefix=$(SourceBuiltAspNetCoreRuntime)</BuildCommandArgs>
|
|
<!-- Update to 1.0.0 version of reference assemblies which are built in SBRP instead of the preview.2 version
|
|
diff --git a/repos/installer.proj.orig b/repos/installer.proj
|
|
index e34337b..9b42de3 100644
|
|
--- a/repos/installer.proj.orig
|
|
+++ b/repos/installer.proj
|
|
@@ -25,7 +25,7 @@
|
|
<BuildCommandArgs Condition="'$(TargetOS)' == 'Linux'">$(BuildCommandArgs) /p:Rid=$(TargetRid)</BuildCommandArgs>
|
|
<BuildCommandArgs>$(BuildCommandArgs) /p:DOTNET_INSTALL_DIR=$(DotNetCliToolDir)</BuildCommandArgs>
|
|
|
|
- <BuildCommandArgs Condition="'$(TargetOS)' == 'Linux'">$(BuildCommandArgs) /p:AspNetCoreInstallerRid=linux-$(Platform)</BuildCommandArgs>
|
|
+ <BuildCommandArgs Condition="'$(TargetOS)' == 'Linux'">$(BuildCommandArgs) /p:AspNetCoreInstallerRid=$(PortableRid)</BuildCommandArgs>
|
|
<!-- core-sdk always wants to build portable on OSX and FreeBSD -->
|
|
<BuildCommandArgs Condition="'$(TargetOS)' == 'FreeBSD'">$(BuildCommandArgs) /p:CoreSetupRid=freebsd-x64 /p:PortableBuild=true</BuildCommandArgs>
|
|
<BuildCommandArgs Condition="'$(TargetOS)' == 'OSX'">$(BuildCommandArgs) /p:CoreSetupRid=osx-x64</BuildCommandArgs>
|
|
diff --git a/Directory.Build.props.orig b/Directory.Build.props
|
|
index 797e54f..8be93da 100644
|
|
--- a/Directory.Build.props.orig
|
|
+++ b/Directory.Build.props
|
|
@@ -181,6 +181,7 @@
|
|
<PortableRid Condition="'$(TargetOS)' == 'FreeBSD'">freebsd-$(Platform)</PortableRid>
|
|
<PortableRid Condition="'$(TargetOS)' == 'OSX'">osx-$(Platform)</PortableRid>
|
|
<PortableRid Condition="'$(TargetOS)' == 'Linux'">linux-$(Platform)</PortableRid>
|
|
+ <PortableRid Condition="$(TargetRid.StartsWith('linux-musl')) or $(TargetRid.StartsWith('alpine'))">linux-musl-$(Platform)</PortableRid>
|
|
<PortableRid Condition="'$(TargetOS)' == 'Windows_NT'">win-$(Platform)</PortableRid>
|
|
<TargetRid Condition="'$(PortableBuild)' == 'true' AND '$(PortableRid)' != ''">$(PortableRid)</TargetRid>
|
|
</PropertyGroup>
|