From dedc35e3feeb580e22865e623b1d2f4d093d0c84 Mon Sep 17 00:00:00 2001 From: William Li Date: Thu, 20 Feb 2020 22:03:15 -0800 Subject: [PATCH 1/4] 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 2/4] 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 3/4] 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 4/4] 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