From e78caf913789455b59dfc8867a831e8a78c0392d Mon Sep 17 00:00:00 2001
From: Daniel Plaisted <daplaist@microsoft.com>
Date: Wed, 9 Mar 2022 13:54:57 -0300
Subject: [PATCH 1/6] Add Mariner 2.0 and Arm64 RHEL builds

---
 .vsts-ci.yml                                  | 20 ++++++++++
 src/redist/targets/GenerateLayout.targets     |  4 +-
 src/redist/targets/GenerateRPMs.targets       | 38 ++++++++++++++++---
 .../targets/GetRuntimeInformation.targets     | 11 +++++-
 .../targets/packaging/rpm/dotnet-config.json  |  7 +---
 5 files changed, 66 insertions(+), 14 deletions(-)

diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index e84198679..135fbbf1e 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -198,6 +198,15 @@ stages:
               _RuntimeIdentifier: ''
               _BuildArchitecture: 'x64'
               _TestArg: $(_NonWindowsTestArg)
+            Build_Rhel_7_2_Release_Arm64:
+              _BuildConfig: Release
+              _DockerParameter: '--docker rhel'
+              _LinuxPortable: ''
+              _RuntimeIdentifier: '--runtime-id linux-arm64'
+              _BuildArchitecture: 'arm64'
+              # Never run tests on arm
+              _TestArg: ''
+              _AdditionalBuildParameters: '/p:CLIBUILD_SKIP_TESTS=true'
             Build_Arm_Debug:
               _BuildConfig: Debug
               _DockerParameter: ''
@@ -306,6 +315,17 @@ stages:
               # already published by Build_LinuxPortable_Release_x64
               _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false'
               _TestArg: $(_NonWindowsTestArg)
+            Build_Linux_Portable_Rpm_Release_Arm64:
+              _BuildConfig: Release
+              _DockerParameter: '--docker rhel'
+              _LinuxPortable: '--linux-portable'
+              _RuntimeIdentifier: '--runtime-id linux-arm64'
+              _BuildArchitecture: 'arm64'
+              # Do not publish zips and tarballs. The linux-x64 binaries are
+              # already published by Build_LinuxPortable_Release_x64
+              _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:CLIBUILD_SKIP_TESTS=true'
+              # Never run tests on arm64
+              _TestArg: ''
           Build_LinuxPortable_Release_x64:
             _BuildConfig: Release
             _DockerParameter: ''
diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets
index 5c9b2f490..afd1c4e0a 100644
--- a/src/redist/targets/GenerateLayout.targets
+++ b/src/redist/targets/GenerateLayout.targets
@@ -46,11 +46,13 @@
 
       <!-- Use the "x64" Rid when downloading Linux shared framework 'DEB' installer files. -->
       <SharedFrameworkInstallerFileRid>$(CoreSetupRid)</SharedFrameworkInstallerFileRid>
-      <SharedFrameworkInstallerFileRid Condition=" '$(IsDebianBaseDistro)' == 'true' OR '$(IsRPMBasedDistro)' == 'true' ">$(Architecture)</SharedFrameworkInstallerFileRid>
+      <SharedFrameworkInstallerFileRid Condition=" '$(IsDebianBaseDistro)' == 'true' OR '$(IsRPMBasedDistro)' == 'true' ">$(InstallerTargetArchitecture)</SharedFrameworkInstallerFileRid>
 
       <!-- Use the "x64" Rid when downloading Linux runtime dependencies Debian package. -->
       <RuntimeDepsInstallerFileRid>$(CoreSetupRid)</RuntimeDepsInstallerFileRid>
       <RuntimeDepsInstallerFileRid Condition=" '$(IsDebianBaseDistro)' == 'true' ">$(Architecture)</RuntimeDepsInstallerFileRid>
+      <RuntimeDepsInstallerFileRid Condition=" '$(IsRPMBasedDistro)' == 'true' And '$(UsePortableLinuxSharedFramework)' != 'true' ">$(OSName)-$(InstallerTargetArchitecture)</RuntimeDepsInstallerFileRid>
+      <RuntimeDepsInstallerFileRid Condition=" '$(CoreSetupRid)' == 'rhel.7-x64' And '$(Architecture)' == 'Arm64' And '$(UsePortableLinuxSharedFramework)' == 'true' ">rhel.7-aarch64</RuntimeDepsInstallerFileRid>
 
       <AlternateArchitecture Condition="'$(Architecture)' == 'x86'">x64</AlternateArchitecture>
       <AlternateArchitecture Condition="'$(Architecture)' == 'x64'">x86</AlternateArchitecture>
