From 33dbdc6d5c998e7b8fcfd6e1c27a4dc5c22384a8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 5 Dec 2022 13:11:01 +0000 Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade build 20221129.2 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.22575.1 -> To Version 8.0.0-beta.22579.2 --- eng/Version.Details.xml | 4 ++-- eng/common/tools.sh | 2 +- global.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9bc906324c..d072b4d25e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -19,9 +19,9 @@ - + https://github.com/dotnet/arcade - b61fcdfe86b30fe91898bfb296f4f4396fe5d87a + 6b3bad6673f3ebe89ebe12ea7c4eff1705b893e6 diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 6586eab458..e7d1e3897e 100644 --- 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 fc87ff15b0..bb7247c5aa 100644 --- 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" } }