Skip to content

Commit 7e0f96e

Browse files
committed
Dereference paths on patches
1 parent efff3f4 commit 7e0f96e

5 files changed

+78
-78
lines changed

src/SourceBuild/tarball/patches/aspnetcore/0005-support-building-with-nonportable-runtime.patch

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@ Subject: [PATCH 1/1]
55
aspnetcore_43937-support-building-with-nonportable-runtime.patch
66

77
---
8-
src/aspnetcore/Directory.Build.props | 2 ++
9-
src/aspnetcore/eng/Common.props | 2 ++
10-
src/aspnetcore/eng/Dependencies.props | 2 ++
8+
Directory.Build.props | 2 ++
9+
eng/Common.props | 2 ++
10+
eng/Dependencies.props | 2 ++
1111
.../eng/tools/GenerateFiles/Directory.Build.targets.in | 7 +++++++
1212
.../Wasm.Performance/Driver/Wasm.Performance.Driver.csproj | 2 +-
1313
.../src/Microsoft.AspNetCore.App.Runtime.csproj | 5 +++--
14-
src/aspnetcore/src/Tools/Directory.Build.targets | 2 +-
14+
src/Tools/Directory.Build.targets | 2 +-
1515
7 files changed, 18 insertions(+), 4 deletions(-)
1616

17-
diff --git a/src/aspnetcore/Directory.Build.props b/src/aspnetcore/Directory.Build.props
17+
diff --git a/Directory.Build.props b/Directory.Build.props
1818
index 721f099a7..9979b084f 100644
19-
--- a/src/aspnetcore/Directory.Build.props
20-
+++ b/src/aspnetcore/Directory.Build.props
19+
--- a/Directory.Build.props
20+
+++ b/Directory.Build.props
2121
@@ -173,6 +173,8 @@
2222
freebsd-x64
2323
</SupportedRuntimeIdentifiers>
@@ -27,10 +27,10 @@ index 721f099a7..9979b084f 100644
2727
<!-- Make error messages clickable in VS Code's console -->
2828
<GenerateFullPaths Condition="'$(VSCODE_CWD)' != '' OR '$(TERM_PROGRAM)' == 'vscode'">true</GenerateFullPaths>
2929

30-
diff --git a/src/aspnetcore/eng/Common.props b/src/aspnetcore/eng/Common.props
30+
diff --git a/eng/Common.props b/eng/Common.props
3131
index a9a69bde9..3dcca1c6b 100644
32-
--- a/src/aspnetcore/eng/Common.props
33-
+++ b/src/aspnetcore/eng/Common.props
32+
--- a/eng/Common.props
33+
+++ b/eng/Common.props
3434
@@ -6,6 +6,8 @@
3535
<TargetOsName Condition=" '$(TargetOsName)' == '' AND $([MSBuild]::IsOSPlatform('FreeBSD'))">freebsd</TargetOsName>
3636
<TargetArchitecture Condition="'$(TargetArchitecture)' == ''">x64</TargetArchitecture>
@@ -40,10 +40,10 @@ index a9a69bde9..3dcca1c6b 100644
4040
</PropertyGroup>
4141

4242
<PropertyGroup Condition=" '$(BuildAllProjects)' == 'true' ">
43-
diff --git a/src/aspnetcore/eng/Dependencies.props b/src/aspnetcore/eng/Dependencies.props
43+
diff --git a/eng/Dependencies.props b/eng/Dependencies.props
4444
index 75c41177f..d39473508 100644
45-
--- a/src/aspnetcore/eng/Dependencies.props
46-
+++ b/src/aspnetcore/eng/Dependencies.props
45+
--- a/eng/Dependencies.props
46+
+++ b/eng/Dependencies.props
4747
@@ -95,6 +95,7 @@ and are generated based on the last package release.
4848
<LatestPackageReference Include="Microsoft.NETCore.App.Runtime.linux-musl-x64" />
4949
<LatestPackageReference Include="Microsoft.NETCore.App.Runtime.linux-musl-arm" />
@@ -60,10 +60,10 @@ index 75c41177f..d39473508 100644
6060
</ItemGroup>
6161