diff --git a/src/redist/targets/GenerateRPMs.targets b/src/redist/targets/GenerateRPMs.targets
index 935684431..a82f068fc 100644
--- a/src/redist/targets/GenerateRPMs.targets
+++ b/src/redist/targets/GenerateRPMs.targets
@@ -91,9 +91,6 @@
       <SDKTokenValue Include="%NETCOREAPP_TARGETING_PACK_RPM_PACKAGE_VERSION%">
         <ReplacementString>$(MicrosoftNETCoreAppRefMajorMinorPatchVersion)</ReplacementString>
       </SDKTokenValue>
-      <SDKTokenValue Include="%NETSTANDARD_TARGETING_PACK_RPM_PACKAGE_VERSION%">
-        <ReplacementString>$(NetStandardTargetingPackMajorMinorPatchVersion)</ReplacementString>
-      </SDKTokenValue>
       <SDKTokenValue Include="%ASPNETCORE_SHAREDFX_RPM_PACKAGE_VERSION%">
         <ReplacementString>$(AspNetCoreRuntimeMajorMinorPatchVersion)</ReplacementString>
       </SDKTokenValue>
@@ -109,9 +106,6 @@
       <SDKTokenValue Include="%NETCORE_APPHOST_PACK_RPM_PACKAGE_NAME%">
         <ReplacementString>$(NetCoreAppHostPackRpmPackageName)</ReplacementString>
       </SDKTokenValue>
-      <SDKTokenValue Include="%NETSTANDARD_TARGETING_PACK_RPM_PACKAGE_NAME%">
-        <ReplacementString>$(NetStandardTargetingPackRpmPackageName)</ReplacementString>
-      </SDKTokenValue>
       <SDKTokenValue Include="%ASPNETCORE_SHAREDFX_RPM_PACKAGE_NAME%">
         <ReplacementString>$(AspNetCoreSharedFxRpmPackageName)</ReplacementString>
       </SDKTokenValue>
@@ -121,6 +115,10 @@
       <SDKTokenValue Include="%SDK_NUGET_VERSION%">
         <ReplacementString>$(Version)</ReplacementString>
       </SDKTokenValue>
+      <SDKTokenValue Include="%SDK_RPM_PACKAGE_ARCHITECTURE%">
+        <ReplacementString>amd64</ReplacementString>
+        <ReplacementString Condition="'$(Architecture)' == 'Arm64'">aarch64</ReplacementString>
+      </SDKTokenValue>
       <SDKTokenValue Include="%CLI_SDK_BRAND_NAME%">
         <ReplacementString>$(SdkBrandName)</ReplacementString>
       </SDKTokenValue>
@@ -133,6 +131,27 @@
       </AfterInstallHostTokenValue>
     </ItemGroup>
 
+    <ItemGroup Condition="'$(Architecture)' != 'Arm64'">
+      <SDKTokenValue Include="%SDK_RPM_NETSTANDARD_TARGETINGPACK_DEPENDENCY%">
+        <ReplacementString>
+          <![CDATA[
+        {
+            "package_name": "$(NetStandardTargetingPackRpmPackageName)",
+            "package_version": "$(NetStandardTargetingPackMajorMinorPatchVersion)"
+        },
+]]>
+        </ReplacementString>
+      </SDKTokenValue>
+    </ItemGroup>
+
+    <!-- .NET Standard targeting pack package hasn't been created for Arm64, so don't include it as a dependency -->
+    <ItemGroup Condition="'$(Architecture)' == 'Arm64'">
+      <SDKTokenValue Include="%SDK_RPM_NETSTANDARD_TARGETINGPACK_DEPENDENCY%">
+        <ReplacementString></ReplacementString>
+      </SDKTokenValue>
+
+    </ItemGroup>
+
     <ItemGroup>
       <TestSdkRpmTaskEnvironmentVariables Include="PATH=$(RpmInstalledDirectory)$(PathListSeparator)$(PATH)" />
       <TestSdkRpmTaskEnvironmentVariables Include="TEST_ARTIFACTS=$(TestArtifactsDir)" />
@@ -186,6 +205,12 @@
       SkipUnchangedFiles="False"
       UseHardlinksIfPossible="False"/>
 
+    <Copy SourceFiles="@(GeneratedRpmFiles)"
+      DestinationFiles="$(Mariner2RpmFile)"
+      OverwriteReadOnlyFiles="True"
+      SkipUnchangedFiles="False"
+      UseHardlinksIfPossible="False"/>
+
   </Target>
 
   <Target Name="SetupRpmProps"
