diff --git a/dotnet-6.yaml b/dotnet-6.yaml
index b6bb7de785c..1dc0f1a64c7 100644
--- a/dotnet-6.yaml
+++ b/dotnet-6.yaml
@@ -1,6 +1,6 @@
 package:
   name: dotnet-6
-  version: 6.0.123
+  version: 6.0.125
   epoch: 0
   description: ".NET SDK, version 6"
   target-architecture:
@@ -43,7 +43,7 @@ pipeline:
     with:
       repository: https://github.com/dotnet/installer
       tag: v${{package.version}}
-      expected-commit: a33389fcc17c512c4ce21b1cf88863aa55e7307a
+      expected-commit: e898a826c2b7f66602c8962134ef165fb9e6d44b
       destination: /home/build/installer
 
   - working-directory: /home/build/installer
@@ -52,33 +52,33 @@ pipeline:
 
   - working-directory: /home/build/src
     pipeline:
-      - uses: patch
-        with:
-          patches: /home/build/build_14816-non-portable-build.patch
-      - uses: patch
-        with:
-          patches: /home/build/build_14816-stop-overriding-aspnetcore-version.patch
-      - uses: patch
-        with:
-          patches: /home/build/build_14816-update-portable-rid-logic.patch
-      - uses: patch
-        with:
-          patches: /home/build/installer_14816-crossgen2-rid.patch
-      - uses: patch
-        with:
-          patches: /home/build/installer_14816-update-portable-rid-logic.patch
       - runs: |
           sed -i -E 's|( /p:BuildDebPackage=false)|\1 /p:EnablePackageValidation=false|' src/runtime/eng/SourceBuild.props
           sed -i -E 's|( /p:BuildDebPackage=false)|\1 --cmakeargs -DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE|' src/runtime/eng/SourceBuild.props
           ./prep.sh --bootstrap
-      - runs: |
-          ./build.sh --online --clean-while-building \
-            -- \
-            /v:n \
-            /p:ContinueOnPrebuiltBaselineError=true \
-            /p:MinimalConsoleLogOutput=false \
-            /p:PrebuiltPackagesPath=/home/build/src/packages \
-            /p:SkipPortableRuntimeBuild=true
+      - assertions:
+          required-steps: 1
+        pipeline:
+          - if: ${{build.arch}} == 'aarch64'
+            runs: |
+              ./build.sh --online --clean-while-building \
+                -- \
+                /v:n \
+                /p:ContinueOnPrebuiltBaselineError=true \
+                /p:MinimalConsoleLogOutput=false \
+                /p:PrebuiltPackagesPath=/home/build/src/packages \
+                /p:SkipPortableRuntimeBuild=true \
+                /p:TargetRid=linux-arm64
+          - if: ${{build.arch}} == 'x86_64'
+            runs: |
+              ./build.sh --online --clean-while-building \
+                -- \
+                /v:n \
+                /p:ContinueOnPrebuiltBaselineError=true \
+                /p:MinimalConsoleLogOutput=false \
+                /p:PrebuiltPackagesPath=/home/build/src/packages \
+                /p:SkipPortableRuntimeBuild=true \
+                /p:TargetRid=linux-x64
       - runs: |
           mkdir -p "${{targets.destdir}}"/usr/share/dotnet
           mkdir -p "${{targets.destdir}}"/usr/bin
