mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add runtime source-build patch to fix stage2 build (#16233)

Browse source
This commit is contained in:
Michael Simons 2023-04-25 15:55:28 -05:00 committed by GitHub
parent 99535ace72
commit 15b1d4a1b1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/SourceBuild/patches/runtime/0003-Directory.Build.props-don-t-overwrite-PackageOS-from.patch Normal file
View file

@ -0,0 +1,24 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tom Deseyn <tom.deseyn@gmail.com>
Date: Tue, 25 Apr 2023 21:33:21 +0200
Subject: [PATCH] Directory.Build.props: don't overwrite PackageOS from
source-build.
Backport: https://github.com/dotnet/runtime/pull/85350
---
Directory.Build.props | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Directory.Build.props b/Directory.Build.props
index e238fe3f9bc..ad38d4cae3a 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -207,7 +207,7 @@
<!-- source-build sets PackageOS to build with non-portable rid packages that were source-built previously. -->
<PackageRID Condition="'$(PackageOS)' != ''">$(PackageOS)-$(TargetArchitecture)</PackageRID>
- <PackageRID>$(_packageOS)-$(TargetArchitecture)</PackageRID>
+ <PackageRID Condition="'$(PackageRID)' == ''">$(_packageOS)-$(TargetArchitecture)</PackageRID>
</PropertyGroup>
<!-- ToolsRID is used for packages needed on the build host. -->