From dda7d3726edbef12d2548345a24adb18069923e1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 Oct 2022 20:30:44 +0000 Subject: [PATCH] [main] Update dependencies from dotnet/sdk (#14837) * Update dependencies from https://github.com/dotnet/sdk build 20221026.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 8.0.0-alpha.1.22525.3 -> To Version 8.0.0-alpha.1.22526.4 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221027.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Build From Version 8.0.0-alpha.1.22525.3 -> To Version 8.0.0-alpha.1.22526.4 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221027.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100 Dependency coherency updates Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Build From Version 8.0.0-alpha.1.22524.5 -> To Version 8.0.0-alpha.1.22526.6 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221027.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100 Dependency coherency updates Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Build From Version 8.0.0-alpha.1.22524.5 -> To Version 8.0.0-alpha.1.22526.6 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221027.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100 Dependency coherency updates Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Build From Version 8.0.0-alpha.1.22524.5 -> To Version 8.0.0-alpha.1.22526.6 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221028.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100 Dependency coherency updates Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 8.0.0-alpha.1.22524.5 -> To Version 8.0.0-alpha.1.22526.6 (parent: Microsoft.NET.Sdk * Remove backported source-build runtime patch * Remove backported source-build aspnetcore patch * Update dependencies from https://github.com/dotnet/sdk build 20221028.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100 Dependency coherency updates Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 8.0.0-alpha.1.22524.5 -> To Version 8.0.0-alpha.1.22527.6 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221028.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 8.0.0-alpha.1.22524.5 -> To Version 8.0.0-alpha.1.22527.6 (parent: Microsoft.NET.Sdk Co-authored-by: dotnet-maestro[bot] Co-authored-by: MichaelSimons --- NuGet.config | 2 +- eng/Version.Details.xml | 90 +++++++++---------- eng/Versions.props | 34 +++---- .../0003-Address-obsolete-errors.patch | 24 ----- ....0-during-source-build-Port-of-75168.patch | 59 ------------ 5 files changed, 63 insertions(+), 146 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/aspnetcore/0003-Address-obsolete-errors.patch delete mode 100644 src/SourceBuild/tarball/patches/runtime/0001-Target-only-net7.0-during-source-build-Port-of-75168.patch diff --git a/NuGet.config b/NuGet.config index 3e9ff87c4..52a239755 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 545b851fa..020d96f19 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop c3e484659d17ab5f96ffef601be29857c44ce7ea - + https://github.com/dotnet/runtime - 5108757b997c59ab8ba1fc5309ab0d4e730e2b77 + feb4bee67a111d6e6091b8492cef57a35191b1d9 - + https://github.com/dotnet/runtime - 5108757b997c59ab8ba1fc5309ab0d4e730e2b77 + feb4bee67a111d6e6091b8492cef57a35191b1d9 - + https://github.com/dotnet/runtime - 5108757b997c59ab8ba1fc5309ab0d4e730e2b77 + feb4bee67a111d6e6091b8492cef57a35191b1d9 - + https://github.com/dotnet/runtime - 5108757b997c59ab8ba1fc5309ab0d4e730e2b77 + feb4bee67a111d6e6091b8492cef57a35191b1d9 - + https://github.com/dotnet/runtime - 5108757b997c59ab8ba1fc5309ab0d4e730e2b77 + feb4bee67a111d6e6091b8492cef57a35191b1d9 - + https://github.com/dotnet/runtime - 5108757b997c59ab8ba1fc5309ab0d4e730e2b77 + feb4bee67a111d6e6091b8492cef57a35191b1d9 @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 5108757b997c59ab8ba1fc5309ab0d4e730e2b77 + feb4bee67a111d6e6091b8492cef57a35191b1d9 - + https://github.com/dotnet/aspnetcore - f73a1835a1454d31337b850e6adaedcf597b5119 + d5629a0534ced8534226e321bfefff475160963e - + https://github.com/dotnet/aspnetcore - f73a1835a1454d31337b850e6adaedcf597b5119 + d5629a0534ced8534226e321bfefff475160963e - + https://github.com/dotnet/aspnetcore - f73a1835a1454d31337b850e6adaedcf597b5119 + d5629a0534ced8534226e321bfefff475160963e - + https://github.com/dotnet/aspnetcore - f73a1835a1454d31337b850e6adaedcf597b5119 + d5629a0534ced8534226e321bfefff475160963e - + https://github.com/dotnet/aspnetcore - f73a1835a1454d31337b850e6adaedcf597b5119 + d5629a0534ced8534226e321bfefff475160963e - + https://github.com/dotnet/aspnetcore - f73a1835a1454d31337b850e6adaedcf597b5119 + d5629a0534ced8534226e321bfefff475160963e - + https://github.com/dotnet/aspnetcore - f73a1835a1454d31337b850e6adaedcf597b5119 + d5629a0534ced8534226e321bfefff475160963e https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://github.com/dotnet/sdk - 7d8e8104e74b40666fa47c80421a6c88f8bc8b42 + 75a50a68891e6069f362d8300c4ee0fd3e8750eb - + https://github.com/dotnet/sdk - 7d8e8104e74b40666fa47c80421a6c88f8bc8b42 + 75a50a68891e6069f362d8300c4ee0fd3e8750eb - + https://github.com/dotnet/sdk - 7d8e8104e74b40666fa47c80421a6c88f8bc8b42 + 75a50a68891e6069f362d8300c4ee0fd3e8750eb - + https://github.com/dotnet/sdk - 7d8e8104e74b40666fa47c80421a6c88f8bc8b42 + 75a50a68891e6069f362d8300c4ee0fd3e8750eb @@ -124,18 +124,18 @@ https://github.com/dotnet/wpf 89620aa2bd732a2072d9d38601be1587a4d73572 - + https://github.com/dotnet/fsharp - 82c00c7dbc2e8e3509c1bef0d04a7fc1b5e0b707 + b5ddadac02c8ddc26b9d137ed4a72e16f267c3ab - + https://github.com/dotnet/fsharp - 82c00c7dbc2e8e3509c1bef0d04a7fc1b5e0b707 + b5ddadac02c8ddc26b9d137ed4a72e16f267c3ab - + https://github.com/microsoft/vstest - 9d12a2e26fda590fd384668271011fcd8f475209 + 86e33e8eb2e9702afc1dcc081b55ed089331aedb @@ -144,14 +144,14 @@ linker - + https://github.com/dotnet/roslyn - 34530dacae1efc796937b41a0e1cf55fd93c7a10 + 9a5bc6728ee6df71ccdc908d66830dc7bb77f241 - + https://github.com/dotnet/msbuild - 3b7246b650398f47b6028e2673b06902613dc46e + 3777dcaf7edb3e86a070037ba53e742dd1872873 diff --git a/eng/Versions.props b/eng/Versions.props index bbd4f5f29..e1bb26ac2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,13 +53,13 @@ - 8.0.0-alpha.1.22525.3 - 8.0.0-alpha.1.22525.3 - 8.0.0-alpha.1.22525.3 - 8.0.0-alpha.1.22525.3 - 8.0.0-alpha.1.22525.3 - 8.0.0-alpha.1.22525.3 - 8.0.0-alpha.1.22525.3 + 8.0.0-alpha.1.22527.3 + 8.0.0-alpha.1.22527.3 + 8.0.0-alpha.1.22527.3 + 8.0.0-alpha.1.22527.3 + 8.0.0-alpha.1.22527.3 + 8.0.0-alpha.1.22527.3 + 8.0.0-alpha.1.22527.3 0.2.0 @@ -67,24 +67,24 @@ 8.0.100 - 8.0.100-alpha.1.22526.7 - 8.0.100-alpha.1.22526.7 + 8.0.100-alpha.1.22528.3 + 8.0.100-alpha.1.22528.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 8.0.0-alpha.1.22524.5 + 8.0.0-alpha.1.22527.6 - 8.0.0-alpha.1.22524.5 - 8.0.0-alpha.1.22524.5 - 8.0.0-alpha.1.22524.5 - 8.0.0-alpha.1.22524.5 - 8.0.0-alpha.1.22524.5 - 8.0.0-alpha.1.22524.5 + 8.0.0-alpha.1.22527.6 + 8.0.0-alpha.1.22527.6 + 8.0.0-alpha.1.22527.6 + 8.0.0-alpha.1.22527.6 + 8.0.0-alpha.1.22527.6 + 8.0.0-alpha.1.22527.6 2.1.0 @@ -185,7 +185,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.5.0-preview-20221025-01 + 17.5.0-preview-20221026-01 7.0.0-rc.1.22426.10 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/runtime/0001-Target-only-net7.0-during-source-build-Port-of-75168.patch b/src/SourceBuild/tarball/patches/runtime/0001-Target-only-net7.0-during-source-build-Port-of-75168.patch deleted file mode 100644 index df8527d48..000000000 --- a/src/SourceBuild/tarball/patches/runtime/0001-Target-only-net7.0-during-source-build-Port-of-75168.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Chris Rummel -Date: Wed, 26 Oct 2022 17:03:02 -0500 -Subject: [PATCH] Target only net7.0 during source-build - Port of #75168 to - main (#77052) - -* Target only net7.0 during source-build -Port of #75168 to main. - -* Target net7.0 in additional projects - -* Update compatibility suppressions - -* Only target net7.0 for source-build - -* Disable package validation for source-build - -* Revert compatibility suppression changes - -* Use NetCoreAppCurrent instead of hardcoding net7.0 - -* Revert mono Apple TFM change - -* Remove unnecessary LangVersion - -* Address code review comments. - -Co-authored-by: Logan Bussell - -Backport: https://github.com/dotnet/runtime/pull/77052 ---- - Directory.Build.props | 1 + - eng/SourceBuild.props | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/Directory.Build.props b/Directory.Build.props -index b902a691666..35e506f1eba 100644 ---- a/Directory.Build.props -+++ b/Directory.Build.props -@@ -53,6 +53,7 @@ - .NET $(NetCoreAppCurrentVersion) - net$(NetCoreAppCurrentVersion) - net6.0 -+ $(NetCoreAppCurrent) - - 7.0 - net$(NetCoreAppToolCurrentVersion) -diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props -index ebf8e683ed0..1dfe97fe1ca 100644 ---- a/eng/SourceBuild.props -+++ b/eng/SourceBuild.props -@@ -48,6 +48,7 @@ - $(InnerBuildArgs) /p:BuildDebPackage=false - $(InnerBuildArgs) /p:EnableNgenOptimization=false - $(InnerBuildArgs) /p:AdditionalRuntimeIdentifierParent=$(BaseOS) -+ $(InnerBuildArgs) /p:EnablePackageValidation=false - - -