From 3d488cd2428e47ccc44267000efe0d09480dfeb9 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 16 Jan 2024 22:33:02 +0000
Subject: [PATCH] [release/7.0.4xx] Update dependencies from dotnet/arcade
 (#18261)

[release/7.0.4xx] Update dependencies from dotnet/arcade
---
 NuGet.config                       | 21 ---------------------
 eng/Version.Details.xml            | 12 ++++++------
 eng/Versions.props                 |  2 +-
 eng/common/native/init-compiler.sh |  2 +-
 global.json                        |  4 ++--
 5 files changed, 10 insertions(+), 31 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index f1fe9ed1c..bdc3a6cb9 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -12,24 +12,12 @@
     <!--  Begin: Package sources from dotnet-aspnetcore -->
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-emsdk -->
-    <add key="darc-pub-dotnet-emsdk-33b038b" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-33b038b5/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-emsdk-33b038b-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-33b038b5-2/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-emsdk-33b038b-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-33b038b5-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-emsdk -->
     <!--  Begin: Package sources from dotnet-runtime -->
-    <add key="darc-int-dotnet-runtime-8f4568c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-8f4568cd/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-runtime-8f4568c-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-8f4568cd-2/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-runtime-8f4568c-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-8f4568cd-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-sdk -->
-    <add key="darc-int-dotnet-sdk-6e7e4b1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-6e7e4b10/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-sdk-6e7e4b1-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-6e7e4b10-2/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-sdk-6e7e4b1-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-6e7e4b10-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-sdk -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
-    <add key="darc-int-dotnet-windowsdesktop-acb200f" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-acb200f3/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-windowsdesktop-acb200f-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-acb200f3-2/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-windowsdesktop-acb200f-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-acb200f3-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-windowsdesktop -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
@@ -53,18 +41,9 @@
     <!--  Begin: Package sources from dotnet-aspnetcore -->
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-runtime -->
-    <add key="darc-int-dotnet-runtime-8f4568c-1" value="true" />
-    <add key="darc-int-dotnet-runtime-8f4568c-2" value="true" />
-    <add key="darc-int-dotnet-runtime-8f4568c" value="true" />
     <!--  Begin: Package sources from dotnet-sdk -->
-    <add key="darc-int-dotnet-sdk-6e7e4b1-1" value="true" />
-    <add key="darc-int-dotnet-sdk-6e7e4b1-2" value="true" />
-    <add key="darc-int-dotnet-sdk-6e7e4b1" value="true" />
     <!--  End: Package sources from dotnet-sdk -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
-    <add key="darc-int-dotnet-windowsdesktop-acb200f-1" value="true" />
-    <add key="darc-int-dotnet-windowsdesktop-acb200f-2" value="true" />
-    <add key="darc-int-dotnet-windowsdesktop-acb200f" value="true" />
     <!--  End: Package sources from dotnet-windowsdesktop -->
     <!--  End: Package sources from dotnet-runtime -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 6d5ac1690..6526e84d8 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -192,18 +192,18 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.24061.2">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.24065.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>d6372b3e4dcd568d7412ab1e60003fa1083aaa5f</Sha>
+      <Sha>feda715e3fb6d511eaa39071bb9d77351cf4d943</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.24061.2">
+    <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.24065.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>d6372b3e4dcd568d7412ab1e60003fa1083aaa5f</Sha>
+      <Sha>feda715e3fb6d511eaa39071bb9d77351cf4d943</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.24061.2">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.24065.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>d6372b3e4dcd568d7412ab1e60003fa1083aaa5f</Sha>
+      <Sha>feda715e3fb6d511eaa39071bb9d77351cf4d943</Sha>
     </Dependency>
     <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="7.0.0-alpha.1.24059.2">
       <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 69a22d60d..549b11314 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -33,7 +33,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/arcade -->
-    <MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.24061.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
+    <MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.24065.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/winforms -->
diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh
index f13b74080..81ea06151 100644
--- a/eng/common/native/init-compiler.sh
+++ b/eng/common/native/init-compiler.sh
@@ -71,7 +71,7 @@ if [[ -z "$CLR_CC" ]]; then
     # Set default versions
     if [[ -z "$majorVersion" ]]; then
         # note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero.
-        if [[ "$compiler" == "clang" ]]; then versions=( 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 )
+        if [[ "$compiler" == "clang" ]]; then versions=( 17 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 )
         elif [[ "$compiler" == "gcc" ]]; then versions=( 12 11 10 9 8 7 6 5 4.9 ); fi
 
         for version in "${versions[@]}"; do
diff --git a/global.json b/global.json
index 45f2ad15f..30aff2051 100644
--- a/global.json
+++ b/global.json
@@ -11,7 +11,7 @@
     "cmake": "3.16.4"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24061.2",
-    "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24061.2"
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24065.4",
+    "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24065.4"
   }
 }