From 79e37935e35d27063109b4ecc6c822c9a0e907f5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 11 Apr 2023 19:49:11 +0000 Subject: [PATCH 1/4] Update dependencies from https://github.com/dotnet/arcade build 20230411.2 Microsoft.DotNet.ApiCompat , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 7.0.0-beta.23164.3 -> To Version 7.0.0-beta.23211.2 --- eng/Version.Details.xml | 76 +++++++++++++++--------------- eng/Versions.props | 32 ++++++------- eng/common/native/init-compiler.sh | 2 +- global.json | 10 ++-- 4 files changed, 60 insertions(+), 60 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3af55c86d6de46..9bb7afcad13118 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -58,77 +58,77 @@ - + https://github.com/dotnet/arcade - 099bbb071e187ba4e1603004597624e6acae6394 + 7c5e5a782c67460b123c8e41d484ebcca8002c93 - + https://github.com/dotnet/arcade - 099bbb071e187ba4e1603004597624e6acae6394 + 7c5e5a782c67460b123c8e41d484ebcca8002c93 - + https://github.com/dotnet/arcade - 099bbb071e187ba4e1603004597624e6acae6394 + 7c5e5a782c67460b123c8e41d484ebcca8002c93 - + https://github.com/dotnet/arcade - 099bbb071e187ba4e1603004597624e6acae6394 + 7c5e5a782c67460b123c8e41d484ebcca8002c93 - + https://github.com/dotnet/arcade - 099bbb071e187ba4e1603004597624e6acae6394 + 7c5e5a782c67460b123c8e41d484ebcca8002c93 - + https://github.com/dotnet/arcade - 099bbb071e187ba4e1603004597624e6acae6394 + 7c5e5a782c67460b123c8e41d484ebcca8002c93 - + https://github.com/dotnet/arcade - 099bbb071e187ba4e1603004597624e6acae6394 + 7c5e5a782c67460b123c8e41d484ebcca8002c93 - + https://github.com/dotnet/arcade - 099bbb071e187ba4e1603004597624e6acae6394 + 7c5e5a782c67460b123c8e41d484ebcca8002c93 - + https://github.com/dotnet/arcade - 099bbb071e187ba4e1603004597624e6acae6394 + 7c5e5a782c67460b123c8e41d484ebcca8002c93 - + https://github.com/dotnet/arcade - 099bbb071e187ba4e1603004597624e6acae6394 + 7c5e5a782c67460b123c8e41d484ebcca8002c93 - + https://github.com/dotnet/arcade - 099bbb071e187ba4e1603004597624e6acae6394 + 7c5e5a782c67460b123c8e41d484ebcca8002c93 - + https://github.com/dotnet/arcade - 099bbb071e187ba4e1603004597624e6acae6394 + 7c5e5a782c67460b123c8e41d484ebcca8002c93 - + https://github.com/dotnet/arcade - 099bbb071e187ba4e1603004597624e6acae6394 + 7c5e5a782c67460b123c8e41d484ebcca8002c93 - + https://github.com/dotnet/arcade - 099bbb071e187ba4e1603004597624e6acae6394 + 7c5e5a782c67460b123c8e41d484ebcca8002c93 - + https://github.com/dotnet/arcade - 099bbb071e187ba4e1603004597624e6acae6394 + 7c5e5a782c67460b123c8e41d484ebcca8002c93 - + https://github.com/dotnet/arcade - 099bbb071e187ba4e1603004597624e6acae6394 + 7c5e5a782c67460b123c8e41d484ebcca8002c93 - + https://github.com/dotnet/arcade - 099bbb071e187ba4e1603004597624e6acae6394 + 7c5e5a782c67460b123c8e41d484ebcca8002c93 - + https://github.com/dotnet/arcade - 099bbb071e187ba4e1603004597624e6acae6394 + 7c5e5a782c67460b123c8e41d484ebcca8002c93 https://github.com/dotnet/runtime-assets @@ -258,9 +258,9 @@ https://github.com/dotnet/xharness 5ebf69650b9f7b4ecab485be840b3022420f7812 - + https://github.com/dotnet/arcade - 099bbb071e187ba4e1603004597624e6acae6394 + 7c5e5a782c67460b123c8e41d484ebcca8002c93 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 5ba7cf216bd9ac..8077beb96b6a33 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,22 +53,22 @@ 7.0.100-rc.1.22402.1 - 7.0.0-beta.23164.3 - 7.0.0-beta.23164.3 - 7.0.0-beta.23164.3 - 7.0.0-beta.23164.3 - 7.0.0-beta.23164.3 - 7.0.0-beta.23164.3 - 2.5.1-beta.23164.3 - 7.0.0-beta.23164.3 - 7.0.0-beta.23164.3 - 7.0.0-beta.23164.3 - 7.0.0-beta.23164.3 - 7.0.0-beta.23164.3 - 7.0.0-beta.23164.3 - 7.0.0-beta.23164.3 - 7.0.0-beta.23164.3 - 7.0.0-beta.23164.3 + 7.0.0-beta.23211.2 + 7.0.0-beta.23211.2 + 7.0.0-beta.23211.2 + 7.0.0-beta.23211.2 + 7.0.0-beta.23211.2 + 7.0.0-beta.23211.2 + 2.5.1-beta.23211.2 + 7.0.0-beta.23211.2 + 7.0.0-beta.23211.2 + 7.0.0-beta.23211.2 + 7.0.0-beta.23211.2 + 7.0.0-beta.23211.2 + 7.0.0-beta.23211.2 + 7.0.0-beta.23211.2 + 7.0.0-beta.23211.2 + 7.0.0-beta.23211.2 6.0.0-preview.1.102 diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh index 41a26d802a93f8..f13b74080edf9b 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=( 15 14 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=( 16 15 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 4a7f1a9cdb1f6e..b9d7d81f1f2ad2 100644 --- a/global.json +++ b/global.json @@ -1,16 +1,16 @@ { "sdk": { - "version": "7.0.104", + "version": "7.0.105", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "7.0.104" + "dotnet": "7.0.105" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23164.3", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.23164.3", - "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.23164.3", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23211.2", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.23211.2", + "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.23211.2", "Microsoft.Build.NoTargets": "3.5.0", "Microsoft.Build.Traversal": "3.1.6", "Microsoft.NET.Sdk.IL": "7.0.0-rc.1.22414.6" From 91bf942c1981a05762aea3f17180deaadc348d50 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 11 Apr 2023 21:42:52 +0000 Subject: [PATCH 2/4] Update dependencies from https://github.com/dotnet/linker build 20230411.1 Microsoft.NET.ILLink.Tasks From Version 7.0.100-1.23207.1 -> To Version 7.0.100-1.23211.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9bb7afcad13118..0cc5033a0930a2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -242,9 +242,9 @@ https://github.com/dotnet/runtime e680411c22e33f45821f4ae64365a2970b2430a6 - + https://github.com/dotnet/linker - 08a09f27f664fb84368aa4b9eb862b13bf808579 + 9d4b3f3e0c100fe5ac4dc7f40d14d792178dbd0c https://github.com/dotnet/xharness diff --git a/eng/Versions.props b/eng/Versions.props index 8077beb96b6a33..0d7674e38d03dd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -174,7 +174,7 @@ 7.0.0-preview-20221010.1 - 7.0.100-1.23207.1 + 7.0.100-1.23211.1 $(MicrosoftNETILLinkTasksVersion) 7.0.0-rtm.23115.1 From c83734ae66ebf24c67830330247a3ed85b7da119 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 11 Apr 2023 21:55:49 +0000 Subject: [PATCH 3/4] Update dependencies from https://github.com/dotnet/emsdk build 20230411.1 Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100 , Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.6 -> To Version 7.0.6 --- NuGet.config | 2 +- eng/Version.Details.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3b47eb2e33ec79..a1337574ac916a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + - 7.0.0-rtm.23115.1 + 7.0.0-rtm.23211.1 2.1.1 7.0.0-alpha.1.22459.1