From 849d0b991ad1ae7bd55648b049ae1f9a0e1e6358 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 23 Apr 2024 23:55:12 +0000
Subject: [PATCH] [main] Update dependencies from dotnet/sdk (#19534)

[main] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 9.0.0-preview.4.24218.3 to 9.0.0-preview.4.24220.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0: from 9.0.0-preview.4.24218.3 to 9.0.0-preview.4.24220.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0: from 9.0.0-preview.4.24218.3 to 9.0.0-preview.4.24220.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-preview.4.24218.7 to 9.0.0-preview.4.24222.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Ref: from 9.0.0-preview.4.24218.7 to 9.0.0-preview.4.24222.8 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.TargetingPack.x64.9.0: from 9.0.0-preview.4.24218.7 to 9.0.0-preview.4.24222.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 9.0.0-preview.4.24218.7 to 9.0.0-preview.4.24222.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 9.0.0-preview.4.24218.7 to 9.0.0-preview.4.24222.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.SourceBuild.Intermediate.runtime.linux-x64: from 9.0.0-preview.4.24218.7 to 9.0.0-preview.4.24222.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 9.0.0-preview.4.24218.1 to 9.0.0-preview.4.24223.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 9.0.0-preview.4.24218.1 to 9.0.0-preview.4.24223.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 9.0.0-preview.4.24218.1 to 9.0.0-preview.4.24223.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0: from 9.0.0-preview.4.24218.1 to 9.0.0-preview.4.24223.1 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 9.0.0-preview.4.24218.1 to 9.0.0-preview.4.24223.1 (parent: Microsoft.NET.Sdk)
  - dotnet-user-jwts: from 9.0.0-preview.4.24218.1 to 9.0.0-preview.4.24223.1 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 9.0.0-preview.4.24218.1 to 9.0.0-preview.4.24223.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.SourceBuild.Intermediate.aspnetcore: from 9.0.0-preview.4.24218.1 to 9.0.0-preview.4.24223.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 9.0.0-preview.4.24218.3 to 9.0.0-preview.4.24220.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 9.0.0-preview.4.24218.3 to 9.0.0-preview.4.24220.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 9.0.0-preview.4.24218.2 to 9.0.0-preview.4.24219.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.FSharp.Compiler: from 12.8.400-beta.24218.1 to 12.8.400-beta.24223.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.SourceBuild.Intermediate.fsharp: from 8.0.400-beta.24218.1 to 8.0.400-beta.24223.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.ILLink.Tasks: from 9.0.0-preview.4.24218.7 to 9.0.0-preview.4.24222.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.Net.Compilers.Toolset: from 4.11.0-1.24218.2 to 4.11.0-1.24222.7 (parent: Microsoft.NET.Sdk)
  - Microsoft.SourceBuild.Intermediate.roslyn: from 4.11.0-1.24218.2 to 4.11.0-1.24222.7 (parent: Microsoft.NET.Sdk)
  - Microsoft.Build: from 17.11.0-preview-24218-01 to 17.11.0-preview-24222-11 (parent: Microsoft.NET.Sdk)
  - Microsoft.SourceBuild.Intermediate.msbuild: from 17.11.0-preview-24218-01 to 17.11.0-preview-24222-11 (parent: Microsoft.NET.Sdk)
  - NuGet.Build.Tasks: from 6.11.0-preview.1.27 to 6.11.0-preview.1.28 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-preview.4.24218.7 to 9.0.0-preview.4.24222.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-preview.4.24218.7 to 9.0.0-preview.4.24222.8 (parent: Microsoft.NET.Sdk)

 - Install node 20.x on windows build to fix aspnetcore build

 - Merge branch 'main' into darc-main-35a979bc-455b-4e15-b1bf-6da27d06b3a5

 - Rebootstrap VMR with arcade changes

 - Merge branch 'main' into darc-main-35a979bc-455b-4e15-b1bf-6da27d06b3a5

 - Remove patches
---
 .../content/eng/Version.Details.xml           |  4 +-
 src/SourceBuild/content/eng/Versions.props    |  4 +-
 src/SourceBuild/content/global.json           |  4 +-
 ...n-which-target-RIDs-are-available-wh.patch | 49 -------------------
 .../0001-fix-Alpine-build-break-101302.patch  | 36 --------------
 5 files changed, 6 insertions(+), 91 deletions(-)
 delete mode 100644 src/SourceBuild/patches/aspnetcore/0001-Condition-RIDs-on-which-target-RIDs-are-available-wh.patch
 delete mode 100644 src/SourceBuild/patches/runtime/0001-fix-Alpine-build-break-101302.patch

diff --git a/src/SourceBuild/content/eng/Version.Details.xml b/src/SourceBuild/content/eng/Version.Details.xml
index b433058ab68f..6099c7aa29a6 100644
--- a/src/SourceBuild/content/eng/Version.Details.xml
+++ b/src/SourceBuild/content/eng/Version.Details.xml
@@ -2,9 +2,9 @@
   <ProductDependencies>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24177.2">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24223.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>689fb2d1b620a9df28c3384d9b208e3654a0f928</Sha>
+      <Sha>91ce5946fec9f81f15f81d20e1aab63527302410</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props
index 5c3cacce4fa5..31d914e8f3fa 100644
--- a/src/SourceBuild/content/eng/Versions.props
+++ b/src/SourceBuild/content/eng/Versions.props
@@ -23,8 +23,8 @@
       of a .NET major or minor release, prebuilts may be needed. When the release is mature, prebuilts
       are not necessary, and this property is removed from the file.
     -->
-    <PrivateSourceBuiltSdkVersion>9.0.100-preview.4.24179.1</PrivateSourceBuiltSdkVersion>
-    <PrivateSourceBuiltArtifactsVersion>9.0.100-preview.4.24179.1</PrivateSourceBuiltArtifactsVersion>
+    <PrivateSourceBuiltSdkVersion>9.0.100-preview.4.24223.1</PrivateSourceBuiltSdkVersion>
+    <PrivateSourceBuiltArtifactsVersion>9.0.100-preview.4.24223.1</PrivateSourceBuiltArtifactsVersion>
     <!-- command-line-api dependencies -->
     <SystemCommandLineVersion>2.0.0-beta4.24126.1</SystemCommandLineVersion>
     <!-- msbuild dependencies -->
diff --git a/src/SourceBuild/content/global.json b/src/SourceBuild/content/global.json
index 5ffcf53ed05c..36bd8350c05b 100644
--- a/src/SourceBuild/content/global.json
+++ b/src/SourceBuild/content/global.json
@@ -1,10 +1,10 @@
 {
   "tools": {
-    "dotnet": "9.0.100-preview.4.24178.10"
+    "dotnet": "9.0.100-preview.4.24223.7"
   },
   "msbuild-sdks": {
     "Microsoft.Build.NoTargets": "3.7.0",
     "Microsoft.Build.Traversal": "3.4.0",
-    "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24177.2"
+    "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24223.3"
   }
 }
diff --git a/src/SourceBuild/patches/aspnetcore/0001-Condition-RIDs-on-which-target-RIDs-are-available-wh.patch b/src/SourceBuild/patches/aspnetcore/0001-Condition-RIDs-on-which-target-RIDs-are-available-wh.patch
deleted file mode 100644
index dc9f1bbb6a1f..000000000000
--- a/src/SourceBuild/patches/aspnetcore/0001-Condition-RIDs-on-which-target-RIDs-are-available-wh.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jeremy Koritzinsky <jekoritz@microsoft.com>
-Date: Tue, 16 Apr 2024 15:56:07 -0700
-Subject: [PATCH] Condition RIDs on which target RIDs are available when doing
- a VMR build
-
-Backport: https://github.com/dotnet/aspnetcore/pull/55172
----
- src/Servers/IIS/IIS/test/testassets/TestTasks/TestTasks.csproj   | 1 +
- src/Servers/IIS/build/testsite.props                             | 1 +
- .../ServerComparison.TestSites/ServerComparison.TestSites.csproj | 1 +
- 3 files changed, 3 insertions(+)
-
-diff --git a/src/Servers/IIS/IIS/test/testassets/TestTasks/TestTasks.csproj b/src/Servers/IIS/IIS/test/testassets/TestTasks/TestTasks.csproj
-index f6157b9730..0e4cfec2ec 100644
---- a/src/Servers/IIS/IIS/test/testassets/TestTasks/TestTasks.csproj
-+++ b/src/Servers/IIS/IIS/test/testassets/TestTasks/TestTasks.csproj
-@@ -4,6 +4,7 @@
-     <OutputType>Exe</OutputType>
-     <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
-     <RuntimeIdentifiers>win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
-+    <RuntimeIdentifiers Condition="'$(DotNetBuild)' == 'true'">$(TargetRuntimeIdentifier)</RuntimeIdentifiers>
- 
-     <!--
-       This is used as a package by ASP.NET benchmarking infrastructure. It is meant for internal use only. See also
-diff --git a/src/Servers/IIS/build/testsite.props b/src/Servers/IIS/build/testsite.props
-index 8226200d1a..429d233d8e 100644
---- a/src/Servers/IIS/build/testsite.props
-+++ b/src/Servers/IIS/build/testsite.props
-@@ -1,6 +1,7 @@
- <Project>
-   <PropertyGroup>
-     <RuntimeIdentifiers>$(RuntimeIdentifiers);win-x64;win-x86</RuntimeIdentifiers>
-+    <RuntimeIdentifiers Condition="'$(DotNetBuild)' == 'true'">$(TargetRuntimeIdentifier)</RuntimeIdentifiers>
-     <Platforms>x64;x86</Platforms>
-     <IISExpressAppHostConfig>$(MSBuildThisFileDirectory)applicationhost.config</IISExpressAppHostConfig>
-     <IISAppHostConfig>$(MSBuildThisFileDirectory)applicationhost.iis.config</IISAppHostConfig>
-diff --git a/src/Servers/testassets/ServerComparison.TestSites/ServerComparison.TestSites.csproj b/src/Servers/testassets/ServerComparison.TestSites/ServerComparison.TestSites.csproj
-index a5a54f6c9d..2b3690af74 100644
---- a/src/Servers/testassets/ServerComparison.TestSites/ServerComparison.TestSites.csproj
-+++ b/src/Servers/testassets/ServerComparison.TestSites/ServerComparison.TestSites.csproj
-@@ -5,6 +5,7 @@
-   <PropertyGroup>
-     <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
-     <RuntimeIdentifiers>win-x86;win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
-+    <RuntimeIdentifiers Condition="'$(DotNetBuild)' == 'true'">$(TargetRuntimeIdentifier)</RuntimeIdentifiers>
-     <InProcessTestSite>true</InProcessTestSite>
-   </PropertyGroup>
- 
diff --git a/src/SourceBuild/patches/runtime/0001-fix-Alpine-build-break-101302.patch b/src/SourceBuild/patches/runtime/0001-fix-Alpine-build-break-101302.patch
deleted file mode 100644
index 929e9f361159..000000000000
--- a/src/SourceBuild/patches/runtime/0001-fix-Alpine-build-break-101302.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Aleksey=20Kliger=20=28=CE=BBgeek=29?= <alklig@microsoft.com>
-Date: Fri, 19 Apr 2024 18:36:22 -0400
-Subject: [PATCH] fix Alpine build break (#101302)
-Backport: https://github.com/dotnet/installer/pull/19534
-
-Apline defines NULL as std::nullptr which is not comparable/assignable
-with intptr_t
-
-Fixes https://github.com/dotnet/source-build/issues/4345
----
- src/coreclr/debug/daccess/cdac.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/coreclr/debug/daccess/cdac.cpp b/src/coreclr/debug/daccess/cdac.cpp
-index 78625bf67f2..23478592371 100644
---- a/src/coreclr/debug/daccess/cdac.cpp
-+++ b/src/coreclr/debug/daccess/cdac.cpp
-@@ -48,7 +48,7 @@ CDAC::CDAC(HMODULE module, uint64_t descriptorAddr, ICorDebugDataTarget* target)
- {
-     if (m_module == NULL)
-     {
--        m_cdac_handle = NULL;
-+        m_cdac_handle = 0;
-         return;
-     }
- 
-@@ -62,7 +62,7 @@ CDAC::CDAC(HMODULE module, uint64_t descriptorAddr, ICorDebugDataTarget* target)
- 
- CDAC::~CDAC()
- {
--    if (m_cdac_handle != NULL)
-+    if (m_cdac_handle)
-     {
-         decltype(&cdac_reader_free) free = reinterpret_cast<decltype(&cdac_reader_free)>(::GetProcAddress(m_module, "cdac_reader_free"));
-         _ASSERTE(free != nullptr);