From 3e0c89b69f70690579d2f1c0a04577a674ef1cf6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 16 Jun 2022 18:11:42 -0700 Subject: [PATCH] [release/6.0] Update dependencies from dotnet/arcade dotnet/llvm-project (#68871) * Update dependencies from https://github.com/dotnet/arcade build 20220504.3 Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.GenAPI , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.GenFacades , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.Helix.Sdk From Version 2.5.1-beta.22161.1 -> To Version 2.5.1-beta.22254.3 * Update dependencies from https://github.com/dotnet/arcade build 20220511.7 Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.GenAPI , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.GenFacades , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.Helix.Sdk From Version 2.5.1-beta.22161.1 -> To Version 2.5.1-beta.22261.7 * Update dependencies from https://github.com/dotnet/llvm-project build 20220513.3 runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools From Version 11.1.0-alpha.1.21416.1 -> To Version 11.1.0-alpha.1.22263.3 * Update dependencies from https://github.com/dotnet/arcade build 20220614.7 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.Sdk , 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 6.0.0-beta.22161.1 -> To Version 6.0.0-beta.22314.7 * Use VS preview pools for Windows build jobs, and remove Windows version number from queue name * Revert "Use VS preview pools for Windows build jobs, and remove Windows version number from queue name" This reverts commit 5478426a751b299afd19f81e15abf033f699d76c. * Update dependencies from https://github.com/dotnet/llvm-project build 20220616.1 runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools From Version 11.1.0-alpha.1.21416.1 -> To Version 11.1.0-alpha.1.22316.1 Co-authored-by: dotnet-maestro[bot] Co-authored-by: carlossanlop <1175054+carlossanlop@users.noreply.github.com> --- NuGet.config | 1 - eng/Version.Details.xml | 108 ++++++++++---------- eng/Versions.props | 46 ++++----- eng/common/templates/steps/source-build.yml | 4 +- global.json | 12 +-- 5 files changed, 85 insertions(+), 86 deletions(-) diff --git a/NuGet.config b/NuGet.config index a66af49d118f5..d5dbd101f043e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b5630ba1a7341..b1e7a3296db7a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -26,77 +26,77 @@ - + https://github.com/dotnet/arcade - 879df783283dfb44c7653493fdf7fd7b07ba6b01 + fdd3a242bc813f371023adff4e4c05c0be705d2a - + https://github.com/dotnet/arcade - 879df783283dfb44c7653493fdf7fd7b07ba6b01 + fdd3a242bc813f371023adff4e4c05c0be705d2a - + https://github.com/dotnet/arcade - 879df783283dfb44c7653493fdf7fd7b07ba6b01 + fdd3a242bc813f371023adff4e4c05c0be705d2a - + https://github.com/dotnet/arcade - 879df783283dfb44c7653493fdf7fd7b07ba6b01 + fdd3a242bc813f371023adff4e4c05c0be705d2a - + https://github.com/dotnet/arcade - 879df783283dfb44c7653493fdf7fd7b07ba6b01 + fdd3a242bc813f371023adff4e4c05c0be705d2a - + https://github.com/dotnet/arcade - 879df783283dfb44c7653493fdf7fd7b07ba6b01 + fdd3a242bc813f371023adff4e4c05c0be705d2a - + https://github.com/dotnet/arcade - 879df783283dfb44c7653493fdf7fd7b07ba6b01 + fdd3a242bc813f371023adff4e4c05c0be705d2a - + https://github.com/dotnet/arcade - 879df783283dfb44c7653493fdf7fd7b07ba6b01 + fdd3a242bc813f371023adff4e4c05c0be705d2a - + https://github.com/dotnet/arcade - 879df783283dfb44c7653493fdf7fd7b07ba6b01 + fdd3a242bc813f371023adff4e4c05c0be705d2a - + https://github.com/dotnet/arcade - 879df783283dfb44c7653493fdf7fd7b07ba6b01 + fdd3a242bc813f371023adff4e4c05c0be705d2a - + https://github.com/dotnet/arcade - 879df783283dfb44c7653493fdf7fd7b07ba6b01 + fdd3a242bc813f371023adff4e4c05c0be705d2a - + https://github.com/dotnet/arcade - 879df783283dfb44c7653493fdf7fd7b07ba6b01 + fdd3a242bc813f371023adff4e4c05c0be705d2a - + https://github.com/dotnet/arcade - 879df783283dfb44c7653493fdf7fd7b07ba6b01 + fdd3a242bc813f371023adff4e4c05c0be705d2a - + https://github.com/dotnet/arcade - 879df783283dfb44c7653493fdf7fd7b07ba6b01 + fdd3a242bc813f371023adff4e4c05c0be705d2a - + https://github.com/dotnet/arcade - 879df783283dfb44c7653493fdf7fd7b07ba6b01 + fdd3a242bc813f371023adff4e4c05c0be705d2a - + https://github.com/dotnet/arcade - 879df783283dfb44c7653493fdf7fd7b07ba6b01 + fdd3a242bc813f371023adff4e4c05c0be705d2a - + https://github.com/dotnet/arcade - 879df783283dfb44c7653493fdf7fd7b07ba6b01 + fdd3a242bc813f371023adff4e4c05c0be705d2a - + https://github.com/dotnet/arcade - 879df783283dfb44c7653493fdf7fd7b07ba6b01 + fdd3a242bc813f371023adff4e4c05c0be705d2a https://github.com/microsoft/vstest @@ -142,37 +142,37 @@ https://github.com/dotnet/runtime-assets 6c6b7f90677142ad7bd829eb28d3bcf8ad775dd7 - + https://github.com/dotnet/llvm-project - cea4a95e1505e737e768c8094d6aa880f5442ab7 + 0f10ab4748ab03f248985e664aea7ec9df55b3f4 - + https://github.com/dotnet/llvm-project - cea4a95e1505e737e768c8094d6aa880f5442ab7 + 0f10ab4748ab03f248985e664aea7ec9df55b3f4 - + https://github.com/dotnet/llvm-project - cea4a95e1505e737e768c8094d6aa880f5442ab7 + 0f10ab4748ab03f248985e664aea7ec9df55b3f4 - + https://github.com/dotnet/llvm-project - cea4a95e1505e737e768c8094d6aa880f5442ab7 + 0f10ab4748ab03f248985e664aea7ec9df55b3f4 - + https://github.com/dotnet/llvm-project - cea4a95e1505e737e768c8094d6aa880f5442ab7 + 0f10ab4748ab03f248985e664aea7ec9df55b3f4 - + https://github.com/dotnet/llvm-project - cea4a95e1505e737e768c8094d6aa880f5442ab7 + 0f10ab4748ab03f248985e664aea7ec9df55b3f4 - + https://github.com/dotnet/llvm-project - cea4a95e1505e737e768c8094d6aa880f5442ab7 + 0f10ab4748ab03f248985e664aea7ec9df55b3f4 - + https://github.com/dotnet/llvm-project - cea4a95e1505e737e768c8094d6aa880f5442ab7 + 0f10ab4748ab03f248985e664aea7ec9df55b3f4 https://github.com/dotnet/runtime @@ -218,9 +218,9 @@ https://github.com/dotnet/xharness e9669dc84ecd668d3bbb748758103e23b394ffef - + https://github.com/dotnet/arcade - 879df783283dfb44c7653493fdf7fd7b07ba6b01 + fdd3a242bc813f371023adff4e4c05c0be705d2a https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 43005de5e8db4..af4b55b988420 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,21 +41,21 @@ 1.1.0-preview.22164.17 - 6.0.0-beta.22161.1 - 6.0.0-beta.22161.1 - 6.0.0-beta.22161.1 - 6.0.0-beta.22161.1 - 6.0.0-beta.22161.1 - 6.0.0-beta.22161.1 - 2.5.1-beta.22161.1 - 6.0.0-beta.22161.1 - 6.0.0-beta.22161.1 - 6.0.0-beta.22161.1 - 6.0.0-beta.22161.1 - 6.0.0-beta.22161.1 - 6.0.0-beta.22161.1 - 6.0.0-beta.22161.1 - 6.0.0-beta.22161.1 + 6.0.0-beta.22314.7 + 6.0.0-beta.22314.7 + 6.0.0-beta.22314.7 + 6.0.0-beta.22314.7 + 6.0.0-beta.22314.7 + 6.0.0-beta.22314.7 + 2.5.1-beta.22314.7 + 6.0.0-beta.22314.7 + 6.0.0-beta.22314.7 + 6.0.0-beta.22314.7 + 6.0.0-beta.22314.7 + 6.0.0-beta.22314.7 + 6.0.0-beta.22314.7 + 6.0.0-beta.22314.7 + 6.0.0-beta.22314.7 6.0.0-preview.1.102 @@ -161,14 +161,14 @@ 6.0.0-preview.7.21417.1 - 11.1.0-alpha.1.21416.1 - 11.1.0-alpha.1.21416.1 - 11.1.0-alpha.1.21416.1 - 11.1.0-alpha.1.21416.1 - 11.1.0-alpha.1.21416.1 - 11.1.0-alpha.1.21416.1 - 11.1.0-alpha.1.21416.1 - 11.1.0-alpha.1.21416.1 + 11.1.0-alpha.1.22316.1 + 11.1.0-alpha.1.22316.1 + 11.1.0-alpha.1.22316.1 + 11.1.0-alpha.1.22316.1 + 11.1.0-alpha.1.22316.1 + 11.1.0-alpha.1.22316.1 + 11.1.0-alpha.1.22316.1 + 11.1.0-alpha.1.22316.1 6.0.4 6.0.4 diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index ba40dc82f1411..abb1b2bcda42b 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -43,8 +43,8 @@ steps: # In that case, add variables to allow the download of internal runtimes if the specified versions are not found # in the default public locations. internalRuntimeDownloadArgs= - if [ '$(dotnetclimsrc-read-sas-token-base64)' != '$''(dotnetclimsrc-read-sas-token-base64)' ]; then - internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetclimsrc.blob.core.windows.net/dotnet /p:DotNetRuntimeSourceFeedKey=$(dotnetclimsrc-read-sas-token-base64) --runtimesourcefeed https://dotnetclimsrc.blob.core.windows.net/dotnet --runtimesourcefeedkey $(dotnetclimsrc-read-sas-token-base64)' + if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then + internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://dotnetbuilds.blob.core.windows.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)' fi buildConfig=Release diff --git a/global.json b/global.json index 5f2d0ee878bcb..580fe7e1d29ca 100644 --- a/global.json +++ b/global.json @@ -1,21 +1,21 @@ { "sdk": { - "version": "6.0.103", + "version": "6.0.106", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "6.0.103" + "dotnet": "6.0.106" }, "native-tools": { "cmake": "3.16.4", "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.22161.1", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22161.1", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22161.1", - "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.22161.1", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.22314.7", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22314.7", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22314.7", + "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.22314.7", "Microsoft.Build.NoTargets": "3.1.0", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "6.0.0-rc.1.21415.6"