Update dependencies from https://github.com/dotnet/arcade build 20221…

…201.6 (#330) [dotnet/release/7.0] Update dependencies from dotnet/arcade
dotnet · Dec 12, 2022 · 0b3ae86 · 0b3ae86
1 parent 253d216
commit 0b3ae86
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -3,17 +3,17 @@
   <ProductDependencies>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22601.3">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22601.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>06f4fb81b32083ab58523f1ea0555a3bcbda6066</Sha>
+      <Sha>c01ccbc9554b39205750bf5bda7aad29f89bc0c9</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22601.3">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22601.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>06f4fb81b32083ab58523f1ea0555a3bcbda6066</Sha>
+      <Sha>c01ccbc9554b39205750bf5bda7aad29f89bc0c9</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22601.3">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22601.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>06f4fb81b32083ab58523f1ea0555a3bcbda6066</Sha>
+      <Sha>c01ccbc9554b39205750bf5bda7aad29f89bc0c9</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -6,6 +6,6 @@
     <PreReleaseVersionIteration>1</PreReleaseVersionIteration>
   </PropertyGroup>
   <PropertyGroup>
-    <MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22601.3</MicrosoftDotNetBuildTasksPackagingVersion>
+    <MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22601.6</MicrosoftDotNetBuildTasksPackagingVersion>
   </PropertyGroup>
 </Project>
diff --git a/eng/common/tools.sh b/eng/common/tools.sh
@@ -511,7 +511,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
@@ -3,8 +3,8 @@
     "dotnet": "7.0.100"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22601.3",
-    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22601.3",
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22601.6",
+    "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22601.6",
     "Microsoft.Build.Traversal": "2.0.34"
   }
 }