From d0df00cbb99ebe35a8a76118c9d8bf3381a68689 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 23 Jul 2021 12:09:54 +0000 Subject: [PATCH 01/12] Update dependencies from https://github.com/dotnet/xharness build 20210722.1 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 1.0.0-prerelease.21370.1 -> To Version 1.0.0-prerelease.21372.1 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index b96d58bf366d1..4bb91915e7a95 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.21370.1", + "version": "1.0.0-prerelease.21372.1", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2f2190618a111..d61117050a947 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -190,13 +190,13 @@ https://github.com/mono/linker 6eae01980dc694107bdee0bc723d75a0dd601f0e - + https://github.com/dotnet/xharness - aa0da55569eaa42c2c735dd89abd2843fba4fe01 + 34e0c0d5f1d975c912a44f6760360f94e5b19038 - + https://github.com/dotnet/xharness - aa0da55569eaa42c2c735dd89abd2843fba4fe01 + 34e0c0d5f1d975c912a44f6760360f94e5b19038 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index ecd7f036d099f..b6b9c402a6293 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -152,8 +152,8 @@ 1.0.1-prerelease-00006 16.9.0-preview-20201201-01 - 1.0.0-prerelease.21370.1 - 1.0.0-prerelease.21370.1 + 1.0.0-prerelease.21372.1 + 1.0.0-prerelease.21372.1 1.0.1-alpha.0.21369.1 2.4.1 2.4.2 From be9a39efd930783599c12a2f93cbef85b528d835 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 24 Jul 2021 12:12:41 +0000 Subject: [PATCH 02/12] Update dependencies from https://github.com/dotnet/arcade build 20210723.11 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.21370.12 -> To Version 6.0.0-beta.21373.11 --- eng/Version.Details.xml | 72 ++++++++++----------- eng/Versions.props | 28 ++++---- eng/common/templates/steps/source-build.yml | 6 ++ global.json | 12 ++-- 4 files changed, 62 insertions(+), 56 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d61117050a947..0e0ac39123157 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,73 +14,73 @@ - + https://github.com/dotnet/arcade - 89806f0b9e93ad2bbe32c654412835c0801a2032 + c6a28c81f96d196338b3ea520bc1e6dc7c440ee2 - + https://github.com/dotnet/arcade - 89806f0b9e93ad2bbe32c654412835c0801a2032 + c6a28c81f96d196338b3ea520bc1e6dc7c440ee2 - + https://github.com/dotnet/arcade - 89806f0b9e93ad2bbe32c654412835c0801a2032 + c6a28c81f96d196338b3ea520bc1e6dc7c440ee2 - + https://github.com/dotnet/arcade - 89806f0b9e93ad2bbe32c654412835c0801a2032 + c6a28c81f96d196338b3ea520bc1e6dc7c440ee2 - + https://github.com/dotnet/arcade - 89806f0b9e93ad2bbe32c654412835c0801a2032 + c6a28c81f96d196338b3ea520bc1e6dc7c440ee2 - + https://github.com/dotnet/arcade - 89806f0b9e93ad2bbe32c654412835c0801a2032 + c6a28c81f96d196338b3ea520bc1e6dc7c440ee2 - + https://github.com/dotnet/arcade - 89806f0b9e93ad2bbe32c654412835c0801a2032 + c6a28c81f96d196338b3ea520bc1e6dc7c440ee2 - + https://github.com/dotnet/arcade - 89806f0b9e93ad2bbe32c654412835c0801a2032 + c6a28c81f96d196338b3ea520bc1e6dc7c440ee2 - + https://github.com/dotnet/arcade - 89806f0b9e93ad2bbe32c654412835c0801a2032 + c6a28c81f96d196338b3ea520bc1e6dc7c440ee2 - + https://github.com/dotnet/arcade - 89806f0b9e93ad2bbe32c654412835c0801a2032 + c6a28c81f96d196338b3ea520bc1e6dc7c440ee2 - + https://github.com/dotnet/arcade - 89806f0b9e93ad2bbe32c654412835c0801a2032 + c6a28c81f96d196338b3ea520bc1e6dc7c440ee2 - + https://github.com/dotnet/arcade - 89806f0b9e93ad2bbe32c654412835c0801a2032 + c6a28c81f96d196338b3ea520bc1e6dc7c440ee2 - + https://github.com/dotnet/arcade - 89806f0b9e93ad2bbe32c654412835c0801a2032 + c6a28c81f96d196338b3ea520bc1e6dc7c440ee2 - + https://github.com/dotnet/arcade - 89806f0b9e93ad2bbe32c654412835c0801a2032 + c6a28c81f96d196338b3ea520bc1e6dc7c440ee2 - + https://github.com/dotnet/arcade - 89806f0b9e93ad2bbe32c654412835c0801a2032 + c6a28c81f96d196338b3ea520bc1e6dc7c440ee2 - + https://github.com/dotnet/arcade - 89806f0b9e93ad2bbe32c654412835c0801a2032 + c6a28c81f96d196338b3ea520bc1e6dc7c440ee2 - + https://github.com/dotnet/arcade - 89806f0b9e93ad2bbe32c654412835c0801a2032 + c6a28c81f96d196338b3ea520bc1e6dc7c440ee2 https://github.com/microsoft/vstest @@ -198,9 +198,9 @@ https://github.com/dotnet/xharness 34e0c0d5f1d975c912a44f6760360f94e5b19038 - + https://github.com/dotnet/arcade - 89806f0b9e93ad2bbe32c654412835c0801a2032 + c6a28c81f96d196338b3ea520bc1e6dc7c440ee2 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index b6b9c402a6293..5b8b7d2590d0f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,20 +52,20 @@ 3.10.0 6.0.0-rc1.21366.2 - 6.0.0-beta.21370.12 - 6.0.0-beta.21370.12 - 6.0.0-beta.21370.12 - 6.0.0-beta.21370.12 - 6.0.0-beta.21370.12 - 6.0.0-beta.21370.12 - 2.5.1-beta.21370.12 - 6.0.0-beta.21370.12 - 6.0.0-beta.21370.12 - 6.0.0-beta.21370.12 - 6.0.0-beta.21370.12 - 6.0.0-beta.21370.12 - 6.0.0-beta.21370.12 - 6.0.0-beta.21370.12 + 6.0.0-beta.21373.11 + 6.0.0-beta.21373.11 + 6.0.0-beta.21373.11 + 6.0.0-beta.21373.11 + 6.0.0-beta.21373.11 + 6.0.0-beta.21373.11 + 2.5.1-beta.21373.11 + 6.0.0-beta.21373.11 + 6.0.0-beta.21373.11 + 6.0.0-beta.21373.11 + 6.0.0-beta.21373.11 + 6.0.0-beta.21373.11 + 6.0.0-beta.21373.11 + 6.0.0-beta.21373.11 6.0.0-preview.1.102 diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index e20637ed6a177..705b7a1c847b9 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -29,6 +29,11 @@ steps: officialBuildArgs='/p:DotNetPublishUsingPipelines=true /p:OfficialBuildId=$(BUILD.BUILDNUMBER)' fi + internalRuntimeDownloadArgs= + if [ '$(dotnetclimsrc-read-sas-token-base64)' != '$''(dotnetclimsrc-read-sas-token-base64)' ]; then + internalRuntimeDownloadArgs='--runtimesourcefeed https://dotnetclimsrc.blob.core.windows.net/dotnet --runtimesourcefeedkey $(dotnetclimsrc-read-sas-token-base64)' + fi + targetRidArgs= if [ '${{ parameters.platform.targetRID }}' != '' ]; then targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}' @@ -43,6 +48,7 @@ steps: --configuration $buildConfig \ --restore --build --pack $publishArgs -bl \ $officialBuildArgs \ + $internalRuntimeDownloadArgs \ $targetRidArgs \ /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \ /p:ArcadeBuildFromSource=true diff --git a/global.json b/global.json index f0a10200a5103..547ce70ef6452 100644 --- a/global.json +++ b/global.json @@ -1,22 +1,22 @@ { "sdk": { - "version": "6.0.100-preview.5.21302.13", + "version": "6.0.100-preview.6.21355.2", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "6.0.100-preview.5.21302.13" + "dotnet": "6.0.100-preview.6.21355.2" }, "native-tools": { "cmake": "3.16.4", "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21370.12", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21373.11", "Microsoft.DotNet.PackageValidation": "1.0.0-preview.7.21352.4", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21370.12", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21370.12", - "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21370.12", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21373.11", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21373.11", + "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21373.11", "Microsoft.Build.NoTargets": "3.0.4", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "6.0.0-rc.1.21369.2" From 799b8808d222c4b66d70c11395619aba78b4556d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 24 Jul 2021 12:34:46 +0000 Subject: [PATCH 03/12] Update dependencies from https://github.com/dotnet/xharness build 20210723.1 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 1.0.0-prerelease.21370.1 -> To Version 1.0.0-prerelease.21373.1 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 4bb91915e7a95..3eb043f5bbe0d 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.21372.1", + "version": "1.0.0-prerelease.21373.1", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0e0ac39123157..cbb0c165c6569 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -190,13 +190,13 @@ https://github.com/mono/linker 6eae01980dc694107bdee0bc723d75a0dd601f0e - + https://github.com/dotnet/xharness - 34e0c0d5f1d975c912a44f6760360f94e5b19038 + ccb49ae05b6d98b29871a1779408d4579e16d6e5 - + https://github.com/dotnet/xharness - 34e0c0d5f1d975c912a44f6760360f94e5b19038 + ccb49ae05b6d98b29871a1779408d4579e16d6e5 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 5b8b7d2590d0f..92c3081f7f35e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -152,8 +152,8 @@ 1.0.1-prerelease-00006 16.9.0-preview-20201201-01 - 1.0.0-prerelease.21372.1 - 1.0.0-prerelease.21372.1 + 1.0.0-prerelease.21373.1 + 1.0.0-prerelease.21373.1 1.0.1-alpha.0.21369.1 2.4.1 2.4.2 From 3024cc3d200b37fa42b319b41d74087b42c0493f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 24 Jul 2021 12:35:22 +0000 Subject: [PATCH 04/12] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20210723.2 Microsoft.CodeAnalysis.NetAnalyzers From Version 6.0.0-rc1.21366.2 -> To Version 6.0.0-rc1.21373.2 --- 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 cbb0c165c6569..603a495f27957 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -226,9 +226,9 @@ https://github.com/dotnet/runtime-assets bcfd1993de3767c54c6d8a522bf63770fba3c98d - + https://github.com/dotnet/roslyn-analyzers - 7e82240306d8a7a83ebbbc1894381393cebf9fb2 + 696bdb9d12cbae251ecb6aaa7b7457395c127748 diff --git a/eng/Versions.props b/eng/Versions.props index 92c3081f7f35e..6d1b3ce36689f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -50,7 +50,7 @@ 3.10.0 3.10.0 - 6.0.0-rc1.21366.2 + 6.0.0-rc1.21373.2 6.0.0-beta.21373.11 6.0.0-beta.21373.11 From 09eef3dbb96da223881d353482796b66fe3b7872 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 25 Jul 2021 12:09:45 +0000 Subject: [PATCH 05/12] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-optimization build 20210724.3 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.21371.3 -> To Version 1.0.0-prerelease.21374.3 --- 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 603a495f27957..0d21775791faa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -202,21 +202,21 @@ https://github.com/dotnet/arcade c6a28c81f96d196338b3ea520bc1e6dc7c440ee2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 2e172488a9ee56619a08c8303a708e69dc82503e + f8742ac0820e98221e7eec5f13989d9538579399 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 2e172488a9ee56619a08c8303a708e69dc82503e + f8742ac0820e98221e7eec5f13989d9538579399 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 2e172488a9ee56619a08c8303a708e69dc82503e + f8742ac0820e98221e7eec5f13989d9538579399 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 2e172488a9ee56619a08c8303a708e69dc82503e + f8742ac0820e98221e7eec5f13989d9538579399 https://github.com/dotnet/hotreload-utils diff --git a/eng/Versions.props b/eng/Versions.props index 6d1b3ce36689f..a89293a1f921b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -125,10 +125,10 @@ 6.0.0-beta.21371.1 6.0.0-beta.21371.1 - 1.0.0-prerelease.21371.3 - 1.0.0-prerelease.21371.3 - 1.0.0-prerelease.21371.3 - 1.0.0-prerelease.21371.3 + 1.0.0-prerelease.21374.3 + 1.0.0-prerelease.21374.3 + 1.0.0-prerelease.21374.3 + 1.0.0-prerelease.21374.3 16.9.0-beta1.21055.5 2.0.0-beta1.20253.1 From 0968c71da420fdcac79f33bf5faada2637bcb9b0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 26 Jul 2021 10:24:38 +0000 Subject: [PATCH 06/12] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20210725.2 Microsoft.CodeAnalysis.NetAnalyzers From Version 6.0.0-rc1.21366.2 -> To Version 6.0.0-rc1.21375.2 --- 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 0d21775791faa..24b41ebca0773 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -226,9 +226,9 @@ https://github.com/dotnet/runtime-assets bcfd1993de3767c54c6d8a522bf63770fba3c98d - + https://github.com/dotnet/roslyn-analyzers - 696bdb9d12cbae251ecb6aaa7b7457395c127748 + 19af44783ceecc31842d7028e3b0ce83095ea166 diff --git a/eng/Versions.props b/eng/Versions.props index a89293a1f921b..b3bcc1aa7dab0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -50,7 +50,7 @@ 3.10.0 3.10.0 - 6.0.0-rc1.21373.2 + 6.0.0-rc1.21375.2 6.0.0-beta.21373.11 6.0.0-beta.21373.11 From 80609a86924bd4b59ecf3e3974db9e04653fb908 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Mon, 26 Jul 2021 12:27:17 +0200 Subject: [PATCH 07/12] Revert SDK bump It will be done in https://github.com/dotnet/runtime/pull/56161 --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index 547ce70ef6452..aff64fe4c7578 100644 --- a/global.json +++ b/global.json @@ -1,11 +1,11 @@ { "sdk": { - "version": "6.0.100-preview.6.21355.2", + "version": "6.0.100-preview.5.21302.13", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "6.0.100-preview.6.21355.2" + "dotnet": "6.0.100-preview.5.21302.13" }, "native-tools": { "cmake": "3.16.4", From 5b669f0cbda0ff9dce6c259447ea58957dc510df Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 26 Jul 2021 12:10:18 +0000 Subject: [PATCH 08/12] Update dependencies from https://github.com/dotnet/runtime build 20210725.2 Microsoft.NETCore.DotNetHost , Microsoft.NETCore.DotNetHostPolicy , Microsoft.NETCore.ILAsm , runtime.native.System.IO.Ports , Microsoft.NET.Sdk.IL , System.Text.Json , System.Runtime.CompilerServices.Unsafe From Version 6.0.0-rc.1.21369.2 -> To Version 6.0.0-rc.1.21375.2 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ global.json | 2 +- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 24b41ebca0773..08a93da5bf1b9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -158,33 +158,33 @@ https://github.com/dotnet/runtime 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - f7e4c261815c66fde2c1e750b744f193e236c17e + 95863758cd16c345d0b8fca067d5db5d6901e498 - + https://github.com/dotnet/runtime - f7e4c261815c66fde2c1e750b744f193e236c17e + 95863758cd16c345d0b8fca067d5db5d6901e498 - + https://github.com/dotnet/runtime - f7e4c261815c66fde2c1e750b744f193e236c17e + 95863758cd16c345d0b8fca067d5db5d6901e498 - + https://github.com/dotnet/runtime - f7e4c261815c66fde2c1e750b744f193e236c17e + 95863758cd16c345d0b8fca067d5db5d6901e498 - + https://github.com/dotnet/runtime - f7e4c261815c66fde2c1e750b744f193e236c17e + 95863758cd16c345d0b8fca067d5db5d6901e498 - + https://github.com/dotnet/runtime - f7e4c261815c66fde2c1e750b744f193e236c17e + 95863758cd16c345d0b8fca067d5db5d6901e498 - + https://github.com/dotnet/runtime - f7e4c261815c66fde2c1e750b744f193e236c17e + 95863758cd16c345d0b8fca067d5db5d6901e498 https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index b3bcc1aa7dab0..32d31c12f22cb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,11 +70,11 @@ 6.0.0-preview.1.102 6.0.0-alpha.1.20612.4 - 6.0.0-rc.1.21369.2 - 6.0.0-rc.1.21369.2 + 6.0.0-rc.1.21375.2 + 6.0.0-rc.1.21375.2 3.1.0 - 6.0.0-rc.1.21369.2 + 6.0.0-rc.1.21375.2 5.0.0 4.3.0 @@ -108,11 +108,11 @@ 5.0.0 5.0.0 4.8.1 - 6.0.0-rc.1.21369.2 - 6.0.0-rc.1.21369.2 + 6.0.0-rc.1.21375.2 + 6.0.0-rc.1.21375.2 4.5.4 4.5.0 - 6.0.0-rc.1.21369.2 + 6.0.0-rc.1.21375.2 6.0.0-beta.21371.1 6.0.0-beta.21371.1 diff --git a/global.json b/global.json index aff64fe4c7578..f8703fefbe1c9 100644 --- a/global.json +++ b/global.json @@ -19,6 +19,6 @@ "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21373.11", "Microsoft.Build.NoTargets": "3.0.4", "Microsoft.Build.Traversal": "3.0.23", - "Microsoft.NET.Sdk.IL": "6.0.0-rc.1.21369.2" + "Microsoft.NET.Sdk.IL": "6.0.0-rc.1.21375.2" } } From fab3fd2f680e860548d87693867d92dcaed5d415 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 26 Jul 2021 12:22:06 +0000 Subject: [PATCH 09/12] Update dependencies from https://github.com/dotnet/arcade build 20210723.11 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.21370.12 -> To Version 6.0.0-beta.21373.11 --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index f8703fefbe1c9..ad51e8c2d4275 100644 --- a/global.json +++ b/global.json @@ -1,11 +1,11 @@ { "sdk": { - "version": "6.0.100-preview.5.21302.13", + "version": "6.0.100-preview.6.21355.2", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "6.0.100-preview.5.21302.13" + "dotnet": "6.0.100-preview.6.21355.2" }, "native-tools": { "cmake": "3.16.4", From 9b7d492273d4ff76fffce73651d336c770266fb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Mon, 26 Jul 2021 14:29:50 +0200 Subject: [PATCH 10/12] Revert SDK bump --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index ad51e8c2d4275..f8703fefbe1c9 100644 --- a/global.json +++ b/global.json @@ -1,11 +1,11 @@ { "sdk": { - "version": "6.0.100-preview.6.21355.2", + "version": "6.0.100-preview.5.21302.13", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "6.0.100-preview.6.21355.2" + "dotnet": "6.0.100-preview.5.21302.13" }, "native-tools": { "cmake": "3.16.4", From 178a31d7bc068944d1c229443036c0652781194e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 26 Jul 2021 13:25:35 +0000 Subject: [PATCH 11/12] Update dependencies from https://github.com/dotnet/emsdk build 20210726.1 Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 From Version 6.0.0-rc.1.21369.1 -> To Version 6.0.0-rc.1.21376.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 08a93da5bf1b9..b3bf6973b3428 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,9 +8,9 @@ https://github.com/dotnet/msquic d7db669b70f4dd67ec001c192f9809c218cab88b - + https://github.com/dotnet/emsdk - 70549df51ec4b2561e2d11caa542e0b2a2903e0a + b78567aff3958fc76860121e5279c06fcbf732b3 diff --git a/eng/Versions.props b/eng/Versions.props index 32d31c12f22cb..525858ec9f267 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -182,7 +182,7 @@ 11.1.0-alpha.1.21369.1 11.1.0-alpha.1.21369.1 - 6.0.0-rc.1.21369.1 + 6.0.0-rc.1.21376.1 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) 1.1.87-gba258badda From eaa19a9569dc63b0dacd7ef7c3361dd7c8992bca Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 27 Jul 2021 02:01:39 +0000 Subject: [PATCH 12/12] Update dependencies from https://github.com/dotnet/emsdk build 20210726.4 Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 From Version 6.0.0-rc.1.21369.1 -> To Version 6.0.0-rc.1.21376.4 --- 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 b3bf6973b3428..b2d8c06192cab 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,9 +8,9 @@ https://github.com/dotnet/msquic d7db669b70f4dd67ec001c192f9809c218cab88b - + https://github.com/dotnet/emsdk - b78567aff3958fc76860121e5279c06fcbf732b3 + 7a7664b07a1625bc1682e0735019178e69fcfbec diff --git a/eng/Versions.props b/eng/Versions.props index 525858ec9f267..9276a2b112f34 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -182,7 +182,7 @@ 11.1.0-alpha.1.21369.1 11.1.0-alpha.1.21369.1 - 6.0.0-rc.1.21376.1 + 6.0.0-rc.1.21376.4 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) 1.1.87-gba258badda