64 lines
3.9 KiB
Diff
64 lines
3.9 KiB
Diff
From aee338a0be16ba360a961aa56a29770d10c6ea46 Mon Sep 17 00:00:00 2001
|
|
From: "build@apk-groulx" <build@apk-groulx.praxis>
|
|
Date: Wed, 19 Jan 2022 15:52:52 +0000
|
|
Subject: [PATCH 1/1] installer_musl-build-fix
|
|
|
|
---
|
|
build.sh | 2 +-
|
|
src/SourceBuild/tarball/content/Directory.Build.props | 2 +-
|
|
src/redist/targets/Crossgen.targets | 2 +-
|
|
src/redist/targets/GenerateLayout.targets | 1 +
|
|
4 files changed, 4 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/build.sh b/build.sh
|
|
index 594a355fa..ae575963a 100755
|
|
--- a/build.sh
|
|
+++ b/build.sh
|
|
@@ -55,5 +55,5 @@ if [ ! -z "$BUILD_IN_DOCKER" ]; then
|
|
else
|
|
# Run under sudo so we can set ulimit
|
|
# See https://github.com/dotnet/core-eng/issues/14808
|
|
- sudo -E $DIR/run-build.sh $args
|
|
+ $DIR/run-build.sh $args
|
|
fi
|
|
diff --git a/src/SourceBuild/tarball/content/Directory.Build.props b/src/SourceBuild/tarball/content/Directory.Build.props
|
|
index 51f8e3c5a..2661667b5 100644
|
|
--- a/src/SourceBuild/tarball/content/Directory.Build.props
|
|
+++ b/src/SourceBuild/tarball/content/Directory.Build.props
|
|
@@ -190,7 +190,7 @@
|
|
<PropertyGroup Condition="'$(PortableBuild)' == 'true'">
|
|
<TargetRid Condition="'$(TargetOS)' == 'FreeBSD'">freebsd-$(Platform)</TargetRid>
|
|
<TargetRid Condition="'$(TargetOS)' == 'OSX'">osx-$(Platform)</TargetRid>
|
|
- <TargetRid Condition="'$(TargetOS)' == 'Linux'">linux-$(Platform)</TargetRid>
|
|
+ <TargetRid Condition="'$(TargetOS)' == 'Linux'">linux-musl-$(Platform)</TargetRid>
|
|
<TargetRid Condition="'$(TargetOS)' == 'Windows_NT'">win-$(Platform)</TargetRid>
|
|
</PropertyGroup>
|
|
|
|
diff --git a/src/redist/targets/Crossgen.targets b/src/redist/targets/Crossgen.targets
|
|
index 8949af132..afd2fa49c 100644
|
|
--- a/src/redist/targets/Crossgen.targets
|
|
+++ b/src/redist/targets/Crossgen.targets
|
|
@@ -6,7 +6,7 @@
|
|
|
|
<PropertyGroup>
|
|
<RuntimeNETCoreAppPackageName>microsoft.netcore.app.runtime.$(SharedFrameworkRid)</RuntimeNETCoreAppPackageName>
|
|
- <RuntimeNETCrossgenPackageName>microsoft.netcore.app.crossgen2.$(HostOSName)-$(BuildArchitecture)</RuntimeNETCrossgenPackageName>
|
|
+ <RuntimeNETCrossgenPackageName>microsoft.netcore.app.crossgen2.$(SharedFrameworkRid)</RuntimeNETCrossgenPackageName>
|
|
<CrossgenPath>$(NuGetPackageRoot)/$(RuntimeNETCrossgenPackageName)/$(MicrosoftNETCoreAppRuntimePackageVersion)/tools/crossgen2$(ExeExtension)</CrossgenPath>
|
|
<!-- When ingesting stable pgo instrumented binaries, the shared framework will be a non-stable version,
|
|
as will the archive file names themselves. -->
|
|
diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets
|
|
index 3917efa60..3746e9c10 100644
|
|
--- a/src/redist/targets/GenerateLayout.targets
|
|
+++ b/src/redist/targets/GenerateLayout.targets
|
|
@@ -95,6 +95,7 @@
|
|
<DownloadedAspNetTargetingPackInstallerFileName Condition=" '$(InstallerExtension)' == '.msi' ">aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefInternalPackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension)</DownloadedAspNetTargetingPackInstallerFileName>
|
|
<DownloadedAspNetCoreV2ModuleInstallerFileName Condition=" '$(InstallerExtension)' == '.msi' ">aspnetcoremodule_$(Architecture)_en_v2_$(MicrosoftAspNetCoreAppRuntimePackageVersion)$(InstallerExtension)</DownloadedAspNetCoreV2ModuleInstallerFileName>
|
|
<AspNetTargetingPackArchiveFileName>aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)$(ArchiveExtension)</AspNetTargetingPackArchiveFileName>
|
|
+ <MicrosoftAspNetCoreAppRuntimePackageVersion>$(MicrosoftAspNetCoreAppRuntimewinx64PackageVersion)</MicrosoftAspNetCoreAppRuntimePackageVersion>
|
|
<AspNetCoreSharedFxArchiveFileName>aspnetcore-runtime-internal-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreSharedFxArchiveRid)$(ArchiveExtension)</AspNetCoreSharedFxArchiveFileName>
|
|
|
|
<!-- Used to detect if ASP.NET Core is built against the same version of Microsoft.NETCore.App. -->
|
|
--
|
|
2.34.1
|
|
|