From dead86bee4dba53c3dc6fd2b6f01a168ca0e23f7 Mon Sep 17 00:00:00 2001 From: William Li Date: Sun, 7 Apr 2019 16:06:16 -0700 Subject: [PATCH 01/15] Revert core-setup preview5 insertion that is too early --- 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 3c6124daa..65b29cf67 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,9 +6,9 @@ https://dev.azure.com/devdiv/DevDiv/_git/DotNet-Trusted b76aadda41b179d0eb08868dc6c97061ffd0103e - + https://github.com/dotnet/core-setup - 9d76acf308e50281e5dacbd061be8519007f67e9 + 08d6d2bb5fd7c59be88a515db93b650eca9be41c https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index a72a10072..ba60ada74 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,7 +37,7 @@ 3.0.100-preview4.19207.2 - 3.0.0-preview5-27607-03 + 3.0.0-preview4-27606-04 $(MicrosoftNETCoreAppPackageVersion) From 1f8839eb4a03786d888e82f1846d1686e4e5c524 Mon Sep 17 00:00:00 2001 From: William Li Date: Mon, 8 Apr 2019 11:00:59 -0700 Subject: [PATCH 02/15] Revert release/3.0.1xx back --- src/CopyToLatest/targets/BranchInfo.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CopyToLatest/targets/BranchInfo.props b/src/CopyToLatest/targets/BranchInfo.props index 9bd214aa9..d103b00f0 100644 --- a/src/CopyToLatest/targets/BranchInfo.props +++ b/src/CopyToLatest/targets/BranchInfo.props @@ -1,5 +1,5 @@ - master + release/3.0.1xx From 2101ac1c952261de3a5daebf5cd4ade485900563 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 8 Apr 2019 22:31:07 +0000 Subject: [PATCH 03/15] Update dependencies from https://github.com/dotnet/wpf build 20190408.6 (#1273) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-preview4.19208.6 --- 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 65b29cf67..eaaf2205b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -58,9 +58,9 @@ https://github.com/dotnet/winforms a875e24eff58bcc7a1bb124a6f05792639a83536 - + https://github.com/dotnet/wpf - a1132a2a7fe48b25716f44680cadebc7dd2f7c64 + 2c098fa45314c5abcc671b4bc4a630b80f597625 diff --git a/eng/Versions.props b/eng/Versions.props index ba60ada74..63ecc83dc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ - 3.0.0-preview4.19207.1 + 3.0.0-preview4.19208.6 From 7a0ec059c19fc891c1a00d28a1f55c25d5bb09d9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 9 Apr 2019 00:31:06 +0000 Subject: [PATCH 04/15] Update dependencies from https://github.com/dotnet/wpf build 20190408.8 (#1277) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-preview4.19208.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 eaaf2205b..6fc327309 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -58,9 +58,9 @@ https://github.com/dotnet/winforms a875e24eff58bcc7a1bb124a6f05792639a83536 - + https://github.com/dotnet/wpf - 2c098fa45314c5abcc671b4bc4a630b80f597625 + 98192dc78e510728bb70f845a68ce3cd077205d8 diff --git a/eng/Versions.props b/eng/Versions.props index 63ecc83dc..8306b396d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ - 3.0.0-preview4.19208.6 + 3.0.0-preview4.19208.8 From a1d75448fe5dfa1c578d7493f4b63b5dbff73632 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 9 Apr 2019 01:57:14 +0000 Subject: [PATCH 05/15] Update dependencies from https://github.com/dotnet/core-setup build 20190408.11 (#1280) - Microsoft.NETCore.App - 3.0.0-preview4-27608-11 --- 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 6fc327309..d065d55c6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,9 +6,9 @@ https://dev.azure.com/devdiv/DevDiv/_git/DotNet-Trusted b76aadda41b179d0eb08868dc6c97061ffd0103e - + https://github.com/dotnet/core-setup - 08d6d2bb5fd7c59be88a515db93b650eca9be41c + 63787f307be73c00d5c8830896be0e82a944227d https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 8306b396d..c9799ab31 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,7 +37,7 @@ 3.0.100-preview4.19207.2 - 3.0.0-preview4-27606-04 + 3.0.0-preview4-27608-11 $(MicrosoftNETCoreAppPackageVersion) From b29dee2607bfff712b442b5ea221927ae92c2f68 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 9 Apr 2019 02:10:32 +0000 Subject: [PATCH 06/15] Update dependencies from https://github.com/dotnet/toolset build 20190408.14 (#1281) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview4.19208.14 --- 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 d065d55c6..5725d07a8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating 42a212514e375a0821baab69fbac462e39590cfb - + https://github.com/dotnet/toolset - 3b82e05e5fd489611d85b55d18c0200c6372e78d + 5831df78ec11f9341cc32dec0e78203d8dc93082 https://github.com/dotnet/standard diff --git a/eng/Versions.props b/eng/Versions.props index c9799ab31..229dd6a6f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview4.19207.8 + 3.0.100-preview4.19208.14 From 6550e564456b02c49e83d556bdf01595b1ccd403 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 9 Apr 2019 02:30:55 +0000 Subject: [PATCH 07/15] Update dependencies from https://github.com/dotnet/toolset build 20190408.15 (#1282) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview4.19208.15 --- 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 5725d07a8..2232cb0b2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating 42a212514e375a0821baab69fbac462e39590cfb - + https://github.com/dotnet/toolset - 5831df78ec11f9341cc32dec0e78203d8dc93082 + f46c6c411f7eb70f72ae78a74323444b0a39b9cb https://github.com/dotnet/standard diff --git a/eng/Versions.props b/eng/Versions.props index 229dd6a6f..b3770a6d1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview4.19208.14 + 3.0.100-preview4.19208.15 From a2de801afac26a1ced731c230feccd55e5840821 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 9 Apr 2019 02:50:54 +0000 Subject: [PATCH 08/15] Update dependencies from https://github.com/dotnet/wpf build 20190408.9 (#1283) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-preview4.19208.9 --- 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 2232cb0b2..7816fdeca 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -58,9 +58,9 @@ https://github.com/dotnet/winforms a875e24eff58bcc7a1bb124a6f05792639a83536 - + https://github.com/dotnet/wpf - 98192dc78e510728bb70f845a68ce3cd077205d8 + 5d48aa52e109fa025dc8991409fcf8fd0ec7ccb2 diff --git a/eng/Versions.props b/eng/Versions.props index b3770a6d1..26344a0e7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ - 3.0.0-preview4.19208.8 + 3.0.0-preview4.19208.9 From 6e40dc568783007e761e888b820028519a16dc48 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 9 Apr 2019 02:53:21 +0000 Subject: [PATCH 09/15] Update dependencies from https://github.com/dotnet/cli build 20190408.5 (#1285) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview4.19208.5 --- 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 7816fdeca..acce76083 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,9 +50,9 @@ https://github.com/dotnet/standard 040f41f20972988aa34195e778b4170004ead695 - + https://github.com/dotnet/cli - 83b6b1e2419fdf62bbe7e2098a3169b082928675 + 1e3947e908afd6b6cd392f9df56b62d115a0a35d https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index 26344a0e7..d50fef880 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ - 3.0.100-preview4.19207.2 + 3.0.100-preview4.19208.5 3.0.0-preview4-27608-11 From 8da2dfb1b5522ca3b78bd3ed73d961b2041e7dce Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 9 Apr 2019 03:04:28 +0000 Subject: [PATCH 10/15] Update dependencies from https://github.com/dotnet/toolset build 20190408.16 (#1286) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview4.19208.16 --- 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 acce76083..413647608 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating 42a212514e375a0821baab69fbac462e39590cfb - + https://github.com/dotnet/toolset - f46c6c411f7eb70f72ae78a74323444b0a39b9cb + 7064ba0cb9bcc5d98f4b3089855a49e1487bcb89 https://github.com/dotnet/standard diff --git a/eng/Versions.props b/eng/Versions.props index d50fef880..b88c680eb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview4.19208.15 + 3.0.100-preview4.19208.16 From 3fdf2c4d01ca2e44829f3851770379b74340085a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 9 Apr 2019 03:19:51 +0000 Subject: [PATCH 11/15] Update dependencies from https://github.com/dotnet/toolset build 20190408.17 (#1288) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview4.19208.17 --- 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 413647608..76046c744 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating 42a212514e375a0821baab69fbac462e39590cfb - + https://github.com/dotnet/toolset - 7064ba0cb9bcc5d98f4b3089855a49e1487bcb89 + 45cec59851858e795a53eb398f4b50682ae56301 https://github.com/dotnet/standard diff --git a/eng/Versions.props b/eng/Versions.props index b88c680eb..7dfa9e250 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview4.19208.16 + 3.0.100-preview4.19208.17 From 2ae1922135fe3250d0d1abf7d9aa039bd99b450e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 9 Apr 2019 04:10:11 +0000 Subject: [PATCH 12/15] Update dependencies from https://github.com/dotnet/toolset build 20190408.23 (#1289) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview4.19208.23 --- 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 76046c744..0ca009d0a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating 42a212514e375a0821baab69fbac462e39590cfb - + https://github.com/dotnet/toolset - 45cec59851858e795a53eb398f4b50682ae56301 + 25ba3f597106842391c1666ec03b8e0fd179e540 https://github.com/dotnet/standard diff --git a/eng/Versions.props b/eng/Versions.props index 7dfa9e250..268c4ca7f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview4.19208.17 + 3.0.100-preview4.19208.23 From fd0f036bde642709f7a4110e8edcc280323c8f97 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 9 Apr 2019 05:19:11 +0000 Subject: [PATCH 13/15] Update dependencies from https://github.com/dotnet/toolset build 20190408.25 (#1291) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview4.19208.25 --- 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 0ca009d0a..faa1cf59e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating 42a212514e375a0821baab69fbac462e39590cfb - + https://github.com/dotnet/toolset - 25ba3f597106842391c1666ec03b8e0fd179e540 + 28cb3fab3350143829db8b91d8670f38848d4d1f https://github.com/dotnet/standard diff --git a/eng/Versions.props b/eng/Versions.props index 268c4ca7f..6d5455ad3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview4.19208.23 + 3.0.100-preview4.19208.25 From 5b5de1ae211efcaaabb78fa4aa04bd6dbce6d927 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 9 Apr 2019 12:55:35 +0000 Subject: [PATCH 14/15] Update dependencies from https://github.com/dotnet/standard build 20190408.5 (#1300) - NETStandard.Library - 2.1.0-prerelease.19208.5 --- 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 faa1cf59e..2214b7022 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,9 +46,9 @@ https://github.com/dotnet/toolset 28cb3fab3350143829db8b91d8670f38848d4d1f - + https://github.com/dotnet/standard - 040f41f20972988aa34195e778b4170004ead695 + 8ef5ada20b5343b0cb9e7fd577341426dab76cd8 https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index 6d5455ad3..44b1d756f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,7 +41,7 @@ $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-prerelease.19207.1 + 2.1.0-prerelease.19208.5 $(NETStandardLibraryPackageVersion) From 5c96d57220ef82ab8b75ba77395055056fd17733 Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Tue, 9 Apr 2019 11:06:05 -0700 Subject: [PATCH 15/15] [release/3.01xx] Bump latest 2.1/2.2 in bundled versions (#1307) --- src/redist/targets/GenerateBundledVersions.targets | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 47a94684d..44701acc7 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -106,11 +106,11 @@ + LatestVersion="2.1.10" /> + LatestVersion="2.2.4" /> + LatestVersion="2.1.10"/> + LatestVersion="2.1.10"/> + LatestVersion="2.2.4"/> + LatestVersion="2.2.4"/>