From d2ec0db6e57a9000dff73c504dd0b8215e89c03a Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 22 Nov 2024 10:43:48 +0530
Subject: [PATCH] [main] Update dependencies from dotnet/arcade (#10099)

* Update dependencies from https://github.com/dotnet/arcade build 20241120.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk
 From Version 10.0.0-beta.24564.1 -> To Version 10.0.0-beta.24570.1

* Update dependencies from https://github.com/dotnet/arcade build 20241120.4

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk
 From Version 10.0.0-beta.24564.1 -> To Version 10.0.0-beta.24570.4

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
---
 eng/Version.Details.xml                   | 16 ++++++++--------
 eng/common/native/install-dependencies.sh |  4 ++++
 global.json                               |  4 ++--
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 3f2d366c6ef..771e566aa37 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -165,25 +165,25 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24564.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24570.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>c1852b9ac37df9a86630c2f078dbee43f7b186e7</Sha>
+      <Sha>0c8f4989db0251f49a4f37d1b35bf4da1e9d6415</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.24564.1">
+    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.24570.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>c1852b9ac37df9a86630c2f078dbee43f7b186e7</Sha>
+      <Sha>0c8f4989db0251f49a4f37d1b35bf4da1e9d6415</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24564.1">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24570.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>c1852b9ac37df9a86630c2f078dbee43f7b186e7</Sha>
+      <Sha>0c8f4989db0251f49a4f37d1b35bf4da1e9d6415</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.ApiCompat" Version="9.0.0-beta.24053.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>f4e11a15c7b8a949d4a366e792a9843ff6e88cd5</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.24564.1">
+    <Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.24570.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>c1852b9ac37df9a86630c2f078dbee43f7b186e7</Sha>
+      <Sha>0c8f4989db0251f49a4f37d1b35bf4da1e9d6415</Sha>
     </Dependency>
     <Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0-beta.23409.2">
       <Uri>https://github.com/dotnet/sourcelink</Uri>
diff --git a/eng/common/native/install-dependencies.sh b/eng/common/native/install-dependencies.sh
index 6d1f8a94a68..dc396a95560 100644
--- a/eng/common/native/install-dependencies.sh
+++ b/eng/common/native/install-dependencies.sh
@@ -44,6 +44,10 @@ case "$os" in
         export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
         # Skip brew update for now, see https://github.com/actions/setup-python/issues/577
         # brew update --preinstall
+
+        # Temporarily uninstall pkg-config@0.29.2 to work around https://github.com/actions/runner-images/issues/10984
+        brew uninstall --ignore-dependencies --force pkg-config@0.29.2
+
         brew bundle --no-upgrade --no-lock --file=- <<EOF
 brew "cmake"
 brew "icu4c"
diff --git a/global.json b/global.json
index f98921330eb..a3c437a9a5b 100644
--- a/global.json
+++ b/global.json
@@ -12,8 +12,8 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24564.1",
-    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24564.1"
+    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24570.4",
+    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24570.4"
   },
   "sdk": {
     "version": "9.0.100"