6262
<ItemGroup Label=".NET team dependencies (Non-source-build)" Condition="'$(DotNetBuildFromSource)' != 'true'">
63-
diff --git a/src/aspnetcore/eng/tools/GenerateFiles/Directory.Build.targets.in b/src/aspnetcore/eng/tools/GenerateFiles/Directory.Build.targets.in
63+
diff --git a/eng/tools/GenerateFiles/Directory.Build.targets.in b/eng/tools/GenerateFiles/Directory.Build.targets.in
6464
index c5206ec8c..5e693b6d7 100644
65-
--- a/src/aspnetcore/eng/tools/GenerateFiles/Directory.Build.targets.in
66-
+++ b/src/aspnetcore/eng/tools/GenerateFiles/Directory.Build.targets.in
65+
--- a/eng/tools/GenerateFiles/Directory.Build.targets.in
66+
+++ b/eng/tools/GenerateFiles/Directory.Build.targets.in
6767
@@ -39,8 +39,15 @@
6868
<DefaultRuntimeFrameworkVersion Condition=" '$(IsServicingBuild)' != 'true' AND
6969
'%(TargetFramework)' == '${DefaultNetCoreTargetFramework}' AND
@@ -80,10 +80,10 @@ index c5206ec8c..5e693b6d7 100644
8080
<!-- Use the just-built ASP.NET Core shared framework if available except when building product code in servicing. -->
8181
<KnownFrameworkReference Update="Microsoft.AspNetCore.App" Condition=" $(UpdateAspNetCoreKnownFramework) ">
8282
<LatestRuntimeFrameworkVersion
83-
diff --git a/src/aspnetcore/src/Components/benchmarkapps/Wasm.Performance/Driver/Wasm.Performance.Driver.csproj b/src/aspnetcore/src/Components/benchmarkapps/Wasm.Performance/Driver/Wasm.Performance.Driver.csproj
83+
diff --git a/src/Components/benchmarkapps/Wasm.Performance/Driver/Wasm.Performance.Driver.csproj b/src/Components/benchmarkapps/Wasm.Performance/Driver/Wasm.Performance.Driver.csproj
8484
index 346ddc48f..9e35e9b1e 100644
85-
--- a/src/aspnetcore/src/Components/benchmarkapps/Wasm.Performance/Driver/Wasm.Performance.Driver.csproj
86-
+++ b/src/aspnetcore/src/Components/benchmarkapps/Wasm.Performance/Driver/Wasm.Performance.Driver.csproj
85+
--- a/src/Components/benchmarkapps/Wasm.Performance/Driver/Wasm.Performance.Driver.csproj
86+
+++ b/src/Components/benchmarkapps/Wasm.Performance/Driver/Wasm.Performance.Driver.csproj
8787
@@ -8,7 +8,7 @@
8888
<!-- WebDriver is not strong-named, so this test project cannot be strong named either. -->
8989
<SignAssembly>false</SignAssembly>
@@ -93,10 +93,10 @@ index 346ddc48f..9e35e9b1e 100644
9393
</PropertyGroup>
9494

9595
<ItemGroup>
96-
diff --git a/src/aspnetcore/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj b/src/aspnetcore/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj
96+
diff --git a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj
9797
index aeb3c08f1..a23f607e4 100644
98-
--- a/src/aspnetcore/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj
99-
+++ b/src/aspnetcore/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj
98+
--- a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj
99+
+++ b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj
100100
@@ -96,7 +96,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant
101101
<Crossgen2ToolFileName Condition=" '$(TargetOsName)' == 'win' ">$(Crossgen2ToolFileName).exe</Crossgen2ToolFileName>
102102

@@ -118,10 +118,10 @@ index aeb3c08f1..a23f607e4 100644
118118

119119
<AssetTargetFallback>$(AssetTargetFallback);native,Version=0.0</AssetTargetFallback>
120120

121-
diff --git a/src/aspnetcore/src/Tools/Directory.Build.targets b/src/aspnetcore/src/Tools/Directory.Build.targets
121+
diff --git a/src/Tools/Directory.Build.targets b/src/Tools/Directory.Build.targets
122122
index 854f90ab5..438ea3da0 100644
123-
--- a/src/aspnetcore/src/Tools/Directory.Build.targets
124-
+++ b/src/aspnetcore/src/Tools/Directory.Build.targets
123+
--- a/src/Tools/Directory.Build.targets
124+
+++ b/src/Tools/Directory.Build.targets
125125
@@ -1,7 +1,7 @@
126126
<Project>
127127
<PropertyGroup Condition=" '$(PackAsTool)' == 'true' ">

