From 604cf8d10b93fb01ef258c4e7032d872211827c0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 24 Nov 2023 16:21:53 +0000 Subject: [PATCH] [main] Update dependencies from dotnet/sdk (#17857) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 9.0.0-alpha.1.23571.4 to 9.0.0-alpha.1.23573.4 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0: from 9.0.0-alpha.1.23571.4 to 9.0.0-alpha.1.23573.4 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0: from 9.0.0-alpha.1.23571.4 to 9.0.0-alpha.1.23573.4 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-alpha.1.23571.32 to 9.0.0-alpha.1.23573.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 9.0.0-alpha.1.23571.32 to 9.0.0-alpha.1.23573.4 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.9.0: from 9.0.0-alpha.1.23571.32 to 9.0.0-alpha.1.23573.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 9.0.0-alpha.1.23571.32 to 9.0.0-alpha.1.23573.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 9.0.0-alpha.1.23571.32 to 9.0.0-alpha.1.23573.4 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 9.0.0-alpha.1.23571.20 to 9.0.0-alpha.1.23573.10 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 9.0.0-alpha.1.23571.20 to 9.0.0-alpha.1.23573.10 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 9.0.0-alpha.1.23571.20 to 9.0.0-alpha.1.23573.10 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0: from 9.0.0-alpha.1.23571.20 to 9.0.0-alpha.1.23573.10 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 9.0.0-alpha.1.23571.20 to 9.0.0-alpha.1.23573.10 (parent: Microsoft.NET.Sdk) - dotnet-user-jwts: from 9.0.0-alpha.1.23571.20 to 9.0.0-alpha.1.23573.10 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 9.0.0-alpha.1.23571.20 to 9.0.0-alpha.1.23573.10 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 9.0.0-alpha.1.23571.4 to 9.0.0-alpha.1.23573.4 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 9.0.0-alpha.1.23570.20 to 9.0.0-alpha.1.23572.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 9.0.0-alpha.1.23571.4 to 9.0.0-alpha.1.23573.4 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 9.0.0-alpha.1.23571.4 to 9.0.0-alpha.1.23572.17 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.NET.ILLink.Tasks: from 9.0.0-alpha.1.23571.32 to 9.0.0-alpha.1.23573.4 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.9.0-preview-23571-01 to 17.9.0-preview-23572-01 (parent: Microsoft.NET.Sdk) - NuGet.Build.Tasks: from 6.9.0-preview.1.40 to 6.9.0-preview.1.45 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-alpha.1.23571.32 to 9.0.0-alpha.1.23573.4 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport: from 9.0.0-alpha.1.23566.3 to 9.0.0-alpha.1.23570.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.CommandLine: from 2.0.0-beta4.23307.1 to 2.0.0-beta4.23407.1 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.command-line-api: from 0.1.430701 to 0.1.440701 (parent: Microsoft.NET.Sdk) - Remove nuget-client patch --- eng/Version.Details.xml | 116 +++++++++--------- eng/Versions.props | 48 ++++---- .../nuget-client/0001-Target-net9.0.patch | 65 ---------- 3 files changed, 82 insertions(+), 147 deletions(-) delete mode 100644 src/SourceBuild/patches/nuget-client/0001-Target-net9.0.patch diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ef7aae11c..b3ac072a6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,42 +5,42 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://github.com/dotnet/windowsdesktop - 225340c04ed20edacf30120eca0a543be30e685f + 35ba819cbb17dd921425826e4510fe16a732ccd9 - + https://github.com/dotnet/windowsdesktop - 225340c04ed20edacf30120eca0a543be30e685f + 35ba819cbb17dd921425826e4510fe16a732ccd9 - + https://github.com/dotnet/windowsdesktop - 225340c04ed20edacf30120eca0a543be30e685f + 35ba819cbb17dd921425826e4510fe16a732ccd9 - + https://github.com/dotnet/windowsdesktop - 225340c04ed20edacf30120eca0a543be30e685f + 35ba819cbb17dd921425826e4510fe16a732ccd9 - + https://github.com/dotnet/runtime - 91f8ffa67c413bfa8c28712f62e62e93988a0224 + cc4db9bd71f2dfcc29dc71385cd96916253c8850 - + https://github.com/dotnet/runtime - 91f8ffa67c413bfa8c28712f62e62e93988a0224 + cc4db9bd71f2dfcc29dc71385cd96916253c8850 - + https://github.com/dotnet/runtime - 91f8ffa67c413bfa8c28712f62e62e93988a0224 + cc4db9bd71f2dfcc29dc71385cd96916253c8850 - + https://github.com/dotnet/runtime - 91f8ffa67c413bfa8c28712f62e62e93988a0224 + cc4db9bd71f2dfcc29dc71385cd96916253c8850 - + https://github.com/dotnet/runtime - 91f8ffa67c413bfa8c28712f62e62e93988a0224 + cc4db9bd71f2dfcc29dc71385cd96916253c8850 @@ -48,55 +48,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 91f8ffa67c413bfa8c28712f62e62e93988a0224 + cc4db9bd71f2dfcc29dc71385cd96916253c8850 - + https://github.com/dotnet/aspnetcore - c187bb1dc18de5b5b0afcfef0c7c14dd67415c61 + 4dc81f80abd45cb5c2e04d3b742bc6755c1153ee - + https://github.com/dotnet/aspnetcore - c187bb1dc18de5b5b0afcfef0c7c14dd67415c61 + 4dc81f80abd45cb5c2e04d3b742bc6755c1153ee - + https://github.com/dotnet/aspnetcore - c187bb1dc18de5b5b0afcfef0c7c14dd67415c61 + 4dc81f80abd45cb5c2e04d3b742bc6755c1153ee - + https://github.com/dotnet/aspnetcore - c187bb1dc18de5b5b0afcfef0c7c14dd67415c61 + 4dc81f80abd45cb5c2e04d3b742bc6755c1153ee - + https://github.com/dotnet/aspnetcore - c187bb1dc18de5b5b0afcfef0c7c14dd67415c61 + 4dc81f80abd45cb5c2e04d3b742bc6755c1153ee - + https://github.com/dotnet/aspnetcore - c187bb1dc18de5b5b0afcfef0c7c14dd67415c61 + 4dc81f80abd45cb5c2e04d3b742bc6755c1153ee - + https://github.com/dotnet/aspnetcore - c187bb1dc18de5b5b0afcfef0c7c14dd67415c61 + 4dc81f80abd45cb5c2e04d3b742bc6755c1153ee - + https://github.com/dotnet/sdk - 94afb2b0c9bcb252f99852f7aab7c9ca6640aee0 + e80b07ab62f322e8adef5d32bae2026a2a2bd813 - + https://github.com/dotnet/sdk - 94afb2b0c9bcb252f99852f7aab7c9ca6640aee0 + e80b07ab62f322e8adef5d32bae2026a2a2bd813 - + https://github.com/dotnet/sdk - 94afb2b0c9bcb252f99852f7aab7c9ca6640aee0 + e80b07ab62f322e8adef5d32bae2026a2a2bd813 - + https://github.com/dotnet/sdk - 94afb2b0c9bcb252f99852f7aab7c9ca6640aee0 + e80b07ab62f322e8adef5d32bae2026a2a2bd813 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ e1aecaf3a332e25fae8cc7aa09d524b5e7c4a47a - + https://github.com/dotnet/winforms - 95b826949274e1cc193b16ef8f31fdb3d5ed23f9 + d20f9c71a189693c6c3475253397665bce0a1354 - + https://github.com/dotnet/wpf - cc9f8e3a5e3a22500c64556f1266a39478a490b8 + 4120cfc5d2a6515c1dceac5b509b92aa7ea80f97 https://github.com/dotnet/fsharp @@ -146,32 +146,32 @@ a561f75d35235af57987c06742f6de34e13a5635 - + https://github.com/dotnet/runtime - 91f8ffa67c413bfa8c28712f62e62e93988a0224 + cc4db9bd71f2dfcc29dc71385cd96916253c8850 https://github.com/dotnet/roslyn 1f802118804658a38c932c885bfc82a9d0f38e86 - + https://github.com/dotnet/msbuild - 38bd5f4b15da70fce0491881c3f0818833f36261 + f4b2350acc97e8e29e0d8498a082b9f91115f0b6 - + https://github.com/nuget/nuget.client - c22b9f4af1a7371e1a6b4eb82d924d028171aee1 + 707c46e558b2b027d7ae942028c369e26545f10a https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 9675e6186a4e5039032ed68e14d5d2c66b17698b + 1dc82a6f4306a95cff46a3242354cc7963b7cec8 @@ -195,13 +195,13 @@ 2c8079e2e8e78c0cd11ac75a32014756136ecdb9 - + https://github.com/dotnet/command-line-api - 02fe27cd6a9b001c8feb7938e6ef4b3799745759 + a045dd54a4c44723c215d992288160eb1401bb7f - + https://github.com/dotnet/command-line-api - 02fe27cd6a9b001c8feb7938e6ef4b3799745759 + a045dd54a4c44723c215d992288160eb1401bb7f diff --git a/eng/Versions.props b/eng/Versions.props index 1669060be..903c9f77d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 9.0.0-alpha.1.23570.20 + 9.0.0-alpha.1.23572.4 - 9.0.0-alpha.1.23571.4 + 9.0.0-alpha.1.23572.17 @@ -73,22 +73,22 @@ - 9.0.0-alpha.1.23571.20 - 9.0.0-alpha.1.23571.20 - 9.0.0-alpha.1.23571.20 - 9.0.0-alpha.1.23571.20 - 9.0.0-alpha.1.23571.20 - 9.0.0-alpha.1.23571.20 - 9.0.0-alpha.1.23571.20 + 9.0.0-alpha.1.23573.10 + 9.0.0-alpha.1.23573.10 + 9.0.0-alpha.1.23573.10 + 9.0.0-alpha.1.23573.10 + 9.0.0-alpha.1.23573.10 + 9.0.0-alpha.1.23573.10 + 9.0.0-alpha.1.23573.10 0.2.0 - 9.0.100-alpha.1.23572.2 - 9.0.100-alpha.1.23572.2 - 9.0.100-alpha.1.23572.2 + 9.0.100-alpha.1.23573.39 + 9.0.100-alpha.1.23573.39 + 9.0.100-alpha.1.23573.39 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -99,24 +99,24 @@ - 9.0.0-alpha.1.23571.32 + 9.0.0-alpha.1.23573.4 - 9.0.0-alpha.1.23571.32 - 9.0.0-alpha.1.23571.32 - 9.0.0-alpha.1.23571.32 - 9.0.0-alpha.1.23571.32 - 9.0.0-alpha.1.23571.32 + 9.0.0-alpha.1.23573.4 + 9.0.0-alpha.1.23573.4 + 9.0.0-alpha.1.23573.4 + 9.0.0-alpha.1.23573.4 + 9.0.0-alpha.1.23573.4 8.0.0-rc.1.23414.4 2.1.0 - 9.0.0-alpha.1.23571.4 - 9.0.0-alpha.1.23571.4 - 9.0.0-alpha.1.23571.4 - 9.0.0-alpha.1.23571.4 + 9.0.0-alpha.1.23573.4 + 9.0.0-alpha.1.23573.4 + 9.0.0-alpha.1.23573.4 + 9.0.0-alpha.1.23573.4 @@ -128,7 +128,7 @@ - 6.9.0-preview.1.40 + 6.9.0-preview.1.45 @@ -260,7 +260,7 @@ 13.3.8825-net8-rc1 16.4.8825-net8-rc1 - 9.0.0-alpha.1.23566.3 + 9.0.0-alpha.1.23570.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion) 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) diff --git a/src/SourceBuild/patches/nuget-client/0001-Target-net9.0.patch b/src/SourceBuild/patches/nuget-client/0001-Target-net9.0.patch deleted file mode 100644 index f3707da91..000000000 --- a/src/SourceBuild/patches/nuget-client/0001-Target-net9.0.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Matt Thalman -Date: Thu, 16 Nov 2023 14:56:46 -0600 -Subject: [PATCH] Target net9.0 - -Backport: https://github.com/NuGet/Home/issues/13018 ---- - build/common.project.props | 2 +- - build/common.targets | 2 +- - src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj | 2 +- - .../NuGet.PackageManagement/NuGet.PackageManagement.csproj | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/build/common.project.props b/build/common.project.props -index 17f9811a1..34069f5d6 100644 ---- a/build/common.project.props -+++ b/build/common.project.props -@@ -12,7 +12,7 @@ - v4.7.2 - net472 - netcoreapp3.1 -- net8.0 -+ net9.0 - net8.0 - netstandard2.0 - $(NETFXTargetFramework);$(NETCoreTargetFramework) -diff --git a/build/common.targets b/build/common.targets -index 08974ae7a..f07f90832 100644 ---- a/build/common.targets -+++ b/build/common.targets -@@ -6,7 +6,7 @@ - true - - -- -+ - $(DefineConstants);IS_CORECLR - true - -diff --git a/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj b/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj -index eea152eb6..74dd4905a 100644 ---- a/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj -+++ b/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj -@@ -26,7 +26,7 @@ - - - -- -+ - - - -diff --git a/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj b/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj -index 38658b221..740dd2bf7 100644 ---- a/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj -+++ b/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj -@@ -32,7 +32,7 @@ - - - -- -+ - - -