Update dependencies from https://github.com/dotnet/arcade build 20221129.2 (#3536)

[main] Update dependencies from dotnet/arcade

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 9bc906324c3c93801257ffa047871222fbc5d59d..d072b4d25e7c2bc0f550b91fc9fe4c2a54b61dcb 100644 (file)
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -19,9 +19,9 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22575.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22579.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>b61fcdfe86b30fe91898bfb296f4f4396fe5d87a</Sha>
+      <Sha>6b3bad6673f3ebe89ebe12ea7c4eff1705b893e6</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.22316.2" Pinned="true">

diff --git a/eng/common/tools.sh b/eng/common/tools.sh
index 6586eab458e55d0400118740c1b43f71fedf1712..e7d1e3897e0314e575d9abc26aaf8367d306f01d 100644 (file)
--- a/eng/common/tools.sh
+++ b/eng/common/tools.sh
@@ -521,7 +521,7 @@ global_json_file="${repo_root}global.json"
 # determine if global.json contains a "runtimes" entry
 global_json_has_runtimes=false
 if command -v jq &> /dev/null; then
-  if jq -er '. | select(has("runtimes"))' "$global_json_file" &> /dev/null; then
+  if jq -e '.tools | has("runtimes")' "$global_json_file" &> /dev/null; then
     global_json_has_runtimes=true
   fi
 elif [[ "$(cat "$global_json_file")" =~ \"runtimes\"[[:space:]\:]*\{ ]]; then

diff --git a/global.json b/global.json
index fc87ff15b05118e302aba11b7a7eed2522ea6ab2..bb7247c5aa1ffac53e1fe7dc8392a5c3d9ff223d 100644 (file)
--- a/global.json
+++ b/global.json
@@ -20,6 +20,6 @@
   },
   "msbuild-sdks": {
     "Microsoft.Build.NoTargets": "3.5.0",
-    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22575.1"
+    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22579.2"
   }
 }