Skip to content

Commit

Permalink
Dereference paths on patches
Browse files Browse the repository at this point in the history
  • Loading branch information
ayakael committed Oct 21, 2022
1 parent efff3f4 commit 7e0f96e
Show file tree
Hide file tree
Showing 5 changed files with 78 additions and 78 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@ Subject: [PATCH 1/1]
aspnetcore_43937-support-building-with-nonportable-runtime.patch

---
src/aspnetcore/Directory.Build.props | 2 ++
src/aspnetcore/eng/Common.props | 2 ++
src/aspnetcore/eng/Dependencies.props | 2 ++
Directory.Build.props | 2 ++
eng/Common.props | 2 ++
eng/Dependencies.props | 2 ++
.../eng/tools/GenerateFiles/Directory.Build.targets.in | 7 +++++++
.../Wasm.Performance/Driver/Wasm.Performance.Driver.csproj | 2 +-
.../src/Microsoft.AspNetCore.App.Runtime.csproj | 5 +++--
src/aspnetcore/src/Tools/Directory.Build.targets | 2 +-
src/Tools/Directory.Build.targets | 2 +-
7 files changed, 18 insertions(+), 4 deletions(-)

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

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

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

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

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

Expand All @@ -118,10 +118,10 @@ index aeb3c08f1..a23f607e4 100644

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

diff --git a/src/aspnetcore/src/Tools/Directory.Build.targets b/src/aspnetcore/src/Tools/Directory.Build.targets
diff --git a/src/Tools/Directory.Build.targets b/src/Tools/Directory.Build.targets
index 854f90ab5..438ea3da0 100644
--- a/src/aspnetcore/src/Tools/Directory.Build.targets
+++ b/src/aspnetcore/src/Tools/Directory.Build.targets
--- a/src/Tools/Directory.Build.targets
+++ b/src/Tools/Directory.Build.targets
@@ -1,7 +1,7 @@
<Project>
<PropertyGroup Condition=" '$(PackAsTool)' == 'true' ">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@ Date: Tue, 18 Oct 2022 20:21:02 +0000
Subject: [PATCH 1/3] runtime_74504-pass-targetrid-to-native-scripts.patch

---
src/runtime/eng/SourceBuild.props | 21 ++++++++++++-------
src/runtime/eng/build.sh | 10 +++++++++
eng/SourceBuild.props | 21 ++++++++++++-------
eng/build.sh | 10 +++++++++
.../common/templates/steps/source-build.yml | 6 ++++++
src/runtime/eng/native/build-commons.sh | 15 +++++++++++++
eng/native/build-commons.sh | 15 +++++++++++++
.../eng/pipelines/common/global-build-job.yml | 2 ++
src/runtime/src/native/corehost/build.sh | 7 +++----
src/runtime/src/native/corehost/corehost.proj | 1 +
src/native/corehost/build.sh | 7 +++----
src/native/corehost/corehost.proj | 1 +
7 files changed, 51 insertions(+), 11 deletions(-)

diff --git a/src/runtime/eng/SourceBuild.props b/src/runtime/eng/SourceBuild.props
diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props
index b70f668a1..9e9396585 100644
--- a/src/runtime/eng/SourceBuild.props
+++ b/src/runtime/eng/SourceBuild.props
--- a/eng/SourceBuild.props
+++ b/eng/SourceBuild.props
@@ -11,14 +11,20 @@
<SourceBuildPortable>true</SourceBuildPortable>
<SourceBuildPortable Condition="'$(SourceBuildNonPortable)' == 'true'">false</SourceBuildPortable>
Expand Down Expand Up @@ -66,10 +66,10 @@ index b70f668a1..9e9396585 100644
</PropertyGroup>
</Target>

