From f0310425a1fadd29c0466d8a4c799ac7bf5ac282 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 17 May 2021 18:31:43 +0000 Subject: [PATCH 01/64] Update dependencies from https://github.com/dotnet/sdk build 20210517.5 (#10652) [release/6.0.1xx-preview5] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.5.21264.3 to 6.0.0-preview.5.21264.4 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.5.21264.3 to 6.0.0-preview.5.21264.4 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.5.21264.3 to 6.0.0-preview.5.21264.4 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21264.3 to 6.0.0-preview.5.21264.4 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-preview.5.21264.3 to 6.0.0-preview.5.21264.4 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-preview.5.21264.3 to 6.0.0-preview.5.21264.4 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-preview.5.21264.1 to 6.0.100-preview.5.21264.2 (parent: Microsoft.NET.Sdk) - Microsoft.NET.ILLink.Tasks: from 6.0.100-preview.5.21263.3 to 6.0.100-preview.5.21264.1 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.0.0-preview-21256-03 to 17.0.0-preview-21267-01 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 18 ++++++++--------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0c8640787..5fb319221 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime 65bdceb4d47075964bb9d3878c994d020d594068 - + https://github.com/dotnet/aspnetcore - 8674585938e57f14b58f50e6c6e94a388d93b0ea + db4ef86f34815a992d79f02109983c3d9d4bdbf1 - + https://github.com/dotnet/aspnetcore - 8674585938e57f14b58f50e6c6e94a388d93b0ea + db4ef86f34815a992d79f02109983c3d9d4bdbf1 - + https://github.com/dotnet/aspnetcore - 8674585938e57f14b58f50e6c6e94a388d93b0ea + db4ef86f34815a992d79f02109983c3d9d4bdbf1 - + https://github.com/dotnet/aspnetcore - 8674585938e57f14b58f50e6c6e94a388d93b0ea + db4ef86f34815a992d79f02109983c3d9d4bdbf1 - + https://github.com/dotnet/aspnetcore - 8674585938e57f14b58f50e6c6e94a388d93b0ea + db4ef86f34815a992d79f02109983c3d9d4bdbf1 - + https://github.com/dotnet/aspnetcore - 8674585938e57f14b58f50e6c6e94a388d93b0ea + db4ef86f34815a992d79f02109983c3d9d4bdbf1 https://github.com/dotnet/test-templates @@ -79,17 +79,17 @@ https://github.com/dotnet/test-templates 5e029cf26b95e2250275433aeb168b6b18f625b6 - + https://github.com/dotnet/templating - 14d86c2b046001c3e3db8792126020d4a4071627 + c13bd264a0eeae6b79dfb01ec814290b383b894b - + https://github.com/dotnet/sdk - dd30cabf1018e392c45f71222258fe04473c988e + b2b2747c7405dbbd7202851c9897cabb89575a91 - + https://github.com/dotnet/sdk - dd30cabf1018e392c45f71222258fe04473c988e + b2b2747c7405dbbd7202851c9897cabb89575a91 @@ -108,18 +108,18 @@ https://github.com/microsoft/vstest 23f1488126d3962a3c6125a0bcfb3c79d0553a69 - + https://github.com/mono/linker - 82e3d7cf6256e9cf477ab011dba5812a1ccca49d + 7a5c445a69359415b7ff18b91cd24472ef9509ff linker https://github.com/dotnet/roslyn 29bf93d703d4001fa1c1e71f5383d08d924cc1c1 - + https://github.com/dotnet/msbuild - d07c47adec8d5cf40718ef9a618b0b959cc8be0d + 4adc47707f27d0dce03cee9e4651d599e7ff265f https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 05be1dc9b..cd6512f59 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -32,7 +32,7 @@ - 6.0.100-preview.5.21264.1 + 6.0.100-preview.5.21264.2 @@ -45,20 +45,20 @@ - 6.0.0-preview.5.21264.3 - 6.0.0-preview.5.21264.3 - 6.0.0-preview.5.21264.3 - 6.0.0-preview.5.21264.3 - 6.0.0-preview.5.21264.3 - 6.0.0-preview.5.21264.3 + 6.0.0-preview.5.21264.4 + 6.0.0-preview.5.21264.4 + 6.0.0-preview.5.21264.4 + 6.0.0-preview.5.21264.4 + 6.0.0-preview.5.21264.4 + 6.0.0-preview.5.21264.4 0.2.0 - 6.0.100-preview.5.21264.8 - 6.0.100-preview.5.21264.8 + 6.0.100-preview.5.21267.5 + 6.0.100-preview.5.21267.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f65a9501f324d2f40c802cd74c892a3227b54dcc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 17 May 2021 20:37:54 +0000 Subject: [PATCH 02/64] Update dependencies from https://github.com/dotnet/sdk build 20210517.9 (#10656) [release/6.0.1xx-preview5] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5fb319221..b1f860705 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating c13bd264a0eeae6b79dfb01ec814290b383b894b - + https://github.com/dotnet/sdk - b2b2747c7405dbbd7202851c9897cabb89575a91 + 44f611903d0d9a555016b5c2e003ab5f5514db4a - + https://github.com/dotnet/sdk - b2b2747c7405dbbd7202851c9897cabb89575a91 + 44f611903d0d9a555016b5c2e003ab5f5514db4a diff --git a/eng/Versions.props b/eng/Versions.props index cd6512f59..e6bbc799a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-preview.5.21267.5 - 6.0.100-preview.5.21267.5 + 6.0.100-preview.5.21267.9 + 6.0.100-preview.5.21267.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0cb3344fdfad02f04fc5873261c1c74b3e71f3fe Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 18 May 2021 00:48:28 +0000 Subject: [PATCH 03/64] Update dependencies from https://github.com/dotnet/sdk build 20210517.14 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.100-preview.5.21267.9 -> To Version 6.0.100-preview.5.21267.14 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.0.0-2.21264.4 -> To Version 4.0.0-1.21267.20 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b1f860705..4270f98c8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating c13bd264a0eeae6b79dfb01ec814290b383b894b - + https://github.com/dotnet/sdk - 44f611903d0d9a555016b5c2e003ab5f5514db4a + a04de1dbef6f69778c5e1bb1815655ef5b6cc839 - + https://github.com/dotnet/sdk - 44f611903d0d9a555016b5c2e003ab5f5514db4a + a04de1dbef6f69778c5e1bb1815655ef5b6cc839 @@ -113,9 +113,9 @@ 7a5c445a69359415b7ff18b91cd24472ef9509ff linker - + https://github.com/dotnet/roslyn - 29bf93d703d4001fa1c1e71f5383d08d924cc1c1 + fee89363dab812cfbf9676e554ae1e62826e97e6 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index e6bbc799a..ef40b3e52 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-preview.5.21267.9 - 6.0.100-preview.5.21267.9 + 6.0.100-preview.5.21267.14 + 6.0.100-preview.5.21267.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ec200e291fe647054a33df3f9a02fcace5021add Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 18 May 2021 01:32:49 +0000 Subject: [PATCH 04/64] Update dependencies from https://github.com/dotnet/sdk build 20210517.16 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.100-preview.5.21267.9 -> To Version 6.0.100-preview.5.21267.16 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.0.0-2.21264.4 -> To Version 4.0.0-1.21267.20 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4270f98c8..b652c94e9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating c13bd264a0eeae6b79dfb01ec814290b383b894b - + https://github.com/dotnet/sdk - a04de1dbef6f69778c5e1bb1815655ef5b6cc839 + 1beaa14c90370c07e9202fa66c7ea37cbf31d339 - + https://github.com/dotnet/sdk - a04de1dbef6f69778c5e1bb1815655ef5b6cc839 + 1beaa14c90370c07e9202fa66c7ea37cbf31d339 diff --git a/eng/Versions.props b/eng/Versions.props index ef40b3e52..2893eb38a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-preview.5.21267.14 - 6.0.100-preview.5.21267.14 + 6.0.100-preview.5.21267.16 + 6.0.100-preview.5.21267.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 248757b405b53e8726710f3a18d36420c8ec4259 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 18 May 2021 02:08:41 +0000 Subject: [PATCH 05/64] Update dependencies from https://github.com/dotnet/sdk build 20210517.18 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.100-preview.5.21267.9 -> To Version 6.0.100-preview.5.21267.18 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.0.0-2.21264.4 -> To Version 4.0.0-1.21267.32 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b652c94e9..9806cbbd1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating c13bd264a0eeae6b79dfb01ec814290b383b894b - + https://github.com/dotnet/sdk - 1beaa14c90370c07e9202fa66c7ea37cbf31d339 + f39a26cfb0e91feac9057b161f28c34d29cf103b - + https://github.com/dotnet/sdk - 1beaa14c90370c07e9202fa66c7ea37cbf31d339 + f39a26cfb0e91feac9057b161f28c34d29cf103b @@ -113,9 +113,9 @@ 7a5c445a69359415b7ff18b91cd24472ef9509ff linker - + https://github.com/dotnet/roslyn - fee89363dab812cfbf9676e554ae1e62826e97e6 + 344acb8100d629969228fd76474befc2c969cb10 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 2893eb38a..68a18a5f6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-preview.5.21267.16 - 6.0.100-preview.5.21267.16 + 6.0.100-preview.5.21267.18 + 6.0.100-preview.5.21267.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 76acea75ce11f6556426d836d39a04d2944e950d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 18 May 2021 02:45:51 +0000 Subject: [PATCH 06/64] Update dependencies from https://github.com/dotnet/sdk build 20210517.19 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.100-preview.5.21267.9 -> To Version 6.0.100-preview.5.21267.19 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.Net.Compilers.Toolset From Version 11.4.2-beta.21262.7 -> To Version 12.0.0-beta.21267.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9806cbbd1..c747e2dd0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating c13bd264a0eeae6b79dfb01ec814290b383b894b - + https://github.com/dotnet/sdk - f39a26cfb0e91feac9057b161f28c34d29cf103b + d6811b11957d139fc46b0fe7481dda4c939a46dc - + https://github.com/dotnet/sdk - f39a26cfb0e91feac9057b161f28c34d29cf103b + d6811b11957d139fc46b0fe7481dda4c939a46dc @@ -100,9 +100,9 @@ https://github.com/dotnet/wpf 068dc59e2e5316b5533017a3bb57ef1fb4ac337f - + https://github.com/dotnet/fsharp - 1b23bbeda88ea3cb9be9af777f4c99fa8663df81 + eed88d48c9f6ebd9d1df11a57f81eba7a40c9bf5 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 68a18a5f6..8cc615340 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-preview.5.21267.18 - 6.0.100-preview.5.21267.18 + 6.0.100-preview.5.21267.19 + 6.0.100-preview.5.21267.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4f68cffc96f4dfc3b8609a3cea2c3de2e78d0e62 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 18 May 2021 04:33:05 +0000 Subject: [PATCH 07/64] Update dependencies from https://github.com/dotnet/sdk build 20210517.21 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.100-preview.5.21267.9 -> To Version 6.0.100-preview.5.21267.21 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.Net.Compilers.Toolset From Version 11.4.2-beta.21262.7 -> To Version 12.0.0-beta.21267.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c747e2dd0..95edae67f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating c13bd264a0eeae6b79dfb01ec814290b383b894b - + https://github.com/dotnet/sdk - d6811b11957d139fc46b0fe7481dda4c939a46dc + d64d5fbe80abe706289baecb429e6900b42c9f22 - + https://github.com/dotnet/sdk - d6811b11957d139fc46b0fe7481dda4c939a46dc + d64d5fbe80abe706289baecb429e6900b42c9f22 @@ -113,7 +113,7 @@ 7a5c445a69359415b7ff18b91cd24472ef9509ff linker - + https://github.com/dotnet/roslyn 344acb8100d629969228fd76474befc2c969cb10 diff --git a/eng/Versions.props b/eng/Versions.props index 8cc615340..727d00235 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-preview.5.21267.19 - 6.0.100-preview.5.21267.19 + 6.0.100-preview.5.21267.21 + 6.0.100-preview.5.21267.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9a4d9827c6bed253e3a9debacbdbee540539ec90 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 19 May 2021 03:43:06 +0000 Subject: [PATCH 08/64] [release/6.0.1xx-preview5] Update dependencies from dotnet/sdk (#10670) [release/6.0.1xx-preview5] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-preview.5.21263.2 to 6.0.0-preview.5.21268.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-preview.5.21263.2 to 6.0.0-preview.5.21268.3 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.5.21263.2 to 6.0.0-preview.5.21268.3 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-preview.5.21226.1 to 6.0.0-preview.6.21268.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.5.21263.2 to 6.0.0-preview.5.21268.3 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-preview.5.21263.1 to 6.0.0-preview.5.21268.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.Net.Compilers.Toolset: from 4.0.0-1.21267.34 to 4.0.0-1.21268.32 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 14 +++++++------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 95edae67f..20c79f66b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - d48786b2de62689bc6a530918b58b2b35e9ae937 + d30f1e40ac60d9cacda7e9bcbbbaf42f6df31646 - + https://github.com/dotnet/windowsdesktop - d48786b2de62689bc6a530918b58b2b35e9ae937 + d30f1e40ac60d9cacda7e9bcbbbaf42f6df31646 - + https://github.com/dotnet/windowsdesktop - d48786b2de62689bc6a530918b58b2b35e9ae937 + d30f1e40ac60d9cacda7e9bcbbbaf42f6df31646 https://github.com/dotnet/runtime @@ -83,22 +83,22 @@ https://github.com/dotnet/templating c13bd264a0eeae6b79dfb01ec814290b383b894b - + https://github.com/dotnet/sdk - d64d5fbe80abe706289baecb429e6900b42c9f22 + db87f379755966fe335188bc0c4c74e45471f5a2 - + https://github.com/dotnet/sdk - d64d5fbe80abe706289baecb429e6900b42c9f22 + db87f379755966fe335188bc0c4c74e45471f5a2 - + https://github.com/dotnet/winforms - 02ba694dc71820ce17e5a70e45396567bd741a59 + c3d820a902ba51038fbec3702c3b2689b240951e - + https://github.com/dotnet/wpf - 068dc59e2e5316b5533017a3bb57ef1fb4ac337f + ccda70d82a64f16ac90f8a4aa14f433c6d5a85d9 https://github.com/dotnet/fsharp @@ -113,9 +113,9 @@ 7a5c445a69359415b7ff18b91cd24472ef9509ff linker - + https://github.com/dotnet/roslyn - 344acb8100d629969228fd76474befc2c969cb10 + 80b8a320c9621b08a9c2a23042dfff7df56db676 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 727d00235..83a015ce5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,11 +24,11 @@ - 6.0.0-preview.5.21226.1 + 6.0.0-preview.6.21268.2 - 6.0.0-preview.5.21263.1 + 6.0.0-preview.5.21268.3 @@ -57,8 +57,8 @@ - 6.0.100-preview.5.21267.21 - 6.0.100-preview.5.21267.21 + 6.0.100-preview.5.21268.11 + 6.0.100-preview.5.21268.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,9 +78,9 @@ - 6.0.0-preview.5.21263.2 - 6.0.0-preview.5.21263.2 - 6.0.0-preview.5.21263.2 + 6.0.0-preview.5.21268.3 + 6.0.0-preview.5.21268.3 + 6.0.0-preview.5.21268.3 From 2af98db39653deca8c63c4d726086a7928dbea26 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 19 May 2021 05:22:01 +0000 Subject: [PATCH 09/64] Update dependencies from https://github.com/dotnet/sdk build 20210518.13 (#10671) [release/6.0.1xx-preview5] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-preview.5.21268.3 to 6.0.0-preview.5.21268.7 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-preview.5.21268.3 to 6.0.0-preview.5.21268.7 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.5.21268.3 to 6.0.0-preview.5.21268.7 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.5.21268.3 to 6.0.0-preview.5.21268.7 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-preview.5.21268.3 to 6.0.0-preview.5.21268.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- eng/Version.Details.xml | 22 +++++++++++----------- eng/Versions.props | 12 ++++++------ 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 20c79f66b..2a195a929 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - d30f1e40ac60d9cacda7e9bcbbbaf42f6df31646 + e48413da178c46a443a022b0855c9c1b85afeb73 - + https://github.com/dotnet/windowsdesktop - d30f1e40ac60d9cacda7e9bcbbbaf42f6df31646 + e48413da178c46a443a022b0855c9c1b85afeb73 - + https://github.com/dotnet/windowsdesktop - d30f1e40ac60d9cacda7e9bcbbbaf42f6df31646 + e48413da178c46a443a022b0855c9c1b85afeb73 https://github.com/dotnet/runtime @@ -83,20 +83,20 @@ https://github.com/dotnet/templating c13bd264a0eeae6b79dfb01ec814290b383b894b - + https://github.com/dotnet/sdk - db87f379755966fe335188bc0c4c74e45471f5a2 + 09d120e013f46fc5d68b91e07a8d14d2502e07f1 - + https://github.com/dotnet/sdk - db87f379755966fe335188bc0c4c74e45471f5a2 + 09d120e013f46fc5d68b91e07a8d14d2502e07f1 https://github.com/dotnet/winforms c3d820a902ba51038fbec3702c3b2689b240951e - + https://github.com/dotnet/wpf ccda70d82a64f16ac90f8a4aa14f433c6d5a85d9 diff --git a/eng/Versions.props b/eng/Versions.props index 83a015ce5..77f6345e5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -28,7 +28,7 @@ - 6.0.0-preview.5.21268.3 + 6.0.0-preview.5.21268.5 @@ -57,8 +57,8 @@ - 6.0.100-preview.5.21268.11 - 6.0.100-preview.5.21268.11 + 6.0.100-preview.5.21268.13 + 6.0.100-preview.5.21268.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,9 +78,9 @@ - 6.0.0-preview.5.21268.3 - 6.0.0-preview.5.21268.3 - 6.0.0-preview.5.21268.3 + 6.0.0-preview.5.21268.7 + 6.0.0-preview.5.21268.7 + 6.0.0-preview.5.21268.7 From 0f379322c72b1eb4ad4d6f1a6f2492f0d3a1c2aa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 19 May 2021 08:56:14 +0000 Subject: [PATCH 10/64] Update dependencies from https://github.com/dotnet/sdk build 20210519.1 (#10674) [release/6.0.1xx-preview5] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-preview.5.21264.2 to 6.0.100-preview.5.21268.5 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2a195a929..87c2c6ae0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,17 +79,17 @@ https://github.com/dotnet/test-templates 5e029cf26b95e2250275433aeb168b6b18f625b6 - + https://github.com/dotnet/templating - c13bd264a0eeae6b79dfb01ec814290b383b894b + 51863b8743ba7a4c895d85d316c494a6feca4208 - + https://github.com/dotnet/sdk - 09d120e013f46fc5d68b91e07a8d14d2502e07f1 + 9e675a71acbf384a2b1b5c344f53969e9be21e63 - + https://github.com/dotnet/sdk - 09d120e013f46fc5d68b91e07a8d14d2502e07f1 + 9e675a71acbf384a2b1b5c344f53969e9be21e63 diff --git a/eng/Versions.props b/eng/Versions.props index 77f6345e5..8fcf62a38 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -32,7 +32,7 @@ - 6.0.100-preview.5.21264.2 + 6.0.100-preview.5.21268.5 @@ -57,8 +57,8 @@ - 6.0.100-preview.5.21268.13 - 6.0.100-preview.5.21268.13 + 6.0.100-preview.5.21269.1 + 6.0.100-preview.5.21269.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8448966942cc486f37318ebf5a0601e028ca72c7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 19 May 2021 18:49:20 +0000 Subject: [PATCH 11/64] Update dependencies from https://github.com/dotnet/sdk build 20210519.8 (#10679) [release/6.0.1xx-preview5] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 87c2c6ae0..43463c829 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 51863b8743ba7a4c895d85d316c494a6feca4208 - + https://github.com/dotnet/sdk - 9e675a71acbf384a2b1b5c344f53969e9be21e63 + 52298fb418c6258e3705238f98b5942cebaaf060 - + https://github.com/dotnet/sdk - 9e675a71acbf384a2b1b5c344f53969e9be21e63 + 52298fb418c6258e3705238f98b5942cebaaf060 diff --git a/eng/Versions.props b/eng/Versions.props index 8fcf62a38..fefd26d26 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-preview.5.21269.1 - 6.0.100-preview.5.21269.1 + 6.0.100-preview.5.21269.8 + 6.0.100-preview.5.21269.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0beb6861696104206622f8fb6778e0f18fce8f1a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 19 May 2021 19:08:09 +0000 Subject: [PATCH 12/64] Update dependencies from https://github.com/dotnet/sdk build 20210519.9 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.100-preview.5.21269.8 -> To Version 6.0.100-preview.5.21269.9 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms From Version 6.0.0-preview.5.21263.11 -> To Version 6.0.0-preview.5.21269.3 (parent: Microsoft.NET.Sdk --- 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 43463c829..4f1e1b987 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop e48413da178c46a443a022b0855c9c1b85afeb73 - + https://github.com/dotnet/runtime - 65bdceb4d47075964bb9d3878c994d020d594068 + 79f9415475a72623a8c51a942b229d8d6157feb1 - + https://github.com/dotnet/runtime - 65bdceb4d47075964bb9d3878c994d020d594068 + 79f9415475a72623a8c51a942b229d8d6157feb1 - + https://github.com/dotnet/runtime - 65bdceb4d47075964bb9d3878c994d020d594068 + 79f9415475a72623a8c51a942b229d8d6157feb1 - + https://github.com/dotnet/runtime - 65bdceb4d47075964bb9d3878c994d020d594068 + 79f9415475a72623a8c51a942b229d8d6157feb1 - + https://github.com/dotnet/runtime - 65bdceb4d47075964bb9d3878c994d020d594068 + 79f9415475a72623a8c51a942b229d8d6157feb1 @@ -39,9 +39,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 65bdceb4d47075964bb9d3878c994d020d594068 + 79f9415475a72623a8c51a942b229d8d6157feb1 https://github.com/dotnet/aspnetcore @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 51863b8743ba7a4c895d85d316c494a6feca4208 - + https://github.com/dotnet/sdk - 52298fb418c6258e3705238f98b5942cebaaf060 + cf477be5b925ab94a450d7c6caa590d295619e90 - + https://github.com/dotnet/sdk - 52298fb418c6258e3705238f98b5942cebaaf060 + cf477be5b925ab94a450d7c6caa590d295619e90 diff --git a/eng/Versions.props b/eng/Versions.props index fefd26d26..d44ee920b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,23 +57,23 @@ - 6.0.100-preview.5.21269.8 - 6.0.100-preview.5.21269.8 + 6.0.100-preview.5.21269.9 + 6.0.100-preview.5.21269.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-preview.5.21263.11 + 6.0.0-preview.5.21269.3 - 6.0.0-preview.5.21263.11 - 6.0.0-preview.5.21263.11 - 6.0.0-preview.5.21263.11 - 6.0.0-preview.5.21263.11 - 6.0.0-preview.5.21263.11 + 6.0.0-preview.5.21269.3 + 6.0.0-preview.5.21269.3 + 6.0.0-preview.5.21269.3 + 6.0.0-preview.5.21269.3 + 6.0.0-preview.5.21269.3 2.1.0 From a4d404576d47b6229fae619c208e43e13639cfff Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 19 May 2021 20:06:24 +0000 Subject: [PATCH 13/64] Update dependencies from https://github.com/dotnet/sdk build 20210519.10 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.100-preview.5.21269.8 -> To Version 6.0.100-preview.5.21269.10 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.0-preview.5.21268.7 -> To Version 6.0.0-preview.5.21269.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4f1e1b987..f9da60ce4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - e48413da178c46a443a022b0855c9c1b85afeb73 + 5e2c6a1215e2fc75b41c2883d48959ca241254dc - + https://github.com/dotnet/windowsdesktop - e48413da178c46a443a022b0855c9c1b85afeb73 + 5e2c6a1215e2fc75b41c2883d48959ca241254dc - + https://github.com/dotnet/windowsdesktop - e48413da178c46a443a022b0855c9c1b85afeb73 + 5e2c6a1215e2fc75b41c2883d48959ca241254dc https://github.com/dotnet/runtime @@ -83,22 +83,22 @@ https://github.com/dotnet/templating 51863b8743ba7a4c895d85d316c494a6feca4208 - + https://github.com/dotnet/sdk - cf477be5b925ab94a450d7c6caa590d295619e90 + 536a7c2f4b99a363a42b4218b285321e544ac3e2 - + https://github.com/dotnet/sdk - cf477be5b925ab94a450d7c6caa590d295619e90 + 536a7c2f4b99a363a42b4218b285321e544ac3e2 - + https://github.com/dotnet/winforms - c3d820a902ba51038fbec3702c3b2689b240951e + ad0a0cee05ab034f44a95917f0588fd8cf73658c - + https://github.com/dotnet/wpf - ccda70d82a64f16ac90f8a4aa14f433c6d5a85d9 + 865c4059a4f1da746d3e94ad0dd3a861e0050b41 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index d44ee920b..85cc92bda 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,11 +24,11 @@ - 6.0.0-preview.6.21268.2 + 6.0.0-preview.5.21268.7 - 6.0.0-preview.5.21268.5 + 6.0.0-preview.5.21269.1 @@ -57,8 +57,8 @@ - 6.0.100-preview.5.21269.9 - 6.0.100-preview.5.21269.9 + 6.0.100-preview.5.21269.10 + 6.0.100-preview.5.21269.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,9 +78,9 @@ - 6.0.0-preview.5.21268.7 - 6.0.0-preview.5.21268.7 - 6.0.0-preview.5.21268.7 + 6.0.0-preview.5.21269.3 + 6.0.0-preview.5.21269.3 + 6.0.0-preview.5.21269.3 From 95646bfbbb02bf93bcb891c709a34bf341f7e16f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 20 May 2021 00:05:33 +0000 Subject: [PATCH 14/64] Update dependencies from https://github.com/dotnet/sdk build 20210519.17 (#10686) [release/6.0.1xx-preview5] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 4.0.0-1.21268.32 to 4.0.0-1.21269.24 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f9da60ce4..50d542b4a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 51863b8743ba7a4c895d85d316c494a6feca4208 - + https://github.com/dotnet/sdk - 536a7c2f4b99a363a42b4218b285321e544ac3e2 + e560b1f6cdbc787068b0ac9c9a32520745e50470 - + https://github.com/dotnet/sdk - 536a7c2f4b99a363a42b4218b285321e544ac3e2 + e560b1f6cdbc787068b0ac9c9a32520745e50470 @@ -113,9 +113,9 @@ 7a5c445a69359415b7ff18b91cd24472ef9509ff linker - + https://github.com/dotnet/roslyn - 80b8a320c9621b08a9c2a23042dfff7df56db676 + be91eaedaf01d8d41530e212ec2b8a6f51b672c6 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 85cc92bda..a0098cbaa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-preview.5.21269.10 - 6.0.100-preview.5.21269.10 + 6.0.100-preview.5.21269.17 + 6.0.100-preview.5.21269.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6ab50ac49f8172ea5dd4c95638eb23fd01e79db2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 21 May 2021 02:18:13 +0000 Subject: [PATCH 15/64] [release/6.0.1xx-preview5] Update dependencies from dotnet/sdk (#10708) [release/6.0.1xx-preview5] Update dependencies from dotnet/sdk - Coherency Updates: - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21269.3 to 6.0.0-preview.5.21270.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 6.0.0-preview.5.21269.3 to 6.0.0-preview.5.21270.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-preview.5.21269.3 to 6.0.0-preview.5.21270.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-preview.5.21269.3 to 6.0.0-preview.5.21270.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-preview.5.21269.3 to 6.0.0-preview.5.21270.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 6.0.0-preview.5.21269.3 to 6.0.0-preview.5.21270.4 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.0.0-1.21269.24 to 4.0.0-1.21270.12 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.0.0-preview-21267-01 to 17.0.0-preview-21270-03 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 50d542b4a..15f8b7fe5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop 5e2c6a1215e2fc75b41c2883d48959ca241254dc - + https://github.com/dotnet/runtime - 79f9415475a72623a8c51a942b229d8d6157feb1 + 39165240e5962da3cdfb5f335b31aebf2ada5d11 - + https://github.com/dotnet/runtime - 79f9415475a72623a8c51a942b229d8d6157feb1 + 39165240e5962da3cdfb5f335b31aebf2ada5d11 - + https://github.com/dotnet/runtime - 79f9415475a72623a8c51a942b229d8d6157feb1 + 39165240e5962da3cdfb5f335b31aebf2ada5d11 - + https://github.com/dotnet/runtime - 79f9415475a72623a8c51a942b229d8d6157feb1 + 39165240e5962da3cdfb5f335b31aebf2ada5d11 - + https://github.com/dotnet/runtime - 79f9415475a72623a8c51a942b229d8d6157feb1 + 39165240e5962da3cdfb5f335b31aebf2ada5d11 @@ -39,9 +39,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 79f9415475a72623a8c51a942b229d8d6157feb1 + 39165240e5962da3cdfb5f335b31aebf2ada5d11 https://github.com/dotnet/aspnetcore @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 51863b8743ba7a4c895d85d316c494a6feca4208 - + https://github.com/dotnet/sdk - e560b1f6cdbc787068b0ac9c9a32520745e50470 + 0bed2fcc7e23cbf54ebebae77469b357e896bbc8 - + https://github.com/dotnet/sdk - e560b1f6cdbc787068b0ac9c9a32520745e50470 + 0bed2fcc7e23cbf54ebebae77469b357e896bbc8 @@ -113,13 +113,13 @@ 7a5c445a69359415b7ff18b91cd24472ef9509ff linker - + https://github.com/dotnet/roslyn - be91eaedaf01d8d41530e212ec2b8a6f51b672c6 + 7b62d33635c0d147132a48d5048c739db594a0f8 - + https://github.com/dotnet/msbuild - 4adc47707f27d0dce03cee9e4651d599e7ff265f + d6abd6dce9f98c3c2f6471eda1ed7271f03f90d2 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index a0098cbaa..97ba839df 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,23 +57,23 @@ - 6.0.100-preview.5.21269.17 - 6.0.100-preview.5.21269.17 + 6.0.100-preview.5.21270.26 + 6.0.100-preview.5.21270.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-preview.5.21269.3 + 6.0.0-preview.5.21270.4 - 6.0.0-preview.5.21269.3 - 6.0.0-preview.5.21269.3 - 6.0.0-preview.5.21269.3 - 6.0.0-preview.5.21269.3 - 6.0.0-preview.5.21269.3 + 6.0.0-preview.5.21270.4 + 6.0.0-preview.5.21270.4 + 6.0.0-preview.5.21270.4 + 6.0.0-preview.5.21270.4 + 6.0.0-preview.5.21270.4 2.1.0 From f15f98a8987c714a4e49c3934613c98a320a2430 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 21 May 2021 06:56:18 +0000 Subject: [PATCH 16/64] Update dependencies from https://github.com/dotnet/sdk build 20210520.40 (#10715) [release/6.0.1xx-preview5] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.5.21264.4 to 6.0.0-preview.5.21270.13 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.5.21264.4 to 6.0.0-preview.5.21270.13 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.5.21264.4 to 6.0.0-preview.5.21270.13 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21264.4 to 6.0.0-preview.5.21270.13 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-preview.5.21264.4 to 6.0.0-preview.5.21270.13 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-preview.5.21264.4 to 6.0.0-preview.5.21270.13 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.0.0-1.21270.12 to 4.0.0-1.21271.8 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 15f8b7fe5..b40e54c54 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime 39165240e5962da3cdfb5f335b31aebf2ada5d11 - + https://github.com/dotnet/aspnetcore - db4ef86f34815a992d79f02109983c3d9d4bdbf1 + a205f49efdf8b822e8da6b29c124d590f47f590f - + https://github.com/dotnet/aspnetcore - db4ef86f34815a992d79f02109983c3d9d4bdbf1 + a205f49efdf8b822e8da6b29c124d590f47f590f - + https://github.com/dotnet/aspnetcore - db4ef86f34815a992d79f02109983c3d9d4bdbf1 + a205f49efdf8b822e8da6b29c124d590f47f590f - + https://github.com/dotnet/aspnetcore - db4ef86f34815a992d79f02109983c3d9d4bdbf1 + a205f49efdf8b822e8da6b29c124d590f47f590f - + https://github.com/dotnet/aspnetcore - db4ef86f34815a992d79f02109983c3d9d4bdbf1 + a205f49efdf8b822e8da6b29c124d590f47f590f - + https://github.com/dotnet/aspnetcore - db4ef86f34815a992d79f02109983c3d9d4bdbf1 + a205f49efdf8b822e8da6b29c124d590f47f590f https://github.com/dotnet/test-templates @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 51863b8743ba7a4c895d85d316c494a6feca4208 - + https://github.com/dotnet/sdk - 0bed2fcc7e23cbf54ebebae77469b357e896bbc8 + 9b59032457097f2cad90e16a500c9c8a8792826d - + https://github.com/dotnet/sdk - 0bed2fcc7e23cbf54ebebae77469b357e896bbc8 + 9b59032457097f2cad90e16a500c9c8a8792826d @@ -113,9 +113,9 @@ 7a5c445a69359415b7ff18b91cd24472ef9509ff linker - + https://github.com/dotnet/roslyn - 7b62d33635c0d147132a48d5048c739db594a0f8 + 920183d4ff3e752de2a94097783bab3aff9d6c02 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 97ba839df..94173a48d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,20 +45,20 @@ - 6.0.0-preview.5.21264.4 - 6.0.0-preview.5.21264.4 - 6.0.0-preview.5.21264.4 - 6.0.0-preview.5.21264.4 - 6.0.0-preview.5.21264.4 - 6.0.0-preview.5.21264.4 + 6.0.0-preview.5.21270.13 + 6.0.0-preview.5.21270.13 + 6.0.0-preview.5.21270.13 + 6.0.0-preview.5.21270.13 + 6.0.0-preview.5.21270.13 + 6.0.0-preview.5.21270.13 0.2.0 - 6.0.100-preview.5.21270.26 - 6.0.100-preview.5.21270.26 + 6.0.100-preview.5.21270.40 + 6.0.100-preview.5.21270.40 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From afed140506d72217e62902f3a7d97e08cb1fa1af Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 21 May 2021 11:11:24 +0000 Subject: [PATCH 17/64] Update dependencies from https://github.com/dotnet/sdk build 20210521.2 (#10717) [release/6.0.1xx-preview5] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 4.0.0-1.21271.8 to 4.0.0-1.21271.16 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b40e54c54..df83bffd8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 51863b8743ba7a4c895d85d316c494a6feca4208 - + https://github.com/dotnet/sdk - 9b59032457097f2cad90e16a500c9c8a8792826d + 415183ae7bb11f03fbd583c3c71b136e2c766468 - + https://github.com/dotnet/sdk - 9b59032457097f2cad90e16a500c9c8a8792826d + 415183ae7bb11f03fbd583c3c71b136e2c766468 @@ -113,9 +113,9 @@ 7a5c445a69359415b7ff18b91cd24472ef9509ff linker - + https://github.com/dotnet/roslyn - 920183d4ff3e752de2a94097783bab3aff9d6c02 + 3756c0cd695ef7fec411a4e52f859e0282f95019 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 94173a48d..8ab1f690a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-preview.5.21270.40 - 6.0.100-preview.5.21270.40 + 6.0.100-preview.5.21271.2 + 6.0.100-preview.5.21271.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ff187da8eb845dfb22048284bdb686ee65cb7bd3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 21 May 2021 11:54:34 +0000 Subject: [PATCH 18/64] Update dependencies from https://github.com/dotnet/sdk build 20210521.4 (#10718) [release/6.0.1xx-preview5] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-preview.5.21268.5 to 6.0.100-preview.5.21271.1 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index df83bffd8..c942ef035 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,17 +79,17 @@ https://github.com/dotnet/test-templates 5e029cf26b95e2250275433aeb168b6b18f625b6 - + https://github.com/dotnet/templating - 51863b8743ba7a4c895d85d316c494a6feca4208 + 5d7718f5bbe6c681021f4c57986777421d9f0da4 - + https://github.com/dotnet/sdk - 415183ae7bb11f03fbd583c3c71b136e2c766468 + c7d1a745bba309762cfa7a888ca34cae4146ac6e - + https://github.com/dotnet/sdk - 415183ae7bb11f03fbd583c3c71b136e2c766468 + c7d1a745bba309762cfa7a888ca34cae4146ac6e diff --git a/eng/Versions.props b/eng/Versions.props index 8ab1f690a..09a8a9f2c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -32,7 +32,7 @@ - 6.0.100-preview.5.21268.5 + 6.0.100-preview.5.21271.1 @@ -57,8 +57,8 @@ - 6.0.100-preview.5.21271.2 - 6.0.100-preview.5.21271.2 + 6.0.100-preview.5.21271.4 + 6.0.100-preview.5.21271.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ed94e42e07d27dc65e49022ba1df8416bf2a6f61 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 21 May 2021 14:24:05 +0000 Subject: [PATCH 19/64] Update dependencies from https://github.com/dotnet/sdk build 20210521.8 (#10719) [release/6.0.1xx-preview5] Update dependencies from dotnet/sdk - Coherency Updates: - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21270.4 to 6.0.0-preview.5.21270.12 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 6.0.0-preview.5.21270.4 to 6.0.0-preview.5.21270.12 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-preview.5.21270.4 to 6.0.0-preview.5.21270.12 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-preview.5.21270.4 to 6.0.0-preview.5.21270.12 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-preview.5.21270.4 to 6.0.0-preview.5.21270.12 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 6.0.0-preview.5.21270.4 to 6.0.0-preview.5.21270.12 (parent: Microsoft.NET.Sdk) --- 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 c942ef035..85d2831a2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop 5e2c6a1215e2fc75b41c2883d48959ca241254dc - + https://github.com/dotnet/runtime - 39165240e5962da3cdfb5f335b31aebf2ada5d11 + 691c12bc9e4f8b7615e8108d57699485d5a67ea7 - + https://github.com/dotnet/runtime - 39165240e5962da3cdfb5f335b31aebf2ada5d11 + 691c12bc9e4f8b7615e8108d57699485d5a67ea7 - + https://github.com/dotnet/runtime - 39165240e5962da3cdfb5f335b31aebf2ada5d11 + 691c12bc9e4f8b7615e8108d57699485d5a67ea7 - + https://github.com/dotnet/runtime - 39165240e5962da3cdfb5f335b31aebf2ada5d11 + 691c12bc9e4f8b7615e8108d57699485d5a67ea7 - + https://github.com/dotnet/runtime - 39165240e5962da3cdfb5f335b31aebf2ada5d11 + 691c12bc9e4f8b7615e8108d57699485d5a67ea7 @@ -39,9 +39,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 39165240e5962da3cdfb5f335b31aebf2ada5d11 + 691c12bc9e4f8b7615e8108d57699485d5a67ea7 https://github.com/dotnet/aspnetcore @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 5d7718f5bbe6c681021f4c57986777421d9f0da4 - + https://github.com/dotnet/sdk - c7d1a745bba309762cfa7a888ca34cae4146ac6e + 2519a7930ca5aedae1c3a8fe57801d1ddcca4b26 - + https://github.com/dotnet/sdk - c7d1a745bba309762cfa7a888ca34cae4146ac6e + 2519a7930ca5aedae1c3a8fe57801d1ddcca4b26 diff --git a/eng/Versions.props b/eng/Versions.props index 09a8a9f2c..5947150d4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,23 +57,23 @@ - 6.0.100-preview.5.21271.4 - 6.0.100-preview.5.21271.4 + 6.0.100-preview.5.21271.8 + 6.0.100-preview.5.21271.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-preview.5.21270.4 + 6.0.0-preview.5.21270.12 - 6.0.0-preview.5.21270.4 - 6.0.0-preview.5.21270.4 - 6.0.0-preview.5.21270.4 - 6.0.0-preview.5.21270.4 - 6.0.0-preview.5.21270.4 + 6.0.0-preview.5.21270.12 + 6.0.0-preview.5.21270.12 + 6.0.0-preview.5.21270.12 + 6.0.0-preview.5.21270.12 + 6.0.0-preview.5.21270.12 2.1.0 From ac27a92eb62e16d39f6ed9831b6d6c0ed52ebc2e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 21 May 2021 16:48:14 +0000 Subject: [PATCH 20/64] Update dependencies from https://github.com/dotnet/sdk build 20210521.14 (#10722) [release/6.0.1xx-preview5] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-preview.5.21269.3 to 6.0.0-preview.5.21271.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-preview.5.21269.3 to 6.0.0-preview.5.21271.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.5.21270.13 to 6.0.0-preview.5.21271.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.5.21270.13 to 6.0.0-preview.5.21271.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.5.21270.13 to 6.0.0-preview.5.21271.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21270.13 to 6.0.0-preview.5.21271.1 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-preview.5.21270.13 to 6.0.0-preview.5.21271.1 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-preview.5.21270.13 to 6.0.0-preview.5.21271.1 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.5.21269.3 to 6.0.0-preview.5.21271.1 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-preview.5.21268.7 to 6.0.0-preview.5.21270.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.5.21269.3 to 6.0.0-preview.5.21271.1 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-preview.5.21269.1 to 6.0.0-preview.5.21271.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 26 ++++++++++----------- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 85d2831a2..9d452d82a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - 5e2c6a1215e2fc75b41c2883d48959ca241254dc + 840008b2a7814bf78e58e3cc0a1c83c2340092f4 - + https://github.com/dotnet/windowsdesktop - 5e2c6a1215e2fc75b41c2883d48959ca241254dc + 840008b2a7814bf78e58e3cc0a1c83c2340092f4 - + https://github.com/dotnet/windowsdesktop - 5e2c6a1215e2fc75b41c2883d48959ca241254dc + 840008b2a7814bf78e58e3cc0a1c83c2340092f4 https://github.com/dotnet/runtime @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime 691c12bc9e4f8b7615e8108d57699485d5a67ea7 - + https://github.com/dotnet/aspnetcore - a205f49efdf8b822e8da6b29c124d590f47f590f + e2c9235dc824c7671a556829bdb3ba9a3a560203 - + https://github.com/dotnet/aspnetcore - a205f49efdf8b822e8da6b29c124d590f47f590f + e2c9235dc824c7671a556829bdb3ba9a3a560203 - + https://github.com/dotnet/aspnetcore - a205f49efdf8b822e8da6b29c124d590f47f590f + e2c9235dc824c7671a556829bdb3ba9a3a560203 - + https://github.com/dotnet/aspnetcore - a205f49efdf8b822e8da6b29c124d590f47f590f + e2c9235dc824c7671a556829bdb3ba9a3a560203 - + https://github.com/dotnet/aspnetcore - a205f49efdf8b822e8da6b29c124d590f47f590f + e2c9235dc824c7671a556829bdb3ba9a3a560203 - + https://github.com/dotnet/aspnetcore - a205f49efdf8b822e8da6b29c124d590f47f590f + e2c9235dc824c7671a556829bdb3ba9a3a560203 https://github.com/dotnet/test-templates @@ -83,22 +83,22 @@ https://github.com/dotnet/templating 5d7718f5bbe6c681021f4c57986777421d9f0da4 - + https://github.com/dotnet/sdk - 2519a7930ca5aedae1c3a8fe57801d1ddcca4b26 + 6dce9ebc3f5439038dc0033c874c78e0c29e30e5 - + https://github.com/dotnet/sdk - 2519a7930ca5aedae1c3a8fe57801d1ddcca4b26 + 6dce9ebc3f5439038dc0033c874c78e0c29e30e5 - + https://github.com/dotnet/winforms - ad0a0cee05ab034f44a95917f0588fd8cf73658c + a676d2268498ba074b798290ee936199a31efe0e - + https://github.com/dotnet/wpf - 865c4059a4f1da746d3e94ad0dd3a861e0050b41 + d27f80e481a3415eb98ab829698cc0f6f2fccded https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 5947150d4..ae95a3e36 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,11 +24,11 @@ - 6.0.0-preview.5.21268.7 + 6.0.0-preview.5.21270.2 - 6.0.0-preview.5.21269.1 + 6.0.0-preview.5.21271.1 @@ -45,20 +45,20 @@ - 6.0.0-preview.5.21270.13 - 6.0.0-preview.5.21270.13 - 6.0.0-preview.5.21270.13 - 6.0.0-preview.5.21270.13 - 6.0.0-preview.5.21270.13 - 6.0.0-preview.5.21270.13 + 6.0.0-preview.5.21271.1 + 6.0.0-preview.5.21271.1 + 6.0.0-preview.5.21271.1 + 6.0.0-preview.5.21271.1 + 6.0.0-preview.5.21271.1 + 6.0.0-preview.5.21271.1 0.2.0 - 6.0.100-preview.5.21271.8 - 6.0.100-preview.5.21271.8 + 6.0.100-preview.5.21271.14 + 6.0.100-preview.5.21271.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,9 +78,9 @@ - 6.0.0-preview.5.21269.3 - 6.0.0-preview.5.21269.3 - 6.0.0-preview.5.21269.3 + 6.0.0-preview.5.21271.1 + 6.0.0-preview.5.21271.1 + 6.0.0-preview.5.21271.1 From cd60cbc4897273ac137973e98262c0790eea9344 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 22 May 2021 00:30:54 +0000 Subject: [PATCH 21/64] [release/6.0.1xx-preview5] Update dependencies from dotnet/sdk (#10723) [release/6.0.1xx-preview5] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-preview.5.21271.1 to 6.0.0-preview.5.21271.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-preview.5.21271.1 to 6.0.0-preview.5.21271.2 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.5.21271.1 to 6.0.0-preview.5.21271.3 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.5.21271.1 to 6.0.0-preview.5.21271.3 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.5.21271.1 to 6.0.0-preview.5.21271.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21271.1 to 6.0.0-preview.5.21271.3 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-preview.5.21271.1 to 6.0.0-preview.5.21271.3 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-preview.5.21271.1 to 6.0.0-preview.5.21271.3 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.5.21271.1 to 6.0.0-preview.5.21271.2 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-preview.5.21270.2 to 6.0.0-preview.5.21271.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.5.21271.1 to 6.0.0-preview.5.21271.2 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-preview.5.21271.1 to 6.0.0-preview.5.21271.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.FSharp.Compiler: from 12.0.0-beta.21267.1 to 12.0.0-beta.21271.1 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.0.0-preview-21270-03 to 17.0.0-preview-21271-07 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 26 +++++++++--------- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9d452d82a..32736d8f1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - 840008b2a7814bf78e58e3cc0a1c83c2340092f4 + 4377095dc1902e5f744a9a014ddfe56d94268906 - + https://github.com/dotnet/windowsdesktop - 840008b2a7814bf78e58e3cc0a1c83c2340092f4 + 4377095dc1902e5f744a9a014ddfe56d94268906 - + https://github.com/dotnet/windowsdesktop - 840008b2a7814bf78e58e3cc0a1c83c2340092f4 + 4377095dc1902e5f744a9a014ddfe56d94268906 https://github.com/dotnet/runtime @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime 691c12bc9e4f8b7615e8108d57699485d5a67ea7 - + https://github.com/dotnet/aspnetcore - e2c9235dc824c7671a556829bdb3ba9a3a560203 + d9c8be5edee1eba786376db32e803a02b890c43c - + https://github.com/dotnet/aspnetcore - e2c9235dc824c7671a556829bdb3ba9a3a560203 + d9c8be5edee1eba786376db32e803a02b890c43c - + https://github.com/dotnet/aspnetcore - e2c9235dc824c7671a556829bdb3ba9a3a560203 + d9c8be5edee1eba786376db32e803a02b890c43c - + https://github.com/dotnet/aspnetcore - e2c9235dc824c7671a556829bdb3ba9a3a560203 + d9c8be5edee1eba786376db32e803a02b890c43c - + https://github.com/dotnet/aspnetcore - e2c9235dc824c7671a556829bdb3ba9a3a560203 + d9c8be5edee1eba786376db32e803a02b890c43c - + https://github.com/dotnet/aspnetcore - e2c9235dc824c7671a556829bdb3ba9a3a560203 + d9c8be5edee1eba786376db32e803a02b890c43c https://github.com/dotnet/test-templates @@ -83,26 +83,26 @@ https://github.com/dotnet/templating 5d7718f5bbe6c681021f4c57986777421d9f0da4 - + https://github.com/dotnet/sdk - 6dce9ebc3f5439038dc0033c874c78e0c29e30e5 + 62134223b512d0f045dd5e705280e44c982c4b0a - + https://github.com/dotnet/sdk - 6dce9ebc3f5439038dc0033c874c78e0c29e30e5 + 62134223b512d0f045dd5e705280e44c982c4b0a - + https://github.com/dotnet/winforms - a676d2268498ba074b798290ee936199a31efe0e + 43654488bda59f15e3ae8d16810e2358125fc752 - + https://github.com/dotnet/wpf - d27f80e481a3415eb98ab829698cc0f6f2fccded + 8e52d84ca75794db29a5c9a09082bbe6b4eba526 - + https://github.com/dotnet/fsharp - eed88d48c9f6ebd9d1df11a57f81eba7a40c9bf5 + 9e8e3b506b730e6a4f9a977f1015318e7fbbdc39 https://github.com/microsoft/vstest @@ -117,9 +117,9 @@ https://github.com/dotnet/roslyn 3756c0cd695ef7fec411a4e52f859e0282f95019 - + https://github.com/dotnet/msbuild - d6abd6dce9f98c3c2f6471eda1ed7271f03f90d2 + 1560b6ce83b9de54dd7da4ca050f7f40387a33f4 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index ae95a3e36..99ce59e98 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,11 +24,11 @@ - 6.0.0-preview.5.21270.2 + 6.0.0-preview.5.21271.1 - 6.0.0-preview.5.21271.1 + 6.0.0-preview.5.21271.2 @@ -45,20 +45,20 @@ - 6.0.0-preview.5.21271.1 - 6.0.0-preview.5.21271.1 - 6.0.0-preview.5.21271.1 - 6.0.0-preview.5.21271.1 - 6.0.0-preview.5.21271.1 - 6.0.0-preview.5.21271.1 + 6.0.0-preview.5.21271.3 + 6.0.0-preview.5.21271.3 + 6.0.0-preview.5.21271.3 + 6.0.0-preview.5.21271.3 + 6.0.0-preview.5.21271.3 + 6.0.0-preview.5.21271.3 0.2.0 - 6.0.100-preview.5.21271.14 - 6.0.100-preview.5.21271.14 + 6.0.100-preview.5.21271.24 + 6.0.100-preview.5.21271.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,9 +78,9 @@ - 6.0.0-preview.5.21271.1 - 6.0.0-preview.5.21271.1 - 6.0.0-preview.5.21271.1 + 6.0.0-preview.5.21271.2 + 6.0.0-preview.5.21271.2 + 6.0.0-preview.5.21271.2 From 962829db2821bcb9f1e0807db2c2590f13ae9899 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 23 May 2021 20:45:13 +0000 Subject: [PATCH 22/64] Update dependencies from https://github.com/dotnet/sdk build 20210523.3 (#10737) [release/6.0.1xx-preview5] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 4.0.0-1.21271.16 to 4.0.0-1.21273.2 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 32736d8f1..22b4f92ce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 5d7718f5bbe6c681021f4c57986777421d9f0da4 - + https://github.com/dotnet/sdk - 62134223b512d0f045dd5e705280e44c982c4b0a + 5288e09e08034e05bd0aadbe15c7247e8b01b5be - + https://github.com/dotnet/sdk - 62134223b512d0f045dd5e705280e44c982c4b0a + 5288e09e08034e05bd0aadbe15c7247e8b01b5be @@ -113,9 +113,9 @@ 7a5c445a69359415b7ff18b91cd24472ef9509ff linker - + https://github.com/dotnet/roslyn - 3756c0cd695ef7fec411a4e52f859e0282f95019 + 58c14fa0505a50c205195ae35417450dedd3fe92 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 99ce59e98..e65305785 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-preview.5.21271.24 - 6.0.100-preview.5.21271.24 + 6.0.100-preview.5.21273.3 + 6.0.100-preview.5.21273.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7c79ce28bc5f42214c49e2ebbf3d7768ca927fa2 Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Mon, 24 May 2021 14:05:11 -0700 Subject: [PATCH 23/64] Create WASM installers for optional workloads (#10685) Co-authored-by: Rainer Sigwald --- .gitignore | 3 + .vsts-ci.yml | 26 ++- README.md | 2 + eng/SymbolPublishingExclusionsFile.txt | 1 + eng/Version.Details.xml | 8 +- eng/Versions.props | 6 +- eng/configure-toolset.ps1 | 6 + eng/version.csproj | 4 +- global.json | 10 +- src/workloads/OptionalWorkloads.vsmanproj | 68 ++++++++ src/workloads/VSSetup.props | 42 +++++ src/workloads/VSSetup.targets | 49 ++++++ src/workloads/readme.md | 2 + src/workloads/workloads.csproj | 192 ++++++++++++++++++++++ 14 files changed, 403 insertions(+), 16 deletions(-) create mode 100644 eng/SymbolPublishingExclusionsFile.txt create mode 100644 src/workloads/OptionalWorkloads.vsmanproj create mode 100644 src/workloads/VSSetup.props create mode 100644 src/workloads/VSSetup.targets create mode 100644 src/workloads/readme.md create mode 100644 src/workloads/workloads.csproj diff --git a/.gitignore b/.gitignore index 2ce687bb1..e3e8f1d20 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,9 @@ Library/ # local nuget cache .nuget/ +# local tools +.tools/ + # NuGet v3 restore drops these even though we don't use MSBuild :( *.nuget.targets *.nuget.props diff --git a/.vsts-ci.yml b/.vsts-ci.yml index db8b04ad3..69a774fc2 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -59,13 +59,13 @@ stages: _BuildConfig: Debug _BuildArchitecture: x86 _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '' + _AdditionalBuildParameters: '-msbuildEngine dotnet' _TestArg: $(_WindowsTestArg) Build_ES_Debug_x64: _BuildConfig: Debug _BuildArchitecture: x64 _DOTNET_CLI_UI_LANGUAGE: es - _AdditionalBuildParameters: '' + _AdditionalBuildParameters: '-msbuildEngine dotnet' _TestArg: $(_WindowsTestArg) # Internal-only builds ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: @@ -73,29 +73,39 @@ stages: _BuildConfig: Release _BuildArchitecture: x86 _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '' + _AdditionalBuildParameters: '-msbuildEngine dotnet' _TestArg: $(_WindowsTestArg) # Always run builds Build_Release_x64: _BuildConfig: Release _BuildArchitecture: x64 _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '/p:PublishInternalAsset=true' + _AdditionalBuildParameters: '-msbuildEngine dotnet /p:PublishInternalAsset=true' _TestArg: $(_WindowsTestArg) Build_Release_arm: _BuildConfig: Release _BuildArchitecture: arm _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '' + _AdditionalBuildParameters: '-msbuildEngine dotnet' # Never run tests on arm64 _TestArg: '' Build_Release_arm64: _BuildConfig: Release _BuildArchitecture: arm64 _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '' + _AdditionalBuildParameters: '-msbuildEngine dotnet' # Never run tests on arm64 _TestArg: '' + Build_Release_workloads: + _BuildConfig: Release + # Architecture doesn't matter as for workloads we generate multiple installer sets + _BuildArchitecture: x64 + _DOTNET_CLI_UI_LANGUAGE: '' + # This is a very specific build process and MUST be built using .NET Framework MSBuild + # because of build task dependencies for Visual Studio. + _AdditionalBuildParameters: '-project src\workloads\workloads.csproj -msbuildEngine vs' + # Never run tests for workloads + _TestArg: '' - template: /eng/build.yml parameters: @@ -115,14 +125,14 @@ stages: _BuildConfig: Release _BuildArchitecture: x64 _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '/p:PublishInternalAsset=true' + _AdditionalBuildParameters: '-msbuildEngine dotnet /p:PublishInternalAsset=true' # Never run tests on PGO bits _TestArg: '' Build_Release_x86: _BuildConfig: Release _BuildArchitecture: x86 _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '' + _AdditionalBuildParameters: '-msbuildEngine dotnet' _TestArg: '' pgoInstrument: true diff --git a/README.md b/README.md index ed4dec72c..e68e0f481 100644 --- a/README.md +++ b/README.md @@ -31,6 +31,8 @@ The repository contains native code project required for the Windows installer. - Install CMAKE 3.2.0.1 or later - Install MSVC Build tools for x86/x64/arm64, v14.28-16.9 +Optional workloads depend on .NET Framework MSBuild due to external task dependencies that do not support .NET Core. This means that Arcade defaults to using ```vs``` as the build engine. When building non-workload related projects from the CLI on Windows, you will need to explicitly set the ```msbuildEngine``` parameter to ```dotnet```. For example, to build the default installers in Windows, run ```build -msbuildEngine dotnet``` instead of just ```build```. + # Build status |All legs| diff --git a/eng/SymbolPublishingExclusionsFile.txt b/eng/SymbolPublishingExclusionsFile.txt new file mode 100644 index 000000000..67f0e5b4d --- /dev/null +++ b/eng/SymbolPublishingExclusionsFile.txt @@ -0,0 +1 @@ +vsman/OptionalWorkloads.vsman diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 22b4f92ce..92386cc61 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -136,14 +136,14 @@ - + https://github.com/dotnet/arcade - e8d0df4f35cfa23174fe7204ef958cf5d1b8e797 + 0b0d5b90b5aba80c66a9e7a210e0af8093dc4f57 - + https://github.com/dotnet/arcade - e8d0df4f35cfa23174fe7204ef958cf5d1b8e797 + 0b0d5b90b5aba80c66a9e7a210e0af8093dc4f57 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index e65305785..f0f4cde74 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,8 @@ - 6.0.0-beta.21263.5 + 6.0.0-beta.21269.3 + 6.0.0-beta.21269.3 @@ -164,5 +165,8 @@ 2.0.1-servicing-26011-01 + + 1.1.37 + diff --git a/eng/configure-toolset.ps1 b/eng/configure-toolset.ps1 index c6cc32f0c..13f193e91 100644 --- a/eng/configure-toolset.ps1 +++ b/eng/configure-toolset.ps1 @@ -4,3 +4,9 @@ $script:useInstalledDotNetCli = $false # Add CMake to the path. $env:PATH = "$PSScriptRoot\..\.tools\bin;$env:PATH" + +if ($msbuildEngine -eq 'vs') +{ + $globalJson = Get-Content -Raw global.json | ConvertFrom-Json + $env:MSBuildSdksPath = [IO.Path]::Combine($RepoRoot, ".dotnet\sdk", $globalJson.tools.dotnet, "sdks") +} diff --git a/eng/version.csproj b/eng/version.csproj index c745a3474..5394f0bff 100644 --- a/eng/version.csproj +++ b/eng/version.csproj @@ -1,6 +1,6 @@ - + - $(CoreSdkTargetFramework) + $(CoreSDKTargetFramework) $(ArtifactsObjDir)sdk_version.h diff --git a/global.json b/global.json index 2b5079f50..266f1a76b 100644 --- a/global.json +++ b/global.json @@ -1,17 +1,25 @@ { + "sdk": { + "version": "6.0.0-preview.5.21228.9", + "allowPrerelease": "true", + "rollForward": "major" + }, "tools": { "dotnet": "6.0.100-preview.5.21228.9", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" ] + }, + "vs": { + "version": "16.9" } }, "native-tools": { "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21263.5", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21269.3", "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21253.2" } } diff --git a/src/workloads/OptionalWorkloads.vsmanproj b/src/workloads/OptionalWorkloads.vsmanproj new file mode 100644 index 000000000..95f1f2400 --- /dev/null +++ b/src/workloads/OptionalWorkloads.vsmanproj @@ -0,0 +1,68 @@ + + + + + + false + false + false + build-manifest + true + false + DotNetOptionalWorkloads + vs + 42.42.42 + true + $(ManifestOutputPath) + + + + + / + + + /CHS/ + + + /CHT/ + + + /CSY/ + + + /DEU/ + + + /ENU/ + + + /ESN/ + + + /FRA/ + + + /ITA/ + + + /JPN/ + + + /KOR/ + + + /PLK/ + + + /PTB/ + + + /RUS/ + + + /TRK/ + + + + + diff --git a/src/workloads/VSSetup.props b/src/workloads/VSSetup.props new file mode 100644 index 000000000..6cfb80b39 --- /dev/null +++ b/src/workloads/VSSetup.props @@ -0,0 +1,42 @@ + + + + 1 + + + + https://vsdrop.corp.microsoft.com/file/v1/ + https://devdiv.artifacts.visualstudio.com/ + $(MSBuildThisDirectory)Tools\Drop.App\lib\net45\Drop.exe + + 10 + $([System.DateTime]::Now.AddYears($(DropExpiration)).ToString("M/d/yyyy h:m:s tt")) + + 10 + + verbose + + + -s "$(DropServiceUri)" + --timeout "$(DropTimeout)" + --tracelevel "$(DropTraceLevel)" + -x "$(DropExpirationDate)" + + -a + + + + dotnet + installer + local_build + $([System.DateTime]::Now.ToString("yyMMdd")).1 + + + + https://vsdrop.corp.microsoft.com/file/v1/Products/$(ManifestTeamProject)/$(ManifestRepositoryName)/$(ManifestBuildBranch)/$(ManifestBuildNumber); + + + + $(OutputPath)\obj\$(MSBuildProject) + + diff --git a/src/workloads/VSSetup.targets b/src/workloads/VSSetup.targets new file mode 100644 index 000000000..3aa470934 --- /dev/null +++ b/src/workloads/VSSetup.targets @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + Products/$(ManifestTeamProject)/$(ManifestRepositoryName)/$(ManifestBuildBranch)/$(ManifestBuildNumber) + + -n "$(DropName)" + -d "$(VSDropSource)" + + $(DropExe) Upgrade $(DropParamService) $(DropParamAuth) $(DropParamTimeout) $(DropParamTraceLevel) + $(DropExe) Create $(DropParamService) $(DropParamAuth) $(DropParamTimeout) $(DropParamTraceLevel) $(DropParamExpirationDate) $(DropParamName) + $(DropExe) Publish $(DropParamService) $(DropParamAuth) $(DropParamTimeout) $(DropParamTraceLevel) $(DropParamName) $(DropParamSource) + $(DropExe) Finalize $(DropParamService) $(DropParamAuth) $(DropParamTimeout) $(DropParamTraceLevel) $(DropParamName) + $(DropExe) Update $(DropParamService) $(DropParamAuth) $(DropParamTimeout) $(DropParamTraceLevel) $(DropParamName) --neverExpire + + + + + + + + + + + + + + + + diff --git a/src/workloads/readme.md b/src/workloads/readme.md new file mode 100644 index 000000000..6ef568558 --- /dev/null +++ b/src/workloads/readme.md @@ -0,0 +1,2 @@ +# Building +The workloads project can only be built using .NET Framework msbuild. To build locally, run ```build -project src\workloads\workloads.csproj -msbuildEngine vs``` diff --git a/src/workloads/workloads.csproj b/src/workloads/workloads.csproj new file mode 100644 index 000000000..b74190a8c --- /dev/null +++ b/src/workloads/workloads.csproj @@ -0,0 +1,192 @@ + + + + + netcoreapp3.1 + net5.0 + net472 + $(NuGetPackageRoot)microsoft.dotnet.build.tasks.installers\$(MicrosoftDotNetBuildTasksInstallersPackageVersion)\tools\$(MicrosoftDotNetBuildTasksInstallersTaskTargetFramework)\Microsoft.DotNet.Build.Tasks.Installers.dll + + + + + + + + + $(CoreSdkTargetFramework) + false + false + + $(ArtifactsObjDir)workloads\ + $(ArtifactsBinDir)workloads\ + $(ArtifactsDir)VSSetup\$(Configuration)\Insertion\ + + $(WorkloadIntermediateOutputPath)packages\ + + + $(WorkloadIntermediateOutputPath)src\gather\GatherPacks.csproj + + + + + + $(ArtifactsObjDir)/LightCommandPackages + + $(ArtifactsNonShippingPackagesDir) + + + + $(PkgWix)\tools + $(PkgMicroBuild_Plugins_SwixBuild) + $(SwixPluginPath)\build\MicroBuild.Plugins.SwixBuild.targets + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Microsoft + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_WixObj Include="$(_WixObjDir)\**\*.wixobj" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $(GitCommitCount.PadLeft(6,'0')) + + + $(_PatchNumber) + + $(GitCommitCount) + + + $(FileVersion) + + $(VersionPrefix).$(CombinedBuildNumberAndRevision) + + + From 03480751ed86e9d4f1c08a44a350c1410de6fef8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 25 May 2021 03:24:40 +0000 Subject: [PATCH 24/64] [release/6.0.1xx-preview5] Update dependencies from dotnet/sdk (#10750) [release/6.0.1xx-preview5] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-preview.5.21271.2 to 6.0.0-preview.5.21274.5 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-preview.5.21271.2 to 6.0.0-preview.5.21274.5 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.5.21271.2 to 6.0.0-preview.5.21274.5 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-preview.5.21271.1 to 6.0.0-preview.5.21274.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.5.21271.2 to 6.0.0-preview.5.21274.5 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-preview.5.21271.2 to 6.0.0-preview.5.21274.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.Net.Compilers.Toolset: from 4.0.0-1.21273.2 to 4.0.0-1.21274.8 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.0.0-preview-21271-07 to 17.0.0-preview-21274-05 (parent: Microsoft.NET.Sdk) - XliffTasks: from 1.0.0-beta.21262.1 to 1.0.0-beta.21265.1 (parent: Microsoft.DotNet.Arcade.Sdk) --- eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 14 +++++++------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 92386cc61..9f75c8e67 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - 4377095dc1902e5f744a9a014ddfe56d94268906 + 4728880630de78669e811f7bfe33ca871d516abb - + https://github.com/dotnet/windowsdesktop - 4377095dc1902e5f744a9a014ddfe56d94268906 + 4728880630de78669e811f7bfe33ca871d516abb - + https://github.com/dotnet/windowsdesktop - 4377095dc1902e5f744a9a014ddfe56d94268906 + 4728880630de78669e811f7bfe33ca871d516abb https://github.com/dotnet/runtime @@ -83,22 +83,22 @@ https://github.com/dotnet/templating 5d7718f5bbe6c681021f4c57986777421d9f0da4 - + https://github.com/dotnet/sdk - 5288e09e08034e05bd0aadbe15c7247e8b01b5be + bf630a3c6f1e657566dd3bdf826fd47f4faae6dd - + https://github.com/dotnet/sdk - 5288e09e08034e05bd0aadbe15c7247e8b01b5be + bf630a3c6f1e657566dd3bdf826fd47f4faae6dd - + https://github.com/dotnet/winforms - 43654488bda59f15e3ae8d16810e2358125fc752 + cb93f123a9f1b68f7048a96d790d433304b4ac16 - + https://github.com/dotnet/wpf - 8e52d84ca75794db29a5c9a09082bbe6b4eba526 + 824bd8ae3616a3c8dd9549d5abaf0376d745040c https://github.com/dotnet/fsharp @@ -113,13 +113,13 @@ 7a5c445a69359415b7ff18b91cd24472ef9509ff linker - + https://github.com/dotnet/roslyn - 58c14fa0505a50c205195ae35417450dedd3fe92 + 5f1908abb99b5c964cead38009090c449cc2bf7f - + https://github.com/dotnet/msbuild - 1560b6ce83b9de54dd7da4ca050f7f40387a33f4 + f7b42c2b1e154a134edc6b2761ef1c4000751711 https://github.com/nuget/nuget.client @@ -153,9 +153,9 @@ https://github.com/dotnet/sourcelink 4b584dbc392bb1aad49c2eb1ab84d8b489b6dccc - + https://github.com/dotnet/xliff-tasks - ac8cf3454829acf944e4ccb22b97d5abe3cb15ae + f4bfde77fb60daf52d8fec738d96d1d54e37dd88 diff --git a/eng/Versions.props b/eng/Versions.props index f0f4cde74..1330a083f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -25,11 +25,11 @@ - 6.0.0-preview.5.21271.1 + 6.0.0-preview.5.21274.4 - 6.0.0-preview.5.21271.2 + 6.0.0-preview.5.21274.4 @@ -58,8 +58,8 @@ - 6.0.100-preview.5.21273.3 - 6.0.100-preview.5.21273.3 + 6.0.100-preview.5.21274.24 + 6.0.100-preview.5.21274.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -79,9 +79,9 @@ - 6.0.0-preview.5.21271.2 - 6.0.0-preview.5.21271.2 - 6.0.0-preview.5.21271.2 + 6.0.0-preview.5.21274.5 + 6.0.0-preview.5.21274.5 + 6.0.0-preview.5.21274.5 From 2e0eea8da304a75208b8d18df9725b4ce140d49b Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Mon, 24 May 2021 21:31:56 -0700 Subject: [PATCH 25/64] Publish additional files in official CI build --- .vsts-ci.yml | 2 +- eng/Publishing.props | 13 +++++++++---- src/workloads/workloads.csproj | 10 ++++------ 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 69a774fc2..d03c66ea7 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -103,7 +103,7 @@ stages: _DOTNET_CLI_UI_LANGUAGE: '' # This is a very specific build process and MUST be built using .NET Framework MSBuild # because of build task dependencies for Visual Studio. - _AdditionalBuildParameters: '-project src\workloads\workloads.csproj -msbuildEngine vs' + _AdditionalBuildParameters: '-project src\workloads\workloads.csproj -msbuildEngine vs /p:OptionalWorkloads=true' # Never run tests for workloads _TestArg: '' diff --git a/eng/Publishing.props b/eng/Publishing.props index d4f6a188e..85ab36c94 100644 --- a/eng/Publishing.props +++ b/eng/Publishing.props @@ -75,20 +75,24 @@ + Condition=" '$(PublishBinariesAndBadge)' == 'true' and '$(OS)' == 'Windows_NT' and '$(Architecture)' == 'x64' and '$(PgoInstrument)' != 'true' and '$(OptionalWorkloads)' != 'true'" /> + Condition=" '$(PublishBinariesAndBadge)' == 'true' and '$(OS)' == 'Windows_NT' and '$(Architecture)' == 'x64' and '$(PgoInstrument)' != 'true' and '$(OptionalWorkloads)' != 'true'" /> + + - - + + @@ -125,6 +129,7 @@ + diff --git a/src/workloads/workloads.csproj b/src/workloads/workloads.csproj index b74190a8c..c775088a7 100644 --- a/src/workloads/workloads.csproj +++ b/src/workloads/workloads.csproj @@ -22,8 +22,6 @@ $(ArtifactsObjDir)workloads\ $(ArtifactsBinDir)workloads\ - $(ArtifactsDir)VSSetup\$(Configuration)\Insertion\ - $(WorkloadIntermediateOutputPath)packages\ @@ -110,7 +108,7 @@ - + @@ -120,7 +118,7 @@ - + @@ -154,7 +152,7 @@ - + @@ -162,7 +160,7 @@ - + From 487ff77b3e223c1ee4530a40d717725bd03d1aef Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Mon, 24 May 2021 21:42:22 -0700 Subject: [PATCH 26/64] Exclude .sha file --- eng/Publishing.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Publishing.props b/eng/Publishing.props index 85ab36c94..a23162faf 100644 --- a/eng/Publishing.props +++ b/eng/Publishing.props @@ -91,8 +91,8 @@ - - + + From 22515ae362a5723b0dc737f7a2c17ba3b4938214 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 25 May 2021 05:39:57 +0000 Subject: [PATCH 27/64] Update dependencies from https://github.com/dotnet/sdk build 20210524.27 (#10756) [release/6.0.1xx-preview5] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Build: from 17.0.0-preview-21274-05 to 17.0.0-preview-21274-08 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9f75c8e67..d520bfbe0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 5d7718f5bbe6c681021f4c57986777421d9f0da4 - + https://github.com/dotnet/sdk - bf630a3c6f1e657566dd3bdf826fd47f4faae6dd + 773fd7cd752fb1632e25dbaca1ffe793d2fe0b2b - + https://github.com/dotnet/sdk - bf630a3c6f1e657566dd3bdf826fd47f4faae6dd + 773fd7cd752fb1632e25dbaca1ffe793d2fe0b2b @@ -117,9 +117,9 @@ https://github.com/dotnet/roslyn 5f1908abb99b5c964cead38009090c449cc2bf7f - + https://github.com/dotnet/msbuild - f7b42c2b1e154a134edc6b2761ef1c4000751711 + 9d419252d876a6f30366c3ce22ec7249391c1f02 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 1330a083f..9f0e69d04 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,8 +58,8 @@ - 6.0.100-preview.5.21274.24 - 6.0.100-preview.5.21274.24 + 6.0.100-preview.5.21274.27 + 6.0.100-preview.5.21274.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8d7dbce43d6dba990bd90c3fcccada45c23b7b56 Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Tue, 25 May 2021 01:53:47 -0700 Subject: [PATCH 28/64] Create versioned folder for .vsman file --- src/workloads/workloads.csproj | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/workloads/workloads.csproj b/src/workloads/workloads.csproj index c775088a7..b471a8380 100644 --- a/src/workloads/workloads.csproj +++ b/src/workloads/workloads.csproj @@ -85,6 +85,11 @@ + + + $(VisualStudioSetupInsertionPath)$(SDKBundleVersion)\ + + @@ -108,7 +113,7 @@ - + @@ -118,7 +123,7 @@ - + @@ -152,7 +157,7 @@ - + @@ -160,7 +165,7 @@ - + From 39b3def720c276f4cc1b5299c07e6a314de3544b Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Tue, 25 May 2021 10:21:26 -0700 Subject: [PATCH 29/64] Switch to 16.8 (#10761) --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 266f1a76b..9362c559b 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ ] }, "vs": { - "version": "16.9" + "version": "16.8" } }, "native-tools": { From 299ea460907b8d14e59cee69d91ee129e693d344 Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Tue, 25 May 2021 14:12:55 -0700 Subject: [PATCH 30/64] Ensure CopyLatest runs on VS2019 agent (#10764) --- .vsts-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index d03c66ea7..f0148aa12 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -411,7 +411,7 @@ stages: jobs: - job: Copy_SDK_To_Latest pool: - name: Hosted VS2017 + vmimage: windows-2019 condition: succeeded() variables: - group: DotNet-DotNetCli-Storage From d1be03eb6ccdf869a4f06c1999f39c5e52fef23f Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Tue, 25 May 2021 15:42:00 -0700 Subject: [PATCH 31/64] Ensure copy latest runs on dotnet engine and not msbuild (#10766) --- eng/CopyToLatest.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/CopyToLatest.cmd b/eng/CopyToLatest.cmd index 67b0a5860..6af63c5a2 100644 --- a/eng/CopyToLatest.cmd +++ b/eng/CopyToLatest.cmd @@ -3,5 +3,5 @@ REM Copyright (c) .NET Foundation and contributors. All rights reserved. REM Licensed under the MIT license. See LICENSE file in the project root for full license information. -powershell -ExecutionPolicy Bypass -NoProfile -NoLogo -Command "& \"%~dp0common\build.ps1\" -restore -build /p:Projects=\"%~dp0..\src\CopyToLatest\CopyToLatest.csproj\" %*; exit $LastExitCode;" +powershell -ExecutionPolicy Bypass -NoProfile -NoLogo -Command "& \"%~dp0common\build.ps1\" -restore -build -msbuildEngine dotnet /p:Projects=\"%~dp0..\src\CopyToLatest\CopyToLatest.csproj\" %*; exit $LastExitCode;" if %errorlevel% neq 0 exit /b %errorlevel% From 52a043fefd1e16f869aa8c5c1c356dd84ec18de9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 25 May 2021 23:34:58 +0000 Subject: [PATCH 32/64] [release/6.0.1xx-preview5] Update dependencies from dotnet/sdk (#10765) [release/6.0.1xx-preview5] Update dependencies from dotnet/sdk - Coherency Updates: - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21270.12 to 6.0.0-preview.5.21275.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 6.0.0-preview.5.21270.12 to 6.0.0-preview.5.21275.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-preview.5.21270.12 to 6.0.0-preview.5.21275.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-preview.5.21270.12 to 6.0.0-preview.5.21275.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-preview.5.21270.12 to 6.0.0-preview.5.21275.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 6.0.0-preview.5.21270.12 to 6.0.0-preview.5.21275.5 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.0.0-1.21274.8 to 4.0.0-1.21275.5 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d520bfbe0..300694a7e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop 4728880630de78669e811f7bfe33ca871d516abb - + https://github.com/dotnet/runtime - 691c12bc9e4f8b7615e8108d57699485d5a67ea7 + ace83b3239c518e149c9919c0e7a14642df76eb9 - + https://github.com/dotnet/runtime - 691c12bc9e4f8b7615e8108d57699485d5a67ea7 + ace83b3239c518e149c9919c0e7a14642df76eb9 - + https://github.com/dotnet/runtime - 691c12bc9e4f8b7615e8108d57699485d5a67ea7 + ace83b3239c518e149c9919c0e7a14642df76eb9 - + https://github.com/dotnet/runtime - 691c12bc9e4f8b7615e8108d57699485d5a67ea7 + ace83b3239c518e149c9919c0e7a14642df76eb9 - + https://github.com/dotnet/runtime - 691c12bc9e4f8b7615e8108d57699485d5a67ea7 + ace83b3239c518e149c9919c0e7a14642df76eb9 @@ -39,9 +39,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 691c12bc9e4f8b7615e8108d57699485d5a67ea7 + ace83b3239c518e149c9919c0e7a14642df76eb9 https://github.com/dotnet/aspnetcore @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 5d7718f5bbe6c681021f4c57986777421d9f0da4 - + https://github.com/dotnet/sdk - 773fd7cd752fb1632e25dbaca1ffe793d2fe0b2b + 91aec08d183f8a57259c307fc0e0261685bf0871 - + https://github.com/dotnet/sdk - 773fd7cd752fb1632e25dbaca1ffe793d2fe0b2b + 91aec08d183f8a57259c307fc0e0261685bf0871 @@ -113,9 +113,9 @@ 7a5c445a69359415b7ff18b91cd24472ef9509ff linker - + https://github.com/dotnet/roslyn - 5f1908abb99b5c964cead38009090c449cc2bf7f + 0eef599ce205182bd6925eb9bdb83359249caa4e https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 9f0e69d04..1d051bea8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,23 +58,23 @@ - 6.0.100-preview.5.21274.27 - 6.0.100-preview.5.21274.27 + 6.0.100-preview.5.21275.10 + 6.0.100-preview.5.21275.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-preview.5.21270.12 + 6.0.0-preview.5.21275.5 - 6.0.0-preview.5.21270.12 - 6.0.0-preview.5.21270.12 - 6.0.0-preview.5.21270.12 - 6.0.0-preview.5.21270.12 - 6.0.0-preview.5.21270.12 + 6.0.0-preview.5.21275.5 + 6.0.0-preview.5.21275.5 + 6.0.0-preview.5.21275.5 + 6.0.0-preview.5.21275.5 + 6.0.0-preview.5.21275.5 2.1.0 From 3081db261c27e015da3ad7c02043859d4823834c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 26 May 2021 01:49:04 +0000 Subject: [PATCH 33/64] [release/6.0.1xx-preview5] Update dependencies from dotnet/sdk (#10767) [release/6.0.1xx-preview5] Update dependencies from dotnet/sdk - Coherency Updates: - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21275.5 to 6.0.0-preview.5.21275.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 6.0.0-preview.5.21275.5 to 6.0.0-preview.5.21275.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-preview.5.21275.5 to 6.0.0-preview.5.21275.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-preview.5.21275.5 to 6.0.0-preview.5.21275.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-preview.5.21275.5 to 6.0.0-preview.5.21275.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 6.0.0-preview.5.21275.5 to 6.0.0-preview.5.21275.7 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.5.21271.3 to 6.0.0-preview.5.21275.6 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.5.21271.3 to 6.0.0-preview.5.21275.6 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.5.21271.3 to 6.0.0-preview.5.21275.6 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21271.3 to 6.0.0-preview.5.21275.6 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-preview.5.21271.3 to 6.0.0-preview.5.21275.6 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-preview.5.21271.3 to 6.0.0-preview.5.21275.6 (parent: Microsoft.NET.Sdk) - Microsoft.FSharp.Compiler: from 12.0.0-beta.21271.1 to 12.0.0-beta.21275.2 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 28 +++++++++---------- 2 files changed, 44 insertions(+), 44 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 300694a7e..163cfbd5c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop 4728880630de78669e811f7bfe33ca871d516abb - + https://github.com/dotnet/runtime - ace83b3239c518e149c9919c0e7a14642df76eb9 + 5f5c3746b9b0500dffc762d06d16f189e2585078 - + https://github.com/dotnet/runtime - ace83b3239c518e149c9919c0e7a14642df76eb9 + 5f5c3746b9b0500dffc762d06d16f189e2585078 - + https://github.com/dotnet/runtime - ace83b3239c518e149c9919c0e7a14642df76eb9 + 5f5c3746b9b0500dffc762d06d16f189e2585078 - + https://github.com/dotnet/runtime - ace83b3239c518e149c9919c0e7a14642df76eb9 + 5f5c3746b9b0500dffc762d06d16f189e2585078 - + https://github.com/dotnet/runtime - ace83b3239c518e149c9919c0e7a14642df76eb9 + 5f5c3746b9b0500dffc762d06d16f189e2585078 @@ -39,33 +39,33 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - ace83b3239c518e149c9919c0e7a14642df76eb9 + 5f5c3746b9b0500dffc762d06d16f189e2585078 - + https://github.com/dotnet/aspnetcore - d9c8be5edee1eba786376db32e803a02b890c43c + 9709f4438d90381e513d38cceb841e3db5834390 - + https://github.com/dotnet/aspnetcore - d9c8be5edee1eba786376db32e803a02b890c43c + 9709f4438d90381e513d38cceb841e3db5834390 - + https://github.com/dotnet/aspnetcore - d9c8be5edee1eba786376db32e803a02b890c43c + 9709f4438d90381e513d38cceb841e3db5834390 - + https://github.com/dotnet/aspnetcore - d9c8be5edee1eba786376db32e803a02b890c43c + 9709f4438d90381e513d38cceb841e3db5834390 - + https://github.com/dotnet/aspnetcore - d9c8be5edee1eba786376db32e803a02b890c43c + 9709f4438d90381e513d38cceb841e3db5834390 - + https://github.com/dotnet/aspnetcore - d9c8be5edee1eba786376db32e803a02b890c43c + 9709f4438d90381e513d38cceb841e3db5834390 https://github.com/dotnet/test-templates @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 5d7718f5bbe6c681021f4c57986777421d9f0da4 - + https://github.com/dotnet/sdk - 91aec08d183f8a57259c307fc0e0261685bf0871 + a899a640f9698ade70b77873df76f439b9f2f671 - + https://github.com/dotnet/sdk - 91aec08d183f8a57259c307fc0e0261685bf0871 + a899a640f9698ade70b77873df76f439b9f2f671 @@ -100,9 +100,9 @@ https://github.com/dotnet/wpf 824bd8ae3616a3c8dd9549d5abaf0376d745040c - + https://github.com/dotnet/fsharp - 9e8e3b506b730e6a4f9a977f1015318e7fbbdc39 + 78c22aa4d14aa4628b3fc18cac7e7758e600b0db https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 1d051bea8..1977ba429 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,35 +46,35 @@ - 6.0.0-preview.5.21271.3 - 6.0.0-preview.5.21271.3 - 6.0.0-preview.5.21271.3 - 6.0.0-preview.5.21271.3 - 6.0.0-preview.5.21271.3 - 6.0.0-preview.5.21271.3 + 6.0.0-preview.5.21275.6 + 6.0.0-preview.5.21275.6 + 6.0.0-preview.5.21275.6 + 6.0.0-preview.5.21275.6 + 6.0.0-preview.5.21275.6 + 6.0.0-preview.5.21275.6 0.2.0 - 6.0.100-preview.5.21275.10 - 6.0.100-preview.5.21275.10 + 6.0.100-preview.5.21275.16 + 6.0.100-preview.5.21275.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-preview.5.21275.5 + 6.0.0-preview.5.21275.7 - 6.0.0-preview.5.21275.5 - 6.0.0-preview.5.21275.5 - 6.0.0-preview.5.21275.5 - 6.0.0-preview.5.21275.5 - 6.0.0-preview.5.21275.5 + 6.0.0-preview.5.21275.7 + 6.0.0-preview.5.21275.7 + 6.0.0-preview.5.21275.7 + 6.0.0-preview.5.21275.7 + 6.0.0-preview.5.21275.7 2.1.0 From c0a89b0d6af98c1e4c6c453bb025bea0cccf8e78 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 26 May 2021 02:29:42 +0000 Subject: [PATCH 34/64] Update dependencies from https://github.com/dotnet/sdk build 20210525.18 (#10768) [release/6.0.1xx-preview5] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-preview.5.21274.5 to 6.0.0-preview.5.21275.5 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-preview.5.21274.5 to 6.0.0-preview.5.21275.5 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.5.21274.5 to 6.0.0-preview.5.21275.5 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-preview.5.21274.4 to 6.0.0-preview.5.21275.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.5.21274.5 to 6.0.0-preview.5.21275.5 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-preview.5.21274.4 to 6.0.0-preview.5.21275.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - NuGet.Build.Tasks: from 5.10.0-rc.7240 to 6.0.0-preview.1.66 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 14 +++++++------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 163cfbd5c..fbc7996e9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - 4728880630de78669e811f7bfe33ca871d516abb + de8f4185f0903e3f1ac94decd14cee97d6f7e6eb - + https://github.com/dotnet/windowsdesktop - 4728880630de78669e811f7bfe33ca871d516abb + de8f4185f0903e3f1ac94decd14cee97d6f7e6eb - + https://github.com/dotnet/windowsdesktop - 4728880630de78669e811f7bfe33ca871d516abb + de8f4185f0903e3f1ac94decd14cee97d6f7e6eb https://github.com/dotnet/runtime @@ -83,22 +83,22 @@ https://github.com/dotnet/templating 5d7718f5bbe6c681021f4c57986777421d9f0da4 - + https://github.com/dotnet/sdk - a899a640f9698ade70b77873df76f439b9f2f671 + b419665e1361d0ea99ed42e362ec6f9ddee486ce - + https://github.com/dotnet/sdk - a899a640f9698ade70b77873df76f439b9f2f671 + b419665e1361d0ea99ed42e362ec6f9ddee486ce - + https://github.com/dotnet/winforms - cb93f123a9f1b68f7048a96d790d433304b4ac16 + 166ec2e193b628365f4fb865fec92b457194056d - + https://github.com/dotnet/wpf - 824bd8ae3616a3c8dd9549d5abaf0376d745040c + 8ae6b7a37db8a339766655f8f975542ceda5ff91 https://github.com/dotnet/fsharp @@ -121,9 +121,9 @@ https://github.com/dotnet/msbuild 9d419252d876a6f30366c3ce22ec7249391c1f02 - + https://github.com/nuget/nuget.client - dca1d060f38e1e02f6bfca41e25f081f19fd534b + e84a10e4b0e6bccce7421af020728d9bbc3e64e0 https://github.com/Microsoft/ApplicationInsights-dotnet diff --git a/eng/Versions.props b/eng/Versions.props index 1977ba429..c572d9a98 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -25,11 +25,11 @@ - 6.0.0-preview.5.21274.4 + 6.0.0-preview.5.21275.4 - 6.0.0-preview.5.21274.4 + 6.0.0-preview.5.21275.4 @@ -58,8 +58,8 @@ - 6.0.100-preview.5.21275.16 - 6.0.100-preview.5.21275.16 + 6.0.100-preview.5.21275.18 + 6.0.100-preview.5.21275.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -79,9 +79,9 @@ - 6.0.0-preview.5.21274.5 - 6.0.0-preview.5.21274.5 - 6.0.0-preview.5.21274.5 + 6.0.0-preview.5.21275.5 + 6.0.0-preview.5.21275.5 + 6.0.0-preview.5.21275.5 From fea186deb0d5d2701ca9b8b4937e0e795516e8ee Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 26 May 2021 08:02:29 +0000 Subject: [PATCH 35/64] Update dependencies from https://github.com/dotnet/sdk build 20210525.22 (#10769) [release/6.0.1xx-preview5] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-preview.5.21275.5 to 6.0.0-preview.5.21275.7 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-preview.5.21275.5 to 6.0.0-preview.5.21275.7 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.5.21275.5 to 6.0.0-preview.5.21275.7 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-preview.5.21275.4 to 6.0.0-preview.5.21275.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.5.21275.5 to 6.0.0-preview.5.21275.7 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-preview.5.21275.4 to 6.0.0-preview.5.21275.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fbc7996e9..4419c7de0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - de8f4185f0903e3f1ac94decd14cee97d6f7e6eb + 7f947e4d6e80516fa4e71456dae6eeb45103d69c - + https://github.com/dotnet/windowsdesktop - de8f4185f0903e3f1ac94decd14cee97d6f7e6eb + 7f947e4d6e80516fa4e71456dae6eeb45103d69c - + https://github.com/dotnet/windowsdesktop - de8f4185f0903e3f1ac94decd14cee97d6f7e6eb + 7f947e4d6e80516fa4e71456dae6eeb45103d69c https://github.com/dotnet/runtime @@ -83,22 +83,22 @@ https://github.com/dotnet/templating 5d7718f5bbe6c681021f4c57986777421d9f0da4 - + https://github.com/dotnet/sdk - b419665e1361d0ea99ed42e362ec6f9ddee486ce + 965a2ed36ac595015ec2f90cc891476250d260c5 - + https://github.com/dotnet/sdk - b419665e1361d0ea99ed42e362ec6f9ddee486ce + 965a2ed36ac595015ec2f90cc891476250d260c5 - + https://github.com/dotnet/winforms - 166ec2e193b628365f4fb865fec92b457194056d + c1f09715e3fdebeb3c14bc95908e1657d12f42e4 - + https://github.com/dotnet/wpf - 8ae6b7a37db8a339766655f8f975542ceda5ff91 + 33a7c82828428849690f7a8a93c623d547c23dda https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index c572d9a98..e84b54788 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -25,11 +25,11 @@ - 6.0.0-preview.5.21275.4 + 6.0.0-preview.5.21275.6 - 6.0.0-preview.5.21275.4 + 6.0.0-preview.5.21275.7 @@ -58,8 +58,8 @@ - 6.0.100-preview.5.21275.18 - 6.0.100-preview.5.21275.18 + 6.0.100-preview.5.21275.22 + 6.0.100-preview.5.21275.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -79,9 +79,9 @@ - 6.0.0-preview.5.21275.5 - 6.0.0-preview.5.21275.5 - 6.0.0-preview.5.21275.5 + 6.0.0-preview.5.21275.7 + 6.0.0-preview.5.21275.7 + 6.0.0-preview.5.21275.7 From dfb69dc107ff88f78c743ff8085d97a430173ef9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 26 May 2021 14:17:08 +0000 Subject: [PATCH 36/64] Update dependencies from https://github.com/dotnet/sdk build 20210526.3 (#10772) [release/6.0.1xx-preview5] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.5.21275.6 to 6.0.0-preview.5.21276.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.5.21275.6 to 6.0.0-preview.5.21276.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.5.21275.6 to 6.0.0-preview.5.21276.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21275.6 to 6.0.0-preview.5.21276.1 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-preview.5.21275.6 to 6.0.0-preview.5.21276.1 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-preview.5.21275.6 to 6.0.0-preview.5.21276.1 (parent: Microsoft.NET.Sdk) --- 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 4419c7de0..6559053a8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime 5f5c3746b9b0500dffc762d06d16f189e2585078 - + https://github.com/dotnet/aspnetcore - 9709f4438d90381e513d38cceb841e3db5834390 + ed6785e32c7e75b9ad46baa537d049d199eaaa6d - + https://github.com/dotnet/aspnetcore - 9709f4438d90381e513d38cceb841e3db5834390 + ed6785e32c7e75b9ad46baa537d049d199eaaa6d - + https://github.com/dotnet/aspnetcore - 9709f4438d90381e513d38cceb841e3db5834390 + ed6785e32c7e75b9ad46baa537d049d199eaaa6d - + https://github.com/dotnet/aspnetcore - 9709f4438d90381e513d38cceb841e3db5834390 + ed6785e32c7e75b9ad46baa537d049d199eaaa6d - + https://github.com/dotnet/aspnetcore - 9709f4438d90381e513d38cceb841e3db5834390 + ed6785e32c7e75b9ad46baa537d049d199eaaa6d - + https://github.com/dotnet/aspnetcore - 9709f4438d90381e513d38cceb841e3db5834390 + ed6785e32c7e75b9ad46baa537d049d199eaaa6d https://github.com/dotnet/test-templates @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 5d7718f5bbe6c681021f4c57986777421d9f0da4 - + https://github.com/dotnet/sdk - 965a2ed36ac595015ec2f90cc891476250d260c5 + aa49683ad9c67be4c94f9ee00b432a01d0f33c93 - + https://github.com/dotnet/sdk - 965a2ed36ac595015ec2f90cc891476250d260c5 + aa49683ad9c67be4c94f9ee00b432a01d0f33c93 diff --git a/eng/Versions.props b/eng/Versions.props index e84b54788..001605aff 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,20 +46,20 @@ - 6.0.0-preview.5.21275.6 - 6.0.0-preview.5.21275.6 - 6.0.0-preview.5.21275.6 - 6.0.0-preview.5.21275.6 - 6.0.0-preview.5.21275.6 - 6.0.0-preview.5.21275.6 + 6.0.0-preview.5.21276.1 + 6.0.0-preview.5.21276.1 + 6.0.0-preview.5.21276.1 + 6.0.0-preview.5.21276.1 + 6.0.0-preview.5.21276.1 + 6.0.0-preview.5.21276.1 0.2.0 - 6.0.100-preview.5.21275.22 - 6.0.100-preview.5.21275.22 + 6.0.100-preview.5.21276.3 + 6.0.100-preview.5.21276.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 090edea44e10630c050da0ab70ca62dbe2fb5268 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 26 May 2021 19:28:10 +0000 Subject: [PATCH 37/64] Update dependencies from https://github.com/dotnet/sdk build 20210526.12 (#10776) [release/6.0.1xx-preview5] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6559053a8..d4ceb9479 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 5d7718f5bbe6c681021f4c57986777421d9f0da4 - + https://github.com/dotnet/sdk - aa49683ad9c67be4c94f9ee00b432a01d0f33c93 + f1f200a726c2d54a0ba951409907520b66a321a2 - + https://github.com/dotnet/sdk - aa49683ad9c67be4c94f9ee00b432a01d0f33c93 + f1f200a726c2d54a0ba951409907520b66a321a2 diff --git a/eng/Versions.props b/eng/Versions.props index 001605aff..62aa0e281 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,8 +58,8 @@ - 6.0.100-preview.5.21276.3 - 6.0.100-preview.5.21276.3 + 6.0.100-preview.5.21276.12 + 6.0.100-preview.5.21276.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 42c9d153c5ded143b51642b2da6d20d46377c62e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 26 May 2021 22:23:26 +0000 Subject: [PATCH 38/64] Update dependencies from https://github.com/dotnet/sdk build 20210526.16 (#10779) [release/6.0.1xx-preview5] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d4ceb9479..3de0c64cd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 5d7718f5bbe6c681021f4c57986777421d9f0da4 - + https://github.com/dotnet/sdk - f1f200a726c2d54a0ba951409907520b66a321a2 + 0193108d0da7284882769861db6956f17e861b8c - + https://github.com/dotnet/sdk - f1f200a726c2d54a0ba951409907520b66a321a2 + 0193108d0da7284882769861db6956f17e861b8c diff --git a/eng/Versions.props b/eng/Versions.props index 62aa0e281..f46a2d6c2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,8 +58,8 @@ - 6.0.100-preview.5.21276.12 - 6.0.100-preview.5.21276.12 + 6.0.100-preview.5.21276.16 + 6.0.100-preview.5.21276.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 411c1a4a6a5b9d32a8a0a9843e24266723de39dd Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Wed, 26 May 2021 21:19:10 -0700 Subject: [PATCH 39/64] Remove optional workloads (#10780) * Revert "Ensure copy latest runs on dotnet engine and not msbuild (#10766)" This reverts commit d1be03eb6ccdf869a4f06c1999f39c5e52fef23f. * Revert "Publish additional files in official CI build" This reverts commit 2e0eea8da304a75208b8d18df9725b4ce140d49b. * Revert "Create WASM installers for optional workloads (#10685)" This reverts commit 7c79ce28bc5f42214c49e2ebbf3d7768ca927fa2. --- .gitignore | 3 - .vsts-ci.yml | 26 +-- README.md | 2 - eng/CopyToLatest.cmd | 2 +- eng/Publishing.props | 9 +- eng/SymbolPublishingExclusionsFile.txt | 1 - eng/Version.Details.xml | 8 +- eng/Versions.props | 6 +- eng/configure-toolset.ps1 | 6 - eng/version.csproj | 4 +- global.json | 10 +- src/workloads/OptionalWorkloads.vsmanproj | 68 -------- src/workloads/VSSetup.props | 42 ----- src/workloads/VSSetup.targets | 49 ------ src/workloads/readme.md | 2 - src/workloads/workloads.csproj | 195 ---------------------- 16 files changed, 19 insertions(+), 414 deletions(-) delete mode 100644 eng/SymbolPublishingExclusionsFile.txt delete mode 100644 src/workloads/OptionalWorkloads.vsmanproj delete mode 100644 src/workloads/VSSetup.props delete mode 100644 src/workloads/VSSetup.targets delete mode 100644 src/workloads/readme.md delete mode 100644 src/workloads/workloads.csproj diff --git a/.gitignore b/.gitignore index e3e8f1d20..2ce687bb1 100644 --- a/.gitignore +++ b/.gitignore @@ -15,9 +15,6 @@ Library/ # local nuget cache .nuget/ -# local tools -.tools/ - # NuGet v3 restore drops these even though we don't use MSBuild :( *.nuget.targets *.nuget.props diff --git a/.vsts-ci.yml b/.vsts-ci.yml index f0148aa12..4423bbb23 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -59,13 +59,13 @@ stages: _BuildConfig: Debug _BuildArchitecture: x86 _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '-msbuildEngine dotnet' + _AdditionalBuildParameters: '' _TestArg: $(_WindowsTestArg) Build_ES_Debug_x64: _BuildConfig: Debug _BuildArchitecture: x64 _DOTNET_CLI_UI_LANGUAGE: es - _AdditionalBuildParameters: '-msbuildEngine dotnet' + _AdditionalBuildParameters: '' _TestArg: $(_WindowsTestArg) # Internal-only builds ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: @@ -73,39 +73,29 @@ stages: _BuildConfig: Release _BuildArchitecture: x86 _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '-msbuildEngine dotnet' + _AdditionalBuildParameters: '' _TestArg: $(_WindowsTestArg) # Always run builds Build_Release_x64: _BuildConfig: Release _BuildArchitecture: x64 _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '-msbuildEngine dotnet /p:PublishInternalAsset=true' + _AdditionalBuildParameters: '/p:PublishInternalAsset=true' _TestArg: $(_WindowsTestArg) Build_Release_arm: _BuildConfig: Release _BuildArchitecture: arm _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '-msbuildEngine dotnet' + _AdditionalBuildParameters: '' # Never run tests on arm64 _TestArg: '' Build_Release_arm64: _BuildConfig: Release _BuildArchitecture: arm64 _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '-msbuildEngine dotnet' + _AdditionalBuildParameters: '' # Never run tests on arm64 _TestArg: '' - Build_Release_workloads: - _BuildConfig: Release - # Architecture doesn't matter as for workloads we generate multiple installer sets - _BuildArchitecture: x64 - _DOTNET_CLI_UI_LANGUAGE: '' - # This is a very specific build process and MUST be built using .NET Framework MSBuild - # because of build task dependencies for Visual Studio. - _AdditionalBuildParameters: '-project src\workloads\workloads.csproj -msbuildEngine vs /p:OptionalWorkloads=true' - # Never run tests for workloads - _TestArg: '' - template: /eng/build.yml parameters: @@ -125,14 +115,14 @@ stages: _BuildConfig: Release _BuildArchitecture: x64 _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '-msbuildEngine dotnet /p:PublishInternalAsset=true' + _AdditionalBuildParameters: '/p:PublishInternalAsset=true' # Never run tests on PGO bits _TestArg: '' Build_Release_x86: _BuildConfig: Release _BuildArchitecture: x86 _DOTNET_CLI_UI_LANGUAGE: '' - _AdditionalBuildParameters: '-msbuildEngine dotnet' + _AdditionalBuildParameters: '' _TestArg: '' pgoInstrument: true diff --git a/README.md b/README.md index e68e0f481..ed4dec72c 100644 --- a/README.md +++ b/README.md @@ -31,8 +31,6 @@ The repository contains native code project required for the Windows installer. - Install CMAKE 3.2.0.1 or later - Install MSVC Build tools for x86/x64/arm64, v14.28-16.9 -Optional workloads depend on .NET Framework MSBuild due to external task dependencies that do not support .NET Core. This means that Arcade defaults to using ```vs``` as the build engine. When building non-workload related projects from the CLI on Windows, you will need to explicitly set the ```msbuildEngine``` parameter to ```dotnet```. For example, to build the default installers in Windows, run ```build -msbuildEngine dotnet``` instead of just ```build```. - # Build status |All legs| diff --git a/eng/CopyToLatest.cmd b/eng/CopyToLatest.cmd index 6af63c5a2..67b0a5860 100644 --- a/eng/CopyToLatest.cmd +++ b/eng/CopyToLatest.cmd @@ -3,5 +3,5 @@ REM Copyright (c) .NET Foundation and contributors. All rights reserved. REM Licensed under the MIT license. See LICENSE file in the project root for full license information. -powershell -ExecutionPolicy Bypass -NoProfile -NoLogo -Command "& \"%~dp0common\build.ps1\" -restore -build -msbuildEngine dotnet /p:Projects=\"%~dp0..\src\CopyToLatest\CopyToLatest.csproj\" %*; exit $LastExitCode;" +powershell -ExecutionPolicy Bypass -NoProfile -NoLogo -Command "& \"%~dp0common\build.ps1\" -restore -build /p:Projects=\"%~dp0..\src\CopyToLatest\CopyToLatest.csproj\" %*; exit $LastExitCode;" if %errorlevel% neq 0 exit /b %errorlevel% diff --git a/eng/Publishing.props b/eng/Publishing.props index a23162faf..d4f6a188e 100644 --- a/eng/Publishing.props +++ b/eng/Publishing.props @@ -75,17 +75,13 @@ + Condition=" '$(PublishBinariesAndBadge)' == 'true' and '$(OS)' == 'Windows_NT' and '$(Architecture)' == 'x64' and '$(PgoInstrument)' != 'true'" /> + Condition=" '$(PublishBinariesAndBadge)' == 'true' and '$(OS)' == 'Windows_NT' and '$(Architecture)' == 'x64' and '$(PgoInstrument)' != 'true'" /> - - @@ -129,7 +125,6 @@ - diff --git a/eng/SymbolPublishingExclusionsFile.txt b/eng/SymbolPublishingExclusionsFile.txt deleted file mode 100644 index 67f0e5b4d..000000000 --- a/eng/SymbolPublishingExclusionsFile.txt +++ /dev/null @@ -1 +0,0 @@ -vsman/OptionalWorkloads.vsman diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3de0c64cd..eb9b0423e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -136,14 +136,14 @@ - + https://github.com/dotnet/arcade - 0b0d5b90b5aba80c66a9e7a210e0af8093dc4f57 + e8d0df4f35cfa23174fe7204ef958cf5d1b8e797 - + https://github.com/dotnet/arcade - 0b0d5b90b5aba80c66a9e7a210e0af8093dc4f57 + e8d0df4f35cfa23174fe7204ef958cf5d1b8e797 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index f46a2d6c2..8cc3a6025 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,8 +20,7 @@ - 6.0.0-beta.21269.3 - 6.0.0-beta.21269.3 + 6.0.0-beta.21263.5 @@ -165,8 +164,5 @@ 2.0.1-servicing-26011-01 - - 1.1.37 - diff --git a/eng/configure-toolset.ps1 b/eng/configure-toolset.ps1 index 13f193e91..c6cc32f0c 100644 --- a/eng/configure-toolset.ps1 +++ b/eng/configure-toolset.ps1 @@ -4,9 +4,3 @@ $script:useInstalledDotNetCli = $false # Add CMake to the path. $env:PATH = "$PSScriptRoot\..\.tools\bin;$env:PATH" - -if ($msbuildEngine -eq 'vs') -{ - $globalJson = Get-Content -Raw global.json | ConvertFrom-Json - $env:MSBuildSdksPath = [IO.Path]::Combine($RepoRoot, ".dotnet\sdk", $globalJson.tools.dotnet, "sdks") -} diff --git a/eng/version.csproj b/eng/version.csproj index 5394f0bff..c745a3474 100644 --- a/eng/version.csproj +++ b/eng/version.csproj @@ -1,6 +1,6 @@ - + - $(CoreSDKTargetFramework) + $(CoreSdkTargetFramework) $(ArtifactsObjDir)sdk_version.h diff --git a/global.json b/global.json index 9362c559b..2b5079f50 100644 --- a/global.json +++ b/global.json @@ -1,25 +1,17 @@ { - "sdk": { - "version": "6.0.0-preview.5.21228.9", - "allowPrerelease": "true", - "rollForward": "major" - }, "tools": { "dotnet": "6.0.100-preview.5.21228.9", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" ] - }, - "vs": { - "version": "16.8" } }, "native-tools": { "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21269.3", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21263.5", "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21253.2" } } diff --git a/src/workloads/OptionalWorkloads.vsmanproj b/src/workloads/OptionalWorkloads.vsmanproj deleted file mode 100644 index 95f1f2400..000000000 --- a/src/workloads/OptionalWorkloads.vsmanproj +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - false - false - false - build-manifest - true - false - DotNetOptionalWorkloads - vs - 42.42.42 - true - $(ManifestOutputPath) - - - - - / - - - /CHS/ - - - /CHT/ - - - /CSY/ - - - /DEU/ - - - /ENU/ - - - /ESN/ - - - /FRA/ - - - /ITA/ - - - /JPN/ - - - /KOR/ - - - /PLK/ - - - /PTB/ - - - /RUS/ - - - /TRK/ - - - - - diff --git a/src/workloads/VSSetup.props b/src/workloads/VSSetup.props deleted file mode 100644 index 6cfb80b39..000000000 --- a/src/workloads/VSSetup.props +++ /dev/null @@ -1,42 +0,0 @@ - - - - 1 - - - - https://vsdrop.corp.microsoft.com/file/v1/ - https://devdiv.artifacts.visualstudio.com/ - $(MSBuildThisDirectory)Tools\Drop.App\lib\net45\Drop.exe - - 10 - $([System.DateTime]::Now.AddYears($(DropExpiration)).ToString("M/d/yyyy h:m:s tt")) - - 10 - - verbose - - - -s "$(DropServiceUri)" - --timeout "$(DropTimeout)" - --tracelevel "$(DropTraceLevel)" - -x "$(DropExpirationDate)" - - -a - - - - dotnet - installer - local_build - $([System.DateTime]::Now.ToString("yyMMdd")).1 - - - - https://vsdrop.corp.microsoft.com/file/v1/Products/$(ManifestTeamProject)/$(ManifestRepositoryName)/$(ManifestBuildBranch)/$(ManifestBuildNumber); - - - - $(OutputPath)\obj\$(MSBuildProject) - - diff --git a/src/workloads/VSSetup.targets b/src/workloads/VSSetup.targets deleted file mode 100644 index 3aa470934..000000000 --- a/src/workloads/VSSetup.targets +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - Products/$(ManifestTeamProject)/$(ManifestRepositoryName)/$(ManifestBuildBranch)/$(ManifestBuildNumber) - - -n "$(DropName)" - -d "$(VSDropSource)" - - $(DropExe) Upgrade $(DropParamService) $(DropParamAuth) $(DropParamTimeout) $(DropParamTraceLevel) - $(DropExe) Create $(DropParamService) $(DropParamAuth) $(DropParamTimeout) $(DropParamTraceLevel) $(DropParamExpirationDate) $(DropParamName) - $(DropExe) Publish $(DropParamService) $(DropParamAuth) $(DropParamTimeout) $(DropParamTraceLevel) $(DropParamName) $(DropParamSource) - $(DropExe) Finalize $(DropParamService) $(DropParamAuth) $(DropParamTimeout) $(DropParamTraceLevel) $(DropParamName) - $(DropExe) Update $(DropParamService) $(DropParamAuth) $(DropParamTimeout) $(DropParamTraceLevel) $(DropParamName) --neverExpire - - - - - - - - - - - - - - - - diff --git a/src/workloads/readme.md b/src/workloads/readme.md deleted file mode 100644 index 6ef568558..000000000 --- a/src/workloads/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# Building -The workloads project can only be built using .NET Framework msbuild. To build locally, run ```build -project src\workloads\workloads.csproj -msbuildEngine vs``` diff --git a/src/workloads/workloads.csproj b/src/workloads/workloads.csproj deleted file mode 100644 index b471a8380..000000000 --- a/src/workloads/workloads.csproj +++ /dev/null @@ -1,195 +0,0 @@ - - - - - netcoreapp3.1 - net5.0 - net472 - $(NuGetPackageRoot)microsoft.dotnet.build.tasks.installers\$(MicrosoftDotNetBuildTasksInstallersPackageVersion)\tools\$(MicrosoftDotNetBuildTasksInstallersTaskTargetFramework)\Microsoft.DotNet.Build.Tasks.Installers.dll - - - - - - - - - $(CoreSdkTargetFramework) - false - false - - $(ArtifactsObjDir)workloads\ - $(ArtifactsBinDir)workloads\ - $(WorkloadIntermediateOutputPath)packages\ - - - $(WorkloadIntermediateOutputPath)src\gather\GatherPacks.csproj - - - - - - $(ArtifactsObjDir)/LightCommandPackages - - $(ArtifactsNonShippingPackagesDir) - - - - $(PkgWix)\tools - $(PkgMicroBuild_Plugins_SwixBuild) - $(SwixPluginPath)\build\MicroBuild.Plugins.SwixBuild.targets - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(VisualStudioSetupInsertionPath)$(SDKBundleVersion)\ - - - - - - Microsoft - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_WixObj Include="$(_WixObjDir)\**\*.wixobj" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(GitCommitCount.PadLeft(6,'0')) - - - $(_PatchNumber) - - $(GitCommitCount) - - - $(FileVersion) - - $(VersionPrefix).$(CombinedBuildNumberAndRevision) - - - From 00b58590771cb40a039a42f22d88756693444fdf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 27 May 2021 06:00:30 +0000 Subject: [PATCH 40/64] Update dependencies from https://github.com/dotnet/sdk build 20210526.21 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.100-preview.5.21276.16 -> To Version 6.0.100-preview.5.21276.21 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,XliffTasks From Version 6.0.0-preview.5.21275.7 -> To Version 6.0.0-preview.5.21276.11 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 28 +++++++++---------- 2 files changed, 44 insertions(+), 44 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index eb9b0423e..0ed0d747e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop 7f947e4d6e80516fa4e71456dae6eeb45103d69c - + https://github.com/dotnet/runtime - 5f5c3746b9b0500dffc762d06d16f189e2585078 + d4e422bd855261f641feb687fbb7fd4d337c1f36 - + https://github.com/dotnet/runtime - 5f5c3746b9b0500dffc762d06d16f189e2585078 + d4e422bd855261f641feb687fbb7fd4d337c1f36 - + https://github.com/dotnet/runtime - 5f5c3746b9b0500dffc762d06d16f189e2585078 + d4e422bd855261f641feb687fbb7fd4d337c1f36 - + https://github.com/dotnet/runtime - 5f5c3746b9b0500dffc762d06d16f189e2585078 + d4e422bd855261f641feb687fbb7fd4d337c1f36 - + https://github.com/dotnet/runtime - 5f5c3746b9b0500dffc762d06d16f189e2585078 + d4e422bd855261f641feb687fbb7fd4d337c1f36 @@ -39,33 +39,33 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 5f5c3746b9b0500dffc762d06d16f189e2585078 + d4e422bd855261f641feb687fbb7fd4d337c1f36 - + https://github.com/dotnet/aspnetcore - ed6785e32c7e75b9ad46baa537d049d199eaaa6d + c1bcd786d1e2242a21660a3a5824b356a32c0f54 - + https://github.com/dotnet/aspnetcore - ed6785e32c7e75b9ad46baa537d049d199eaaa6d + c1bcd786d1e2242a21660a3a5824b356a32c0f54 - + https://github.com/dotnet/aspnetcore - ed6785e32c7e75b9ad46baa537d049d199eaaa6d + c1bcd786d1e2242a21660a3a5824b356a32c0f54 - + https://github.com/dotnet/aspnetcore - ed6785e32c7e75b9ad46baa537d049d199eaaa6d + c1bcd786d1e2242a21660a3a5824b356a32c0f54 - + https://github.com/dotnet/aspnetcore - ed6785e32c7e75b9ad46baa537d049d199eaaa6d + c1bcd786d1e2242a21660a3a5824b356a32c0f54 - + https://github.com/dotnet/aspnetcore - ed6785e32c7e75b9ad46baa537d049d199eaaa6d + c1bcd786d1e2242a21660a3a5824b356a32c0f54 https://github.com/dotnet/test-templates @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 5d7718f5bbe6c681021f4c57986777421d9f0da4 - + https://github.com/dotnet/sdk - 0193108d0da7284882769861db6956f17e861b8c + 98e04b659b8fe5c10632818132ca8dad25135851 - + https://github.com/dotnet/sdk - 0193108d0da7284882769861db6956f17e861b8c + 98e04b659b8fe5c10632818132ca8dad25135851 @@ -153,9 +153,9 @@ https://github.com/dotnet/sourcelink 4b584dbc392bb1aad49c2eb1ab84d8b489b6dccc - + https://github.com/dotnet/xliff-tasks - f4bfde77fb60daf52d8fec738d96d1d54e37dd88 + ac8cf3454829acf944e4ccb22b97d5abe3cb15ae diff --git a/eng/Versions.props b/eng/Versions.props index 8cc3a6025..1050580b8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,35 +45,35 @@ - 6.0.0-preview.5.21276.1 - 6.0.0-preview.5.21276.1 - 6.0.0-preview.5.21276.1 - 6.0.0-preview.5.21276.1 - 6.0.0-preview.5.21276.1 - 6.0.0-preview.5.21276.1 + 6.0.0-preview.5.21276.6 + 6.0.0-preview.5.21276.6 + 6.0.0-preview.5.21276.6 + 6.0.0-preview.5.21276.6 + 6.0.0-preview.5.21276.6 + 6.0.0-preview.5.21276.6 0.2.0 - 6.0.100-preview.5.21276.16 - 6.0.100-preview.5.21276.16 + 6.0.100-preview.5.21276.21 + 6.0.100-preview.5.21276.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-preview.5.21275.7 + 6.0.0-preview.5.21276.11 - 6.0.0-preview.5.21275.7 - 6.0.0-preview.5.21275.7 - 6.0.0-preview.5.21275.7 - 6.0.0-preview.5.21275.7 - 6.0.0-preview.5.21275.7 + 6.0.0-preview.5.21276.11 + 6.0.0-preview.5.21276.11 + 6.0.0-preview.5.21276.11 + 6.0.0-preview.5.21276.11 + 6.0.0-preview.5.21276.11 2.1.0 From 72fb9b8259ea01117142421b0452fa2cbe6c453b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 27 May 2021 07:53:11 +0000 Subject: [PATCH 41/64] Update dependencies from https://github.com/dotnet/sdk build 20210527.2 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.100-preview.5.21276.16 -> To Version 6.0.100-preview.5.21277.2 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,XliffTasks From Version 6.0.0-preview.5.21275.7 -> To Version 6.0.0-preview.5.21276.11 (parent: Microsoft.NET.Sdk --- 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 0ed0d747e..b3629e3f0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime d4e422bd855261f641feb687fbb7fd4d337c1f36 - + https://github.com/dotnet/aspnetcore - c1bcd786d1e2242a21660a3a5824b356a32c0f54 + ff8d1cfd52fa6700088dd524181eb4c66c409476 - + https://github.com/dotnet/aspnetcore - c1bcd786d1e2242a21660a3a5824b356a32c0f54 + ff8d1cfd52fa6700088dd524181eb4c66c409476 - + https://github.com/dotnet/aspnetcore - c1bcd786d1e2242a21660a3a5824b356a32c0f54 + ff8d1cfd52fa6700088dd524181eb4c66c409476 - + https://github.com/dotnet/aspnetcore - c1bcd786d1e2242a21660a3a5824b356a32c0f54 + ff8d1cfd52fa6700088dd524181eb4c66c409476 - + https://github.com/dotnet/aspnetcore - c1bcd786d1e2242a21660a3a5824b356a32c0f54 + ff8d1cfd52fa6700088dd524181eb4c66c409476 - + https://github.com/dotnet/aspnetcore - c1bcd786d1e2242a21660a3a5824b356a32c0f54 + ff8d1cfd52fa6700088dd524181eb4c66c409476 https://github.com/dotnet/test-templates @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 5d7718f5bbe6c681021f4c57986777421d9f0da4 - + https://github.com/dotnet/sdk - 98e04b659b8fe5c10632818132ca8dad25135851 + e5333b546360e2ce5fe6b7243b7b409289fe4df3 - + https://github.com/dotnet/sdk - 98e04b659b8fe5c10632818132ca8dad25135851 + e5333b546360e2ce5fe6b7243b7b409289fe4df3 diff --git a/eng/Versions.props b/eng/Versions.props index 1050580b8..6acffe8d4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,20 +45,20 @@ - 6.0.0-preview.5.21276.6 - 6.0.0-preview.5.21276.6 - 6.0.0-preview.5.21276.6 - 6.0.0-preview.5.21276.6 - 6.0.0-preview.5.21276.6 - 6.0.0-preview.5.21276.6 + 6.0.0-preview.5.21276.10 + 6.0.0-preview.5.21276.10 + 6.0.0-preview.5.21276.10 + 6.0.0-preview.5.21276.10 + 6.0.0-preview.5.21276.10 + 6.0.0-preview.5.21276.10 0.2.0 - 6.0.100-preview.5.21276.21 - 6.0.100-preview.5.21276.21 + 6.0.100-preview.5.21277.2 + 6.0.100-preview.5.21277.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e6f387c54b241b9828c84064ac657a3982715761 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 27 May 2021 08:55:31 +0000 Subject: [PATCH 42/64] Update dependencies from https://github.com/dotnet/sdk build 20210527.3 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.100-preview.5.21276.16 -> To Version 6.0.100-preview.5.21277.3 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,XliffTasks From Version 6.0.0-preview.5.21275.7 -> To Version 6.0.0-preview.5.21276.8 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b3629e3f0..fc8a01218 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - 7f947e4d6e80516fa4e71456dae6eeb45103d69c + 2ffb300c1ab1e782483041ebfb2681101963e283 - + https://github.com/dotnet/windowsdesktop - 7f947e4d6e80516fa4e71456dae6eeb45103d69c + 2ffb300c1ab1e782483041ebfb2681101963e283 - + https://github.com/dotnet/windowsdesktop - 7f947e4d6e80516fa4e71456dae6eeb45103d69c + 2ffb300c1ab1e782483041ebfb2681101963e283 https://github.com/dotnet/runtime @@ -83,22 +83,22 @@ https://github.com/dotnet/templating 5d7718f5bbe6c681021f4c57986777421d9f0da4 - + https://github.com/dotnet/sdk - e5333b546360e2ce5fe6b7243b7b409289fe4df3 + 9a652b609abffe8620c131ed28981d46fdb4fb9d - + https://github.com/dotnet/sdk - e5333b546360e2ce5fe6b7243b7b409289fe4df3 + 9a652b609abffe8620c131ed28981d46fdb4fb9d - + https://github.com/dotnet/winforms - c1f09715e3fdebeb3c14bc95908e1657d12f42e4 + 00f73a6caa1c3474e8287c8baa0dc62d9063d40e - + https://github.com/dotnet/wpf - 33a7c82828428849690f7a8a93c623d547c23dda + 9b43ebb30eb85ee1cd7ea0383a18135ad50d3d30 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 6acffe8d4..b757f5351 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,11 +24,11 @@ - 6.0.0-preview.5.21275.6 + 6.0.0-preview.5.21276.4 - 6.0.0-preview.5.21275.7 + 6.0.0-preview.5.21276.7 @@ -57,8 +57,8 @@ - 6.0.100-preview.5.21277.2 - 6.0.100-preview.5.21277.2 + 6.0.100-preview.5.21277.3 + 6.0.100-preview.5.21277.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,9 +78,9 @@ - 6.0.0-preview.5.21275.7 - 6.0.0-preview.5.21275.7 - 6.0.0-preview.5.21275.7 + 6.0.0-preview.5.21276.8 + 6.0.0-preview.5.21276.8 + 6.0.0-preview.5.21276.8 From 54319c07593636a5ff36562940e856c6b86648a0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 27 May 2021 13:05:15 +0000 Subject: [PATCH 43/64] Update dependencies from https://github.com/dotnet/sdk build 20210527.5 (#10784) [release/6.0.1xx-preview5] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.5.21276.10 to 6.0.0-preview.5.21277.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.5.21276.10 to 6.0.0-preview.5.21277.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.5.21276.10 to 6.0.0-preview.5.21277.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21276.10 to 6.0.0-preview.5.21277.1 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-preview.5.21276.10 to 6.0.0-preview.5.21277.1 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-preview.5.21276.10 to 6.0.0-preview.5.21277.1 (parent: Microsoft.NET.Sdk) --- 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 fc8a01218..daae676f1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime d4e422bd855261f641feb687fbb7fd4d337c1f36 - + https://github.com/dotnet/aspnetcore - ff8d1cfd52fa6700088dd524181eb4c66c409476 + 5205221675185af160bc01b9e3acccdde2de6f33 - + https://github.com/dotnet/aspnetcore - ff8d1cfd52fa6700088dd524181eb4c66c409476 + 5205221675185af160bc01b9e3acccdde2de6f33 - + https://github.com/dotnet/aspnetcore - ff8d1cfd52fa6700088dd524181eb4c66c409476 + 5205221675185af160bc01b9e3acccdde2de6f33 - + https://github.com/dotnet/aspnetcore - ff8d1cfd52fa6700088dd524181eb4c66c409476 + 5205221675185af160bc01b9e3acccdde2de6f33 - + https://github.com/dotnet/aspnetcore - ff8d1cfd52fa6700088dd524181eb4c66c409476 + 5205221675185af160bc01b9e3acccdde2de6f33 - + https://github.com/dotnet/aspnetcore - ff8d1cfd52fa6700088dd524181eb4c66c409476 + 5205221675185af160bc01b9e3acccdde2de6f33 https://github.com/dotnet/test-templates @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 5d7718f5bbe6c681021f4c57986777421d9f0da4 - + https://github.com/dotnet/sdk - 9a652b609abffe8620c131ed28981d46fdb4fb9d + c2b78aae4d9aa928c5c3c3084099aea25c5973d6 - + https://github.com/dotnet/sdk - 9a652b609abffe8620c131ed28981d46fdb4fb9d + c2b78aae4d9aa928c5c3c3084099aea25c5973d6 diff --git a/eng/Versions.props b/eng/Versions.props index b757f5351..5e13bf4af 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,20 +45,20 @@ - 6.0.0-preview.5.21276.10 - 6.0.0-preview.5.21276.10 - 6.0.0-preview.5.21276.10 - 6.0.0-preview.5.21276.10 - 6.0.0-preview.5.21276.10 - 6.0.0-preview.5.21276.10 + 6.0.0-preview.5.21277.1 + 6.0.0-preview.5.21277.1 + 6.0.0-preview.5.21277.1 + 6.0.0-preview.5.21277.1 + 6.0.0-preview.5.21277.1 + 6.0.0-preview.5.21277.1 0.2.0 - 6.0.100-preview.5.21277.3 - 6.0.100-preview.5.21277.3 + 6.0.100-preview.5.21277.5 + 6.0.100-preview.5.21277.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ef4abb849d152a7bcd12690e396e1454742b5d24 Mon Sep 17 00:00:00 2001 From: Sarah Oslund Date: Thu, 27 May 2021 09:04:12 -0700 Subject: [PATCH 44/64] Make baseline manifests lowercase --- src/redist/targets/BundledManifests.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/redist/targets/BundledManifests.targets b/src/redist/targets/BundledManifests.targets index 83bd6bd66..e84c67f2d 100644 --- a/src/redist/targets/BundledManifests.targets +++ b/src/redist/targets/BundledManifests.targets @@ -68,11 +68,11 @@ + DestinationPath="$([MSBuild]::ValueOrDefault('%(WorkloadManifestId)', '').ToLower())/"/> + DestinationPath="$([MSBuild]::ValueOrDefault('%(BundledManifests.WorkloadManifestId)', '').ToLower())/"/> From 65b1539d9dbabb5b32b3ead837d3c6366aedddcc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 27 May 2021 23:45:12 +0000 Subject: [PATCH 45/64] [release/6.0.1xx-preview5] Update dependencies from dotnet/sdk (#10791) [release/6.0.1xx-preview5] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index daae676f1..10e103869 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 5d7718f5bbe6c681021f4c57986777421d9f0da4 - + https://github.com/dotnet/sdk - c2b78aae4d9aa928c5c3c3084099aea25c5973d6 + 428eb393772bf85b28e10cb9884426a9857f6695 - + https://github.com/dotnet/sdk - c2b78aae4d9aa928c5c3c3084099aea25c5973d6 + 428eb393772bf85b28e10cb9884426a9857f6695 diff --git a/eng/Versions.props b/eng/Versions.props index 5e13bf4af..ec185348b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-preview.5.21277.5 - 6.0.100-preview.5.21277.5 + 6.0.100-preview.5.21277.18 + 6.0.100-preview.5.21277.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f2df56cdc2000bf6c9685d903eddb44cbf545810 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 May 2021 01:15:26 +0000 Subject: [PATCH 46/64] Update dependencies from https://github.com/dotnet/sdk build 20210527.19 (#10793) [release/6.0.1xx-preview5] Update dependencies from dotnet/sdk - Coherency Updates: - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21276.11 to 6.0.0-preview.5.21277.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 6.0.0-preview.5.21276.11 to 6.0.0-preview.5.21277.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-preview.5.21276.11 to 6.0.0-preview.5.21277.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-preview.5.21276.11 to 6.0.0-preview.5.21277.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-preview.5.21276.11 to 6.0.0-preview.5.21277.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 6.0.0-preview.5.21276.11 to 6.0.0-preview.5.21277.4 (parent: Microsoft.NET.Sdk) --- 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 10e103869..65d0b6b81 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop 2ffb300c1ab1e782483041ebfb2681101963e283 - + https://github.com/dotnet/runtime - d4e422bd855261f641feb687fbb7fd4d337c1f36 + d73fb996ce229224bccde20c9978780517e46f92 - + https://github.com/dotnet/runtime - d4e422bd855261f641feb687fbb7fd4d337c1f36 + d73fb996ce229224bccde20c9978780517e46f92 - + https://github.com/dotnet/runtime - d4e422bd855261f641feb687fbb7fd4d337c1f36 + d73fb996ce229224bccde20c9978780517e46f92 - + https://github.com/dotnet/runtime - d4e422bd855261f641feb687fbb7fd4d337c1f36 + d73fb996ce229224bccde20c9978780517e46f92 - + https://github.com/dotnet/runtime - d4e422bd855261f641feb687fbb7fd4d337c1f36 + d73fb996ce229224bccde20c9978780517e46f92 @@ -39,9 +39,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - d4e422bd855261f641feb687fbb7fd4d337c1f36 + d73fb996ce229224bccde20c9978780517e46f92 https://github.com/dotnet/aspnetcore @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 5d7718f5bbe6c681021f4c57986777421d9f0da4 - + https://github.com/dotnet/sdk - 428eb393772bf85b28e10cb9884426a9857f6695 + aeda99ca2c4518d83b7b2ae7508513abdebbe6f6 - + https://github.com/dotnet/sdk - 428eb393772bf85b28e10cb9884426a9857f6695 + aeda99ca2c4518d83b7b2ae7508513abdebbe6f6 diff --git a/eng/Versions.props b/eng/Versions.props index ec185348b..bb3d22df0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,23 +57,23 @@ - 6.0.100-preview.5.21277.18 - 6.0.100-preview.5.21277.18 + 6.0.100-preview.5.21277.19 + 6.0.100-preview.5.21277.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-preview.5.21276.11 + 6.0.0-preview.5.21277.4 - 6.0.0-preview.5.21276.11 - 6.0.0-preview.5.21276.11 - 6.0.0-preview.5.21276.11 - 6.0.0-preview.5.21276.11 - 6.0.0-preview.5.21276.11 + 6.0.0-preview.5.21277.4 + 6.0.0-preview.5.21277.4 + 6.0.0-preview.5.21277.4 + 6.0.0-preview.5.21277.4 + 6.0.0-preview.5.21277.4 2.1.0 From 9a6cbaac3f78275e638b0362bcb93b47f4f56357 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 May 2021 04:48:46 +0000 Subject: [PATCH 47/64] [release/6.0.1xx-preview5] Update dependencies from dotnet/sdk (#10794) [release/6.0.1xx-preview5] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 4.0.0-1.21275.5 to 4.0.0-1.21277.15 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.0.0-preview-21274-08 to 17.0.0-preview-21278-01 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 65d0b6b81..d22f46e25 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 5d7718f5bbe6c681021f4c57986777421d9f0da4 - + https://github.com/dotnet/sdk - aeda99ca2c4518d83b7b2ae7508513abdebbe6f6 + 6a77807c879d3b05626168cdb260da4049cd42e6 - + https://github.com/dotnet/sdk - aeda99ca2c4518d83b7b2ae7508513abdebbe6f6 + 6a77807c879d3b05626168cdb260da4049cd42e6 @@ -113,13 +113,13 @@ 7a5c445a69359415b7ff18b91cd24472ef9509ff linker - + https://github.com/dotnet/roslyn - 0eef599ce205182bd6925eb9bdb83359249caa4e + 0adf94c625f834f1c89d11700621302b658a50ea - + https://github.com/dotnet/msbuild - 9d419252d876a6f30366c3ce22ec7249391c1f02 + c8d4b38e7a913601c8e13e39b614462383afb65d https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index bb3d22df0..318e6633b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-preview.5.21277.19 - 6.0.100-preview.5.21277.19 + 6.0.100-preview.5.21277.23 + 6.0.100-preview.5.21277.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9560effe318b9323f3a58f21610160b6f7eb15fd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 May 2021 09:45:00 +0000 Subject: [PATCH 48/64] Update dependencies from https://github.com/dotnet/sdk build 20210528.1 (#10796) [release/6.0.1xx-preview5] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Build: from 17.0.0-preview-21278-01 to 17.0.0-preview-21278-03 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d22f46e25..967b3a3a2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 5d7718f5bbe6c681021f4c57986777421d9f0da4 - + https://github.com/dotnet/sdk - 6a77807c879d3b05626168cdb260da4049cd42e6 + 2debb638be121addc9c070a4fd15f47358e10526 - + https://github.com/dotnet/sdk - 6a77807c879d3b05626168cdb260da4049cd42e6 + 2debb638be121addc9c070a4fd15f47358e10526 @@ -117,9 +117,9 @@ https://github.com/dotnet/roslyn 0adf94c625f834f1c89d11700621302b658a50ea - + https://github.com/dotnet/msbuild - c8d4b38e7a913601c8e13e39b614462383afb65d + 2af95547e57fa1c50ae27c8f3ae8c5531e5a0430 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 318e6633b..00966e207 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-preview.5.21277.23 - 6.0.100-preview.5.21277.23 + 6.0.100-preview.5.21278.1 + 6.0.100-preview.5.21278.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2c4f7ed0affbdb252ea9fe52c2bf65b129ca8654 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 May 2021 11:26:13 +0000 Subject: [PATCH 49/64] [release/6.0.1xx-preview5] Update dependencies from dotnet/sdk (#10797) [release/6.0.1xx-preview5] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.5.21277.1 to 6.0.0-preview.5.21277.4 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.5.21277.1 to 6.0.0-preview.5.21277.4 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.5.21277.1 to 6.0.0-preview.5.21277.4 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21277.1 to 6.0.0-preview.5.21277.4 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-preview.5.21277.1 to 6.0.0-preview.5.21277.4 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-preview.5.21277.1 to 6.0.0-preview.5.21277.4 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.0.0-preview-21278-03 to 17.0.0-preview-21278-06 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 967b3a3a2..088482f64 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime d73fb996ce229224bccde20c9978780517e46f92 - + https://github.com/dotnet/aspnetcore - 5205221675185af160bc01b9e3acccdde2de6f33 + 3885ed1695205ef6af918245e632ad6bd3b1dcb0 - + https://github.com/dotnet/aspnetcore - 5205221675185af160bc01b9e3acccdde2de6f33 + 3885ed1695205ef6af918245e632ad6bd3b1dcb0 - + https://github.com/dotnet/aspnetcore - 5205221675185af160bc01b9e3acccdde2de6f33 + 3885ed1695205ef6af918245e632ad6bd3b1dcb0 - + https://github.com/dotnet/aspnetcore - 5205221675185af160bc01b9e3acccdde2de6f33 + 3885ed1695205ef6af918245e632ad6bd3b1dcb0 - + https://github.com/dotnet/aspnetcore - 5205221675185af160bc01b9e3acccdde2de6f33 + 3885ed1695205ef6af918245e632ad6bd3b1dcb0 - + https://github.com/dotnet/aspnetcore - 5205221675185af160bc01b9e3acccdde2de6f33 + 3885ed1695205ef6af918245e632ad6bd3b1dcb0 https://github.com/dotnet/test-templates @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 5d7718f5bbe6c681021f4c57986777421d9f0da4 - + https://github.com/dotnet/sdk - 2debb638be121addc9c070a4fd15f47358e10526 + 327c1cf4a3f08dcc52ae285c8148bb95b91c6780 - + https://github.com/dotnet/sdk - 2debb638be121addc9c070a4fd15f47358e10526 + 327c1cf4a3f08dcc52ae285c8148bb95b91c6780 @@ -117,9 +117,9 @@ https://github.com/dotnet/roslyn 0adf94c625f834f1c89d11700621302b658a50ea - + https://github.com/dotnet/msbuild - 2af95547e57fa1c50ae27c8f3ae8c5531e5a0430 + ec2363803095b15166e3210ae7441a724b4b0c43 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 00966e207..2b3af95ec 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,20 +45,20 @@ - 6.0.0-preview.5.21277.1 - 6.0.0-preview.5.21277.1 - 6.0.0-preview.5.21277.1 - 6.0.0-preview.5.21277.1 - 6.0.0-preview.5.21277.1 - 6.0.0-preview.5.21277.1 + 6.0.0-preview.5.21277.4 + 6.0.0-preview.5.21277.4 + 6.0.0-preview.5.21277.4 + 6.0.0-preview.5.21277.4 + 6.0.0-preview.5.21277.4 + 6.0.0-preview.5.21277.4 0.2.0 - 6.0.100-preview.5.21278.1 - 6.0.100-preview.5.21278.1 + 6.0.100-preview.5.21278.4 + 6.0.100-preview.5.21278.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4a0d6ea0663cbacf44a1d5d4597027ec6d15686f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 May 2021 20:34:22 +0000 Subject: [PATCH 50/64] Update dependencies from https://github.com/dotnet/sdk build 20210528.8 (#10802) [release/6.0.1xx-preview5] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-preview.5.21276.8 to 6.0.0-preview.5.21277.5 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-preview.5.21276.8 to 6.0.0-preview.5.21277.5 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.5.21276.8 to 6.0.0-preview.5.21277.5 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-preview.5.21276.4 to 6.0.0-preview.5.21277.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.5.21276.8 to 6.0.0-preview.5.21277.5 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-preview.5.21276.7 to 6.0.0-preview.5.21277.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 088482f64..ce8680042 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - 2ffb300c1ab1e782483041ebfb2681101963e283 + 5b471be13f980ffef8353943b0d48f94346eb1a2 - + https://github.com/dotnet/windowsdesktop - 2ffb300c1ab1e782483041ebfb2681101963e283 + 5b471be13f980ffef8353943b0d48f94346eb1a2 - + https://github.com/dotnet/windowsdesktop - 2ffb300c1ab1e782483041ebfb2681101963e283 + 5b471be13f980ffef8353943b0d48f94346eb1a2 https://github.com/dotnet/runtime @@ -83,22 +83,22 @@ https://github.com/dotnet/templating 5d7718f5bbe6c681021f4c57986777421d9f0da4 - + https://github.com/dotnet/sdk - 327c1cf4a3f08dcc52ae285c8148bb95b91c6780 + dcbbe381ee18e10479ec2b48fa2ee731105fbd68 - + https://github.com/dotnet/sdk - 327c1cf4a3f08dcc52ae285c8148bb95b91c6780 + dcbbe381ee18e10479ec2b48fa2ee731105fbd68 - + https://github.com/dotnet/winforms - 00f73a6caa1c3474e8287c8baa0dc62d9063d40e + 2e426a482be09a8204ef421cc70e4a698a8f797f - + https://github.com/dotnet/wpf - 9b43ebb30eb85ee1cd7ea0383a18135ad50d3d30 + e9ac5bd8b42413e14b6c02a8d114c15857d789e0 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 2b3af95ec..2e500914d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,11 +24,11 @@ - 6.0.0-preview.5.21276.4 + 6.0.0-preview.5.21277.4 - 6.0.0-preview.5.21276.7 + 6.0.0-preview.5.21277.4 @@ -57,8 +57,8 @@ - 6.0.100-preview.5.21278.4 - 6.0.100-preview.5.21278.4 + 6.0.100-preview.5.21278.8 + 6.0.100-preview.5.21278.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,9 +78,9 @@ - 6.0.0-preview.5.21276.8 - 6.0.0-preview.5.21276.8 - 6.0.0-preview.5.21276.8 + 6.0.0-preview.5.21277.5 + 6.0.0-preview.5.21277.5 + 6.0.0-preview.5.21277.5 From 1961425fbd08d8731b9c9ae165dd418b279a8da5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 May 2021 22:30:51 +0000 Subject: [PATCH 51/64] Update dependencies from https://github.com/dotnet/sdk build 20210528.10 (#10803) [release/6.0.1xx-preview5] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.ILLink.Tasks: from 6.0.100-preview.5.21264.1 to 6.0.100-preview.5.21278.1 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ce8680042..5918be16f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 5d7718f5bbe6c681021f4c57986777421d9f0da4 - + https://github.com/dotnet/sdk - dcbbe381ee18e10479ec2b48fa2ee731105fbd68 + ce5177d10063f662e23c887c800e50b7a81bcc38 - + https://github.com/dotnet/sdk - dcbbe381ee18e10479ec2b48fa2ee731105fbd68 + ce5177d10063f662e23c887c800e50b7a81bcc38 @@ -108,9 +108,9 @@ https://github.com/microsoft/vstest 23f1488126d3962a3c6125a0bcfb3c79d0553a69 - + https://github.com/mono/linker - 7a5c445a69359415b7ff18b91cd24472ef9509ff + dd761f75c38eca0bae79597436320510ffc80702 linker diff --git a/eng/Versions.props b/eng/Versions.props index 2e500914d..233ec29ea 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-preview.5.21278.8 - 6.0.100-preview.5.21278.8 + 6.0.100-preview.5.21278.10 + 6.0.100-preview.5.21278.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e4f4a7c4a69998ff53f83f29aa1cf0d11d9f096a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 May 2021 23:10:36 +0000 Subject: [PATCH 52/64] Update dependencies from https://github.com/dotnet/sdk build 20210528.12 (#10805) [release/6.0.1xx-preview5] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.5.21277.4 to 6.0.0-preview.5.21278.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.5.21277.4 to 6.0.0-preview.5.21278.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.5.21277.4 to 6.0.0-preview.5.21278.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21277.4 to 6.0.0-preview.5.21278.1 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-preview.5.21277.4 to 6.0.0-preview.5.21278.1 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-preview.5.21277.4 to 6.0.0-preview.5.21278.1 (parent: Microsoft.NET.Sdk) --- 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 5918be16f..bdf01ad8e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime d73fb996ce229224bccde20c9978780517e46f92 - + https://github.com/dotnet/aspnetcore - 3885ed1695205ef6af918245e632ad6bd3b1dcb0 + 0b83c46100eb388af770b00a136c01e8da140661 - + https://github.com/dotnet/aspnetcore - 3885ed1695205ef6af918245e632ad6bd3b1dcb0 + 0b83c46100eb388af770b00a136c01e8da140661 - + https://github.com/dotnet/aspnetcore - 3885ed1695205ef6af918245e632ad6bd3b1dcb0 + 0b83c46100eb388af770b00a136c01e8da140661 - + https://github.com/dotnet/aspnetcore - 3885ed1695205ef6af918245e632ad6bd3b1dcb0 + 0b83c46100eb388af770b00a136c01e8da140661 - + https://github.com/dotnet/aspnetcore - 3885ed1695205ef6af918245e632ad6bd3b1dcb0 + 0b83c46100eb388af770b00a136c01e8da140661 - + https://github.com/dotnet/aspnetcore - 3885ed1695205ef6af918245e632ad6bd3b1dcb0 + 0b83c46100eb388af770b00a136c01e8da140661 https://github.com/dotnet/test-templates @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 5d7718f5bbe6c681021f4c57986777421d9f0da4 - + https://github.com/dotnet/sdk - ce5177d10063f662e23c887c800e50b7a81bcc38 + ea0af2ff7aa36495918e2ad88a61926eeee2ae86 - + https://github.com/dotnet/sdk - ce5177d10063f662e23c887c800e50b7a81bcc38 + ea0af2ff7aa36495918e2ad88a61926eeee2ae86 diff --git a/eng/Versions.props b/eng/Versions.props index 233ec29ea..3f4a612a1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,20 +45,20 @@ - 6.0.0-preview.5.21277.4 - 6.0.0-preview.5.21277.4 - 6.0.0-preview.5.21277.4 - 6.0.0-preview.5.21277.4 - 6.0.0-preview.5.21277.4 - 6.0.0-preview.5.21277.4 + 6.0.0-preview.5.21278.1 + 6.0.0-preview.5.21278.1 + 6.0.0-preview.5.21278.1 + 6.0.0-preview.5.21278.1 + 6.0.0-preview.5.21278.1 + 6.0.0-preview.5.21278.1 0.2.0 - 6.0.100-preview.5.21278.10 - 6.0.100-preview.5.21278.10 + 6.0.100-preview.5.21278.12 + 6.0.100-preview.5.21278.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b60a2ac53ec7f352b49939defc295bbaa7977058 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 May 2021 23:51:14 +0000 Subject: [PATCH 53/64] Update dependencies from https://github.com/dotnet/sdk build 20210528.13 (#10806) [release/6.0.1xx-preview5] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Build: from 17.0.0-preview-21278-06 to 17.0.0-preview-21278-07 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bdf01ad8e..9bfda629b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 5d7718f5bbe6c681021f4c57986777421d9f0da4 - + https://github.com/dotnet/sdk - ea0af2ff7aa36495918e2ad88a61926eeee2ae86 + eb6a7ff89f6b4a4e79ab87dc59200fc5511c045f - + https://github.com/dotnet/sdk - ea0af2ff7aa36495918e2ad88a61926eeee2ae86 + eb6a7ff89f6b4a4e79ab87dc59200fc5511c045f @@ -117,9 +117,9 @@ https://github.com/dotnet/roslyn 0adf94c625f834f1c89d11700621302b658a50ea - + https://github.com/dotnet/msbuild - ec2363803095b15166e3210ae7441a724b4b0c43 + 8861fa05a4dade04d5277f87181e69fb81dea868 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 3f4a612a1..cd3dd8ea3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-preview.5.21278.12 - 6.0.100-preview.5.21278.12 + 6.0.100-preview.5.21278.13 + 6.0.100-preview.5.21278.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 211afe241eb387eb2fd787cf31efd0447182f60d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 29 May 2021 01:24:14 +0000 Subject: [PATCH 54/64] [release/6.0.1xx-preview5] Update dependencies from dotnet/sdk (#10807) [release/6.0.1xx-preview5] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.5.21278.1 to 6.0.0-preview.5.21278.2 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.5.21278.1 to 6.0.0-preview.5.21278.2 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.5.21278.1 to 6.0.0-preview.5.21278.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21278.1 to 6.0.0-preview.5.21278.2 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-preview.5.21278.1 to 6.0.0-preview.5.21278.2 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-preview.5.21278.1 to 6.0.0-preview.5.21278.2 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.0.0-preview-21278-07 to 17.0.0-preview-21278-08 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9bfda629b..4bd257a9d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime d73fb996ce229224bccde20c9978780517e46f92 - + https://github.com/dotnet/aspnetcore - 0b83c46100eb388af770b00a136c01e8da140661 + 1fb8cc40fbea9c61b659a4937080a2e13ccecf66 - + https://github.com/dotnet/aspnetcore - 0b83c46100eb388af770b00a136c01e8da140661 + 1fb8cc40fbea9c61b659a4937080a2e13ccecf66 - + https://github.com/dotnet/aspnetcore - 0b83c46100eb388af770b00a136c01e8da140661 + 1fb8cc40fbea9c61b659a4937080a2e13ccecf66 - + https://github.com/dotnet/aspnetcore - 0b83c46100eb388af770b00a136c01e8da140661 + 1fb8cc40fbea9c61b659a4937080a2e13ccecf66 - + https://github.com/dotnet/aspnetcore - 0b83c46100eb388af770b00a136c01e8da140661 + 1fb8cc40fbea9c61b659a4937080a2e13ccecf66 - + https://github.com/dotnet/aspnetcore - 0b83c46100eb388af770b00a136c01e8da140661 + 1fb8cc40fbea9c61b659a4937080a2e13ccecf66 https://github.com/dotnet/test-templates @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 5d7718f5bbe6c681021f4c57986777421d9f0da4 - + https://github.com/dotnet/sdk - eb6a7ff89f6b4a4e79ab87dc59200fc5511c045f + bf366614c64e4dbc42e8b1ddaf6e88597fa6a1fb - + https://github.com/dotnet/sdk - eb6a7ff89f6b4a4e79ab87dc59200fc5511c045f + bf366614c64e4dbc42e8b1ddaf6e88597fa6a1fb @@ -117,9 +117,9 @@ https://github.com/dotnet/roslyn 0adf94c625f834f1c89d11700621302b658a50ea - + https://github.com/dotnet/msbuild - 8861fa05a4dade04d5277f87181e69fb81dea868 + ffa1a002981a0dd4925d7aa210c08bfbbde091cd https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index cd3dd8ea3..a05bbb1f6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,20 +45,20 @@ - 6.0.0-preview.5.21278.1 - 6.0.0-preview.5.21278.1 - 6.0.0-preview.5.21278.1 - 6.0.0-preview.5.21278.1 - 6.0.0-preview.5.21278.1 - 6.0.0-preview.5.21278.1 + 6.0.0-preview.5.21278.2 + 6.0.0-preview.5.21278.2 + 6.0.0-preview.5.21278.2 + 6.0.0-preview.5.21278.2 + 6.0.0-preview.5.21278.2 + 6.0.0-preview.5.21278.2 0.2.0 - 6.0.100-preview.5.21278.13 - 6.0.100-preview.5.21278.13 + 6.0.100-preview.5.21278.16 + 6.0.100-preview.5.21278.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b04fda9e21ab2dc967dd69648044c49568133d54 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 29 May 2021 02:50:10 +0000 Subject: [PATCH 55/64] Update dependencies from https://github.com/dotnet/sdk build 20210528.17 (#10808) [release/6.0.1xx-preview5] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 12.0.0-beta.21275.2 to 12.0.0-beta.21278.1 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4bd257a9d..83a7bac1d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 5d7718f5bbe6c681021f4c57986777421d9f0da4 - + https://github.com/dotnet/sdk - bf366614c64e4dbc42e8b1ddaf6e88597fa6a1fb + d5911413d80b0bb28eddef909bfb497e8525cc1e - + https://github.com/dotnet/sdk - bf366614c64e4dbc42e8b1ddaf6e88597fa6a1fb + d5911413d80b0bb28eddef909bfb497e8525cc1e @@ -100,9 +100,9 @@ https://github.com/dotnet/wpf e9ac5bd8b42413e14b6c02a8d114c15857d789e0 - + https://github.com/dotnet/fsharp - 78c22aa4d14aa4628b3fc18cac7e7758e600b0db + 6c1809559b48eece9bf5b5c78624b834e329141b https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index a05bbb1f6..1bb872db1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-preview.5.21278.16 - 6.0.100-preview.5.21278.16 + 6.0.100-preview.5.21278.17 + 6.0.100-preview.5.21278.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 33c32a6370062dd94e0d0d2219409d0873250afa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 29 May 2021 08:01:22 +0000 Subject: [PATCH 56/64] [release/6.0.1xx-preview5] Update dependencies from dotnet/sdk (#10809) [release/6.0.1xx-preview5] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.5.21278.2 to 6.0.0-preview.5.21278.3 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.5.21278.2 to 6.0.0-preview.5.21278.3 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.5.21278.2 to 6.0.0-preview.5.21278.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21278.2 to 6.0.0-preview.5.21278.3 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-preview.5.21278.2 to 6.0.0-preview.5.21278.3 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-preview.5.21278.2 to 6.0.0-preview.5.21278.3 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.0.0-preview-21278-08 to 17.0.0-preview-21279-01 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 83a7bac1d..a547fe247 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime d73fb996ce229224bccde20c9978780517e46f92 - + https://github.com/dotnet/aspnetcore - 1fb8cc40fbea9c61b659a4937080a2e13ccecf66 + b2220094859b74361ef838247da01726227d4ffb - + https://github.com/dotnet/aspnetcore - 1fb8cc40fbea9c61b659a4937080a2e13ccecf66 + b2220094859b74361ef838247da01726227d4ffb - + https://github.com/dotnet/aspnetcore - 1fb8cc40fbea9c61b659a4937080a2e13ccecf66 + b2220094859b74361ef838247da01726227d4ffb - + https://github.com/dotnet/aspnetcore - 1fb8cc40fbea9c61b659a4937080a2e13ccecf66 + b2220094859b74361ef838247da01726227d4ffb - + https://github.com/dotnet/aspnetcore - 1fb8cc40fbea9c61b659a4937080a2e13ccecf66 + b2220094859b74361ef838247da01726227d4ffb - + https://github.com/dotnet/aspnetcore - 1fb8cc40fbea9c61b659a4937080a2e13ccecf66 + b2220094859b74361ef838247da01726227d4ffb https://github.com/dotnet/test-templates @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 5d7718f5bbe6c681021f4c57986777421d9f0da4 - + https://github.com/dotnet/sdk - d5911413d80b0bb28eddef909bfb497e8525cc1e + 14e430d76c787aaa8e9b6c74aeb512277518140d - + https://github.com/dotnet/sdk - d5911413d80b0bb28eddef909bfb497e8525cc1e + 14e430d76c787aaa8e9b6c74aeb512277518140d @@ -117,9 +117,9 @@ https://github.com/dotnet/roslyn 0adf94c625f834f1c89d11700621302b658a50ea - + https://github.com/dotnet/msbuild - ffa1a002981a0dd4925d7aa210c08bfbbde091cd + 4f30e789b578397717f36475f78610a5b68f6d60 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 1bb872db1..18962b32c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,20 +45,20 @@ - 6.0.0-preview.5.21278.2 - 6.0.0-preview.5.21278.2 - 6.0.0-preview.5.21278.2 - 6.0.0-preview.5.21278.2 - 6.0.0-preview.5.21278.2 - 6.0.0-preview.5.21278.2 + 6.0.0-preview.5.21278.3 + 6.0.0-preview.5.21278.3 + 6.0.0-preview.5.21278.3 + 6.0.0-preview.5.21278.3 + 6.0.0-preview.5.21278.3 + 6.0.0-preview.5.21278.3 0.2.0 - 6.0.100-preview.5.21278.17 - 6.0.100-preview.5.21278.17 + 6.0.100-preview.5.21278.19 + 6.0.100-preview.5.21278.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9d031945a8545b9a6b1676fc0e9d7dc8966364fb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 29 May 2021 08:52:41 +0000 Subject: [PATCH 57/64] Update dependencies from https://github.com/dotnet/sdk build 20210529.1 (#10810) [release/6.0.1xx-preview5] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Build: from 17.0.0-preview-21279-01 to 17.0.0-preview-21279-04 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a547fe247..1f3ab11c7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 5d7718f5bbe6c681021f4c57986777421d9f0da4 - + https://github.com/dotnet/sdk - 14e430d76c787aaa8e9b6c74aeb512277518140d + 11faa22bcbd682f6b51af83c050449de9264ea09 - + https://github.com/dotnet/sdk - 14e430d76c787aaa8e9b6c74aeb512277518140d + 11faa22bcbd682f6b51af83c050449de9264ea09 @@ -117,9 +117,9 @@ https://github.com/dotnet/roslyn 0adf94c625f834f1c89d11700621302b658a50ea - + https://github.com/dotnet/msbuild - 4f30e789b578397717f36475f78610a5b68f6d60 + ea93ae1f32d647aff9d4ca0e0d4712b83e95cf10 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 18962b32c..da684215b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-preview.5.21278.19 - 6.0.100-preview.5.21278.19 + 6.0.100-preview.5.21279.1 + 6.0.100-preview.5.21279.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2ca61921ed73bdb7a57f59a66e0f6b9f4adfa1f7 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Sun, 30 May 2021 08:06:01 -0500 Subject: [PATCH 58/64] Update .NET 6 Preview 5 Xamarin workload manifests (#10799) * Bump to xamarin/xamarin-android/release/6.0.1xx-preview5@198eeff * Bump to xamarin/xamarin-macios/release/6.0.1xx-preview5@be26b02 Since we have the packages named appropriately with `.Manifest-6.0.100`, I don't think we will need to bump this again for Preview 5: > dotnet workload install microsoft-android-sdk-full Updated advertising manifest microsoft.net.sdk.android. Updated advertising manifest microsoft.net.sdk.ios. Updated advertising manifest microsoft.net.sdk.maccatalyst. Updated advertising manifest microsoft.net.sdk.macos. Updated advertising manifest microsoft.net.sdk.tvos. --- eng/Versions.props | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index da684215b..f71a5f529 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -153,11 +153,11 @@ - 11.0.200-ci.main.256 - 14.5.100-ci.main.723 - 14.5.100-ci.main.723 - 11.3.100-ci.main.723 - 14.5.100-ci.main.723 + 30.0.100-preview.5.18 + 14.5.100-preview.5.881 + 14.5.100-preview.5.881 + 11.3.100-preview.5.881 + 14.5.100-preview.5.881 $(MicrosoftNETCoreAppRefPackageVersion) From 407ae848361c6f38e422bd73828ef2f2f257329d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 31 May 2021 04:35:56 +0000 Subject: [PATCH 59/64] Update dependencies from https://github.com/dotnet/sdk build 20210530.3 (#10811) [release/6.0.1xx-preview5] Update dependencies from dotnet/sdk - Coherency Updates: - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21277.4 to 6.0.0-preview.5.21280.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 6.0.0-preview.5.21277.4 to 6.0.0-preview.5.21280.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-preview.5.21277.4 to 6.0.0-preview.5.21280.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-preview.5.21277.4 to 6.0.0-preview.5.21280.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-preview.5.21277.4 to 6.0.0-preview.5.21280.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 6.0.0-preview.5.21277.4 to 6.0.0-preview.5.21280.5 (parent: Microsoft.NET.Sdk) --- 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 1f3ab11c7..b44fef182 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop 5b471be13f980ffef8353943b0d48f94346eb1a2 - + https://github.com/dotnet/runtime - d73fb996ce229224bccde20c9978780517e46f92 + ef54ee284e0e488ec80caec4636b167cb2c32845 - + https://github.com/dotnet/runtime - d73fb996ce229224bccde20c9978780517e46f92 + ef54ee284e0e488ec80caec4636b167cb2c32845 - + https://github.com/dotnet/runtime - d73fb996ce229224bccde20c9978780517e46f92 + ef54ee284e0e488ec80caec4636b167cb2c32845 - + https://github.com/dotnet/runtime - d73fb996ce229224bccde20c9978780517e46f92 + ef54ee284e0e488ec80caec4636b167cb2c32845 - + https://github.com/dotnet/runtime - d73fb996ce229224bccde20c9978780517e46f92 + ef54ee284e0e488ec80caec4636b167cb2c32845 @@ -39,9 +39,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - d73fb996ce229224bccde20c9978780517e46f92 + ef54ee284e0e488ec80caec4636b167cb2c32845 https://github.com/dotnet/aspnetcore @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 5d7718f5bbe6c681021f4c57986777421d9f0da4 - + https://github.com/dotnet/sdk - 11faa22bcbd682f6b51af83c050449de9264ea09 + f2302d9abf0dc6baa88f3740ab29977069dbfdf8 - + https://github.com/dotnet/sdk - 11faa22bcbd682f6b51af83c050449de9264ea09 + f2302d9abf0dc6baa88f3740ab29977069dbfdf8 diff --git a/eng/Versions.props b/eng/Versions.props index f71a5f529..57f14257e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,23 +57,23 @@ - 6.0.100-preview.5.21279.1 - 6.0.100-preview.5.21279.1 + 6.0.100-preview.5.21280.3 + 6.0.100-preview.5.21280.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-preview.5.21277.4 + 6.0.0-preview.5.21280.5 - 6.0.0-preview.5.21277.4 - 6.0.0-preview.5.21277.4 - 6.0.0-preview.5.21277.4 - 6.0.0-preview.5.21277.4 - 6.0.0-preview.5.21277.4 + 6.0.0-preview.5.21280.5 + 6.0.0-preview.5.21280.5 + 6.0.0-preview.5.21280.5 + 6.0.0-preview.5.21280.5 + 6.0.0-preview.5.21280.5 2.1.0 From 828768eb89c11c2c7c96c9623e678b03c696a1dd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 31 May 2021 10:33:09 +0000 Subject: [PATCH 60/64] Update dependencies from https://github.com/dotnet/sdk build 20210531.2 (#10813) [release/6.0.1xx-preview5] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-preview.5.21277.5 to 6.0.0-preview.5.21280.4 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-preview.5.21277.5 to 6.0.0-preview.5.21280.4 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.5.21277.5 to 6.0.0-preview.5.21280.4 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-preview.5.21277.4 to 6.0.0-preview.5.21280.12 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.5.21277.5 to 6.0.0-preview.5.21280.4 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-preview.5.21277.4 to 6.0.0-preview.5.21280.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b44fef182..3da38a9c5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - 5b471be13f980ffef8353943b0d48f94346eb1a2 + e9ef29dc86ceca46f7fb88744c1f4a35d8551faf - + https://github.com/dotnet/windowsdesktop - 5b471be13f980ffef8353943b0d48f94346eb1a2 + e9ef29dc86ceca46f7fb88744c1f4a35d8551faf - + https://github.com/dotnet/windowsdesktop - 5b471be13f980ffef8353943b0d48f94346eb1a2 + e9ef29dc86ceca46f7fb88744c1f4a35d8551faf https://github.com/dotnet/runtime @@ -83,22 +83,22 @@ https://github.com/dotnet/templating 5d7718f5bbe6c681021f4c57986777421d9f0da4 - + https://github.com/dotnet/sdk - f2302d9abf0dc6baa88f3740ab29977069dbfdf8 + 06cc64dadcb5ec5dc8e79c5d4ed92de8080fdcab - + https://github.com/dotnet/sdk - f2302d9abf0dc6baa88f3740ab29977069dbfdf8 + 06cc64dadcb5ec5dc8e79c5d4ed92de8080fdcab - + https://github.com/dotnet/winforms - 2e426a482be09a8204ef421cc70e4a698a8f797f + 52cfea3bbfcc3e1fd435f0301edde4c093d8bcd5 - + https://github.com/dotnet/wpf - e9ac5bd8b42413e14b6c02a8d114c15857d789e0 + fa96c924ec69cfb1e37fb36f9eb15976dac091ff https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 57f14257e..635fdd8f7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,11 +24,11 @@ - 6.0.0-preview.5.21277.4 + 6.0.0-preview.5.21280.12 - 6.0.0-preview.5.21277.4 + 6.0.0-preview.5.21280.3 @@ -57,8 +57,8 @@ - 6.0.100-preview.5.21280.3 - 6.0.100-preview.5.21280.3 + 6.0.100-preview.5.21281.2 + 6.0.100-preview.5.21281.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,9 +78,9 @@ - 6.0.0-preview.5.21277.5 - 6.0.0-preview.5.21277.5 - 6.0.0-preview.5.21277.5 + 6.0.0-preview.5.21280.4 + 6.0.0-preview.5.21280.4 + 6.0.0-preview.5.21280.4 From 22d6557696041d55108ba68c29cbe9996fc0a17a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 31 May 2021 13:39:22 +0000 Subject: [PATCH 61/64] Update dependencies from https://github.com/dotnet/sdk build 20210531.3 (#10814) [release/6.0.1xx-preview5] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.5.21278.3 to 6.0.0-preview.5.21281.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.5.21278.3 to 6.0.0-preview.5.21281.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.5.21278.3 to 6.0.0-preview.5.21281.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21278.3 to 6.0.0-preview.5.21281.1 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-preview.5.21278.3 to 6.0.0-preview.5.21281.1 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-preview.5.21278.3 to 6.0.0-preview.5.21281.1 (parent: Microsoft.NET.Sdk) --- 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 3da38a9c5..931b68912 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime ef54ee284e0e488ec80caec4636b167cb2c32845 - + https://github.com/dotnet/aspnetcore - b2220094859b74361ef838247da01726227d4ffb + 7923d4d1fc1a1cfbe959e895bd4f6d8203a58e93 - + https://github.com/dotnet/aspnetcore - b2220094859b74361ef838247da01726227d4ffb + 7923d4d1fc1a1cfbe959e895bd4f6d8203a58e93 - + https://github.com/dotnet/aspnetcore - b2220094859b74361ef838247da01726227d4ffb + 7923d4d1fc1a1cfbe959e895bd4f6d8203a58e93 - + https://github.com/dotnet/aspnetcore - b2220094859b74361ef838247da01726227d4ffb + 7923d4d1fc1a1cfbe959e895bd4f6d8203a58e93 - + https://github.com/dotnet/aspnetcore - b2220094859b74361ef838247da01726227d4ffb + 7923d4d1fc1a1cfbe959e895bd4f6d8203a58e93 - + https://github.com/dotnet/aspnetcore - b2220094859b74361ef838247da01726227d4ffb + 7923d4d1fc1a1cfbe959e895bd4f6d8203a58e93 https://github.com/dotnet/test-templates @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 5d7718f5bbe6c681021f4c57986777421d9f0da4 - + https://github.com/dotnet/sdk - 06cc64dadcb5ec5dc8e79c5d4ed92de8080fdcab + 76e9c0724797ec7376f78900f5ab16cc3c02d2bb - + https://github.com/dotnet/sdk - 06cc64dadcb5ec5dc8e79c5d4ed92de8080fdcab + 76e9c0724797ec7376f78900f5ab16cc3c02d2bb diff --git a/eng/Versions.props b/eng/Versions.props index 635fdd8f7..07642ca67 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,20 +45,20 @@ - 6.0.0-preview.5.21278.3 - 6.0.0-preview.5.21278.3 - 6.0.0-preview.5.21278.3 - 6.0.0-preview.5.21278.3 - 6.0.0-preview.5.21278.3 - 6.0.0-preview.5.21278.3 + 6.0.0-preview.5.21281.1 + 6.0.0-preview.5.21281.1 + 6.0.0-preview.5.21281.1 + 6.0.0-preview.5.21281.1 + 6.0.0-preview.5.21281.1 + 6.0.0-preview.5.21281.1 0.2.0 - 6.0.100-preview.5.21281.2 - 6.0.100-preview.5.21281.2 + 6.0.100-preview.5.21281.3 + 6.0.100-preview.5.21281.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 14d786cf18af922d7e1f608d7ad61d24ec87d550 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 31 May 2021 16:53:04 +0000 Subject: [PATCH 62/64] Update dependencies from https://github.com/dotnet/sdk build 20210531.6 (#10815) [release/6.0.1xx-preview5] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.5.21281.1 to 6.0.0-preview.5.21281.3 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.5.21281.1 to 6.0.0-preview.5.21281.3 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.5.21281.1 to 6.0.0-preview.5.21281.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21281.1 to 6.0.0-preview.5.21281.3 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-preview.5.21281.1 to 6.0.0-preview.5.21281.3 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-preview.5.21281.1 to 6.0.0-preview.5.21281.3 (parent: Microsoft.NET.Sdk) --- 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 931b68912..f32990d95 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime ef54ee284e0e488ec80caec4636b167cb2c32845 - + https://github.com/dotnet/aspnetcore - 7923d4d1fc1a1cfbe959e895bd4f6d8203a58e93 + 2e3bf97c48587812ed0d5e641f77bfb95dd690f0 - + https://github.com/dotnet/aspnetcore - 7923d4d1fc1a1cfbe959e895bd4f6d8203a58e93 + 2e3bf97c48587812ed0d5e641f77bfb95dd690f0 - + https://github.com/dotnet/aspnetcore - 7923d4d1fc1a1cfbe959e895bd4f6d8203a58e93 + 2e3bf97c48587812ed0d5e641f77bfb95dd690f0 - + https://github.com/dotnet/aspnetcore - 7923d4d1fc1a1cfbe959e895bd4f6d8203a58e93 + 2e3bf97c48587812ed0d5e641f77bfb95dd690f0 - + https://github.com/dotnet/aspnetcore - 7923d4d1fc1a1cfbe959e895bd4f6d8203a58e93 + 2e3bf97c48587812ed0d5e641f77bfb95dd690f0 - + https://github.com/dotnet/aspnetcore - 7923d4d1fc1a1cfbe959e895bd4f6d8203a58e93 + 2e3bf97c48587812ed0d5e641f77bfb95dd690f0 https://github.com/dotnet/test-templates @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 5d7718f5bbe6c681021f4c57986777421d9f0da4 - + https://github.com/dotnet/sdk - 76e9c0724797ec7376f78900f5ab16cc3c02d2bb + 497abb70248afa44728e3b51d41c800b91049e02 - + https://github.com/dotnet/sdk - 76e9c0724797ec7376f78900f5ab16cc3c02d2bb + 497abb70248afa44728e3b51d41c800b91049e02 diff --git a/eng/Versions.props b/eng/Versions.props index 07642ca67..ebb816119 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,20 +45,20 @@ - 6.0.0-preview.5.21281.1 - 6.0.0-preview.5.21281.1 - 6.0.0-preview.5.21281.1 - 6.0.0-preview.5.21281.1 - 6.0.0-preview.5.21281.1 - 6.0.0-preview.5.21281.1 + 6.0.0-preview.5.21281.3 + 6.0.0-preview.5.21281.3 + 6.0.0-preview.5.21281.3 + 6.0.0-preview.5.21281.3 + 6.0.0-preview.5.21281.3 + 6.0.0-preview.5.21281.3 0.2.0 - 6.0.100-preview.5.21281.3 - 6.0.100-preview.5.21281.3 + 6.0.100-preview.5.21281.6 + 6.0.100-preview.5.21281.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 49ef30587a27fe4ac98c017c485615c150e79627 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 1 Jun 2021 14:04:47 -0700 Subject: [PATCH 63/64] Update dependencies from https://github.com/dotnet/sdk build 20210601.9 (#10822) Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.100-preview.5.21281.6 -> To Version 6.0.100-preview.5.21301.9 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms From Version 6.0.0-preview.5.21280.5 -> To Version 6.0.0-preview.5.21301.3 (parent: Microsoft.NET.Sdk Co-authored-by: dotnet-maestro[bot] --- 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 f32990d95..76d2601a0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop e9ef29dc86ceca46f7fb88744c1f4a35d8551faf - + https://github.com/dotnet/runtime - ef54ee284e0e488ec80caec4636b167cb2c32845 + 4ce05fa319721fe56249bef6bdc827fac808eb04 - + https://github.com/dotnet/runtime - ef54ee284e0e488ec80caec4636b167cb2c32845 + 4ce05fa319721fe56249bef6bdc827fac808eb04 - + https://github.com/dotnet/runtime - ef54ee284e0e488ec80caec4636b167cb2c32845 + 4ce05fa319721fe56249bef6bdc827fac808eb04 - + https://github.com/dotnet/runtime - ef54ee284e0e488ec80caec4636b167cb2c32845 + 4ce05fa319721fe56249bef6bdc827fac808eb04 - + https://github.com/dotnet/runtime - ef54ee284e0e488ec80caec4636b167cb2c32845 + 4ce05fa319721fe56249bef6bdc827fac808eb04 @@ -39,9 +39,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - ef54ee284e0e488ec80caec4636b167cb2c32845 + 4ce05fa319721fe56249bef6bdc827fac808eb04 https://github.com/dotnet/aspnetcore @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 5d7718f5bbe6c681021f4c57986777421d9f0da4 - + https://github.com/dotnet/sdk - 497abb70248afa44728e3b51d41c800b91049e02 + 542943fe46899769e251d53e49d07d891deebffc - + https://github.com/dotnet/sdk - 497abb70248afa44728e3b51d41c800b91049e02 + 542943fe46899769e251d53e49d07d891deebffc diff --git a/eng/Versions.props b/eng/Versions.props index ebb816119..c1f513d58 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,23 +57,23 @@ - 6.0.100-preview.5.21281.6 - 6.0.100-preview.5.21281.6 + 6.0.100-preview.5.21301.9 + 6.0.100-preview.5.21301.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-preview.5.21280.5 + 6.0.0-preview.5.21301.3 - 6.0.0-preview.5.21280.5 - 6.0.0-preview.5.21280.5 - 6.0.0-preview.5.21280.5 - 6.0.0-preview.5.21280.5 - 6.0.0-preview.5.21280.5 + 6.0.0-preview.5.21301.3 + 6.0.0-preview.5.21301.3 + 6.0.0-preview.5.21301.3 + 6.0.0-preview.5.21301.3 + 6.0.0-preview.5.21301.3 2.1.0 From f2de0c236f3eb6d155dd50b28da84a9fd8c6c398 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 1 Jun 2021 15:12:22 -0700 Subject: [PATCH 64/64] Update dependencies from https://github.com/dotnet/sdk build 20210601.11 (#10826) Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.100-preview.5.21301.9 -> To Version 6.0.100-preview.5.21301.11 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms From Version 6.0.0-preview.5.21301.3 -> To Version 6.0.0-preview.5.21301.5 (parent: Microsoft.NET.Sdk Co-authored-by: dotnet-maestro[bot] --- 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 76d2601a0..bdfdc4624 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop e9ef29dc86ceca46f7fb88744c1f4a35d8551faf - + https://github.com/dotnet/runtime - 4ce05fa319721fe56249bef6bdc827fac808eb04 + ec3e0b276b159ab24946f17f2b89d00862488a6a - + https://github.com/dotnet/runtime - 4ce05fa319721fe56249bef6bdc827fac808eb04 + ec3e0b276b159ab24946f17f2b89d00862488a6a - + https://github.com/dotnet/runtime - 4ce05fa319721fe56249bef6bdc827fac808eb04 + ec3e0b276b159ab24946f17f2b89d00862488a6a - + https://github.com/dotnet/runtime - 4ce05fa319721fe56249bef6bdc827fac808eb04 + ec3e0b276b159ab24946f17f2b89d00862488a6a - + https://github.com/dotnet/runtime - 4ce05fa319721fe56249bef6bdc827fac808eb04 + ec3e0b276b159ab24946f17f2b89d00862488a6a @@ -39,9 +39,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 4ce05fa319721fe56249bef6bdc827fac808eb04 + ec3e0b276b159ab24946f17f2b89d00862488a6a https://github.com/dotnet/aspnetcore @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 5d7718f5bbe6c681021f4c57986777421d9f0da4 - + https://github.com/dotnet/sdk - 542943fe46899769e251d53e49d07d891deebffc + 0c2b0cb4fe43cef09f588337bd29411bc6391e25 - + https://github.com/dotnet/sdk - 542943fe46899769e251d53e49d07d891deebffc + 0c2b0cb4fe43cef09f588337bd29411bc6391e25 diff --git a/eng/Versions.props b/eng/Versions.props index c1f513d58..65705bf20 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,23 +57,23 @@ - 6.0.100-preview.5.21301.9 - 6.0.100-preview.5.21301.9 + 6.0.100-preview.5.21301.11 + 6.0.100-preview.5.21301.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-preview.5.21301.3 + 6.0.0-preview.5.21301.5 - 6.0.0-preview.5.21301.3 - 6.0.0-preview.5.21301.3 - 6.0.0-preview.5.21301.3 - 6.0.0-preview.5.21301.3 - 6.0.0-preview.5.21301.3 + 6.0.0-preview.5.21301.5 + 6.0.0-preview.5.21301.5 + 6.0.0-preview.5.21301.5 + 6.0.0-preview.5.21301.5 + 6.0.0-preview.5.21301.5 2.1.0