@@ -4,19 +4,19 @@ Date: Tue, 18 Oct 2022 20:21:02 +0000
44Subject: [PATCH 1/3] runtime_74504-pass-targetrid-to-native-scripts.patch
55
66---
7- src/runtime/ eng/SourceBuild.props | 21 ++++++++++++-------
8- src/runtime/ eng/build.sh | 10 +++++++++
7+ eng/SourceBuild.props | 21 ++++++++++++-------
8+ eng/build.sh | 10 +++++++++
99 .../common/templates/steps/source-build.yml | 6 ++++++
10- src/runtime/ eng/native/build-commons.sh | 15 +++++++++++++
10+ eng/native/build-commons.sh | 15 +++++++++++++
1111 .../eng/pipelines/common/global-build-job.yml | 2 ++
12- src/runtime/src/ native/corehost/build.sh | 7 +++----
13- src/runtime/src/ native/corehost/corehost.proj | 1 +
12+ src/native/corehost/build.sh | 7 +++----
13+ src/native/corehost/corehost.proj | 1 +
1414 7 files changed, 51 insertions(+), 11 deletions(-)
1515
16- diff --git a/src/runtime/ eng/SourceBuild.props b/src/runtime /eng/SourceBuild.props
16+ diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props
1717index b70f668a1..9e9396585 100644
18- --- a/src/runtime/ eng/SourceBuild.props
19- +++ b/src/runtime/ eng/SourceBuild.props
18+ --- a/eng/SourceBuild.props
19+ +++ b/eng/SourceBuild.props
2020@@ -11,14 +11,20 @@
2121 <SourceBuildPortable>true</SourceBuildPortable>
2222 <SourceBuildPortable Condition="'$(SourceBuildNonPortable)' == 'true'">false</SourceBuildPortable>
@@ -66,10 +66,10 @@ index b70f668a1..9e9396585 100644
6666 </PropertyGroup>
6767 </Target>
6868
69- diff --git a/src/runtime/ eng/build.sh b/src/runtime /eng/build.sh
69+ diff --git a/eng/build.sh b/eng/build.sh
7070index 8836bde10..ea6be90af 100755
71- --- a/src/runtime/ eng/build.sh
72- +++ b/src/runtime/ eng/build.sh
71+ --- a/eng/build.sh
72+ +++ b/eng/build.sh
7373@@ -31,6 +31,7 @@ usage()
7474 echo " --os Target operating system: windows, Linux, FreeBSD, OSX, MacCatalyst, tvOS,"
7575 echo " tvOSSimulator, iOS, iOSSimulator, Android, Browser, NetBSD, illumos or Solaris."
@@ -94,10 +94,10 @@ index 8836bde10..ea6be90af 100755
9494 -portablebuild)
9595 if [ -z ${2+x} ]; then
9696 echo "No value for portablebuild is supplied. See help (--help) for supported values." 1>&2
97- diff --git a/src/runtime/ eng/common/templates/steps/source-build.yml b/src/runtime /eng/common/templates/steps/source-build.yml
97+ diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml
9898index abb1b2bcd..b5b3e5aeb 100644
99- --- a/src/runtime/ eng/common/templates/steps/source-build.yml
100- +++ b/src/runtime/ eng/common/templates/steps/source-build.yml
99+ --- a/eng/common/templates/steps/source-build.yml
100+ +++ b/eng/common/templates/steps/source-build.yml
101101@@ -63,6 +63,11 @@ steps:
102102 targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}'
103103 fi
@@ -118,10 +118,10 @@ index abb1b2bcd..b5b3e5aeb 100644
118118 /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \
119119 /p:ArcadeBuildFromSource=true
120120 displayName: Build
121- diff --git a/src/runtime/ eng/native/build-commons.sh b/src/runtime /eng/native/build-commons.sh
121+ diff --git a/eng/native/build-commons.sh b/eng/native/build-commons.sh
122122index 9600e346b..85a6f50ec 100755
123- --- a/src/runtime/ eng/native/build-commons.sh
124- +++ b/src/runtime/ eng/native/build-commons.sh
123+ --- a/eng/native/build-commons.sh
124+ +++ b/eng/native/build-commons.sh
125125@@ -246,6 +246,7 @@ usage()
126126 echo "-msbuildonunsupportedplatform: build managed binaries even if distro is not officially supported."
127127 echo "-ninja: target ninja instead of GNU make"
@@ -164,10 +164,10 @@ index 9600e346b..85a6f50ec 100755
164164+ fi
165165 # Init if MSBuild for .NET Core is supported for this platform
166166 isMSBuildOnNETCoreSupported
167- diff --git a/src/runtime/ eng/pipelines/common/global-build-job.yml b/src/runtime /eng/pipelines/common/global-build-job.yml
167+ diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml
168168index c5d913a46..1dcd4aa5a 100644
169- --- a/src/runtime/ eng/pipelines/common/global-build-job.yml
170- +++ b/src/runtime/ eng/pipelines/common/global-build-job.yml
169+ --- a/eng/pipelines/common/global-build-job.yml
170+ +++ b/eng/pipelines/common/global-build-job.yml
171171@@ -129,6 +129,8 @@ jobs:
172172 platform:
173173 buildScript: $(_sclEnableCommand) $(Build.SourcesDirectory)$(dir)build$(scriptExt)
@@ -177,10 +177,10 @@ index c5d913a46..1dcd4aa5a 100644
177177
178178 - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS', 'MacCatalyst') }}:
179179 - script: $(Build.SourcesDirectory)/eng/install-native-dependencies.sh ${{ parameters.osGroup }} ${{ parameters.archType }} azDO
180- diff --git a/src/runtime/src/ native/corehost/build.sh b/src/runtime /src/native/corehost/build.sh
180+ diff --git a/src/native/corehost/build.sh b/src/native/corehost/build.sh
181181index 3aa6820e7..4d7828a00 100755
182- --- a/src/runtime/src/ native/corehost/build.sh
183- +++ b/src/runtime/src/ native/corehost/build.sh
182+ --- a/src/native/corehost/build.sh
183+ +++ b/src/native/corehost/build.sh
184184@@ -83,14 +83,13 @@ __LogsDir="$__RootBinDir/log"
185185 __MsbuildDebugLogsDir="$__LogsDir/MsbuildDebugLogs"
186186
@@ -199,10 +199,10 @@ index 3aa6820e7..4d7828a00 100755
199199 __CMakeArgs="-DRUNTIME_FLAVOR=\"$__RuntimeFlavor\" $__CMakeArgs"
200200 __CMakeArgs="-DFEATURE_DISTRO_AGNOSTIC_SSL=$__PortableBuild $__CMakeArgs"
201201
202- diff --git a/src/runtime/src/ native/corehost/corehost.proj b/src/runtime /src/native/corehost/corehost.proj
202+ diff --git a/src/native/corehost/corehost.proj b/src/native/corehost/corehost.proj
203203index ba630e8d2..004358388 100644
204- --- a/src/runtime/src/ native/corehost/corehost.proj
205- +++ b/src/runtime/src/ native/corehost/corehost.proj
204+ --- a/src/native/corehost/corehost.proj
205+ +++ b/src/native/corehost/corehost.proj
206206@@ -33,6 +33,7 @@
207207 <BuildArgs Condition="'$(Ninja)' == 'true'">$(BuildArgs) -ninja</BuildArgs>
208208 <BuildArgs>$(BuildArgs) -runtimeflavor $(RuntimeFlavor)</BuildArgs>
0 commit comments