diff --git a/src/runtime/eng/build.sh b/src/runtime/eng/build.sh
diff --git a/eng/build.sh b/eng/build.sh
index 8836bde10..ea6be90af 100755
--- a/src/runtime/eng/build.sh
+++ b/src/runtime/eng/build.sh
--- a/eng/build.sh
+++ b/eng/build.sh
@@ -31,6 +31,7 @@ usage()
echo " --os Target operating system: windows, Linux, FreeBSD, OSX, MacCatalyst, tvOS,"
echo " tvOSSimulator, iOS, iOSSimulator, Android, Browser, NetBSD, illumos or Solaris."
Expand All @@ -94,10 +94,10 @@ index 8836bde10..ea6be90af 100755
-portablebuild)
if [ -z ${2+x} ]; then
echo "No value for portablebuild is supplied. See help (--help) for supported values." 1>&2
diff --git a/src/runtime/eng/common/templates/steps/source-build.yml b/src/runtime/eng/common/templates/steps/source-build.yml
diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml
index abb1b2bcd..b5b3e5aeb 100644
--- a/src/runtime/eng/common/templates/steps/source-build.yml
+++ b/src/runtime/eng/common/templates/steps/source-build.yml
--- a/eng/common/templates/steps/source-build.yml
+++ b/eng/common/templates/steps/source-build.yml
@@ -63,6 +63,11 @@ steps:
targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}'
fi
Expand All @@ -118,10 +118,10 @@ index abb1b2bcd..b5b3e5aeb 100644
/p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \
/p:ArcadeBuildFromSource=true
displayName: Build
diff --git a/src/runtime/eng/native/build-commons.sh b/src/runtime/eng/native/build-commons.sh
diff --git a/eng/native/build-commons.sh b/eng/native/build-commons.sh
index 9600e346b..85a6f50ec 100755
--- a/src/runtime/eng/native/build-commons.sh
+++ b/src/runtime/eng/native/build-commons.sh
--- a/eng/native/build-commons.sh
+++ b/eng/native/build-commons.sh
@@ -246,6 +246,7 @@ usage()
echo "-msbuildonunsupportedplatform: build managed binaries even if distro is not officially supported."
echo "-ninja: target ninja instead of GNU make"
Expand Down Expand Up @@ -164,10 +164,10 @@ index 9600e346b..85a6f50ec 100755
+fi
# Init if MSBuild for .NET Core is supported for this platform
isMSBuildOnNETCoreSupported
diff --git a/src/runtime/eng/pipelines/common/global-build-job.yml b/src/runtime/eng/pipelines/common/global-build-job.yml
diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml
index c5d913a46..1dcd4aa5a 100644
--- a/src/runtime/eng/pipelines/common/global-build-job.yml
+++ b/src/runtime/eng/pipelines/common/global-build-job.yml
--- a/eng/pipelines/common/global-build-job.yml
+++ b/eng/pipelines/common/global-build-job.yml
@@ -129,6 +129,8 @@ jobs:
platform:
buildScript: $(_sclEnableCommand) $(Build.SourcesDirectory)$(dir)build$(scriptExt)
Expand All @@ -177,10 +177,10 @@ index c5d913a46..1dcd4aa5a 100644

- ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS', 'MacCatalyst') }}:
- script: $(Build.SourcesDirectory)/eng/install-native-dependencies.sh ${{ parameters.osGroup }} ${{ parameters.archType }} azDO
diff --git a/src/runtime/src/native/corehost/build.sh b/src/runtime/src/native/corehost/build.sh
diff --git a/src/native/corehost/build.sh b/src/native/corehost/build.sh
index 3aa6820e7..4d7828a00 100755
--- a/src/runtime/src/native/corehost/build.sh
+++ b/src/runtime/src/native/corehost/build.sh
--- a/src/native/corehost/build.sh
+++ b/src/native/corehost/build.sh
@@ -83,14 +83,13 @@ __LogsDir="$__RootBinDir/log"
__MsbuildDebugLogsDir="$__LogsDir/MsbuildDebugLogs"

Expand All @@ -199,10 +199,10 @@ index 3aa6820e7..4d7828a00 100755
__CMakeArgs="-DRUNTIME_FLAVOR=\"$__RuntimeFlavor\" $__CMakeArgs"
__CMakeArgs="-DFEATURE_DISTRO_AGNOSTIC_SSL=$__PortableBuild $__CMakeArgs"

