From 9a0995a3e92425d64188ac50c6f26af774559cc3 Mon Sep 17 00:00:00 2001 From: Rahul Bhandari Date: Tue, 13 Apr 2021 12:07:36 -0700 Subject: [PATCH 01/77] Update snapcraft.yaml --- src/snaps/dotnet-sdk-3.1/snap/snapcraft.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/snaps/dotnet-sdk-3.1/snap/snapcraft.yaml b/src/snaps/dotnet-sdk-3.1/snap/snapcraft.yaml index 01f810e2b..1e6c874c9 100755 --- a/src/snaps/dotnet-sdk-3.1/snap/snapcraft.yaml +++ b/src/snaps/dotnet-sdk-3.1/snap/snapcraft.yaml @@ -1,5 +1,5 @@ name: dotnet-sdk -version: 3.1.407 +version: 3.1.408 summary: Cross-Platform .NET Core SDK description: | .NET Core SDK. https://dot.net/core. @@ -16,8 +16,8 @@ base: core18 parts: dotnet-sdk: plugin: dump - source: https://download.visualstudio.microsoft.com/download/pr/ab82011d-2549-4e23-a8a9-a2b522a31f27/6e615d6177e49c3e874d05ee3566e8bf/dotnet-sdk-3.1.407-linux-x64.tar.gz - source-checksum: sha512/b9c61061464a38df0a3eb5894a4a1229cd27d2ccba4168e434f4609b763630c01fbe1b2564826194d6d9b5ad86047e586312c0f35eafc3755dfe0ff9ba075c0c + source: https://download.visualstudio.microsoft.com/download/pr/2054b462-43da-4c61-9e2d-d02167c71c40/a8be03062d9d770c8025c7de47ca366d/dotnet-sdk-3.1.408-linux-x64.tar.gz + source-checksum: sha512/5e2c378addf337c1b7e44583718672e0791235150630f0b613353c8597342dcaae3b7c412b17d5e6d93d87b5708a6ca2dc16ff6e6c5a2101b224d24e6a5c4e7a stage-packages: - libicu60 - libssl1.0.0 From 58cdf0b1242b32554ec4d3cc13a5f17023b45915 Mon Sep 17 00:00:00 2001 From: Rahul Bhandari Date: Tue, 13 Apr 2021 12:08:49 -0700 Subject: [PATCH 02/77] Update snapcraft.yaml --- src/snaps/dotnet-sdk-2.1/snap/snapcraft.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/snaps/dotnet-sdk-2.1/snap/snapcraft.yaml b/src/snaps/dotnet-sdk-2.1/snap/snapcraft.yaml index d73c54acc..ee58bc736 100755 --- a/src/snaps/dotnet-sdk-2.1/snap/snapcraft.yaml +++ b/src/snaps/dotnet-sdk-2.1/snap/snapcraft.yaml @@ -1,5 +1,5 @@ name: dotnet-sdk -version: 2.1.814 +version: 2.1.815 summary: Cross-Platform .NET Core SDK description: | .NET Core SDK. https://dot.net/core. @@ -16,8 +16,8 @@ base: core18 parts: dotnet-sdk: plugin: dump - source: https://download.visualstudio.microsoft.com/download/pr/b44d40e6-fa23-4f2d-a0a9-4199731f0b1e/5e62077a9e8014d8d4c74aee5406e0c7/dotnet-sdk-2.1.814-linux-x64.tar.gz - source-checksum: sha512/79408996f53650d0c3ac39348fa102537d14190ba5dcc4b9152cdb8fc72566608ad7430f196731eeb62dcfacdb0f2fa37577b5d51e165afd9dd9ae15f9d2aabc + source: https://download.visualstudio.microsoft.com/download/pr/7fba29f6-aac9-4b53-a5f9-9b421bec6288/70ac39be0282331d18b535f64ea5f40a/dotnet-sdk-2.1.815-linux-x64.tar.gz + source-checksum: sha512/e998ccb8b4e47a727141e85823637f2030df556d3056aadbdfbce4eca823fe4759ca0e0b2edaa6f83dd5b4cbb8a3b0046ff2c9eae96832e71dc6c13855998148 stage-packages: - libicu60 - libssl1.0.0 From 8adcebe113d69b5bc544fb00dc2860a767212389 Mon Sep 17 00:00:00 2001 From: Rahul Bhandari Date: Tue, 13 Apr 2021 12:10:21 -0700 Subject: [PATCH 03/77] Update snapcraft.yaml --- src/snaps/dotnet-sdk-5.0/snap/snapcraft.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/snaps/dotnet-sdk-5.0/snap/snapcraft.yaml b/src/snaps/dotnet-sdk-5.0/snap/snapcraft.yaml index 93a84fff4..3ddf457ba 100755 --- a/src/snaps/dotnet-sdk-5.0/snap/snapcraft.yaml +++ b/src/snaps/dotnet-sdk-5.0/snap/snapcraft.yaml @@ -1,5 +1,5 @@ name: dotnet-sdk -version: 5.0.201 +version: 5.0.202 summary: Cross-Platform .NET Core SDK description: | .NET Core SDK. https://dot.net/core. @@ -16,8 +16,8 @@ base: core18 parts: dotnet-sdk: plugin: dump - source: https://download.visualstudio.microsoft.com/download/pr/73a9cb2a-1acd-4d20-b864-d12797ca3d40/075dbe1dc3bba4aa85ca420167b861b6/dotnet-sdk-5.0.201-linux-x64.tar.gz - source-checksum: sha512/099084cc7935482e363bd7802d2fdd909b3d72d2e9706e9ba4df95e3d142a28b780d2b85e5fb4662dcaad18e91c7e06519184fae981a521425eed605770c3c5a + source: https://download.visualstudio.microsoft.com/download/pr/5f0f07ab-cd9a-4498-a9f7-67d90d582180/2a3db6698751e6cbb93ec244cb81cc5f/dotnet-sdk-5.0.202-linux-x64.tar.gz + source-checksum: sha512/01ed59f236184987405673d24940d55ce29d830e7dbbc19556fdc03893039e6046712de6f901dc9911047a0dee4fd15319b7e94f8a31df6b981fa35bd93d9838 stage-packages: - libicu60 - libssl1.0.0 From 79c5bfd41509863c86a57a635733e8d123c7b54e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 28 Apr 2021 18:32:45 +0000 Subject: [PATCH 04/77] Update dependencies from https://github.com/dotnet/sdk build 20210428.5 (#10386) [main] 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 2fac17ae1..56870a323 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 254a4c63afcd94b221408c6e8d245b90802551eb - + https://github.com/dotnet/sdk - fc6dfaac882ce1229406a1087b22e852378b8319 + a0367a5d3d592c03cbc9733f5329e2a103d03262 - + https://github.com/dotnet/sdk - fc6dfaac882ce1229406a1087b22e852378b8319 + a0367a5d3d592c03cbc9733f5329e2a103d03262 diff --git a/eng/Versions.props b/eng/Versions.props index 7ba581631..034d8cfdc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-preview.5.21228.4 - 6.0.100-preview.5.21228.4 + 6.0.100-preview.5.21228.5 + 6.0.100-preview.5.21228.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 134dcdac4108b148fe80f6fc09c8d2a400fe7f73 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 28 Apr 2021 11:54:16 -0700 Subject: [PATCH 05/77] Remove the duplicate implicit version properties --- src/redist/targets/GenerateBundledVersions.targets | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 05b3d13af..d2e538306 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -46,11 +46,6 @@ <_AspNet50RuntimePackVersion>5.0.5 <_AspNet50TargetingPackVersion>5.0.0 - <_WindowsDesktop31RuntimePackVersion>3.1.12 - <_WindowsDesktop31TargetingPackVersion>3.1.0 - <_AspNet31RuntimePackVersion>3.1.14 - <_AspNet31TargetingPackVersion>3.1.10 - <_NETCoreApp30RuntimePackVersion>3.0.3 <_NETCoreApp30TargetingPackVersion>3.0.0 From 8e036263f6332e4721ad51442b44a03a2d8604f0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 28 Apr 2021 23:39:14 +0000 Subject: [PATCH 06/77] [main] Update dependencies from dotnet/sdk (#10390) [main] 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 56870a323..5ef92b1a4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 254a4c63afcd94b221408c6e8d245b90802551eb - + https://github.com/dotnet/sdk - a0367a5d3d592c03cbc9733f5329e2a103d03262 + 80d09484e8adb07d62dc1ce15a42a259bd3cd934 - + https://github.com/dotnet/sdk - a0367a5d3d592c03cbc9733f5329e2a103d03262 + 80d09484e8adb07d62dc1ce15a42a259bd3cd934 diff --git a/eng/Versions.props b/eng/Versions.props index 034d8cfdc..cfbde8098 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-preview.5.21228.5 - 6.0.100-preview.5.21228.5 + 6.0.100-preview.5.21228.9 + 6.0.100-preview.5.21228.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 01eed4b4179cb21956d684c9a8c8e58ca0b9eba3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 29 Apr 2021 00:27:45 +0000 Subject: [PATCH 07/77] Update dependencies from https://github.com/dotnet/sdk build 20210428.12 (#10393) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 11.4.2-beta.21224.1 to 11.4.2-beta.21227.5 (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 5ef92b1a4..cdc83326a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 254a4c63afcd94b221408c6e8d245b90802551eb - + https://github.com/dotnet/sdk - 80d09484e8adb07d62dc1ce15a42a259bd3cd934 + e0f0a1f4ca0ea465fcac0804a03085731e019e1f - + https://github.com/dotnet/sdk - 80d09484e8adb07d62dc1ce15a42a259bd3cd934 + e0f0a1f4ca0ea465fcac0804a03085731e019e1f @@ -100,9 +100,9 @@ https://github.com/dotnet/wpf 40775430dc86d110ba7b83ca5a898b8f4e9335e7 - + https://github.com/dotnet/fsharp - 9588f1d472ac8227796dca34ff76dfe136bb4bd7 + b6a352ab0a11a0584348dd77811af7eecaf9d072 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index cfbde8098..ae2ac6afa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-preview.5.21228.9 - 6.0.100-preview.5.21228.9 + 6.0.100-preview.5.21228.12 + 6.0.100-preview.5.21228.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a4e550406d29bec836702c36e9331d4978f974c1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 29 Apr 2021 01:10:58 +0000 Subject: [PATCH 08/77] Update dependencies from https://github.com/dotnet/sdk build 20210428.14 (#10395) [main] 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 cdc83326a..5ef44a818 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 254a4c63afcd94b221408c6e8d245b90802551eb - + https://github.com/dotnet/sdk - e0f0a1f4ca0ea465fcac0804a03085731e019e1f + 4fa848bfd04ff7009ed711ae4d9754109061ab04 - + https://github.com/dotnet/sdk - e0f0a1f4ca0ea465fcac0804a03085731e019e1f + 4fa848bfd04ff7009ed711ae4d9754109061ab04 diff --git a/eng/Versions.props b/eng/Versions.props index ae2ac6afa..4f7cfc967 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-preview.5.21228.12 - 6.0.100-preview.5.21228.12 + 6.0.100-preview.5.21228.14 + 6.0.100-preview.5.21228.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5bd83fe771d85279836d72eb76b65abfae9b7dcc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 29 Apr 2021 02:10:19 +0000 Subject: [PATCH 09/77] Update dependencies from https://github.com/dotnet/sdk build 20210428.15 (#10396) [main] Update dependencies from dotnet/sdk - Coherency Updates: - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21227.7 to 6.0.0-preview.5.21228.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 6.0.0-preview.5.21227.7 to 6.0.0-preview.5.21228.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-preview.5.21227.7 to 6.0.0-preview.5.21228.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-preview.5.21227.7 to 6.0.0-preview.5.21228.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-preview.5.21227.7 to 6.0.0-preview.5.21228.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 6.0.0-preview.5.21227.7 to 6.0.0-preview.5.21228.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 5ef44a818..df72e76ab 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop 9570a321daf2bd6756b91a0866bb8e0d7874190d - + https://github.com/dotnet/runtime - 41f3d48b520d4cf4f9e051dc07f480dcb9c62e08 + 52c1d0b9b72f09fa7cf1f491d1c147dc173b7d60 - + https://github.com/dotnet/runtime - 41f3d48b520d4cf4f9e051dc07f480dcb9c62e08 + 52c1d0b9b72f09fa7cf1f491d1c147dc173b7d60 - + https://github.com/dotnet/runtime - 41f3d48b520d4cf4f9e051dc07f480dcb9c62e08 + 52c1d0b9b72f09fa7cf1f491d1c147dc173b7d60 - + https://github.com/dotnet/runtime - 41f3d48b520d4cf4f9e051dc07f480dcb9c62e08 + 52c1d0b9b72f09fa7cf1f491d1c147dc173b7d60 - + https://github.com/dotnet/runtime - 41f3d48b520d4cf4f9e051dc07f480dcb9c62e08 + 52c1d0b9b72f09fa7cf1f491d1c147dc173b7d60 @@ -39,9 +39,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 41f3d48b520d4cf4f9e051dc07f480dcb9c62e08 + 52c1d0b9b72f09fa7cf1f491d1c147dc173b7d60 https://github.com/dotnet/aspnetcore @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 254a4c63afcd94b221408c6e8d245b90802551eb - + https://github.com/dotnet/sdk - 4fa848bfd04ff7009ed711ae4d9754109061ab04 + 6211cb74a54a0b25e7380b39ad95bb2280b34060 - + https://github.com/dotnet/sdk - 4fa848bfd04ff7009ed711ae4d9754109061ab04 + 6211cb74a54a0b25e7380b39ad95bb2280b34060 diff --git a/eng/Versions.props b/eng/Versions.props index 4f7cfc967..c71503601 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,23 +57,23 @@ - 6.0.100-preview.5.21228.14 - 6.0.100-preview.5.21228.14 + 6.0.100-preview.5.21228.15 + 6.0.100-preview.5.21228.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-preview.5.21227.7 + 6.0.0-preview.5.21228.5 - 6.0.0-preview.5.21227.7 - 6.0.0-preview.5.21227.7 - 6.0.0-preview.5.21227.7 - 6.0.0-preview.5.21227.7 - 6.0.0-preview.5.21227.7 + 6.0.0-preview.5.21228.5 + 6.0.0-preview.5.21228.5 + 6.0.0-preview.5.21228.5 + 6.0.0-preview.5.21228.5 + 6.0.0-preview.5.21228.5 2.1.0 From e0389de15d822e91fb8bd32fdc9092003f27b553 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 29 Apr 2021 03:00:03 +0000 Subject: [PATCH 10/77] Update dependencies from https://github.com/dotnet/sdk build 20210428.17 (#10398) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.5.21226.3 to 6.0.0-preview.5.21228.5 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.5.21226.3 to 6.0.0-preview.5.21228.5 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.5.21226.3 to 6.0.0-preview.5.21228.5 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21226.3 to 6.0.0-preview.5.21228.5 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-preview.5.21226.3 to 6.0.0-preview.5.21228.5 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-preview.5.21226.3 to 6.0.0-preview.5.21228.5 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.0.0-2.21227.22 to 4.0.0-2.21228.16 (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 df72e76ab..4003ea80a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime 52c1d0b9b72f09fa7cf1f491d1c147dc173b7d60 - + https://github.com/dotnet/aspnetcore - 4681108d2877be20acf73fcfa8fb6cb31c8db6d9 + 406a536267f7104e4f203e1bd60167609fad5869 - + https://github.com/dotnet/aspnetcore - 4681108d2877be20acf73fcfa8fb6cb31c8db6d9 + 406a536267f7104e4f203e1bd60167609fad5869 - + https://github.com/dotnet/aspnetcore - 4681108d2877be20acf73fcfa8fb6cb31c8db6d9 + 406a536267f7104e4f203e1bd60167609fad5869 - + https://github.com/dotnet/aspnetcore - 4681108d2877be20acf73fcfa8fb6cb31c8db6d9 + 406a536267f7104e4f203e1bd60167609fad5869 - + https://github.com/dotnet/aspnetcore - 4681108d2877be20acf73fcfa8fb6cb31c8db6d9 + 406a536267f7104e4f203e1bd60167609fad5869 - + https://github.com/dotnet/aspnetcore - 4681108d2877be20acf73fcfa8fb6cb31c8db6d9 + 406a536267f7104e4f203e1bd60167609fad5869 https://github.com/dotnet/test-templates @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 254a4c63afcd94b221408c6e8d245b90802551eb - + https://github.com/dotnet/sdk - 6211cb74a54a0b25e7380b39ad95bb2280b34060 + a0c1d495cb258450a9a4dc01a398e729e6973336 - + https://github.com/dotnet/sdk - 6211cb74a54a0b25e7380b39ad95bb2280b34060 + a0c1d495cb258450a9a4dc01a398e729e6973336 @@ -113,9 +113,9 @@ e48f540b753d2aa5f5d4c22f4bbc41aba130345b linker - + https://github.com/dotnet/roslyn - 84e6ff97a24ba7e74fd89e61da54487a8535ceed + e253351a7e27f8759f7a7f4786bfa9052045bfa3 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index c71503601..8555ed3f1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,20 +45,20 @@ - 6.0.0-preview.5.21226.3 - 6.0.0-preview.5.21226.3 - 6.0.0-preview.5.21226.3 - 6.0.0-preview.5.21226.3 - 6.0.0-preview.5.21226.3 - 6.0.0-preview.5.21226.3 + 6.0.0-preview.5.21228.5 + 6.0.0-preview.5.21228.5 + 6.0.0-preview.5.21228.5 + 6.0.0-preview.5.21228.5 + 6.0.0-preview.5.21228.5 + 6.0.0-preview.5.21228.5 0.2.0 - 6.0.100-preview.5.21228.15 - 6.0.100-preview.5.21228.15 + 6.0.100-preview.5.21228.17 + 6.0.100-preview.5.21228.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5976815e254ac6205006ab9b8f638097feea6442 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 29 Apr 2021 03:47:12 +0000 Subject: [PATCH 11/77] Update dependencies from https://github.com/dotnet/sdk build 20210428.18 (#10399) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.5.21228.5 to 6.0.0-preview.5.21228.6 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.5.21228.5 to 6.0.0-preview.5.21228.6 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.5.21228.5 to 6.0.0-preview.5.21228.6 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21228.5 to 6.0.0-preview.5.21228.6 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-preview.5.21228.5 to 6.0.0-preview.5.21228.6 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-preview.5.21228.5 to 6.0.0-preview.5.21228.6 (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 4003ea80a..b4710c793 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime 52c1d0b9b72f09fa7cf1f491d1c147dc173b7d60 - + https://github.com/dotnet/aspnetcore - 406a536267f7104e4f203e1bd60167609fad5869 + 5850fa333b368050f317c485434ab42d61aabf8e - + https://github.com/dotnet/aspnetcore - 406a536267f7104e4f203e1bd60167609fad5869 + 5850fa333b368050f317c485434ab42d61aabf8e - + https://github.com/dotnet/aspnetcore - 406a536267f7104e4f203e1bd60167609fad5869 + 5850fa333b368050f317c485434ab42d61aabf8e - + https://github.com/dotnet/aspnetcore - 406a536267f7104e4f203e1bd60167609fad5869 + 5850fa333b368050f317c485434ab42d61aabf8e - + https://github.com/dotnet/aspnetcore - 406a536267f7104e4f203e1bd60167609fad5869 + 5850fa333b368050f317c485434ab42d61aabf8e - + https://github.com/dotnet/aspnetcore - 406a536267f7104e4f203e1bd60167609fad5869 + 5850fa333b368050f317c485434ab42d61aabf8e https://github.com/dotnet/test-templates @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 254a4c63afcd94b221408c6e8d245b90802551eb - + https://github.com/dotnet/sdk - a0c1d495cb258450a9a4dc01a398e729e6973336 + bb1184313fd0e843a5c198e440becdc2106bb247 - + https://github.com/dotnet/sdk - a0c1d495cb258450a9a4dc01a398e729e6973336 + bb1184313fd0e843a5c198e440becdc2106bb247 diff --git a/eng/Versions.props b/eng/Versions.props index 8555ed3f1..2a1a32f7d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,20 +45,20 @@ - 6.0.0-preview.5.21228.5 - 6.0.0-preview.5.21228.5 - 6.0.0-preview.5.21228.5 - 6.0.0-preview.5.21228.5 - 6.0.0-preview.5.21228.5 - 6.0.0-preview.5.21228.5 + 6.0.0-preview.5.21228.6 + 6.0.0-preview.5.21228.6 + 6.0.0-preview.5.21228.6 + 6.0.0-preview.5.21228.6 + 6.0.0-preview.5.21228.6 + 6.0.0-preview.5.21228.6 0.2.0 - 6.0.100-preview.5.21228.17 - 6.0.100-preview.5.21228.17 + 6.0.100-preview.5.21228.18 + 6.0.100-preview.5.21228.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From bf8f9b8aab3bb9bfdfb385fb1ec162d698a4c691 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 29 Apr 2021 05:01:31 +0000 Subject: [PATCH 12/77] Update dependencies from https://github.com/dotnet/sdk build 20210428.20 (#10401) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 4.0.0-2.21228.16 to 4.0.0-2.21229.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 b4710c793..c7f15c7e3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 254a4c63afcd94b221408c6e8d245b90802551eb - + https://github.com/dotnet/sdk - bb1184313fd0e843a5c198e440becdc2106bb247 + 150caf4ee84799066d314732669e282de3a1736b - + https://github.com/dotnet/sdk - bb1184313fd0e843a5c198e440becdc2106bb247 + 150caf4ee84799066d314732669e282de3a1736b @@ -113,9 +113,9 @@ e48f540b753d2aa5f5d4c22f4bbc41aba130345b linker - + https://github.com/dotnet/roslyn - e253351a7e27f8759f7a7f4786bfa9052045bfa3 + d871940668630d0d6f71666760beab55b7cf4636 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 2a1a32f7d..b4cd58b2d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-preview.5.21228.18 - 6.0.100-preview.5.21228.18 + 6.0.100-preview.5.21228.20 + 6.0.100-preview.5.21228.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0b60950dad3cd50b07e130568454a33e058e2507 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 29 Apr 2021 08:21:00 +0000 Subject: [PATCH 13/77] Update dependencies from https://github.com/dotnet/sdk build 20210429.1 (#10403) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.5.21228.6 to 6.0.0-preview.5.21228.8 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.5.21228.6 to 6.0.0-preview.5.21228.8 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.5.21228.6 to 6.0.0-preview.5.21228.8 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21228.6 to 6.0.0-preview.5.21228.8 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-preview.5.21228.6 to 6.0.0-preview.5.21228.8 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-preview.5.21228.6 to 6.0.0-preview.5.21228.8 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.0.0-2.21229.2 to 4.0.0-2.21229.10 (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 c7f15c7e3..a981858b9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime 52c1d0b9b72f09fa7cf1f491d1c147dc173b7d60 - + https://github.com/dotnet/aspnetcore - 5850fa333b368050f317c485434ab42d61aabf8e + 714a30aaf72eabd7b18958280175077c14eae137 - + https://github.com/dotnet/aspnetcore - 5850fa333b368050f317c485434ab42d61aabf8e + 714a30aaf72eabd7b18958280175077c14eae137 - + https://github.com/dotnet/aspnetcore - 5850fa333b368050f317c485434ab42d61aabf8e + 714a30aaf72eabd7b18958280175077c14eae137 - + https://github.com/dotnet/aspnetcore - 5850fa333b368050f317c485434ab42d61aabf8e + 714a30aaf72eabd7b18958280175077c14eae137 - + https://github.com/dotnet/aspnetcore - 5850fa333b368050f317c485434ab42d61aabf8e + 714a30aaf72eabd7b18958280175077c14eae137 - + https://github.com/dotnet/aspnetcore - 5850fa333b368050f317c485434ab42d61aabf8e + 714a30aaf72eabd7b18958280175077c14eae137 https://github.com/dotnet/test-templates @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 254a4c63afcd94b221408c6e8d245b90802551eb - + https://github.com/dotnet/sdk - 150caf4ee84799066d314732669e282de3a1736b + 24810db9dc152fb597c644989747063bd8939afd - + https://github.com/dotnet/sdk - 150caf4ee84799066d314732669e282de3a1736b + 24810db9dc152fb597c644989747063bd8939afd @@ -113,9 +113,9 @@ e48f540b753d2aa5f5d4c22f4bbc41aba130345b linker - + https://github.com/dotnet/roslyn - d871940668630d0d6f71666760beab55b7cf4636 + f6e5c2e782c2ccd0e08c0e5fc88e7d234e3257e0 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index b4cd58b2d..a3c08517a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,20 +45,20 @@ - 6.0.0-preview.5.21228.6 - 6.0.0-preview.5.21228.6 - 6.0.0-preview.5.21228.6 - 6.0.0-preview.5.21228.6 - 6.0.0-preview.5.21228.6 - 6.0.0-preview.5.21228.6 + 6.0.0-preview.5.21228.8 + 6.0.0-preview.5.21228.8 + 6.0.0-preview.5.21228.8 + 6.0.0-preview.5.21228.8 + 6.0.0-preview.5.21228.8 + 6.0.0-preview.5.21228.8 0.2.0 - 6.0.100-preview.5.21228.20 - 6.0.100-preview.5.21228.20 + 6.0.100-preview.5.21229.1 + 6.0.100-preview.5.21229.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5112d92612bb07784bce6e0acb5b92d1ceffe785 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 29 Apr 2021 10:00:54 +0000 Subject: [PATCH 14/77] Update dependencies from https://github.com/dotnet/sdk build 20210429.3 (#10405) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.5.21228.8 to 6.0.0-preview.5.21228.10 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.5.21228.8 to 6.0.0-preview.5.21228.10 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.5.21228.8 to 6.0.0-preview.5.21228.10 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21228.8 to 6.0.0-preview.5.21228.10 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-preview.5.21228.8 to 6.0.0-preview.5.21228.10 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-preview.5.21228.8 to 6.0.0-preview.5.21228.10 (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 a981858b9..ba26900a0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime 52c1d0b9b72f09fa7cf1f491d1c147dc173b7d60 - + https://github.com/dotnet/aspnetcore - 714a30aaf72eabd7b18958280175077c14eae137 + 1cbd507952744ed6f49347346add44ee64b14cb9 - + https://github.com/dotnet/aspnetcore - 714a30aaf72eabd7b18958280175077c14eae137 + 1cbd507952744ed6f49347346add44ee64b14cb9 - + https://github.com/dotnet/aspnetcore - 714a30aaf72eabd7b18958280175077c14eae137 + 1cbd507952744ed6f49347346add44ee64b14cb9 - + https://github.com/dotnet/aspnetcore - 714a30aaf72eabd7b18958280175077c14eae137 + 1cbd507952744ed6f49347346add44ee64b14cb9 - + https://github.com/dotnet/aspnetcore - 714a30aaf72eabd7b18958280175077c14eae137 + 1cbd507952744ed6f49347346add44ee64b14cb9 - + https://github.com/dotnet/aspnetcore - 714a30aaf72eabd7b18958280175077c14eae137 + 1cbd507952744ed6f49347346add44ee64b14cb9 https://github.com/dotnet/test-templates @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 254a4c63afcd94b221408c6e8d245b90802551eb - + https://github.com/dotnet/sdk - 24810db9dc152fb597c644989747063bd8939afd + 460b79a1ce69913a729e907bc8edf857e93d2cc9 - + https://github.com/dotnet/sdk - 24810db9dc152fb597c644989747063bd8939afd + 460b79a1ce69913a729e907bc8edf857e93d2cc9 diff --git a/eng/Versions.props b/eng/Versions.props index a3c08517a..c7572b9f8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,20 +45,20 @@ - 6.0.0-preview.5.21228.8 - 6.0.0-preview.5.21228.8 - 6.0.0-preview.5.21228.8 - 6.0.0-preview.5.21228.8 - 6.0.0-preview.5.21228.8 - 6.0.0-preview.5.21228.8 + 6.0.0-preview.5.21228.10 + 6.0.0-preview.5.21228.10 + 6.0.0-preview.5.21228.10 + 6.0.0-preview.5.21228.10 + 6.0.0-preview.5.21228.10 + 6.0.0-preview.5.21228.10 0.2.0 - 6.0.100-preview.5.21229.1 - 6.0.100-preview.5.21229.1 + 6.0.100-preview.5.21229.3 + 6.0.100-preview.5.21229.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ab1d33c0e5f1527c980c0774e347344a0f0a4bdc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 29 Apr 2021 11:33:05 +0000 Subject: [PATCH 15/77] Update dependencies from https://github.com/dotnet/sdk build 20210429.4 (#10407) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 4.0.0-2.21229.10 to 4.0.0-2.21229.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 ba26900a0..419574041 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 254a4c63afcd94b221408c6e8d245b90802551eb - + https://github.com/dotnet/sdk - 460b79a1ce69913a729e907bc8edf857e93d2cc9 + 7e82ad11f80a6f33f6a2c7a29754053be26a3fcf - + https://github.com/dotnet/sdk - 460b79a1ce69913a729e907bc8edf857e93d2cc9 + 7e82ad11f80a6f33f6a2c7a29754053be26a3fcf @@ -113,9 +113,9 @@ e48f540b753d2aa5f5d4c22f4bbc41aba130345b linker - + https://github.com/dotnet/roslyn - f6e5c2e782c2ccd0e08c0e5fc88e7d234e3257e0 + 834d238f61b0c29e9d2e343d67a857b48038d8fe https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index c7572b9f8..3165691ff 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-preview.5.21229.3 - 6.0.100-preview.5.21229.3 + 6.0.100-preview.5.21229.4 + 6.0.100-preview.5.21229.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 71addce9e2347744ba953ecaf0abae9c153eed06 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 29 Apr 2021 12:20:36 +0000 Subject: [PATCH 16/77] Update dependencies from https://github.com/dotnet/sdk build 20210429.6 (#10409) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.5.21228.10 to 6.0.0-preview.5.21229.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.5.21228.10 to 6.0.0-preview.5.21229.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.5.21228.10 to 6.0.0-preview.5.21229.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21228.10 to 6.0.0-preview.5.21229.1 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-preview.5.21228.10 to 6.0.0-preview.5.21229.1 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-preview.5.21228.10 to 6.0.0-preview.5.21229.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 419574041..c9099174f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime 52c1d0b9b72f09fa7cf1f491d1c147dc173b7d60 - + https://github.com/dotnet/aspnetcore - 1cbd507952744ed6f49347346add44ee64b14cb9 + 3e46e68821157961e3b49359068447538bead6b3 - + https://github.com/dotnet/aspnetcore - 1cbd507952744ed6f49347346add44ee64b14cb9 + 3e46e68821157961e3b49359068447538bead6b3 - + https://github.com/dotnet/aspnetcore - 1cbd507952744ed6f49347346add44ee64b14cb9 + 3e46e68821157961e3b49359068447538bead6b3 - + https://github.com/dotnet/aspnetcore - 1cbd507952744ed6f49347346add44ee64b14cb9 + 3e46e68821157961e3b49359068447538bead6b3 - + https://github.com/dotnet/aspnetcore - 1cbd507952744ed6f49347346add44ee64b14cb9 + 3e46e68821157961e3b49359068447538bead6b3 - + https://github.com/dotnet/aspnetcore - 1cbd507952744ed6f49347346add44ee64b14cb9 + 3e46e68821157961e3b49359068447538bead6b3 https://github.com/dotnet/test-templates @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 254a4c63afcd94b221408c6e8d245b90802551eb - + https://github.com/dotnet/sdk - 7e82ad11f80a6f33f6a2c7a29754053be26a3fcf + 68b0c0fd1e69c158824dce2e5f125fb579d3f6b5 - + https://github.com/dotnet/sdk - 7e82ad11f80a6f33f6a2c7a29754053be26a3fcf + 68b0c0fd1e69c158824dce2e5f125fb579d3f6b5 diff --git a/eng/Versions.props b/eng/Versions.props index 3165691ff..4c1865639 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,20 +45,20 @@ - 6.0.0-preview.5.21228.10 - 6.0.0-preview.5.21228.10 - 6.0.0-preview.5.21228.10 - 6.0.0-preview.5.21228.10 - 6.0.0-preview.5.21228.10 - 6.0.0-preview.5.21228.10 + 6.0.0-preview.5.21229.1 + 6.0.0-preview.5.21229.1 + 6.0.0-preview.5.21229.1 + 6.0.0-preview.5.21229.1 + 6.0.0-preview.5.21229.1 + 6.0.0-preview.5.21229.1 0.2.0 - 6.0.100-preview.5.21229.4 - 6.0.100-preview.5.21229.4 + 6.0.100-preview.5.21229.6 + 6.0.100-preview.5.21229.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From aa9bddb57013a7c790b4d4cc05510f6c67e0153b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 29 Apr 2021 13:14:01 +0000 Subject: [PATCH 17/77] Update dependencies from https://github.com/dotnet/arcade build 20210428.3 (#10410) [main] Update dependencies from dotnet/arcade - Coherency Updates: - XliffTasks: from 1.0.0-beta.21221.1 to 1.0.0-beta.21224.1 (parent: Microsoft.DotNet.Arcade.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/templates/job/onelocbuild.yml | 8 +++++--- global.json | 4 ++-- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c9099174f..0471985d5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -136,14 +136,14 @@ - + https://github.com/dotnet/arcade - b7279bb45342c948ab46fea2d08ec17ae2f2a1bf + e1044f09e18638a98a9f0448086a7295f3d16834 - + https://github.com/dotnet/arcade - b7279bb45342c948ab46fea2d08ec17ae2f2a1bf + e1044f09e18638a98a9f0448086a7295f3d16834 https://github.com/dotnet/source-build-reference-packages @@ -153,9 +153,9 @@ https://github.com/dotnet/sourcelink 4b584dbc392bb1aad49c2eb1ab84d8b489b6dccc - + https://github.com/dotnet/xliff-tasks - e92cb4fc57ecfa244930cdd6d98270f185650462 + 37099419d3170cb788fd6bc3de4f7364bc586195 diff --git a/eng/Versions.props b/eng/Versions.props index 4c1865639..cd96da1f4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ - 6.0.0-beta.21222.1 + 6.0.0-beta.21228.3 diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml index d2b271ec1..b27d6faf3 100644 --- a/eng/common/templates/job/onelocbuild.yml +++ b/eng/common/templates/job/onelocbuild.yml @@ -17,6 +17,7 @@ parameters: LclSource: lclFilesInRepo LclPackageId: '' RepoType: gitHub + condition: '' jobs: - job: OneLocBuild @@ -44,6 +45,7 @@ jobs: filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1 arguments: $(_GenerateLocProjectArguments) displayName: Generate LocProject.json + condition: ${{ parameters.condition }} - task: OneLocBuild@2 displayName: OneLocBuild @@ -62,7 +64,7 @@ jobs: ${{ if eq(parameters.RepoType, 'gitHub') }}: repoType: ${{ parameters.RepoType }} gitHubPatVariable: "${{ parameters.GithubPat }}" - condition: always() + condition: ${{ parameters.condition }} - task: PublishBuildArtifacts@1 displayName: Publish Localization Files @@ -70,7 +72,7 @@ jobs: PathtoPublish: '$(Build.ArtifactStagingDirectory)/loc' PublishLocation: Container ArtifactName: Loc - condition: always() + condition: ${{ parameters.condition }} - task: PublishBuildArtifacts@1 displayName: Publish LocProject.json @@ -78,4 +80,4 @@ jobs: PathtoPublish: '$(Build.SourcesDirectory)/Localize/' PublishLocation: Container ArtifactName: Loc - condition: always() \ No newline at end of file + condition: ${{ parameters.condition }} \ No newline at end of file diff --git a/global.json b/global.json index 8b39dc8ea..421227a50 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.100-preview.2.21155.3", + "dotnet": "6.0.100-preview.3.21202.5", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21222.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21228.3" } } From b0644831cf5ccec8bc81ba3e3990134e85195516 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 29 Apr 2021 15:11:29 +0000 Subject: [PATCH 18/77] Update dependencies from https://github.com/dotnet/sdk build 20210429.7 (#10411) [main] Update dependencies from dotnet/sdk - Coherency Updates: - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21228.5 to 6.0.0-preview.5.21229.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 6.0.0-preview.5.21228.5 to 6.0.0-preview.5.21229.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-preview.5.21228.5 to 6.0.0-preview.5.21229.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-preview.5.21228.5 to 6.0.0-preview.5.21229.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-preview.5.21228.5 to 6.0.0-preview.5.21229.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 6.0.0-preview.5.21228.5 to 6.0.0-preview.5.21229.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 0471985d5..4e5fa0e89 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop 9570a321daf2bd6756b91a0866bb8e0d7874190d - + https://github.com/dotnet/runtime - 52c1d0b9b72f09fa7cf1f491d1c147dc173b7d60 + 6a5bc5315a6416de33655e127b5fbc5cb97a16a7 - + https://github.com/dotnet/runtime - 52c1d0b9b72f09fa7cf1f491d1c147dc173b7d60 + 6a5bc5315a6416de33655e127b5fbc5cb97a16a7 - + https://github.com/dotnet/runtime - 52c1d0b9b72f09fa7cf1f491d1c147dc173b7d60 + 6a5bc5315a6416de33655e127b5fbc5cb97a16a7 - + https://github.com/dotnet/runtime - 52c1d0b9b72f09fa7cf1f491d1c147dc173b7d60 + 6a5bc5315a6416de33655e127b5fbc5cb97a16a7 - + https://github.com/dotnet/runtime - 52c1d0b9b72f09fa7cf1f491d1c147dc173b7d60 + 6a5bc5315a6416de33655e127b5fbc5cb97a16a7 @@ -39,9 +39,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 52c1d0b9b72f09fa7cf1f491d1c147dc173b7d60 + 6a5bc5315a6416de33655e127b5fbc5cb97a16a7 https://github.com/dotnet/aspnetcore @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 254a4c63afcd94b221408c6e8d245b90802551eb - + https://github.com/dotnet/sdk - 68b0c0fd1e69c158824dce2e5f125fb579d3f6b5 + 7ad9f843da4f722122bbe3e9abcdbb84ec60aa91 - + https://github.com/dotnet/sdk - 68b0c0fd1e69c158824dce2e5f125fb579d3f6b5 + 7ad9f843da4f722122bbe3e9abcdbb84ec60aa91 diff --git a/eng/Versions.props b/eng/Versions.props index cd96da1f4..17eaea1e6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,23 +57,23 @@ - 6.0.100-preview.5.21229.6 - 6.0.100-preview.5.21229.6 + 6.0.100-preview.5.21229.7 + 6.0.100-preview.5.21229.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-preview.5.21228.5 + 6.0.0-preview.5.21229.1 - 6.0.0-preview.5.21228.5 - 6.0.0-preview.5.21228.5 - 6.0.0-preview.5.21228.5 - 6.0.0-preview.5.21228.5 - 6.0.0-preview.5.21228.5 + 6.0.0-preview.5.21229.1 + 6.0.0-preview.5.21229.1 + 6.0.0-preview.5.21229.1 + 6.0.0-preview.5.21229.1 + 6.0.0-preview.5.21229.1 2.1.0 From c51bb5e3557680cd1dd4661e5252e90128c60a58 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 29 Apr 2021 15:57:09 +0000 Subject: [PATCH 19/77] Update dependencies from https://github.com/dotnet/sdk build 20210429.9 (#10413) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Build: from 16.10.0-preview-21228-01 to 16.10.0-preview-21228-02 (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 4e5fa0e89..ea6021d76 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 254a4c63afcd94b221408c6e8d245b90802551eb - + https://github.com/dotnet/sdk - 7ad9f843da4f722122bbe3e9abcdbb84ec60aa91 + f3a493372498670b632984aa1c0c953d2eb8ecec - + https://github.com/dotnet/sdk - 7ad9f843da4f722122bbe3e9abcdbb84ec60aa91 + f3a493372498670b632984aa1c0c953d2eb8ecec @@ -117,9 +117,9 @@ https://github.com/dotnet/roslyn 834d238f61b0c29e9d2e343d67a857b48038d8fe - + https://github.com/dotnet/msbuild - 4f72ae4cfb09d03dccd7fc628d619ef4ab5aa479 + 5b9216a75e98e19eba84e04a5f30bd35a68f317a https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 17eaea1e6..23a6c4345 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-preview.5.21229.7 - 6.0.100-preview.5.21229.7 + 6.0.100-preview.5.21229.9 + 6.0.100-preview.5.21229.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 219d63e4710a037238b46e66657c9cd64bbca89d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 29 Apr 2021 19:48:55 +0000 Subject: [PATCH 20/77] [main] Update dependencies from dotnet/sdk (#10414) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-preview.5.21228.2 to 6.0.100-preview.5.21229.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 ea6021d76..8e23a9df6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,17 +79,17 @@ https://github.com/dotnet/test-templates 36a1b45f75489255f2d1770acd2d78c5002d4679 - + https://github.com/dotnet/templating - 254a4c63afcd94b221408c6e8d245b90802551eb + 620ab7756f20ba9455cae728e395076984799da2 - + https://github.com/dotnet/sdk - f3a493372498670b632984aa1c0c953d2eb8ecec + 397a0beb1dd8ccbea15c59909314d648a91054db - + https://github.com/dotnet/sdk - f3a493372498670b632984aa1c0c953d2eb8ecec + 397a0beb1dd8ccbea15c59909314d648a91054db diff --git a/eng/Versions.props b/eng/Versions.props index 23a6c4345..84f527c0f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -32,7 +32,7 @@ - 6.0.100-preview.5.21228.2 + 6.0.100-preview.5.21229.1 @@ -57,8 +57,8 @@ - 6.0.100-preview.5.21229.9 - 6.0.100-preview.5.21229.9 + 6.0.100-preview.5.21229.11 + 6.0.100-preview.5.21229.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b5c76c22d4163b77850c3070824fc9c2d99ea78b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 29 Apr 2021 21:50:29 +0000 Subject: [PATCH 21/77] [main] Update dependencies from dotnet/sdk (#10416) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-preview.5.21229.1 to 6.0.100-preview.5.21229.2 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.0.0-2.21229.16 to 4.0.0-2.21229.20 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8e23a9df6..e653e1c44 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,17 +79,17 @@ https://github.com/dotnet/test-templates 36a1b45f75489255f2d1770acd2d78c5002d4679 - + https://github.com/dotnet/templating - 620ab7756f20ba9455cae728e395076984799da2 + 17e8e7ee9843107d2be5f3b570f1e831cf90d1cd - + https://github.com/dotnet/sdk - 397a0beb1dd8ccbea15c59909314d648a91054db + d39f368e07220a36d012f777fb034902a48e3637 - + https://github.com/dotnet/sdk - 397a0beb1dd8ccbea15c59909314d648a91054db + d39f368e07220a36d012f777fb034902a48e3637 @@ -113,9 +113,9 @@ e48f540b753d2aa5f5d4c22f4bbc41aba130345b linker - + https://github.com/dotnet/roslyn - 834d238f61b0c29e9d2e343d67a857b48038d8fe + aa479a697e63f2c0496014d855f7a29f160cab57 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 84f527c0f..ff5a3434d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -32,7 +32,7 @@ - 6.0.100-preview.5.21229.1 + 6.0.100-preview.5.21229.2 @@ -57,8 +57,8 @@ - 6.0.100-preview.5.21229.11 - 6.0.100-preview.5.21229.11 + 6.0.100-preview.5.21229.15 + 6.0.100-preview.5.21229.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a149a0c3b88366940596d705d1752bea27715780 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 29 Apr 2021 22:39:05 +0000 Subject: [PATCH 22/77] Update dependencies from https://github.com/dotnet/sdk build 20210429.17 (#10418) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.5.21229.1 to 6.0.0-preview.5.21229.2 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.5.21229.1 to 6.0.0-preview.5.21229.2 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.5.21229.1 to 6.0.0-preview.5.21229.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21229.1 to 6.0.0-preview.5.21229.2 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-preview.5.21229.1 to 6.0.0-preview.5.21229.2 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-preview.5.21229.1 to 6.0.0-preview.5.21229.2 (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 e653e1c44..c1cf581c1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime 6a5bc5315a6416de33655e127b5fbc5cb97a16a7 - + https://github.com/dotnet/aspnetcore - 3e46e68821157961e3b49359068447538bead6b3 + db8a6497042f2d2a730c1ee09ad3641502acf802 - + https://github.com/dotnet/aspnetcore - 3e46e68821157961e3b49359068447538bead6b3 + db8a6497042f2d2a730c1ee09ad3641502acf802 - + https://github.com/dotnet/aspnetcore - 3e46e68821157961e3b49359068447538bead6b3 + db8a6497042f2d2a730c1ee09ad3641502acf802 - + https://github.com/dotnet/aspnetcore - 3e46e68821157961e3b49359068447538bead6b3 + db8a6497042f2d2a730c1ee09ad3641502acf802 - + https://github.com/dotnet/aspnetcore - 3e46e68821157961e3b49359068447538bead6b3 + db8a6497042f2d2a730c1ee09ad3641502acf802 - + https://github.com/dotnet/aspnetcore - 3e46e68821157961e3b49359068447538bead6b3 + db8a6497042f2d2a730c1ee09ad3641502acf802 https://github.com/dotnet/test-templates @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 17e8e7ee9843107d2be5f3b570f1e831cf90d1cd - + https://github.com/dotnet/sdk - d39f368e07220a36d012f777fb034902a48e3637 + 0df16f2d9c179032be57ac213c4248e5621d1846 - + https://github.com/dotnet/sdk - d39f368e07220a36d012f777fb034902a48e3637 + 0df16f2d9c179032be57ac213c4248e5621d1846 diff --git a/eng/Versions.props b/eng/Versions.props index ff5a3434d..62935dd98 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,20 +45,20 @@ - 6.0.0-preview.5.21229.1 - 6.0.0-preview.5.21229.1 - 6.0.0-preview.5.21229.1 - 6.0.0-preview.5.21229.1 - 6.0.0-preview.5.21229.1 - 6.0.0-preview.5.21229.1 + 6.0.0-preview.5.21229.2 + 6.0.0-preview.5.21229.2 + 6.0.0-preview.5.21229.2 + 6.0.0-preview.5.21229.2 + 6.0.0-preview.5.21229.2 + 6.0.0-preview.5.21229.2 0.2.0 - 6.0.100-preview.5.21229.15 - 6.0.100-preview.5.21229.15 + 6.0.100-preview.5.21229.17 + 6.0.100-preview.5.21229.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 64fc3db7ccd2c0df8fb869d6f18db9e87d87800e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 29 Apr 2021 23:31:06 +0000 Subject: [PATCH 23/77] Update dependencies from https://github.com/dotnet/sdk build 20210429.18 (#10419) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.ILLink.Tasks: from 6.0.100-preview.5.21228.2 to 6.0.100-preview.5.21229.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 c1cf581c1..0ca286e93 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 17e8e7ee9843107d2be5f3b570f1e831cf90d1cd - + https://github.com/dotnet/sdk - 0df16f2d9c179032be57ac213c4248e5621d1846 + 28a70f594a649b082e37de5cff2da3526abe93f8 - + https://github.com/dotnet/sdk - 0df16f2d9c179032be57ac213c4248e5621d1846 + 28a70f594a649b082e37de5cff2da3526abe93f8 @@ -108,9 +108,9 @@ https://github.com/microsoft/vstest 2233e0bdc7ca37eecee62eec848adcafca81024d - + https://github.com/mono/linker - e48f540b753d2aa5f5d4c22f4bbc41aba130345b + 307f6b0afd2fea639fffa97e67155bafe6aa8461 linker diff --git a/eng/Versions.props b/eng/Versions.props index 62935dd98..5e67024fc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-preview.5.21229.17 - 6.0.100-preview.5.21229.17 + 6.0.100-preview.5.21229.18 + 6.0.100-preview.5.21229.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 858a03d31a8128778490ce37d40bb479a7feb018 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 30 Apr 2021 00:30:40 +0000 Subject: [PATCH 24/77] Update dependencies from https://github.com/dotnet/sdk build 20210429.20 (#10421) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 4.0.0-2.21229.20 to 4.0.0-2.21229.30 (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 0ca286e93..a41b9cb14 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 17e8e7ee9843107d2be5f3b570f1e831cf90d1cd - + https://github.com/dotnet/sdk - 28a70f594a649b082e37de5cff2da3526abe93f8 + 5d28e9d8dc1959649e9aabbf0ba97d216d67bda8 - + https://github.com/dotnet/sdk - 28a70f594a649b082e37de5cff2da3526abe93f8 + 5d28e9d8dc1959649e9aabbf0ba97d216d67bda8 @@ -113,9 +113,9 @@ 307f6b0afd2fea639fffa97e67155bafe6aa8461 linker - + https://github.com/dotnet/roslyn - aa479a697e63f2c0496014d855f7a29f160cab57 + bce5da1c0f25a920cef314c94036e5a08120a19e https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 5e67024fc..d5460f2fb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-preview.5.21229.18 - 6.0.100-preview.5.21229.18 + 6.0.100-preview.5.21229.20 + 6.0.100-preview.5.21229.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b5d8542e0c8284526b9214e4960c6ab4dfc98fcb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 30 Apr 2021 01:43:32 +0000 Subject: [PATCH 25/77] Update dependencies from https://github.com/dotnet/sdk build 20210429.23 (#10422) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.5.21229.2 to 6.0.0-preview.5.21229.3 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.5.21229.2 to 6.0.0-preview.5.21229.3 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.5.21229.2 to 6.0.0-preview.5.21229.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21229.2 to 6.0.0-preview.5.21229.3 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-preview.5.21229.2 to 6.0.0-preview.5.21229.3 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-preview.5.21229.2 to 6.0.0-preview.5.21229.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 a41b9cb14..eb5eb4c6a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime 6a5bc5315a6416de33655e127b5fbc5cb97a16a7 - + https://github.com/dotnet/aspnetcore - db8a6497042f2d2a730c1ee09ad3641502acf802 + 80f0a03068065c8609b19d6bfa228accd18ae468 - + https://github.com/dotnet/aspnetcore - db8a6497042f2d2a730c1ee09ad3641502acf802 + 80f0a03068065c8609b19d6bfa228accd18ae468 - + https://github.com/dotnet/aspnetcore - db8a6497042f2d2a730c1ee09ad3641502acf802 + 80f0a03068065c8609b19d6bfa228accd18ae468 - + https://github.com/dotnet/aspnetcore - db8a6497042f2d2a730c1ee09ad3641502acf802 + 80f0a03068065c8609b19d6bfa228accd18ae468 - + https://github.com/dotnet/aspnetcore - db8a6497042f2d2a730c1ee09ad3641502acf802 + 80f0a03068065c8609b19d6bfa228accd18ae468 - + https://github.com/dotnet/aspnetcore - db8a6497042f2d2a730c1ee09ad3641502acf802 + 80f0a03068065c8609b19d6bfa228accd18ae468 https://github.com/dotnet/test-templates @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 17e8e7ee9843107d2be5f3b570f1e831cf90d1cd - + https://github.com/dotnet/sdk - 5d28e9d8dc1959649e9aabbf0ba97d216d67bda8 + 4ac39993302c79b9c5ca71a6679a70666d9d2a4a - + https://github.com/dotnet/sdk - 5d28e9d8dc1959649e9aabbf0ba97d216d67bda8 + 4ac39993302c79b9c5ca71a6679a70666d9d2a4a diff --git a/eng/Versions.props b/eng/Versions.props index d5460f2fb..1b5b1e782 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,20 +45,20 @@ - 6.0.0-preview.5.21229.2 - 6.0.0-preview.5.21229.2 - 6.0.0-preview.5.21229.2 - 6.0.0-preview.5.21229.2 - 6.0.0-preview.5.21229.2 - 6.0.0-preview.5.21229.2 + 6.0.0-preview.5.21229.3 + 6.0.0-preview.5.21229.3 + 6.0.0-preview.5.21229.3 + 6.0.0-preview.5.21229.3 + 6.0.0-preview.5.21229.3 + 6.0.0-preview.5.21229.3 0.2.0 - 6.0.100-preview.5.21229.20 - 6.0.100-preview.5.21229.20 + 6.0.100-preview.5.21229.23 + 6.0.100-preview.5.21229.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2d9e8a8b136e5949777a103eeb5927b0b1b86d08 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 30 Apr 2021 02:27:44 +0000 Subject: [PATCH 26/77] Update dependencies from https://github.com/dotnet/sdk build 20210429.24 (#10423) [main] 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 eb5eb4c6a..64e688ecc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 17e8e7ee9843107d2be5f3b570f1e831cf90d1cd - + https://github.com/dotnet/sdk - 4ac39993302c79b9c5ca71a6679a70666d9d2a4a + 197090a6e1954fbcf29f59a444692676f51357f5 - + https://github.com/dotnet/sdk - 4ac39993302c79b9c5ca71a6679a70666d9d2a4a + 197090a6e1954fbcf29f59a444692676f51357f5 diff --git a/eng/Versions.props b/eng/Versions.props index 1b5b1e782..34691e834 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-preview.5.21229.23 - 6.0.100-preview.5.21229.23 + 6.0.100-preview.5.21229.24 + 6.0.100-preview.5.21229.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 986b9caaf6c5d37d99117871c9fc3f261bc42d60 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 30 Apr 2021 04:03:02 +0000 Subject: [PATCH 27/77] [main] Update dependencies from dotnet/sdk (#10424) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.5.21229.3 to 6.0.0-preview.5.21229.5 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.5.21229.3 to 6.0.0-preview.5.21229.5 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.5.21229.3 to 6.0.0-preview.5.21229.5 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21229.3 to 6.0.0-preview.5.21229.5 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-preview.5.21229.3 to 6.0.0-preview.5.21229.5 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-preview.5.21229.3 to 6.0.0-preview.5.21229.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 64e688ecc..c6c2223f8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime 6a5bc5315a6416de33655e127b5fbc5cb97a16a7 - + https://github.com/dotnet/aspnetcore - 80f0a03068065c8609b19d6bfa228accd18ae468 + 16138c92521c55a5ecb99bcc55195a8551510f2b - + https://github.com/dotnet/aspnetcore - 80f0a03068065c8609b19d6bfa228accd18ae468 + 16138c92521c55a5ecb99bcc55195a8551510f2b - + https://github.com/dotnet/aspnetcore - 80f0a03068065c8609b19d6bfa228accd18ae468 + 16138c92521c55a5ecb99bcc55195a8551510f2b - + https://github.com/dotnet/aspnetcore - 80f0a03068065c8609b19d6bfa228accd18ae468 + 16138c92521c55a5ecb99bcc55195a8551510f2b - + https://github.com/dotnet/aspnetcore - 80f0a03068065c8609b19d6bfa228accd18ae468 + 16138c92521c55a5ecb99bcc55195a8551510f2b - + https://github.com/dotnet/aspnetcore - 80f0a03068065c8609b19d6bfa228accd18ae468 + 16138c92521c55a5ecb99bcc55195a8551510f2b https://github.com/dotnet/test-templates @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 17e8e7ee9843107d2be5f3b570f1e831cf90d1cd - + https://github.com/dotnet/sdk - 197090a6e1954fbcf29f59a444692676f51357f5 + 4561d21212369228f14357bd1df5709f27f16484 - + https://github.com/dotnet/sdk - 197090a6e1954fbcf29f59a444692676f51357f5 + 4561d21212369228f14357bd1df5709f27f16484 diff --git a/eng/Versions.props b/eng/Versions.props index 34691e834..5c111608c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,20 +45,20 @@ - 6.0.0-preview.5.21229.3 - 6.0.0-preview.5.21229.3 - 6.0.0-preview.5.21229.3 - 6.0.0-preview.5.21229.3 - 6.0.0-preview.5.21229.3 - 6.0.0-preview.5.21229.3 + 6.0.0-preview.5.21229.5 + 6.0.0-preview.5.21229.5 + 6.0.0-preview.5.21229.5 + 6.0.0-preview.5.21229.5 + 6.0.0-preview.5.21229.5 + 6.0.0-preview.5.21229.5 0.2.0 - 6.0.100-preview.5.21229.24 - 6.0.100-preview.5.21229.24 + 6.0.100-preview.5.21229.27 + 6.0.100-preview.5.21229.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From aca7b90e093c0d5af70ba055be9852244a700d81 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 30 Apr 2021 05:34:07 +0000 Subject: [PATCH 28/77] Update dependencies from https://github.com/dotnet/sdk build 20210429.28 (#10426) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.5.21229.5 to 6.0.0-preview.5.21229.6 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.5.21229.5 to 6.0.0-preview.5.21229.6 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.5.21229.5 to 6.0.0-preview.5.21229.6 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21229.5 to 6.0.0-preview.5.21229.6 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-preview.5.21229.5 to 6.0.0-preview.5.21229.6 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-preview.5.21229.5 to 6.0.0-preview.5.21229.6 (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 c6c2223f8..d0d68f778 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime 6a5bc5315a6416de33655e127b5fbc5cb97a16a7 - + https://github.com/dotnet/aspnetcore - 16138c92521c55a5ecb99bcc55195a8551510f2b + b1c34c8d357d25617924a0edfd9290b5bc745263 - + https://github.com/dotnet/aspnetcore - 16138c92521c55a5ecb99bcc55195a8551510f2b + b1c34c8d357d25617924a0edfd9290b5bc745263 - + https://github.com/dotnet/aspnetcore - 16138c92521c55a5ecb99bcc55195a8551510f2b + b1c34c8d357d25617924a0edfd9290b5bc745263 - + https://github.com/dotnet/aspnetcore - 16138c92521c55a5ecb99bcc55195a8551510f2b + b1c34c8d357d25617924a0edfd9290b5bc745263 - + https://github.com/dotnet/aspnetcore - 16138c92521c55a5ecb99bcc55195a8551510f2b + b1c34c8d357d25617924a0edfd9290b5bc745263 - + https://github.com/dotnet/aspnetcore - 16138c92521c55a5ecb99bcc55195a8551510f2b + b1c34c8d357d25617924a0edfd9290b5bc745263 https://github.com/dotnet/test-templates @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 17e8e7ee9843107d2be5f3b570f1e831cf90d1cd - + https://github.com/dotnet/sdk - 4561d21212369228f14357bd1df5709f27f16484 + 5b787fafcdb61dfe28a53616defbbaa6911e1c0e - + https://github.com/dotnet/sdk - 4561d21212369228f14357bd1df5709f27f16484 + 5b787fafcdb61dfe28a53616defbbaa6911e1c0e diff --git a/eng/Versions.props b/eng/Versions.props index 5c111608c..caaf16701 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,20 +45,20 @@ - 6.0.0-preview.5.21229.5 - 6.0.0-preview.5.21229.5 - 6.0.0-preview.5.21229.5 - 6.0.0-preview.5.21229.5 - 6.0.0-preview.5.21229.5 - 6.0.0-preview.5.21229.5 + 6.0.0-preview.5.21229.6 + 6.0.0-preview.5.21229.6 + 6.0.0-preview.5.21229.6 + 6.0.0-preview.5.21229.6 + 6.0.0-preview.5.21229.6 + 6.0.0-preview.5.21229.6 0.2.0 - 6.0.100-preview.5.21229.27 - 6.0.100-preview.5.21229.27 + 6.0.100-preview.5.21229.28 + 6.0.100-preview.5.21229.28 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d096cb92f5ae8bdbc9b964a41126bfaf64ab4dd8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 30 Apr 2021 06:28:33 +0000 Subject: [PATCH 29/77] Update dependencies from https://github.com/dotnet/sdk build 20210429.29 (#10427) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.5.21229.6 to 6.0.0-preview.5.21229.9 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.5.21229.6 to 6.0.0-preview.5.21229.9 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.5.21229.6 to 6.0.0-preview.5.21229.9 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21229.6 to 6.0.0-preview.5.21229.9 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-preview.5.21229.6 to 6.0.0-preview.5.21229.9 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-preview.5.21229.6 to 6.0.0-preview.5.21229.9 (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 d0d68f778..701bcb577 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime 6a5bc5315a6416de33655e127b5fbc5cb97a16a7 - + https://github.com/dotnet/aspnetcore - b1c34c8d357d25617924a0edfd9290b5bc745263 + 547de595414d6ebb9ddeaa4a231815449c9f3c60 - + https://github.com/dotnet/aspnetcore - b1c34c8d357d25617924a0edfd9290b5bc745263 + 547de595414d6ebb9ddeaa4a231815449c9f3c60 - + https://github.com/dotnet/aspnetcore - b1c34c8d357d25617924a0edfd9290b5bc745263 + 547de595414d6ebb9ddeaa4a231815449c9f3c60 - + https://github.com/dotnet/aspnetcore - b1c34c8d357d25617924a0edfd9290b5bc745263 + 547de595414d6ebb9ddeaa4a231815449c9f3c60 - + https://github.com/dotnet/aspnetcore - b1c34c8d357d25617924a0edfd9290b5bc745263 + 547de595414d6ebb9ddeaa4a231815449c9f3c60 - + https://github.com/dotnet/aspnetcore - b1c34c8d357d25617924a0edfd9290b5bc745263 + 547de595414d6ebb9ddeaa4a231815449c9f3c60 https://github.com/dotnet/test-templates @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 17e8e7ee9843107d2be5f3b570f1e831cf90d1cd - + https://github.com/dotnet/sdk - 5b787fafcdb61dfe28a53616defbbaa6911e1c0e + da50c5d78622b7bd5929af4b9e6989911d52a13b - + https://github.com/dotnet/sdk - 5b787fafcdb61dfe28a53616defbbaa6911e1c0e + da50c5d78622b7bd5929af4b9e6989911d52a13b diff --git a/eng/Versions.props b/eng/Versions.props index caaf16701..824111604 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,20 +45,20 @@ - 6.0.0-preview.5.21229.6 - 6.0.0-preview.5.21229.6 - 6.0.0-preview.5.21229.6 - 6.0.0-preview.5.21229.6 - 6.0.0-preview.5.21229.6 - 6.0.0-preview.5.21229.6 + 6.0.0-preview.5.21229.9 + 6.0.0-preview.5.21229.9 + 6.0.0-preview.5.21229.9 + 6.0.0-preview.5.21229.9 + 6.0.0-preview.5.21229.9 + 6.0.0-preview.5.21229.9 0.2.0 - 6.0.100-preview.5.21229.28 - 6.0.100-preview.5.21229.28 + 6.0.100-preview.5.21229.29 + 6.0.100-preview.5.21229.29 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ac6ce6b6b551a5377b0b92b4d681bcf82a8ffdc2 Mon Sep 17 00:00:00 2001 From: Vlada Shubina Date: Fri, 30 Apr 2021 15:20:20 +0300 Subject: [PATCH 30/77] added tests to check if the templates shipped with SDK have net6.0 set as default framework (#10238) * fixes dotnet/templating#3054 dotnet/templating#2797 checks if the templates shipped with SDK have net6.0 set as default framework adds new data sets for templating managed templates adds basic tests on item templates as they were missing console templates are targeting net6.0 already so fixes dotnet/installer#8974 * made a special case for 'grpc' not to run on linux-musl --- test/EndToEnd/ProjectBuildTests.cs | 239 +++++++++++++++++++++++++---- 1 file changed, 206 insertions(+), 33 deletions(-) diff --git a/test/EndToEnd/ProjectBuildTests.cs b/test/EndToEnd/ProjectBuildTests.cs index b44c71202..3e71cff75 100644 --- a/test/EndToEnd/ProjectBuildTests.cs +++ b/test/EndToEnd/ProjectBuildTests.cs @@ -1,10 +1,12 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using System; using System.IO; using System.Linq; using System.Runtime.InteropServices; using System.Xml.Linq; +using FluentAssertions; using Microsoft.DotNet.TestFramework; using Microsoft.DotNet.Tools.Test.Utilities; using Xunit; @@ -13,21 +15,6 @@ namespace EndToEnd.Tests { public class ProjectBuildTests : TestBase { - // TODO: Once console template is updated to target net6.0, remove this logic - // https://github.com/dotnet/installer/issues/8974 - void RetargetProject(string projectDirectory) - { - var projectFile = Directory.GetFiles(projectDirectory, "*.csproj").Single(); - - var projectXml = XDocument.Load(projectFile); - var ns = projectXml.Root.Name.Namespace; - - projectXml.Root.Element(ns + "PropertyGroup") - .Element(ns + "TargetFramework").Value = "net6.0"; - - projectXml.Save(projectFile); - } - [Fact] public void ItCanNewRestoreBuildRunCleanMSBuildProject() { @@ -40,8 +27,6 @@ namespace EndToEnd.Tests .Execute(newArgs) .Should().Pass(); - RetargetProject(projectDirectory); - new RestoreCommand() .WithWorkingDirectory(projectDirectory) .Execute() @@ -80,8 +65,6 @@ namespace EndToEnd.Tests .Execute(newArgs) .Should().Pass(); - RetargetProject(projectDirectory); - string projectPath = Path.Combine(projectDirectory, directory.Name + ".csproj"); var project = XDocument.Load(projectPath); @@ -156,15 +139,48 @@ namespace EndToEnd.Tests } [Theory] + // microsoft.dotnet.common.projectemplates templates [InlineData("console")] + [InlineData("console", "C#")] + [InlineData("console", "VB")] + [InlineData("console", "F#")] [InlineData("classlib")] + [InlineData("classlib", "C#")] + [InlineData("classlib", "VB")] + [InlineData("classlib", "F#")] + [InlineData("mstest")] [InlineData("nunit")] [InlineData("web")] [InlineData("mvc")] - public void ItCanBuildTemplates(string templateName) + public void ItCanBuildTemplates(string templateName, string language = "") { - TestTemplateBuild(templateName); + TestTemplateCreateAndBuild(templateName, language: language); + } + + [Theory] + // microsoft.dotnet.common.itemtemplates templates + [InlineData("globaljson")] + [InlineData("nugetconfig")] + [InlineData("webconfig")] + [InlineData("gitignore")] + [InlineData("tool-manifest")] + [InlineData("sln")] + public void ItCanCreateItemTemplate(string templateName) + { + DirectoryInfo directory = TestAssets.CreateTestDirectory(identifier: templateName); + string projectDirectory = directory.FullName; + + string newArgs = $"{templateName} --debug:ephemeral-hive"; + + new NewCommandShim() + .WithWorkingDirectory(projectDirectory) + .Execute(newArgs) + .Should().Pass(); + + //check if the template created files + Assert.True(directory.Exists); + Assert.True(directory.EnumerateFileSystemInfos().Any()); } [WindowsOnlyTheory] @@ -172,14 +188,14 @@ namespace EndToEnd.Tests [InlineData("winforms", Skip = "https://github.com/dotnet/wpf/issues/2363")] public void ItCanBuildDesktopTemplates(string templateName) { - TestTemplateBuild(templateName); + TestTemplateCreateAndBuild(templateName); } [WindowsOnlyTheory] [InlineData("wpf", Skip = "https://github.com/dotnet/wpf/issues/2363")] public void ItCanBuildDesktopTemplatesSelfContained(string templateName) { - TestTemplateBuild(templateName); + TestTemplateCreateAndBuild(templateName); } [Theory] @@ -187,27 +203,184 @@ namespace EndToEnd.Tests [InlineData("console")] public void ItCanBuildTemplatesSelfContained(string templateName) { - TestTemplateBuild(templateName, selfContained: true); + TestTemplateCreateAndBuild(templateName, selfContained: true); } - private void TestTemplateBuild(string templateName, bool selfContained = false) + /// + /// The test checks if the template creates the template for correct framework by default. + /// For .NET 6 the templates should create the projects targeting net6.0 + /// + [Theory] + [InlineData("console")] + [InlineData("console", "C#")] + [InlineData("console", "VB")] + [InlineData("console", "F#")] + [InlineData("classlib")] + [InlineData("classlib", "C#")] + [InlineData("classlib", "VB")] + [InlineData("classlib", "F#")] + [InlineData("worker")] + [InlineData("worker", "C#")] + [InlineData("worker", "F#")] + [InlineData("mstest")] + [InlineData("mstest", "C#")] + [InlineData("mstest", "VB")] + [InlineData("mstest", "F#")] + [InlineData("nunit")] + [InlineData("nunit", "C#")] + [InlineData("nunit", "VB")] + [InlineData("nunit", "F#")] + [InlineData("xunit")] + [InlineData("xunit", "C#")] + [InlineData("xunit", "VB")] + [InlineData("xunit", "F#")] + [InlineData("blazorserver")] + [InlineData("blazorwasm")] + [InlineData("web")] + [InlineData("web", "C#")] + [InlineData("web", "F#")] + [InlineData("mvc")] + [InlineData("mvc", "C#")] + [InlineData("mvc", "F#")] + [InlineData("webapi")] + [InlineData("webapi", "C#")] + [InlineData("webapi", "F#")] + [InlineData("webapp")] + [InlineData("razorclasslib")] + public void ItCanCreateAndBuildTemplatesWithDefaultFramework(string templateName, string language = "") { - var directory = TestAssets.CreateTestDirectory(identifier: templateName); + string framework = DetectExpectedDefaultFramework(); + TestTemplateCreateAndBuild(templateName, selfContained: true, language: language, framework: framework); + } + + /// + /// The test checks if the template creates the template for correct framework by default. + /// For .NET 6 the templates should create the projects targeting net6.0. + /// These templates require node.js to be built, so we just check if TargetFramework is present in csproj files + /// + [Theory] + [InlineData("angular")] + [InlineData("react")] + [InlineData("reactredux")] + public void ItCanCreateTemplateWithDefaultFramework(string templateName) + { + string framework = DetectExpectedDefaultFramework(); + TestTemplateCreateAndBuild(templateName, build: false, framework: framework); + } + + /// + /// [Windows only tests] + /// The test checks if the template creates the template for correct framework by default. + /// For .NET 6 the templates should create the projects targeting net6.0. + /// + [WindowsOnlyTheory] + [InlineData("wpf")] + [InlineData("wpf", "C#")] + [InlineData("wpf", "VB")] + [InlineData("wpflib")] + [InlineData("wpflib", "C#")] + [InlineData("wpflib", "VB")] + [InlineData("wpfcustomcontrollib")] + [InlineData("wpfcustomcontrollib", "C#")] + [InlineData("wpfcustomcontrollib", "VB")] + [InlineData("wpfusercontrollib")] + [InlineData("wpfusercontrollib", "C#")] + [InlineData("wpfusercontrollib", "VB")] + [InlineData("winforms")] + [InlineData("winforms", "C#")] + [InlineData("winforms", "VB")] + [InlineData("winformslib")] + [InlineData("winformslib", "C#")] + [InlineData("winformslib", "VB")] + [InlineData("winformscontrollib")] + [InlineData("winformscontrollib", "C#")] + [InlineData("winformscontrollib", "VB")] + public void ItCanCreateAndBuildTemplatesWithDefaultFramework_Windows(string templateName, string language = "") + { + string framework = DetectExpectedDefaultFramework(); + TestTemplateCreateAndBuild(templateName, selfContained: true, language: language, framework: $"{framework}-windows"); + } + + /// + /// [project is not built on linux-musl] + /// The test checks if the template creates the template for correct framework by default. + /// For .NET 6 the templates should create the projects targeting net6.0. + /// + [Theory] + [InlineData("grpc")] + public void ItCanCreateAndBuildTemplatesWithDefaultFramework_DisableBuildOnLinuxMusl(string templateName) + { + string framework = DetectExpectedDefaultFramework(); + + if (RuntimeInformation.RuntimeIdentifier.StartsWith("alpine")) //linux musl + { + TestTemplateCreateAndBuild(templateName, build: false, framework: framework); + } + else + { + TestTemplateCreateAndBuild(templateName, selfContained: true, framework: framework); + } + } + + private static string DetectExpectedDefaultFramework() + { + string dotnetFolder = Path.GetDirectoryName(RepoDirectoriesProvider.DotnetUnderTest); + string[] runtimeFolders = Directory.GetDirectories(Path.Combine(dotnetFolder, "shared", "Microsoft.NETCore.App")); + + int latestMajorVersion = runtimeFolders.Select(folder => int.Parse(Path.GetFileName(folder).Split('.').First())).Max(); + if (latestMajorVersion == 6) + { + return "net6.0"; + } + throw new Exception("Unsupported version of SDK"); + } + + private static void TestTemplateCreateAndBuild(string templateName, bool build = true, bool selfContained = false, string language = "", string framework = "") + { + DirectoryInfo directory = TestAssets.CreateTestDirectory(identifier: string.IsNullOrWhiteSpace(language) ? templateName : $"{templateName}[{language}]"); string projectDirectory = directory.FullName; string newArgs = $"{templateName} --debug:ephemeral-hive --no-restore"; + if (!string.IsNullOrWhiteSpace(language)) + { + newArgs += $" --language {language}"; + } + new NewCommandShim() .WithWorkingDirectory(projectDirectory) .Execute(newArgs) .Should().Pass(); - var buildArgs = selfContained ? "" :$"-r {RuntimeInformation.RuntimeIdentifier}"; - var dotnetRoot = Path.GetDirectoryName(RepoDirectoriesProvider.DotnetUnderTest); - new BuildCommand() - .WithEnvironmentVariable("PATH", dotnetRoot) // override PATH since razor rely on PATH to find dotnet - .WithWorkingDirectory(projectDirectory) - .Execute(buildArgs) - .Should().Pass(); + if (!string.IsNullOrWhiteSpace(framework)) + { + //check if MSBuild TargetFramework property for *proj is set to expected framework + string expectedExtension = language switch + { + "C#" => "*.csproj", + "F#" => "*.fsproj", + "VB" => "*.vbproj", + _ => "*.csproj" + }; + string projectFile = Directory.GetFiles(projectDirectory, expectedExtension).Single(); + XDocument projectXml = XDocument.Load(projectFile); + XNamespace ns = projectXml.Root.Name.Namespace; + Assert.Equal(framework, projectXml.Root.Element(ns + "PropertyGroup").Element(ns + "TargetFramework").Value); + } + + if (build) + { + string buildArgs = selfContained ? "" : $"-r {RuntimeInformation.RuntimeIdentifier}"; + if (!string.IsNullOrWhiteSpace(framework)) + { + buildArgs += $" --framework {framework}"; + } + string dotnetRoot = Path.GetDirectoryName(RepoDirectoriesProvider.DotnetUnderTest); + new BuildCommand() + .WithEnvironmentVariable("PATH", dotnetRoot) // override PATH since razor rely on PATH to find dotnet + .WithWorkingDirectory(projectDirectory) + .Execute(buildArgs) + .Should().Pass(); + } } } } From f64a58d612091804703be86c10f942f71b493949 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 30 Apr 2021 14:57:00 +0000 Subject: [PATCH 31/77] [main] Update dependencies from dotnet/sdk (#10429) [main] 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 701bcb577..5427fca31 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 17e8e7ee9843107d2be5f3b570f1e831cf90d1cd - + https://github.com/dotnet/sdk - da50c5d78622b7bd5929af4b9e6989911d52a13b + f10505ebd4ba4006d0891b679d3fc39242dd22d2 - + https://github.com/dotnet/sdk - da50c5d78622b7bd5929af4b9e6989911d52a13b + f10505ebd4ba4006d0891b679d3fc39242dd22d2 diff --git a/eng/Versions.props b/eng/Versions.props index 824111604..3f0952ae8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-preview.5.21229.29 - 6.0.100-preview.5.21229.29 + 6.0.100-preview.5.21230.2 + 6.0.100-preview.5.21230.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d2bca6238100fc4b7c029beded4db138ac58c3af Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 30 Apr 2021 15:52:07 +0000 Subject: [PATCH 32/77] Update dependencies from https://github.com/dotnet/sdk build 20210430.3 (#10431) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-preview.5.21229.2 to 6.0.100-preview.5.21230.2 (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 5427fca31..6975b730f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,17 +79,17 @@ https://github.com/dotnet/test-templates 36a1b45f75489255f2d1770acd2d78c5002d4679 - + https://github.com/dotnet/templating - 17e8e7ee9843107d2be5f3b570f1e831cf90d1cd + 9c100429018dd530ef432898eeb739db61590874 - + https://github.com/dotnet/sdk - f10505ebd4ba4006d0891b679d3fc39242dd22d2 + 0c662786676b15d423d7103ac55a593b60348923 - + https://github.com/dotnet/sdk - f10505ebd4ba4006d0891b679d3fc39242dd22d2 + 0c662786676b15d423d7103ac55a593b60348923 diff --git a/eng/Versions.props b/eng/Versions.props index 3f0952ae8..120628995 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -32,7 +32,7 @@ - 6.0.100-preview.5.21229.2 + 6.0.100-preview.5.21230.2 @@ -57,8 +57,8 @@ - 6.0.100-preview.5.21230.2 - 6.0.100-preview.5.21230.2 + 6.0.100-preview.5.21230.3 + 6.0.100-preview.5.21230.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ea29c8cd469f660329b75fac1d51c177730a8918 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 30 Apr 2021 16:51:00 +0000 Subject: [PATCH 33/77] Update dependencies from https://github.com/dotnet/sdk build 20210430.5 (#10433) [main] Update dependencies from dotnet/sdk - Coherency Updates: - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21229.1 to 6.0.0-preview.5.21229.9 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 6.0.0-preview.5.21229.1 to 6.0.0-preview.5.21229.9 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-preview.5.21229.1 to 6.0.0-preview.5.21229.9 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-preview.5.21229.1 to 6.0.0-preview.5.21229.9 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-preview.5.21229.1 to 6.0.0-preview.5.21229.9 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 6.0.0-preview.5.21229.1 to 6.0.0-preview.5.21229.9 (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 6975b730f..22d9d71ca 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop 9570a321daf2bd6756b91a0866bb8e0d7874190d - + https://github.com/dotnet/runtime - 6a5bc5315a6416de33655e127b5fbc5cb97a16a7 + 49aec59e52d2f0bc8e2acd297023aa8464aee00c - + https://github.com/dotnet/runtime - 6a5bc5315a6416de33655e127b5fbc5cb97a16a7 + 49aec59e52d2f0bc8e2acd297023aa8464aee00c - + https://github.com/dotnet/runtime - 6a5bc5315a6416de33655e127b5fbc5cb97a16a7 + 49aec59e52d2f0bc8e2acd297023aa8464aee00c - + https://github.com/dotnet/runtime - 6a5bc5315a6416de33655e127b5fbc5cb97a16a7 + 49aec59e52d2f0bc8e2acd297023aa8464aee00c - + https://github.com/dotnet/runtime - 6a5bc5315a6416de33655e127b5fbc5cb97a16a7 + 49aec59e52d2f0bc8e2acd297023aa8464aee00c @@ -39,9 +39,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 6a5bc5315a6416de33655e127b5fbc5cb97a16a7 + 49aec59e52d2f0bc8e2acd297023aa8464aee00c https://github.com/dotnet/aspnetcore @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 9c100429018dd530ef432898eeb739db61590874 - + https://github.com/dotnet/sdk - 0c662786676b15d423d7103ac55a593b60348923 + e8a48dd5e556e67212eaf7e76028c9a9f566f100 - + https://github.com/dotnet/sdk - 0c662786676b15d423d7103ac55a593b60348923 + e8a48dd5e556e67212eaf7e76028c9a9f566f100 diff --git a/eng/Versions.props b/eng/Versions.props index 120628995..44aa084e0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,23 +57,23 @@ - 6.0.100-preview.5.21230.3 - 6.0.100-preview.5.21230.3 + 6.0.100-preview.5.21230.5 + 6.0.100-preview.5.21230.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-preview.5.21229.1 + 6.0.0-preview.5.21229.9 - 6.0.0-preview.5.21229.1 - 6.0.0-preview.5.21229.1 - 6.0.0-preview.5.21229.1 - 6.0.0-preview.5.21229.1 - 6.0.0-preview.5.21229.1 + 6.0.0-preview.5.21229.9 + 6.0.0-preview.5.21229.9 + 6.0.0-preview.5.21229.9 + 6.0.0-preview.5.21229.9 + 6.0.0-preview.5.21229.9 2.1.0 From 516dcda17c1f27e1538ecc036fe0a2d752f4fcd0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 30 Apr 2021 18:51:13 +0000 Subject: [PATCH 34/77] [main] Update dependencies from dotnet/sdk (#10434) [main] 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 22d9d71ca..c49fc527a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 9c100429018dd530ef432898eeb739db61590874 - + https://github.com/dotnet/sdk - e8a48dd5e556e67212eaf7e76028c9a9f566f100 + 9b52a33128858566e6f9dd18f8ade2907bd51995 - + https://github.com/dotnet/sdk - e8a48dd5e556e67212eaf7e76028c9a9f566f100 + 9b52a33128858566e6f9dd18f8ade2907bd51995 diff --git a/eng/Versions.props b/eng/Versions.props index 44aa084e0..a679074df 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-preview.5.21230.5 - 6.0.100-preview.5.21230.5 + 6.0.100-preview.5.21230.7 + 6.0.100-preview.5.21230.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d8c55140ff8cf502e98b32b2c173a53389f7ba7d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 30 Apr 2021 19:36:02 +0000 Subject: [PATCH 35/77] Update dependencies from https://github.com/dotnet/sdk build 20210430.8 (#10435) [main] 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 c49fc527a..9cac322ed 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 9c100429018dd530ef432898eeb739db61590874 - + https://github.com/dotnet/sdk - 9b52a33128858566e6f9dd18f8ade2907bd51995 + 8325e90255536141940f47bfd4288655e3bbd8c0 - + https://github.com/dotnet/sdk - 9b52a33128858566e6f9dd18f8ade2907bd51995 + 8325e90255536141940f47bfd4288655e3bbd8c0 diff --git a/eng/Versions.props b/eng/Versions.props index a679074df..8f6f7809e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-preview.5.21230.7 - 6.0.100-preview.5.21230.7 + 6.0.100-preview.5.21230.8 + 6.0.100-preview.5.21230.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c713da9422cffb9190eabd551f2ca3ae9790ed05 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 30 Apr 2021 22:03:08 +0000 Subject: [PATCH 36/77] Update dependencies from https://github.com/dotnet/sdk build 20210430.9 (#10436) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.Test.Sdk: from 17.0.0-preview-20210427-01 to 17.0.0-preview-20210430-01 (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 9cac322ed..adda9aad1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 9c100429018dd530ef432898eeb739db61590874 - + https://github.com/dotnet/sdk - 8325e90255536141940f47bfd4288655e3bbd8c0 + ec2dc8c15bc4e7e1d7a8540db1c331e5b2dace5f - + https://github.com/dotnet/sdk - 8325e90255536141940f47bfd4288655e3bbd8c0 + ec2dc8c15bc4e7e1d7a8540db1c331e5b2dace5f @@ -104,9 +104,9 @@ https://github.com/dotnet/fsharp b6a352ab0a11a0584348dd77811af7eecaf9d072 - + https://github.com/microsoft/vstest - 2233e0bdc7ca37eecee62eec848adcafca81024d + 46782df35d175d5df5b0ae432d9fdf75113caa32 https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index 8f6f7809e..8f693891d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-preview.5.21230.8 - 6.0.100-preview.5.21230.8 + 6.0.100-preview.5.21230.9 + 6.0.100-preview.5.21230.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -142,7 +142,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.0.0-preview-20210427-01 + 17.0.0-preview-20210430-01 From e251100dc02ac2d89715927b4f7459c004eb61cf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 30 Apr 2021 22:45:52 +0000 Subject: [PATCH 37/77] Update dependencies from https://github.com/dotnet/sdk build 20210430.11 (#10438) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.5.21229.9 to 6.0.0-preview.5.21230.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.5.21229.9 to 6.0.0-preview.5.21230.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.5.21229.9 to 6.0.0-preview.5.21230.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21229.9 to 6.0.0-preview.5.21230.1 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-preview.5.21229.9 to 6.0.0-preview.5.21230.1 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-preview.5.21229.9 to 6.0.0-preview.5.21230.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 adda9aad1..1499aab90 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime 49aec59e52d2f0bc8e2acd297023aa8464aee00c - + https://github.com/dotnet/aspnetcore - 547de595414d6ebb9ddeaa4a231815449c9f3c60 + 0004f2c54175935a9eba4081bcae3782fdce2967 - + https://github.com/dotnet/aspnetcore - 547de595414d6ebb9ddeaa4a231815449c9f3c60 + 0004f2c54175935a9eba4081bcae3782fdce2967 - + https://github.com/dotnet/aspnetcore - 547de595414d6ebb9ddeaa4a231815449c9f3c60 + 0004f2c54175935a9eba4081bcae3782fdce2967 - + https://github.com/dotnet/aspnetcore - 547de595414d6ebb9ddeaa4a231815449c9f3c60 + 0004f2c54175935a9eba4081bcae3782fdce2967 - + https://github.com/dotnet/aspnetcore - 547de595414d6ebb9ddeaa4a231815449c9f3c60 + 0004f2c54175935a9eba4081bcae3782fdce2967 - + https://github.com/dotnet/aspnetcore - 547de595414d6ebb9ddeaa4a231815449c9f3c60 + 0004f2c54175935a9eba4081bcae3782fdce2967 https://github.com/dotnet/test-templates @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 9c100429018dd530ef432898eeb739db61590874 - + https://github.com/dotnet/sdk - ec2dc8c15bc4e7e1d7a8540db1c331e5b2dace5f + f65cd79c69a769af2f49b8c1c9029cf6948ddc1b - + https://github.com/dotnet/sdk - ec2dc8c15bc4e7e1d7a8540db1c331e5b2dace5f + f65cd79c69a769af2f49b8c1c9029cf6948ddc1b diff --git a/eng/Versions.props b/eng/Versions.props index 8f693891d..b3f5b117c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,20 +45,20 @@ - 6.0.0-preview.5.21229.9 - 6.0.0-preview.5.21229.9 - 6.0.0-preview.5.21229.9 - 6.0.0-preview.5.21229.9 - 6.0.0-preview.5.21229.9 - 6.0.0-preview.5.21229.9 + 6.0.0-preview.5.21230.1 + 6.0.0-preview.5.21230.1 + 6.0.0-preview.5.21230.1 + 6.0.0-preview.5.21230.1 + 6.0.0-preview.5.21230.1 + 6.0.0-preview.5.21230.1 0.2.0 - 6.0.100-preview.5.21230.9 - 6.0.100-preview.5.21230.9 + 6.0.100-preview.5.21230.11 + 6.0.100-preview.5.21230.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e84206992c2b63c377c02f80c2df3c1246641af2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 30 Apr 2021 23:27:16 +0000 Subject: [PATCH 38/77] Update dependencies from https://github.com/dotnet/sdk build 20210430.13 (#10440) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.Test.Sdk: from 17.0.0-preview-20210430-01 to 17.0.0-preview-20210430-02 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.0.0-2.21229.30 to 4.0.0-2.21230.16 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1499aab90..b2f437a5b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 9c100429018dd530ef432898eeb739db61590874 - + https://github.com/dotnet/sdk - f65cd79c69a769af2f49b8c1c9029cf6948ddc1b + 1011efdd33c370bf4f41e745ca719f84c8edfcb3 - + https://github.com/dotnet/sdk - f65cd79c69a769af2f49b8c1c9029cf6948ddc1b + 1011efdd33c370bf4f41e745ca719f84c8edfcb3 @@ -104,18 +104,18 @@ https://github.com/dotnet/fsharp b6a352ab0a11a0584348dd77811af7eecaf9d072 - + https://github.com/microsoft/vstest - 46782df35d175d5df5b0ae432d9fdf75113caa32 + 899fe6fa7df46ff3a7eb79caa470762531e4be53 https://github.com/mono/linker 307f6b0afd2fea639fffa97e67155bafe6aa8461 linker - + https://github.com/dotnet/roslyn - bce5da1c0f25a920cef314c94036e5a08120a19e + 12de5951b59dc980d3b449940c195d88228ef2ba https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index b3f5b117c..3d831e3a2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-preview.5.21230.11 - 6.0.100-preview.5.21230.11 + 6.0.100-preview.5.21230.13 + 6.0.100-preview.5.21230.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -142,7 +142,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.0.0-preview-20210430-01 + 17.0.0-preview-20210430-02 From fd35d1462bfae0550ed85666c3bec5b4621e7584 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 1 May 2021 00:15:17 +0000 Subject: [PATCH 39/77] Update dependencies from https://github.com/dotnet/sdk build 20210430.15 (#10441) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.5.21230.1 to 6.0.0-preview.5.21230.2 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.5.21230.1 to 6.0.0-preview.5.21230.2 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.5.21230.1 to 6.0.0-preview.5.21230.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21230.1 to 6.0.0-preview.5.21230.2 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-preview.5.21230.1 to 6.0.0-preview.5.21230.2 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-preview.5.21230.1 to 6.0.0-preview.5.21230.2 (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 b2f437a5b..78b370d6f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime 49aec59e52d2f0bc8e2acd297023aa8464aee00c - + https://github.com/dotnet/aspnetcore - 0004f2c54175935a9eba4081bcae3782fdce2967 + eba50232b08c526cfe19f7a9097ce2a8469a2b13 - + https://github.com/dotnet/aspnetcore - 0004f2c54175935a9eba4081bcae3782fdce2967 + eba50232b08c526cfe19f7a9097ce2a8469a2b13 - + https://github.com/dotnet/aspnetcore - 0004f2c54175935a9eba4081bcae3782fdce2967 + eba50232b08c526cfe19f7a9097ce2a8469a2b13 - + https://github.com/dotnet/aspnetcore - 0004f2c54175935a9eba4081bcae3782fdce2967 + eba50232b08c526cfe19f7a9097ce2a8469a2b13 - + https://github.com/dotnet/aspnetcore - 0004f2c54175935a9eba4081bcae3782fdce2967 + eba50232b08c526cfe19f7a9097ce2a8469a2b13 - + https://github.com/dotnet/aspnetcore - 0004f2c54175935a9eba4081bcae3782fdce2967 + eba50232b08c526cfe19f7a9097ce2a8469a2b13 https://github.com/dotnet/test-templates @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 9c100429018dd530ef432898eeb739db61590874 - + https://github.com/dotnet/sdk - 1011efdd33c370bf4f41e745ca719f84c8edfcb3 + d5c8ed0d54eae9ba5eef2a05e8e735cc0573f9bc - + https://github.com/dotnet/sdk - 1011efdd33c370bf4f41e745ca719f84c8edfcb3 + d5c8ed0d54eae9ba5eef2a05e8e735cc0573f9bc diff --git a/eng/Versions.props b/eng/Versions.props index 3d831e3a2..d8ccfb731 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,20 +45,20 @@ - 6.0.0-preview.5.21230.1 - 6.0.0-preview.5.21230.1 - 6.0.0-preview.5.21230.1 - 6.0.0-preview.5.21230.1 - 6.0.0-preview.5.21230.1 - 6.0.0-preview.5.21230.1 + 6.0.0-preview.5.21230.2 + 6.0.0-preview.5.21230.2 + 6.0.0-preview.5.21230.2 + 6.0.0-preview.5.21230.2 + 6.0.0-preview.5.21230.2 + 6.0.0-preview.5.21230.2 0.2.0 - 6.0.100-preview.5.21230.13 - 6.0.100-preview.5.21230.13 + 6.0.100-preview.5.21230.15 + 6.0.100-preview.5.21230.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d93863a998093d26cbc00e3c7258dbe7702774c3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 1 May 2021 01:04:19 +0000 Subject: [PATCH 40/77] Update dependencies from https://github.com/dotnet/sdk build 20210430.17 (#10442) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 4.0.0-2.21230.16 to 4.0.0-2.21230.18 (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 78b370d6f..5da2d7ece 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 9c100429018dd530ef432898eeb739db61590874 - + https://github.com/dotnet/sdk - d5c8ed0d54eae9ba5eef2a05e8e735cc0573f9bc + adc83305c683c48677b689efbccbd97d362b250f - + https://github.com/dotnet/sdk - d5c8ed0d54eae9ba5eef2a05e8e735cc0573f9bc + adc83305c683c48677b689efbccbd97d362b250f @@ -113,9 +113,9 @@ 307f6b0afd2fea639fffa97e67155bafe6aa8461 linker - + https://github.com/dotnet/roslyn - 12de5951b59dc980d3b449940c195d88228ef2ba + 75b17e3a34f340b3c264f234886251e7c1dcbc83 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index d8ccfb731..8b247ad3f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-preview.5.21230.15 - 6.0.100-preview.5.21230.15 + 6.0.100-preview.5.21230.17 + 6.0.100-preview.5.21230.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 34bec5688763e3bdd60dd7119f8ac4e12851b0e7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 1 May 2021 01:56:41 +0000 Subject: [PATCH 41/77] Update dependencies from https://github.com/dotnet/sdk build 20210430.18 (#10443) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.5.21230.2 to 6.0.0-preview.5.21230.3 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.5.21230.2 to 6.0.0-preview.5.21230.3 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.5.21230.2 to 6.0.0-preview.5.21230.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21230.2 to 6.0.0-preview.5.21230.3 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-preview.5.21230.2 to 6.0.0-preview.5.21230.3 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-preview.5.21230.2 to 6.0.0-preview.5.21230.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 5da2d7ece..cd8fa4f10 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime 49aec59e52d2f0bc8e2acd297023aa8464aee00c - + https://github.com/dotnet/aspnetcore - eba50232b08c526cfe19f7a9097ce2a8469a2b13 + 16d2181e664f3e8483868cc5bcce494ef007077c - + https://github.com/dotnet/aspnetcore - eba50232b08c526cfe19f7a9097ce2a8469a2b13 + 16d2181e664f3e8483868cc5bcce494ef007077c - + https://github.com/dotnet/aspnetcore - eba50232b08c526cfe19f7a9097ce2a8469a2b13 + 16d2181e664f3e8483868cc5bcce494ef007077c - + https://github.com/dotnet/aspnetcore - eba50232b08c526cfe19f7a9097ce2a8469a2b13 + 16d2181e664f3e8483868cc5bcce494ef007077c - + https://github.com/dotnet/aspnetcore - eba50232b08c526cfe19f7a9097ce2a8469a2b13 + 16d2181e664f3e8483868cc5bcce494ef007077c - + https://github.com/dotnet/aspnetcore - eba50232b08c526cfe19f7a9097ce2a8469a2b13 + 16d2181e664f3e8483868cc5bcce494ef007077c https://github.com/dotnet/test-templates @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 9c100429018dd530ef432898eeb739db61590874 - + https://github.com/dotnet/sdk - adc83305c683c48677b689efbccbd97d362b250f + 1a3b116e7c1c7af0afd847789cc5205be3b62568 - + https://github.com/dotnet/sdk - adc83305c683c48677b689efbccbd97d362b250f + 1a3b116e7c1c7af0afd847789cc5205be3b62568 diff --git a/eng/Versions.props b/eng/Versions.props index 8b247ad3f..e894d3a2c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,20 +45,20 @@ - 6.0.0-preview.5.21230.2 - 6.0.0-preview.5.21230.2 - 6.0.0-preview.5.21230.2 - 6.0.0-preview.5.21230.2 - 6.0.0-preview.5.21230.2 - 6.0.0-preview.5.21230.2 + 6.0.0-preview.5.21230.3 + 6.0.0-preview.5.21230.3 + 6.0.0-preview.5.21230.3 + 6.0.0-preview.5.21230.3 + 6.0.0-preview.5.21230.3 + 6.0.0-preview.5.21230.3 0.2.0 - 6.0.100-preview.5.21230.17 - 6.0.100-preview.5.21230.17 + 6.0.100-preview.5.21230.18 + 6.0.100-preview.5.21230.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e09aabaaf7e550a3835391617a5e1acb6c98c1cf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 1 May 2021 02:44:11 +0000 Subject: [PATCH 42/77] Update dependencies from https://github.com/dotnet/sdk build 20210430.19 (#10444) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 4.0.0-2.21230.18 to 4.0.0-2.21230.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 cd8fa4f10..823295691 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 9c100429018dd530ef432898eeb739db61590874 - + https://github.com/dotnet/sdk - 1a3b116e7c1c7af0afd847789cc5205be3b62568 + 933e5f37fe82c777353fe34e7a760554496adabb - + https://github.com/dotnet/sdk - 1a3b116e7c1c7af0afd847789cc5205be3b62568 + 933e5f37fe82c777353fe34e7a760554496adabb @@ -113,9 +113,9 @@ 307f6b0afd2fea639fffa97e67155bafe6aa8461 linker - + https://github.com/dotnet/roslyn - 75b17e3a34f340b3c264f234886251e7c1dcbc83 + b2390a5b46b96f33daa16998c4a88cf3cbef25ae https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index e894d3a2c..1e28b02e4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-preview.5.21230.18 - 6.0.100-preview.5.21230.18 + 6.0.100-preview.5.21230.19 + 6.0.100-preview.5.21230.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 226c4378ff6e7047465166a076759d8174f64b32 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 1 May 2021 03:40:04 +0000 Subject: [PATCH 43/77] Update dependencies from https://github.com/dotnet/sdk build 20210430.22 (#10446) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.5.21230.3 to 6.0.0-preview.5.21230.4 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.5.21230.3 to 6.0.0-preview.5.21230.4 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.5.21230.3 to 6.0.0-preview.5.21230.4 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21230.3 to 6.0.0-preview.5.21230.4 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-preview.5.21230.3 to 6.0.0-preview.5.21230.4 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-preview.5.21230.3 to 6.0.0-preview.5.21230.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 823295691..aa992b48c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime 49aec59e52d2f0bc8e2acd297023aa8464aee00c - + https://github.com/dotnet/aspnetcore - 16d2181e664f3e8483868cc5bcce494ef007077c + 8ef5a952d967c1a3b7731a07132c018c78a36137 - + https://github.com/dotnet/aspnetcore - 16d2181e664f3e8483868cc5bcce494ef007077c + 8ef5a952d967c1a3b7731a07132c018c78a36137 - + https://github.com/dotnet/aspnetcore - 16d2181e664f3e8483868cc5bcce494ef007077c + 8ef5a952d967c1a3b7731a07132c018c78a36137 - + https://github.com/dotnet/aspnetcore - 16d2181e664f3e8483868cc5bcce494ef007077c + 8ef5a952d967c1a3b7731a07132c018c78a36137 - + https://github.com/dotnet/aspnetcore - 16d2181e664f3e8483868cc5bcce494ef007077c + 8ef5a952d967c1a3b7731a07132c018c78a36137 - + https://github.com/dotnet/aspnetcore - 16d2181e664f3e8483868cc5bcce494ef007077c + 8ef5a952d967c1a3b7731a07132c018c78a36137 https://github.com/dotnet/test-templates @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 9c100429018dd530ef432898eeb739db61590874 - + https://github.com/dotnet/sdk - 933e5f37fe82c777353fe34e7a760554496adabb + 549296f3116fca747557b4cb380843cff55da350 - + https://github.com/dotnet/sdk - 933e5f37fe82c777353fe34e7a760554496adabb + 549296f3116fca747557b4cb380843cff55da350 diff --git a/eng/Versions.props b/eng/Versions.props index 1e28b02e4..620f55875 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,20 +45,20 @@ - 6.0.0-preview.5.21230.3 - 6.0.0-preview.5.21230.3 - 6.0.0-preview.5.21230.3 - 6.0.0-preview.5.21230.3 - 6.0.0-preview.5.21230.3 - 6.0.0-preview.5.21230.3 + 6.0.0-preview.5.21230.4 + 6.0.0-preview.5.21230.4 + 6.0.0-preview.5.21230.4 + 6.0.0-preview.5.21230.4 + 6.0.0-preview.5.21230.4 + 6.0.0-preview.5.21230.4 0.2.0 - 6.0.100-preview.5.21230.19 - 6.0.100-preview.5.21230.19 + 6.0.100-preview.5.21230.22 + 6.0.100-preview.5.21230.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5e151301c70db058ff3d5dd4083b56af749e32fa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 1 May 2021 09:46:15 +0000 Subject: [PATCH 44/77] Update dependencies from https://github.com/dotnet/sdk build 20210430.24 (#10449) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.5.21230.4 to 6.0.0-preview.5.21230.5 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.5.21230.4 to 6.0.0-preview.5.21230.5 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.5.21230.4 to 6.0.0-preview.5.21230.5 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21230.4 to 6.0.0-preview.5.21230.5 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-preview.5.21230.4 to 6.0.0-preview.5.21230.5 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-preview.5.21230.4 to 6.0.0-preview.5.21230.5 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.0.0-2.21230.20 to 4.0.0-2.21251.2 (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 aa992b48c..31ccc67ad 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime 49aec59e52d2f0bc8e2acd297023aa8464aee00c - + https://github.com/dotnet/aspnetcore - 8ef5a952d967c1a3b7731a07132c018c78a36137 + 2434aee04f2baec9ee6ed0d33fe84c8dd3009dd3 - + https://github.com/dotnet/aspnetcore - 8ef5a952d967c1a3b7731a07132c018c78a36137 + 2434aee04f2baec9ee6ed0d33fe84c8dd3009dd3 - + https://github.com/dotnet/aspnetcore - 8ef5a952d967c1a3b7731a07132c018c78a36137 + 2434aee04f2baec9ee6ed0d33fe84c8dd3009dd3 - + https://github.com/dotnet/aspnetcore - 8ef5a952d967c1a3b7731a07132c018c78a36137 + 2434aee04f2baec9ee6ed0d33fe84c8dd3009dd3 - + https://github.com/dotnet/aspnetcore - 8ef5a952d967c1a3b7731a07132c018c78a36137 + 2434aee04f2baec9ee6ed0d33fe84c8dd3009dd3 - + https://github.com/dotnet/aspnetcore - 8ef5a952d967c1a3b7731a07132c018c78a36137 + 2434aee04f2baec9ee6ed0d33fe84c8dd3009dd3 https://github.com/dotnet/test-templates @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 9c100429018dd530ef432898eeb739db61590874 - + https://github.com/dotnet/sdk - 549296f3116fca747557b4cb380843cff55da350 + 0121d59e23a16913661082da31de82257076f15d - + https://github.com/dotnet/sdk - 549296f3116fca747557b4cb380843cff55da350 + 0121d59e23a16913661082da31de82257076f15d @@ -113,9 +113,9 @@ 307f6b0afd2fea639fffa97e67155bafe6aa8461 linker - + https://github.com/dotnet/roslyn - b2390a5b46b96f33daa16998c4a88cf3cbef25ae + ec9be53666c3b56648072daf7af0fb88e9f269f5 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 620f55875..24aaf2d74 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,20 +45,20 @@ - 6.0.0-preview.5.21230.4 - 6.0.0-preview.5.21230.4 - 6.0.0-preview.5.21230.4 - 6.0.0-preview.5.21230.4 - 6.0.0-preview.5.21230.4 - 6.0.0-preview.5.21230.4 + 6.0.0-preview.5.21230.5 + 6.0.0-preview.5.21230.5 + 6.0.0-preview.5.21230.5 + 6.0.0-preview.5.21230.5 + 6.0.0-preview.5.21230.5 + 6.0.0-preview.5.21230.5 0.2.0 - 6.0.100-preview.5.21230.22 - 6.0.100-preview.5.21230.22 + 6.0.100-preview.5.21230.24 + 6.0.100-preview.5.21230.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1d1884b8361b990b134765bcf0cfd6d5542b81b7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 1 May 2021 13:00:30 +0000 Subject: [PATCH 45/77] [main] Update dependencies from dotnet/arcade (#10430) [main] Update dependencies from dotnet/arcade - Coherency Updates: - Microsoft.SourceLink.GitHub: from 1.1.0-beta-21201-01 to 1.1.0-beta-21228-01 (parent: Microsoft.DotNet.Arcade.Sdk) --- eng/Version.Details.xml | 10 +-- eng/Versions.props | 2 +- eng/common/post-build/symbols-validation.ps1 | 94 +++++++++++--------- global.json | 2 +- 4 files changed, 58 insertions(+), 50 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 31ccc67ad..832b9bfe8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -136,20 +136,20 @@ - + https://github.com/dotnet/arcade - e1044f09e18638a98a9f0448086a7295f3d16834 + 46ad27d3cc557f2b84ce30b2c4e27438526dc91d - + https://github.com/dotnet/arcade - e1044f09e18638a98a9f0448086a7295f3d16834 + 46ad27d3cc557f2b84ce30b2c4e27438526dc91d https://github.com/dotnet/source-build-reference-packages 639aeb4d76c8b1a6226bf7c4edb34fbdae30e6e1 - + https://github.com/dotnet/sourcelink 4b584dbc392bb1aad49c2eb1ab84d8b489b6dccc diff --git a/eng/Versions.props b/eng/Versions.props index 24aaf2d74..3998c0764 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ - 6.0.0-beta.21228.3 + 6.0.0-beta.21230.2 diff --git a/eng/common/post-build/symbols-validation.ps1 b/eng/common/post-build/symbols-validation.ps1 index 99bf28cd5..e6d5d2fd0 100644 --- a/eng/common/post-build/symbols-validation.ps1 +++ b/eng/common/post-build/symbols-validation.ps1 @@ -1,9 +1,10 @@ param( - [Parameter(Mandatory=$true)][string] $InputPath, # Full path to directory where NuGet packages to be checked are stored - [Parameter(Mandatory=$true)][string] $ExtractPath, # Full path to directory where the packages will be extracted during validation - [Parameter(Mandatory=$true)][string] $DotnetSymbolVersion, # Version of dotnet symbol to use - [Parameter(Mandatory=$false)][switch] $ContinueOnError, # If we should keep checking symbols after an error - [Parameter(Mandatory=$false)][switch] $Clean # Clean extracted symbols directory after checking symbols + [Parameter(Mandatory = $true)][string] $InputPath, # Full path to directory where NuGet packages to be checked are stored + [Parameter(Mandatory = $true)][string] $ExtractPath, # Full path to directory where the packages will be extracted during validation + [Parameter(Mandatory = $true)][string] $DotnetSymbolVersion, # Version of dotnet symbol to use + [Parameter(Mandatory = $false)][switch] $CheckForWindowsPdbs, # If we should check for the existence of windows pdbs in addition to portable PDBs + [Parameter(Mandatory = $false)][switch] $ContinueOnError, # If we should keep checking symbols after an error + [Parameter(Mandatory = $false)][switch] $Clean # Clean extracted symbols directory after checking symbols ) # Maximum number of jobs to run in parallel @@ -19,9 +20,15 @@ $SecondsBetweenLoadChecks = 10 Set-Variable -Name "ERROR_BADEXTRACT" -Option Constant -Value -1 Set-Variable -Name "ERROR_FILEDOESNOTEXIST" -Option Constant -Value -2 +$WindowsPdbVerificationParam = "" +if ($CheckForWindowsPdbs) { + $WindowsPdbVerificationParam = "--windows-pdbs" +} + $CountMissingSymbols = { param( - [string] $PackagePath # Path to a NuGet package + [string] $PackagePath, # Path to a NuGet package + [string] $WindowsPdbVerificationParam # If we should check for the existence of windows pdbs in addition to portable PDBs ) . $using:PSScriptRoot\..\tools.ps1 @@ -34,7 +41,7 @@ $CountMissingSymbols = { if (!(Test-Path $PackagePath)) { Write-PipelineTaskError "Input file does not exist: $PackagePath" return [pscustomobject]@{ - result = $using:ERROR_FILEDOESNOTEXIST + result = $using:ERROR_FILEDOESNOTEXIST packagePath = $PackagePath } } @@ -57,24 +64,25 @@ $CountMissingSymbols = { Write-Host "Something went wrong extracting $PackagePath" Write-Host $_ return [pscustomobject]@{ - result = $using:ERROR_BADEXTRACT + result = $using:ERROR_BADEXTRACT packagePath = $PackagePath } } Get-ChildItem -Recurse $ExtractPath | - Where-Object {$RelevantExtensions -contains $_.Extension} | - ForEach-Object { - $FileName = $_.FullName - if ($FileName -Match '\\ref\\') { - Write-Host "`t Ignoring reference assembly file " $FileName - return - } + Where-Object { $RelevantExtensions -contains $_.Extension } | + ForEach-Object { + $FileName = $_.FullName + if ($FileName -Match '\\ref\\') { + Write-Host "`t Ignoring reference assembly file " $FileName + return + } - $FirstMatchingSymbolDescriptionOrDefault = { + $FirstMatchingSymbolDescriptionOrDefault = { param( - [string] $FullPath, # Full path to the module that has to be checked - [string] $TargetServerParam, # Parameter to pass to `Symbol Tool` indicating the server to lookup for symbols + [string] $FullPath, # Full path to the module that has to be checked + [string] $TargetServerParam, # Parameter to pass to `Symbol Tool` indicating the server to lookup for symbols + [string] $WindowsPdbVerificationParam, # Parameter to pass to potential check for windows-pdbs. [string] $SymbolsPath ) @@ -99,7 +107,7 @@ $CountMissingSymbols = { # DWARF file for a .dylib $DylibDwarf = $SymbolPath.Replace($Extension, '.dylib.dwarf') - + $dotnetSymbolExe = "$env:USERPROFILE\.dotnet\tools" $dotnetSymbolExe = Resolve-Path "$dotnetSymbolExe\dotnet-symbol.exe" @@ -107,7 +115,7 @@ $CountMissingSymbols = { while ($totalRetries -lt $using:MaxRetry) { # Save the output and get diagnostic output - $output = & $dotnetSymbolExe --symbols --modules --windows-pdbs $TargetServerParam $FullPath -o $SymbolsPath --diagnostics | Out-String + $output = & $dotnetSymbolExe --symbols --modules $WindowsPdbVerificationParam $TargetServerParam $FullPath -o $SymbolsPath --diagnostics | Out-String if (Test-Path $PdbPath) { return 'PDB' @@ -136,30 +144,30 @@ $CountMissingSymbols = { return $null } - $SymbolsOnMSDL = & $FirstMatchingSymbolDescriptionOrDefault $FileName '--microsoft-symbol-server' $SymbolsPath - $SymbolsOnSymWeb = & $FirstMatchingSymbolDescriptionOrDefault $FileName '--internal-server' $SymbolsPath + $SymbolsOnMSDL = & $FirstMatchingSymbolDescriptionOrDefault $FileName '--microsoft-symbol-server' $SymbolsPath $WindowsPdbVerificationParam + $SymbolsOnSymWeb = & $FirstMatchingSymbolDescriptionOrDefault $FileName '--internal-server' $SymbolsPath $WindowsPdbVerificationParam - Write-Host -NoNewLine "`t Checking file " $FileName "... " + Write-Host -NoNewLine "`t Checking file " $FileName "... " - if ($SymbolsOnMSDL -ne $null -and $SymbolsOnSymWeb -ne $null) { - Write-Host "Symbols found on MSDL ($SymbolsOnMSDL) and SymWeb ($SymbolsOnSymWeb)" + if ($SymbolsOnMSDL -ne $null -and $SymbolsOnSymWeb -ne $null) { + Write-Host "Symbols found on MSDL ($SymbolsOnMSDL) and SymWeb ($SymbolsOnSymWeb)" + } + else { + $MissingSymbols++ + + if ($SymbolsOnMSDL -eq $null -and $SymbolsOnSymWeb -eq $null) { + Write-Host 'No symbols found on MSDL or SymWeb!' } else { - $MissingSymbols++ - - if ($SymbolsOnMSDL -eq $null -and $SymbolsOnSymWeb -eq $null) { - Write-Host 'No symbols found on MSDL or SymWeb!' + if ($SymbolsOnMSDL -eq $null) { + Write-Host 'No symbols found on MSDL!' } else { - if ($SymbolsOnMSDL -eq $null) { - Write-Host 'No symbols found on MSDL!' - } - else { - Write-Host 'No symbols found on SymWeb!' - } + Write-Host 'No symbols found on SymWeb!' } } } + } if ($using:Clean) { Remove-Item $ExtractPath -Recurse -Force @@ -168,16 +176,16 @@ $CountMissingSymbols = { Pop-Location return [pscustomobject]@{ - result = $MissingSymbols - packagePath = $PackagePath - } + result = $MissingSymbols + packagePath = $PackagePath + } } function CheckJobResult( - $result, - $packagePath, - [ref]$DupedSymbols, - [ref]$TotalFailures) { + $result, + $packagePath, + [ref]$DupedSymbols, + [ref]$TotalFailures) { if ($result -eq $ERROR_BADEXTRACT) { Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "$packagePath has duplicated symbol files" $DupedSymbols.Value++ @@ -222,7 +230,7 @@ function CheckSymbolsAvailable { return } - Start-Job -ScriptBlock $CountMissingSymbols -ArgumentList $FullName | Out-Null + Start-Job -ScriptBlock $CountMissingSymbols -ArgumentList @($FullName,$WindowsPdbVerificationParam) | Out-Null $NumJobs = @(Get-Job -State 'Running').Count diff --git a/global.json b/global.json index 421227a50..44a00c720 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21228.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21230.2" } } From 72024adff2c74a51d22d33bc162742ef42b22033 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 1 May 2021 14:50:43 +0000 Subject: [PATCH 46/77] Update dependencies from https://github.com/dotnet/sdk build 20210501.1 (#10450) [main] Update dependencies from dotnet/sdk - Coherency Updates: - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21229.9 to 6.0.0-preview.5.21251.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 6.0.0-preview.5.21229.9 to 6.0.0-preview.5.21251.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-preview.5.21229.9 to 6.0.0-preview.5.21251.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-preview.5.21229.9 to 6.0.0-preview.5.21251.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-preview.5.21229.9 to 6.0.0-preview.5.21251.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 6.0.0-preview.5.21229.9 to 6.0.0-preview.5.21251.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 832b9bfe8..a8ffbcc30 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop 9570a321daf2bd6756b91a0866bb8e0d7874190d - + https://github.com/dotnet/runtime - 49aec59e52d2f0bc8e2acd297023aa8464aee00c + 7ea91b742cc1646bd1611749a8179fba2fcdc3af - + https://github.com/dotnet/runtime - 49aec59e52d2f0bc8e2acd297023aa8464aee00c + 7ea91b742cc1646bd1611749a8179fba2fcdc3af - + https://github.com/dotnet/runtime - 49aec59e52d2f0bc8e2acd297023aa8464aee00c + 7ea91b742cc1646bd1611749a8179fba2fcdc3af - + https://github.com/dotnet/runtime - 49aec59e52d2f0bc8e2acd297023aa8464aee00c + 7ea91b742cc1646bd1611749a8179fba2fcdc3af - + https://github.com/dotnet/runtime - 49aec59e52d2f0bc8e2acd297023aa8464aee00c + 7ea91b742cc1646bd1611749a8179fba2fcdc3af @@ -39,9 +39,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 49aec59e52d2f0bc8e2acd297023aa8464aee00c + 7ea91b742cc1646bd1611749a8179fba2fcdc3af https://github.com/dotnet/aspnetcore @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 9c100429018dd530ef432898eeb739db61590874 - + https://github.com/dotnet/sdk - 0121d59e23a16913661082da31de82257076f15d + aa61f3e09117df410641631e335f1ebf3555ae4b - + https://github.com/dotnet/sdk - 0121d59e23a16913661082da31de82257076f15d + aa61f3e09117df410641631e335f1ebf3555ae4b diff --git a/eng/Versions.props b/eng/Versions.props index 3998c0764..29d8ff1aa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,23 +57,23 @@ - 6.0.100-preview.5.21230.24 - 6.0.100-preview.5.21230.24 + 6.0.100-preview.5.21251.1 + 6.0.100-preview.5.21251.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-preview.5.21229.9 + 6.0.0-preview.5.21251.1 - 6.0.0-preview.5.21229.9 - 6.0.0-preview.5.21229.9 - 6.0.0-preview.5.21229.9 - 6.0.0-preview.5.21229.9 - 6.0.0-preview.5.21229.9 + 6.0.0-preview.5.21251.1 + 6.0.0-preview.5.21251.1 + 6.0.0-preview.5.21251.1 + 6.0.0-preview.5.21251.1 + 6.0.0-preview.5.21251.1 2.1.0 From 531c1771fb47f032c5d909b7c25a9d6cd7356465 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 1 May 2021 15:36:20 +0000 Subject: [PATCH 47/77] Update dependencies from https://github.com/dotnet/sdk build 20210501.2 (#10451) [main] 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 a8ffbcc30..3f74a70c9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 9c100429018dd530ef432898eeb739db61590874 - + https://github.com/dotnet/sdk - aa61f3e09117df410641631e335f1ebf3555ae4b + ea2bf368353a882fc5a4625e2c37e1195300414b - + https://github.com/dotnet/sdk - aa61f3e09117df410641631e335f1ebf3555ae4b + ea2bf368353a882fc5a4625e2c37e1195300414b diff --git a/eng/Versions.props b/eng/Versions.props index 29d8ff1aa..dd97a4311 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-preview.5.21251.1 - 6.0.100-preview.5.21251.1 + 6.0.100-preview.5.21251.2 + 6.0.100-preview.5.21251.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 901f2ac5db3e48658940767d44e5c0a53dfbf22e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 1 May 2021 22:03:45 +0000 Subject: [PATCH 48/77] Update dependencies from https://github.com/dotnet/sdk build 20210501.4 (#10453) [main] 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 3f74a70c9..04c4d0a9e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 9c100429018dd530ef432898eeb739db61590874 - + https://github.com/dotnet/sdk - ea2bf368353a882fc5a4625e2c37e1195300414b + d22bb74e1b73006135c000323fdab8225834b133 - + https://github.com/dotnet/sdk - ea2bf368353a882fc5a4625e2c37e1195300414b + d22bb74e1b73006135c000323fdab8225834b133 diff --git a/eng/Versions.props b/eng/Versions.props index dd97a4311..3dd7ed985 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-preview.5.21251.2 - 6.0.100-preview.5.21251.2 + 6.0.100-preview.5.21251.4 + 6.0.100-preview.5.21251.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 921395c33e0d3c0e22b8ee18c70778d7f2045976 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 2 May 2021 14:40:44 +0000 Subject: [PATCH 49/77] Update dependencies from https://github.com/dotnet/sdk build 20210502.1 (#10455) [main] Update dependencies from dotnet/sdk - Coherency Updates: - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21251.1 to 6.0.0-preview.5.21251.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 6.0.0-preview.5.21251.1 to 6.0.0-preview.5.21251.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-preview.5.21251.1 to 6.0.0-preview.5.21251.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-preview.5.21251.1 to 6.0.0-preview.5.21251.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-preview.5.21251.1 to 6.0.0-preview.5.21251.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 6.0.0-preview.5.21251.1 to 6.0.0-preview.5.21251.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 04c4d0a9e..fd2361ac1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop 9570a321daf2bd6756b91a0866bb8e0d7874190d - + https://github.com/dotnet/runtime - 7ea91b742cc1646bd1611749a8179fba2fcdc3af + d2fba8fdc44f5ed7a4676c219c626e36a3fa2998 - + https://github.com/dotnet/runtime - 7ea91b742cc1646bd1611749a8179fba2fcdc3af + d2fba8fdc44f5ed7a4676c219c626e36a3fa2998 - + https://github.com/dotnet/runtime - 7ea91b742cc1646bd1611749a8179fba2fcdc3af + d2fba8fdc44f5ed7a4676c219c626e36a3fa2998 - + https://github.com/dotnet/runtime - 7ea91b742cc1646bd1611749a8179fba2fcdc3af + d2fba8fdc44f5ed7a4676c219c626e36a3fa2998 - + https://github.com/dotnet/runtime - 7ea91b742cc1646bd1611749a8179fba2fcdc3af + d2fba8fdc44f5ed7a4676c219c626e36a3fa2998 @@ -39,9 +39,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 7ea91b742cc1646bd1611749a8179fba2fcdc3af + d2fba8fdc44f5ed7a4676c219c626e36a3fa2998 https://github.com/dotnet/aspnetcore @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 9c100429018dd530ef432898eeb739db61590874 - + https://github.com/dotnet/sdk - d22bb74e1b73006135c000323fdab8225834b133 + e24c272697e01b3d4f9848c0fefcdf53be54fff1 - + https://github.com/dotnet/sdk - d22bb74e1b73006135c000323fdab8225834b133 + e24c272697e01b3d4f9848c0fefcdf53be54fff1 diff --git a/eng/Versions.props b/eng/Versions.props index 3dd7ed985..da37efb3c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,23 +57,23 @@ - 6.0.100-preview.5.21251.4 - 6.0.100-preview.5.21251.4 + 6.0.100-preview.5.21252.1 + 6.0.100-preview.5.21252.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-preview.5.21251.1 + 6.0.0-preview.5.21251.4 - 6.0.0-preview.5.21251.1 - 6.0.0-preview.5.21251.1 - 6.0.0-preview.5.21251.1 - 6.0.0-preview.5.21251.1 - 6.0.0-preview.5.21251.1 + 6.0.0-preview.5.21251.4 + 6.0.0-preview.5.21251.4 + 6.0.0-preview.5.21251.4 + 6.0.0-preview.5.21251.4 + 6.0.0-preview.5.21251.4 2.1.0 From eceded1fb7842e3460dbb1d613e20d635706a0f9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 3 May 2021 04:11:13 +0000 Subject: [PATCH 50/77] Update dependencies from https://github.com/dotnet/sdk build 20210502.2 (#10456) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.5.21230.5 to 6.0.0-preview.5.21252.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.5.21230.5 to 6.0.0-preview.5.21252.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.5.21230.5 to 6.0.0-preview.5.21252.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21230.5 to 6.0.0-preview.5.21252.1 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-preview.5.21230.5 to 6.0.0-preview.5.21252.1 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-preview.5.21230.5 to 6.0.0-preview.5.21252.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 fd2361ac1..30955dd12 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime d2fba8fdc44f5ed7a4676c219c626e36a3fa2998 - + https://github.com/dotnet/aspnetcore - 2434aee04f2baec9ee6ed0d33fe84c8dd3009dd3 + 014a198bccaa1d8e2f8db454e704ad19fff5e47e - + https://github.com/dotnet/aspnetcore - 2434aee04f2baec9ee6ed0d33fe84c8dd3009dd3 + 014a198bccaa1d8e2f8db454e704ad19fff5e47e - + https://github.com/dotnet/aspnetcore - 2434aee04f2baec9ee6ed0d33fe84c8dd3009dd3 + 014a198bccaa1d8e2f8db454e704ad19fff5e47e - + https://github.com/dotnet/aspnetcore - 2434aee04f2baec9ee6ed0d33fe84c8dd3009dd3 + 014a198bccaa1d8e2f8db454e704ad19fff5e47e - + https://github.com/dotnet/aspnetcore - 2434aee04f2baec9ee6ed0d33fe84c8dd3009dd3 + 014a198bccaa1d8e2f8db454e704ad19fff5e47e - + https://github.com/dotnet/aspnetcore - 2434aee04f2baec9ee6ed0d33fe84c8dd3009dd3 + 014a198bccaa1d8e2f8db454e704ad19fff5e47e https://github.com/dotnet/test-templates @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 9c100429018dd530ef432898eeb739db61590874 - + https://github.com/dotnet/sdk - e24c272697e01b3d4f9848c0fefcdf53be54fff1 + bfaf3955402bbfa0ba92e9edc7a314bc07fbfed5 - + https://github.com/dotnet/sdk - e24c272697e01b3d4f9848c0fefcdf53be54fff1 + bfaf3955402bbfa0ba92e9edc7a314bc07fbfed5 diff --git a/eng/Versions.props b/eng/Versions.props index da37efb3c..23faf9a17 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,20 +45,20 @@ - 6.0.0-preview.5.21230.5 - 6.0.0-preview.5.21230.5 - 6.0.0-preview.5.21230.5 - 6.0.0-preview.5.21230.5 - 6.0.0-preview.5.21230.5 - 6.0.0-preview.5.21230.5 + 6.0.0-preview.5.21252.1 + 6.0.0-preview.5.21252.1 + 6.0.0-preview.5.21252.1 + 6.0.0-preview.5.21252.1 + 6.0.0-preview.5.21252.1 + 6.0.0-preview.5.21252.1 0.2.0 - 6.0.100-preview.5.21252.1 - 6.0.100-preview.5.21252.1 + 6.0.100-preview.5.21252.2 + 6.0.100-preview.5.21252.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a982bedd020e1c06312fdbd6242b923a349bef08 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 3 May 2021 12:10:45 +0000 Subject: [PATCH 51/77] Update dependencies from https://github.com/dotnet/sdk build 20210503.1 (#10457) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.Test.Sdk: from 17.0.0-preview-20210430-02 to 17.0.0-preview-20210503-01 (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 30955dd12..e7a9f4a1c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 9c100429018dd530ef432898eeb739db61590874 - + https://github.com/dotnet/sdk - bfaf3955402bbfa0ba92e9edc7a314bc07fbfed5 + 544569824f34a0515cc533a4673e0f7827184125 - + https://github.com/dotnet/sdk - bfaf3955402bbfa0ba92e9edc7a314bc07fbfed5 + 544569824f34a0515cc533a4673e0f7827184125 @@ -104,9 +104,9 @@ https://github.com/dotnet/fsharp b6a352ab0a11a0584348dd77811af7eecaf9d072 - + https://github.com/microsoft/vstest - 899fe6fa7df46ff3a7eb79caa470762531e4be53 + 99d604ca32681fd9fc6fd3f2286de64a3b5ffe09 https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index 23faf9a17..09ad74576 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-preview.5.21252.2 - 6.0.100-preview.5.21252.2 + 6.0.100-preview.5.21253.1 + 6.0.100-preview.5.21253.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -142,7 +142,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.0.0-preview-20210430-02 + 17.0.0-preview-20210503-01 From 9fbb0b562b15508b3194ebbdcb708ff20a00e159 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 3 May 2021 13:19:14 +0000 Subject: [PATCH 52/77] Update dependencies from https://github.com/dotnet/sdk build 20210503.2 (#10458) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 4.0.0-2.21251.2 to 4.0.0-2.21253.8 (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 e7a9f4a1c..ef3b47dc9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 9c100429018dd530ef432898eeb739db61590874 - + https://github.com/dotnet/sdk - 544569824f34a0515cc533a4673e0f7827184125 + 656de7c79a0c7428294b9fd6155a21611fc510bf - + https://github.com/dotnet/sdk - 544569824f34a0515cc533a4673e0f7827184125 + 656de7c79a0c7428294b9fd6155a21611fc510bf @@ -113,9 +113,9 @@ 307f6b0afd2fea639fffa97e67155bafe6aa8461 linker - + https://github.com/dotnet/roslyn - ec9be53666c3b56648072daf7af0fb88e9f269f5 + 5b972bceb846f5d15f991a479e285067a75103e4 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 09ad74576..0a4db4b2b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-preview.5.21253.1 - 6.0.100-preview.5.21253.1 + 6.0.100-preview.5.21253.2 + 6.0.100-preview.5.21253.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 72d79f6d7f066a253e599bb155f397df699dd776 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 3 May 2021 14:42:08 +0000 Subject: [PATCH 53/77] Update dependencies from https://github.com/dotnet/sdk build 20210503.4 (#10461) [main] Update dependencies from dotnet/sdk - Coherency Updates: - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21251.4 to 6.0.0-preview.5.21253.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 6.0.0-preview.5.21251.4 to 6.0.0-preview.5.21253.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-preview.5.21251.4 to 6.0.0-preview.5.21253.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-preview.5.21251.4 to 6.0.0-preview.5.21253.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-preview.5.21251.4 to 6.0.0-preview.5.21253.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 6.0.0-preview.5.21251.4 to 6.0.0-preview.5.21253.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 ef3b47dc9..3b2502cb7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop 9570a321daf2bd6756b91a0866bb8e0d7874190d - + https://github.com/dotnet/runtime - d2fba8fdc44f5ed7a4676c219c626e36a3fa2998 + e6bb456e608ad24a55f3fef2d1ee4ede07d6c729 - + https://github.com/dotnet/runtime - d2fba8fdc44f5ed7a4676c219c626e36a3fa2998 + e6bb456e608ad24a55f3fef2d1ee4ede07d6c729 - + https://github.com/dotnet/runtime - d2fba8fdc44f5ed7a4676c219c626e36a3fa2998 + e6bb456e608ad24a55f3fef2d1ee4ede07d6c729 - + https://github.com/dotnet/runtime - d2fba8fdc44f5ed7a4676c219c626e36a3fa2998 + e6bb456e608ad24a55f3fef2d1ee4ede07d6c729 - + https://github.com/dotnet/runtime - d2fba8fdc44f5ed7a4676c219c626e36a3fa2998 + e6bb456e608ad24a55f3fef2d1ee4ede07d6c729 @@ -39,9 +39,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - d2fba8fdc44f5ed7a4676c219c626e36a3fa2998 + e6bb456e608ad24a55f3fef2d1ee4ede07d6c729 https://github.com/dotnet/aspnetcore @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 9c100429018dd530ef432898eeb739db61590874 - + https://github.com/dotnet/sdk - 656de7c79a0c7428294b9fd6155a21611fc510bf + 548da35134820a029beba57ab55ca15674305df3 - + https://github.com/dotnet/sdk - 656de7c79a0c7428294b9fd6155a21611fc510bf + 548da35134820a029beba57ab55ca15674305df3 diff --git a/eng/Versions.props b/eng/Versions.props index 0a4db4b2b..32bc810da 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,23 +57,23 @@ - 6.0.100-preview.5.21253.2 - 6.0.100-preview.5.21253.2 + 6.0.100-preview.5.21253.4 + 6.0.100-preview.5.21253.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-preview.5.21251.4 + 6.0.0-preview.5.21253.1 - 6.0.0-preview.5.21251.4 - 6.0.0-preview.5.21251.4 - 6.0.0-preview.5.21251.4 - 6.0.0-preview.5.21251.4 - 6.0.0-preview.5.21251.4 + 6.0.0-preview.5.21253.1 + 6.0.0-preview.5.21253.1 + 6.0.0-preview.5.21253.1 + 6.0.0-preview.5.21253.1 + 6.0.0-preview.5.21253.1 2.1.0 From 2d5d5b16f7c3d05cbce40dfa5fe1112c755469b6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 3 May 2021 16:38:54 +0000 Subject: [PATCH 54/77] [main] Update dependencies from dotnet/sdk (#10462) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.Test.Sdk: from 17.0.0-preview-20210503-01 to 17.0.0-preview-20210503-02 (parent: Microsoft.NET.Sdk) - Microsoft.NET.ILLink.Tasks: from 6.0.100-preview.5.21229.1 to 6.0.100-preview.5.21253.1 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3b2502cb7..85eb6edeb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 9c100429018dd530ef432898eeb739db61590874 - + https://github.com/dotnet/sdk - 548da35134820a029beba57ab55ca15674305df3 + e81658d23b74da31f9ed31b499170c8c1a5c261e - + https://github.com/dotnet/sdk - 548da35134820a029beba57ab55ca15674305df3 + e81658d23b74da31f9ed31b499170c8c1a5c261e @@ -104,13 +104,13 @@ https://github.com/dotnet/fsharp b6a352ab0a11a0584348dd77811af7eecaf9d072 - + https://github.com/microsoft/vstest - 99d604ca32681fd9fc6fd3f2286de64a3b5ffe09 + 65f0834de100ee9d1d47641db4773465ad39fe0f - + https://github.com/mono/linker - 307f6b0afd2fea639fffa97e67155bafe6aa8461 + a9de8c40d9ccae31a68f3c4d01f35793df5f025c linker diff --git a/eng/Versions.props b/eng/Versions.props index 32bc810da..5974c183c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-preview.5.21253.4 - 6.0.100-preview.5.21253.4 + 6.0.100-preview.5.21253.6 + 6.0.100-preview.5.21253.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -142,7 +142,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.0.0-preview-20210503-01 + 17.0.0-preview-20210503-02 From 93b4537cacc6c5dc76f329be7ae190eade09d1bc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 3 May 2021 17:41:14 +0000 Subject: [PATCH 55/77] Update dependencies from https://github.com/dotnet/sdk build 20210503.7 (#10463) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.5.21252.1 to 6.0.0-preview.5.21253.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.5.21252.1 to 6.0.0-preview.5.21253.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.5.21252.1 to 6.0.0-preview.5.21253.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21252.1 to 6.0.0-preview.5.21253.1 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-preview.5.21252.1 to 6.0.0-preview.5.21253.1 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-preview.5.21252.1 to 6.0.0-preview.5.21253.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 85eb6edeb..238da56ed 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime e6bb456e608ad24a55f3fef2d1ee4ede07d6c729 - + https://github.com/dotnet/aspnetcore - 014a198bccaa1d8e2f8db454e704ad19fff5e47e + 5ae4a1a8310d65fd866c892639ff77119d7c422a - + https://github.com/dotnet/aspnetcore - 014a198bccaa1d8e2f8db454e704ad19fff5e47e + 5ae4a1a8310d65fd866c892639ff77119d7c422a - + https://github.com/dotnet/aspnetcore - 014a198bccaa1d8e2f8db454e704ad19fff5e47e + 5ae4a1a8310d65fd866c892639ff77119d7c422a - + https://github.com/dotnet/aspnetcore - 014a198bccaa1d8e2f8db454e704ad19fff5e47e + 5ae4a1a8310d65fd866c892639ff77119d7c422a - + https://github.com/dotnet/aspnetcore - 014a198bccaa1d8e2f8db454e704ad19fff5e47e + 5ae4a1a8310d65fd866c892639ff77119d7c422a - + https://github.com/dotnet/aspnetcore - 014a198bccaa1d8e2f8db454e704ad19fff5e47e + 5ae4a1a8310d65fd866c892639ff77119d7c422a https://github.com/dotnet/test-templates @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 9c100429018dd530ef432898eeb739db61590874 - + https://github.com/dotnet/sdk - e81658d23b74da31f9ed31b499170c8c1a5c261e + 2c93b5056250a84c543c8cb7e4231662e1aa1c5c - + https://github.com/dotnet/sdk - e81658d23b74da31f9ed31b499170c8c1a5c261e + 2c93b5056250a84c543c8cb7e4231662e1aa1c5c diff --git a/eng/Versions.props b/eng/Versions.props index 5974c183c..6f0b75c49 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,20 +45,20 @@ - 6.0.0-preview.5.21252.1 - 6.0.0-preview.5.21252.1 - 6.0.0-preview.5.21252.1 - 6.0.0-preview.5.21252.1 - 6.0.0-preview.5.21252.1 - 6.0.0-preview.5.21252.1 + 6.0.0-preview.5.21253.1 + 6.0.0-preview.5.21253.1 + 6.0.0-preview.5.21253.1 + 6.0.0-preview.5.21253.1 + 6.0.0-preview.5.21253.1 + 6.0.0-preview.5.21253.1 0.2.0 - 6.0.100-preview.5.21253.6 - 6.0.100-preview.5.21253.6 + 6.0.100-preview.5.21253.7 + 6.0.100-preview.5.21253.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From bb3db97806505014882b9d1c9ee622f651a5eb1b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 3 May 2021 18:45:13 +0000 Subject: [PATCH 56/77] Update dependencies from https://github.com/dotnet/sdk build 20210503.9 (#10465) [main] 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 238da56ed..884051f6a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 9c100429018dd530ef432898eeb739db61590874 - + https://github.com/dotnet/sdk - 2c93b5056250a84c543c8cb7e4231662e1aa1c5c + 43c12fe05538acb63648912e1181646edff29441 - + https://github.com/dotnet/sdk - 2c93b5056250a84c543c8cb7e4231662e1aa1c5c + 43c12fe05538acb63648912e1181646edff29441 diff --git a/eng/Versions.props b/eng/Versions.props index 6f0b75c49..e11088bee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-preview.5.21253.7 - 6.0.100-preview.5.21253.7 + 6.0.100-preview.5.21253.9 + 6.0.100-preview.5.21253.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1c048a060b57e1e68cbe59b6702eb02f7bed47a4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 3 May 2021 22:12:37 +0000 Subject: [PATCH 57/77] Update dependencies from https://github.com/dotnet/sdk build 20210503.11 (#10466) [main] 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 884051f6a..b70235925 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 9c100429018dd530ef432898eeb739db61590874 - + https://github.com/dotnet/sdk - 43c12fe05538acb63648912e1181646edff29441 + 7d4e2bbd85ff943672b6060f59a1801a41594a4e - + https://github.com/dotnet/sdk - 43c12fe05538acb63648912e1181646edff29441 + 7d4e2bbd85ff943672b6060f59a1801a41594a4e diff --git a/eng/Versions.props b/eng/Versions.props index e11088bee..fb3428165 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-preview.5.21253.9 - 6.0.100-preview.5.21253.9 + 6.0.100-preview.5.21253.11 + 6.0.100-preview.5.21253.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 145d01eb8171ab28ce47c3d216c04082994fe345 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 3 May 2021 23:04:59 +0000 Subject: [PATCH 58/77] Update dependencies from https://github.com/dotnet/sdk build 20210503.12 (#10467) [main] 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 b70235925..8c892a5cf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 9c100429018dd530ef432898eeb739db61590874 - + https://github.com/dotnet/sdk - 7d4e2bbd85ff943672b6060f59a1801a41594a4e + 094ea162b5a4b58af284a66376071bb37b605198 - + https://github.com/dotnet/sdk - 7d4e2bbd85ff943672b6060f59a1801a41594a4e + 094ea162b5a4b58af284a66376071bb37b605198 diff --git a/eng/Versions.props b/eng/Versions.props index fb3428165..68a0b18fd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-preview.5.21253.11 - 6.0.100-preview.5.21253.11 + 6.0.100-preview.5.21253.12 + 6.0.100-preview.5.21253.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 849d21a8e69e23eb3b4ddf238741d1c5891eb1c3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 3 May 2021 23:56:58 +0000 Subject: [PATCH 59/77] Update dependencies from https://github.com/dotnet/sdk build 20210503.14 (#10469) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 4.0.0-2.21253.8 to 4.0.0-2.21253.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 8c892a5cf..acea70cab 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 9c100429018dd530ef432898eeb739db61590874 - + https://github.com/dotnet/sdk - 094ea162b5a4b58af284a66376071bb37b605198 + 8512a81966084ddbba7febf5966a55f5c9a14c19 - + https://github.com/dotnet/sdk - 094ea162b5a4b58af284a66376071bb37b605198 + 8512a81966084ddbba7febf5966a55f5c9a14c19 @@ -113,9 +113,9 @@ a9de8c40d9ccae31a68f3c4d01f35793df5f025c linker - + https://github.com/dotnet/roslyn - 5b972bceb846f5d15f991a479e285067a75103e4 + 103d7848b8058b2ca3d1138dddfe3af3d9f9ba68 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 68a0b18fd..3c4afa8ab 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-preview.5.21253.12 - 6.0.100-preview.5.21253.12 + 6.0.100-preview.5.21253.14 + 6.0.100-preview.5.21253.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 891754ed421a277effc07b48a6cffc8b85d738cf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 4 May 2021 01:59:28 +0000 Subject: [PATCH 60/77] [main] Update dependencies from dotnet/sdk (#10471) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.5.21253.1 to 6.0.0-preview.5.21253.2 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.5.21253.1 to 6.0.0-preview.5.21253.2 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.5.21253.1 to 6.0.0-preview.5.21253.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21253.1 to 6.0.0-preview.5.21253.2 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-preview.5.21253.1 to 6.0.0-preview.5.21253.2 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-preview.5.21253.1 to 6.0.0-preview.5.21253.2 (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 acea70cab..6576a5a70 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime e6bb456e608ad24a55f3fef2d1ee4ede07d6c729 - + https://github.com/dotnet/aspnetcore - 5ae4a1a8310d65fd866c892639ff77119d7c422a + aee816f2edbba6f3c59bbd8cf2d87b3132cc8b68 - + https://github.com/dotnet/aspnetcore - 5ae4a1a8310d65fd866c892639ff77119d7c422a + aee816f2edbba6f3c59bbd8cf2d87b3132cc8b68 - + https://github.com/dotnet/aspnetcore - 5ae4a1a8310d65fd866c892639ff77119d7c422a + aee816f2edbba6f3c59bbd8cf2d87b3132cc8b68 - + https://github.com/dotnet/aspnetcore - 5ae4a1a8310d65fd866c892639ff77119d7c422a + aee816f2edbba6f3c59bbd8cf2d87b3132cc8b68 - + https://github.com/dotnet/aspnetcore - 5ae4a1a8310d65fd866c892639ff77119d7c422a + aee816f2edbba6f3c59bbd8cf2d87b3132cc8b68 - + https://github.com/dotnet/aspnetcore - 5ae4a1a8310d65fd866c892639ff77119d7c422a + aee816f2edbba6f3c59bbd8cf2d87b3132cc8b68 https://github.com/dotnet/test-templates @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 9c100429018dd530ef432898eeb739db61590874 - + https://github.com/dotnet/sdk - 8512a81966084ddbba7febf5966a55f5c9a14c19 + 0bb35310d0f7c99823a06a174e21c358352d0eb3 - + https://github.com/dotnet/sdk - 8512a81966084ddbba7febf5966a55f5c9a14c19 + 0bb35310d0f7c99823a06a174e21c358352d0eb3 diff --git a/eng/Versions.props b/eng/Versions.props index 3c4afa8ab..d5467ad86 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,20 +45,20 @@ - 6.0.0-preview.5.21253.1 - 6.0.0-preview.5.21253.1 - 6.0.0-preview.5.21253.1 - 6.0.0-preview.5.21253.1 - 6.0.0-preview.5.21253.1 - 6.0.0-preview.5.21253.1 + 6.0.0-preview.5.21253.2 + 6.0.0-preview.5.21253.2 + 6.0.0-preview.5.21253.2 + 6.0.0-preview.5.21253.2 + 6.0.0-preview.5.21253.2 + 6.0.0-preview.5.21253.2 0.2.0 - 6.0.100-preview.5.21253.14 - 6.0.100-preview.5.21253.14 + 6.0.100-preview.5.21253.19 + 6.0.100-preview.5.21253.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 892d2ba240d7512e05f0012af8b3677a5913b617 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 4 May 2021 04:57:14 +0000 Subject: [PATCH 61/77] Update dependencies from https://github.com/dotnet/sdk build 20210503.21 (#10473) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.5.21253.2 to 6.0.0-preview.5.21253.3 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.5.21253.2 to 6.0.0-preview.5.21253.3 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.5.21253.2 to 6.0.0-preview.5.21253.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21253.2 to 6.0.0-preview.5.21253.3 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-preview.5.21253.2 to 6.0.0-preview.5.21253.3 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-preview.5.21253.2 to 6.0.0-preview.5.21253.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 6576a5a70..76276af38 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime e6bb456e608ad24a55f3fef2d1ee4ede07d6c729 - + https://github.com/dotnet/aspnetcore - aee816f2edbba6f3c59bbd8cf2d87b3132cc8b68 + 741e477384b0f95a689649d567406c7a657525ba - + https://github.com/dotnet/aspnetcore - aee816f2edbba6f3c59bbd8cf2d87b3132cc8b68 + 741e477384b0f95a689649d567406c7a657525ba - + https://github.com/dotnet/aspnetcore - aee816f2edbba6f3c59bbd8cf2d87b3132cc8b68 + 741e477384b0f95a689649d567406c7a657525ba - + https://github.com/dotnet/aspnetcore - aee816f2edbba6f3c59bbd8cf2d87b3132cc8b68 + 741e477384b0f95a689649d567406c7a657525ba - + https://github.com/dotnet/aspnetcore - aee816f2edbba6f3c59bbd8cf2d87b3132cc8b68 + 741e477384b0f95a689649d567406c7a657525ba - + https://github.com/dotnet/aspnetcore - aee816f2edbba6f3c59bbd8cf2d87b3132cc8b68 + 741e477384b0f95a689649d567406c7a657525ba https://github.com/dotnet/test-templates @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 9c100429018dd530ef432898eeb739db61590874 - + https://github.com/dotnet/sdk - 0bb35310d0f7c99823a06a174e21c358352d0eb3 + 3710146046e96567f2cca71116a27dbfe77a9fe4 - + https://github.com/dotnet/sdk - 0bb35310d0f7c99823a06a174e21c358352d0eb3 + 3710146046e96567f2cca71116a27dbfe77a9fe4 diff --git a/eng/Versions.props b/eng/Versions.props index d5467ad86..d95a3a25d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,20 +45,20 @@ - 6.0.0-preview.5.21253.2 - 6.0.0-preview.5.21253.2 - 6.0.0-preview.5.21253.2 - 6.0.0-preview.5.21253.2 - 6.0.0-preview.5.21253.2 - 6.0.0-preview.5.21253.2 + 6.0.0-preview.5.21253.3 + 6.0.0-preview.5.21253.3 + 6.0.0-preview.5.21253.3 + 6.0.0-preview.5.21253.3 + 6.0.0-preview.5.21253.3 + 6.0.0-preview.5.21253.3 0.2.0 - 6.0.100-preview.5.21253.19 - 6.0.100-preview.5.21253.19 + 6.0.100-preview.5.21253.21 + 6.0.100-preview.5.21253.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 72701591f7747fd069a6d963eeb5ab391ecbd98c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 4 May 2021 13:00:28 +0000 Subject: [PATCH 62/77] Update dependencies from https://github.com/dotnet/arcade build 20210503.2 (#10476) [main] Update dependencies from dotnet/arcade - Coherency Updates: - XliffTasks: from 1.0.0-beta.21224.1 to 1.0.0-beta.21251.1 (parent: Microsoft.DotNet.Arcade.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/post-build/sourcelink-validation.ps1 | 2 +- eng/common/post-build/symbols-validation.ps1 | 2 +- global.json | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 76276af38..8fc8b4189 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -136,14 +136,14 @@ - + https://github.com/dotnet/arcade - 46ad27d3cc557f2b84ce30b2c4e27438526dc91d + e9fd640e1ec1890489ea66ad0f59e733448056da - + https://github.com/dotnet/arcade - 46ad27d3cc557f2b84ce30b2c4e27438526dc91d + e9fd640e1ec1890489ea66ad0f59e733448056da https://github.com/dotnet/source-build-reference-packages @@ -153,9 +153,9 @@ https://github.com/dotnet/sourcelink 4b584dbc392bb1aad49c2eb1ab84d8b489b6dccc - + https://github.com/dotnet/xliff-tasks - 37099419d3170cb788fd6bc3de4f7364bc586195 + 59ce967675b3600c2de41443483949d86305de93 diff --git a/eng/Versions.props b/eng/Versions.props index d95a3a25d..21cbe3f99 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ - 6.0.0-beta.21230.2 + 6.0.0-beta.21253.2 diff --git a/eng/common/post-build/sourcelink-validation.ps1 b/eng/common/post-build/sourcelink-validation.ps1 index 1c46f7b63..8c554729b 100644 --- a/eng/common/post-build/sourcelink-validation.ps1 +++ b/eng/common/post-build/sourcelink-validation.ps1 @@ -14,7 +14,7 @@ param( $global:RepoFiles = @{} # Maximum number of jobs to run in parallel -$MaxParallelJobs = 6 +$MaxParallelJobs = 16 # Wait time between check for system load $SecondsBetweenLoadChecks = 10 diff --git a/eng/common/post-build/symbols-validation.ps1 b/eng/common/post-build/symbols-validation.ps1 index e6d5d2fd0..788321d77 100644 --- a/eng/common/post-build/symbols-validation.ps1 +++ b/eng/common/post-build/symbols-validation.ps1 @@ -8,7 +8,7 @@ param( ) # Maximum number of jobs to run in parallel -$MaxParallelJobs = 6 +$MaxParallelJobs = 16 # Max number of retries $MaxRetry = 5 diff --git a/global.json b/global.json index 44a00c720..825c7cd6f 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21230.2" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21253.2" } } From c6779fdf4c887589fdc994b5e132d40d77857485 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 4 May 2021 15:46:26 +0000 Subject: [PATCH 63/77] [main] Update dependencies from dotnet/sdk (#10474) [main] Update dependencies from dotnet/sdk - Coherency Updates: - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21253.1 to 6.0.0-preview.5.21253.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 6.0.0-preview.5.21253.1 to 6.0.0-preview.5.21253.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-preview.5.21253.1 to 6.0.0-preview.5.21253.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-preview.5.21253.1 to 6.0.0-preview.5.21253.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-preview.5.21253.1 to 6.0.0-preview.5.21253.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 6.0.0-preview.5.21253.1 to 6.0.0-preview.5.21253.3 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.5.21253.3 to 6.0.0-preview.5.21253.4 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.5.21253.3 to 6.0.0-preview.5.21253.4 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.5.21253.3 to 6.0.0-preview.5.21253.4 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21253.3 to 6.0.0-preview.5.21253.4 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-preview.5.21253.3 to 6.0.0-preview.5.21253.4 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-preview.5.21253.3 to 6.0.0-preview.5.21253.4 (parent: Microsoft.NET.Sdk) - Microsoft.FSharp.Compiler: from 11.4.2-beta.21227.5 to 11.4.2-beta.21230.7 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Test.Sdk: from 17.0.0-preview-20210503-02 to 17.0.0-preview-20210504-01 (parent: Microsoft.NET.Sdk) - Microsoft.NET.ILLink.Tasks: from 6.0.100-preview.5.21253.1 to 6.0.100-preview.5.21253.3 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.0.0-2.21253.20 to 4.0.0-2.21254.8 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 16.10.0-preview-21228-02 to 16.10.0-preview-21253-02 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 30 ++++++++-------- 2 files changed, 53 insertions(+), 53 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8fc8b4189..ac2205e1f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop 9570a321daf2bd6756b91a0866bb8e0d7874190d - + https://github.com/dotnet/runtime - e6bb456e608ad24a55f3fef2d1ee4ede07d6c729 + bb2d2c45410b9407a9657df7f5ca113bced53a43 - + https://github.com/dotnet/runtime - e6bb456e608ad24a55f3fef2d1ee4ede07d6c729 + bb2d2c45410b9407a9657df7f5ca113bced53a43 - + https://github.com/dotnet/runtime - e6bb456e608ad24a55f3fef2d1ee4ede07d6c729 + bb2d2c45410b9407a9657df7f5ca113bced53a43 - + https://github.com/dotnet/runtime - e6bb456e608ad24a55f3fef2d1ee4ede07d6c729 + bb2d2c45410b9407a9657df7f5ca113bced53a43 - + https://github.com/dotnet/runtime - e6bb456e608ad24a55f3fef2d1ee4ede07d6c729 + bb2d2c45410b9407a9657df7f5ca113bced53a43 @@ -39,33 +39,33 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - e6bb456e608ad24a55f3fef2d1ee4ede07d6c729 + bb2d2c45410b9407a9657df7f5ca113bced53a43 - + https://github.com/dotnet/aspnetcore - 741e477384b0f95a689649d567406c7a657525ba + 8cf98856bb96c7aad8373ae5b1fa6e7f021f649e - + https://github.com/dotnet/aspnetcore - 741e477384b0f95a689649d567406c7a657525ba + 8cf98856bb96c7aad8373ae5b1fa6e7f021f649e - + https://github.com/dotnet/aspnetcore - 741e477384b0f95a689649d567406c7a657525ba + 8cf98856bb96c7aad8373ae5b1fa6e7f021f649e - + https://github.com/dotnet/aspnetcore - 741e477384b0f95a689649d567406c7a657525ba + 8cf98856bb96c7aad8373ae5b1fa6e7f021f649e - + https://github.com/dotnet/aspnetcore - 741e477384b0f95a689649d567406c7a657525ba + 8cf98856bb96c7aad8373ae5b1fa6e7f021f649e - + https://github.com/dotnet/aspnetcore - 741e477384b0f95a689649d567406c7a657525ba + 8cf98856bb96c7aad8373ae5b1fa6e7f021f649e https://github.com/dotnet/test-templates @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 9c100429018dd530ef432898eeb739db61590874 - + https://github.com/dotnet/sdk - 3710146046e96567f2cca71116a27dbfe77a9fe4 + 4cb41929dcf3c0a6f1308c9d05bd5c0f60447ae9 - + https://github.com/dotnet/sdk - 3710146046e96567f2cca71116a27dbfe77a9fe4 + 4cb41929dcf3c0a6f1308c9d05bd5c0f60447ae9 @@ -100,26 +100,26 @@ https://github.com/dotnet/wpf 40775430dc86d110ba7b83ca5a898b8f4e9335e7 - + https://github.com/dotnet/fsharp - b6a352ab0a11a0584348dd77811af7eecaf9d072 + e411df7595bbe379f07dd2bcbb6e4046eca9eb31 - + https://github.com/microsoft/vstest - 65f0834de100ee9d1d47641db4773465ad39fe0f + 5a4a4c064ec8a0e9ccb02354e0137c3264cc8fb5 - + https://github.com/mono/linker - a9de8c40d9ccae31a68f3c4d01f35793df5f025c + 795106705fedfceb6d1de60999673dfe39dc7acf linker - + https://github.com/dotnet/roslyn - 103d7848b8058b2ca3d1138dddfe3af3d9f9ba68 + 28bd07cc74ebb4c3d5b2d9cb22b2fd60f5c580dd - + https://github.com/dotnet/msbuild - 5b9216a75e98e19eba84e04a5f30bd35a68f317a + fa96a2a81e0fb8c028057fa204bbf386bfb36aec https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 21cbe3f99..b9bb45638 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,35 +45,35 @@ - 6.0.0-preview.5.21253.3 - 6.0.0-preview.5.21253.3 - 6.0.0-preview.5.21253.3 - 6.0.0-preview.5.21253.3 - 6.0.0-preview.5.21253.3 - 6.0.0-preview.5.21253.3 + 6.0.0-preview.5.21253.4 + 6.0.0-preview.5.21253.4 + 6.0.0-preview.5.21253.4 + 6.0.0-preview.5.21253.4 + 6.0.0-preview.5.21253.4 + 6.0.0-preview.5.21253.4 0.2.0 - 6.0.100-preview.5.21253.21 - 6.0.100-preview.5.21253.21 + 6.0.100-preview.5.21254.3 + 6.0.100-preview.5.21254.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-preview.5.21253.1 + 6.0.0-preview.5.21253.3 - 6.0.0-preview.5.21253.1 - 6.0.0-preview.5.21253.1 - 6.0.0-preview.5.21253.1 - 6.0.0-preview.5.21253.1 - 6.0.0-preview.5.21253.1 + 6.0.0-preview.5.21253.3 + 6.0.0-preview.5.21253.3 + 6.0.0-preview.5.21253.3 + 6.0.0-preview.5.21253.3 + 6.0.0-preview.5.21253.3 2.1.0 @@ -142,7 +142,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.0.0-preview-20210503-02 + 17.0.0-preview-20210504-01 From c78e2d500e3bd99a971af79c8be15cf4f8f1a5cb Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Tue, 4 May 2021 10:55:23 -0500 Subject: [PATCH 64/77] Bump to latest preview 4 Xamarin workloads * xamarin-android: https://github.com/xamarin/xamarin-android/commit/a09fa1e93a94c7ee9f759c840ed7a5829d0e9152 * xamarin-macios: https://github.com/xamarin/xamarin-macios/commit/422b620702d5ebfe7f5536e126d28f6b18d9fdc6 Manually tested this with: > .\build.cmd -pack -publish Then `artifacts\packages\Debug\Shipping\dotnet-sdk-6.0.100-dev-win-x64.zip` seems to have the correct workload manifests. --- eng/Versions.props | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index b9bb45638..35dfdfe93 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -146,11 +146,11 @@ - 11.0.200-preview.4.232 - 14.5.100-preview.4.623 - 14.5.100-preview.4.623 - 11.3.100-preview.4.623 - 14.5.100-preview.4.623 + 11.0.200-preview.4.245 + 14.5.100-preview.4.633 + 14.5.100-preview.4.633 + 11.3.100-preview.4.633 + 14.5.100-preview.4.633 $(MicrosoftAspNetCoreAppRuntimePackageVersion) From 6a3a3e46c65471aedf9e0bfe14bc3eb1c8766024 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 4 May 2021 20:41:26 +0000 Subject: [PATCH 65/77] Update dependencies from https://github.com/dotnet/sdk build 20210504.11 (#10500) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 11.4.2-beta.21230.7 to 11.4.2-beta.21253.4 (parent: Microsoft.NET.Sdk) - NuGet.Build.Tasks: from 5.10.0-preview.3.7228 to 5.10.0-rc.7240 (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 ac2205e1f..09a249a1e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 9c100429018dd530ef432898eeb739db61590874 - + https://github.com/dotnet/sdk - 4cb41929dcf3c0a6f1308c9d05bd5c0f60447ae9 + 5f5337e8bddc98801140a9ce065fc94bfe279acd - + https://github.com/dotnet/sdk - 4cb41929dcf3c0a6f1308c9d05bd5c0f60447ae9 + 5f5337e8bddc98801140a9ce065fc94bfe279acd @@ -100,9 +100,9 @@ https://github.com/dotnet/wpf 40775430dc86d110ba7b83ca5a898b8f4e9335e7 - + https://github.com/dotnet/fsharp - e411df7595bbe379f07dd2bcbb6e4046eca9eb31 + a999919d71f838451607deeab656d094b2d13e04 https://github.com/microsoft/vstest @@ -121,9 +121,9 @@ https://github.com/dotnet/msbuild fa96a2a81e0fb8c028057fa204bbf386bfb36aec - + https://github.com/nuget/nuget.client - d2bb0de35242b04802c1a7856ebb7718f674565c + dca1d060f38e1e02f6bfca41e25f081f19fd534b https://github.com/Microsoft/ApplicationInsights-dotnet diff --git a/eng/Versions.props b/eng/Versions.props index 35dfdfe93..0a50d762b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-preview.5.21254.3 - 6.0.100-preview.5.21254.3 + 6.0.100-preview.5.21254.11 + 6.0.100-preview.5.21254.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 48211b0862a2b1d475f97dcd952f0836cce320d3 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 4 May 2021 16:17:02 -0500 Subject: [PATCH 66/77] enable source-build CI (#10499) --- .vsts-ci.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 6fe393a60..95a18d7a9 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -339,6 +339,12 @@ stages: # Never run tests on arm64 _TestArg: '' + - template: /eng/common/templates/job/source-build.yml + parameters: + platform: + name: 'Managed' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-3e800f1-20190501005343' + # https://github.com/dotnet/core-sdk/issues/248 # - template: /eng/build.yml # parameters: From d5bd6dac781787fc177739f06e9143457b82a689 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 5 May 2021 00:28:34 +0000 Subject: [PATCH 67/77] [main] Update dependencies from dotnet/sdk (#10503) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.5.21253.4 to 6.0.0-preview.5.21254.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.5.21253.4 to 6.0.0-preview.5.21254.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.5.21253.4 to 6.0.0-preview.5.21254.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21253.4 to 6.0.0-preview.5.21254.1 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-preview.5.21253.4 to 6.0.0-preview.5.21254.1 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-preview.5.21253.4 to 6.0.0-preview.5.21254.1 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.0.0-2.21254.8 to 4.0.0-2.21254.26 (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 09a249a1e..cb2f5208b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime bb2d2c45410b9407a9657df7f5ca113bced53a43 - + https://github.com/dotnet/aspnetcore - 8cf98856bb96c7aad8373ae5b1fa6e7f021f649e + 66cfa327f434e4cfa6cc068f85b46feae08bb4e0 - + https://github.com/dotnet/aspnetcore - 8cf98856bb96c7aad8373ae5b1fa6e7f021f649e + 66cfa327f434e4cfa6cc068f85b46feae08bb4e0 - + https://github.com/dotnet/aspnetcore - 8cf98856bb96c7aad8373ae5b1fa6e7f021f649e + 66cfa327f434e4cfa6cc068f85b46feae08bb4e0 - + https://github.com/dotnet/aspnetcore - 8cf98856bb96c7aad8373ae5b1fa6e7f021f649e + 66cfa327f434e4cfa6cc068f85b46feae08bb4e0 - + https://github.com/dotnet/aspnetcore - 8cf98856bb96c7aad8373ae5b1fa6e7f021f649e + 66cfa327f434e4cfa6cc068f85b46feae08bb4e0 - + https://github.com/dotnet/aspnetcore - 8cf98856bb96c7aad8373ae5b1fa6e7f021f649e + 66cfa327f434e4cfa6cc068f85b46feae08bb4e0 https://github.com/dotnet/test-templates @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 9c100429018dd530ef432898eeb739db61590874 - + https://github.com/dotnet/sdk - 5f5337e8bddc98801140a9ce065fc94bfe279acd + d202ae1de2a0e9178cebfb5f51cb1b9a46baacfd - + https://github.com/dotnet/sdk - 5f5337e8bddc98801140a9ce065fc94bfe279acd + d202ae1de2a0e9178cebfb5f51cb1b9a46baacfd @@ -113,9 +113,9 @@ 795106705fedfceb6d1de60999673dfe39dc7acf linker - + https://github.com/dotnet/roslyn - 28bd07cc74ebb4c3d5b2d9cb22b2fd60f5c580dd + 7b996850bb82a370ca74c3f57e0a4d4df1c90049 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 0a50d762b..168b39e12 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,20 +45,20 @@ - 6.0.0-preview.5.21253.4 - 6.0.0-preview.5.21253.4 - 6.0.0-preview.5.21253.4 - 6.0.0-preview.5.21253.4 - 6.0.0-preview.5.21253.4 - 6.0.0-preview.5.21253.4 + 6.0.0-preview.5.21254.1 + 6.0.0-preview.5.21254.1 + 6.0.0-preview.5.21254.1 + 6.0.0-preview.5.21254.1 + 6.0.0-preview.5.21254.1 + 6.0.0-preview.5.21254.1 0.2.0 - 6.0.100-preview.5.21254.11 - 6.0.100-preview.5.21254.11 + 6.0.100-preview.5.21254.19 + 6.0.100-preview.5.21254.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From bb099fcfd427dcb75536afaf9c19170ef9e129b2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 5 May 2021 01:36:45 +0000 Subject: [PATCH 68/77] Update dependencies from https://github.com/dotnet/sdk build 20210504.21 (#10506) [main] 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 cb2f5208b..9e847abdd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 9c100429018dd530ef432898eeb739db61590874 - + https://github.com/dotnet/sdk - d202ae1de2a0e9178cebfb5f51cb1b9a46baacfd + 78f52c75c24394c3e792ab0d26ca72e50cccb18f - + https://github.com/dotnet/sdk - d202ae1de2a0e9178cebfb5f51cb1b9a46baacfd + 78f52c75c24394c3e792ab0d26ca72e50cccb18f diff --git a/eng/Versions.props b/eng/Versions.props index 168b39e12..3571d1134 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-preview.5.21254.19 - 6.0.100-preview.5.21254.19 + 6.0.100-preview.5.21254.21 + 6.0.100-preview.5.21254.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ca036e5c23936729b434698954275786cd8151a1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 5 May 2021 02:26:32 +0000 Subject: [PATCH 69/77] Update dependencies from https://github.com/dotnet/sdk build 20210504.27 (#10508) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.5.21254.1 to 6.0.0-preview.5.21254.4 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.5.21254.1 to 6.0.0-preview.5.21254.4 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.5.21254.1 to 6.0.0-preview.5.21254.4 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21254.1 to 6.0.0-preview.5.21254.4 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-preview.5.21254.1 to 6.0.0-preview.5.21254.4 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-preview.5.21254.1 to 6.0.0-preview.5.21254.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 9e847abdd..fcb4bd760 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime bb2d2c45410b9407a9657df7f5ca113bced53a43 - + https://github.com/dotnet/aspnetcore - 66cfa327f434e4cfa6cc068f85b46feae08bb4e0 + d2b772b33c31b781a45e4a92a33861034ecbe2e8 - + https://github.com/dotnet/aspnetcore - 66cfa327f434e4cfa6cc068f85b46feae08bb4e0 + d2b772b33c31b781a45e4a92a33861034ecbe2e8 - + https://github.com/dotnet/aspnetcore - 66cfa327f434e4cfa6cc068f85b46feae08bb4e0 + d2b772b33c31b781a45e4a92a33861034ecbe2e8 - + https://github.com/dotnet/aspnetcore - 66cfa327f434e4cfa6cc068f85b46feae08bb4e0 + d2b772b33c31b781a45e4a92a33861034ecbe2e8 - + https://github.com/dotnet/aspnetcore - 66cfa327f434e4cfa6cc068f85b46feae08bb4e0 + d2b772b33c31b781a45e4a92a33861034ecbe2e8 - + https://github.com/dotnet/aspnetcore - 66cfa327f434e4cfa6cc068f85b46feae08bb4e0 + d2b772b33c31b781a45e4a92a33861034ecbe2e8 https://github.com/dotnet/test-templates @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 9c100429018dd530ef432898eeb739db61590874 - + https://github.com/dotnet/sdk - 78f52c75c24394c3e792ab0d26ca72e50cccb18f + 5c4aefd8121fbde3d38470345434c70cefb5036d - + https://github.com/dotnet/sdk - 78f52c75c24394c3e792ab0d26ca72e50cccb18f + 5c4aefd8121fbde3d38470345434c70cefb5036d diff --git a/eng/Versions.props b/eng/Versions.props index 3571d1134..0ea820691 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,20 +45,20 @@ - 6.0.0-preview.5.21254.1 - 6.0.0-preview.5.21254.1 - 6.0.0-preview.5.21254.1 - 6.0.0-preview.5.21254.1 - 6.0.0-preview.5.21254.1 - 6.0.0-preview.5.21254.1 + 6.0.0-preview.5.21254.4 + 6.0.0-preview.5.21254.4 + 6.0.0-preview.5.21254.4 + 6.0.0-preview.5.21254.4 + 6.0.0-preview.5.21254.4 + 6.0.0-preview.5.21254.4 0.2.0 - 6.0.100-preview.5.21254.21 - 6.0.100-preview.5.21254.21 + 6.0.100-preview.5.21254.27 + 6.0.100-preview.5.21254.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 84bbbde048b3feecb2aadc0471a3f5a3dc6d09d7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 5 May 2021 03:32:24 +0000 Subject: [PATCH 70/77] Update dependencies from https://github.com/dotnet/sdk build 20210504.28 (#10509) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.5.21254.4 to 6.0.0-preview.5.21254.7 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.5.21254.4 to 6.0.0-preview.5.21254.7 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.5.21254.4 to 6.0.0-preview.5.21254.7 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21254.4 to 6.0.0-preview.5.21254.7 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-preview.5.21254.4 to 6.0.0-preview.5.21254.7 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-preview.5.21254.4 to 6.0.0-preview.5.21254.7 (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 fcb4bd760..522612844 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime bb2d2c45410b9407a9657df7f5ca113bced53a43 - + https://github.com/dotnet/aspnetcore - d2b772b33c31b781a45e4a92a33861034ecbe2e8 + bbe65b8eaadcb6021f863a293fb57c46085db883 - + https://github.com/dotnet/aspnetcore - d2b772b33c31b781a45e4a92a33861034ecbe2e8 + bbe65b8eaadcb6021f863a293fb57c46085db883 - + https://github.com/dotnet/aspnetcore - d2b772b33c31b781a45e4a92a33861034ecbe2e8 + bbe65b8eaadcb6021f863a293fb57c46085db883 - + https://github.com/dotnet/aspnetcore - d2b772b33c31b781a45e4a92a33861034ecbe2e8 + bbe65b8eaadcb6021f863a293fb57c46085db883 - + https://github.com/dotnet/aspnetcore - d2b772b33c31b781a45e4a92a33861034ecbe2e8 + bbe65b8eaadcb6021f863a293fb57c46085db883 - + https://github.com/dotnet/aspnetcore - d2b772b33c31b781a45e4a92a33861034ecbe2e8 + bbe65b8eaadcb6021f863a293fb57c46085db883 https://github.com/dotnet/test-templates @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 9c100429018dd530ef432898eeb739db61590874 - + https://github.com/dotnet/sdk - 5c4aefd8121fbde3d38470345434c70cefb5036d + a3313de48b62d9282469735f7c02f12f095bc258 - + https://github.com/dotnet/sdk - 5c4aefd8121fbde3d38470345434c70cefb5036d + a3313de48b62d9282469735f7c02f12f095bc258 diff --git a/eng/Versions.props b/eng/Versions.props index 0ea820691..f5b269b14 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,20 +45,20 @@ - 6.0.0-preview.5.21254.4 - 6.0.0-preview.5.21254.4 - 6.0.0-preview.5.21254.4 - 6.0.0-preview.5.21254.4 - 6.0.0-preview.5.21254.4 - 6.0.0-preview.5.21254.4 + 6.0.0-preview.5.21254.7 + 6.0.0-preview.5.21254.7 + 6.0.0-preview.5.21254.7 + 6.0.0-preview.5.21254.7 + 6.0.0-preview.5.21254.7 + 6.0.0-preview.5.21254.7 0.2.0 - 6.0.100-preview.5.21254.27 - 6.0.100-preview.5.21254.27 + 6.0.100-preview.5.21254.28 + 6.0.100-preview.5.21254.28 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3c87114e6db030f4e59294cd9b5d0b8304fd95c7 Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Tue, 4 May 2021 20:55:39 -0700 Subject: [PATCH 71/77] Optional Workload: Finalizer (#10356) MSI finalizer to remove optional workloads when uninstalling the SDK. --- .vsts-ci.yml | 8 +- Native.sln | 42 ++++ eng/Build.props | 8 + eng/Versions.props | 3 + eng/configure-toolset.ps1 | 2 + eng/configure-toolset.sh | 5 +- eng/native.proj | 16 ++ eng/version.csproj | 8 + global.json | 6 +- src/finalizer/CMakeLists.txt | 39 ++++ src/finalizer/finalizer.cpp | 211 ++++++++++++++++++ src/finalizer/finalizer.proj | 14 ++ src/finalizer/native.rc | Bin 0 -> 3024 bytes src/finalizer/precomp.h | 26 +++ src/finalizer_shim/finalizer_shim.csproj | 35 +++ src/redist/targets/GenerateMSIs.targets | 3 + .../packaging/windows/clisdk/bundle.wxs | 18 +- .../windows/clisdk/generatebundle.ps1 | 2 + .../packaging/windows/clisdk/variables.wxi | 2 + 19 files changed, 440 insertions(+), 8 deletions(-) create mode 100644 Native.sln create mode 100644 eng/Build.props create mode 100644 eng/native.proj create mode 100644 eng/version.csproj create mode 100644 src/finalizer/CMakeLists.txt create mode 100644 src/finalizer/finalizer.cpp create mode 100644 src/finalizer/finalizer.proj create mode 100644 src/finalizer/native.rc create mode 100644 src/finalizer/precomp.h create mode 100644 src/finalizer_shim/finalizer_shim.csproj diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 95a18d7a9..db8b04ad3 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -46,10 +46,10 @@ stages: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: NetCorePublic-Pool - queue: buildpool.windows.10.amd64.vs2017.open + queue: buildpool.windows.10.amd64.vs2019.open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCoreInternal-Pool - queue: buildpool.windows.10.amd64.vs2017 + queue: buildpool.windows.10.amd64.vs2019 timeoutInMinutes: 180 strategy: matrix: @@ -103,10 +103,10 @@ stages: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: NetCorePublic-Pool - queue: buildpool.windows.10.amd64.vs2017.open + queue: buildpool.windows.10.amd64.vs2019.open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCoreInternal-Pool - queue: buildpool.windows.10.amd64.vs2017 + queue: buildpool.windows.10.amd64.vs2019 timeoutInMinutes: 180 strategy: matrix: diff --git a/Native.sln b/Native.sln new file mode 100644 index 000000000..7ce79b609 --- /dev/null +++ b/Native.sln @@ -0,0 +1,42 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.28603.18 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{ED2FE3E2-F7E7-4389-8231-B65123F2076F}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "finalizer_shim", "src\finalizer_shim\finalizer_shim.csproj", "{688E2883-C5A9-4D66-A207-772C9160989C}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x86 = Debug|x86 + Debug|x64 = Debug|x64 + Debug|arm64 = Debug|arm64 + Release|x86 = Release|x86 + Release|x64 = Release|x64 + Release|arm64 = Release|arm64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {688E2883-C5A9-4D66-A207-772C9160989C}.Debug|x86.ActiveCfg = Debug|x86 + {688E2883-C5A9-4D66-A207-772C9160989C}.Debug|x86.Build.0 = Debug|x86 + {688E2883-C5A9-4D66-A207-772C9160989C}.Debug|x64.ActiveCfg = Debug|x64 + {688E2883-C5A9-4D66-A207-772C9160989C}.Debug|x64.Build.0 = Debug|x64 + {688E2883-C5A9-4D66-A207-772C9160989C}.Debug|arm64.ActiveCfg = Debug|arm64 + {688E2883-C5A9-4D66-A207-772C9160989C}.Debug|arm64.Build.0 = Debug|arm64 + {688E2883-C5A9-4D66-A207-772C9160989C}.Release|x86.ActiveCfg = Release|x86 + {688E2883-C5A9-4D66-A207-772C9160989C}.Release|x86.Build.0 = Release|x86 + {688E2883-C5A9-4D66-A207-772C9160989C}.Release|x64.ActiveCfg = Release|x64 + {688E2883-C5A9-4D66-A207-772C9160989C}.Release|x64.Build.0 = Release|x64 + {688E2883-C5A9-4D66-A207-772C9160989C}.Release|arm64.ActiveCfg = Release|arm64 + {688E2883-C5A9-4D66-A207-772C9160989C}.Release|arm64.Build.0 = Release|arm64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {688E2883-C5A9-4D66-A207-772C9160989C} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {18FCFCA3-D1A8-4D3A-9763-6A658D0D726F} + EndGlobalSection +EndGlobal diff --git a/eng/Build.props b/eng/Build.props new file mode 100644 index 000000000..917aa8993 --- /dev/null +++ b/eng/Build.props @@ -0,0 +1,8 @@ + + + + + + diff --git a/eng/Versions.props b/eng/Versions.props index f5b269b14..402e77f66 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -99,6 +99,9 @@ $(MicrosoftNETCoreAppRuntimePackageVersion) $(MicrosoftNETCoreAppRuntimePackageVersion) + + 3.14.0-dotnet + $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) diff --git a/eng/configure-toolset.ps1 b/eng/configure-toolset.ps1 index 87375243e..c6cc32f0c 100644 --- a/eng/configure-toolset.ps1 +++ b/eng/configure-toolset.ps1 @@ -2,3 +2,5 @@ $script:useInstalledDotNetCli = $false +# Add CMake to the path. +$env:PATH = "$PSScriptRoot\..\.tools\bin;$env:PATH" diff --git a/eng/configure-toolset.sh b/eng/configure-toolset.sh index d890b1b02..1e0b58a36 100644 --- a/eng/configure-toolset.sh +++ b/eng/configure-toolset.sh @@ -1,3 +1,6 @@ # SdkTests do not currently work with globally installed CLI as they use dotnet-install.ps1 to install more runtimes -useInstalledDotNetCli="false" \ No newline at end of file +useInstalledDotNetCli="false" + +# Working around issue https://github.com/dotnet/arcade/issues/7327 +DisableNativeToolsetInstalls=true \ No newline at end of file diff --git a/eng/native.proj b/eng/native.proj new file mode 100644 index 000000000..736b175c3 --- /dev/null +++ b/eng/native.proj @@ -0,0 +1,16 @@ + + + + $(Architecture) + + + + + + + + + + + + diff --git a/eng/version.csproj b/eng/version.csproj new file mode 100644 index 000000000..c745a3474 --- /dev/null +++ b/eng/version.csproj @@ -0,0 +1,8 @@ + + + $(CoreSdkTargetFramework) + $(ArtifactsObjDir)sdk_version.h + + + + diff --git a/global.json b/global.json index 825c7cd6f..5b01eaf09 100644 --- a/global.json +++ b/global.json @@ -7,7 +7,11 @@ ] } }, + "native-tools": { + "cmake": "3.16.4" + }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21253.2" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21253.2", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21253.2" } } diff --git a/src/finalizer/CMakeLists.txt b/src/finalizer/CMakeLists.txt new file mode 100644 index 000000000..fe1b531ea --- /dev/null +++ b/src/finalizer/CMakeLists.txt @@ -0,0 +1,39 @@ +cmake_minimum_required(VERSION 3.15.5) + +# Create project named finalizer, this will +# will generate Finalizer.vcxproj +project(Finalizer) + +set(CMAKE_MACOSX_RPATH 1) +set(CMAKE_CXX_STANDARD 11) +set(CMAKE_CXX_STANDARD_REQUIRED ON) +set(CMAKE_FIND_LIBRARY_SUFFIXES ".lib") +set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS /ENTRY:wmainCRTStartup") + +# The WiX SDK is extracted from a NuGet package using an SDK .csproj (finalizer_shim) +# that copies the "lib" and "inc" folders to a stable location. + +include_directories(../../artifacts/WixSdk/inc) +include_directories(../../artifacts/obj) +link_directories(../../artifacts/WixSdk/lib/${Platform}) + +add_compile_options(/MT) + +add_executable(Finalizer + finalizer.cpp + native.rc +) + +# These are normally part of a .vcxproj in Visual Studio, but +# appears to be missing when CMAKE generates a .vcxproj +# for arm64. +target_link_libraries(Finalizer shell32.lib) +target_link_libraries(Finalizer advapi32.lib) +target_link_libraries(Finalizer version.lib) +target_link_libraries(Finalizer msi.lib) + +# Add WiX libraries +target_link_libraries(Finalizer wcautil.lib) +target_link_libraries(Finalizer dutil.lib) + +install(TARGETS Finalizer) diff --git a/src/finalizer/finalizer.cpp b/src/finalizer/finalizer.cpp new file mode 100644 index 000000000..5860d3df0 --- /dev/null +++ b/src/finalizer/finalizer.cpp @@ -0,0 +1,211 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +#include "precomp.h" + +extern "C" HRESULT Initialize(int argc, wchar_t* argv[]) +{ + HRESULT hr = S_OK; + + // We're not going to do any clever parsing. This is intended to be called from + // the standalone bundle only and there will only be two parameters: + // 1. The path of the log file, created by the bundle. + // 2. The dependent we're trying to clean up. + if (argc != 3) + { + return HRESULT_FROM_WIN32(ERROR_INVALID_COMMAND_LINE); + } + + LogInitialize(::GetModuleHandleW(NULL)); + +#ifdef _DEBUG + LogSetLevel(REPORT_DEBUG, FALSE); +#else + LogSetLevel(REPORT_VERBOSE, FALSE); // FALSE means don't write an additional text line to the log saying the level changed +#endif + + hr = LogOpen(NULL, argv[1], NULL, NULL, FALSE, TRUE, NULL); + ExitOnFailure(hr, "Failed to create log file."); + + hr = RegInitialize(); + ExitOnFailure(hr, "Failed to initialize the registry."); + + hr = WiuInitialize(); + ExitOnFailure(hr, "Failed to initialize Windows Installer."); + +LExit: + return hr; +} + +extern "C" HRESULT RemoveDependent(LPWSTR sczDependent, BOOL* pbRestartRequired) +{ + HRESULT hr = S_OK; + HKEY hkInstallerDependenciesKey = NULL; + HKEY hkProviderKey = NULL; + HKEY hkDependentsKey = NULL; + LPWSTR sczProviderKey = NULL; + LPWSTR sczDependentsKey = NULL; + LPWSTR sczProductId = NULL; + LPWSTR sczProductName = NULL; + DWORD cSubKeys = 0; + DWORD dwExitCode = 0; + WIU_RESTART restart = WIU_RESTART_NONE; + + // Optional workloads are always per-machine installs, so we don't need to check HKCU. + hr = RegOpen(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Classes\\Installer\\Dependencies", KEY_READ, &hkInstallerDependenciesKey); + ExitOnFailure(hr, "Failed to read installer dependencies key."); + + // This has to be an exhaustive search as we're not looking for a specific provider key, but for a specific dependent + // that could be registered against any provider key. + for (DWORD dwIndex = 0;; ++dwIndex) + { + // Get the next provider key name + hr = RegKeyEnum(hkInstallerDependenciesKey, dwIndex, &sczProviderKey); + + if (E_NOMOREITEMS == hr) + { + hr = S_OK; + break; + } + + ExitOnFailure(hr, "Failed to enumerate installer dependency provider keys."); + LogStringLine(REPORT_STANDARD, "Processing provider key: %ls", sczProviderKey); + + hr = RegOpen(hkInstallerDependenciesKey, sczProviderKey, KEY_READ, &hkProviderKey); + ExitOnFailure(hr, "Unable to open provider key."); + + // Open the dependents key with write permissions so we can modify it if it matches + // the target dependent value. + hr = RegOpen(hkProviderKey, L"Dependents", KEY_READ | KEY_WRITE, &hkDependentsKey); + if (E_FILENOTFOUND == hr) + { + // Providers can sometimes become orphaned duirng uninstalls. If there's no Dependents subkey, we just + // release the handle and continue to the next provider key. + hr = S_OK; + ReleaseRegKey(hkProviderKey); + + continue; + } + + ExitOnFailure(hr, "Unable to open dependents key."); + + // Enumerate over all the dependent keys + for (DWORD dwDepdentsKeyIndex = 0;; ++dwDepdentsKeyIndex) + { + hr = RegKeyEnum(hkDependentsKey, dwDepdentsKeyIndex, &sczDependentsKey); + + if (E_NOMOREITEMS == hr) + { + hr = S_OK; + break; + } + + ExitOnFailure(hr, "Failed to read provider's dependent key."); + + if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, sczDependentsKey, -1, sczDependent, -1)) + { + LogStringLine(REPORT_STANDARD, " Dependent match found: %ls", sczDependentsKey); + + hr = RegDelete(hkDependentsKey, sczDependent, REG_KEY_DEFAULT, TRUE); + ExitOnFailure(hr, "Failed to delete dependent \"%ls\"", sczDependent); + LogStringLine(REPORT_STANDARD, " Dependent deleted"); + // Reset the index since we're deleting keys while enumerating + dwDepdentsKeyIndex = dwDepdentsKeyIndex > 1 ? dwDepdentsKeyIndex-- : 0; + + // Check if there are any subkeys remaining under the dependents key. If not, we + // can uninstall the MSI. We'll recheck the key again in case the MSI fails to clean up the + // provider key to make sure we don't have orphaned keys. + hr = RegQueryKey(hkDependentsKey, &cSubKeys, NULL); + ExitOnFailure(hr, "Failed to query dependents key."); + + LogStringLine(REPORT_STANDARD, " Remaining dependents: %i", cSubKeys); + + if (0 == cSubKeys) + { + // This was the final dependent, so now we can remove the installation if the provider wasn't corrupted and + // still contains the product ID. + hr = RegReadString(hkProviderKey, NULL, &sczProductId); + + if (E_FILENOTFOUND == hr) + { + LogStringLine(REPORT_STANDARD, " No product ID found, provider key: %ls", sczProviderKey); + hr = S_OK; + break; + } + else + { + ExitOnFailure(hr, "Failed to read product ID."); + } + + // Let's make sure the product is actually installed. The provider key for an MSI typically + // stores the ProductCode, DisplayName, and Version, but by calling into MsiGetProductInfo, + // we're doing an implicit detect and getting a property back. + hr = WiuGetProductInfo(sczProductId, L"ProductName", &sczProductName); + if (SUCCEEDED(hr)) + { + // The provider key *should* have the ProductName and ProductVersion properties, but since + // we know it's installed, we just query the installer service. + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + hr = WiuConfigureProductEx(sczProductId, INSTALLLEVEL_DEFAULT, INSTALLSTATE_ABSENT, L"MSIFASTINSTALL=7 IGNOREDEPENDENCIES=ALL REBOOT=ReallySuppress", &restart); + LogStringLine(REPORT_STANDARD, " Uninstall of \"%ls\" (%ls%) exited with 0x%.8x", sczProductName, sczProductId, hr); + + // Flag any reboot since we need to return that to the bundle. + if (WIU_RESTART_INITIATED == restart || WIU_RESTART_REQUIRED == restart) + { + LogStringLine(REPORT_STANDARD, " Reboot requested, deferring."); + *pbRestartRequired = TRUE; + } + + // Reset potential failures so we can continue to remove as many dependents as possible. + hr = S_OK; + } + else if (HRESULT_FROM_WIN32(ERROR_UNKNOWN_PRODUCT) == hr || HRESULT_FROM_WIN32(ERROR_UNKNOWN_PROPERTY) == hr) + { + // Possibly a corrupted provider key that wasn't cleaned up. We'll just ignore it. + LogStringLine(REPORT_STANDARD, " Product is not installed, ProductCode:%ls, result: 0x%.8x", sczProductId, hr); + hr = S_OK; + } + } + } + } + + ReleaseRegKey(hkDependentsKey); + ReleaseRegKey(hkProviderKey); + } + +LExit: + ReleaseStr(sczProductName); + ReleaseStr(sczProductId); + ReleaseStr(sczProviderKey); + ReleaseStr(sczDependentsKey); + ReleaseRegKey(hkDependentsKey); + ReleaseRegKey(hkProviderKey); + ReleaseRegKey(hkInstallerDependenciesKey); + return hr; +} + +int wmain(int argc, wchar_t* argv[]) +{ + HRESULT hr = S_OK; + DWORD dwExitCode = 0; + LPWSTR sczDependent = NULL; + BOOL bRestartRequired = FALSE; + + hr = ::Initialize(argc, argv); + ExitOnFailure(hr, "Failed to initialize."); + + sczDependent = argv[2]; + hr = ::RemoveDependent(sczDependent, &bRestartRequired); + ExitOnFailure(hr, "Failed to remove dependent \"%ls\".", sczDependent); + + if (bRestartRequired) + { + dwExitCode = ERROR_SUCCESS_REBOOT_REQUIRED; + } + +LExit: + LogUninitialize(TRUE); + RegUninitialize(); + WiuUninitialize(); + return FAILED(hr) ? (int)hr : (int)dwExitCode; +} diff --git a/src/finalizer/finalizer.proj b/src/finalizer/finalizer.proj new file mode 100644 index 000000000..463a37a14 --- /dev/null +++ b/src/finalizer/finalizer.proj @@ -0,0 +1,14 @@ + + + CMakeLists.txt + + + + + + + + diff --git a/src/finalizer/native.rc b/src/finalizer/native.rc new file mode 100644 index 0000000000000000000000000000000000000000..bea8f0b5201472b08eff2cd32328290138cdde8a GIT binary patch literal 3024 zcmc(hT~As;5QgWvN&mx!-l#FvT6@u?X(IAbBZ>ipcxA96B}E_tRr}-HKJPBeIR}(h z+oU1qupcw?&b%`_dw%|SWj!0%XY1S4F0EtEayDl4)z0l3^BZP88zS@CzOeVwUifEO z?}OcXTbD@Rq9yr{bNQy#vDmbt)fgRE)sC4T@GdcS3p;ULXeFd7=w)>sI^h@A&mWPK zg%dEVRp*X-`V{vu9=EIO4xKF~;t$CI!f5CMH%&tdNu1929YMUwl{gWyy5>Fv>=8~1i`%@DRZsvJ-PG{P(4LU-D`qAyG zzSifbJ5pKhvex$_?T(Qe!hW9|I7S0T_lz#Q?lmiy$X@Yuyo9XXcnd=^ri$s=_t{?d z_SSuzWN^c_GEBss;Ohaoci0oYZvQd!F)Krm9VqI2j`x(BlxOlF?6o)pHCW!{4hSRX zdu0!qvG0+JdP0;Ay*3ycshdh7dXfEK?W?|7Vn@8dN?^2&t-klPiZOgX4R4DRlH{7`rotFzLtFK%F-Qd>BiH| ztXodpssc54?8M&aV5aTA869uc;uHzhO^$o`ZgwMY+8e$_-tpwv5$~#K)vnkN*%QZ_ zYhUl*@tVz+5R2ZDPJ>R=axFMpOZl{pgs>fGA-gR1TK8ux l@|x}`G1u8!y+L*9G>v_&#_9|AYML=ON0805-K2ws(J$6shg$#u literal 0 HcmV?d00001 diff --git a/src/finalizer/precomp.h b/src/finalizer/precomp.h new file mode 100644 index 000000000..92e713d52 --- /dev/null +++ b/src/finalizer/precomp.h @@ -0,0 +1,26 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +#pragma once + +#include +#include +#include +#include +#include +#include +#include +#include + +// Configure some logging parameters for WiX +#define ExitTrace LogErrorString +#define ExitTrace1 LogErrorString +#define ExitTrace2 LogErrorString +#define ExitTrace3 LogErrorString + +// Includes from WiX SDK +#include "dutil.h" +#include "regutil.h" +#include "logutil.h" +#include "strutil.h" +#include "wiutil.h" diff --git a/src/finalizer_shim/finalizer_shim.csproj b/src/finalizer_shim/finalizer_shim.csproj new file mode 100644 index 000000000..1f378f56b --- /dev/null +++ b/src/finalizer_shim/finalizer_shim.csproj @@ -0,0 +1,35 @@ + + + + $(Architecture) + $(CoreSdkTargetFramework) + true + false + false + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index 0c69a4db7..b3fbe8fab 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -27,6 +27,8 @@ $(MSBuildThisFileDirectory)packaging/windows/clisdk/generatebundle.ps1 $(MSBuildThisFileDirectory)packaging/windows/clisdk/generatenupkg.ps1 + $(ArtifactsDir)bin/finalizer/$(Architecture)/$(Configuration)/bin/finalizer.exe + $(MSBuildThisFileDirectory)packaging/windows/clisdk/VS.Redist.Common.NetCore.Toolset.nuspec $(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Toolset.$(Architecture).$(FullNugetVersion).nupkg $(MSBuildThisFileDirectory)packaging/windows/clisdk/VS.Redist.Common.NetCore.SdkPlaceholder.nuspec @@ -345,6 +347,7 @@ '$(DownloadsFolder)$(DownloadedArm64NetCoreAppHostPackInstallerFileName)' ^ '$(DownloadsFolder)$(DownloadedAspNetTargetingPackInstallerFileName)' ^ '$(DownloadsFolder)$(DownloadedWindowsDesktopTargetingPackInstallerFileName)' ^ + '$(FinalizerExe)' ^ '$(LatestTemplateMsiInstallerFile)' ^ '$(ManifestsMsiInstallerFile)' ^ '$(CombinedFrameworkSdkHostMSIInstallerFile)' ^ diff --git a/src/redist/targets/packaging/windows/clisdk/bundle.wxs b/src/redist/targets/packaging/windows/clisdk/bundle.wxs index aac49d06b..67cae8841 100644 --- a/src/redist/targets/packaging/windows/clisdk/bundle.wxs +++ b/src/redist/targets/packaging/windows/clisdk/bundle.wxs @@ -175,10 +175,10 @@ - + - + @@ -194,6 +194,20 @@ + + + diff --git a/src/redist/targets/packaging/windows/clisdk/generatebundle.ps1 b/src/redist/targets/packaging/windows/clisdk/generatebundle.ps1 index 58bbdde7a..d68bf8441 100644 --- a/src/redist/targets/packaging/windows/clisdk/generatebundle.ps1 +++ b/src/redist/targets/packaging/windows/clisdk/generatebundle.ps1 @@ -16,6 +16,7 @@ param( [Parameter(Mandatory=$true)][string]$Arm64NetCoreAppHostPackMSIFile, [Parameter(Mandatory=$true)][string]$AspNetTargetingPackMSIFile, [Parameter(Mandatory=$true)][string]$WindowsDesktopTargetingPackMSIFile, + [Parameter(Mandatory=$true)][string]$FinalizerExe, [Parameter(Mandatory=$true)][string]$TemplatesMSIFile, [Parameter(Mandatory=$true)][string]$ManifestsMSIFile, [Parameter(Mandatory=$true)][string]$DotnetBundleOutput, @@ -63,6 +64,7 @@ function RunCandleForBundle -dNetStandardTargetingPackMsiSourcePath="$NetStandardTargetingPackMSIFile" ` -dAspNetTargetingPackMsiSourcePath="$AspNetTargetingPackMSIFile" ` -dWindowsDesktopTargetingPackMsiSourcePath="$WindowsDesktopTargetingPackMSIFile" ` + -dFinalizerExeSourcePath="$FinalizerExe" ` -dTemplatesMsiSourcePath="$TemplatesMSIFile" ` -dManifestsMsiSourcePath="$ManifestsMSIFile" ` -dWinFormsAndWpfVersion="$WindowsDesktopVersion" ` diff --git a/src/redist/targets/packaging/windows/clisdk/variables.wxi b/src/redist/targets/packaging/windows/clisdk/variables.wxi index bad1ff7ef..414585175 100644 --- a/src/redist/targets/packaging/windows/clisdk/variables.wxi +++ b/src/redist/targets/packaging/windows/clisdk/variables.wxi @@ -45,4 +45,6 @@ + + From 0e29f22ae9461efed2567b93e31d063c9680c14f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 5 May 2021 05:43:36 +0000 Subject: [PATCH 72/77] [main] Update dependencies from dotnet/sdk (#10510) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.5.21254.7 to 6.0.0-preview.5.21254.16 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.5.21254.7 to 6.0.0-preview.5.21254.16 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.5.21254.7 to 6.0.0-preview.5.21254.16 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21254.7 to 6.0.0-preview.5.21254.16 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-preview.5.21254.7 to 6.0.0-preview.5.21254.16 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-preview.5.21254.7 to 6.0.0-preview.5.21254.16 (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 522612844..da604c5c9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime bb2d2c45410b9407a9657df7f5ca113bced53a43 - + https://github.com/dotnet/aspnetcore - bbe65b8eaadcb6021f863a293fb57c46085db883 + 0c338065fcc16d90c3173c56f4f7a1d8f28fb922 - + https://github.com/dotnet/aspnetcore - bbe65b8eaadcb6021f863a293fb57c46085db883 + 0c338065fcc16d90c3173c56f4f7a1d8f28fb922 - + https://github.com/dotnet/aspnetcore - bbe65b8eaadcb6021f863a293fb57c46085db883 + 0c338065fcc16d90c3173c56f4f7a1d8f28fb922 - + https://github.com/dotnet/aspnetcore - bbe65b8eaadcb6021f863a293fb57c46085db883 + 0c338065fcc16d90c3173c56f4f7a1d8f28fb922 - + https://github.com/dotnet/aspnetcore - bbe65b8eaadcb6021f863a293fb57c46085db883 + 0c338065fcc16d90c3173c56f4f7a1d8f28fb922 - + https://github.com/dotnet/aspnetcore - bbe65b8eaadcb6021f863a293fb57c46085db883 + 0c338065fcc16d90c3173c56f4f7a1d8f28fb922 https://github.com/dotnet/test-templates @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 9c100429018dd530ef432898eeb739db61590874 - + https://github.com/dotnet/sdk - a3313de48b62d9282469735f7c02f12f095bc258 + 0f6b90b94e942af95723f176dcb1148adc678840 - + https://github.com/dotnet/sdk - a3313de48b62d9282469735f7c02f12f095bc258 + 0f6b90b94e942af95723f176dcb1148adc678840 diff --git a/eng/Versions.props b/eng/Versions.props index 402e77f66..40c660b96 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,20 +45,20 @@ - 6.0.0-preview.5.21254.7 - 6.0.0-preview.5.21254.7 - 6.0.0-preview.5.21254.7 - 6.0.0-preview.5.21254.7 - 6.0.0-preview.5.21254.7 - 6.0.0-preview.5.21254.7 + 6.0.0-preview.5.21254.16 + 6.0.0-preview.5.21254.16 + 6.0.0-preview.5.21254.16 + 6.0.0-preview.5.21254.16 + 6.0.0-preview.5.21254.16 + 6.0.0-preview.5.21254.16 0.2.0 - 6.0.100-preview.5.21254.28 - 6.0.100-preview.5.21254.28 + 6.0.100-preview.5.21254.32 + 6.0.100-preview.5.21254.32 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3f646d13a758a0a33c46f097673d986a27855773 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 5 May 2021 06:19:13 +0000 Subject: [PATCH 73/77] Update dependencies from https://github.com/dotnet/sdk build 20210504.33 (#10511) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.5.21254.16 to 6.0.0-preview.5.21254.19 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.5.21254.16 to 6.0.0-preview.5.21254.19 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.5.21254.16 to 6.0.0-preview.5.21254.19 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21254.16 to 6.0.0-preview.5.21254.19 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-preview.5.21254.16 to 6.0.0-preview.5.21254.19 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-preview.5.21254.16 to 6.0.0-preview.5.21254.19 (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 da604c5c9..75aec6ec4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime bb2d2c45410b9407a9657df7f5ca113bced53a43 - + https://github.com/dotnet/aspnetcore - 0c338065fcc16d90c3173c56f4f7a1d8f28fb922 + 264b68cf9dc17b0e865b7fab6d6d55367523af0b - + https://github.com/dotnet/aspnetcore - 0c338065fcc16d90c3173c56f4f7a1d8f28fb922 + 264b68cf9dc17b0e865b7fab6d6d55367523af0b - + https://github.com/dotnet/aspnetcore - 0c338065fcc16d90c3173c56f4f7a1d8f28fb922 + 264b68cf9dc17b0e865b7fab6d6d55367523af0b - + https://github.com/dotnet/aspnetcore - 0c338065fcc16d90c3173c56f4f7a1d8f28fb922 + 264b68cf9dc17b0e865b7fab6d6d55367523af0b - + https://github.com/dotnet/aspnetcore - 0c338065fcc16d90c3173c56f4f7a1d8f28fb922 + 264b68cf9dc17b0e865b7fab6d6d55367523af0b - + https://github.com/dotnet/aspnetcore - 0c338065fcc16d90c3173c56f4f7a1d8f28fb922 + 264b68cf9dc17b0e865b7fab6d6d55367523af0b https://github.com/dotnet/test-templates @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 9c100429018dd530ef432898eeb739db61590874 - + https://github.com/dotnet/sdk - 0f6b90b94e942af95723f176dcb1148adc678840 + e121f36b4a1b5702efd34b202f489693bcf0b000 - + https://github.com/dotnet/sdk - 0f6b90b94e942af95723f176dcb1148adc678840 + e121f36b4a1b5702efd34b202f489693bcf0b000 diff --git a/eng/Versions.props b/eng/Versions.props index 40c660b96..e84074ce4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,20 +45,20 @@ - 6.0.0-preview.5.21254.16 - 6.0.0-preview.5.21254.16 - 6.0.0-preview.5.21254.16 - 6.0.0-preview.5.21254.16 - 6.0.0-preview.5.21254.16 - 6.0.0-preview.5.21254.16 + 6.0.0-preview.5.21254.19 + 6.0.0-preview.5.21254.19 + 6.0.0-preview.5.21254.19 + 6.0.0-preview.5.21254.19 + 6.0.0-preview.5.21254.19 + 6.0.0-preview.5.21254.19 0.2.0 - 6.0.100-preview.5.21254.32 - 6.0.100-preview.5.21254.32 + 6.0.100-preview.5.21254.33 + 6.0.100-preview.5.21254.33 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 47070197d2ffb72e700edc1b89ab121b9707fb23 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 5 May 2021 08:23:59 +0000 Subject: [PATCH 74/77] [main] Update dependencies from dotnet/sdk (#10512) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.5.21254.19 to 6.0.0-preview.5.21254.21 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.5.21254.19 to 6.0.0-preview.5.21254.21 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.5.21254.19 to 6.0.0-preview.5.21254.21 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21254.19 to 6.0.0-preview.5.21254.21 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-preview.5.21254.19 to 6.0.0-preview.5.21254.21 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-preview.5.21254.19 to 6.0.0-preview.5.21254.21 (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 75aec6ec4..5ef28456b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime bb2d2c45410b9407a9657df7f5ca113bced53a43 - + https://github.com/dotnet/aspnetcore - 264b68cf9dc17b0e865b7fab6d6d55367523af0b + 665ea2f868d916693ad1e243959349fa8e6d9647 - + https://github.com/dotnet/aspnetcore - 264b68cf9dc17b0e865b7fab6d6d55367523af0b + 665ea2f868d916693ad1e243959349fa8e6d9647 - + https://github.com/dotnet/aspnetcore - 264b68cf9dc17b0e865b7fab6d6d55367523af0b + 665ea2f868d916693ad1e243959349fa8e6d9647 - + https://github.com/dotnet/aspnetcore - 264b68cf9dc17b0e865b7fab6d6d55367523af0b + 665ea2f868d916693ad1e243959349fa8e6d9647 - + https://github.com/dotnet/aspnetcore - 264b68cf9dc17b0e865b7fab6d6d55367523af0b + 665ea2f868d916693ad1e243959349fa8e6d9647 - + https://github.com/dotnet/aspnetcore - 264b68cf9dc17b0e865b7fab6d6d55367523af0b + 665ea2f868d916693ad1e243959349fa8e6d9647 https://github.com/dotnet/test-templates @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 9c100429018dd530ef432898eeb739db61590874 - + https://github.com/dotnet/sdk - e121f36b4a1b5702efd34b202f489693bcf0b000 + ce47f5063e4010f9efb080db246ce275117cba5e - + https://github.com/dotnet/sdk - e121f36b4a1b5702efd34b202f489693bcf0b000 + ce47f5063e4010f9efb080db246ce275117cba5e diff --git a/eng/Versions.props b/eng/Versions.props index e84074ce4..0ba6f89e0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,20 +45,20 @@ - 6.0.0-preview.5.21254.19 - 6.0.0-preview.5.21254.19 - 6.0.0-preview.5.21254.19 - 6.0.0-preview.5.21254.19 - 6.0.0-preview.5.21254.19 - 6.0.0-preview.5.21254.19 + 6.0.0-preview.5.21254.21 + 6.0.0-preview.5.21254.21 + 6.0.0-preview.5.21254.21 + 6.0.0-preview.5.21254.21 + 6.0.0-preview.5.21254.21 + 6.0.0-preview.5.21254.21 0.2.0 - 6.0.100-preview.5.21254.33 - 6.0.100-preview.5.21254.33 + 6.0.100-preview.5.21255.1 + 6.0.100-preview.5.21255.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 44a5cb3ab3dd5b8789a495d3b1037d276f2a266b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 5 May 2021 12:13:47 +0000 Subject: [PATCH 75/77] Update dependencies from https://github.com/dotnet/sdk build 20210505.3 (#10515) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.ILLink.Tasks: from 6.0.100-preview.5.21253.3 to 6.0.100-preview.5.21254.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 5ef28456b..000d9a119 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 9c100429018dd530ef432898eeb739db61590874 - + https://github.com/dotnet/sdk - ce47f5063e4010f9efb080db246ce275117cba5e + e9c33dd7ea00b13012f965ec31ff0b75942ec046 - + https://github.com/dotnet/sdk - ce47f5063e4010f9efb080db246ce275117cba5e + e9c33dd7ea00b13012f965ec31ff0b75942ec046 @@ -108,9 +108,9 @@ https://github.com/microsoft/vstest 5a4a4c064ec8a0e9ccb02354e0137c3264cc8fb5 - + https://github.com/mono/linker - 795106705fedfceb6d1de60999673dfe39dc7acf + 4afa1051f5e44560368aacb21429e956ce39cc1a linker diff --git a/eng/Versions.props b/eng/Versions.props index 0ba6f89e0..1d136f29d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-preview.5.21255.1 - 6.0.100-preview.5.21255.1 + 6.0.100-preview.5.21255.3 + 6.0.100-preview.5.21255.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5fc7460211bb3071ce680f5efdb622f4dd8a5b34 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 5 May 2021 13:06:29 +0000 Subject: [PATCH 76/77] Update dependencies from https://github.com/dotnet/arcade build 20210504.3 (#10516) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- eng/common/cross/build-rootfs.sh | 4 ++++ eng/common/templates/job/onelocbuild.yml | 2 ++ global.json | 2 +- 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 000d9a119..c3b857573 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -136,14 +136,14 @@ - + https://github.com/dotnet/arcade - e9fd640e1ec1890489ea66ad0f59e733448056da + 0cfaf935894a4c98ff7445c903f1b4c32990b127 - + https://github.com/dotnet/arcade - e9fd640e1ec1890489ea66ad0f59e733448056da + 0cfaf935894a4c98ff7445c903f1b4c32990b127 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 1d136f29d..2bf28ec9c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ - 6.0.0-beta.21253.2 + 6.0.0-beta.21254.3 diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 81e641a57..df0dfa578 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -78,6 +78,10 @@ __IllumosPackages+=" openssl-1.1.1e" __IllumosPackages+=" zlib-1.2.11" __IllumosPackages+=" openldap-client-2.4.49" +# ML.NET dependencies +__UbuntuPackages+=" libomp5" +__UbuntuPackages+=" libomp-dev" + __UseMirror=0 __UnprocessedBuildArgs= diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml index b27d6faf3..958db4064 100644 --- a/eng/common/templates/job/onelocbuild.yml +++ b/eng/common/templates/job/onelocbuild.yml @@ -12,6 +12,7 @@ parameters: SourcesDirectory: $(Build.SourcesDirectory) CreatePr: true AutoCompletePr: false + UseLfLineEndings: true UseCheckedInLocProjectJson: false LanguageSet: VS_Main_Languages LclSource: lclFilesInRepo @@ -59,6 +60,7 @@ jobs: isCreatePrSelected: ${{ parameters.CreatePr }} ${{ if eq(parameters.CreatePr, true) }}: isAutoCompletePrSelected: ${{ parameters.AutoCompletePr }} + isUseLfLineEndingsSelected: ${{ parameters.UseLfLineEndings }} packageSourceAuth: patAuth patVariable: ${{ parameters.CeapexPat }} ${{ if eq(parameters.RepoType, 'gitHub') }}: diff --git a/global.json b/global.json index 5b01eaf09..bf04de7b2 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21253.2", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21254.3", "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21253.2" } } From 56109c44e441f282e84b98b5a650b67e28ce0abf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 5 May 2021 15:08:17 +0000 Subject: [PATCH 77/77] [main] Update dependencies from dotnet/sdk (#10517) [main] Update dependencies from dotnet/sdk - Coherency Updates: - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21253.3 to 6.0.0-preview.5.21254.12 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 6.0.0-preview.5.21253.3 to 6.0.0-preview.5.21254.12 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-preview.5.21253.3 to 6.0.0-preview.5.21254.12 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-preview.5.21253.3 to 6.0.0-preview.5.21254.12 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-preview.5.21253.3 to 6.0.0-preview.5.21254.12 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 6.0.0-preview.5.21253.3 to 6.0.0-preview.5.21254.12 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-preview.5.21230.2 to 6.0.100-preview.5.21253.2 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 18 +++++++++--------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c3b857573..1ffb8e4bd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop 9570a321daf2bd6756b91a0866bb8e0d7874190d - + https://github.com/dotnet/runtime - bb2d2c45410b9407a9657df7f5ca113bced53a43 + 65020c946254c9a99497f4fdfa4136131f51f913 - + https://github.com/dotnet/runtime - bb2d2c45410b9407a9657df7f5ca113bced53a43 + 65020c946254c9a99497f4fdfa4136131f51f913 - + https://github.com/dotnet/runtime - bb2d2c45410b9407a9657df7f5ca113bced53a43 + 65020c946254c9a99497f4fdfa4136131f51f913 - + https://github.com/dotnet/runtime - bb2d2c45410b9407a9657df7f5ca113bced53a43 + 65020c946254c9a99497f4fdfa4136131f51f913 - + https://github.com/dotnet/runtime - bb2d2c45410b9407a9657df7f5ca113bced53a43 + 65020c946254c9a99497f4fdfa4136131f51f913 @@ -39,9 +39,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - bb2d2c45410b9407a9657df7f5ca113bced53a43 + 65020c946254c9a99497f4fdfa4136131f51f913 https://github.com/dotnet/aspnetcore @@ -79,17 +79,17 @@ https://github.com/dotnet/test-templates 36a1b45f75489255f2d1770acd2d78c5002d4679 - + https://github.com/dotnet/templating - 9c100429018dd530ef432898eeb739db61590874 + 7e14ef44c849e230176477bf271ceab3db74ea7e - + https://github.com/dotnet/sdk - e9c33dd7ea00b13012f965ec31ff0b75942ec046 + 2a3aa0c04c5e047425c25a463a326e1c4a4d43dd - + https://github.com/dotnet/sdk - e9c33dd7ea00b13012f965ec31ff0b75942ec046 + 2a3aa0c04c5e047425c25a463a326e1c4a4d43dd diff --git a/eng/Versions.props b/eng/Versions.props index 2bf28ec9c..3ce6a8909 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -32,7 +32,7 @@ - 6.0.100-preview.5.21230.2 + 6.0.100-preview.5.21253.2 @@ -57,23 +57,23 @@ - 6.0.100-preview.5.21255.3 - 6.0.100-preview.5.21255.3 + 6.0.100-preview.5.21255.5 + 6.0.100-preview.5.21255.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-preview.5.21253.3 + 6.0.0-preview.5.21254.12 - 6.0.0-preview.5.21253.3 - 6.0.0-preview.5.21253.3 - 6.0.0-preview.5.21253.3 - 6.0.0-preview.5.21253.3 - 6.0.0-preview.5.21253.3 + 6.0.0-preview.5.21254.12 + 6.0.0-preview.5.21254.12 + 6.0.0-preview.5.21254.12 + 6.0.0-preview.5.21254.12 + 6.0.0-preview.5.21254.12 2.1.0