From 8e94f17609cc51c3c8c09c674a4e93ac6257cc30 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 6 Jul 2022 12:38:21 +0000 Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade build 20220705.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.22327.2 -> To Version 7.0.0-beta.22355.4 Dependency coherency updates Microsoft.SourceLink.GitHub,Microsoft.DotNet.XliffTasks From Version 1.2.0-beta-22325-02 -> To Version 1.2.0-beta-22354-01 (parent: Microsoft.DotNet.Arcade.Sdk --- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 2 +- eng/common/native/init-compiler.sh | 2 +- global.json | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index db4d487ea..9485557ec 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -196,26 +196,26 @@ - + https://github.com/dotnet/arcade - 66cb5f1f50059cbafe25d1b75a1adbbced840d85 + 9f45238c23d89cf44a10705db1217e66a441ba5a - + https://github.com/dotnet/arcade - 66cb5f1f50059cbafe25d1b75a1adbbced840d85 + 9f45238c23d89cf44a10705db1217e66a441ba5a - + https://github.com/dotnet/arcade - 66cb5f1f50059cbafe25d1b75a1adbbced840d85 + 9f45238c23d89cf44a10705db1217e66a441ba5a https://github.com/dotnet/source-build-reference-packages 993b067a1849e4884360b4548cbf74f0bfaa2f35 - + https://github.com/dotnet/sourcelink 39d159f2a663d836dc54704cfa74414be3e3338f diff --git a/eng/Versions.props b/eng/Versions.props index 7a559fd74..4ae507d8e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 7.0.0-beta.22354.1 + 7.0.0-beta.22355.4 diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh index 6d7ba15e5..4b99a9cad 100644 --- a/eng/common/native/init-compiler.sh +++ b/eng/common/native/init-compiler.sh @@ -71,7 +71,7 @@ if [[ -z "$CLR_CC" ]]; then # Set default versions if [[ -z "$majorVersion" ]]; then # note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero. - if [[ "$compiler" == "clang" ]]; then versions=( 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 ) + if [[ "$compiler" == "clang" ]]; then versions=( 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 ) elif [[ "$compiler" == "gcc" ]]; then versions=( 12 11 10 9 8 7 6 5 4.9 ); fi for version in "${versions[@]}"; do diff --git a/global.json b/global.json index c7d60c667..54ba2b356 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22354.1", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22354.1" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22355.4", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22355.4" } }