diff --git a/src/runtime/src/native/corehost/corehost.proj b/src/runtime/src/native/corehost/corehost.proj
diff --git a/src/native/corehost/corehost.proj b/src/native/corehost/corehost.proj
index ba630e8d2..004358388 100644
--- a/src/runtime/src/native/corehost/corehost.proj
+++ b/src/runtime/src/native/corehost/corehost.proj
--- a/src/native/corehost/corehost.proj
+++ b/src/native/corehost/corehost.proj
@@ -33,6 +33,7 @@
<BuildArgs Condition="'$(Ninja)' == 'true'">$(BuildArgs) -ninja</BuildArgs>
<BuildArgs>$(BuildArgs) -runtimeflavor $(RuntimeFlavor)</BuildArgs>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ Date: Tue, 18 Oct 2022 20:21:34 +0000
Subject: [PATCH 2/3] runtime_74504-pass-targetrid-to-native-scripts.patch

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

diff --git a/src/runtime/Directory.Build.targets b/src/runtime/Directory.Build.targets
diff --git a/Directory.Build.targets b/Directory.Build.targets
index d0c698797..4337207a4 100644
--- a/src/runtime/Directory.Build.targets
+++ b/src/runtime/Directory.Build.targets
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -11,6 +11,21 @@
<Import Project="$(RepositoryEngineeringDir)liveBuilds.targets" />
<Import Project="$(RepositoryEngineeringDir)python.targets" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ Subject: [PATCH 3/3]
runtime_76068-use-generated-runtimejson-when-building-sharedframework.patch

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

diff --git a/src/runtime/Directory.Build.props b/src/runtime/Directory.Build.props
diff --git a/Directory.Build.props b/Directory.Build.props
index c815af204..790ee76a3 100644
--- a/src/runtime/Directory.Build.props
+++ b/src/runtime/Directory.Build.props
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -253,7 +253,6 @@
<PackageProjectUrl>https://dot.net</PackageProjectUrl>
<Owners>microsoft,dotnetframework</Owners>
Expand All @@ -23,10 +23,10 @@ index c815af204..790ee76a3 100644
<LicenseFile>$(MSBuildThisFileDirectory)LICENSE.TXT</LicenseFile>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
diff --git a/src/runtime/eng/liveBuilds.targets b/src/runtime/eng/liveBuilds.targets
diff --git a/eng/liveBuilds.targets b/eng/liveBuilds.targets
index d62f4bcd4..0834d63b1 100644
--- a/src/runtime/eng/liveBuilds.targets
+++ b/src/runtime/eng/liveBuilds.targets
--- a/eng/liveBuilds.targets
+++ b/eng/liveBuilds.targets
@@ -193,6 +193,8 @@
</Target>

Expand All @@ -37,10 +37,10 @@ index d62f4bcd4..0834d63b1 100644
+ <BundledRuntimeIdentifierGraphFile Condition="!Exists('$(BundledRuntimeIdentifierGraphFile)')">$([MSBuild]::NormalizePath('$(LibrariesProjectRoot)', 'Microsoft.NETCore.Platforms', 'src', 'runtime.json'))</BundledRuntimeIdentifierGraphFile>
</PropertyGroup>
</Project>
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
diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj b/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj
index 262b0aae1..637bc8261 100644
--- 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
--- a/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj
+++ b/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj
@@ -41,7 +41,7 @@

<ItemGroup>
Expand All @@ -65,10 +65,10 @@ index 262b0aae1..637bc8261 100644
UpdateRuntimeFiles="True" />
</Target>

diff --git a/src/runtime/src/libraries/pretest.proj b/src/runtime/src/libraries/pretest.proj
diff --git a/src/libraries/pretest.proj b/src/libraries/pretest.proj
index fc2fee13d..ee9473523 100644
--- a/src/runtime/src/libraries/pretest.proj
+++ b/src/runtime/src/libraries/pretest.proj
--- a/src/libraries/pretest.proj
+++ b/src/libraries/pretest.proj
@@ -92,7 +92,7 @@
Condition="'$(BuildTargetFramework)' == '$(NetCoreAppCurrent)' or '$(BuildTargetFramework)' == ''">
<!-- Shared framework deps file generation. Produces a test shared-framework deps file. -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ Subject: [PATCH 1/2] ResolveReadyToRunCompilers: map non-portable rids when
.../ResolveReadyToRunCompilers.cs | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)

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

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

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

0 comments on commit 7e0f96e

Please sign in to comment.