From e779f0adeb5178269c88e1f9e6778ced203f826c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 4 Apr 2022 14:53:40 +0000 Subject: [PATCH] [main] Update dependencies from dotnet/sdk (#13524) * Update dependencies from https://github.com/dotnet/sdk build 20220401.3 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 7.0.100-preview.4.22201.1 -> To Version 7.0.100-preview.4.22201.3 Dependency coherency updates Microsoft.NET.Test.Sdk From Version 17.2.0-preview-20220308-05 -> To Version 17.2.0-preview-20220401-07 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220401.5 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 7.0.100-preview.4.22201.1 -> To Version 7.0.100-preview.4.22201.5 Dependency coherency updates Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.NET.Test.Sdk,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-preview.4.22180.7 -> To Version 7.0.0-preview.4.22201.1 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220401.7 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 7.0.100-preview.4.22201.1 -> To Version 7.0.100-preview.4.22201.7 Dependency coherency updates Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.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.7.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.NET.Test.Sdk,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-preview.4.22180.7 -> To Version 7.0.0-preview.4.22201.1 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220401.8 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 7.0.100-preview.4.22201.1 -> To Version 7.0.100-preview.4.22201.8 Dependency coherency updates Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.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.7.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-preview.4.22180.7 -> To Version 7.0.0-preview.4.22201.1 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220401.11 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 7.0.100-preview.4.22201.1 -> To Version 7.0.100-preview.4.22201.11 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.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.7.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-preview.4.22180.5 -> To Version 7.0.0-preview.4.22181.1 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220402.1 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 7.0.100-preview.4.22201.1 -> To Version 7.0.100-preview.4.22202.1 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.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.7.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-preview.4.22180.5 -> To Version 7.0.0-preview.4.22181.1 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220402.2 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 7.0.100-preview.4.22201.1 -> To Version 7.0.100-preview.4.22202.2 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.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.7.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-preview.4.22180.5 -> To Version 7.0.0-preview.4.22181.1 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220402.3 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 7.0.100-preview.4.22201.1 -> To Version 7.0.100-preview.4.22202.3 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.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.7.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-preview.4.22180.5 -> To Version 7.0.0-preview.4.22181.1 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220404.1 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 7.0.100-preview.4.22201.1 -> To Version 7.0.100-preview.4.22204.1 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.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.7.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-preview.4.22180.5 -> To Version 7.0.0-preview.4.22181.1 (parent: Microsoft.NET.Sdk * Remove vstest source-build patch that was backported Co-authored-by: dotnet-maestro[bot] Co-authored-by: MichaelSimons --- eng/Version.Details.xml | 104 +++++++++--------- eng/Versions.props | 46 ++++---- ...oject-target-frameworks-for-source-b.patch | 41 ------- 3 files changed, 75 insertions(+), 116 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/vstest/0001-Update-nuspec-project-target-frameworks-for-source-b.patch diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bfc3de693..4ef011f9b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://github.com/dotnet/windowsdesktop - 26172489366bd114c643a86d17d38f0b6bf12a49 + b08aa172c7081f4d87385f1234d6fa632aee7178 - + https://github.com/dotnet/windowsdesktop - 26172489366bd114c643a86d17d38f0b6bf12a49 + b08aa172c7081f4d87385f1234d6fa632aee7178 - + https://github.com/dotnet/windowsdesktop - 26172489366bd114c643a86d17d38f0b6bf12a49 + b08aa172c7081f4d87385f1234d6fa632aee7178 - + https://github.com/dotnet/windowsdesktop - 26172489366bd114c643a86d17d38f0b6bf12a49 + b08aa172c7081f4d87385f1234d6fa632aee7178 - + https://github.com/dotnet/runtime - c0db07b3f3f093b5f4cd27e1f5e8aa54adad049d + c3e44952bb75d054517f2a24943502d3a14a47f5 - + https://github.com/dotnet/runtime - c0db07b3f3f093b5f4cd27e1f5e8aa54adad049d + c3e44952bb75d054517f2a24943502d3a14a47f5 - + https://github.com/dotnet/runtime - c0db07b3f3f093b5f4cd27e1f5e8aa54adad049d + c3e44952bb75d054517f2a24943502d3a14a47f5 - + https://github.com/dotnet/runtime - c0db07b3f3f093b5f4cd27e1f5e8aa54adad049d + c3e44952bb75d054517f2a24943502d3a14a47f5 - + https://github.com/dotnet/runtime - c0db07b3f3f093b5f4cd27e1f5e8aa54adad049d + c3e44952bb75d054517f2a24943502d3a14a47f5 - + https://github.com/dotnet/runtime - c0db07b3f3f093b5f4cd27e1f5e8aa54adad049d + c3e44952bb75d054517f2a24943502d3a14a47f5 @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - c0db07b3f3f093b5f4cd27e1f5e8aa54adad049d + c3e44952bb75d054517f2a24943502d3a14a47f5 - + https://github.com/dotnet/aspnetcore - b6630137b2109042dc11ece3164782e451647bff + bae39d367cf8b92a9fb004fd9515bd3e2d0a46bf - + https://github.com/dotnet/aspnetcore - b6630137b2109042dc11ece3164782e451647bff + bae39d367cf8b92a9fb004fd9515bd3e2d0a46bf - + https://github.com/dotnet/aspnetcore - b6630137b2109042dc11ece3164782e451647bff + bae39d367cf8b92a9fb004fd9515bd3e2d0a46bf - + https://github.com/dotnet/aspnetcore - b6630137b2109042dc11ece3164782e451647bff + bae39d367cf8b92a9fb004fd9515bd3e2d0a46bf - + https://github.com/dotnet/aspnetcore - b6630137b2109042dc11ece3164782e451647bff + bae39d367cf8b92a9fb004fd9515bd3e2d0a46bf - + https://github.com/dotnet/aspnetcore - b6630137b2109042dc11ece3164782e451647bff + bae39d367cf8b92a9fb004fd9515bd3e2d0a46bf https://github.com/dotnet/test-templates @@ -94,32 +94,32 @@ a10dda7e809e9eaf66609d4568da1df62a95b3d0 - + https://github.com/dotnet/templating - 780ae899725d63241e10c938b18b3a2f624e429f + 7c66fc4c8cfcf1b77a438b1bb529ac1d3000ae16 - + https://github.com/dotnet/templating - 780ae899725d63241e10c938b18b3a2f624e429f + 7c66fc4c8cfcf1b77a438b1bb529ac1d3000ae16 - + https://github.com/dotnet/sdk - 3459c4d8d0a3a452417e1dc775a36f737a2153d8 + 725e0fd5622a9924b29c44a4ddb18be6d9135373 - + https://github.com/dotnet/sdk - 3459c4d8d0a3a452417e1dc775a36f737a2153d8 + 725e0fd5622a9924b29c44a4ddb18be6d9135373 - + https://github.com/dotnet/winforms - add0d95f0ee5b46fa06fd202e04f4aeae59790a3 + 05fbdd877a08b5b2fd92ffabaa88fad331484c74 - + https://github.com/dotnet/wpf - 08cbbef6d9a5f5769dcd052d46b0a72f44f3fd6f + 8a826add52c35cc8d0b94d94c73dc630121c6f64 https://github.com/dotnet/fsharp @@ -130,9 +130,9 @@ 6d626ff0752a77d339f609b4d361787dc9ca93a5 - + https://github.com/microsoft/vstest - 4c2d848ef50380313b3e60488f6f3a6bf422a2a4 + db231b7cb608461afb1c773b39f7311e92a4701b @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - a59a22c6f3c2cc1883e20cece412209f18f4a29f + 4f4a757510f260eb8ac121dd9f8e7706d13751fb @@ -151,9 +151,9 @@ ce7523296d7ddb70fb61a68e84bc2ff38e012e35 - + https://github.com/nuget/nuget.client - bc4b41f3ca294ccc8aedc8af5159c215943e1ed2 + 6f54dbd49fcda01ca8d71eb4fa4eea6ef54379ab diff --git a/eng/Versions.props b/eng/Versions.props index e6138e245..529710cf7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -30,15 +30,15 @@ - 7.0.0-preview.4.22180.1 + 7.0.0-preview.4.22181.1 - 7.0.0-preview.4.22180.4 + 7.0.0-preview.4.22181.1 - 7.0.100-preview.4.22180.6 + 7.0.100-preview.4.22201.2 @@ -52,44 +52,44 @@ - 7.0.0-preview.4.22181.10 - 7.0.0-preview.4.22181.10 - 7.0.0-preview.4.22181.10 - 7.0.0-preview.4.22181.10 - 7.0.0-preview.4.22181.10 - 7.0.0-preview.4.22181.10 + 7.0.0-preview.4.22201.3 + 7.0.0-preview.4.22201.3 + 7.0.0-preview.4.22201.3 + 7.0.0-preview.4.22201.3 + 7.0.0-preview.4.22201.3 + 7.0.0-preview.4.22201.3 0.2.0 - 7.0.100-preview.4.22201.1 - 7.0.100-preview.4.22201.1 + 7.0.100-preview.4.22204.1 + 7.0.100-preview.4.22204.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0-preview.4.22180.7 + 7.0.0-preview.4.22201.3 - 7.0.0-preview.4.22180.7 - 7.0.0-preview.4.22180.7 - 7.0.0-preview.4.22180.7 - 7.0.0-preview.4.22180.7 - 7.0.0-preview.4.22180.7 - 7.0.0-preview.4.22180.7 + 7.0.0-preview.4.22201.3 + 7.0.0-preview.4.22201.3 + 7.0.0-preview.4.22201.3 + 7.0.0-preview.4.22201.3 + 7.0.0-preview.4.22201.3 + 7.0.0-preview.4.22201.3 2.1.0 - 7.0.0-preview.4.22180.5 - 7.0.0-preview.4.22180.5 - 7.0.0-preview.4.22180.5 - 7.0.0-preview.4.22180.5 + 7.0.0-preview.4.22181.1 + 7.0.0-preview.4.22181.1 + 7.0.0-preview.4.22181.1 + 7.0.0-preview.4.22181.1 @@ -167,7 +167,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.2.0-preview-20220308-05 + 17.2.0-preview-20220401-08 diff --git a/src/SourceBuild/tarball/patches/vstest/0001-Update-nuspec-project-target-frameworks-for-source-b.patch b/src/SourceBuild/tarball/patches/vstest/0001-Update-nuspec-project-target-frameworks-for-source-b.patch deleted file mode 100644 index 729c76c4e..000000000 --- a/src/SourceBuild/tarball/patches/vstest/0001-Update-nuspec-project-target-frameworks-for-source-b.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Tue, 23 Nov 2021 17:45:25 +0000 -Subject: [PATCH] Update nuspec project target frameworks for source-build - -This patch removes prebuilts caused from targetting netcoreapp1.0 - -Backported with https://github.com/microsoft/vstest/pull/3188 ---- - src/package/nuspec/Microsoft.TestPlatform.Build.csproj | 3 ++- - src/package/nuspec/Microsoft.TestPlatform.CLI.csproj | 3 ++- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/package/nuspec/Microsoft.TestPlatform.Build.csproj b/src/package/nuspec/Microsoft.TestPlatform.Build.csproj -index 038fbf8..57cde8e 100644 ---- a/src/package/nuspec/Microsoft.TestPlatform.Build.csproj -+++ b/src/package/nuspec/Microsoft.TestPlatform.Build.csproj -@@ -1,7 +1,8 @@ - - - Exe -- netcoreapp1.0 -+ netcoreapp1.0 -+ net6.0 - false - TestPlatform.Build.nuspec - version=$(Version) -diff --git a/src/package/nuspec/Microsoft.TestPlatform.CLI.csproj b/src/package/nuspec/Microsoft.TestPlatform.CLI.csproj -index 29198ba..19386eb 100644 ---- a/src/package/nuspec/Microsoft.TestPlatform.CLI.csproj -+++ b/src/package/nuspec/Microsoft.TestPlatform.CLI.csproj -@@ -1,7 +1,8 @@ - - - Exe -- netcoreapp1.0 -+ netcoreapp1.0 -+ net6.0 - false - TestPlatform.CLI.nuspec - version=$(Version)