From 66bf831f5b4dacdb2582a934546693f7dce35a60 Mon Sep 17 00:00:00 2001 From: William Li Date: Mon, 26 Oct 2020 16:39:42 -0700 Subject: [PATCH 1/3] Update branding 5.0.2xx --- eng/Versions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 897ab3c1e..c99d7ce69 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -7,14 +7,14 @@ 5 0 - 1 + 2 00 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) - rtm + preview $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) - true + false release From fc1e9110305611099605e8878cdf2d213fdf3e71 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 3 Nov 2020 19:05:10 +0000 Subject: [PATCH 2/3] Update dependencies from https://github.com/dotnet/sdk build 20201103.4 (#8995) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 5.0.0 to 5.0.0 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App: from 5.0.0-rtm.20520.1 to 5.0.0-rtm.20529.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 5.0.0 to 5.0.0 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Internal: from 5.0.0-rtm.20519.4 to 5.0.0-rtm.20529.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0 to 5.0.0 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.0 to 5.0.0 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.0 to 5.0.0 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 5.0.0 to 5.0.0 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 5.0.0 to 5.0.0 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 5.0.0-rtm.20523.6 to 5.0.0-rtm.20529.7 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0: from 5.0.0-rtm.20523.6 to 5.0.0-rtm.20529.7 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0 to 5.0.0 (parent: Microsoft.NET.Sdk) - Microsoft.EntityFrameworkCore: from 5.0.0 to 5.0.0 (parent: Microsoft.AspNetCore.App.Runtime.win-x64) - dotnet-dev-certs: from 5.0.0-rtm.20523.6 to 5.0.0-rtm.20529.7 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rtm.20523.6 to 5.0.0-rtm.20529.7 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rtm.20523.6 to 5.0.0-rtm.20529.7 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0 to 5.0.0 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rtm.20520.1 to 5.0.0-rtm.20529.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0 to 5.0.0 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rtm.20520.3 to 5.0.0-rtm.20529.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.DotNet.Cli.CommandLine: from 1.0.0-preview.19208.1 to 1.0.0-preview.19208.1 (parent: Microsoft.NET.Sdk) --- NuGet.config | 22 ++++++++++---- eng/Version.Details.xml | 66 ++++++++++++++++++++--------------------- eng/Versions.props | 22 +++++++------- 3 files changed, 61 insertions(+), 49 deletions(-) diff --git a/NuGet.config b/NuGet.config index 822f50170..110374230 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,12 +6,24 @@ - - - + + + + + + + - - + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 334bccb9f..089821884 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,35 +3,35 @@ https://github.com/dotnet/windowsdesktop - ec2af60c1eb8b2665745750f6445b3ff133178fb + 5848b16d1fc803ea4892692b3b5dd9ee79955428 - + https://github.com/dotnet/windowsdesktop - ec2af60c1eb8b2665745750f6445b3ff133178fb + 5848b16d1fc803ea4892692b3b5dd9ee79955428 https://github.com/dotnet/windowsdesktop - ec2af60c1eb8b2665745750f6445b3ff133178fb + 5848b16d1fc803ea4892692b3b5dd9ee79955428 https://github.com/dotnet/runtime - cf258a14b70ad9069470a108f13765e0e5988f51 + 7ef6d50b312217d2f7c17b9697891fa8ab98a19d - + https://github.com/dotnet/runtime - cf258a14b70ad9069470a108f13765e0e5988f51 + 7ef6d50b312217d2f7c17b9697891fa8ab98a19d https://github.com/dotnet/runtime - cf258a14b70ad9069470a108f13765e0e5988f51 + 7ef6d50b312217d2f7c17b9697891fa8ab98a19d https://github.com/dotnet/runtime - cf258a14b70ad9069470a108f13765e0e5988f51 + 7ef6d50b312217d2f7c17b9697891fa8ab98a19d https://github.com/dotnet/runtime - cf258a14b70ad9069470a108f13765e0e5988f51 + 7ef6d50b312217d2f7c17b9697891fa8ab98a19d @@ -41,39 +41,39 @@ https://github.com/dotnet/runtime - cf258a14b70ad9069470a108f13765e0e5988f51 + 7ef6d50b312217d2f7c17b9697891fa8ab98a19d https://github.com/dotnet/aspnetcore - c15cd69b65a5b999b7c7042c5408c7c3be2ac7e7 + 80f8669450b2b79085d624f81f74c8d7ad5be089 - + https://github.com/dotnet/aspnetcore - c15cd69b65a5b999b7c7042c5408c7c3be2ac7e7 + 80f8669450b2b79085d624f81f74c8d7ad5be089 https://github.com/dotnet/aspnetcore - c15cd69b65a5b999b7c7042c5408c7c3be2ac7e7 + 80f8669450b2b79085d624f81f74c8d7ad5be089 - + https://github.com/dotnet/aspnetcore - c15cd69b65a5b999b7c7042c5408c7c3be2ac7e7 + 80f8669450b2b79085d624f81f74c8d7ad5be089 https://github.com/dotnet/efcore - 73566d1fb936ebccd9e8c476fb286ffd451bdd46 + c57d3d2083c50ed3fa746e55016ce5dc0e863e5b - + https://github.com/dotnet/aspnetcore - c15cd69b65a5b999b7c7042c5408c7c3be2ac7e7 + 80f8669450b2b79085d624f81f74c8d7ad5be089 - + https://github.com/dotnet/aspnetcore - c15cd69b65a5b999b7c7042c5408c7c3be2ac7e7 + 80f8669450b2b79085d624f81f74c8d7ad5be089 - + https://github.com/dotnet/aspnetcore - c15cd69b65a5b999b7c7042c5408c7c3be2ac7e7 + 80f8669450b2b79085d624f81f74c8d7ad5be089 https://github.com/dotnet/test-templates @@ -87,22 +87,22 @@ https://github.com/dotnet/templating 31980633108a1bef00c798136fcd30a873c90fa3 - + https://github.com/dotnet/sdk - 2c9e8d8b135ff8ad9bef9dcf4805c05cbd9cb585 + 18ad595395c424400e46947e6f9ce4d13e9256bb - + https://github.com/dotnet/sdk - 2c9e8d8b135ff8ad9bef9dcf4805c05cbd9cb585 + 18ad595395c424400e46947e6f9ce4d13e9256bb - + https://github.com/dotnet/winforms - 30738f0987bdccb72f705af705521051fe141a46 + 7d4355bb5f5c1f98ded2fb0497f8795cd1b0305f - + https://github.com/dotnet/wpf - 9e81b0885121e9958e48895ae48be9639a396528 + 61553660e51cd7fe9a733d6cdbc20e537710b8a8 https://github.com/dotnet/fsharp @@ -130,7 +130,7 @@ 830c8be45dbbccd411ecf6080abff0c2c98079cf - https://github.com/dotnet/cliCommandLineParser + https://github.com/dotnet/CliCommandLineParser 0e89c2116ad28e404ba56c14d1c3f938caa25a01 diff --git a/eng/Versions.props b/eng/Versions.props index c99d7ce69..c30ae2437 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 5.0.0-rtm.20520.1 + 5.0.0-rtm.20529.3 - 5.0.0-rtm.20520.3 + 5.0.0-rtm.20529.5 @@ -45,19 +45,19 @@ 5.0.0 5.0.0 - 5.0.0-rtm.20523.6 - 5.0.0-rtm.20523.6 - 5.0.0-rtm.20523.6 - 5.0.0-rtm.20523.6 - 5.0.0-rtm.20523.6 + 5.0.0-rtm.20529.7 + 5.0.0-rtm.20529.7 + 5.0.0-rtm.20529.7 + 5.0.0-rtm.20529.7 + 5.0.0-rtm.20529.7 0.2.0 - 5.0.100-rtm.20526.7 - 5.0.100-rtm.20526.7 + 5.0.200-preview.20553.4 + 5.0.200-preview.20553.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,7 +68,7 @@ - 5.0.0-rtm.20519.4 + 5.0.0-rtm.20529.3 5.0.0 5.0.0 5.0.0 @@ -77,7 +77,7 @@ - 5.0.0-rtm.20520.1 + 5.0.0-rtm.20529.4 5.0.0 5.0.0 From ce522fa8575c22780f415f7fbc156485160844f7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 3 Nov 2020 22:14:29 +0000 Subject: [PATCH 3/3] Update dependencies from https://github.com/dotnet/sdk build 20201103.7 (#8997) [release/5.0.2xx] Update dependencies from dotnet/sdk --- NuGet.config | 12 ++++++++++++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 110374230..d376e2811 100644 --- a/NuGet.config +++ b/NuGet.config @@ -25,6 +25,18 @@ + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 089821884..85c820831 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating 31980633108a1bef00c798136fcd30a873c90fa3 - + https://github.com/dotnet/sdk - 18ad595395c424400e46947e6f9ce4d13e9256bb + 2456ed254ca805a436994ed6a8f1f7baf75265bb - + https://github.com/dotnet/sdk - 18ad595395c424400e46947e6f9ce4d13e9256bb + 2456ed254ca805a436994ed6a8f1f7baf75265bb diff --git a/eng/Versions.props b/eng/Versions.props index c30ae2437..8e53c8667 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 5.0.200-preview.20553.4 - 5.0.200-preview.20553.4 + 5.0.200-preview.20553.7 + 5.0.200-preview.20553.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion)