39 lines
1.8 KiB
Diff
39 lines
1.8 KiB
Diff
|
From 5ee269eef8bd02d066151deaa4d8c0fe6b6cbce4 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:46 -0500
|
||
|
|
Subject: [PATCH 2/3] BundledVersions: update portable rid logic (backport
|
||
|
|
dotnet#14647)
|
||
|
|
|
||
|
|
---
|
||
|
|
.../tarball/content/repos/installer.proj | 5 +++++
|
||
|
|
src/redist/targets/GetRuntimeInformation.targets | 16 ++++++++++------
|
||
|
|
2 files changed, 15 insertions(+), 6 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/repos/installer.proj b/repos/installer.proj
|
||
|
|
index 6c08a1f67..95d47c941 100644
|
||
|
|
--- a/repos/installer.proj
|
||
|
|
+++ b/repos/installer.proj
|
||
|
|
@@ -10,6 +10,10 @@
|
||
|
|
<OverrideTargetRid Condition="'$(TargetOS)' == 'OSX'">osx-x64</OverrideTargetRid>
|
||
|
|
<OSNameOverride>$(OverrideTargetRid.Substring(0, $(OverrideTargetRid.IndexOf("-"))))</OSNameOverride>
|
||
|
|
|
||
|
|
+ <!-- Determine target portable rid based on bootstrap SDK's portable rid -->
|
||
|
|
+ <_platformIndex>$(NETCoreSdkPortableRuntimeIdentifier.LastIndexOf('-'))</_platformIndex>
|
||
|
|
+ <PortableOS Condition="'$(PortableOS)' == ''">$(NETCoreSdkPortableRuntimeIdentifier.Substring(0, $(_platformIndex)))</PortableOS>
|
||
|
|
+
|
||
|
|
<RuntimeArg>--runtime-id $(OverrideTargetRid)</RuntimeArg>
|
||
|
|
<RuntimeArg Condition="'$(TargetOS)' == 'Linux'">--runtime-id $(TargetRid)</RuntimeArg>
|
||
|
|
|
||
|
|
@@ -22,6 +26,7 @@
|
||
|
|
-->
|
||
|
|
<BuildCommandArgs>$(BuildCommandArgs) /p:NETCoreAppMaximumVersion=99.9</BuildCommandArgs>
|
||
|
|
<BuildCommandArgs>$(BuildCommandArgs) /p:OSName=$(OSNameOverride)</BuildCommandArgs>
|
||
|
|
+ <BuildCommandArgs>$(BuildCommandArgs) /p:PortableOSName=$(PortableOS)</BuildCommandArgs>
|
||
|
|
<BuildCommandArgs Condition="'$(TargetOS)' == 'Linux'">$(BuildCommandArgs) /p:Rid=$(TargetRid)</BuildCommandArgs>
|
||
|
|
<BuildCommandArgs>$(BuildCommandArgs) /p:DOTNET_INSTALL_DIR=$(DotNetCliToolDir)</BuildCommandArgs>
|
||
|
|
|
||
|
|
--
|
||
|
|
2.38.2
|
||
|
|
|