From e9e0a769c7d294e0fd16db95cadbf80d11c7f4c8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 13 Dec 2022 18:00:50 +0000 Subject: [PATCH] [main] Update dependencies from dotnet/sdk (#15118) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 8.0.0-alpha.1.22607.2 to 8.0.0-alpha.1.22609.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0: from 8.0.0-alpha.1.22607.2 to 8.0.0-alpha.1.22609.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0: from 8.0.0-alpha.1.22607.2 to 8.0.0-alpha.1.22609.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 8.0.0-alpha.1.22608.6 to 8.0.0-alpha.1.22612.9 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 8.0.0-alpha.1.22608.6 to 8.0.0-alpha.1.22612.9 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 8.0.0-alpha.1.22608.6 to 8.0.0-alpha.1.22612.9 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0: from 8.0.0-alpha.1.22608.6 to 8.0.0-alpha.1.22612.9 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 8.0.0-alpha.1.22608.6 to 8.0.0-alpha.1.22612.9 (parent: Microsoft.NET.Sdk) - dotnet-user-jwts: from 8.0.0-alpha.1.22608.6 to 8.0.0-alpha.1.22612.9 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 8.0.0-alpha.1.22608.6 to 8.0.0-alpha.1.22612.9 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-alpha.1.22607.2 to 8.0.0-alpha.1.22609.1 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-alpha.1.22607.2 to 8.0.0-alpha.1.22609.1 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Test.Sdk: from 17.5.0-preview-20221209-01 to 17.5.0-preview-20221209-03 (parent: Microsoft.NET.Sdk) - Microsoft.NET.ILLink.Tasks: from 8.0.100-1.22609.1 to 8.0.100-1.22612.1 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.5.0-preview-22608-02 to 17.5.0-preview-22612-01 (parent: Microsoft.NET.Sdk) - NuGet.Build.Tasks: from 6.5.0-preview.2.108 to 6.5.0-preview.3.126 (parent: Microsoft.NET.Sdk) - Merge branch 'main' of https://github.com/dotnet/installer into darc-main-f64e2f71-8a38-4252-ad60-74b7e6f08ef1 - Resolve source-build patch conflicts - --amend - --amend --- eng/Version.Details.xml | 76 +++++++++---------- eng/Versions.props | 30 ++++---- ...solvePackageFileConflicts-workaround.patch | 23 ------ .../0003-Address-obsolete-errors.patch | 24 ------ ...ess-Microsoft.Build.Locator-prebuilt.patch | 36 --------- ...-version-properties-for-source-build.patch | 47 ------------ ...geVersion-props-to-address-prebuilts.patch | 34 +++++++++ 7 files changed, 87 insertions(+), 183 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/aspnetcore/0001-ResolvePackageFileConflicts-workaround.patch delete mode 100644 src/SourceBuild/tarball/patches/aspnetcore/0003-Address-obsolete-errors.patch delete mode 100644 src/SourceBuild/tarball/patches/format/0001-Address-Microsoft.Build.Locator-prebuilt.patch delete mode 100644 src/SourceBuild/tarball/patches/nuget-client/0001-Add-package-version-properties-for-source-build.patch create mode 100644 src/SourceBuild/tarball/patches/nuget-client/0001-Define-PackageVersion-props-to-address-prebuilts.patch diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9f7152688..ef58fd01b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/windowsdesktop - 953e10da1e672367e370ec1ba6fadd8f2e889b48 + 93219e89112a3d3203879355463b9d5b9d7ef4ba - + https://github.com/dotnet/windowsdesktop - 953e10da1e672367e370ec1ba6fadd8f2e889b48 + 93219e89112a3d3203879355463b9d5b9d7ef4ba - + https://github.com/dotnet/windowsdesktop - 953e10da1e672367e370ec1ba6fadd8f2e889b48 + 93219e89112a3d3203879355463b9d5b9d7ef4ba - + https://github.com/dotnet/windowsdesktop - 953e10da1e672367e370ec1ba6fadd8f2e889b48 + 93219e89112a3d3203879355463b9d5b9d7ef4ba https://github.com/dotnet/runtime @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime 1a37caf773a3b857ccff49a31be3333d4fdc491f - + https://github.com/dotnet/aspnetcore - f543e3552514c5c420eeddd55c505bbc131f10a6 + 6956f42a0a01ed4fb8fc2cb889c2535f8fe5f735 - + https://github.com/dotnet/aspnetcore - f543e3552514c5c420eeddd55c505bbc131f10a6 + 6956f42a0a01ed4fb8fc2cb889c2535f8fe5f735 - + https://github.com/dotnet/aspnetcore - f543e3552514c5c420eeddd55c505bbc131f10a6 + 6956f42a0a01ed4fb8fc2cb889c2535f8fe5f735 - + https://github.com/dotnet/aspnetcore - f543e3552514c5c420eeddd55c505bbc131f10a6 + 6956f42a0a01ed4fb8fc2cb889c2535f8fe5f735 - + https://github.com/dotnet/aspnetcore - f543e3552514c5c420eeddd55c505bbc131f10a6 + 6956f42a0a01ed4fb8fc2cb889c2535f8fe5f735 - + https://github.com/dotnet/aspnetcore - f543e3552514c5c420eeddd55c505bbc131f10a6 + 6956f42a0a01ed4fb8fc2cb889c2535f8fe5f735 - + https://github.com/dotnet/aspnetcore - f543e3552514c5c420eeddd55c505bbc131f10a6 + 6956f42a0a01ed4fb8fc2cb889c2535f8fe5f735 https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - e5479573ba46cc6d85059cee3632195e49e75e6d + dffe3a864e40b271bb20e316a5bc96eb0eac3c55 - + https://github.com/dotnet/sdk - e5479573ba46cc6d85059cee3632195e49e75e6d + dffe3a864e40b271bb20e316a5bc96eb0eac3c55 - + https://github.com/dotnet/sdk - e5479573ba46cc6d85059cee3632195e49e75e6d + dffe3a864e40b271bb20e316a5bc96eb0eac3c55 - + https://github.com/dotnet/sdk - e5479573ba46cc6d85059cee3632195e49e75e6d + dffe3a864e40b271bb20e316a5bc96eb0eac3c55 @@ -137,14 +137,14 @@ ae1718567f2aab20df7ca07368b9f51d1c376a10 - + https://github.com/microsoft/vstest - 8da5d535932a4143bbd8594c8a66cca686db9bfc + bedc83105652ba5638dfc1ec629f3402af65acd0 - + https://github.com/dotnet/linker - 27ce03227f4822aaff660ec9bac6fe6c20d001d2 + dde6d62e9e80cde5e2dd8a2ce613384ff41d4a08 linker @@ -153,14 +153,14 @@ 716366a3830293571eaaad9b1b2b3929b5216f42 - + https://github.com/dotnet/msbuild - c81f58b45b97d3d0e547f48719322d55f00b5aa4 + 9c3057b5af56ef92ffde7d1b37dea8ddee74d8b1 - + https://github.com/nuget/nuget.client - be87c9ee11149780ce7de5fe35fe2653d565ccfd + 31f2a1cb6fe3dababe67cdb84e9d6ddb9e3ace04 diff --git a/eng/Versions.props b/eng/Versions.props index ffdc48d6f..aa3ffbe10 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,22 +58,22 @@ - 8.0.0-alpha.1.22608.6 - 8.0.0-alpha.1.22608.6 - 8.0.0-alpha.1.22608.6 - 8.0.0-alpha.1.22608.6 - 8.0.0-alpha.1.22608.6 - 8.0.0-alpha.1.22608.6 - 8.0.0-alpha.1.22608.6 + 8.0.0-alpha.1.22612.9 + 8.0.0-alpha.1.22612.9 + 8.0.0-alpha.1.22612.9 + 8.0.0-alpha.1.22612.9 + 8.0.0-alpha.1.22612.9 + 8.0.0-alpha.1.22612.9 + 8.0.0-alpha.1.22612.9 0.2.0 - 8.0.100-alpha.1.22610.2 - 8.0.100-alpha.1.22610.2 - 8.0.100-alpha.1.22610.2 + 8.0.100-alpha.1.22612.6 + 8.0.100-alpha.1.22612.6 + 8.0.100-alpha.1.22612.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -94,10 +94,10 @@ - 8.0.0-alpha.1.22607.2 - 8.0.0-alpha.1.22607.2 - 8.0.0-alpha.1.22607.2 - 8.0.0-alpha.1.22607.2 + 8.0.0-alpha.1.22609.1 + 8.0.0-alpha.1.22609.1 + 8.0.0-alpha.1.22609.1 + 8.0.0-alpha.1.22609.1 @@ -187,7 +187,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.5.0-preview-20221209-01 + 17.5.0-preview-20221209-03 8.0.0-alpha.1.22557.12 diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0001-ResolvePackageFileConflicts-workaround.patch b/src/SourceBuild/tarball/patches/aspnetcore/0001-ResolvePackageFileConflicts-workaround.patch deleted file mode 100644 index ab355630e..000000000 --- a/src/SourceBuild/tarball/patches/aspnetcore/0001-ResolvePackageFileConflicts-workaround.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Fri, 11 Nov 2022 21:10:54 +0000 -Subject: [PATCH] ResolvePackageFileConflicts workaround - ---- - .../App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj -index 3b5d2ae950..f92fb421fe 100644 ---- a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj -+++ b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj -@@ -253,6 +253,9 @@ This package is an internal implementation of the .NET Core SDK and is not meant - - - -+ -+ -+ - - - diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0003-Address-obsolete-errors.patch b/src/SourceBuild/tarball/patches/aspnetcore/0003-Address-obsolete-errors.patch deleted file mode 100644 index b98759d70..000000000 --- a/src/SourceBuild/tarball/patches/aspnetcore/0003-Address-obsolete-errors.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Thu, 27 Oct 2022 02:47:08 +0000 -Subject: [PATCH] Address obsolete errors - -Backport: https://github.com/dotnet/aspnetcore/pull/44734 ---- - src/Servers/Kestrel/Core/src/KestrelServerOptions.cs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Servers/Kestrel/Core/src/KestrelServerOptions.cs b/src/Servers/Kestrel/Core/src/KestrelServerOptions.cs -index f31880e891..fc6322dd41 100644 ---- a/src/Servers/Kestrel/Core/src/KestrelServerOptions.cs -+++ b/src/Servers/Kestrel/Core/src/KestrelServerOptions.cs -@@ -252,9 +252,6 @@ public class KestrelServerOptions - writer.WritePropertyName(nameof(AllowResponseHeaderCompression)); - writer.WriteBooleanValue(AllowResponseHeaderCompression); - -- writer.WritePropertyName(nameof(EnableAltSvc)); -- writer.WriteBooleanValue(EnableAltSvc); -- - writer.WritePropertyName(nameof(IsDevCertLoaded)); - writer.WriteBooleanValue(IsDevCertLoaded); - diff --git a/src/SourceBuild/tarball/patches/format/0001-Address-Microsoft.Build.Locator-prebuilt.patch b/src/SourceBuild/tarball/patches/format/0001-Address-Microsoft.Build.Locator-prebuilt.patch deleted file mode 100644 index e8b8f38fd..000000000 --- a/src/SourceBuild/tarball/patches/format/0001-Address-Microsoft.Build.Locator-prebuilt.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Tue, 15 Nov 2022 17:34:00 +0000 -Subject: [PATCH] Address Microsoft.Build.Locator prebuilt - -Backport: https://github.com/dotnet/format/issues/1759 ---- - Directory.Packages.props | 2 +- - eng/Versions.props | 1 + - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/Directory.Packages.props b/Directory.Packages.props -index c4bf3cf..f7e85b2 100644 ---- a/Directory.Packages.props -+++ b/Directory.Packages.props -@@ -10,7 +10,7 @@ - - - -- -+ - - - -diff --git a/eng/Versions.props b/eng/Versions.props -index fcd583b..2933963 100644 ---- a/eng/Versions.props -+++ b/eng/Versions.props -@@ -14,6 +14,7 @@ - - - 17.3.0-preview-22302-02 -+ 1.5.5 - 3.3.3 - 7.0.0-rc.1.22426.10 - diff --git a/src/SourceBuild/tarball/patches/nuget-client/0001-Add-package-version-properties-for-source-build.patch b/src/SourceBuild/tarball/patches/nuget-client/0001-Add-package-version-properties-for-source-build.patch deleted file mode 100644 index 76a1abde5..000000000 --- a/src/SourceBuild/tarball/patches/nuget-client/0001-Add-package-version-properties-for-source-build.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Logan Bussell -Date: Mon, 21 Nov 2022 22:32:04 +0000 -Subject: [PATCH] Add package version properties for source-build - -Backport: https://github.com/NuGet/Home/issues/12261 ---- - Directory.Packages.props | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/Directory.Packages.props b/Directory.Packages.props -index 8afa7dd31..0c4eaecf5 100644 ---- a/Directory.Packages.props -+++ b/Directory.Packages.props -@@ -9,11 +9,13 @@ - 17.2.0-preview-2-32304-091 - 16.153.0 - -- 17.3.1 -+ 17.3.1 - - 16.8.0 - - 16.11.0 -+ 3.0.0 -+ 4.5.0 - - - -@@ -56,7 +58,7 @@ - - - -- -+ - - - -@@ -66,7 +68,7 @@ - - - -- -+ - - - diff --git a/src/SourceBuild/tarball/patches/nuget-client/0001-Define-PackageVersion-props-to-address-prebuilts.patch b/src/SourceBuild/tarball/patches/nuget-client/0001-Define-PackageVersion-props-to-address-prebuilts.patch new file mode 100644 index 000000000..938dcbf9d --- /dev/null +++ b/src/SourceBuild/tarball/patches/nuget-client/0001-Define-PackageVersion-props-to-address-prebuilts.patch @@ -0,0 +1,34 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MichaelSimons +Date: Mon, 12 Dec 2022 19:30:59 +0000 +Subject: [PATCH] Define PackageVersion props to address prebuilts + +Backport: https://github.com/NuGet/Home/issues/12317 +--- + Directory.Packages.props | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/Directory.Packages.props b/Directory.Packages.props +index e4b41a45f..245ffcc99 100644 +--- a/Directory.Packages.props ++++ b/Directory.Packages.props +@@ -16,6 +16,8 @@ + 16.11.0 + + ++ 6.0.0 ++ 6.0.0 + 3.0.0 + 4.5.0 + +@@ -38,8 +40,8 @@ + + + +- +- ++ ++ + + +