diff options
Diffstat (limited to 'testing/dotnet31-bootstrap/core-sdk_generate-layout-core-setup-blob-path-fix.patch')
| -rw-r--r-- | testing/dotnet31-bootstrap/core-sdk_generate-layout-core-setup-blob-path-fix.patch | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/testing/dotnet31-bootstrap/core-sdk_generate-layout-core-setup-blob-path-fix.patch b/testing/dotnet31-bootstrap/core-sdk_generate-layout-core-setup-blob-path-fix.patch deleted file mode 100644 index fa35a2debd5..00000000000 --- a/testing/dotnet31-bootstrap/core-sdk_generate-layout-core-setup-blob-path-fix.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 94e8b5473285f0ae97204c726b2f8119f178f197 Mon Sep 17 00:00:00 2001 -From: Antoine Martin <dev@ayakael.net> -Date: Sun, 5 Dec 2021 15:33:35 +0000 -Subject: [PATCH 1/1] GenerateLayout CoreSetup blob path fix - -<dotnet/core-setup> blobs are written to $builddir/artifacts/obj/x64/Release/ -blobs/Runtime/3.1.20-alpine.3.15 while installer expects them in 3.1.20. -This patches <dotnet/installer>/src/redist/targets/GenerateLayout.targets -to point to actual path. - ---- - src/redist/targets/GenerateLayout.targets | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets -index eb4e312c0..240dbf403 100644 ---- a/src/redist/targets/GenerateLayout.targets -+++ b/src/redist/targets/GenerateLayout.targets -@@ -12,7 +12,7 @@ - <PropertyGroup> - <!-- Blob storage directories are not stabilized, so these must refer to a package that does not stabilize --> - <AspNetCoreBlobVersion>$(MicrosoftAspNetCoreAppRuntimewinx64PackageVersion)</AspNetCoreBlobVersion> -- <CoreSetupBlobVersion>$(MicrosoftNETCoreAppRuntimePackageVersion)</CoreSetupBlobVersion> -+ <CoreSetupBlobVersion>$(MicrosoftNETCoreAppRuntimePackageVersion)-$([System.Text.RegularExpressions.Regex]::Replace($(Rid), "-.*", ""))</CoreSetupBlobVersion> - - <!-- Change these individually to or $(CoreSetupBlobVersion), $(AspNetCoreBlobVersion), or appropriate fixed version depending if corresponding .Ref packages are unpinned. --> - <NETCoreAppTargetingPackBlobVersion Condition="'$(Rid)' != 'win-arm64'">3.1.0-rtm.19565.2</NETCoreAppTargetingPackBlobVersion> --- -2.34.0 - |