From 1796b5e257e505513c6422b605e92271cee1db56 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 30 Jan 2020 07:39:01 +0000 Subject: [PATCH 01/70] Add Blazor templates to the SDK --- NuGet.config | 1 + eng/Versions.props | 1 + src/redist/targets/BundledTemplates.targets | 1 + 3 files changed, 3 insertions(+) diff --git a/NuGet.config b/NuGet.config index 075766785..f216cef74 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,6 +18,7 @@ + diff --git a/eng/Versions.props b/eng/Versions.props index ddeff7283..0bd92a9eb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,6 +42,7 @@ 3.1.1-servicing.19615.10 3.1.1-servicing.19615.10 3.1.1-servicing.19615.10 + 3.2.0-preview2.20110.5 diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index 7c2713bc9..65fb60a6f 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -28,6 +28,7 @@ + From e65d3af04eee4efca88d29aefe80a88bbaf4075e Mon Sep 17 00:00:00 2001 From: Pranav K Date: Wed, 12 Feb 2020 10:46:10 -0800 Subject: [PATCH 02/70] Add Blazor templates to Versions.Details.xml --- eng/Version.Details.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2ca52088b..fd2089345 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -53,6 +53,10 @@ https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore e276c8174b8bfdeb70efceafa81c75f8badbc8db + + https://github.com/aspnet/AspNetCore + cae6a9cfb3519136ea8691df26d9a865f337b66b + https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore e276c8174b8bfdeb70efceafa81c75f8badbc8db From 55c3664e169fd168b4a0355b1e1e008b8ea88c00 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Tue, 18 Feb 2020 16:33:17 -0800 Subject: [PATCH 03/70] React to package renames --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- src/redist/targets/BundledTemplates.targets | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fd2089345..ec3f05385 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -53,9 +53,9 @@ https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore e276c8174b8bfdeb70efceafa81c75f8badbc8db - + https://github.com/aspnet/AspNetCore - cae6a9cfb3519136ea8691df26d9a865f337b66b + 92409e2e57b320f9728de62fba2c82168761f9cc https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 0bd92a9eb..545ef5a21 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,7 +42,7 @@ 3.1.1-servicing.19615.10 3.1.1-servicing.19615.10 3.1.1-servicing.19615.10 - 3.2.0-preview2.20110.5 + 3.2.0-preview2.20118.6 diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index 65fb60a6f..c597d4875 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -28,7 +28,7 @@ - + From 4204b9df7e35f8f4a66b1897667aae4a6d045d8e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 20 Feb 2020 22:37:24 +0000 Subject: [PATCH 04/70] Update dependencies from https://github.com/dotnet/toolset build 20200220.3 (#6494) - Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20120.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 87c215190..f75588f6d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,9 +73,9 @@ https://github.com/dotnet/templating 13abe7e2749d95337e8d72efdc5b71611815fd43 - + https://github.com/dotnet/toolset - e8dfcaf6d27640aea0af2ee4623f9a5e3c9cd407 + 91a81b97d95d1f21a4aea28b2c9f3c9afd14189a https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 22fa2550b..2c9693e26 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.200-preview.20118.13 + 3.1.200-preview.20120.3 From 505ed94f520a2e73ca4930d88e6d95266f44c267 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 21 Feb 2020 04:27:35 +0000 Subject: [PATCH 05/70] Update dependencies from https://github.com/dotnet/toolset build 20200220.8 (#6507) - Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20120.8 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f75588f6d..e8384838f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,9 +73,9 @@ https://github.com/dotnet/templating 13abe7e2749d95337e8d72efdc5b71611815fd43 - + https://github.com/dotnet/toolset - 91a81b97d95d1f21a4aea28b2c9f3c9afd14189a + cd9c3f289e3ee83ef4a419b670316eb9862b4e8d https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 2c9693e26..467db2d60 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.200-preview.20120.3 + 3.1.200-preview.20120.8 From dedc35e3feeb580e22865e623b1d2f4d093d0c84 Mon Sep 17 00:00:00 2001 From: William Li Date: Thu, 20 Feb 2020 22:03:15 -0800 Subject: [PATCH 06/70] Update to 3.1.2 runtime --- NuGet.config | 3 ++ eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 28 +++++++-------- 3 files changed, 57 insertions(+), 54 deletions(-) diff --git a/NuGet.config b/NuGet.config index 075766785..5efcd05c8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,10 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e8384838f..b9efab687 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,25 +1,25 @@ - - https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - a1388f194c30cb21b36b75982962cb5e35954e4e + + https://github.com/dotnet/core-setup + 966115a91565d43cd545c1b8acd83eda2a0cb4cb - - https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - a1388f194c30cb21b36b75982962cb5e35954e4e + + https://github.com/dotnet/core-setup + 966115a91565d43cd545c1b8acd83eda2a0cb4cb - - https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - a1388f194c30cb21b36b75982962cb5e35954e4e + + https://github.com/dotnet/core-setup + 966115a91565d43cd545c1b8acd83eda2a0cb4cb - - https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - a1388f194c30cb21b36b75982962cb5e35954e4e + + https://github.com/dotnet/core-setup + 966115a91565d43cd545c1b8acd83eda2a0cb4cb - - https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - a1388f194c30cb21b36b75982962cb5e35954e4e + + https://github.com/dotnet/core-setup + 966115a91565d43cd545c1b8acd83eda2a0cb4cb @@ -41,33 +41,33 @@ https://github.com/dotnet/corefx 0f7f38c4fd323b26da10cce95f857f77f0f09b48 - - https://github.com/aspnet/AspNetCore - 2b7e994b8a304700a09617ffc5052f0d943bbcba + + https://github.com/dotnet/aspnetcore + c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc - - https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore - e276c8174b8bfdeb70efceafa81c75f8badbc8db + + https://github.com/dotnet/aspnetcore + c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc - - https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore - e276c8174b8bfdeb70efceafa81c75f8badbc8db + + https://github.com/dotnet/aspnetcore + c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc - - https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore - e276c8174b8bfdeb70efceafa81c75f8badbc8db + + https://github.com/dotnet/aspnetcore + c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc - - https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore - e276c8174b8bfdeb70efceafa81c75f8badbc8db + + https://github.com/dotnet/aspnetcore + c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc - - https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore - e276c8174b8bfdeb70efceafa81c75f8badbc8db + + https://github.com/dotnet/aspnetcore + c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc - + https://github.com/dotnet/test-templates - 5117d3d9d7dfd3583f0c42a639efaf092f957b7b + 07c739a22eeb760e60322ac0989c998328fe0aa2 https://github.com/dotnet/templating @@ -86,13 +86,13 @@ 003454db824f0bd58d0b7a967e42f11f20692a48 - + https://github.com/dotnet/winforms - 9483a88b7764a74d71cbd449de6c56c1d5e0af21 + b3a34e6695615d67a167fdbc436fce1e885f986e - - https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - a8e48616c8d8e56469a456eb1ee263268316b827 + + https://github.com/dotnet/wpf + b30a16a465c9a0ed7e641a9d55df2f6e5c878a81 diff --git a/eng/Versions.props b/eng/Versions.props index 467db2d60..04f3eabe9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,15 +16,15 @@ - 4.8.1-servicing.19605.5 + 4.8.1-servicing.20069.13 - 3.1.0-rtm.19605.7 + 3.1.2-servicing.20069.7 - 3.1.1-servicing.19605.2 + 3.1.2 @@ -36,12 +36,12 @@ - 3.1.1 - 3.1.0 - 3.1.1-servicing.19615.10 - 3.1.1-servicing.19615.10 - 3.1.1-servicing.19615.10 - 3.1.1-servicing.19615.10 + 3.1.2 + 3.1.2 + 3.1.2-servicing.20068.1 + 3.1.2-servicing.20068.1 + 3.1.2-servicing.20068.1 + 3.1.2-servicing.20068.1 @@ -61,12 +61,12 @@ - 3.1.1-servicing.19608.4 - 3.1.1 - 3.1.1 + 3.1.2-servicing.20070.1 + 3.1.2 + 3.1.2 3.1.0 - 3.1.1 - 3.1.1 + 3.1.2 + 3.1.2 3.1.0 2.1.0 From abdbaeca5c234f3513d4fe3d4839a827ea21b441 Mon Sep 17 00:00:00 2001 From: William Li Date: Fri, 21 Feb 2020 11:05:58 -0800 Subject: [PATCH 07/70] Update AspNetCoreTargetingPackBlobVersion --- src/redist/targets/GenerateLayout.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index 781fa0b8a..f0007c176 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -15,7 +15,7 @@ 3.1.0-rtm.19565.2 - 3.1.0 + 3.1.2-servicing.20068.1 3.1.0-rtm.19565.2 3.0.0 From 08a7cc20db342aa3c664ae61c6e170f95a91bc08 Mon Sep 17 00:00:00 2001 From: William Li Date: Fri, 21 Feb 2020 13:55:23 -0800 Subject: [PATCH 08/70] Align with v3.1.102 and update dependencies --- NuGet.config | 3 +-- eng/Version.Details.xml | 2 +- eng/Versions.props | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5efcd05c8..77c0a6055 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,10 +7,9 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b9efab687..967eef8f6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,7 +5,7 @@ https://github.com/dotnet/core-setup 966115a91565d43cd545c1b8acd83eda2a0cb4cb - + https://github.com/dotnet/core-setup 966115a91565d43cd545c1b8acd83eda2a0cb4cb diff --git a/eng/Versions.props b/eng/Versions.props index 04f3eabe9..a30fd0e97 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,7 +24,7 @@ - 3.1.2 + 3.1.1-servicing.19605.2 @@ -61,7 +61,7 @@ - 3.1.2-servicing.20070.1 + 3.1.2-servicing.20067.4 3.1.2 3.1.2 3.1.0 From 8c68055ea95398edbacc834469fc13866d33c6a9 Mon Sep 17 00:00:00 2001 From: William Li Date: Fri, 21 Feb 2020 15:01:05 -0800 Subject: [PATCH 09/70] Add missing props change --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index a30fd0e97..2c549b0fa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -28,7 +28,7 @@ - 1.0.2-beta4.20105.2 + 1.0.2-beta4.20079.1 From 47c956071e85904dd0728c6e016826fb8f01fbf5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 22 Feb 2020 00:26:56 +0000 Subject: [PATCH 10/70] Update dependencies from https://github.com/dotnet/toolset build 20200221.7 (#6527) - Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20121.7 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 967eef8f6..d9bd75f1e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,9 +73,9 @@ https://github.com/dotnet/templating 13abe7e2749d95337e8d72efdc5b71611815fd43 - + https://github.com/dotnet/toolset - cd9c3f289e3ee83ef4a419b670316eb9862b4e8d + 10b794d619dd046e077271a26e93ce68218cca6c https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 2c549b0fa..f8a5ea199 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.200-preview.20120.8 + 3.1.200-preview.20121.7 From e0b550191598e2c5f4b5da79bd004e2622aa6bd8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 21 Feb 2020 18:34:20 -0800 Subject: [PATCH 11/70] Update dependencies from https://github.com/dotnet/toolset build 20200221.10 (#6529) - Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20121.10 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d9bd75f1e..998a18606 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,9 +73,9 @@ https://github.com/dotnet/templating 13abe7e2749d95337e8d72efdc5b71611815fd43 - + https://github.com/dotnet/toolset - 10b794d619dd046e077271a26e93ce68218cca6c + b18238b0ed0a3e3dfaa6bd412ae97178021cda78 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index f8a5ea199..85717a35e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.200-preview.20121.7 + 3.1.200-preview.20121.10 From ad752fad7b135b1856b14ff91c587e2fec91b123 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 23 Feb 2020 21:36:36 +0000 Subject: [PATCH 12/70] Update dependencies from https://github.com/dotnet/toolset build 20200223.1 (#6542) - Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20123.1 Dependency coherency updates - Microsoft.DotNet.Common.ItemTemplates - 3.1.2 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.1.200-preview.20123.1 (parent: Microsoft.Dotnet.Toolset.Internal) --- 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 998a18606..a5abe7fc9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,21 +69,21 @@ https://github.com/dotnet/test-templates 07c739a22eeb760e60322ac0989c998328fe0aa2 - + https://github.com/dotnet/templating - 13abe7e2749d95337e8d72efdc5b71611815fd43 + 247f60e9e34a03ed99e855eb1ea0c20931a968db - + https://github.com/dotnet/toolset - b18238b0ed0a3e3dfaa6bd412ae97178021cda78 + 6683e564cf62f57f876e1740214b901a41f362e7 https://github.com/dotnet/sdk 0bc67530cef6dd771a8750d1747926eca2dcb845 - + https://github.com/dotnet/cli - 003454db824f0bd58d0b7a967e42f11f20692a48 + 2b200dd9108f4907120f55281ce549878023b2c1 diff --git a/eng/Versions.props b/eng/Versions.props index 85717a35e..b70457f8e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.200-preview.20121.10 + 3.1.200-preview.20123.1 @@ -24,7 +24,7 @@ - 3.1.1-servicing.19605.2 + 3.1.2 @@ -45,7 +45,7 @@ - 3.1.200-preview.20118.2 + 3.1.200-preview.20123.1 0.2.0 From 1ec35d21d0bbf0f656bc5eec13f9dc3c3bb826ad Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 24 Feb 2020 07:51:36 +0000 Subject: [PATCH 13/70] Update dependencies from https://github.com/dotnet/toolset build 20200223.2 (#6543) - Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20123.2 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.200-preview.20123.1 (parent: Microsoft.Dotnet.Toolset.Internal) --- 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 a5abe7fc9..d308bf44a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,13 +73,13 @@ https://github.com/dotnet/templating 247f60e9e34a03ed99e855eb1ea0c20931a968db - + https://github.com/dotnet/toolset - 6683e564cf62f57f876e1740214b901a41f362e7 + 76acb0d0dbd3cd045c1a6fd1da00de24e35fba5f - + https://github.com/dotnet/sdk - 0bc67530cef6dd771a8750d1747926eca2dcb845 + f1ae79d83d0c08d08472e9f7ba030a119c4d9458 https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index b70457f8e..7ff4f5d3d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.200-preview.20123.1 + 3.1.200-preview.20123.2 @@ -52,7 +52,7 @@ - 3.1.200-preview.20113.2 + 3.1.200-preview.20123.1 $(MicrosoftNETSdkPackageVersion) From 0a672ec5446ea037f75bfd612a3a4cf2d3c02dbf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 24 Feb 2020 21:51:46 +0000 Subject: [PATCH 14/70] Update dependencies from https://github.com/dotnet/toolset build 20200224.1 (#6548) - Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20124.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d308bf44a..6e6dd7f18 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,9 +73,9 @@ https://github.com/dotnet/templating 247f60e9e34a03ed99e855eb1ea0c20931a968db - + https://github.com/dotnet/toolset - 76acb0d0dbd3cd045c1a6fd1da00de24e35fba5f + 80e7d33f08fbc8042d1cb8fdb01ec72667e5d662 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 7ff4f5d3d..083f28d65 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.200-preview.20123.2 + 3.1.200-preview.20124.1 From b3dae24c3ba7c78c77e9817385089c28d8f6c780 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 24 Feb 2020 22:46:26 +0000 Subject: [PATCH 15/70] Update dependencies from https://github.com/dotnet/toolset build 20200224.2 (#6549) - Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20124.2 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.200-preview.20124.1 (parent: Microsoft.Dotnet.Toolset.Internal) --- 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 6e6dd7f18..0dcb930c1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,17 +73,17 @@ https://github.com/dotnet/templating 247f60e9e34a03ed99e855eb1ea0c20931a968db - + https://github.com/dotnet/toolset - 80e7d33f08fbc8042d1cb8fdb01ec72667e5d662 + 99c019d308d25855c67b83eb3ca94f9fd5999bd0 https://github.com/dotnet/sdk f1ae79d83d0c08d08472e9f7ba030a119c4d9458 - + https://github.com/dotnet/cli - 2b200dd9108f4907120f55281ce549878023b2c1 + 5e2596aefb5f470eb9fed18868736265fdab2511 diff --git a/eng/Versions.props b/eng/Versions.props index 083f28d65..dc2405797 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.200-preview.20124.1 + 3.1.200-preview.20124.2 @@ -45,7 +45,7 @@ - 3.1.200-preview.20123.1 + 3.1.200-preview.20124.1 0.2.0 From 80803885a0500f47403dea04addd93a3ce9beaa0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 27 Feb 2020 04:18:12 +0000 Subject: [PATCH 16/70] [release/3.1.2xx] Update dependencies from dotnet/toolset (#6552) * Update dependencies from https://github.com/dotnet/toolset build 20200224.4 - Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20124.4 * Update dependencies from https://github.com/dotnet/toolset build 20200226.1 - Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20126.1 * Update dependencies from https://github.com/dotnet/toolset build 20200226.2 - Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20126.2 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.200-preview.20126.2 (parent: Microsoft.Dotnet.Toolset.Internal) --- 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 0dcb930c1..6d40ac725 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,13 +73,13 @@ https://github.com/dotnet/templating 247f60e9e34a03ed99e855eb1ea0c20931a968db - + https://github.com/dotnet/toolset - 99c019d308d25855c67b83eb3ca94f9fd5999bd0 + 011bceaeaaa68279aebf84ce58e488a1acaf283a - + https://github.com/dotnet/sdk - f1ae79d83d0c08d08472e9f7ba030a119c4d9458 + 1a75f83011dccb47a8b9689704b961a0bf09ca14 https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index dc2405797..52f286523 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.200-preview.20124.2 + 3.1.200-preview.20126.2 @@ -52,7 +52,7 @@ - 3.1.200-preview.20123.1 + 3.1.200-preview.20126.2 $(MicrosoftNETSdkPackageVersion) From 4873a887d4e1f522d400d7a655521088d1e69fe7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 27 Feb 2020 08:57:31 +0000 Subject: [PATCH 17/70] [release/3.1.2xx] Update dependencies from dotnet/toolset (#6586) * Update dependencies from https://github.com/dotnet/toolset build 20200226.3 - Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20126.3 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.200-preview.20126.1 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20200226.4 - Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20126.4 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.200-preview.20126.2 (parent: Microsoft.Dotnet.Toolset.Internal) --- 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 6d40ac725..6c197c766 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,17 +73,17 @@ https://github.com/dotnet/templating 247f60e9e34a03ed99e855eb1ea0c20931a968db - + https://github.com/dotnet/toolset - 011bceaeaaa68279aebf84ce58e488a1acaf283a + 88cdbcb087141623b35c112ab3c97dca25e6c8be https://github.com/dotnet/sdk 1a75f83011dccb47a8b9689704b961a0bf09ca14 - + https://github.com/dotnet/cli - 5e2596aefb5f470eb9fed18868736265fdab2511 + a47ca8f97e48fd858e0ee2aaab05c11f0c9bda1a diff --git a/eng/Versions.props b/eng/Versions.props index 52f286523..1d03b0799 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.200-preview.20126.2 + 3.1.200-preview.20126.4 @@ -45,7 +45,7 @@ - 3.1.200-preview.20124.1 + 3.1.200-preview.20126.2 0.2.0 From fd21bc112176ba35045f6377685200a9f803dde3 Mon Sep 17 00:00:00 2001 From: William Li Date: Thu, 27 Feb 2020 17:05:21 -0800 Subject: [PATCH 18/70] No suffix (#6594) --- src/redist/targets/Versions.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/redist/targets/Versions.targets b/src/redist/targets/Versions.targets index 1156ea7db..461a1b9f2 100644 --- a/src/redist/targets/Versions.targets +++ b/src/redist/targets/Versions.targets @@ -4,11 +4,11 @@ 1 2 00 - preview + servicing - false + true From 5f245dfc64db786a2b5b19a7ac44787cb7ed5f9f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 Feb 2020 04:36:39 +0000 Subject: [PATCH 19/70] Update dependencies from https://github.com/dotnet/toolset build 20200227.2 (#6599) - Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20127.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6c197c766..a7eb8a208 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,9 +73,9 @@ https://github.com/dotnet/templating 247f60e9e34a03ed99e855eb1ea0c20931a968db - + https://github.com/dotnet/toolset - 88cdbcb087141623b35c112ab3c97dca25e6c8be + 7848af4b784658523b15ae605a3a14c4bba5dea4 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 1d03b0799..294ffe986 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.200-preview.20126.4 + 3.1.200-preview.20127.2 From fa2116e505e052b03079cf988f4a4cf309e26b6d Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Thu, 30 Jan 2020 16:18:56 -0800 Subject: [PATCH 20/70] Bump self-contained default for 3.0.x and 2.1.x * Bump self-contained default for 3.0.x and 2.1.x * Add 3.0.3 feeds for tests --- NuGet.config | 3 +++ src/redist/targets/GenerateBundledVersions.targets | 12 ++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 77c0a6055..5625dbd3a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,6 +11,9 @@ + + + diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index a214842a0..45a3461c5 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -14,11 +14,11 @@ <_NETStandardLibraryPackageVersion>$(NETStandardLibraryRefPackageVersion) <_NETCorePlatformsPackageVersion>$(MicrosoftNETCorePlatformsPackageVersion) - <_NETCoreApp30RuntimePackVersion>3.0.2 + <_NETCoreApp30RuntimePackVersion>3.0.3 <_NETCoreApp30TargetingPackVersion>3.0.0 - <_WindowsDesktop30RuntimePackVersion>3.0.2 + <_WindowsDesktop30RuntimePackVersion>3.0.3 <_WindowsDesktop30TargetingPackVersion>3.0.0 - <_AspNet30RuntimePackVersion>3.0.2 + <_AspNet30RuntimePackVersion>3.0.3 <_AspNet30TargetingPackVersion>3.0.1 @@ -92,7 +92,7 @@ + LatestVersion="2.1.16" /> + LatestVersion="2.1.16"/> + LatestVersion="2.1.16"/> Date: Tue, 3 Mar 2020 01:51:44 +0000 Subject: [PATCH 21/70] Update dependencies from https://github.com/dotnet/toolset build 20200302.4 (#6649) - Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20152.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a7eb8a208..b6ed47bcd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,9 +73,9 @@ https://github.com/dotnet/templating 247f60e9e34a03ed99e855eb1ea0c20931a968db - + https://github.com/dotnet/toolset - 7848af4b784658523b15ae605a3a14c4bba5dea4 + 73f0352d1cc739ce20019e5b059dc3b4e1bf767d https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 294ffe986..f8a64a108 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.200-preview.20127.2 + 3.1.200-preview.20152.4 From 575392ab9b6c8b6b25cac0179d3b173c41ccb545 Mon Sep 17 00:00:00 2001 From: William Li Date: Wed, 4 Mar 2020 12:39:06 -0800 Subject: [PATCH 22/70] Correct feed --- NuGet.config | 2 +- eng/Version.Details.xml | 22 +++++++++++----------- eng/Versions.props | 6 +++--- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5625dbd3a..7b54ce752 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b6ed47bcd..426ff142d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,23 +3,23 @@ https://github.com/dotnet/core-setup - 966115a91565d43cd545c1b8acd83eda2a0cb4cb + 916b5cba268e1e1e803243004f4276cf40b2dda8 https://github.com/dotnet/core-setup - 966115a91565d43cd545c1b8acd83eda2a0cb4cb + 916b5cba268e1e1e803243004f4276cf40b2dda8 https://github.com/dotnet/core-setup - 966115a91565d43cd545c1b8acd83eda2a0cb4cb + 916b5cba268e1e1e803243004f4276cf40b2dda8 https://github.com/dotnet/core-setup - 966115a91565d43cd545c1b8acd83eda2a0cb4cb + 916b5cba268e1e1e803243004f4276cf40b2dda8 https://github.com/dotnet/core-setup - 966115a91565d43cd545c1b8acd83eda2a0cb4cb + 916b5cba268e1e1e803243004f4276cf40b2dda8 @@ -73,9 +73,9 @@ https://github.com/dotnet/templating 247f60e9e34a03ed99e855eb1ea0c20931a968db - + https://github.com/dotnet/toolset - 73f0352d1cc739ce20019e5b059dc3b4e1bf767d + b5160ead2f6b91d45b89edb3c29747f0a8e60a26 https://github.com/dotnet/sdk @@ -86,13 +86,13 @@ a47ca8f97e48fd858e0ee2aaab05c11f0c9bda1a - + https://github.com/dotnet/winforms - b3a34e6695615d67a167fdbc436fce1e885f986e + 9483a88b7764a74d71cbd449de6c56c1d5e0af21 - + https://github.com/dotnet/wpf - b30a16a465c9a0ed7e641a9d55df2f6e5c878a81 + 589ace3c9fdfa0f1ea1640b82304a6a7ac597871 diff --git a/eng/Versions.props b/eng/Versions.props index f8a64a108..6cf7d2e65 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,15 +12,15 @@ preview - 3.1.200-preview.20152.4 + 3.1.200-preview.20153.1 - 4.8.1-servicing.20069.13 + 4.8.1-servicing.19605.5 - 3.1.2-servicing.20069.7 + 3.1.2-servicing.20066.4 From 6dba88e32d3013655d403ce1bd7a4bc9502c946e Mon Sep 17 00:00:00 2001 From: William Li Date: Wed, 4 Mar 2020 12:39:36 -0800 Subject: [PATCH 23/70] Test to prevent apphost not being identical --- src/redist/targets/GenerateLayout.targets | 33 +++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index f0007c176..7dd9a4408 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -471,6 +471,39 @@ + + + + $(DownloadsFolder)$(DownloadedNetCoreAppHostPackInstallerFileName) + $(IntermediateOutputPath)AppHostpkgExtract\ + + + + + + + + + + + + + + + + + + + + + + - - - - $(DownloadsFolder)$(DownloadedNetCoreAppHostPackInstallerFileName) - $(IntermediateOutputPath)AppHostpkgExtract\ - - - - - - - - - - - - - - - - - - - - - - - release/3.1.2xx + release/3.1.3xx diff --git a/src/redist/targets/Versions.targets b/src/redist/targets/Versions.targets index 461a1b9f2..4ae516342 100644 --- a/src/redist/targets/Versions.targets +++ b/src/redist/targets/Versions.targets @@ -2,13 +2,13 @@ 3 1 - 2 + 3 00 - servicing + preview - true + false From 3d9474da2c4c5eb15027d8505df68e90ee67ad51 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 11 Mar 2020 00:11:44 +0000 Subject: [PATCH 28/70] Update dependencies from https://github.com/dotnet/toolset build 20200310.1 (#6758) - Microsoft.Dotnet.Toolset.Internal - 3.1.300-preview.20160.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 426ff142d..e778401b7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,9 +73,9 @@ https://github.com/dotnet/templating 247f60e9e34a03ed99e855eb1ea0c20931a968db - + https://github.com/dotnet/toolset - b5160ead2f6b91d45b89edb3c29747f0a8e60a26 + 74b6cb39036b54bf3f0fac90c00eac8b9aa4b0df https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 6cf7d2e65..599091855 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.200-preview.20153.1 + 3.1.300-preview.20160.1 From 0c5d20fe05cc6687f62d798261cf5a2c4d12f0da Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 11 Mar 2020 19:11:05 +0000 Subject: [PATCH 29/70] [release/3.1.3xx] Update dependencies from dotnet/toolset (#6763) * Update dependencies from https://github.com/dotnet/toolset build 20200310.5 - Microsoft.Dotnet.Toolset.Internal - 3.1.300-preview.20160.5 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.300-preview.20160.11 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20200311.1 - Microsoft.Dotnet.Toolset.Internal - 3.1.300-preview.20161.1 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.300-preview.20160.11 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.1.300-preview.20161.1 (parent: Microsoft.Dotnet.Toolset.Internal) Co-authored-by: dotnet-maestro[bot] --- 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 99e6b5386..164bc9327 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -77,17 +77,17 @@ https://github.com/dotnet/templating 247f60e9e34a03ed99e855eb1ea0c20931a968db - + https://github.com/dotnet/toolset - 74b6cb39036b54bf3f0fac90c00eac8b9aa4b0df + ea551c5daaed5a1c783a8e8942dfaad42c3beb07 - + https://github.com/dotnet/sdk - 1a75f83011dccb47a8b9689704b961a0bf09ca14 + a360dd6ff2012a97ff9b10d431adc84334302ef4 - + https://github.com/dotnet/cli - a47ca8f97e48fd858e0ee2aaab05c11f0c9bda1a + cbe09077cf66fb84bb56bfe483321e34e3af8a2e diff --git a/eng/Versions.props b/eng/Versions.props index bd0c90aee..46ac3b4ae 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.300-preview.20160.1 + 3.1.300-preview.20161.1 @@ -46,14 +46,14 @@ - 3.1.200-preview.20126.2 + 3.1.300-preview.20161.1 0.2.0 - 3.1.200-preview.20126.2 + 3.1.300-preview.20160.11 $(MicrosoftNETSdkPackageVersion) From 3779f5d006049d1eee74863be2ff117172aa041b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 11 Mar 2020 20:46:19 +0000 Subject: [PATCH 30/70] Update dependencies from https://github.com/dotnet/aspnetcore build 20200311.4 (#6777) - Microsoft.AspNetCore.Components.WebAssembly.Templates - 3.2.0-preview3.20161.4 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 164bc9327..639985d91 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -53,9 +53,9 @@ https://github.com/dotnet/aspnetcore c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc - - https://github.com/aspnet/AspNetCore - 92409e2e57b320f9728de62fba2c82168761f9cc + + https://github.com/dotnet/aspnetcore + a1faa16dde11c3929eabe4d1c558ed9774d4bd7e https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 46ac3b4ae..207d099be 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,7 +42,7 @@ 3.1.2-servicing.20068.1 3.1.2-servicing.20068.1 3.1.2-servicing.20068.1 - 3.2.0-preview2.20160.5 + 3.2.0-preview3.20161.4 From aa7c4bbdb1eae8634b52fa6de04dc0c03ac87bc7 Mon Sep 17 00:00:00 2001 From: sfoslund Date: Thu, 12 Mar 2020 09:33:33 -0700 Subject: [PATCH 31/70] Updating pipeline publishing version --- .vsts-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 474c19e43..278f2e212 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -277,7 +277,7 @@ stages: - stage: copy_to_latest displayName: Copy to latest dependsOn: - - NETCore_SDK_312xx_Publishing + - NETCore_SDK_313xx_Publishing jobs: - job: Copy_SDK_To_Latest pool: From 0dc800e8a4648288c1109a96312a3e600e868dc9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 12 Mar 2020 19:19:14 +0000 Subject: [PATCH 32/70] [release/3.1.3xx] Update dependencies from dotnet/aspnetcore (#6780) * Update dependencies from https://github.com/dotnet/aspnetcore build 20200311.7 - Microsoft.AspNetCore.Components.WebAssembly.Templates - 3.2.0-preview3.20161.7 * Removing deleted feed Co-authored-by: dotnet-maestro[bot] Co-authored-by: sfoslund --- NuGet.config | 1 - eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4bc7f424f..3a3d36a3b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,7 +8,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 639985d91..94b9725bb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -53,9 +53,9 @@ https://github.com/dotnet/aspnetcore c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc - + https://github.com/dotnet/aspnetcore - a1faa16dde11c3929eabe4d1c558ed9774d4bd7e + 297d497753679a04d23cebcc6e0a4f1da186d931 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 207d099be..6de410fb1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,7 +42,7 @@ 3.1.2-servicing.20068.1 3.1.2-servicing.20068.1 3.1.2-servicing.20068.1 - 3.2.0-preview3.20161.4 + 3.2.0-preview3.20161.7 From 95d37eb4ff46c46b9426d67f4516893569da99b3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 12 Mar 2020 20:00:04 +0000 Subject: [PATCH 33/70] Update dependencies from https://github.com/dotnet/aspnetcore build 20200312.2 (#6792) - Microsoft.AspNetCore.Components.WebAssembly.Templates - 3.2.0-preview3.20162.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 94b9725bb..1df1b3e29 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -53,9 +53,9 @@ https://github.com/dotnet/aspnetcore c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc - + https://github.com/dotnet/aspnetcore - 297d497753679a04d23cebcc6e0a4f1da186d931 + 823082d2823d58739e4868972cc640d6944c3d07 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 6de410fb1..b72e19a56 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,7 +42,7 @@ 3.1.2-servicing.20068.1 3.1.2-servicing.20068.1 3.1.2-servicing.20068.1 - 3.2.0-preview3.20161.7 + 3.2.0-preview3.20162.2 From 7239b95bfc5feaa55c9b1a953383f5abadb2db12 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 12 Mar 2020 20:41:29 +0000 Subject: [PATCH 34/70] Update dependencies from https://github.com/dotnet/aspnetcore build 20200312.3 (#6794) - Microsoft.AspNetCore.Components.WebAssembly.Templates - 3.2.0-preview3.20162.3 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1df1b3e29..6298ef396 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -53,9 +53,9 @@ https://github.com/dotnet/aspnetcore c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc - + https://github.com/dotnet/aspnetcore - 823082d2823d58739e4868972cc640d6944c3d07 + 2e9bb2ff5fa0f31ba0f005ea1f0355cca0f1b9a2 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index b72e19a56..dfc595976 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,7 +42,7 @@ 3.1.2-servicing.20068.1 3.1.2-servicing.20068.1 3.1.2-servicing.20068.1 - 3.2.0-preview3.20162.2 + 3.2.0-preview3.20162.3 From 9c33ea0171f09a2cb91cb0bb380f87b112a587e6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 12 Mar 2020 21:16:25 +0000 Subject: [PATCH 35/70] Update dependencies from https://github.com/dotnet/toolset build 20200312.1 (#6797) - Microsoft.Dotnet.Toolset.Internal - 3.1.300-preview.20162.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6298ef396..9d3a8ad17 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -77,9 +77,9 @@ https://github.com/dotnet/templating 247f60e9e34a03ed99e855eb1ea0c20931a968db - + https://github.com/dotnet/toolset - ea551c5daaed5a1c783a8e8942dfaad42c3beb07 + c2694dfc2d625c22643680d516ed684ae0eab1d5 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index dfc595976..81706e97b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.300-preview.20161.1 + 3.1.300-preview.20162.1 From e591bd5a8dae575837c9b7df6704c083aa9807d0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 12 Mar 2020 22:11:20 +0000 Subject: [PATCH 36/70] Update dependencies from https://github.com/dotnet/toolset build 20200312.3 (#6799) - Microsoft.Dotnet.Toolset.Internal - 3.1.300-preview.20162.3 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9d3a8ad17..7212ef21b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -77,9 +77,9 @@ https://github.com/dotnet/templating 247f60e9e34a03ed99e855eb1ea0c20931a968db - + https://github.com/dotnet/toolset - c2694dfc2d625c22643680d516ed684ae0eab1d5 + 905b72ab67b8caa97d01939b313d30404e035486 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 81706e97b..d1ef5b13e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.300-preview.20162.1 + 3.1.300-preview.20162.3 From b42e33319df38fcdc52b51ceb88910f48cfe34ff Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 13 Mar 2020 02:26:47 +0000 Subject: [PATCH 37/70] Update dependencies from https://github.com/dotnet/toolset build 20200312.4 (#6803) - Microsoft.Dotnet.Toolset.Internal - 3.1.300-preview.20162.4 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.300-preview.20162.2 (parent: Microsoft.Dotnet.Toolset.Internal) Co-authored-by: dotnet-maestro[bot] --- 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 7212ef21b..5fe24fba1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -77,17 +77,17 @@ https://github.com/dotnet/templating 247f60e9e34a03ed99e855eb1ea0c20931a968db - + https://github.com/dotnet/toolset - 905b72ab67b8caa97d01939b313d30404e035486 + 9e5af358872b0bb9b3beea117c6c7eaa6fc49570 https://github.com/dotnet/sdk a360dd6ff2012a97ff9b10d431adc84334302ef4 - + https://github.com/dotnet/cli - cbe09077cf66fb84bb56bfe483321e34e3af8a2e + a922532e3d3fd4f25661aa2352e46459302fb6b2 diff --git a/eng/Versions.props b/eng/Versions.props index d1ef5b13e..1dfd08026 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.300-preview.20162.3 + 3.1.300-preview.20162.4 @@ -46,7 +46,7 @@ - 3.1.300-preview.20161.1 + 3.1.300-preview.20162.2 0.2.0 From 85d475e4cab6660d54b0a064234f1fe536f23d0f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 13 Mar 2020 05:38:15 +0000 Subject: [PATCH 38/70] Update dependencies from https://github.com/dotnet/aspnetcore build 20200312.4 (#6802) - Microsoft.AspNetCore.Components.WebAssembly.Templates - 3.2.0-preview3.20162.4 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5fe24fba1..608366b9c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -53,9 +53,9 @@ https://github.com/dotnet/aspnetcore c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc - + https://github.com/dotnet/aspnetcore - 2e9bb2ff5fa0f31ba0f005ea1f0355cca0f1b9a2 + 343816f4d16849c207500d3172c2c8a03092ae42 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 1dfd08026..7d236f4c3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,7 +42,7 @@ 3.1.2-servicing.20068.1 3.1.2-servicing.20068.1 3.1.2-servicing.20068.1 - 3.2.0-preview3.20162.3 + 3.2.0-preview3.20162.4 From d6cc8afa9949df22ff30707348ca0cfa8330d84b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 13 Mar 2020 12:37:11 +0000 Subject: [PATCH 39/70] Update dependencies from https://github.com/dotnet/aspnetcore build 20200313.1 (#6808) - Microsoft.AspNetCore.Components.WebAssembly.Templates - 3.2.0-preview3.20163.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 608366b9c..b661caf91 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -53,9 +53,9 @@ https://github.com/dotnet/aspnetcore c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc - + https://github.com/dotnet/aspnetcore - 343816f4d16849c207500d3172c2c8a03092ae42 + 9343d2bca07c585fe31597635b55c374ac7292c4 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 7d236f4c3..5a9b7f950 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,7 +42,7 @@ 3.1.2-servicing.20068.1 3.1.2-servicing.20068.1 3.1.2-servicing.20068.1 - 3.2.0-preview3.20162.4 + 3.2.0-preview3.20163.1 From c1f05cc5e1a2c0235af525261facb3a1aaf04793 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 13 Mar 2020 18:53:35 +0000 Subject: [PATCH 40/70] Update dependencies from https://github.com/dotnet/aspnetcore build 20200313.2 (#6812) - Microsoft.AspNetCore.Components.WebAssembly.Templates - 3.2.0-preview3.20163.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b661caf91..7f81de214 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -53,9 +53,9 @@ https://github.com/dotnet/aspnetcore c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc - + https://github.com/dotnet/aspnetcore - 9343d2bca07c585fe31597635b55c374ac7292c4 + f1b812e21ef61691f810dc5fb51df084ef74a2ae https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 5a9b7f950..2165f5973 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,7 +42,7 @@ 3.1.2-servicing.20068.1 3.1.2-servicing.20068.1 3.1.2-servicing.20068.1 - 3.2.0-preview3.20163.1 + 3.2.0-preview3.20163.2 From 612514f7fe68362d232583cd99e98b23eb07bcae Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 17 Mar 2020 16:01:03 +0000 Subject: [PATCH 41/70] [release/3.1.3xx] Update dependencies from dotnet/aspnetcore (#6816) * Update dependencies from https://github.com/dotnet/aspnetcore build 20200313.6 - Microsoft.AspNetCore.Components.WebAssembly.Templates - 3.2.0-preview3.20163.6 * Update dependencies from https://github.com/dotnet/aspnetcore build 20200313.10 - Microsoft.AspNetCore.Components.WebAssembly.Templates - 3.2.0-preview3.20163.10 * Update dependencies from https://github.com/dotnet/aspnetcore build 20200313.13 - Microsoft.AspNetCore.Components.WebAssembly.Templates - 3.2.0-preview3.20163.13 * Update dependencies from https://github.com/dotnet/aspnetcore build 20200315.1 - Microsoft.AspNetCore.Components.WebAssembly.Templates - 3.2.0-preview3.20165.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7f81de214..34001c961 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -53,9 +53,9 @@ https://github.com/dotnet/aspnetcore c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc - + https://github.com/dotnet/aspnetcore - f1b812e21ef61691f810dc5fb51df084ef74a2ae + e2b574c32592a23bfb2403e9011065fb3662d78d https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 2165f5973..fe773c15f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,7 +42,7 @@ 3.1.2-servicing.20068.1 3.1.2-servicing.20068.1 3.1.2-servicing.20068.1 - 3.2.0-preview3.20163.2 + 3.2.0-preview3.20165.1 From 05ebaaf2a4b3fc468c29461c6a6c57718c04d1db Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 17 Mar 2020 16:34:26 +0000 Subject: [PATCH 42/70] Update dependencies from https://github.com/dotnet/toolset build 20200313.1 (#6815) - Microsoft.Dotnet.Toolset.Internal - 3.1.300-preview.20163.1 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.300-preview.20162.4 (parent: Microsoft.Dotnet.Toolset.Internal) Co-authored-by: dotnet-maestro[bot] --- 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 34001c961..22106fc29 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -77,17 +77,17 @@ https://github.com/dotnet/templating 247f60e9e34a03ed99e855eb1ea0c20931a968db - + https://github.com/dotnet/toolset - 9e5af358872b0bb9b3beea117c6c7eaa6fc49570 + 1a0a7a3dc88fa951612c80d0e7068066e5bcf7dc https://github.com/dotnet/sdk a360dd6ff2012a97ff9b10d431adc84334302ef4 - + https://github.com/dotnet/cli - a922532e3d3fd4f25661aa2352e46459302fb6b2 + 75111456fd9f891ef11011cbb2ca03e7a18ab92e diff --git a/eng/Versions.props b/eng/Versions.props index fe773c15f..f77da2195 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.300-preview.20162.4 + 3.1.300-preview.20163.1 @@ -46,7 +46,7 @@ - 3.1.300-preview.20162.2 + 3.1.300-preview.20162.4 0.2.0 From 11c6207e7b1e4f0684143ec26eed09e0e55581f4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 17 Mar 2020 19:06:24 +0000 Subject: [PATCH 43/70] Update dependencies from https://github.com/dotnet/toolset build 20200317.1 (#6832) - Microsoft.Dotnet.Toolset.Internal - 3.1.300-preview.20167.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 22106fc29..6af963365 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -77,9 +77,9 @@ https://github.com/dotnet/templating 247f60e9e34a03ed99e855eb1ea0c20931a968db - + https://github.com/dotnet/toolset - 1a0a7a3dc88fa951612c80d0e7068066e5bcf7dc + 27fe8d245dd064b60aa6043f5fb86141e3972813 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index f77da2195..2a284ef4f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.300-preview.20163.1 + 3.1.300-preview.20167.1 From 921e4db109f7f4b0ea8516e360788e07514e7547 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 17 Mar 2020 22:52:48 +0000 Subject: [PATCH 44/70] Update dependencies from https://github.com/dotnet/aspnetcore build 20200317.5 (#6834) - Microsoft.AspNetCore.Components.WebAssembly.Templates - 3.2.0-preview3.20167.5 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6af963365..e6e9e38b3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -53,9 +53,9 @@ https://github.com/dotnet/aspnetcore c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc - + https://github.com/dotnet/aspnetcore - e2b574c32592a23bfb2403e9011065fb3662d78d + 56d22a817b0fb576d377642914e8fcbce7c26d53 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 2a284ef4f..ac97db990 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,7 +42,7 @@ 3.1.2-servicing.20068.1 3.1.2-servicing.20068.1 3.1.2-servicing.20068.1 - 3.2.0-preview3.20165.1 + 3.2.0-preview3.20167.5 From b217e7e62f56556a8923cc396437b63698392d13 Mon Sep 17 00:00:00 2001 From: sfoslund Date: Thu, 12 Mar 2020 13:02:10 -0700 Subject: [PATCH 45/70] Updating to 2.1.17 patch version --- src/redist/targets/GenerateBundledVersions.targets | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 45a3461c5..7058ceefa 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -92,7 +92,7 @@ + LatestVersion="2.1.17" /> + LatestVersion="2.1.17"/> + LatestVersion="2.1.17"/> Date: Wed, 18 Mar 2020 15:51:30 +0000 Subject: [PATCH 46/70] Update dependencies from https://github.com/dotnet/toolset build 20200317.3 (#6835) - Microsoft.Dotnet.Toolset.Internal - 3.1.300-preview.20167.3 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.300-preview.20167.1 (parent: Microsoft.Dotnet.Toolset.Internal) Co-authored-by: dotnet-maestro[bot] --- 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 e6e9e38b3..57bf301f7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -77,17 +77,17 @@ https://github.com/dotnet/templating 247f60e9e34a03ed99e855eb1ea0c20931a968db - + https://github.com/dotnet/toolset - 27fe8d245dd064b60aa6043f5fb86141e3972813 + c44f0a9678d7b560f9153d4b65effd01fd51d00c https://github.com/dotnet/sdk a360dd6ff2012a97ff9b10d431adc84334302ef4 - + https://github.com/dotnet/cli - 75111456fd9f891ef11011cbb2ca03e7a18ab92e + cb807aab514ead2650bb8b1caef5be607410dba7 diff --git a/eng/Versions.props b/eng/Versions.props index ac97db990..e30f32036 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.300-preview.20167.1 + 3.1.300-preview.20167.3 @@ -46,7 +46,7 @@ - 3.1.300-preview.20162.4 + 3.1.300-preview.20167.1 0.2.0 From 4a1b951da81f71e7f81d010d044922e5476995c3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 18 Mar 2020 16:37:58 +0000 Subject: [PATCH 47/70] Update dependencies from https://github.com/dotnet/toolset build 20200317.6 (#6854) - Microsoft.Dotnet.Toolset.Internal - 3.1.300-preview.20167.6 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.300-preview.20167.4 (parent: Microsoft.Dotnet.Toolset.Internal) Co-authored-by: dotnet-maestro[bot] --- 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 57bf301f7..8121de914 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -77,13 +77,13 @@ https://github.com/dotnet/templating 247f60e9e34a03ed99e855eb1ea0c20931a968db - + https://github.com/dotnet/toolset - c44f0a9678d7b560f9153d4b65effd01fd51d00c + 42d88017258abe4143e187af59bc96f7948c337e - + https://github.com/dotnet/sdk - a360dd6ff2012a97ff9b10d431adc84334302ef4 + ab67b97f347912176cbc9f94ab76c5645d245af6 https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index e30f32036..856136872 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.300-preview.20167.3 + 3.1.300-preview.20167.6 @@ -53,7 +53,7 @@ - 3.1.300-preview.20160.11 + 3.1.300-preview.20167.4 $(MicrosoftNETSdkPackageVersion) From a986a3c1aaade61e6a676e5aa6904a2651c64845 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 18 Mar 2020 19:16:29 +0000 Subject: [PATCH 48/70] Update dependencies from https://github.com/dotnet/toolset build 20200318.1 (#6857) - Microsoft.Dotnet.Toolset.Internal - 3.1.300-preview.20168.1 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.300-preview.20168.1 (parent: Microsoft.Dotnet.Toolset.Internal) Co-authored-by: dotnet-maestro[bot] --- 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 8121de914..c431d8f90 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -77,17 +77,17 @@ https://github.com/dotnet/templating 247f60e9e34a03ed99e855eb1ea0c20931a968db - + https://github.com/dotnet/toolset - 42d88017258abe4143e187af59bc96f7948c337e + 34cf9198546024cbd28c04dc8295dd88a1d43e95 https://github.com/dotnet/sdk ab67b97f347912176cbc9f94ab76c5645d245af6 - + https://github.com/dotnet/cli - cb807aab514ead2650bb8b1caef5be607410dba7 + b234867cb3322666b420a7be8fc89c4196d19b3e diff --git a/eng/Versions.props b/eng/Versions.props index 856136872..a2564623d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.300-preview.20167.6 + 3.1.300-preview.20168.1 @@ -46,7 +46,7 @@ - 3.1.300-preview.20167.1 + 3.1.300-preview.20168.1 0.2.0 From 13f19b4682d800c875ed31e4035d8ae959ee93a6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 18 Mar 2020 20:02:51 +0000 Subject: [PATCH 49/70] Update dependencies from https://github.com/dotnet/aspnetcore build 20200318.3 (#6858) - Microsoft.AspNetCore.Components.WebAssembly.Templates - 3.2.0-preview3.20168.3 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c431d8f90..62d8223ba 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -53,9 +53,9 @@ https://github.com/dotnet/aspnetcore c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc - + https://github.com/dotnet/aspnetcore - 56d22a817b0fb576d377642914e8fcbce7c26d53 + a700aa92fec0c3554eb3f450a17037761b069363 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index a2564623d..05d146f6c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,7 +42,7 @@ 3.1.2-servicing.20068.1 3.1.2-servicing.20068.1 3.1.2-servicing.20068.1 - 3.2.0-preview3.20167.5 + 3.2.0-preview3.20168.3 From 4ee96efcb0e886cad04a7a07e177b147728e2714 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 24 Mar 2020 00:11:19 +0000 Subject: [PATCH 50/70] Update dependencies from https://github.com/dotnet/toolset build 20200323.1 (#6897) - Microsoft.Dotnet.Toolset.Internal - 3.1.300-preview.20173.1 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.300-preview.20173.1 (parent: Microsoft.Dotnet.Toolset.Internal) Co-authored-by: dotnet-maestro[bot] --- 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 62d8223ba..77aead9b0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -77,13 +77,13 @@ https://github.com/dotnet/templating 247f60e9e34a03ed99e855eb1ea0c20931a968db - + https://github.com/dotnet/toolset - 34cf9198546024cbd28c04dc8295dd88a1d43e95 + 668718f15a6c3d58fb52dcaaf739b477aca6f85a - + https://github.com/dotnet/sdk - ab67b97f347912176cbc9f94ab76c5645d245af6 + a1af8fb4a842393917f9cda201fc1322eb0b675f https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index 05d146f6c..4173aad55 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.300-preview.20168.1 + 3.1.300-preview.20173.1 @@ -53,7 +53,7 @@ - 3.1.300-preview.20167.4 + 3.1.300-preview.20173.1 $(MicrosoftNETSdkPackageVersion) From 95479352ce725b4b841830b3b552f6855be68f91 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 25 Mar 2020 01:12:49 +0000 Subject: [PATCH 51/70] [release/3.1.3xx] Update dependencies from dotnet/aspnetcore (#6908) * Update dependencies from https://github.com/dotnet/aspnetcore build 20200324.3 - Microsoft.AspNetCore.Components.WebAssembly.Templates - 3.2.0-preview3.20174.3 * Update dependencies from https://github.com/dotnet/aspnetcore build 20200324.6 - Microsoft.AspNetCore.Components.WebAssembly.Templates - 3.2.0-preview3.20174.6 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 77aead9b0..42edd5ee1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -53,9 +53,9 @@ https://github.com/dotnet/aspnetcore c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc - + https://github.com/dotnet/aspnetcore - a700aa92fec0c3554eb3f450a17037761b069363 + 3ba4cbfd5ca8220a68755fe005ba6bfc682b2366 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 4173aad55..c78fea428 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,7 +42,7 @@ 3.1.2-servicing.20068.1 3.1.2-servicing.20068.1 3.1.2-servicing.20068.1 - 3.2.0-preview3.20168.3 + 3.2.0-preview3.20174.6 From 354d3df8d06d87c76982369a38572497b3c4fa9a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 25 Mar 2020 03:47:26 +0000 Subject: [PATCH 52/70] Update dependencies from https://github.com/dotnet/toolset build 20200324.2 (#6912) - Microsoft.Dotnet.Toolset.Internal - 3.1.300-preview.20174.2 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.300-preview.20174.1 (parent: Microsoft.Dotnet.Toolset.Internal) Co-authored-by: dotnet-maestro[bot] --- 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 42edd5ee1..a7722d3cf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -77,17 +77,17 @@ https://github.com/dotnet/templating 247f60e9e34a03ed99e855eb1ea0c20931a968db - + https://github.com/dotnet/toolset - 668718f15a6c3d58fb52dcaaf739b477aca6f85a + fb36998b12e1c49bcd17aa75567b3e7b6f195f76 https://github.com/dotnet/sdk a1af8fb4a842393917f9cda201fc1322eb0b675f - + https://github.com/dotnet/cli - b234867cb3322666b420a7be8fc89c4196d19b3e + eedc14af13bc1fdc6f4a6db3b3583ef5e40cb82e diff --git a/eng/Versions.props b/eng/Versions.props index c78fea428..32e2ca1df 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.300-preview.20173.1 + 3.1.300-preview.20174.2 @@ -46,7 +46,7 @@ - 3.1.300-preview.20168.1 + 3.1.300-preview.20174.1 0.2.0 From 51b35ff151e75c454b484bf29aaa6d9b2880df28 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 25 Mar 2020 16:02:11 +0000 Subject: [PATCH 53/70] [release/3.1.3xx] Update dependencies from dotnet/aspnetcore (#6911) * Update dependencies from https://github.com/dotnet/aspnetcore build 20200324.7 - Microsoft.AspNetCore.Components.WebAssembly.Templates - 3.2.0-preview3.20174.7 * Update dependencies from https://github.com/dotnet/aspnetcore build 20200325.3 - Microsoft.AspNetCore.Components.WebAssembly.Templates - 3.2.0-preview3.20175.3 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a7722d3cf..a22c3561e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -53,9 +53,9 @@ https://github.com/dotnet/aspnetcore c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc - + https://github.com/dotnet/aspnetcore - 3ba4cbfd5ca8220a68755fe005ba6bfc682b2366 + 4ab628ff76a5527efb8901cad5a88b5868b5fc9c https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 32e2ca1df..5fbaebb53 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,7 +42,7 @@ 3.1.2-servicing.20068.1 3.1.2-servicing.20068.1 3.1.2-servicing.20068.1 - 3.2.0-preview3.20174.6 + 3.2.0-preview3.20175.3 From 0edc5fa730b5c722aa373cde36a9c534153c55f0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 25 Mar 2020 11:18:36 -0700 Subject: [PATCH 54/70] Update dependencies from https://github.com/dotnet/sdk build 20200325.3 (#6917) - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.2.20175.3 - Microsoft.NET.Sdk - 5.0.100-preview.2.20175.3 Co-authored-by: dotnet-maestro[bot] --- 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 228c4410f..a22d4283d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 7e732bccfebe0cf51138d4368b98c2ab11e168f7 - + https://github.com/dotnet/sdk - 4f4c12ceabf0b8bdc36c52fe106a9f6f0f65b33e + a54659705d00fefeeba7fc1f32c191d9489b3aa2 - + https://github.com/dotnet/sdk - 4f4c12ceabf0b8bdc36c52fe106a9f6f0f65b33e + a54659705d00fefeeba7fc1f32c191d9489b3aa2 diff --git a/eng/Versions.props b/eng/Versions.props index efa9fb4fd..9a05ddb0b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,8 +49,8 @@ - 5.0.100-preview.2.20167.7 - 5.0.100-preview.2.20167.7 + 5.0.100-preview.2.20175.3 + 5.0.100-preview.2.20175.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 48389d3a9a920d0b1259760a6c064a035d62c97e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 25 Mar 2020 19:53:03 +0000 Subject: [PATCH 55/70] [release/3.1.3xx] Update dependencies from dotnet/aspnetcore (#6916) * Update dependencies from https://github.com/dotnet/aspnetcore build 20200325.4 - Microsoft.AspNetCore.Components.WebAssembly.Templates - 3.2.0-preview3.20175.4 * Update dependencies from https://github.com/dotnet/aspnetcore build 20200325.6 - Microsoft.AspNetCore.Components.WebAssembly.Templates - 3.2.0-preview3.20175.6 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a22c3561e..4adb3586b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -53,9 +53,9 @@ https://github.com/dotnet/aspnetcore c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc - + https://github.com/dotnet/aspnetcore - 4ab628ff76a5527efb8901cad5a88b5868b5fc9c + b9d7772816fd9e812f30b1e65c40dd34e8875537 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 5fbaebb53..7aa879e38 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,7 +42,7 @@ 3.1.2-servicing.20068.1 3.1.2-servicing.20068.1 3.1.2-servicing.20068.1 - 3.2.0-preview3.20175.3 + 3.2.0-preview3.20175.6 From 7619c03dfd7779bd8f8ae7d7b0148985d6f19235 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 26 Mar 2020 00:52:32 +0000 Subject: [PATCH 56/70] [release/3.1.3xx] Update dependencies from dotnet/aspnetcore (#6921) * Update dependencies from https://github.com/dotnet/aspnetcore build 20200325.9 - Microsoft.AspNetCore.Components.WebAssembly.Templates - 3.2.0-preview3.20175.9 * Update dependencies from https://github.com/dotnet/aspnetcore build 20200325.14 - Microsoft.AspNetCore.Components.WebAssembly.Templates - 3.2.0-preview4.20175.14 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4adb3586b..8856cff78 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -53,9 +53,9 @@ https://github.com/dotnet/aspnetcore c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc - + https://github.com/dotnet/aspnetcore - b9d7772816fd9e812f30b1e65c40dd34e8875537 + c93389f4494a82ee485dab4637299366691dd053 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 7aa879e38..1bf6a8611 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,7 +42,7 @@ 3.1.2-servicing.20068.1 3.1.2-servicing.20068.1 3.1.2-servicing.20068.1 - 3.2.0-preview3.20175.6 + 3.2.0-preview4.20175.14 From 49dc6c1e6fba1c11520ef8a25517558849a8b816 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 26 Mar 2020 07:36:11 +0000 Subject: [PATCH 57/70] Update dependencies from https://github.com/dotnet/aspnetcore build 20200325.18 (#6925) - Microsoft.AspNetCore.Components.WebAssembly.Templates - 3.2.0-preview4.20175.18 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8856cff78..0feb6bb60 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -53,9 +53,9 @@ https://github.com/dotnet/aspnetcore c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc - + https://github.com/dotnet/aspnetcore - c93389f4494a82ee485dab4637299366691dd053 + 3e07040bd1c8efb442f03218e3cc0b83b310bf3a https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 1bf6a8611..32465049a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,7 +42,7 @@ 3.1.2-servicing.20068.1 3.1.2-servicing.20068.1 3.1.2-servicing.20068.1 - 3.2.0-preview4.20175.14 + 3.2.0-preview4.20175.18 From d752c3e07b1780565dd992866188170a080f8030 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 26 Mar 2020 21:41:00 +0000 Subject: [PATCH 58/70] Update dependencies from https://github.com/dotnet/sdk build 20200326.4 (#6936) - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.2.20176.4 - Microsoft.NET.Sdk - 5.0.100-preview.2.20176.4 Co-authored-by: dotnet-maestro[bot] --- 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 a22d4283d..bb0376cc3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 7e732bccfebe0cf51138d4368b98c2ab11e168f7 - + https://github.com/dotnet/sdk - a54659705d00fefeeba7fc1f32c191d9489b3aa2 + 09cfa5216b4c80af4268db61d8e7b3432a25451f - + https://github.com/dotnet/sdk - a54659705d00fefeeba7fc1f32c191d9489b3aa2 + 09cfa5216b4c80af4268db61d8e7b3432a25451f diff --git a/eng/Versions.props b/eng/Versions.props index 9a05ddb0b..c5934d96e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,8 +49,8 @@ - 5.0.100-preview.2.20175.3 - 5.0.100-preview.2.20175.3 + 5.0.100-preview.2.20176.4 + 5.0.100-preview.2.20176.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 26fb45d0e8eeb5ba9c5427ee2a1ee31d6c802e1f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 27 Mar 2020 02:11:01 +0000 Subject: [PATCH 59/70] [release/3.1.3xx] Update dependencies from dotnet/aspnetcore (#6930) * Update dependencies from https://github.com/dotnet/aspnetcore build 20200326.6 - Microsoft.AspNetCore.Components.WebAssembly.Templates - 3.2.0-preview4.20176.6 * Update dependencies from https://github.com/dotnet/aspnetcore build 20200326.9 - Microsoft.AspNetCore.Components.WebAssembly.Templates - 3.2.0-preview4.20176.9 * Update dependencies from https://github.com/dotnet/aspnetcore build 20200326.14 - Microsoft.AspNetCore.Components.WebAssembly.Templates - 3.2.0-preview4.20176.14 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0feb6bb60..9a9511f58 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -53,9 +53,9 @@ https://github.com/dotnet/aspnetcore c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc - + https://github.com/dotnet/aspnetcore - 3e07040bd1c8efb442f03218e3cc0b83b310bf3a + 35d7da843aabf2f8ef74a1cc57843893cc70f9cc https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 32465049a..79556f0dc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,7 +42,7 @@ 3.1.2-servicing.20068.1 3.1.2-servicing.20068.1 3.1.2-servicing.20068.1 - 3.2.0-preview4.20175.18 + 3.2.0-preview4.20176.14 From 61488d76f803b57133a7f0a21092f91b02666643 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 27 Mar 2020 18:26:18 +0000 Subject: [PATCH 60/70] Update dependencies from https://github.com/dotnet/aspnetcore build 20200327.1 (#6957) - Microsoft.AspNetCore.Components.WebAssembly.Templates - 3.2.0-preview4.20177.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9a9511f58..f575d2ad6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -53,9 +53,9 @@ https://github.com/dotnet/aspnetcore c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc - + https://github.com/dotnet/aspnetcore - 35d7da843aabf2f8ef74a1cc57843893cc70f9cc + 18a196bcefd34104b888b4361d7dd9354f0db4b3 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 79556f0dc..077652591 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,7 +42,7 @@ 3.1.2-servicing.20068.1 3.1.2-servicing.20068.1 3.1.2-servicing.20068.1 - 3.2.0-preview4.20176.14 + 3.2.0-preview4.20177.1 From 5b42d6b919a3ca15410c82a2f00363f12c37662d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 27 Mar 2020 18:51:07 +0000 Subject: [PATCH 61/70] Update dependencies from https://github.com/dotnet/test-templates build 20200326.1 (#6958) - Microsoft.DotNet.Test.ProjectTemplates.2.1 - 1.0.2-beta4.20176.1 - Microsoft.DotNet.Test.ProjectTemplates.3.1 - 1.0.2-beta4.20176.1 - Microsoft.DotNet.Test.ProjectTemplates.5.0 - 1.0.2-beta4.20176.1 Co-authored-by: dotnet-maestro[bot] --- 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 bb0376cc3..a4145bb57 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -67,17 +67,17 @@ https://github.com/dotnet/aspnetcore f6897a5bb7ca767df8eb465bf15b193c878fffbf - + https://github.com/dotnet/test-templates - e8e924b5937e75ab3049d57cb5fb196ea2e3332c + 2720fcade72d709a5d2fe80d0b80fbdac54213f6 - + https://github.com/dotnet/test-templates - e8e924b5937e75ab3049d57cb5fb196ea2e3332c + 2720fcade72d709a5d2fe80d0b80fbdac54213f6 - + https://github.com/dotnet/test-templates - e8e924b5937e75ab3049d57cb5fb196ea2e3332c + 2720fcade72d709a5d2fe80d0b80fbdac54213f6 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index c5934d96e..5f524cef6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 1.0.2-beta4.20162.1 + 1.0.2-beta4.20176.1 @@ -99,7 +99,7 @@ 1.7.1 3.1.2 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) - 1.0.2-beta4.20162.1 + 1.0.2-beta4.20176.1 3.1.2 4.8.0-rc2.19462.10 @@ -113,7 +113,7 @@ 1.5.3 1.0.2-beta3 $(MicrosoftDotNetCommonItemTemplates21PackageVersion) - 1.0.2-beta4.20126.1 + 1.0.2-beta4.20176.1 2.1.14 From fc4f419efb411f3f7e139253e93221f701851976 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 28 Mar 2020 23:11:46 +0000 Subject: [PATCH 62/70] [release/3.1.3xx] Update dependencies from dotnet/aspnetcore (#6963) * Update dependencies from https://github.com/dotnet/aspnetcore build 20200328.3 - Microsoft.AspNetCore.Components.WebAssembly.Templates - 3.2.0-preview4.20178.3 * Update dependencies from https://github.com/dotnet/aspnetcore build 20200328.7 - Microsoft.AspNetCore.Components.WebAssembly.Templates - 3.2.0-preview4.20178.7 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f575d2ad6..41205b117 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -53,9 +53,9 @@ https://github.com/dotnet/aspnetcore c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc - + https://github.com/dotnet/aspnetcore - 18a196bcefd34104b888b4361d7dd9354f0db4b3 + 56b944f46cac1f1f880c26e9ae64b2abf6570367 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 077652591..e11941447 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,7 +42,7 @@ 3.1.2-servicing.20068.1 3.1.2-servicing.20068.1 3.1.2-servicing.20068.1 - 3.2.0-preview4.20177.1 + 3.2.0-preview4.20178.7 From 68ac4f8c3b93d0b2db027d39a40314aceb5707db Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 29 Mar 2020 00:12:47 +0000 Subject: [PATCH 63/70] Update dependencies from https://github.com/dotnet/aspnetcore build 20200328.8 (#6964) - Microsoft.AspNetCore.Components.WebAssembly.Templates - 3.2.0-preview4.20178.8 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 41205b117..4bcf46b5b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -53,9 +53,9 @@ https://github.com/dotnet/aspnetcore c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc - + https://github.com/dotnet/aspnetcore - 56b944f46cac1f1f880c26e9ae64b2abf6570367 + 07b12fe0bc63c066a0b079a0b2ca4dae6717ccf5 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index e11941447..a67325d83 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,7 +42,7 @@ 3.1.2-servicing.20068.1 3.1.2-servicing.20068.1 3.1.2-servicing.20068.1 - 3.2.0-preview4.20178.7 + 3.2.0-preview4.20178.8 From 61617995b5a24e6f8b2728e84ea9cb1261965c40 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 29 Mar 2020 23:46:30 +0000 Subject: [PATCH 64/70] Update dependencies from https://github.com/dotnet/aspnetcore build 20200329.4 (#6967) - Microsoft.AspNetCore.Components.WebAssembly.Templates - 3.2.0-preview4.20179.4 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4bcf46b5b..bea729ee3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -53,9 +53,9 @@ https://github.com/dotnet/aspnetcore c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc - + https://github.com/dotnet/aspnetcore - 07b12fe0bc63c066a0b079a0b2ca4dae6717ccf5 + 78534e59c1c185c0f86c028a25b5b0b244073d91 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index a67325d83..729c1568b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,7 +42,7 @@ 3.1.2-servicing.20068.1 3.1.2-servicing.20068.1 3.1.2-servicing.20068.1 - 3.2.0-preview4.20178.8 + 3.2.0-preview4.20179.4 From 3241fd92a7d8bf8d477cb858d7b39ac7ab947052 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 30 Mar 2020 02:55:52 +0000 Subject: [PATCH 65/70] Update dependencies from https://github.com/dotnet/test-templates build 20200326.1 (#6954) - Microsoft.DotNet.Test.ProjectTemplates.3.1 - 1.0.2-beta4.20176.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bea729ee3..9935b639d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,9 +69,9 @@ https://github.com/dotnet/aspnetcore c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc - + https://github.com/dotnet/test-templates - 07c739a22eeb760e60322ac0989c998328fe0aa2 + 2720fcade72d709a5d2fe80d0b80fbdac54213f6 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 729c1568b..97ccb2b46 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -28,7 +28,7 @@ - 1.0.2-beta4.20079.1 + 1.0.2-beta4.20176.1 From c1ce152d167b849351a130a021b1c2275880516a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 30 Mar 2020 06:00:41 +0000 Subject: [PATCH 66/70] [release/3.1.3xx] Update dependencies from dotnet/core-setup (#6940) * Update dependencies from https://github.com/dotnet/core-setup build 20200326.1 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.4-servicing.20176.1 - Microsoft.NETCore.DotNetHostResolver - 3.1.4-servicing.20176.1 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.4-servicing.20176.1 - Microsoft.NETCore.App.Host.win-x64 - 3.1.4-servicing.20176.1 - Microsoft.NETCore.App.Internal - 3.1.4-servicing.20176.1 Dependency coherency updates - Microsoft.NETCore.Platforms - 3.1.1-servicing.20176.2 (parent: Microsoft.NetCore.App.Internal) - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.1-servicing.20127.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.3-servicing.20128.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) * Update dependencies from https://github.com/dotnet/core-setup build 20200326.3 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.4-servicing.20176.3 - Microsoft.NETCore.DotNetHostResolver - 3.1.4-servicing.20176.3 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.4-servicing.20176.3 - Microsoft.NETCore.App.Host.win-x64 - 3.1.4-servicing.20176.3 - Microsoft.NETCore.App.Internal - 3.1.4-servicing.20176.3 Dependency coherency updates - Microsoft.NETCore.Platforms - 3.1.1-servicing.20176.2 (parent: Microsoft.NetCore.App.Internal) - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.1-servicing.20127.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.3-servicing.20128.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) * Update dependencies from https://github.com/dotnet/core-setup build 20200326.4 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.4-servicing.20176.4 - Microsoft.NETCore.DotNetHostResolver - 3.1.4-servicing.20176.4 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.4-servicing.20176.4 - Microsoft.NETCore.App.Host.win-x64 - 3.1.4-servicing.20176.4 - Microsoft.NETCore.App.Internal - 3.1.4-servicing.20176.4 Dependency coherency updates - Microsoft.NETCore.Platforms - 3.1.1-servicing.20176.6 (parent: Microsoft.NetCore.App.Internal) - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.1-servicing.20127.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.3-servicing.20128.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 1 - eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 24 insertions(+), 25 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3a3d36a3b..b484be09f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9935b639d..4d4cb824e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,25 +1,25 @@ - + https://github.com/dotnet/core-setup - 916b5cba268e1e1e803243004f4276cf40b2dda8 + 08b96bae4b5127c9ab110182fdd51e6a045803cf - + https://github.com/dotnet/core-setup - 916b5cba268e1e1e803243004f4276cf40b2dda8 + 08b96bae4b5127c9ab110182fdd51e6a045803cf - + https://github.com/dotnet/core-setup - 916b5cba268e1e1e803243004f4276cf40b2dda8 + 08b96bae4b5127c9ab110182fdd51e6a045803cf - + https://github.com/dotnet/core-setup - 916b5cba268e1e1e803243004f4276cf40b2dda8 + 08b96bae4b5127c9ab110182fdd51e6a045803cf - + https://github.com/dotnet/core-setup - 916b5cba268e1e1e803243004f4276cf40b2dda8 + 08b96bae4b5127c9ab110182fdd51e6a045803cf @@ -37,9 +37,9 @@ https://github.com/dotnet/core-setup 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 - + https://github.com/dotnet/corefx - 0f7f38c4fd323b26da10cce95f857f77f0f09b48 + 78ef3883a0a2ca585ebf9392c2ee6897d611cfe7 https://github.com/dotnet/aspnetcore @@ -90,13 +90,13 @@ eedc14af13bc1fdc6f4a6db3b3583ef5e40cb82e - + https://github.com/dotnet/winforms - 9483a88b7764a74d71cbd449de6c56c1d5e0af21 + 8b60caf6234fd40d51f2593dbaa474e1ffab0bff - + https://github.com/dotnet/wpf - 589ace3c9fdfa0f1ea1640b82304a6a7ac597871 + b8c0f1ed4a1cd2cdd8dcbebc5ccff99993d4c3dd diff --git a/eng/Versions.props b/eng/Versions.props index 97ccb2b46..df87ccbca 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,11 +16,11 @@ - 4.8.1-servicing.19605.5 + 4.8.1-servicing.20127.4 - 3.1.2-servicing.20066.4 + 3.1.3-servicing.20128.4 @@ -58,16 +58,16 @@ - 3.1.0 + 3.1.1-servicing.20176.6 - 3.1.2-servicing.20067.4 - 3.1.2 - 3.1.2 + 3.1.4-servicing.20176.4 + 3.1.4-servicing.20176.4 + 3.1.4-servicing.20176.4 3.1.0 - 3.1.2 - 3.1.2 + 3.1.4-servicing.20176.4 + 3.1.4-servicing.20176.4 3.1.0 2.1.0 From 5a9b32979933c50dd64ad015ee6d49c1c537faf2 Mon Sep 17 00:00:00 2001 From: William Li Date: Mon, 30 Mar 2020 11:56:33 -0700 Subject: [PATCH 67/70] Add docker pull retry (#6971) --- eng/dockerrun.sh | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/eng/dockerrun.sh b/eng/dockerrun.sh index 762e177a7..819858ea2 100755 --- a/eng/dockerrun.sh +++ b/eng/dockerrun.sh @@ -99,9 +99,30 @@ fi # VSO [ ! -z "$BUILD_BUILDID" ] && DOTNET_BUILD_CONTAINER_NAME="$BUILD_BUILDID" +function retry { + local max_count=$1 + shift + + local count=0 + until "$@"; do + exit=$? + wait=$((2 ** $count)) + count=$(($count + 1)) + if [[ ${count} -lt ${max_count} ]]; then + echo "Retry $count/$max_count returned $exit, wait $wait seconds..." + sleep ${wait} + else + echo "Retry $count/$max_count returned $exit." + return ${exit} + fi + done + return 0 +} + # Build the docker container (will be fast if it is already built) +# with retry since docker pull has high failure rate echo "Building Docker Container using Dockerfile: $DOCKERFILE" -docker build --build-arg WORK_DIR=$DOCKER_HOST_SHARE_DIR --build-arg USER_ID=$(id -u) -t $DOTNET_BUILD_CONTAINER_TAG $DOCKERFILE +retry 10 docker build --build-arg WORK_DIR=$DOCKER_HOST_SHARE_DIR --build-arg USER_ID=$(id -u) -t $DOTNET_BUILD_CONTAINER_TAG $DOCKERFILE 2>&1 # Run the build in the container echo "Launching build in Docker Container" From f181bff63ae0e1e66d0032417aeedfe120752fbd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 31 Mar 2020 02:43:50 +0000 Subject: [PATCH 68/70] Update dependencies from https://github.com/dotnet/sdk build 20200330.7 (#6982) - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.2.20180.7 - Microsoft.NET.Sdk - 5.0.100-preview.2.20180.7 Co-authored-by: dotnet-maestro[bot] --- 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 a4145bb57..57f413afd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 7e732bccfebe0cf51138d4368b98c2ab11e168f7 - + https://github.com/dotnet/sdk - 09cfa5216b4c80af4268db61d8e7b3432a25451f + 1e94ae81b1e20d5a06a9b8efb123a902dc9ee5cf - + https://github.com/dotnet/sdk - 09cfa5216b4c80af4268db61d8e7b3432a25451f + 1e94ae81b1e20d5a06a9b8efb123a902dc9ee5cf diff --git a/eng/Versions.props b/eng/Versions.props index 5f524cef6..f6b7013f0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,8 +49,8 @@ - 5.0.100-preview.2.20176.4 - 5.0.100-preview.2.20176.4 + 5.0.100-preview.2.20180.7 + 5.0.100-preview.2.20180.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d1174c3375bd36c5279c01247fd4febd1723f1df Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 31 Mar 2020 16:23:33 +0000 Subject: [PATCH 69/70] [release/3.1.3xx] Update dependencies from dotnet/aspnetcore (#6979) * Update dependencies from https://github.com/dotnet/aspnetcore build 20200330.6 - Microsoft.AspNetCore.Components.WebAssembly.Templates - 3.2.0-preview4.20180.6 * Update dependencies from https://github.com/dotnet/aspnetcore build 20200331.1 - Microsoft.AspNetCore.Components.WebAssembly.Templates - 3.2.0-preview4.20181.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4d4cb824e..de72c12d8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -53,9 +53,9 @@ https://github.com/dotnet/aspnetcore c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc - + https://github.com/dotnet/aspnetcore - 78534e59c1c185c0f86c028a25b5b0b244073d91 + 05ee136e87a9c84b9d29fa36ad6756865e4086e7 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index df87ccbca..9bc81fd13 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,7 +42,7 @@ 3.1.2-servicing.20068.1 3.1.2-servicing.20068.1 3.1.2-servicing.20068.1 - 3.2.0-preview4.20179.4 + 3.2.0-preview4.20181.1 From 98f5bac118b6ebbe66b5053eb97e120e0481d1f0 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Fri, 13 Mar 2020 12:59:04 +0100 Subject: [PATCH 70/70] Add test templates dependency for 2.1 (#6806) --- eng/Version.Details.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7c2786b24..0cf0733b7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -67,6 +67,10 @@ https://github.com/dotnet/aspnetcore a2d8852186643561d783e5ea6c9bc65fc97810ce + + https://github.com/dotnet/test-templates + e8e924b5937e75ab3049d57cb5fb196ea2e3332c + https://github.com/dotnet/test-templates 2720fcade72d709a5d2fe80d0b80fbdac54213f6