From 5e4a6560aa344207403646a59ccfb8f9889c82ea Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 6 Jul 2023 09:53:22 +0000 Subject: [PATCH] [main] Update dependencies from dotnet/sdk (#16864) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 8.0.0-preview.7.23329.3 to 8.0.0-preview.7.23355.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0: from 8.0.0-preview.7.23329.3 to 8.0.0-preview.7.23355.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0: from 8.0.0-preview.7.23329.3 to 8.0.0-preview.7.23355.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.8.0: from 8.0.0-preview.7.23329.8 to 8.0.0-preview.7.23355.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 8.0.0-preview.7.23329.8 to 8.0.0-preview.7.23355.7 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.8.0: from 8.0.0-preview.7.23329.8 to 8.0.0-preview.7.23355.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 8.0.0-preview.7.23329.8 to 8.0.0-preview.7.23355.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 8.0.0-preview.7.23329.8 to 8.0.0-preview.7.23355.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 8.0.0-preview.7.23329.8 to 8.0.0-preview.7.23355.7 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 8.0.0-preview.7.23329.9 to 8.0.0-preview.7.23355.19 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 8.0.0-preview.7.23329.9 to 8.0.0-preview.7.23355.19 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 8.0.0-preview.7.23329.9 to 8.0.0-preview.7.23355.19 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0: from 8.0.0-preview.7.23329.9 to 8.0.0-preview.7.23355.19 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 8.0.0-preview.7.23329.9 to 8.0.0-preview.7.23355.19 (parent: Microsoft.NET.Sdk) - dotnet-user-jwts: from 8.0.0-preview.7.23329.9 to 8.0.0-preview.7.23355.19 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 8.0.0-preview.7.23329.9 to 8.0.0-preview.7.23355.19 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-preview.7.23329.3 to 8.0.0-preview.7.23355.1 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 8.0.0-preview.7.23328.3 to 8.0.0-preview.7.23354.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-preview.7.23329.3 to 8.0.0-preview.7.23355.1 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 8.0.0-preview.7.23329.1 to 8.0.0-preview.7.23354.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.FSharp.Compiler: from 12.8.0-beta.23327.15 to 12.8.0-beta.23354.4 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 8.0.100-beta.23327.15 to 8.0.100-beta.23354.4 (parent: Microsoft.NET.Sdk) - Microsoft.NET.ILLink.Tasks: from 8.0.0-preview.7.23329.8 to 8.0.0-preview.7.23355.7 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.7.0-3.23329.1 to 4.8.0-1.23355.3 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.8.0-preview-23328-02 to 17.8.0-preview-23353-01 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 8.0.0-preview.7.23329.8 to 8.0.0-preview.7.23355.7 (parent: Microsoft.NET.Sdk) - System.CommandLine: from 2.0.0-beta4.22564.1 to 2.0.0-beta4.23307.1 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.command-line-api: from 0.1.356401 to 0.1.430701 (parent: Microsoft.NET.Sdk) - Merge branch 'main' of https://github.com/dotnet/installer into darc-main-c9de4a14-3172-41f6-9336-1865d7edc45d - Remove backported msbuild source-build patch - Remove backported command-line-api source-build patches - Merge branch 'main' into darc-main-c9de4a14-3172-41f6-9336-1865d7edc45d --- eng/Version.Details.xml | 124 +++++++++--------- eng/Versions.props | 48 +++---- ...mandLine.NamingConventionBinder-duri.patch | 23 ---- ...-TFM-when-building-with-source-build.patch | 68 ---------- ...y-cast-default-for-Task.Delay-method.patch | 23 ---- ...tch-for-MSBuild-to-fix-Mono-scenario.patch | 39 ------ 6 files changed, 86 insertions(+), 239 deletions(-) delete mode 100644 src/SourceBuild/patches/command-line-api/0001-Build-System.CommandLine.NamingConventionBinder-duri.patch delete mode 100644 src/SourceBuild/patches/command-line-api/0002-Use-net8.0-TFM-when-building-with-source-build.patch delete mode 100644 src/SourceBuild/patches/command-line-api/0003-Explicitly-cast-default-for-Task.Delay-method.patch delete mode 100644 src/SourceBuild/patches/msbuild/0001-Add-patch-for-MSBuild-to-fix-Mono-scenario.patch diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a9eb784a4..66a3ea9ff 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://github.com/dotnet/windowsdesktop - 458f9396f7e6305feab20f5d04b068267f982841 + a29858d328ce94c56778494d331b8f27a7290cef - + https://github.com/dotnet/windowsdesktop - 458f9396f7e6305feab20f5d04b068267f982841 + a29858d328ce94c56778494d331b8f27a7290cef - + https://github.com/dotnet/windowsdesktop - 458f9396f7e6305feab20f5d04b068267f982841 + a29858d328ce94c56778494d331b8f27a7290cef - + https://github.com/dotnet/windowsdesktop - 458f9396f7e6305feab20f5d04b068267f982841 + a29858d328ce94c56778494d331b8f27a7290cef - + https://github.com/dotnet/runtime - 3e87528325b09f884b0a09a8c4ef79393abfd0db + f1d2be8f443a599a142506d622a35e1c2e683961 - + https://github.com/dotnet/runtime - 3e87528325b09f884b0a09a8c4ef79393abfd0db + f1d2be8f443a599a142506d622a35e1c2e683961 - + https://github.com/dotnet/runtime - 3e87528325b09f884b0a09a8c4ef79393abfd0db + f1d2be8f443a599a142506d622a35e1c2e683961 - + https://github.com/dotnet/runtime - 3e87528325b09f884b0a09a8c4ef79393abfd0db + f1d2be8f443a599a142506d622a35e1c2e683961 - + https://github.com/dotnet/runtime - 3e87528325b09f884b0a09a8c4ef79393abfd0db + f1d2be8f443a599a142506d622a35e1c2e683961 - + https://github.com/dotnet/runtime - 3e87528325b09f884b0a09a8c4ef79393abfd0db + f1d2be8f443a599a142506d622a35e1c2e683961 @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 3e87528325b09f884b0a09a8c4ef79393abfd0db + f1d2be8f443a599a142506d622a35e1c2e683961 - + https://github.com/dotnet/aspnetcore - d07f4d43aa93d91dd2db65daaffbf37ce0012841 + 82e1738c4525bb74d11dbbe856a771b52b951ef6 - + https://github.com/dotnet/aspnetcore - d07f4d43aa93d91dd2db65daaffbf37ce0012841 + 82e1738c4525bb74d11dbbe856a771b52b951ef6 - + https://github.com/dotnet/aspnetcore - d07f4d43aa93d91dd2db65daaffbf37ce0012841 + 82e1738c4525bb74d11dbbe856a771b52b951ef6 - + https://github.com/dotnet/aspnetcore - d07f4d43aa93d91dd2db65daaffbf37ce0012841 + 82e1738c4525bb74d11dbbe856a771b52b951ef6 - + https://github.com/dotnet/aspnetcore - d07f4d43aa93d91dd2db65daaffbf37ce0012841 + 82e1738c4525bb74d11dbbe856a771b52b951ef6 - + https://github.com/dotnet/aspnetcore - d07f4d43aa93d91dd2db65daaffbf37ce0012841 + 82e1738c4525bb74d11dbbe856a771b52b951ef6 - + https://github.com/dotnet/aspnetcore - d07f4d43aa93d91dd2db65daaffbf37ce0012841 + 82e1738c4525bb74d11dbbe856a771b52b951ef6 https://github.com/dotnet/test-templates @@ -102,39 +102,39 @@ https://github.com/dotnet/test-templates 86fd4cd1c57057f920678e29d6ecbba491abd142 - + https://github.com/dotnet/sdk - c24068d23c636b121e1680f88bd773fc72109891 + 51762f9cd60ecc346dc6a13dcbb5f88fec1750d8 - + https://github.com/dotnet/sdk - c24068d23c636b121e1680f88bd773fc72109891 + 51762f9cd60ecc346dc6a13dcbb5f88fec1750d8 - + https://github.com/dotnet/sdk - c24068d23c636b121e1680f88bd773fc72109891 + 51762f9cd60ecc346dc6a13dcbb5f88fec1750d8 - + https://github.com/dotnet/sdk - c24068d23c636b121e1680f88bd773fc72109891 + 51762f9cd60ecc346dc6a13dcbb5f88fec1750d8 - + https://github.com/dotnet/winforms - 23e83c29f422e4ab823ac535f4a4f63745de3d05 + 918e34631094c184e6b29d659842b540f092ed98 - + https://github.com/dotnet/wpf - d8e3ae2342d9f51e4d904b78ca3ef7fe6d494dac + fa5c1d4a57fbc973453a4e24932277615199788e - + https://github.com/dotnet/fsharp - 9bf50f790ca3135b4428d464cc735ff4e8ff1bd5 + 4885abbdf7595c1b8475ea868964d4ce43284b9e - + https://github.com/dotnet/fsharp - 9bf50f790ca3135b4428d464cc735ff4e8ff1bd5 + 4885abbdf7595c1b8475ea868964d4ce43284b9e @@ -142,18 +142,18 @@ 919ec8358820228cc5fa77ef000051c1d6875399 - + https://github.com/dotnet/runtime - 3e87528325b09f884b0a09a8c4ef79393abfd0db + f1d2be8f443a599a142506d622a35e1c2e683961 - + https://github.com/dotnet/roslyn - b2bd4936daed91d4efd10c71177f7766823e615c + c022624fcdbfe5a5130e8dc5eec24a2a22f395b1 - + https://github.com/dotnet/msbuild - 0cad196bd27a639e701af16d435e0be64bb852f6 + 946c584115367635c37ac7ecaadb2f36542f88b0 @@ -191,13 +191,13 @@ 2c8079e2e8e78c0cd11ac75a32014756136ecdb9 - + https://github.com/dotnet/command-line-api - 8374d5fca634a93458c84414b1604c12f765d1ab + 02fe27cd6a9b001c8feb7938e6ef4b3799745759 - + https://github.com/dotnet/command-line-api - 8374d5fca634a93458c84414b1604c12f765d1ab + 02fe27cd6a9b001c8feb7938e6ef4b3799745759 diff --git a/eng/Versions.props b/eng/Versions.props index 4bbc4183b..faf041034 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,11 +44,11 @@ - 8.0.0-preview.7.23328.3 + 8.0.0-preview.7.23354.1 - 8.0.0-preview.7.23329.1 + 8.0.0-preview.7.23354.2 @@ -68,50 +68,50 @@ - 8.0.0-preview.7.23329.9 - 8.0.0-preview.7.23329.9 - 8.0.0-preview.7.23329.9 - 8.0.0-preview.7.23329.9 - 8.0.0-preview.7.23329.9 - 8.0.0-preview.7.23329.9 - 8.0.0-preview.7.23329.9 + 8.0.0-preview.7.23355.19 + 8.0.0-preview.7.23355.19 + 8.0.0-preview.7.23355.19 + 8.0.0-preview.7.23355.19 + 8.0.0-preview.7.23355.19 + 8.0.0-preview.7.23355.19 + 8.0.0-preview.7.23355.19 0.2.0 - 8.0.100-preview.7.23330.1 - 8.0.100-preview.7.23330.1 - 8.0.100-preview.7.23330.1 + 8.0.100-preview.7.23356.4 + 8.0.100-preview.7.23356.4 + 8.0.100-preview.7.23356.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.7.0-3.23329.1 + 4.8.0-1.23355.3 - 8.0.0-preview.7.23329.8 + 8.0.0-preview.7.23355.7 - 8.0.0-preview.7.23329.8 - 8.0.0-preview.7.23329.8 - 8.0.0-preview.7.23329.8 - 8.0.0-preview.7.23329.8 - 8.0.0-preview.7.23329.8 - 8.0.0-preview.7.23329.8 + 8.0.0-preview.7.23355.7 + 8.0.0-preview.7.23355.7 + 8.0.0-preview.7.23355.7 + 8.0.0-preview.7.23355.7 + 8.0.0-preview.7.23355.7 + 8.0.0-preview.7.23355.7 2.1.0 - 8.0.0-preview.7.23329.3 - 8.0.0-preview.7.23329.3 - 8.0.0-preview.7.23329.3 - 8.0.0-preview.7.23329.3 + 8.0.0-preview.7.23355.1 + 8.0.0-preview.7.23355.1 + 8.0.0-preview.7.23355.1 + 8.0.0-preview.7.23355.1 diff --git a/src/SourceBuild/patches/command-line-api/0001-Build-System.CommandLine.NamingConventionBinder-duri.patch b/src/SourceBuild/patches/command-line-api/0001-Build-System.CommandLine.NamingConventionBinder-duri.patch deleted file mode 100644 index 4b0a5f82f..000000000 --- a/src/SourceBuild/patches/command-line-api/0001-Build-System.CommandLine.NamingConventionBinder-duri.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Michael Simons -Date: Wed, 18 Jan 2023 22:23:40 +0000 -Subject: [PATCH] Build System.CommandLine.NamingConventionBinder during - source-build - -Backport: https://github.com/dotnet/command-line-api/pull/2026 ---- - sourcebuild.slnf | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/sourcebuild.slnf b/sourcebuild.slnf -index dd18805b..dc155a4d 100644 ---- a/sourcebuild.slnf -+++ b/sourcebuild.slnf -@@ -4,6 +4,7 @@ - "projects": [ - "src\\System.CommandLine\\System.CommandLine.csproj", - "src\\System.CommandLine.DragonFruit\\System.CommandLine.DragonFruit.csproj", -+ "src\\System.CommandLine.NamingConventionBinder\\System.CommandLine.NamingConventionBinder.csproj", - "src\\System.CommandLine.Rendering\\System.CommandLine.Rendering.csproj" - ] - } diff --git a/src/SourceBuild/patches/command-line-api/0002-Use-net8.0-TFM-when-building-with-source-build.patch b/src/SourceBuild/patches/command-line-api/0002-Use-net8.0-TFM-when-building-with-source-build.patch deleted file mode 100644 index 78fa7b0cc..000000000 --- a/src/SourceBuild/patches/command-line-api/0002-Use-net8.0-TFM-when-building-with-source-build.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Matt Thalman -Date: Thu, 6 Apr 2023 09:16:13 -0500 -Subject: [PATCH] Use net8.0 TFM when building with source-build - -Backport: https://github.com/dotnet/command-line-api/pull/2150 ---- - Directory.Build.props | 6 +++--- - .../System.CommandLine.Benchmarks.csproj | 4 ++-- - src/System.CommandLine/System.CommandLine.csproj | 4 ++-- - 3 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/Directory.Build.props b/Directory.Build.props -index 4c1f04a2..0444426a 100644 ---- a/Directory.Build.props -+++ b/Directory.Build.props -@@ -11,11 +11,11 @@ - 10.0 - - -- -- net7.0 -+ -+ $(NetCurrent) - - -- -+ - net7.0 - - -diff --git a/src/System.CommandLine.Benchmarks/System.CommandLine.Benchmarks.csproj b/src/System.CommandLine.Benchmarks/System.CommandLine.Benchmarks.csproj -index b63e109c..3ef1afa1 100644 ---- a/src/System.CommandLine.Benchmarks/System.CommandLine.Benchmarks.csproj -+++ b/src/System.CommandLine.Benchmarks/System.CommandLine.Benchmarks.csproj -@@ -9,8 +9,8 @@ - false - - -- net7.0 -- net7.0 -+ $(TargetFrameworkForNETSDK) -+ $(TargetFrameworkForNETSDK) - - - False -diff --git a/src/System.CommandLine/System.CommandLine.csproj b/src/System.CommandLine/System.CommandLine.csproj -index 05d28476..37115d70 100644 ---- a/src/System.CommandLine/System.CommandLine.csproj -+++ b/src/System.CommandLine/System.CommandLine.csproj -@@ -3,7 +3,7 @@ - - true - System.CommandLine -- net7.0;netstandard2.0 -+ $(TargetFrameworkForNETSDK);netstandard2.0 - enable - true - 10 -@@ -18,7 +18,7 @@ - true - - -- -+ - true - true - diff --git a/src/SourceBuild/patches/command-line-api/0003-Explicitly-cast-default-for-Task.Delay-method.patch b/src/SourceBuild/patches/command-line-api/0003-Explicitly-cast-default-for-Task.Delay-method.patch deleted file mode 100644 index f71f4b885..000000000 --- a/src/SourceBuild/patches/command-line-api/0003-Explicitly-cast-default-for-Task.Delay-method.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Matt Thalman -Date: Mon, 17 Apr 2023 12:26:51 -0500 -Subject: [PATCH] Explicitly cast default for Task.Delay method - -Backport: Not needed since this code is removed in latest version of command-line-api ---- - src/System.CommandLine/Builder/CommandLineBuilderExtensions.cs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/System.CommandLine/Builder/CommandLineBuilderExtensions.cs b/src/System.CommandLine/Builder/CommandLineBuilderExtensions.cs -index 0fb30887..cd59971d 100644 ---- a/src/System.CommandLine/Builder/CommandLineBuilderExtensions.cs -+++ b/src/System.CommandLine/Builder/CommandLineBuilderExtensions.cs -@@ -107,7 +107,7 @@ namespace System.CommandLine - if (timeout! > TimeSpan.Zero) - { - Task -- .Delay(timeout.Value, default) -+ .Delay(timeout.Value, (CancellationToken)default) - .ContinueWith(t => - { - // Prevent our ProcessExit from intervene and block the exit diff --git a/src/SourceBuild/patches/msbuild/0001-Add-patch-for-MSBuild-to-fix-Mono-scenario.patch b/src/SourceBuild/patches/msbuild/0001-Add-patch-for-MSBuild-to-fix-Mono-scenario.patch deleted file mode 100644 index a600008e1..000000000 --- a/src/SourceBuild/patches/msbuild/0001-Add-patch-for-MSBuild-to-fix-Mono-scenario.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Matt Thalman -Date: Thu, 22 Jun 2023 09:28:28 -0500 -Subject: [PATCH] Add patch for MSBuild to fix Mono scenario - -Backport: https://github.com/dotnet/msbuild/pull/8940 ---- - eng/Version.Details.xml | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml -index 724c5623a..f4d1fb921 100644 ---- a/eng/Version.Details.xml -+++ b/eng/Version.Details.xml -@@ -6,12 +6,24 @@ - 525b6c35cc5c5c9b80b47044be2e4e77858d505a - - -+ -+ https://github.com/dotnet/runtime -+ d099f075e45d2aa6007a22b71b45a08758559f80 -+ - - - https://github.com/dotnet/runtime - d099f075e45d2aa6007a22b71b45a08758559f80 - -+ -+ https://github.com/dotnet/runtime -+ d099f075e45d2aa6007a22b71b45a08758559f80 -+ -+ -+ https://github.com/dotnet/runtime -+ d099f075e45d2aa6007a22b71b45a08758559f80 -+ - - https://github.com/dotnet/runtime - d099f075e45d2aa6007a22b71b45a08758559f80