diff --git a/dotnet-6/build_14816-non-portable-build.patch b/dotnet-6/build_14816-non-portable-build.patch
deleted file mode 100644
index 31164955f35..00000000000
--- a/dotnet-6/build_14816-non-portable-build.patch
+++ /dev/null
@@ -1,208 +0,0 @@
-From 3008f7ef29e0a5593f6f0afbdc9343f573f1a375 Mon Sep 17 00:00:00 2001
-Patch-Source: https://github.com/dotnet/installer/pull/14816
-From: Antoine Martin <dev@ayakael.net>
-Date: Tue, 15 Nov 2022 01:04:07 -0500
-Subject: [PATCH 1/3] Eliminate runtime portable build (backport dotnet#14549)
-
----
- .../tarball/content/Directory.Build.props     |  8 --
- .../tarball/content/repos/aspnetcore.proj     |  1 +
- .../tarball/content/repos/installer.proj      |  2 +-
- .../tarball/content/repos/known-good.proj     |  1 -
- .../content/repos/runtime-portable.proj       | 47 -----------
- .../content/repos/runtime.common.props        | 43 ----------
- .../content/repos/runtime.common.targets      | 46 -----------
- .../tarball/content/repos/runtime.proj        | 82 ++++++++++++++++++-
- .../source-build-reference-packages.proj      |  4 +-
- src/redist/targets/Crossgen.targets           |  2 +-
- src/redist/targets/GenerateLayout.targets     |  3 +
- 11 files changed, 88 insertions(+), 151 deletions(-)
- delete mode 100644 repos/runtime-portable.proj
- delete mode 100644 repos/runtime.common.props
- delete mode 100644 repos/runtime.common.targets
-
-diff --git a/Directory.Build.props b/Directory.Build.props
-index 61cc6ff67..2e2d7e8bc 100644
---- a/Directory.Build.props
-+++ b/Directory.Build.props
-@@ -22,14 +22,6 @@
-     <Platform Condition="'$(Platform)' == ''">x64</Platform>
- 
-     <UseStableVersions Condition="'$(UseStableVersions)' == ''">false</UseStableVersions>
--
--    <!-- new supported portable/nonportable options.  These control whether to build portable runtime
--         or portable SDK.  The PortableBuild flag is only set in runtime-portable.proj and should
--         no longer be passed in.  -->
--    <BuildPortableRuntime Condition="'$(BuildPortableRuntime)' == ''">false</BuildPortableRuntime>
--    <BuildPortableSdk Condition="'$(BuildPortableSdk)' == ''">false</BuildPortableSdk>
--    <UseSystemLibraries Condition="'$(UseSystemLibraries)' == '' AND '$(PortableRuntime)' != 'true'">true</UseSystemLibraries>
--    <UseSystemLibraries Condition="'$(UseSystemLibraries)' == ''">false</UseSystemLibraries>
-   </PropertyGroup>
- 
-   <!-- This repo's projects are entirely infrastructure and do not ship. -->
-diff --git a/repos/aspnetcore.proj b/repos/aspnetcore.proj
-index 480f3c713..52243024a 100644
---- a/repos/aspnetcore.proj
-+++ b/repos/aspnetcore.proj
-@@ -9,6 +9,7 @@
-     <BuildCommandArgs>$(BuildCommandArgs) --no-build-repo-tasks</BuildCommandArgs>
-     <BuildCommandArgs>$(BuildCommandArgs) /p:BuildNodeJs=false</BuildCommandArgs>
-     <BuildCommandArgs>$(BuildCommandArgs) /p:PublishCompressedFilesPathPrefix=$(SourceBuiltAspNetCoreRuntime)</BuildCommandArgs>
-+    <BuildCommandArgs>$(BuildCommandArgs) /p:PortableBuild=false /p:TargetRuntimeIdentifier=$(TargetRid)</BuildCommandArgs>
-     <!-- Update to 1.0.0 version of reference assemblies which are built in SBRP instead of the preview.2 version
-          included by Arcade -->
-     <BuildCommandArgs>$(BuildCommandArgs) /p:MicrosoftNetFrameworkReferenceAssembliesVersion=1.0.0</BuildCommandArgs>
-diff --git a/repos/installer.proj b/repos/installer.proj
-index e34337b85..6c08a1f67 100644
---- a/repos/installer.proj
-+++ b/repos/installer.proj
-@@ -25,7 +25,7 @@
-     <BuildCommandArgs Condition="'$(TargetOS)' == 'Linux'">$(BuildCommandArgs) /p:Rid=$(TargetRid)</BuildCommandArgs>
-     <BuildCommandArgs>$(BuildCommandArgs) /p:DOTNET_INSTALL_DIR=$(DotNetCliToolDir)</BuildCommandArgs>
- 
--    <BuildCommandArgs Condition="'$(TargetOS)' == 'Linux'">$(BuildCommandArgs) /p:AspNetCoreInstallerRid=linux-$(Platform)</BuildCommandArgs>
-+    <BuildCommandArgs Condition="'$(TargetOS)' == 'Linux'">$(BuildCommandArgs) /p:AspNetCoreInstallerRid=$(TargetRid)</BuildCommandArgs>
-     <!-- core-sdk always wants to build portable on OSX and FreeBSD -->
-     <BuildCommandArgs Condition="'$(TargetOS)' == 'FreeBSD'">$(BuildCommandArgs) /p:CoreSetupRid=freebsd-x64 /p:PortableBuild=true</BuildCommandArgs>
-     <BuildCommandArgs Condition="'$(TargetOS)' == 'OSX'">$(BuildCommandArgs) /p:CoreSetupRid=osx-x64</BuildCommandArgs>
-diff --git a/repos/known-good.proj b/repos/known-good.proj
-index eab516290..12d9943da 100644
---- a/repos/known-good.proj
-+++ b/repos/known-good.proj
-@@ -44,7 +44,6 @@
-         <!-- Tier 2 -->
-         <RepositoryReference Include="linker" />
-         <RepositoryReference Include="msbuild" />
--        <RepositoryReference Include="runtime-portable" />
-         <RepositoryReference Include="runtime" />
-         <RepositoryReference Include="templating" />
- 
-diff --git a/repos/runtime.proj b/repos/runtime.proj
-index f3ed143f8..efd8b66fa 100644
---- a/repos/runtime.proj
-+++ b/repos/runtime.proj
-@@ -1,18 +1,53 @@
- <Project>
--  <Import Project="runtime.common.props"/>
-+  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
- 
-+  <!-- Build arguments -->
-   <PropertyGroup>
-+    <LogVerbosityOptOut>true</LogVerbosityOptOut>
-+
-+    <CleanCommand>$(ProjectDirectory)/clean$(ShellExtension)</CleanCommand>
-+
-     <OverrideTargetRid>$(TargetRid)</OverrideTargetRid>
-     <OverrideTargetRid Condition="'$(TargetOS)' == 'OSX'">osx-x64</OverrideTargetRid>
-     <OverrideTargetRid Condition="'$(TargetOS)' == 'FreeBSD'">freebsd-x64</OverrideTargetRid>
-     <OverrideTargetRid Condition="'$(TargetOS)' == 'Windows_NT'">win-x64</OverrideTargetRid>
- 
-+    <_platformIndex>$(NETCoreSdkRuntimeIdentifier.LastIndexOf('-'))</_platformIndex>
-+    <RuntimeOS>$(NETCoreSdkRuntimeIdentifier.Substring(0, $(_platformIndex)))</RuntimeOS>
-+
-+    <_platformIndex>$(NETCoreSdkPortableRuntimeIdentifier.LastIndexOf('-'))</_platformIndex>
-+    <BaseOS>$(NETCoreSdkPortableRuntimeIdentifier.Substring(0, $(_platformIndex)))</BaseOS>
-+
-     <BuildCommandArgs>$(StandardSourceBuildArgs)</BuildCommandArgs>
-     <BuildCommandArgs>$(BuildCommandArgs) /p:TargetRid=$(OverrideTargetRid)</BuildCommandArgs>
-+    <BuildCommandArgs>$(BuildCommandArgs) /p:RuntimeOS=$(RuntimeOS)</BuildCommandArgs>
-+    <BuildCommandArgs>$(BuildCommandArgs) /p:BaseOS=$(BaseOS)</BuildCommandArgs>
-     <BuildCommandArgs>$(BuildCommandArgs) /p:SourceBuildNonPortable=true</BuildCommandArgs>
-     <BuildCommand>$(StandardSourceBuildCommand) $(BuildCommandArgs)</BuildCommand>
-   </PropertyGroup>
- 
-+  <!-- Output / source-build flags -->
-+  <PropertyGroup>
-+    <GlobalJsonFile>$(ProjectDirectory)global.json</GlobalJsonFile>
-+    <NuGetConfigFile>$(ProjectDirectory)NuGet.config</NuGetConfigFile>
-+    <OutputPlacementRepoApiImplemented>false</OutputPlacementRepoApiImplemented>
-+    <DependencyVersionInputRepoApiImplemented>true</DependencyVersionInputRepoApiImplemented>
-+  </PropertyGroup>
-+
-+  <!-- SDK Overrides -->
-+  <ItemGroup>
-+    <UseSourceBuiltSdkOverride Include="@(ArcadeSdkOverride)" />
-+    <UseSourceBuiltSdkOverride Include="@(ArcadeCoreFxTestingOverride)" />
-+    <UseSourceBuiltSdkOverride Include="@(ArcadePackagingOverride)" />
-+    <UseSourceBuiltSdkOverride Include="@(ArcadeTargetFrameworkSdkOverride)" />
-+    <UseSourceBuiltSdkOverride Include="@(ArcadeSharedFrameworkSdkOverride)" />
-+  </ItemGroup>
-+
-+  <!-- Environment Variables -->
-+  <ItemGroup>
-+    <EnvironmentVariables Include="BuildInParallel=false" />
-+  </ItemGroup>
-+
-   <!-- Repository References -->
-   <ItemGroup>
-       <RepositoryReference Include="arcade" />
-@@ -20,8 +55,49 @@
-       <RepositoryReference Include="linker" />
-       <RepositoryReference Include="source-build" />
-       <RepositoryReference Include="roslyn" />
--      <RepositoryReference Include="runtime-portable" />
-   </ItemGroup>
- 
--  <Import Project="runtime.common.targets" />
-+  <UsingTask AssemblyFile="$(XPlatSourceBuildTasksAssembly)" TaskName="AddRidToRuntimeJson" />
-+  <UsingTask AssemblyFile="$(XPlatSourceBuildTasksAssembly)" TaskName="PublishCoreSetupBinaries" />
-+
-+  <Target Name="SetOutputList" AfterTargets="Package" BeforeTargets="GatherBuiltPackages">
-+    <ItemGroup>
-+      <PackagesOutputList Include="$(ShippingPackagesOutput)" />
-+      <PackagesOutputList Include="$(NonShippingPackagesOutput)" />
-+    </ItemGroup>
-+  </Target>
-+
-+  <Target Name="UpdateRuntimeGraph"
-+          BeforeTargets="Build"
-+          Condition="'$(_IsBootstrapping)' == 'true'">
-+    <PropertyGroup>
-+      <RuntimeJsonFile>$(ProjectDirectory)pkg/Microsoft.NETCore.Platforms/runtime.json</RuntimeJsonFile>
-+    </PropertyGroup>
-+
-+    <Message Importance="High" Text="Adding rid, $(TargetRid), to $(RuntimeJsonFile)" />
-+    <AddRidToRuntimeJson RuntimeJson="$(RuntimeJsonFile)"
-+                         Rid="$(TargetRid)-$(Platform)" />
-+  </Target>
-+
-+  <Target Name="CopyBinariesToBinFolder"
-+          AfterTargets="ExtractIntermediatePackages"
-+          Inputs="$(MSBuildProjectFullPath)"
-+          Outputs="$(RepoCompletedSemaphorePath)CopyBinariesToBinFolder.complete">
-+    <ItemGroup>
-+      <_builtRuntimePackages Include="$(SourceBuiltAssetsDir)*.symbols.nupkg" />
-+      <_builtRuntimePackages>
-+        <TransformedFileName>$([System.String]::Copy('%(FileName)').Replace('symbols', 'nupkg'))</TransformedFileName>
-+      </_builtRuntimePackages>
-+      <BinariesToCopy Include="$(SourceBuiltAssetsDir)*.*" Exclude="$(SourceBuiltAssetsDir)*.nupkg;$(SourceBuiltAssetsDir)*.requires_nupkg_signing" />
-+      <BinariesToCopy Include="@(_builtRuntimePackages->'$(SourceBuiltPackagesPath)%(TransformedFileName)')" />
-+    </ItemGroup>
-+
-+    <Copy SourceFiles="@(BinariesToCopy)"
-+          DestinationFolder="$(OutputPath)runtime"
-+          Condition="'@(BinariesToCopy)'!=''" />
-+
-+    <WriteLinesToFile File="$(RepoCompletedSemaphorePath)CopyBinariesToBinFolder.complete" Overwrite="true" />
-+  </Target>
-+
-+  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
- </Project>
-diff --git a/repos/source-build-reference-packages.proj b/repos/source-build-reference-packages.proj
-index 69ab564a2..9545b50e4 100644
---- a/repos/source-build-reference-packages.proj
-+++ b/repos/source-build-reference-packages.proj
-@@ -2,7 +2,9 @@
-   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
- 
-   <PropertyGroup>
--    <BuildCommand>$(StandardSourceBuildCommand) $(StandardSourceBuildArgs)</BuildCommand>
-+    <BuildCommandArgs>$(StandardSourceBuildArgs)</BuildCommandArgs>
-+    <BuildCommandArgs>$(BuildCommandArgs) /p:MicrosoftNetCoreIlasmPackageRuntimeId=$(NETCoreSdkRuntimeIdentifier)</BuildCommandArgs>
-+    <BuildCommand>$(StandardSourceBuildCommand) $(BuildCommandArgs)</BuildCommand>
- 
-     <NuGetConfigFile>$(ProjectDirectory)NuGet.config</NuGetConfigFile>
-     <GlobalJsonFile>$(ProjectDirectory)global.json</GlobalJsonFile>
--- 
-2.38.2
-
diff --git a/dotnet-6/build_14816-stop-overriding-aspnetcore-version.patch b/dotnet-6/build_14816-stop-overriding-aspnetcore-version.patch
deleted file mode 100644
index e42f25fe35a..00000000000
--- a/dotnet-6/build_14816-stop-overriding-aspnetcore-version.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 94463478bd6aaec208bc5e3dd1d120e0a49aeaaa Mon Sep 17 00:00:00 2001
-Patch-Source: https://github.com/dotnet/installer/pull/14816
-From: Antoine Martin <dev@ayakael.net>
-Date: Tue, 15 Nov 2022 01:08:29 -0500
-Subject: [PATCH 3/3] source-build: stop overriding aspnetcore version
- (backport of #14938)
-
----
- .../tarball/content/Directory.Build.props            |  4 ----
- .../tarball/content/tools-local/init-build.proj      | 12 ++++++++++++
- 2 files changed, 12 insertions(+), 4 deletions(-)
-
-diff --git a/Directory.Build.props b/Directory.Build.props
-index 2e2d7e8bc..6b08fa71b 100644
---- a/Directory.Build.props
-+++ b/Directory.Build.props
-@@ -222,12 +222,8 @@
-     <ExtraPackageVersionPropsPackageInfo Include="MicrosoftNETCoreAppRuntimePackageVersion" Version="$(runtimeOutputPackageVersion)" />
-     <ExtraPackageVersionPropsPackageInfo Include="MicrosoftNETCoreAppRuntimeVersion" Version="$(runtimeOutputPackageVersion)" />
-     <ExtraPackageVersionPropsPackageInfo Include="MicrosoftNETCoreAppHostPackageVersion" Version="$(runtimeOutputPackageVersion)" />
--    <ExtraPackageVersionPropsPackageInfo Include="MicrosoftAspNetCoreAppRuntimePackageVersion" Version="%24(MicrosoftAspNetCoreAppRuntimeLinux$(Platform)PackageVersion)" />
-     <!-- core-sdk uses this property for ASP.NET blob directory -->
-     <ExtraPackageVersionPropsPackageInfo Include="VSRedistCommonAspNetCoreTargetingPackx6430PackageVersion" Version="$(aspnetcoreOutputPackageVersion)" />
--    <!-- OSX needs the OSX version instead of Linux.  We don't have a lot of flexibility in how we output these properties so we're relying on the previous one being blank if the Linux version of the package is missing.  -->
--    <ExtraPackageVersionPropsPackageInfo Include="MicrosoftAspNetCoreAppRuntimePackageVersion" Version="%24(MicrosoftAspNetCoreAppRuntimeOsxX64PackageVersion)" DoNotOverwrite="true" />
--    <ExtraPackageVersionPropsPackageInfo Include="MicrosoftAspNetCoreAppRuntimePackageVersion" Version="%24(MicrosoftAspNetCoreAppRuntimewinx64PackageVersion)" DoNotOverwrite="true" />
- 
-     <!-- Used by installer to determine sdk version -->
-     <ExtraPackageVersionPropsPackageInfo Include="MicrosoftDotnetToolsetInternalPackageVersion" Version="%24(MicrosoftNETSdkPackageVersion)" />
-diff --git a/tools-local/init-build.proj b/tools-local/init-build.proj
-index 701f76c0c..ac4508947 100644
---- a/tools-local/init-build.proj
-+++ b/tools-local/init-build.proj
-@@ -9,6 +9,7 @@
-   <UsingTask AssemblyFile="$(XPlatSourceBuildTasksAssembly)" TaskName="NuGetPack" />
-   <UsingTask AssemblyFile="$(XPlatSourceBuildTasksAssembly)" TaskName="ZipFileExtractToDirectory" />
-   <UsingTask AssemblyFile="$(XPlatSourceBuildTasksAssembly)" TaskName="ReplaceTextInFile" />
-+  <UsingTask AssemblyFile="$(XPlatSourceBuildTasksAssembly)" TaskName="ReplaceRegexInFiles" />
- 
-   <ItemGroup>
-     <BuildTasksTarget Include="Restore;Build;InstallResolver" />
-@@ -22,6 +23,7 @@
-     <CallTarget Targets="
-       UnpackTarballs;
-       BuildXPlatTasks;
-+      PatchPackageVersions;
-       BuildLeakDetection;
-       ExtractToolPackage;
-       GenerateRootFs;
-@@ -38,6 +40,16 @@
-     <Delete Files="$(CompletedSemaphorePath)*.*" />
-   </Target>
- 
-+  <!-- TODO: Remove this when the .NET 8 artifacts tarball no longer includes MicrosoftAspNetCoreAppRuntimePackageVersion -->
-+  <Target Name="PatchPackageVersions">
-+  <!-- Rename MicrosoftAspNetCoreAppRuntimePackageVersion so it isn't used
-+       Fixes https://github.com/dotnet/installer/issues/14492 -->
-+    <ReplaceRegexInFiles
-+      InputFiles="$(IntermediatePath)PreviouslySourceBuiltPackageVersions.props"
-+      OldTextRegex="\bMicrosoftAspNetCoreAppRuntimePackageVersion\b"
-+      NewText="__unused" />
-+  </Target>
-+
-   <Target Name="UnpackTarballs"
-           Inputs="$(MSBuildProjectFullPath)"
-           Outputs="$(CompletedSemaphorePath)UnpackTarballs.complete" >
--- 
-2.38.2
-
diff --git a/dotnet-6/build_14816-update-portable-rid-logic.patch b/dotnet-6/build_14816-update-portable-rid-logic.patch
deleted file mode 100644
index 3c411e38278..00000000000
--- a/dotnet-6/build_14816-update-portable-rid-logic.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 5ee269eef8bd02d066151deaa4d8c0fe6b6cbce4 Mon Sep 17 00:00:00 2001
-Patch-Source: https://github.com/dotnet/installer/pull/14816
-From: Antoine Martin <dev@ayakael.net>
-Date: Tue, 15 Nov 2022 01:04:46 -0500
-Subject: [PATCH 2/3] BundledVersions: update portable rid logic (backport
- dotnet#14647)
-
----
- .../tarball/content/repos/installer.proj         |  5 +++++
- src/redist/targets/GetRuntimeInformation.targets | 16 ++++++++++------
- 2 files changed, 15 insertions(+), 6 deletions(-)
-
-diff --git a/repos/installer.proj b/repos/installer.proj
-index 6c08a1f67..95d47c941 100644
---- a/repos/installer.proj
-+++ b/repos/installer.proj
-@@ -10,6 +10,10 @@
-     <OverrideTargetRid Condition="'$(TargetOS)' == 'OSX'">osx-x64</OverrideTargetRid>
-     <OSNameOverride>$(OverrideTargetRid.Substring(0, $(OverrideTargetRid.IndexOf("-"))))</OSNameOverride>
- 
-+    <!-- Determine target portable rid based on bootstrap SDK's portable rid -->
-+    <_platformIndex>$(NETCoreSdkPortableRuntimeIdentifier.LastIndexOf('-'))</_platformIndex>
-+    <PortableOS Condition="'$(PortableOS)' == ''">$(NETCoreSdkPortableRuntimeIdentifier.Substring(0, $(_platformIndex)))</PortableOS>
-+
-     <RuntimeArg>--runtime-id $(OverrideTargetRid)</RuntimeArg>
-     <RuntimeArg Condition="'$(TargetOS)' == 'Linux'">--runtime-id $(TargetRid)</RuntimeArg>
- 
-@@ -22,6 +26,7 @@
-     -->
-     <BuildCommandArgs>$(BuildCommandArgs) /p:NETCoreAppMaximumVersion=99.9</BuildCommandArgs>
-     <BuildCommandArgs>$(BuildCommandArgs) /p:OSName=$(OSNameOverride)</BuildCommandArgs>
-+    <BuildCommandArgs>$(BuildCommandArgs) /p:PortableOSName=$(PortableOS)</BuildCommandArgs>
-     <BuildCommandArgs Condition="'$(TargetOS)' == 'Linux'">$(BuildCommandArgs) /p:Rid=$(TargetRid)</BuildCommandArgs>
-     <BuildCommandArgs>$(BuildCommandArgs) /p:DOTNET_INSTALL_DIR=$(DotNetCliToolDir)</BuildCommandArgs>
- 
--- 
-2.38.2
-
diff --git a/dotnet-6/installer_14816-crossgen2-rid.patch b/dotnet-6/installer_14816-crossgen2-rid.patch
deleted file mode 100644
index 4a2c6fef0b6..00000000000
--- a/dotnet-6/installer_14816-crossgen2-rid.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 3008f7ef29e0a5593f6f0afbdc9343f573f1a375 Mon Sep 17 00:00:00 2001
-Patch-Source: https://github.com/dotnet/installer/pull/14816
-From: Antoine Martin <dev@ayakael.net>
-Date: Tue, 15 Nov 2022 01:04:07 -0500
-Subject: [PATCH 1/3] Eliminate runtime portable build (backport dotnet#14549)
-
----
- .../tarball/content/Directory.Build.props     |  8 --
- .../tarball/content/repos/aspnetcore.proj     |  1 +
- .../tarball/content/repos/installer.proj      |  2 +-
- .../tarball/content/repos/known-good.proj     |  1 -
- .../content/repos/runtime-portable.proj       | 47 -----------
- .../content/repos/runtime.common.props        | 43 ----------
- .../content/repos/runtime.common.targets      | 46 -----------
- .../tarball/content/repos/runtime.proj        | 82 ++++++++++++++++++-
- .../source-build-reference-packages.proj      |  4 +-
- src/redist/targets/Crossgen.targets           |  2 +-
- src/redist/targets/GenerateLayout.targets     |  3 +
- 11 files changed, 88 insertions(+), 151 deletions(-)
- delete mode 100644 src/SourceBuild/tarball/content/repos/runtime-portable.proj
- delete mode 100644 src/SourceBuild/tarball/content/repos/runtime.common.props
- delete mode 100644 src/SourceBuild/tarball/content/repos/runtime.common.targets
-
-diff --git a/src/installer/src/redist/targets/Crossgen.targets b/src/installer/src/redist/targets/Crossgen.targets
-index 8949af132..a59ed388f 100644
---- a/src/installer/src/redist/targets/Crossgen.targets
-+++ b/src/installer/src/redist/targets/Crossgen.targets
-@@ -6,7 +6,7 @@
-     
-     <PropertyGroup>
-       <RuntimeNETCoreAppPackageName>microsoft.netcore.app.runtime.$(SharedFrameworkRid)</RuntimeNETCoreAppPackageName>
--      <RuntimeNETCrossgenPackageName>microsoft.netcore.app.crossgen2.$(HostOSName)-$(BuildArchitecture)</RuntimeNETCrossgenPackageName>
-+      <RuntimeNETCrossgenPackageName>microsoft.netcore.app.crossgen2.$(Crossgen2Rid)</RuntimeNETCrossgenPackageName>
-       <CrossgenPath>$(NuGetPackageRoot)/$(RuntimeNETCrossgenPackageName)/$(MicrosoftNETCoreAppRuntimePackageVersion)/tools/crossgen2$(ExeExtension)</CrossgenPath>
-       <!-- When ingesting stable pgo instrumented binaries, the shared framework will be a non-stable version,
-            as will the archive file names themselves. -->
-diff --git a/src/installer/src/redist/targets/GenerateLayout.targets b/src/installer/src/redist/targets/GenerateLayout.targets
-index 88a053b61..ce5e09b69 100644
---- a/src/installer/src/redist/targets/GenerateLayout.targets
-+++ b/src/installer/src/redist/targets/GenerateLayout.targets
-@@ -84,6 +84,9 @@
-       <CombinedFrameworkHostArchiveFileName Condition=" '$(PgoInstrument)' == 'true' ">dotnet-runtime$(PgoTerm)-$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension)</CombinedFrameworkHostArchiveFileName>
-       <WinFormsAndWpfSharedFxArchiveFileName>windowsdesktop-runtime-$(MicrosoftWindowsDesktopAppRuntimePackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension)</WinFormsAndWpfSharedFxArchiveFileName>
- 
-+      <Crossgen2Rid>$(HostOSName)-$(BuildArchitecture)</Crossgen2Rid>
-+      <Crossgen2Rid Condition="'$(DotNetBuildFromSource)' == 'true'">$(SharedFrameworkRid)</Crossgen2Rid>
-+
-       <AspNetCoreInstallerRid Condition="'$(AspNetCoreInstallerRid)' == ''">$(SharedFrameworkRid)</AspNetCoreInstallerRid>
-       <AspNetCoreInstallerRid Condition="'$(SharedFrameworkRid)' == 'rhel.6-x64'">linux-x64</AspNetCoreInstallerRid>
-       <AspNetCoreArchiveRid>$(AspNetCoreInstallerRid)</AspNetCoreArchiveRid>
--- 
-2.38.2
-
diff --git a/dotnet-6/installer_14816-update-portable-rid-logic.patch b/dotnet-6/installer_14816-update-portable-rid-logic.patch
deleted file mode 100644
index 53f23350658..00000000000
--- a/dotnet-6/installer_14816-update-portable-rid-logic.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 5ee269eef8bd02d066151deaa4d8c0fe6b6cbce4 Mon Sep 17 00:00:00 2001
-Patch-Source: https://github.com/dotnet/installer/pull/14816
-From: Antoine Martin <dev@ayakael.net>
-Date: Tue, 15 Nov 2022 01:04:46 -0500
-Subject: [PATCH 2/3] BundledVersions: update portable rid logic (backport
- dotnet#14647)
-
----
- .../tarball/content/repos/installer.proj         |  5 +++++
- src/redist/targets/GetRuntimeInformation.targets | 16 ++++++++++------
- 2 files changed, 15 insertions(+), 6 deletions(-)
-
-diff --git a/src/installer/src/redist/targets/GetRuntimeInformation.targets b/src/installer/src/redist/targets/GetRuntimeInformation.targets
-index a99a7e9da..89f000119 100644
---- a/src/installer/src/redist/targets/GetRuntimeInformation.targets
-+++ b/src/installer/src/redist/targets/GetRuntimeInformation.targets
-@@ -9,10 +9,15 @@
-       <HostOSName Condition=" '$(HostOSName)' == '' AND $([MSBuild]::IsOSPlatform('OSX')) ">osx</HostOSName>
-       <HostOSName Condition=" '$(HostOSName)' == '' AND $([MSBuild]::IsOSPlatform('FREEBSD')) ">freebsd</HostOSName>
-       <HostOSName Condition=" '$(HostOSName)' == '' AND '$(IsLinux)' == 'True' ">linux</HostOSName>
--      
-+
-+      <OSName Condition=" '$(OSName)' == '' AND $(Rid) != '' ">$(Rid.Substring(0, $(Rid.LastIndexOf('-'))))</OSName>
-       <OSName Condition=" '$(OSName)' == '' ">$(HostOSName)</OSName>
- 
--      <Rid Condition=" '$(Rid)' == '' ">$(OSName)-$(Architecture)</Rid>
-+      <PortableOSName Condition=" '$(PortableOSName)' == '' ">$(OSName)</PortableOSName>
-+
-+      <Rid>$(OSName)-$(Architecture)</Rid>
-+
-+      <PortableRid>$(PortableOSName)-$(Architecture)</PortableRid>
-     </PropertyGroup>
- 
-     <PropertyGroup>
-@@ -23,10 +28,9 @@
-     </PropertyGroup>
- 
-     <PropertyGroup>
--      <ProductMonikerRid Condition=" '$(Rid)' == 'ubuntu.16.04-x64' OR
--                                   '$(Rid)' == 'rhel.6-x64' OR
--                                   '$(Rid)' == 'linux-musl-x64' ">$(Rid)</ProductMonikerRid>
--      <ProductMonikerRid Condition=" '$(ProductMonikerRid)' == '' ">$(OSName)-$(Architecture)</ProductMonikerRid>
-+      <ProductMonikerRid Condition=" '$(ProductMonikerRid)' == '' ">$(Rid)</ProductMonikerRid>
-+
-+      <PortableProductMonikerRid Condition=" '$(PortableProductMonikerRid)' == '' ">$(PortableRid)</PortableProductMonikerRid>
- 
-       <PortableProductMonikerRid Condition=" '$(PortableProductMonikerRid)' == '' ">$(HostOSName)-$(Architecture)</PortableProductMonikerRid>
- 
--- 
-2.38.2
-