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

Merge runtime patches (#18598)

Browse source
This commit is contained in:
Nikola Milosavljevic 2024-02-09 09:44:25 -08:00 committed by GitHub
parent e4d3343347
commit 4946900043
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/SourceBuild/patches/runtime/0002-short-stack-support.patch → src/SourceBuild/patches/runtime/0001-Short-stack-and-nuget-config-changes.patch
View file

@ -1,12 +1,18 @@
From 6e36330872998c791a2c0d31b688e1bdece2451f Mon Sep 17 00:00:00 2001
From: Jo Shields <joshield@microsoft.com>
Date: Fri, 2 Feb 2024 06:56:20 -0500
Subject: [PATCH] Source built short stack support (#97725)
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Nikola Milosavljevic <nikolam@microsoft.com>
Date: Fri, 9 Feb 2024 16:33:58 +0000
Subject: [PATCH] Short stack and nuget config changes
Backport: https://github.com/dotnet/runtime/pull/97725
Backport: https://github.com/dotnet/runtime/pull/97778
---
eng/SourceBuild.props | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
--- a/eng/SourceBuild.props 2024-02-07 11:01:33.807337902 -0500
+++ b/eng/SourceBuild.props 2024-02-05 16:48:58.219933758 -0500
diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props
index 3b544528694..f0637cad996 100644
--- a/eng/SourceBuild.props
+++ b/eng/SourceBuild.props
@@ -15,6 +15,7 @@
<!-- Split e.g. 'fedora.33-x64' into 'fedora.33' and 'x64'. -->
<_targetRidPlatformIndex>$(TargetRid.LastIndexOf('-'))</_targetRidPlatformIndex>
@ -46,3 +52,11 @@ Backport: https://github.com/dotnet/runtime/pull/97725
<InnerBuildArgs>$(InnerBuildArgs) $(FlagParameterPrefix)verbosity $(LogVerbosity)</InnerBuildArgs>
<InnerBuildArgs>$(InnerBuildArgs) $(FlagParameterPrefix)nodereuse $(ArcadeFalseBoolBuildArg)</InnerBuildArgs>
<InnerBuildArgs>$(InnerBuildArgs) $(FlagParameterPrefix)warnAsError $(ArcadeFalseBoolBuildArg)</InnerBuildArgs>
@@ -51,6 +64,7 @@
<InnerBuildArgs Condition="'$(OfficialBuildId)' != ''">$(InnerBuildArgs) /p:OfficialBuildId=$(OfficialBuildId)</InnerBuildArgs>
<InnerBuildArgs Condition="'$(ContinuousIntegrationBuild)' != ''">$(InnerBuildArgs) /p:ContinuousIntegrationBuild=$(ContinuousIntegrationBuild)</InnerBuildArgs>
<InnerBuildArgs Condition="'$(PortableBuild)' != ''">$(InnerBuildArgs) /p:PortableBuild=$(PortableBuild)</InnerBuildArgs>
+ <InnerBuildArgs Condition="'$(RestoreConfigFile)' != ''">$(InnerBuildArgs) /p:RestoreConfigFile=$(RestoreConfigFile)</InnerBuildArgs>
</PropertyGroup>
</Target>