src/SourceBuild/tarball/patches/runtime/0004-pass-targetrid-to-native-scripts.patch

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@ Date: Tue, 18 Oct 2022 20:21:02 +0000
44
Subject: [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
1717
index 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
7070
index 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
9898
index 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
122122
index 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
168168
index 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
181181
index 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
203203
index 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>

src/SourceBuild/tarball/patches/runtime/0005-support-building-runtime-with-non-portable-runtime.patch

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ Date: Tue, 18 Oct 2022 20:21:34 +0000
44
Subject: [PATCH 2/3] runtime_74504-pass-targetrid-to-native-scripts.patch
55

66
---
7-
src/runtime/Directory.Build.targets | 15 ++++
8-
src/runtime/Directory.Build.targets.orig | 96 ++++++++++++++++++++++++
7+
Directory.Build.targets | 15 ++++
8+
Directory.Build.targets.orig | 96 ++++++++++++++++++++++++
99
2 files changed, 111 insertions(+)
10-
create mode 100644 src/runtime/Directory.Build.targets.orig
10+
create mode 100644 Directory.Build.targets.orig
1111

12-
diff --git a/src/runtime/Directory.Build.targets b/src/runtime/Directory.Build.targets
12+
diff --git a/Directory.Build.targets b/Directory.Build.targets
1313
index d0c698797..4337207a4 100644
14-
--- a/src/runtime/Directory.Build.targets
15-
+++ b/src/runtime/Directory.Build.targets
14+
--- a/Directory.Build.targets
15+
+++ b/Directory.Build.targets
1616
@@ -11,6 +11,21 @@
1717
<Import Project="$(RepositoryEngineeringDir)liveBuilds.targets" />
1818
<Import Project="$(RepositoryEngineeringDir)python.targets" />

src/SourceBuild/tarball/patches/runtime/0006-use-generated-runtimejson-when-building-sharedframework.patch

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@ Subject: [PATCH 3/3]
55
runtime_76068-use-generated-runtimejson-when-building-sharedframework.patch
66

77
---
8-
src/runtime/Directory.Build.props | 1 -
9-
src/runtime/eng/liveBuilds.targets | 4 +++-
8+
Directory.Build.props | 1 -
9+
eng/liveBuilds.targets | 4 +++-
1010
.../src/Microsoft.NETCore.Platforms.csproj | 6 +++---
11-
src/runtime/src/libraries/pretest.proj | 2 +-
11+
src/libraries/pretest.proj | 2 +-
1212
4 files changed, 7 insertions(+), 6 deletions(-)
1313

14-
diff --git a/src/runtime/Directory.Build.props b/src/runtime/Directory.Build.props
14+
diff --git a/Directory.Build.props b/Directory.Build.props
1515
index c815af204..790ee76a3 100644
16-
--- a/src/runtime/Directory.Build.props
17-
+++ b/src/runtime/Directory.Build.props
16+
--- a/Directory.Build.props
17+
+++ b/Directory.Build.props
1818
@@ -253,7 +253,6 @@
1919
<PackageProjectUrl>https://dot.net</PackageProjectUrl>
2020
<Owners>microsoft,dotnetframework</Owners>
@@ -23,10 +23,10 @@ index c815af204..790ee76a3 100644
2323
<LicenseFile>$(MSBuildThisFileDirectory)LICENSE.TXT</LicenseFile>
2424
<PackageLicenseExpression>MIT</PackageLicenseExpression>
2525
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
26-
diff --git a/src/runtime/eng/liveBuilds.targets b/src/runtime/eng/liveBuilds.targets
26+
diff --git a/eng/liveBuilds.targets b/eng/liveBuilds.targets
2727
index d62f4bcd4..0834d63b1 100644
28-
--- a/src/runtime/eng/liveBuilds.targets
29-
+++ b/src/runtime/eng/liveBuilds.targets
28+
--- a/eng/liveBuilds.targets
29+
+++ b/eng/liveBuilds.targets
3030
@@ -193,6 +193,8 @@
3131
</Target>
3232

@@ -37,10 +37,10 @@ index d62f4bcd4..0834d63b1 100644
3737
+ <BundledRuntimeIdentifierGraphFile Condition="!Exists('$(BundledRuntimeIdentifierGraphFile)')">$([MSBuild]::NormalizePath('$(LibrariesProjectRoot)', 'Microsoft.NETCore.Platforms', 'src', 'runtime.json'))</BundledRuntimeIdentifierGraphFile>
3838
</PropertyGroup>
3939
</Project>
40-
diff --git a/src/runtime/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj b/src/runtime/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj
40+
diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj b/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj
4141
index 262b0aae1..637bc8261 100644
42-
--- a/src/runtime/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj
43-
+++ b/src/runtime/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj
42+
--- a/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj
43+
+++ b/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj
4444
@@ -41,7 +41,7 @@
4545

4646
<ItemGroup>
@@ -65,10 +65,10 @@ index 262b0aae1..637bc8261 100644
6565
UpdateRuntimeFiles="True" />
6666
</Target>
6767

68-
diff --git a/src/runtime/src/libraries/pretest.proj b/src/runtime/src/libraries/pretest.proj
68+
diff --git a/src/libraries/pretest.proj b/src/libraries/pretest.proj
6969
index fc2fee13d..ee9473523 100644
70-
--- a/src/runtime/src/libraries/pretest.proj
71-
+++ b/src/runtime/src/libraries/pretest.proj
70+
--- a/src/libraries/pretest.proj
71+
+++ b/src/libraries/pretest.proj
7272
@@ -92,7 +92,7 @@
7373
Condition="'$(BuildTargetFramework)' == '$(NetCoreAppCurrent)' or '$(BuildTargetFramework)' == ''">
7474
<!-- Shared framework deps file generation. Produces a test shared-framework deps file. -->

src/SourceBuild/tarball/patches/sdk/0001-map-nonportable-rids-when-targetos-is-determined.patch

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ Subject: [PATCH 1/2] ResolveReadyToRunCompilers: map non-portable rids when
99
.../ResolveReadyToRunCompilers.cs | 10 +++++++++-
1010
1 file changed, 9 insertions(+), 1 deletion(-)
1111

12-
diff --git a/src/sdk/src/Tasks/Microsoft.NET.Build.Tasks/ResolveReadyToRunCompilers.cs b/src/sdk/src/Tasks/Microsoft.NET.Build.Tasks/ResolveReadyToRunCompilers.cs
12+
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/ResolveReadyToRunCompilers.cs b/src/Tasks/Microsoft.NET.Build.Tasks/ResolveReadyToRunCompilers.cs
1313
index 716a7f37c3c..6967822aca1 100644
14-
--- a/src/sdk/src/Tasks/Microsoft.NET.Build.Tasks/ResolveReadyToRunCompilers.cs
15-
+++ b/src/sdk/src/Tasks/Microsoft.NET.Build.Tasks/ResolveReadyToRunCompilers.cs
14+
--- a/src/Tasks/Microsoft.NET.Build.Tasks/ResolveReadyToRunCompilers.cs
15+
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/ResolveReadyToRunCompilers.cs
1616
@@ -143,7 +143,15 @@ private bool ValidateCrossgen2Support()
1717

1818
bool version5 = crossgen2PackVersion.Major < 6;
@@ -41,10 +41,10 @@ Subject: [PATCH 2/2] For source-build, allow using a rid that is not in the
4141
.../ResolveReadyToRunCompilers.cs | 61 +++++++++++++------
4242
1 file changed, 44 insertions(+), 17 deletions(-)
4343

44-
diff --git a/src/sdk/src/Tasks/Microsoft.NET.Build.Tasks/ResolveReadyToRunCompilers.cs b/src/sdk/src/Tasks/Microsoft.NET.Build.Tasks/ResolveReadyToRunCompilers.cs
44+
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/ResolveReadyToRunCompilers.cs b/src/Tasks/Microsoft.NET.Build.Tasks/ResolveReadyToRunCompilers.cs
4545
index 6967822aca1..5d21bc96e84 100644
46-
--- a/src/sdk/src/Tasks/Microsoft.NET.Build.Tasks/ResolveReadyToRunCompilers.cs
47-
+++ b/src/sdk/src/Tasks/Microsoft.NET.Build.Tasks/ResolveReadyToRunCompilers.cs
46+
--- a/src/Tasks/Microsoft.NET.Build.Tasks/ResolveReadyToRunCompilers.cs
47+
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/ResolveReadyToRunCompilers.cs
4848
@@ -144,28 +144,13 @@ private bool ValidateCrossgen2Support()
4949
bool version5 = crossgen2PackVersion.Major < 6;
5050
bool isSupportedTarget = ExtractTargetPlatformAndArchitecture(_targetRuntimeIdentifier, out _targetPlatform, out _targetArchitecture);

0 commit comments

Comments
 (0)