From 3b19d945fca7d2b2f9d5f945e52eb39d2b513710 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 17 Aug 2021 12:12:57 +0000 Subject: [PATCH 1/6] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-optimization build 20210816.5 optimization.linux-x64.MIBC.Runtime , optimization.windows_nt-x64.MIBC.Runtime , optimization.windows_nt-x86.MIBC.Runtime , optimization.PGO.CoreCLR From Version 1.0.0-prerelease.21411.3 -> To Version 1.0.0-prerelease.21416.5 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 513e7c245d1ca..28cf253a8109d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -206,21 +206,21 @@ https://github.com/dotnet/arcade 58ac7035021bd7277ef7582338afd25403fc9aea - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 59848b44e07f0c06bb2f00f93f033ee693029d1e + d50065944d8b41d804448a7056351481d583ad3d - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 59848b44e07f0c06bb2f00f93f033ee693029d1e + d50065944d8b41d804448a7056351481d583ad3d - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 59848b44e07f0c06bb2f00f93f033ee693029d1e + d50065944d8b41d804448a7056351481d583ad3d - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 59848b44e07f0c06bb2f00f93f033ee693029d1e + d50065944d8b41d804448a7056351481d583ad3d https://github.com/dotnet/hotreload-utils diff --git a/eng/Versions.props b/eng/Versions.props index 626a8ec22b3d9..601d9285a0011 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -128,10 +128,10 @@ 6.0.0-beta.21411.3 6.0.0-beta.21411.3 - 1.0.0-prerelease.21411.3 - 1.0.0-prerelease.21411.3 - 1.0.0-prerelease.21411.3 - 1.0.0-prerelease.21411.3 + 1.0.0-prerelease.21416.5 + 1.0.0-prerelease.21416.5 + 1.0.0-prerelease.21416.5 + 1.0.0-prerelease.21416.5 16.9.0-beta1.21055.5 2.0.0-beta1.20253.1 From 407a65a02135daa762fbd0e5397eb6c61788b704 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 17 Aug 2021 13:15:42 +0000 Subject: [PATCH 2/6] Update dependencies from https://github.com/dotnet/arcade build 20210813.4 Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.Build.Tasks.Workloads , 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.CodeAnalysis , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.GenFacades , Microsoft.DotNet.GenAPI , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SharedFramework.Sdk From Version 6.0.0-beta.21412.1 -> To Version 6.0.0-beta.21413.4 --- eng/Version.Details.xml | 72 +++++++++---------- eng/Versions.props | 28 ++++---- .../templates/job/source-index-stage1.yml | 11 ++- global.json | 8 +-- 4 files changed, 62 insertions(+), 57 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 28cf253a8109d..c0f7e86acaa5e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,73 +14,73 @@ - + https://github.com/dotnet/arcade - 58ac7035021bd7277ef7582338afd25403fc9aea + 9b7027ba718462aa6410cef61a8be5a4283e7528 - + https://github.com/dotnet/arcade - 58ac7035021bd7277ef7582338afd25403fc9aea + 9b7027ba718462aa6410cef61a8be5a4283e7528 - + https://github.com/dotnet/arcade - 58ac7035021bd7277ef7582338afd25403fc9aea + 9b7027ba718462aa6410cef61a8be5a4283e7528 - + https://github.com/dotnet/arcade - 58ac7035021bd7277ef7582338afd25403fc9aea + 9b7027ba718462aa6410cef61a8be5a4283e7528 - + https://github.com/dotnet/arcade - 58ac7035021bd7277ef7582338afd25403fc9aea + 9b7027ba718462aa6410cef61a8be5a4283e7528 - + https://github.com/dotnet/arcade - 58ac7035021bd7277ef7582338afd25403fc9aea + 9b7027ba718462aa6410cef61a8be5a4283e7528 - + https://github.com/dotnet/arcade - 58ac7035021bd7277ef7582338afd25403fc9aea + 9b7027ba718462aa6410cef61a8be5a4283e7528 - + https://github.com/dotnet/arcade - 58ac7035021bd7277ef7582338afd25403fc9aea + 9b7027ba718462aa6410cef61a8be5a4283e7528 - + https://github.com/dotnet/arcade - 58ac7035021bd7277ef7582338afd25403fc9aea + 9b7027ba718462aa6410cef61a8be5a4283e7528 - + https://github.com/dotnet/arcade - 58ac7035021bd7277ef7582338afd25403fc9aea + 9b7027ba718462aa6410cef61a8be5a4283e7528 - + https://github.com/dotnet/arcade - 58ac7035021bd7277ef7582338afd25403fc9aea + 9b7027ba718462aa6410cef61a8be5a4283e7528 - + https://github.com/dotnet/arcade - 58ac7035021bd7277ef7582338afd25403fc9aea + 9b7027ba718462aa6410cef61a8be5a4283e7528 - + https://github.com/dotnet/arcade - 58ac7035021bd7277ef7582338afd25403fc9aea + 9b7027ba718462aa6410cef61a8be5a4283e7528 - + https://github.com/dotnet/arcade - 58ac7035021bd7277ef7582338afd25403fc9aea + 9b7027ba718462aa6410cef61a8be5a4283e7528 - + https://github.com/dotnet/arcade - 58ac7035021bd7277ef7582338afd25403fc9aea + 9b7027ba718462aa6410cef61a8be5a4283e7528 - + https://github.com/dotnet/arcade - 58ac7035021bd7277ef7582338afd25403fc9aea + 9b7027ba718462aa6410cef61a8be5a4283e7528 - + https://github.com/dotnet/arcade - 58ac7035021bd7277ef7582338afd25403fc9aea + 9b7027ba718462aa6410cef61a8be5a4283e7528 https://github.com/microsoft/vstest @@ -202,9 +202,9 @@ https://github.com/dotnet/xharness e9669dc84ecd668d3bbb748758103e23b394ffef - + https://github.com/dotnet/arcade - 58ac7035021bd7277ef7582338afd25403fc9aea + 9b7027ba718462aa6410cef61a8be5a4283e7528 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 601d9285a0011..33add49e329b2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,20 +54,20 @@ 1.0.0-rc.1.21404.21 - 6.0.0-beta.21412.1 - 6.0.0-beta.21412.1 - 6.0.0-beta.21412.1 - 6.0.0-beta.21412.1 - 6.0.0-beta.21412.1 - 6.0.0-beta.21412.1 - 2.5.1-beta.21412.1 - 6.0.0-beta.21412.1 - 6.0.0-beta.21412.1 - 6.0.0-beta.21412.1 - 6.0.0-beta.21412.1 - 6.0.0-beta.21412.1 - 6.0.0-beta.21412.1 - 6.0.0-beta.21412.1 + 6.0.0-beta.21413.4 + 6.0.0-beta.21413.4 + 6.0.0-beta.21413.4 + 6.0.0-beta.21413.4 + 6.0.0-beta.21413.4 + 6.0.0-beta.21413.4 + 2.5.1-beta.21413.4 + 6.0.0-beta.21413.4 + 6.0.0-beta.21413.4 + 6.0.0-beta.21413.4 + 6.0.0-beta.21413.4 + 6.0.0-beta.21413.4 + 6.0.0-beta.21413.4 + 6.0.0-beta.21413.4 6.0.0-preview.1.102 diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index 21fba5fa40c3d..b58d42364b9e7 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -35,15 +35,20 @@ jobs: packageType: sdk version: 3.1.x - - script: ${{ parameters.sourceIndexBuildCommand }} - displayName: Build Repository - + - task: UseDotNet@2 + displayName: Use .NET Core sdk + inputs: + useGlobalJson: true + - script: | dotnet tool install BinLogToSln --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path .source-index/tools dotnet tool install UploadIndexStage1 --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path .source-index/tools echo ##vso[task.prependpath]$(Build.SourcesDirectory)/.source-index/tools displayName: Download Tools + - script: ${{ parameters.sourceIndexBuildCommand }} + displayName: Build Repository + - script: BinLogToSln -i $(BinlogPath) -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output displayName: Process Binlog into indexable sln env: diff --git a/global.json b/global.json index b8af8d2dac2ad..e3425ab9bdd9d 100644 --- a/global.json +++ b/global.json @@ -12,10 +12,10 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21412.1", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21412.1", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21412.1", - "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21412.1", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21413.4", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21413.4", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21413.4", + "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21413.4", "Microsoft.Build.NoTargets": "3.1.0", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "6.0.0-rc.1.21415.6" From 18cd611b46b61d9c65d52980eafb3f30b3ed206c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 17 Aug 2021 13:16:20 +0000 Subject: [PATCH 3/6] Update dependencies from https://github.com/dotnet/icu build 20210816.1 Microsoft.NETCore.Runtime.ICU.Transport From Version 6.0.0-rc.1.21410.2 -> To Version 6.0.0-rc.1.21416.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 c0f7e86acaa5e..1c1426db8f595 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/icu - 5263e5a05ff3f9ba6cb061a97be83f5d8ad276be + 05dbba88d0ae799b4fea1e13c69b0c02beb7dcbe https://github.com/dotnet/msquic diff --git a/eng/Versions.props b/eng/Versions.props index 33add49e329b2..586e5842eacf9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -172,7 +172,7 @@ 6.0.100-preview.6.21413.1 $(MicrosoftNETILLinkTasksVersion) - 6.0.0-rc.1.21410.2 + 6.0.0-rc.1.21416.1 6.0.0-preview.7.21413.1 From e96a857fba5b85128fcc1fae13e454222f653563 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 17 Aug 2021 13:16:58 +0000 Subject: [PATCH 4/6] Update dependencies from https://github.com/dotnet/llvm-project build 20210816.1 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.21409.1 -> To Version 11.1.0-alpha.1.21416.1 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1c1426db8f595..01ff4ca766172 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -126,37 +126,37 @@ https://github.com/dotnet/runtime-assets cc70e46d909f35a576abe245219c1df31160bbd6 - + https://github.com/dotnet/llvm-project - 30296e71234ffb3eb8da789d36adf4db146e6602 + cea4a95e1505e737e768c8094d6aa880f5442ab7 - + https://github.com/dotnet/llvm-project - 30296e71234ffb3eb8da789d36adf4db146e6602 + cea4a95e1505e737e768c8094d6aa880f5442ab7 - + https://github.com/dotnet/llvm-project - 30296e71234ffb3eb8da789d36adf4db146e6602 + cea4a95e1505e737e768c8094d6aa880f5442ab7 - + https://github.com/dotnet/llvm-project - 30296e71234ffb3eb8da789d36adf4db146e6602 + cea4a95e1505e737e768c8094d6aa880f5442ab7 - + https://github.com/dotnet/llvm-project - 30296e71234ffb3eb8da789d36adf4db146e6602 + cea4a95e1505e737e768c8094d6aa880f5442ab7 - + https://github.com/dotnet/llvm-project - 30296e71234ffb3eb8da789d36adf4db146e6602 + cea4a95e1505e737e768c8094d6aa880f5442ab7 - + https://github.com/dotnet/llvm-project - 30296e71234ffb3eb8da789d36adf4db146e6602 + cea4a95e1505e737e768c8094d6aa880f5442ab7 - + https://github.com/dotnet/llvm-project - 30296e71234ffb3eb8da789d36adf4db146e6602 + cea4a95e1505e737e768c8094d6aa880f5442ab7 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 586e5842eacf9..562c542605fd7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -176,14 +176,14 @@ 6.0.0-preview.7.21413.1 - 11.1.0-alpha.1.21409.1 - 11.1.0-alpha.1.21409.1 - 11.1.0-alpha.1.21409.1 - 11.1.0-alpha.1.21409.1 - 11.1.0-alpha.1.21409.1 - 11.1.0-alpha.1.21409.1 - 11.1.0-alpha.1.21409.1 - 11.1.0-alpha.1.21409.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 6.0.0-rc.1.21416.1 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) From c4096a1d8cfbaa7f075db9dc3faeb0275f224aef Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 17 Aug 2021 13:17:37 +0000 Subject: [PATCH 5/6] Update dependencies from https://github.com/dotnet/runtime-assets build 20210816.1 Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Drawing.Common.TestData , System.IO.Compression.TestData , System.IO.Packaging.TestData , System.Net.TestData , System.Private.Runtime.UnicodeData , System.Runtime.Numerics.TestData , System.Runtime.TimeZoneData , System.Security.Cryptography.X509Certificates.TestData , System.Windows.Extensions.TestData From Version 6.0.0-beta.21411.3 -> To Version 6.0.0-beta.21416.1 --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 22 ++++++++++----------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 01ff4ca766172..0ff0bb2a06817 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -86,45 +86,45 @@ https://github.com/microsoft/vstest 140434f7109d357d0158ade9e5164a4861513965 - + https://github.com/dotnet/runtime-assets - cc70e46d909f35a576abe245219c1df31160bbd6 + 7f980667ff908c5b5d7cf0dd66d48e7af23daae1 - + https://github.com/dotnet/runtime-assets - cc70e46d909f35a576abe245219c1df31160bbd6 + 7f980667ff908c5b5d7cf0dd66d48e7af23daae1 - + https://github.com/dotnet/runtime-assets - cc70e46d909f35a576abe245219c1df31160bbd6 + 7f980667ff908c5b5d7cf0dd66d48e7af23daae1 - + https://github.com/dotnet/runtime-assets - cc70e46d909f35a576abe245219c1df31160bbd6 + 7f980667ff908c5b5d7cf0dd66d48e7af23daae1 - + https://github.com/dotnet/runtime-assets - cc70e46d909f35a576abe245219c1df31160bbd6 + 7f980667ff908c5b5d7cf0dd66d48e7af23daae1 - + https://github.com/dotnet/runtime-assets - cc70e46d909f35a576abe245219c1df31160bbd6 + 7f980667ff908c5b5d7cf0dd66d48e7af23daae1 - + https://github.com/dotnet/runtime-assets - cc70e46d909f35a576abe245219c1df31160bbd6 + 7f980667ff908c5b5d7cf0dd66d48e7af23daae1 - + https://github.com/dotnet/runtime-assets - cc70e46d909f35a576abe245219c1df31160bbd6 + 7f980667ff908c5b5d7cf0dd66d48e7af23daae1 - + https://github.com/dotnet/runtime-assets - cc70e46d909f35a576abe245219c1df31160bbd6 + 7f980667ff908c5b5d7cf0dd66d48e7af23daae1 - + https://github.com/dotnet/runtime-assets - cc70e46d909f35a576abe245219c1df31160bbd6 + 7f980667ff908c5b5d7cf0dd66d48e7af23daae1 https://github.com/dotnet/llvm-project @@ -226,9 +226,9 @@ https://github.com/dotnet/hotreload-utils 802e79f0cf423249d54bfaafca2da4a272f4ca07 - + https://github.com/dotnet/runtime-assets - cc70e46d909f35a576abe245219c1df31160bbd6 + 7f980667ff908c5b5d7cf0dd66d48e7af23daae1 https://github.com/dotnet/roslyn-analyzers diff --git a/eng/Versions.props b/eng/Versions.props index 562c542605fd7..43820e46287cd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -116,17 +116,17 @@ 4.5.0 6.0.0-rc.1.21415.6 - 6.0.0-beta.21411.3 - 6.0.0-beta.21411.3 - 6.0.0-beta.21411.3 - 6.0.0-beta.21411.3 - 6.0.0-beta.21411.3 - 6.0.0-beta.21411.3 - 6.0.0-beta.21411.3 - 6.0.0-beta.21411.3 - 6.0.0-beta.21411.3 - 6.0.0-beta.21411.3 - 6.0.0-beta.21411.3 + 6.0.0-beta.21416.1 + 6.0.0-beta.21416.1 + 6.0.0-beta.21416.1 + 6.0.0-beta.21416.1 + 6.0.0-beta.21416.1 + 6.0.0-beta.21416.1 + 6.0.0-beta.21416.1 + 6.0.0-beta.21416.1 + 6.0.0-beta.21416.1 + 6.0.0-beta.21416.1 + 6.0.0-beta.21416.1 1.0.0-prerelease.21416.5 1.0.0-prerelease.21416.5 From 20fcebb5659b353bb0677ceddf6838e44542a0e0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 17 Aug 2021 13:18:14 +0000 Subject: [PATCH 6/6] Update dependencies from https://github.com/dotnet/msquic build 20210816.1 System.Net.MsQuic.Transport From Version 6.0.0-preview.7.21413.1 -> To Version 6.0.0-preview.7.21416.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 0ff0bb2a06817..36134b4ae9133 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,9 +4,9 @@ https://github.com/dotnet/icu 05dbba88d0ae799b4fea1e13c69b0c02beb7dcbe - + https://github.com/dotnet/msquic - 73d128a9c0beb6d6d92ef2b0c09ada8433754a11 + 362df5b138c53d034a5068fa9ea6c7ec8a632239 https://github.com/dotnet/emsdk diff --git a/eng/Versions.props b/eng/Versions.props index 43820e46287cd..999c049d68c48 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -174,7 +174,7 @@ 6.0.0-rc.1.21416.1 - 6.0.0-preview.7.21413.1 + 6.0.0-preview.7.21416.1 11.1.0-alpha.1.21416.1 11.1.0-alpha.1.21416.1