From 7bcd112e466d30f251d298a5f013adfb0ab03868 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 30 Nov 2022 13:03:39 +0000 Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade build 20221129.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.22578.1 -> To Version 8.0.0-beta.22579.2 --- eng/Version.Details.xml | 8 ++++---- eng/common/tools.sh | 2 +- global.json | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e09a48547e4..47bd47ed09e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,14 +8,14 @@ - + https://github.com/dotnet/arcade - 3817f2b38a05c37c950715f84c95d452bcacfe52 + 6b3bad6673f3ebe89ebe12ea7c4eff1705b893e6 - + https://github.com/dotnet/arcade - 3817f2b38a05c37c950715f84c95d452bcacfe52 + 6b3bad6673f3ebe89ebe12ea7c4eff1705b893e6 diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 6586eab458e..e7d1e3897e0 100755 --- 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 b2ea220aa7a..939b18b4e34 100644 --- a/global.json +++ b/global.json @@ -18,7 +18,7 @@ "perl": "5.32.1.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22578.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22578.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22579.2", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22579.2" } }