Move more patching to sed

Servarr · Mar 7, 2021 · 7af9219 · 7af9219
1 parent 81cd052
commit 7af9219
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 65 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -88,7 +88,8 @@ stages:
           - bash: |
               set -e
               git -C aspnetcore checkout ${{ parameters.aspBranch }}
-              git -C aspnetcore apply ../dotnet-bsd/patches/aspnetcore/0001-freebsd-support.patch
+              sed -i '/linux-x64;/a \ \ \ \ \ \ freebsd-x64;' aspnetcore/Directory.Build.props
+              sed -i '/<LatestPackageReference Include="Microsoft.NETCore.App.Runtime.linux-x64" \/>/a \ \ \ \ <LatestPackageReference Include="Microsoft.NETCore.App.Runtime.freebsd-x64" \/>' aspnetcore/eng/Dependencies.props
               dotnet nuget add source ../runtime/artifacts/packages/Release/Shipping --name local --configfile aspnetcore/NuGet.config
               sed -i '/\/dnceng\/internal\//d' aspnetcore/NuGet.config
             displayName: Apply patches
@@ -128,6 +129,8 @@ stages:
               set -e
               git -C installer checkout ${{ parameters.sdkBranch }}
               git -C installer apply ../dotnet-bsd/patches/installer/0001-freebsd-support.patch
+              sed -i 's/NetCore5AppHostRids Include="@(NetCore31RuntimePackRids)/NetCore5AppHostRids Include="@(NetCore31RuntimePackRids);freebsd-x64/' installer/src/redist/targets/GenerateBundledVersions.targets
+              sed -i 's/AspNetCore50RuntimePackRids Include="@(AspNetCore31RuntimePackRids)/AspNetCore50RuntimePackRids Include="@(AspNetCore31RuntimePackRids);freebsd-x64/' installer/src/redist/targets/GenerateBundledVersions.targets
               dotnet nuget remove source msbuild --configfile installer/NuGet.config || true
               dotnet nuget remove source nuget-build --configfile installer/NuGet.config || true
               dotnet nuget add source ../runtime/artifacts/packages/Release/Shipping --name runtime --configfile installer/NuGet.config

diff --git a/patches/aspnetcore/0001-freebsd-support.patch b/patches/aspnetcore/0001-freebsd-support.patch
diff --git a/patches/installer/0001-freebsd-support.patch b/patches/installer/0001-freebsd-support.patch
@@ -4,33 +4,10 @@ Date: Mon, 1 Feb 2021 17:22:10 +0000
 Subject: [PATCH] freebsd support
 
 ---
- NuGet.config                                       | 4 ++--
- src/redist/targets/GenerateBundledVersions.targets | 4 ++--
- src/redist/targets/GetRuntimeInformation.targets   | 2 +-
+
+src/redist/targets/GetRuntimeInformation.targets   | 2 +-
  3 files changed, 5 insertions(+), 5 deletions(-)
 
-diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets
-index 43b35ea06..00c2520b3 100644
---- a/src/redist/targets/GenerateBundledVersions.targets
-+++ b/src/redist/targets/GenerateBundledVersions.targets
-@@ -73,7 +73,7 @@
-
-       <NetCore31RuntimePackRids Include="@(NetCore30RuntimePackRids)"/>
-
--      <NetCore5AppHostRids Include="@(NetCore31RuntimePackRids)"/>
-+      <NetCore5AppHostRids Include="@(NetCore31RuntimePackRids);freebsd-x64;"/>
-
-       <NetCore5RuntimePackRids Include="
-           @(NetCore5AppHostRids);
-@@ -108,7 +108,7 @@
-       <Crossgen2SupportedRids Include="linux-musl-x64;linux-x64;win-x64" />
-
-       <AspNetCore31RuntimePackRids Include="@(AspNetCore30RuntimePackRids)" />
--      <AspNetCore50RuntimePackRids Include="@(AspNetCore31RuntimePackRids);win-arm64" />
-+      <AspNetCore50RuntimePackRids Include="@(AspNetCore31RuntimePackRids);win-arm64;freebsd-x64" />
-       <AspNetCoreRuntimePackRids Include="@(AspNetCore50RuntimePackRids)" />
-
-       <WindowsDesktop30RuntimePackRids Include="win-x64;win-x86" />
 diff --git a/src/redist/targets/GetRuntimeInformation.targets b/src/redist/targets/GetRuntimeInformation.targets
 index 9f53268ab..0ba2fc8dc 100644
 --- a/src/redist/targets/GetRuntimeInformation.targets