54 lines
3.4 KiB
Diff
54 lines
3.4 KiB
Diff
|
From 3008f7ef29e0a5593f6f0afbdc9343f573f1a375 Mon Sep 17 00:00:00 2001
|
||
|
|
Patch-Source: https://github.com/dotnet/installer/pull/14816
|
||
|
|
From: Antoine Martin <dev@ayakael.net>
|
||
|
|
Date: Tue, 15 Nov 2022 01:04:07 -0500
|
||
|
|
Subject: [PATCH 1/3] Eliminate runtime portable build (backport dotnet#14549)
|
||
|
|
|
||
|
|
---
|
||
|
|
.../tarball/content/Directory.Build.props | 8 --
|
||
|
|
.../tarball/content/repos/aspnetcore.proj | 1 +
|
||
|
|
.../tarball/content/repos/installer.proj | 2 +-
|
||
|
|
.../tarball/content/repos/known-good.proj | 1 -
|
||
|
|
.../content/repos/runtime-portable.proj | 47 -----------
|
||
|
|
.../content/repos/runtime.common.props | 43 ----------
|
||
|
|
.../content/repos/runtime.common.targets | 46 -----------
|
||
|
|
.../tarball/content/repos/runtime.proj | 82 ++++++++++++++++++-
|
||
|
|
.../source-build-reference-packages.proj | 4 +-
|
||
|
|
src/redist/targets/Crossgen.targets | 2 +-
|
||
|
|
src/redist/targets/GenerateLayout.targets | 3 +
|
||
|
|
11 files changed, 88 insertions(+), 151 deletions(-)
|
||
|
|
delete mode 100644 src/SourceBuild/tarball/content/repos/runtime-portable.proj
|
||
|
|
delete mode 100644 src/SourceBuild/tarball/content/repos/runtime.common.props
|
||
|
|
delete mode 100644 src/SourceBuild/tarball/content/repos/runtime.common.targets
|
||
|
|
|
||
|
|
diff --git a/src/installer/src/redist/targets/Crossgen.targets b/src/installer/src/redist/targets/Crossgen.targets
|
||
|
|
index 8949af132..a59ed388f 100644
|
||
|
|
--- a/src/installer/src/redist/targets/Crossgen.targets
|
||
|
|
+++ b/src/installer/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.$(Crossgen2Rid)</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/installer/src/redist/targets/GenerateLayout.targets b/src/installer/src/redist/targets/GenerateLayout.targets
|
||
|
|
index 88a053b61..ce5e09b69 100644
|
||
|
|
--- a/src/installer/src/redist/targets/GenerateLayout.targets
|
||
|
|
+++ b/src/installer/src/redist/targets/GenerateLayout.targets
|
||
|
|
@@ -84,6 +84,9 @@
|
||
|
|
<CombinedFrameworkHostArchiveFileName Condition=" '$(PgoInstrument)' == 'true' ">dotnet-runtime$(PgoTerm)-$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension)</CombinedFrameworkHostArchiveFileName>
|
||
|
|
<WinFormsAndWpfSharedFxArchiveFileName>windowsdesktop-runtime-$(MicrosoftWindowsDesktopAppRuntimePackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension)</WinFormsAndWpfSharedFxArchiveFileName>
|
||
|
|
|
||
|
|
+ <Crossgen2Rid>$(HostOSName)-$(BuildArchitecture)</Crossgen2Rid>
|
||
|
|
+ <Crossgen2Rid Condition="'$(DotNetBuildFromSource)' == 'true'">$(SharedFrameworkRid)</Crossgen2Rid>
|
||
|
|
+
|
||
|
|
<AspNetCoreInstallerRid Condition="'$(AspNetCoreInstallerRid)' == ''">$(SharedFrameworkRid)</AspNetCoreInstallerRid>
|
||
|
|
<AspNetCoreInstallerRid Condition="'$(SharedFrameworkRid)' == 'rhel.6-x64'">linux-x64</AspNetCoreInstallerRid>
|
||
|
|
<AspNetCoreArchiveRid>$(AspNetCoreInstallerRid)</AspNetCoreArchiveRid>
|
||
|
|
--
|
||
|
|
2.38.2
|
||
|
|
|