@@ -199,6 +224,7 @@
       <SdkRPMInstallerFile>$(ArtifactsShippingPackagesDir)$(DistroSpecificArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(InstallerExtension)</SdkRPMInstallerFile>
       <RpmFile>$(SdkRPMInstallerFile)</RpmFile>
       <MarinerRpmFile>$(ArtifactsShippingPackagesDir)$(MarinerArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(InstallerExtension)</MarinerRpmFile>
+      <Mariner2RpmFile>$(ArtifactsShippingPackagesDir)$(Mariner2ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(InstallerExtension)</Mariner2RpmFile>
       <!-- Need to acquire manpage files from CLI repo: https://github.com/dotnet/cli/issues/10266 -->
       <ManPagesDir>$(RepoRoot)/Documentation/manpages</ManPagesDir>
       <EndToEndTestProject>$(RepoRoot)/test/EndToEnd/EndToEnd.csproj</EndToEndTestProject>
diff --git a/src/redist/targets/GetRuntimeInformation.targets b/src/redist/targets/GetRuntimeInformation.targets
index 01f704c7d..a99a7e9da 100644
--- a/src/redist/targets/GetRuntimeInformation.targets
+++ b/src/redist/targets/GetRuntimeInformation.targets
@@ -39,8 +39,15 @@
       <!-- Warning: changing the value "ProductBandCombinedHostHostFxrFrameworkSdkName" can only occur on a product-band boundary [CliProductBandVersion],
                Changing "ProductBandCombinedHostHostFxrFrameworkSdkName" mid-product-band will break the upgradability of the SDK bundle installer. -->
       <ProductBandCombinedHostHostFxrFrameworkSdkName>Dotnet SDK Bundle Installer $(CliProductBandVersion) $(ProductMonikerRid)</ProductBandCombinedHostHostFxrFrameworkSdkName>
-      <DistroSpecificArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>$(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(Version)-$(Architecture)</DistroSpecificArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>
-      <MarinerArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk Condition=" '$(IsRPMBasedDistro)' == 'True' ">$(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(Version)-cm.1-$(Architecture)</MarinerArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>
+
+      <InstallerTargetArchitecture>$(Architecture)</InstallerTargetArchitecture>
+      <InstallerTargetArchitecture Condition=" '$(IsRPMBasedDistro)' == 'true' and '$(Architecture)' == 'Arm64' ">aarch64</InstallerTargetArchitecture>
+
+      <DistroSpecificArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>$(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(Version)-$(InstallerTargetArchitecture)</DistroSpecificArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>
+      <!-- Mariner RPM names -->
+      <MarinerArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk Condition=" '$(IsRPMBasedDistro)' == 'True' ">$(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(Version)-cm.1-$(InstallerTargetArchitecture)</MarinerArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>
+      <Mariner2ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk Condition=" '$(IsRPMBasedDistro)' == 'True' ">$(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(Version)-cm.2-$(InstallerTargetArchitecture)</Mariner2ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>
+
     </PropertyGroup>
   </Target>
 </Project>
diff --git a/src/redist/targets/packaging/rpm/dotnet-config.json b/src/redist/targets/packaging/rpm/dotnet-config.json
index ed3ccbfeb..1a9d84999 100644
--- a/src/redist/targets/packaging/rpm/dotnet-config.json
+++ b/src/redist/targets/packaging/rpm/dotnet-config.json
@@ -14,7 +14,7 @@
         "changelog_message": "Bootstrap loop package"
     },
     "control": {
-        "architecture": "amd64"
+        "architecture": "%SDK_RPM_PACKAGE_ARCHITECTURE%"
     },
     "copyright": ".NET Foundation and contributors",
     "license": {
@@ -34,10 +34,7 @@
             "package_name": "%NETCORE_APPHOST_PACK_RPM_PACKAGE_NAME%",
             "package_version": "%SHARED_FRAMEWORK_RPM_PACKAGE_VERSION%"
         },
-        {
-            "package_name": "%NETSTANDARD_TARGETING_PACK_RPM_PACKAGE_NAME%",
-            "package_version": "%NETSTANDARD_TARGETING_PACK_RPM_PACKAGE_VERSION%"
-        },
+%SDK_RPM_NETSTANDARD_TARGETINGPACK_DEPENDENCY%
         {
             "package_name": "%ASPNETCORE_SHAREDFX_RPM_PACKAGE_NAME%",
             "package_version": "%ASPNETCORE_SHAREDFX_RPM_PACKAGE_VERSION%"

From 8c85e40f17df0c39eef28605d1d20a71f2b6ecc7 Mon Sep 17 00:00:00 2001
From: Marc Paine <marcpop@microsoft.com>
Date: Wed, 27 Apr 2022 14:57:58 -0700
Subject: [PATCH 2/6] Add a direct reference to a newer version of this package

---
 .../Microsoft.DotNet.Tools.Tests.Utilities.csproj               | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj b/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj
index fb083d8a5..04fed4562 100644
--- a/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj
+++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj
@@ -7,5 +7,7 @@
     <PackageReference Include="FluentAssertions" Version="4.18.0" />
     <PackageReference Include="xunit" Version="2.2.0" />
     <PackageReference Include="Microsoft.DotNet.Cli.Utils" Version="$(MicrosoftDotNetCliUtilsPackageVersion)" />
+    <PackageReference Include="System.Net.Http" Version="4.3.4" />
+    <PackageReference Include="System.Security.Cryptography.X509Certificates" Version="4.3.2" />
   </ItemGroup>
 </Project>
\ No newline at end of file

From f0b493ed4338ef5e349819c647ce0fb4f0d27a4e Mon Sep 17 00:00:00 2001
From: Sean Reeser <v-seanreeser@microsoft.com>
Date: Tue, 3 May 2022 10:28:24 -0700
Subject: [PATCH 3/6] Update branding to 6.0.301

---
 eng/Versions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 4b4ef5512..f800c1c27 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -8,7 +8,7 @@
     <VersionMajor>6</VersionMajor>
     <VersionMinor>0</VersionMinor>
     <VersionSDKMinor>3</VersionSDKMinor>
-    <VersionFeature>00</VersionFeature>
+    <VersionFeature>01</VersionFeature>
     <VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature)</VersionPrefix>
     <PreReleaseVersionLabel>rtm</PreReleaseVersionLabel>
     <MajorMinorVersion>$(VersionMajor).$(VersionMinor)</MajorMinorVersion>

From 6afedc0959b311253bf6e60973325c969bccac0b Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 5 May 2022 16:33:12 +0000
Subject: [PATCH 4/6] Update dependencies from https://github.com/dotnet/arcade
 build 20220504.3

Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.22212.5 -> To Version 6.0.0-beta.22254.3
---
 eng/Version.Details.xml | 12 ++++++------
 eng/Versions.props      |  2 +-
 global.json             |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index f5423eaa6..f9a032f59 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -197,19 +197,19 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22212.5">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22254.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>1a6b24397e50146d0fece9cfb9c0b87275691e6f</Sha>
+      <Sha>5fdd5b6c08c6c39edf12001400a11786c03b3e35</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="6.0.0-beta.22212.5">
+    <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="6.0.0-beta.22254.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>1a6b24397e50146d0fece9cfb9c0b87275691e6f</Sha>
+      <Sha>5fdd5b6c08c6c39edf12001400a11786c03b3e35</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22212.5">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22254.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>1a6b24397e50146d0fece9cfb9c0b87275691e6f</Sha>
+      <Sha>5fdd5b6c08c6c39edf12001400a11786c03b3e35</Sha>
     </Dependency>
     <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="6.0.0-servicing.22254.2">
       <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index d773bb308..8257eff6f 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -19,7 +19,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/arcade -->
-    <MicrosoftDotNetBuildTasksInstallersPackageVersion>6.0.0-beta.22212.5</MicrosoftDotNetBuildTasksInstallersPackageVersion>
+    <MicrosoftDotNetBuildTasksInstallersPackageVersion>6.0.0-beta.22254.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/winforms -->
diff --git a/global.json b/global.json
index b645142d3..c751a7b2d 100644
--- a/global.json
+++ b/global.json
@@ -11,7 +11,7 @@
     "cmake": "3.16.4"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22212.5",
-    "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22212.5"
+    "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22254.3",
+    "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22254.3"
   }
 }

From 6a94e1add2efb38edaf77441a61f0c9cfc169b16 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 5 May 2022 17:18:19 +0000
Subject: [PATCH 5/6] Update dependencies from https://github.com/dotnet/sdk
 build 20220505.8

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.400-preview.22254.54 -> To Version 6.0.400-preview.22255.8

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset
 From Version 12.0.3-beta.22254.3 -> To Version 12.0.4-beta.22255.1 (parent: Microsoft.NET.Sdk
---
 eng/Version.Details.xml | 20 ++++++++++----------
 eng/Versions.props      |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index f5423eaa6..f217a80c6 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -103,14 +103,14 @@
       <Uri>https://github.com/dotnet/templating</Uri>
       <Sha>317884e224df8817849767f8ed7207a14c9acc4f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk" Version="6.0.400-preview.22254.54">
+    <Dependency Name="Microsoft.NET.Sdk" Version="6.0.400-preview.22255.8">
       <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>7b84df09bec6e490d1bbd042020cc0aaa5bf3c1b</Sha>
+      <Sha>8a368a138d56b43b4b85c29a55f44eaa43f22ca4</Sha>
       <SourceBuild RepoName="sdk" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.400-preview.22254.54">
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.400-preview.22255.8">
       <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>7b84df09bec6e490d1bbd042020cc0aaa5bf3c1b</Sha>
+      <Sha>8a368a138d56b43b4b85c29a55f44eaa43f22ca4</Sha>
     </Dependency>
     <!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
     <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.4-servicing.22164.7" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
@@ -121,13 +121,13 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
       <Sha>fcb07d637abf53791e2c55c63d9207fc3232fe83</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.FSharp.Compiler" Version="12.0.3-beta.22254.3" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.FSharp.Compiler" Version="12.0.4-beta.22255.1" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/dotnet/fsharp</Uri>
-      <Sha>5392322da394d850ca3dc7d4d8be1e4536e658aa</Sha>
+      <Sha>219170547a96003cc822195b797bfd0a89a90614</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="6.0.4-beta.22254.3" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="6.0.5-beta.22255.1" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/dotnet/fsharp</Uri>
-      <Sha>5392322da394d850ca3dc7d4d8be1e4536e658aa</Sha>
+      <Sha>219170547a96003cc822195b797bfd0a89a90614</Sha>
       <SourceBuild RepoName="fsharp" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.NET.Test.Sdk" Version="17.2.0-release-20220408-11" CoherentParentDependency="Microsoft.NET.Sdk">
@@ -141,9 +141,9 @@
       <SourceBuild RepoName="linker" ManagedOnly="true" />
       <RepoName>linker</RepoName>
     </Dependency>
-    <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.3.0-2.22254.3" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.3.0-2.22254.6" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>909376faa424f06577e9b83f05ab8eab93b33995</Sha>
+      <Sha>e0de281c676b295d33847103736c2cc392490244</Sha>
       <SourceBuild RepoName="roslyn" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Build" Version="17.3.0-preview-22254-01" CoherentParentDependency="Microsoft.NET.Sdk">
diff --git a/eng/Versions.props b/eng/Versions.props
index d773bb308..d8a0d8c55 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -56,8 +56,8 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/sdk -->
-    <MicrosoftNETSdkPackageVersion>6.0.400-preview.22254.54</MicrosoftNETSdkPackageVersion>
-    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.400-preview.22254.54</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftNETSdkPackageVersion>6.0.400-preview.22255.8</MicrosoftNETSdkPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.400-preview.22255.8</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
     <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
     <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
     <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>

From 67f3a63ac05399cfe2d7e9e3fee8627c08b73c18 Mon Sep 17 00:00:00 2001
From: Daniel Plaisted <dsplaisted@gmail.com>
Date: Tue, 17 May 2022 08:55:03 -0700
Subject: [PATCH 6/6] Switch to centos to create ARM64/Mariner RPMs

See https://github.com/dotnet/installer/pull/11750/commits/278ef2543358e9e532f6327f18fef0a0f9c78bf1
---
 .vsts-ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index a0588a633..55e5c57f5 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -187,14 +187,14 @@ stages:
               _TestArg: $(_NonWindowsTestArg)
             Build_Rhel_7_2_Release_x64:
               _BuildConfig: Release
-              _DockerParameter: '--docker rhel'
+              _DockerParameter: '--docker centos'
               _LinuxPortable: ''
               _RuntimeIdentifier: ''
               _BuildArchitecture: 'x64'
               _TestArg: $(_NonWindowsTestArg)
             Build_Rhel_7_2_Release_Arm64:
               _BuildConfig: Release
-              _DockerParameter: '--docker rhel'
+              _DockerParameter: '--docker centos'
               _LinuxPortable: ''
               _RuntimeIdentifier: '--runtime-id linux-arm64'
               _BuildArchitecture: 'arm64'
@@ -311,7 +311,7 @@ stages:
               _TestArg: $(_NonWindowsTestArg)
             Build_Linux_Portable_Rpm_Release_Arm64:
               _BuildConfig: Release
-              _DockerParameter: '--docker rhel'
+              _DockerParameter: '--docker centos'
               _LinuxPortable: '--linux-portable'
               _RuntimeIdentifier: '--runtime-id linux-arm64'
               _BuildArchitecture: 'arm64'