From d43539eeb533bbc729c8fb569797e04b785f7049 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 17 May 2022 23:55:57 +0000 Subject: [PATCH] [main] Update dependencies from dotnet/sdk (#13811) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 7.0.0-preview.5.22259.2 to 7.0.0-preview.5.22264.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0: from 7.0.0-preview.5.22259.2 to 7.0.0-preview.5.22264.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0: from 7.0.0-preview.5.22259.2 to 7.0.0-preview.5.22264.2 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 7.0.0-preview.5.22258.4 to 7.0.0-preview.5.22266.11 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.7.0: from 7.0.0-preview.5.22258.4 to 7.0.0-preview.5.22266.11 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-preview.5.22258.4 to 7.0.0-preview.5.22266.11 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 7.0.0-preview.5.22258.4 to 7.0.0-preview.5.22266.11 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 7.0.0-preview.5.22258.4 to 7.0.0-preview.5.22266.11 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 7.0.0-preview.5.22258.4 to 7.0.0-preview.5.22266.11 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 7.0.0-preview.5.22259.9 to 7.0.0-preview.5.22266.9 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-preview.5.22259.9 to 7.0.0-preview.5.22266.9 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-preview.5.22259.9 to 7.0.0-preview.5.22266.9 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-preview.5.22259.9 to 7.0.0-preview.5.22266.9 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 7.0.0-preview.5.22259.9 to 7.0.0-preview.5.22266.9 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 7.0.0-preview.5.22259.9 to 7.0.0-preview.5.22266.9 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ItemTemplates: from 7.0.100-preview.5.22259.5 to 7.0.100-preview.5.22267.2 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 7.0.100-preview.5.22259.5 to 7.0.100-preview.5.22267.2 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-preview.5.22259.2 to 7.0.0-preview.5.22264.2 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 7.0.0-preview.4.22257.1 to 7.0.0-preview.4.22264.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-preview.5.22259.2 to 7.0.0-preview.5.22264.2 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 7.0.0-preview.5.22259.1 to 7.0.0-preview.5.22264.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.NET.Test.Sdk: from 17.3.0-preview-20220509-01 to 17.3.0-preview-20220516-01 (parent: Microsoft.NET.Sdk) - Microsoft.NET.ILLink.Tasks: from 7.0.100-1.22259.1 to 7.0.100-1.22266.1 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.3.0-2.22259.9 to 4.3.0-2.22266.7 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.3.0-preview-22256-03 to 17.3.0-preview-22263-02 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-preview.5.22258.4 to 7.0.0-preview.5.22266.11 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Workload.Emscripten.Manifest-7.0.100: from 7.0.0-preview.4.22215.1 to 7.0.0-preview.5.22252.1 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.7.0) - Microsoft.SourceBuild.Intermediate.source-build-externals: from 7.0.0-alpha.1.22255.1 to 7.0.0-alpha.1.22259.2 (parent: Microsoft.NET.Sdk) - Merge branch 'main' into darc-main-116d39ae-bf4b-46a2-b22a-cd7fba818000 - Remove runtime patch that was upstreamed --- eng/Version.Details.xml | 116 +++++++++--------- eng/Versions.props | 48 ++++---- .../0001-Move-tools-and-apps-to-net7.0.patch | 51 -------- 3 files changed, 82 insertions(+), 133 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/runtime/0001-Move-tools-and-apps-to-net7.0.patch diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 158a2213c..64e3e9b46 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://github.com/dotnet/windowsdesktop - b660bc7e76726b74eedcab8c7d06d080c37cfbdf + 421f936f20ebd6aecd00d4f57491caef5975132b - + https://github.com/dotnet/windowsdesktop - b660bc7e76726b74eedcab8c7d06d080c37cfbdf + 421f936f20ebd6aecd00d4f57491caef5975132b - + https://github.com/dotnet/windowsdesktop - b660bc7e76726b74eedcab8c7d06d080c37cfbdf + 421f936f20ebd6aecd00d4f57491caef5975132b - + https://github.com/dotnet/windowsdesktop - b660bc7e76726b74eedcab8c7d06d080c37cfbdf + 421f936f20ebd6aecd00d4f57491caef5975132b - + https://github.com/dotnet/runtime - 3e5517beb897faf4592d23f036446561da1e5c23 + f4c60fd235fa8db19567ea7048cabec11ce9ce36 - + https://github.com/dotnet/runtime - 3e5517beb897faf4592d23f036446561da1e5c23 + f4c60fd235fa8db19567ea7048cabec11ce9ce36 - + https://github.com/dotnet/runtime - 3e5517beb897faf4592d23f036446561da1e5c23 + f4c60fd235fa8db19567ea7048cabec11ce9ce36 - + https://github.com/dotnet/runtime - 3e5517beb897faf4592d23f036446561da1e5c23 + f4c60fd235fa8db19567ea7048cabec11ce9ce36 - + https://github.com/dotnet/runtime - 3e5517beb897faf4592d23f036446561da1e5c23 + f4c60fd235fa8db19567ea7048cabec11ce9ce36 - + https://github.com/dotnet/runtime - 3e5517beb897faf4592d23f036446561da1e5c23 + f4c60fd235fa8db19567ea7048cabec11ce9ce36 @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 3e5517beb897faf4592d23f036446561da1e5c23 + f4c60fd235fa8db19567ea7048cabec11ce9ce36 - + https://github.com/dotnet/aspnetcore - 52c11c30efe97e271530e92cfbe951ee73862c01 + 374896bd7017be626d334dd93b9cbea45e1830da - + https://github.com/dotnet/aspnetcore - 52c11c30efe97e271530e92cfbe951ee73862c01 + 374896bd7017be626d334dd93b9cbea45e1830da - + https://github.com/dotnet/aspnetcore - 52c11c30efe97e271530e92cfbe951ee73862c01 + 374896bd7017be626d334dd93b9cbea45e1830da - + https://github.com/dotnet/aspnetcore - 52c11c30efe97e271530e92cfbe951ee73862c01 + 374896bd7017be626d334dd93b9cbea45e1830da - + https://github.com/dotnet/aspnetcore - 52c11c30efe97e271530e92cfbe951ee73862c01 + 374896bd7017be626d334dd93b9cbea45e1830da - + https://github.com/dotnet/aspnetcore - 52c11c30efe97e271530e92cfbe951ee73862c01 + 374896bd7017be626d334dd93b9cbea45e1830da https://github.com/dotnet/test-templates @@ -94,32 +94,32 @@ b3ea6fe79f36182991222dbf5bb18ee13800a657 - + https://github.com/dotnet/templating - 17f9bb0e6e89183b3a221f768771bed6b9031e3a + fb1005db4eb9658b59c4301ad0b04378c9517e6e - + https://github.com/dotnet/templating - 17f9bb0e6e89183b3a221f768771bed6b9031e3a + fb1005db4eb9658b59c4301ad0b04378c9517e6e - + https://github.com/dotnet/sdk - 9b795af259e1aaf156ae7535c1803741b228f22c + 5e7b7cb2b0af8c8fcc53e62214d07beb28672b85 - + https://github.com/dotnet/sdk - 9b795af259e1aaf156ae7535c1803741b228f22c + 5e7b7cb2b0af8c8fcc53e62214d07beb28672b85 - + https://github.com/dotnet/winforms - ac1bfc344264b23f898712abc45260b118bd921c + ec0ad520678f51d8c3ee44a1e4da7c3b9dfb73fa - + https://github.com/dotnet/wpf - 6b4faa7f45a62ef140f51f0cd04bedc944729592 + 5a44db0f95cfe7d09997ba32e05ec75394fed772 https://github.com/dotnet/fsharp @@ -130,25 +130,25 @@ 058e7a7e597a02c129f38742f250a4b212da9ee3 - + https://github.com/microsoft/vstest - 1f899456b005f3585a907e57f14aed75b2093a8e + a12cd93cd5af4a761757a4eb79076bf433c71d7d - + https://github.com/dotnet/linker - b9c9da264c5bc24a8e32fc5d2bda239dffc01fdb + 5a8de69d4d1ee764852f1a87cccf58c4b640f809 linker - + https://github.com/dotnet/roslyn - 7be9fe7317b014f78be18c4a7c886a41657704c4 + c4fb8fe4d37707b9343c0d0800e1b44b58969704 - + https://github.com/dotnet/msbuild - 72a07679401d1272d70ce482ea03c109ddd6e601 + 78bb45f0f7033ba5658903dacd6164e83af68c94 @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - f41e658e85769eef222f5f7571038edbd2d1d9d8 + aeb9a3591b687c3f141e43b330604b34da738149 https://github.com/dotnet/deployment-tools @@ -180,9 +180,9 @@ ab3eb7a525e31dc6fb4d9cc0b7154fa2be58dac1 - + https://github.com/dotnet/source-build-externals - 63d94dda01aa485dda91841e99ac855207128a2e + 929686f9bb080937b5cd8f496527f4c02123a11e diff --git a/eng/Versions.props b/eng/Versions.props index 945cf895f..d68e71652 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -30,15 +30,15 @@ - 7.0.0-preview.4.22257.1 + 7.0.0-preview.4.22264.2 - 7.0.0-preview.5.22259.1 + 7.0.0-preview.5.22264.2 - 7.0.100-preview.5.22259.5 + 7.0.100-preview.5.22267.2 @@ -52,44 +52,44 @@ - 7.0.0-preview.5.22259.9 - 7.0.0-preview.5.22259.9 - 7.0.0-preview.5.22259.9 - 7.0.0-preview.5.22259.9 - 7.0.0-preview.5.22259.9 - 7.0.0-preview.5.22259.9 + 7.0.0-preview.5.22266.9 + 7.0.0-preview.5.22266.9 + 7.0.0-preview.5.22266.9 + 7.0.0-preview.5.22266.9 + 7.0.0-preview.5.22266.9 + 7.0.0-preview.5.22266.9 0.2.0 - 7.0.100-preview.5.22259.18 - 7.0.100-preview.5.22259.18 + 7.0.100-preview.5.22267.13 + 7.0.100-preview.5.22267.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0-preview.5.22258.4 + 7.0.0-preview.5.22266.11 - 7.0.0-preview.5.22258.4 - 7.0.0-preview.5.22258.4 - 7.0.0-preview.5.22258.4 - 7.0.0-preview.5.22258.4 - 7.0.0-preview.5.22258.4 - 7.0.0-preview.5.22258.4 + 7.0.0-preview.5.22266.11 + 7.0.0-preview.5.22266.11 + 7.0.0-preview.5.22266.11 + 7.0.0-preview.5.22266.11 + 7.0.0-preview.5.22266.11 + 7.0.0-preview.5.22266.11 2.1.0 - 7.0.0-preview.5.22259.2 - 7.0.0-preview.5.22259.2 - 7.0.0-preview.5.22259.2 - 7.0.0-preview.5.22259.2 + 7.0.0-preview.5.22264.2 + 7.0.0-preview.5.22264.2 + 7.0.0-preview.5.22264.2 + 7.0.0-preview.5.22264.2 @@ -167,7 +167,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.3.0-preview-20220509-01 + 17.3.0-preview-20220516-01 @@ -200,7 +200,7 @@ 12.3.100-rc.1.125 15.4.100-rc.1.125 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.0-preview.4.22215.1 + 7.0.0-preview.5.22252.1 $(MicrosoftNETWorkloadEmscriptenManifest70100Version) diff --git a/src/SourceBuild/tarball/patches/runtime/0001-Move-tools-and-apps-to-net7.0.patch b/src/SourceBuild/tarball/patches/runtime/0001-Move-tools-and-apps-to-net7.0.patch deleted file mode 100644 index 02cef20a0..000000000 --- a/src/SourceBuild/tarball/patches/runtime/0001-Move-tools-and-apps-to-net7.0.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Larry Ewing -Date: Fri, 8 Apr 2022 17:26:16 -0500 -Subject: [PATCH] Move tools and apps to net7.0 - -Original PR: https://github.com/dotnet/runtime/pull/67771 ---- - Directory.Build.props | 4 ++-- - .../ILStrip/AssemblyStripper/AssemblyStripper.csproj | 5 ++--- - 2 files changed, 4 insertions(+), 5 deletions(-) - -diff --git a/Directory.Build.props b/Directory.Build.props -index 2ec01ea57e6..2e6a7b6c0f5 100644 ---- a/Directory.Build.props -+++ b/Directory.Build.props -@@ -53,7 +53,7 @@ - net$(NetCoreAppCurrentVersion) - net6.0 - -- 6.0 -+ 7.0 - net$(NetCoreAppToolCurrentVersion) - $(NetCoreAppCurrentIdentifier),Version=v$(NetCoreAppToolCurrentVersion) - -@@ -61,7 +61,7 @@ - $(NetCoreAppLatestStableVersion).0 - net$(NetCoreAppLatestStableVersion) - -- 6.0 -+ 7.0 - net$(AspNetCoreAppCurrentVersion) - - net462 -diff --git a/src/tasks/MonoTargetsTasks/ILStrip/AssemblyStripper/AssemblyStripper.csproj b/src/tasks/MonoTargetsTasks/ILStrip/AssemblyStripper/AssemblyStripper.csproj -index 439b5b8b21b..2eb8a61b633 100644 ---- a/src/tasks/MonoTargetsTasks/ILStrip/AssemblyStripper/AssemblyStripper.csproj -+++ b/src/tasks/MonoTargetsTasks/ILStrip/AssemblyStripper/AssemblyStripper.csproj -@@ -4,11 +4,10 @@ - false - - disable -- -- $(NoWarn),CS0618,CS0649,SYSLIB0003 -+ $(NoWarn),CS0618,CS0649,SYSLIB0003,SYSLIB0037 - - false -