From 819d5f47a4ba52899f9f7c4836ae3ee91e8183df Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 6 Dec 2021 17:33:48 +0000 Subject: [PATCH] [main] Update dependencies from dotnet/sdk (#12716) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 7.0.0-alpha.1.21566.3 to 7.0.0-alpha.1.21580.7 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21566.3 to 7.0.0-alpha.1.21580.7 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0: from 7.0.0-alpha.1.21566.3 to 7.0.0-alpha.1.21580.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 7.0.0-alpha.1.21567.1 to 7.0.0-alpha.1.21580.11 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.7.0: from 7.0.0-alpha.1.21567.1 to 7.0.0-alpha.1.21580.11 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21567.1 to 7.0.0-alpha.1.21580.11 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 7.0.0-alpha.1.21567.1 to 7.0.0-alpha.1.21580.11 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 7.0.0-alpha.1.21567.1 to 7.0.0-alpha.1.21580.11 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 7.0.0-alpha.1.21567.1 to 7.0.0-alpha.1.21580.11 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 7.0.0-alpha.1.21568.1 to 7.0.0-alpha.1.21601.8 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-alpha.1.21568.1 to 7.0.0-alpha.1.21601.8 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21568.1 to 7.0.0-alpha.1.21601.8 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21568.1 to 7.0.0-alpha.1.21601.8 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 7.0.0-alpha.1.21568.1 to 7.0.0-alpha.1.21601.8 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 7.0.0-alpha.1.21568.1 to 7.0.0-alpha.1.21601.8 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ItemTemplates: from 7.0.100-alpha.1.21568.4 to 7.0.100-alpha.1.21601.1 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 7.0.100-alpha.1.21568.4 to 7.0.100-alpha.1.21601.1 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-alpha.1.21566.3 to 7.0.0-alpha.1.21580.7 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 7.0.0-alpha.1.21566.2 to 7.0.0-alpha.1.21580.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-alpha.1.21566.3 to 7.0.0-alpha.1.21580.7 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 7.0.0-alpha.1.21566.6 to 7.0.0-alpha.1.21580.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.NET.Test.Sdk: from 17.1.0-preview-20211118-03 to 17.1.0-preview-20211202-01 (parent: Microsoft.NET.Sdk) - Microsoft.NET.ILLink.Tasks: from 7.0.100-1.21567.1 to 7.0.100-1.21601.2 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.0.1-1.21568.1 to 4.0.1-1.21573.5 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.1.0-preview-21567-01 to 17.1.0-preview-21579-12 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21567.1 to 7.0.0-alpha.1.21580.11 (parent: Microsoft.NET.Sdk) - Try using new dotnetbuilds asset root URI - !fixup! typo - Resolve msbuild source-build patch conflict - Merge branch 'darc-main-5f79afa4-8b96-43d6-a79b-6954e7183172' of https://github.com/dotnet/installer into darc-main-5f79afa4-8b96-43d6-a79b-6954e7183172 - Merge branch 'main' of https://github.com/dotnet/installer into darc-main-5f79afa4-8b96-43d6-a79b-6954e7183172 - Resolve source-build conflicts w/format patches --- eng/Version.Details.xml | 108 ++++++------ eng/Versions.props | 52 +++--- .../0001-Fix-MicrosoftExtensionsVersion.patch | 4 +- ...2-Update-system-command-line-version.patch | 164 ------------------ ...y-on-MS.VS.Setup.Configuration.Inter.patch | 17 +- 5 files changed, 86 insertions(+), 259 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/format/0002-Update-system-command-line-version.patch diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 24f6e2235..0c2caad38 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://github.com/dotnet/windowsdesktop - 7214df3a9275a3a5e30c3045a69d5c26e709a55d + 411473ddf9b7d031eae26395a816b0059faa2c50 - + https://github.com/dotnet/windowsdesktop - 7214df3a9275a3a5e30c3045a69d5c26e709a55d + 411473ddf9b7d031eae26395a816b0059faa2c50 - + https://github.com/dotnet/windowsdesktop - 7214df3a9275a3a5e30c3045a69d5c26e709a55d + 411473ddf9b7d031eae26395a816b0059faa2c50 - + https://github.com/dotnet/windowsdesktop - 7214df3a9275a3a5e30c3045a69d5c26e709a55d + 411473ddf9b7d031eae26395a816b0059faa2c50 - + https://github.com/dotnet/runtime - 10e107debae28de4bd1e710cfe448be3c293e841 + 09cd9c2cfd21f7e830269ee7cd64ea11cbe47a1d - + https://github.com/dotnet/runtime - 10e107debae28de4bd1e710cfe448be3c293e841 + 09cd9c2cfd21f7e830269ee7cd64ea11cbe47a1d - + https://github.com/dotnet/runtime - 10e107debae28de4bd1e710cfe448be3c293e841 + 09cd9c2cfd21f7e830269ee7cd64ea11cbe47a1d - + https://github.com/dotnet/runtime - 10e107debae28de4bd1e710cfe448be3c293e841 + 09cd9c2cfd21f7e830269ee7cd64ea11cbe47a1d - + https://github.com/dotnet/runtime - 10e107debae28de4bd1e710cfe448be3c293e841 + 09cd9c2cfd21f7e830269ee7cd64ea11cbe47a1d - + https://github.com/dotnet/runtime - 10e107debae28de4bd1e710cfe448be3c293e841 + 09cd9c2cfd21f7e830269ee7cd64ea11cbe47a1d @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 10e107debae28de4bd1e710cfe448be3c293e841 + 09cd9c2cfd21f7e830269ee7cd64ea11cbe47a1d - + https://github.com/dotnet/aspnetcore - ad46e0355613b8cfca9d401a44d9eba7004a175b + a32dde1438404a98ec437e249f43666cd4001170 - + https://github.com/dotnet/aspnetcore - ad46e0355613b8cfca9d401a44d9eba7004a175b + a32dde1438404a98ec437e249f43666cd4001170 - + https://github.com/dotnet/aspnetcore - ad46e0355613b8cfca9d401a44d9eba7004a175b + a32dde1438404a98ec437e249f43666cd4001170 - + https://github.com/dotnet/aspnetcore - ad46e0355613b8cfca9d401a44d9eba7004a175b + a32dde1438404a98ec437e249f43666cd4001170 - + https://github.com/dotnet/aspnetcore - ad46e0355613b8cfca9d401a44d9eba7004a175b + a32dde1438404a98ec437e249f43666cd4001170 - + https://github.com/dotnet/aspnetcore - ad46e0355613b8cfca9d401a44d9eba7004a175b + a32dde1438404a98ec437e249f43666cd4001170 https://github.com/dotnet/test-templates @@ -90,32 +90,32 @@ a27234829e6f68613c9f558bc548539a9cc397bb - + https://github.com/dotnet/templating - 41c976b056ee37235f37df41d971e025d6519ec9 + 9b8b780bf233907ae5d38aaf8c8b769782322735 - + https://github.com/dotnet/templating - 41c976b056ee37235f37df41d971e025d6519ec9 + 9b8b780bf233907ae5d38aaf8c8b769782322735 - + https://github.com/dotnet/sdk - cf5593dba1b37e3eb41f44a7cc66ecd841c7f16c + 6b3bcfffc3a6280eec5cc2f84b59891515b3d20c - + https://github.com/dotnet/sdk - cf5593dba1b37e3eb41f44a7cc66ecd841c7f16c + 6b3bcfffc3a6280eec5cc2f84b59891515b3d20c - + https://github.com/dotnet/winforms - 5a5a7c7874d9a707328d4e69a6fffca1998bc1e3 + 36b637614457bf865679cf2f8730fe0676cc91c2 - + https://github.com/dotnet/wpf - 19b4ef3e3621c1d8252e000d920920fdf64cf858 + 095e51221dd8c9d603cff3eebd23252179350ae7 https://github.com/dotnet/fsharp @@ -126,25 +126,25 @@ 6d626ff0752a77d339f609b4d361787dc9ca93a5 - + https://github.com/microsoft/vstest - efb84220a100157d0a9b97ded93af240d1da8936 + 3599fd55bbabfe757db4121b3cd04b8512bd86b7 - + https://github.com/dotnet/linker - 57574f1178ea4489ca207ae8d87197a20b8ae78e + 2914e5a11fa685c2ce90e1ba972c9ac5deea079c linker - + https://github.com/dotnet/roslyn - 6ab6601178d9fba8c680b56934cd1742e0816bff + 1fa6e45dd631b37e7b28a78907240aed8a300d50 - + https://github.com/dotnet/msbuild - 7434b575d12157ef98aeaad3b86c8f235f551c41 + befb72b8adf0a934c94f5cc6be85cf4039f78aea diff --git a/eng/Versions.props b/eng/Versions.props index f9f36e154..b96e8bc9b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,21 +18,27 @@ false release + + + + https://dotnetbuilds.blob.core.windows.net/public/ + https://dotnetclimsrc.blob.core.windows.net/dotnet/ + 7.0.0-beta.21603.6 - 7.0.0-alpha.1.21566.2 + 7.0.0-alpha.1.21580.1 - 7.0.0-alpha.1.21566.6 + 7.0.0-alpha.1.21580.3 - 7.0.100-alpha.1.21568.4 + 7.0.100-alpha.1.21601.1 @@ -45,44 +51,44 @@ - 7.0.0-alpha.1.21568.1 - 7.0.0-alpha.1.21568.1 - 7.0.0-alpha.1.21568.1 - 7.0.0-alpha.1.21568.1 - 7.0.0-alpha.1.21568.1 - 7.0.0-alpha.1.21568.1 + 7.0.0-alpha.1.21601.8 + 7.0.0-alpha.1.21601.8 + 7.0.0-alpha.1.21601.8 + 7.0.0-alpha.1.21601.8 + 7.0.0-alpha.1.21601.8 + 7.0.0-alpha.1.21601.8 0.2.0 - 7.0.100-alpha.1.21568.15 - 7.0.100-alpha.1.21568.15 + 7.0.100-alpha.1.21602.1 + 7.0.100-alpha.1.21602.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0-alpha.1.21567.1 + 7.0.0-alpha.1.21580.11 - 7.0.0-alpha.1.21567.1 - 7.0.0-alpha.1.21567.1 - 7.0.0-alpha.1.21567.1 - 7.0.0-alpha.1.21567.1 - 7.0.0-alpha.1.21567.1 - 7.0.0-alpha.1.21567.1 + 7.0.0-alpha.1.21580.11 + 7.0.0-alpha.1.21580.11 + 7.0.0-alpha.1.21580.11 + 7.0.0-alpha.1.21580.11 + 7.0.0-alpha.1.21580.11 + 7.0.0-alpha.1.21580.11 2.1.0 - 7.0.0-alpha.1.21566.3 - 7.0.0-alpha.1.21566.3 - 7.0.0-alpha.1.21566.3 - 7.0.0-alpha.1.21566.3 + 7.0.0-alpha.1.21580.7 + 7.0.0-alpha.1.21580.7 + 7.0.0-alpha.1.21580.7 + 7.0.0-alpha.1.21580.7 @@ -153,7 +159,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.1.0-preview-20211118-03 + 17.1.0-preview-20211202-01 diff --git a/src/SourceBuild/tarball/patches/format/0001-Fix-MicrosoftExtensionsVersion.patch b/src/SourceBuild/tarball/patches/format/0001-Fix-MicrosoftExtensionsVersion.patch index 7c19d6a40..80fb51c59 100644 --- a/src/SourceBuild/tarball/patches/format/0001-Fix-MicrosoftExtensionsVersion.patch +++ b/src/SourceBuild/tarball/patches/format/0001-Fix-MicrosoftExtensionsVersion.patch @@ -26,7 +26,7 @@ index 6b628c2..9b579ea 100644 - 5.0.0 - 6.0.0-preview.4.221 + 6.0.0-rc.278 @@ -25,9 +24,9 @@ @@ -51,7 +51,7 @@ index b1990aa..f6ddbbd 100644 3.3.2 + 5.0.0 - 4.0.0-6.21515.3 + 4.0.0-6.21526.21 diff --git a/src/Logging/SimpleConsoleLogger.cs b/src/Logging/SimpleConsoleLogger.cs index c361f84..fd8015c 100644 diff --git a/src/SourceBuild/tarball/patches/format/0002-Update-system-command-line-version.patch b/src/SourceBuild/tarball/patches/format/0002-Update-system-command-line-version.patch deleted file mode 100644 index 4d5554a71..000000000 --- a/src/SourceBuild/tarball/patches/format/0002-Update-system-command-line-version.patch +++ /dev/null @@ -1,164 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Michael Simons -Date: Fri, 19 Nov 2021 13:50:52 -0600 -Subject: [PATCH] Update system-command-line version - -Backported with https://github.com/dotnet/format/pull/1436 ---- - eng/Version.Details.xml | 8 ++++---- - eng/Versions.props | 4 ++-- - src/Commands/FormatAnalyzersCommand.cs | 4 ++-- - src/Commands/FormatCommandCommon.cs | 12 ++++++------ - src/Commands/FormatStyleCommand.cs | 4 ++-- - src/Commands/RootFormatCommand.cs | 4 ++-- - 6 files changed, 18 insertions(+), 18 deletions(-) - -diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml -index 48b181b..68c0b43 100644 ---- a/eng/Version.Details.xml -+++ b/eng/Version.Details.xml -@@ -5,13 +5,13 @@ - https://github.com/dotnet/roslyn - 95b7a0198f8c805b367f17e4639020ec21c16705 - -- -+ - https://github.com/dotnet/command-line-api -- 82273cb56c83b589e8e5b63da0ac9745ffc6e105 -+ 09a24a79ef01a0c70655919ee3c59bb54a8574df - -- -+ - https://github.com/dotnet/command-line-api -- 82273cb56c83b589e8e5b63da0ac9745ffc6e105 -+ 09a24a79ef01a0c70655919ee3c59bb54a8574df - - - -diff --git a/eng/Versions.props b/eng/Versions.props -index 2758207..6a02917 100644 ---- a/eng/Versions.props -+++ b/eng/Versions.props -@@ -18,8 +18,8 @@ - - 4.0.0-6.21515.3 - -- 2.0.0-beta1.21473.1 -- 0.3.0-alpha.21473.1 -+ 2.0.0-beta1.21525.1 -+ 0.3.0-alpha.21525.1 - -