From d528c2e33a687bb409e57e51c050ee746c7ab8d4 Mon Sep 17 00:00:00 2001
From: Antoine Martin <dev@ayakael.net>
Date: Tue, 14 Mar 2023 16:30:49 -0400
Subject: [PATCH] user/dotnet6-build: upgrade to 6.0.115

---
 user/dotnet6-build/APKBUILD                   |  8 +--
 .../dotnet6-build/build_13378-arm-build.patch | 71 -------------------
 .../installer_13378-arm-build.patch           | 43 -----------
 3 files changed, 2 insertions(+), 120 deletions(-)
 delete mode 100644 user/dotnet6-build/build_13378-arm-build.patch
 delete mode 100644 user/dotnet6-build/installer_13378-arm-build.patch

diff --git a/user/dotnet6-build/APKBUILD b/user/dotnet6-build/APKBUILD
index 533ca4b..13c0f24 100644
--- a/user/dotnet6-build/APKBUILD
+++ b/user/dotnet6-build/APKBUILD
@@ -18,7 +18,7 @@
 #     - CVE-2023-21808
 
 pkgname=dotnet6-build
-pkgver=6.0.114
+pkgver=6.0.115
 pkgrel=0
 _gittag=v$pkgver
 _giturl="https://github.com/dotnet/installer"
@@ -26,13 +26,11 @@ _testtag=4832cef147bac35fdd5c57275a795e683bba0bb8
 _bunnytag=71880bd94711519f7b786248a88a827a401207a2
 _patches="
 	aspnetcore_46735-set-known-good-runtimeid.patch
-	build_13378-arm-build.patch
 	build_14816-non-portable-build.patch
 	build_14816-stop-overriding-aspnetcore-version.patch
 	build_14816-update-portable-rid-logic.patch
 	build_disable-apphost.diff
 	check_rid-alpine-generation.diff
-	installer_13378-arm-build.patch
 	installer_14816-crossgen2-rid.patch
 	installer_14816-update-portable-rid-logic.patch
 	msbuild_optional-systemconfiguration.patch
@@ -528,17 +526,15 @@ doc() {
 }
 
 sha512sums="
-2c01c7b2de4d47d4125717e1240b4822af8b07336d48d87cbc0521fc1b7245672ded01021ad9cdba476b8aa519c4376f40ee1654254e687bef07df9872a3476d  dotnet-v6.0.114.tar.xz
+d205bd65e5d51b9471805553c2a8a4c34cf81df72eaede9072541061c78109356b8b77d0b2fdc85eb33b3907facf7d06aca9247e03830df66f91385e62237ec1  dotnet-v6.0.115.tar.xz
 994e5145653698551408a87e34d19368e85a2531af9e2bfe61b903af0f016bfd5e4a7691795bdf09ba74bf6f41fc666973ee8cfde9088738f9a2f83f4bafa5e4  dotnet-testsuite-4832cef147bac35fdd5c57275a795e683bba0bb8.tar.gz
 fc281df5fcf0d31dc9ff7f5b0e870960cfbe3c4fa0f6a6bb50b22c4ee18d2c608c827205bc79bd7f686d77ac917582fc26f68432cdd86c4a33b910c0c7416d09  dotnet-bunny-71880bd94711519f7b786248a88a827a401207a2.tar.gz
 5a46a1ac9f70c378c7193275de399d7c7c235c5c7da7e76d0b44ff380ae1df3f3724cebc9c430157606c545bb3aa6d321d0e7d6702f9c4d8e74c901d394a6c51  aspnetcore_46735-set-known-good-runtimeid.patch
-6e9663f466007fc5fa7010e6859f054b6a4e59affa7aae7fd4d9ab4ba8410d4855b680f58f938ad21d0b3d2a7c7b097c7e9494a4dde2c43478ddddbf37539545  build_13378-arm-build.patch
 bdbe798add3ded0c2cf361c9f5aa18fb3540e348e68a5695cbdb797be917f06d1bda69855cae2f36950e9506119e81165927787e13b80a17a1b647ef2c221916  build_14816-non-portable-build.patch
 3e04fff2d9d9b39ac4dce0b80f4b566fff8819313a5bf1df791e8f1a63a26ef882bd8aa1524344f63fbb4a3728077179b7f1d7ebefc003c236d39a48beaa0073  build_14816-stop-overriding-aspnetcore-version.patch
 70d402d0bcaa98c8b09652365404238b67ed26eb9c3d510c7d6309fb61937d98c9144f1096e521c11b00e946d29585a9d474498ccc5223de32bd6471ab5a431f  build_14816-update-portable-rid-logic.patch
 a5a359af816595fbf19482e5dccf874c78d2fc4b59f38223118aac603b33e00c9fed22580eee3112519477205c2c8ed16177d100f09f45275e3da3c20b0ed7f7  build_disable-apphost.diff
 941b430b55e323f723bbc5160447f060f40d18ce32e5803ab7dda16bfc60a0f5ec1dccd246e68475d7115ee265a9433824d8a5d997c302531311194a90deeca9  check_rid-alpine-generation.diff
-23b712d7a088e780cd0994c5577b4c015cc1478e3a6bbca9b6e97ff2f2711562ef3a01ed483582a6861b31989b949972e2159caa4a34e0b18b6e8c062bb82c9e  installer_13378-arm-build.patch
 7ffda90d766217e7c3756ebd423b557218c24f5337668b319421514945d3f961d82037c997b7254de088b1853102d7de15e0d824cf2cc02a6c455efc2b0107a2  installer_14816-crossgen2-rid.patch
 e71f91d14873755bc2f227807d909e5260bd1f166a262eda0bf05d4a3975a7bce7fde457c1eba476a83b317aebdaaba25f1893d3385182428c08bba6243f21c8  installer_14816-update-portable-rid-logic.patch
 86e14ecc0269c8b2c2a2a679790de4fa4e15ac06b2a831e1129c4a7de1499d60583fcdc79b3705652c3c4ced73afac2e0ee3edce2cfa3b00fddf94180fb26e10  msbuild_optional-systemconfiguration.patch
diff --git a/user/dotnet6-build/build_13378-arm-build.patch b/user/dotnet6-build/build_13378-arm-build.patch
deleted file mode 100644
index 5c23c42..0000000
--- a/user/dotnet6-build/build_13378-arm-build.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 75c3e74ea35219f257c80daf9a236e0f518a7875 Mon Sep 17 00:00:00 2001
-Patch-Source: https://github.com/dotnet/installer/pull/13378
-From: Antoine Martin <dev@ayakael.net>
-Date: Wed, 9 Mar 2022 20:16:03 +0000
-Subject: [PATCH 1/1] arm support
-
-By default, build does not support arm. This patch introduces all the logics
-to parse platform information.
-
----
- Directory.Build.props       | 2 +-
- repos/known-good.proj       | 2 +-
- repos/runtime.common.props  | 2 +-
- tools-local/init-build.proj | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/Directory.Build.props b/Directory.Build.props
-index 61cc6ff67..d921eda93 100644
---- a/Directory.Build.props
-+++ b/Directory.Build.props
-@@ -17,7 +17,7 @@
-   <PropertyGroup>
-     <Platform Condition="'$(Platform)' == 'AnyCPU'"></Platform>
-     <BuildArchitecture>$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant())</BuildArchitecture>
--    <Platform Condition="'$(Platform)' == '' AND '$(BuildArchitecture)' == 'arm64'">$(BuildArchitecture)</Platform>
-+    <Platform Condition="'$(Platform)' == '' AND ( '$(BuildArchitecture)' == 'arm64' OR '$(BuildArchitecture)' == 'arm') ">$(BuildArchitecture)</Platform>
-     <Platform Condition="'$(Platform)' == '' AND '$(BuildArchitecture)' == 's390x'">$(BuildArchitecture)</Platform>
-     <Platform Condition="'$(Platform)' == ''">x64</Platform>
- 
-diff --git a/repos/known-good.proj b/repos/known-good.proj
-index eab516290..c04cdac70 100644
---- a/repos/known-good.proj
-+++ b/repos/known-good.proj
-@@ -18,7 +18,7 @@
-         <RepositoryReference Include="runtime" />
-       </ItemGroup>
-     </When>
--    <When Condition="$(Platform.Contains('arm')) AND '$(BuildArchitecture)' != 'arm64'">
-+    <When Condition="$(Platform.Contains('arm')) AND '$(BuildArchitecture)' != 'arm64' AND '$(BuildArchitecture)' != 'arm'">
-       <ItemGroup>
-         <RepositoryReference Include="runtime" />
-       </ItemGroup>
-diff --git a/repos/runtime.common.props b/repos/runtime.common.props
-index b1e9e6adb..037c3d94a 100644
---- a/repos/runtime.common.props
-+++ b/repos/runtime.common.props
-@@ -13,7 +13,7 @@
-     <BuildCommandArgs>$(StandardSourceBuildArgs.Replace('-bl', '-nobl'))</BuildCommandArgs>
- 
-     <BuildCommand>$(StandardSourceBuildCommand) $(BuildCommandArgs)</BuildCommand>
--    <BuildCommand Condition="$(Platform.Contains('arm')) AND '$(BuildArchitecture)' != 'arm64'">$(ArmEnvironmentVariables) $(StandardSourceBuildCommand) $(BuildCommandArgs)</BuildCommand>
-+    <BuildCommand Condition="$(Platform.Contains('arm')) AND '$(BuildArchitecture)' != 'arm64' AND '$(BuildArchitecture)' != 'arm'">$(ArmEnvironmentVariables) $(StandardSourceBuildCommand) $(BuildCommandArgs)</BuildCommand>
- 
-     <CleanCommand>$(ProjectDirectory)/clean$(ShellExtension)</CleanCommand>
-   </PropertyGroup>
-diff --git a/tools-local/init-build.proj b/tools-local/init-build.proj
-index 701f76c0c..b2c3beed1 100644
---- a/tools-local/init-build.proj
-+++ b/tools-local/init-build.proj
-@@ -138,7 +138,7 @@
-   </Target>
- 
-   <Target Name="GenerateRootFs" Condition="'$(OS)' != 'Windows_NT'">
--     <Exec Condition="$(Platform.Contains('arm')) AND '$(Platform)' != 'armel' AND '$(BuildArchitecture)' != 'arm64'" Command="$(ArmEnvironmentVariables) $(ProjectDir)cross/build-rootfs.sh" />
-+     <Exec Condition="$(Platform.Contains('arm')) AND '$(Platform)' != 'armel' AND '$(BuildArchitecture)' != 'arm64' AND '$(BuildArchitecture)' != 'arm'" Command="$(ArmEnvironmentVariables) $(ProjectDir)cross/build-rootfs.sh" />
-      <Exec Condition="'$(Platform)' == 'armel'" Command="$(ArmEnvironmentVariables) $(ProjectDir)cross/armel/tizen-build-rootfs.sh" />
-   </Target>
- 
--- 
-2.35.1
-
diff --git a/user/dotnet6-build/installer_13378-arm-build.patch b/user/dotnet6-build/installer_13378-arm-build.patch
deleted file mode 100644
index 9f534d3..0000000
--- a/user/dotnet6-build/installer_13378-arm-build.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 4f21dd6d62c740e2cc2557bbc5d6c2f2653a5612 Mon Sep 17 00:00:00 2001
-Patch-Source: https://github.com/dotnet/installer/pull/13378
-From: Antoine Martin <dev@ayakael.net>
-Date: Wed, 9 Mar 2022 08:17:41 +0000
-Subject: [PATCH 1/1] arm build
-
-By default, installer does not support arm. This patch introduces all the logics
-to parse platform information.
-
----
- Directory.Build.props | 2 +-
- eng/Build.props       | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/installer/Directory.Build.props b/src/installer/Directory.Build.props
-index c373c9beb..af0f16f88 100644
---- a/src/installer/Directory.Build.props
-+++ b/src/installer/Directory.Build.props
-@@ -9,7 +9,7 @@
- 
-   <PropertyGroup>
-     <BuildArchitecture>$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant())</BuildArchitecture>
--    <Architecture Condition="'$(Architecture)' == '' AND '$(BuildArchitecture)' == 'arm64'">$(BuildArchitecture)</Architecture>
-+    <Architecture Condition="'$(Architecture)' == '' AND ( '$(BuildArchitecture)' == 'arm64' OR '$(BuildArchitecture)' == 'arm') ">$(BuildArchitecture)</Architecture>
-     <Architecture Condition="'$(Architecture)' == '' AND '$(BuildArchitecture)' == 's390x'">$(BuildArchitecture)</Architecture>
-     <Architecture Condition="'$(Architecture)' == ''">x64</Architecture>
-   </PropertyGroup>
-diff --git a/src/installer/eng/Build.props b/src/installer/eng/Build.props
-index 4df683bab..0aa640051 100644
---- a/src/installer/eng/Build.props
-+++ b/src/installer/eng/Build.props
-@@ -1,7 +1,7 @@
- <Project>
-   <ItemGroup Condition=" '$(ArcadeBuildTarball)' != 'true' ">
-     <ProjectToBuild Include="$(RepoRoot)Microsoft.DotNet.Cli.sln" />
--    <ProjectToBuild Condition="'$(OS)' == 'Windows_NT' And ('$(Architecture)' == 'x86' Or '$(Architecture)' == 'x64' Or '$(Architecture)' == 'arm64')" 
-+    <ProjectToBuild Condition="'$(OS)' == 'Windows_NT' And ('$(Architecture)' == 'x86' Or '$(Architecture)' == 'x64' Or '$(Architecture)' == 'arm64' Or '$(Architecture)' == 'arm')" 
-                     Include="$(RepoRoot)eng\version.csproj;
-                              $(RepoRoot)eng\native.proj" />
-   </ItemGroup>
--- 
-2.35.1
-