From ef80dcb010fe88dbb772589d474a99b4bb1512a3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 17 Dec 2021 21:28:08 +0000 Subject: [PATCH] [main] Update dependencies from dotnet/sdk (#12826) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 7.0.0-alpha.1.21611.2 to 7.0.0-alpha.1.21616.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21611.2 to 7.0.0-alpha.1.21616.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0: from 7.0.0-alpha.1.21611.2 to 7.0.0-alpha.1.21616.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 7.0.0-alpha.1.21612.5 to 7.0.0-alpha.1.21616.17 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.7.0: from 7.0.0-alpha.1.21612.5 to 7.0.0-alpha.1.21616.17 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21612.5 to 7.0.0-alpha.1.21616.17 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 7.0.0-alpha.1.21612.5 to 7.0.0-alpha.1.21616.17 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 7.0.0-alpha.1.21612.5 to 7.0.0-alpha.1.21616.17 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 7.0.0-alpha.1.21612.5 to 7.0.0-alpha.1.21616.17 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 7.0.0-alpha.1.21613.11 to 7.0.0-alpha.1.21616.8 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-alpha.1.21613.11 to 7.0.0-alpha.1.21616.8 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21613.11 to 7.0.0-alpha.1.21616.8 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21613.11 to 7.0.0-alpha.1.21616.8 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 7.0.0-alpha.1.21613.11 to 7.0.0-alpha.1.21616.8 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 7.0.0-alpha.1.21613.11 to 7.0.0-alpha.1.21616.8 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ItemTemplates: from 7.0.100-alpha.1.21613.3 to 7.0.100-alpha.1.21617.2 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 7.0.100-alpha.1.21613.3 to 7.0.100-alpha.1.21617.2 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-alpha.1.21611.2 to 7.0.0-alpha.1.21616.1 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 7.0.0-alpha.1.21609.2 to 7.0.0-alpha.1.21615.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-alpha.1.21611.2 to 7.0.0-alpha.1.21616.1 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 7.0.0-alpha.1.21611.1 to 7.0.0-alpha.1.21615.8 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.NET.Test.Sdk: from 17.2.0-preview-20211214-01 to 17.2.0-preview-20211214-03 (parent: Microsoft.NET.Sdk) - Microsoft.NET.ILLink.Tasks: from 7.0.100-1.21613.2 to 7.0.100-1.21616.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21612.5 to 7.0.0-alpha.1.21616.17 (parent: Microsoft.NET.Sdk) - Update default tf from winforms templates. --- eng/Version.Details.xml | 100 ++++++++++++++--------------- eng/Versions.props | 46 ++++++------- test/EndToEnd/ProjectBuildTests.cs | 13 +++- 3 files changed, 83 insertions(+), 76 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 80c9e077a..952f6097d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://github.com/dotnet/windowsdesktop - 23bd6f4091ec84264d381005dda19566a059dc65 + 9ed509dc3d88a167ae1f1ac7a17a3b9c2bbd6a47 - + https://github.com/dotnet/windowsdesktop - 23bd6f4091ec84264d381005dda19566a059dc65 + 9ed509dc3d88a167ae1f1ac7a17a3b9c2bbd6a47 - + https://github.com/dotnet/windowsdesktop - 23bd6f4091ec84264d381005dda19566a059dc65 + 9ed509dc3d88a167ae1f1ac7a17a3b9c2bbd6a47 - + https://github.com/dotnet/windowsdesktop - 23bd6f4091ec84264d381005dda19566a059dc65 + 9ed509dc3d88a167ae1f1ac7a17a3b9c2bbd6a47 - + https://github.com/dotnet/runtime - 78f4a7de7e89ddefa88f9e9da7604ecb5c58d3b7 + b338078cbbff08f809b1d73825e420157f4d81e3 - + https://github.com/dotnet/runtime - 78f4a7de7e89ddefa88f9e9da7604ecb5c58d3b7 + b338078cbbff08f809b1d73825e420157f4d81e3 - + https://github.com/dotnet/runtime - 78f4a7de7e89ddefa88f9e9da7604ecb5c58d3b7 + b338078cbbff08f809b1d73825e420157f4d81e3 - + https://github.com/dotnet/runtime - 78f4a7de7e89ddefa88f9e9da7604ecb5c58d3b7 + b338078cbbff08f809b1d73825e420157f4d81e3 - + https://github.com/dotnet/runtime - 78f4a7de7e89ddefa88f9e9da7604ecb5c58d3b7 + b338078cbbff08f809b1d73825e420157f4d81e3 - + https://github.com/dotnet/runtime - 78f4a7de7e89ddefa88f9e9da7604ecb5c58d3b7 + b338078cbbff08f809b1d73825e420157f4d81e3 @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 78f4a7de7e89ddefa88f9e9da7604ecb5c58d3b7 + b338078cbbff08f809b1d73825e420157f4d81e3 - + https://github.com/dotnet/aspnetcore - 8c2a9c9d3f84ac7730be99f4ce040a878d155e97 + d434a4d205cd0da5d0b91af75c1195119197ea6e - + https://github.com/dotnet/aspnetcore - 8c2a9c9d3f84ac7730be99f4ce040a878d155e97 + d434a4d205cd0da5d0b91af75c1195119197ea6e - + https://github.com/dotnet/aspnetcore - 8c2a9c9d3f84ac7730be99f4ce040a878d155e97 + d434a4d205cd0da5d0b91af75c1195119197ea6e - + https://github.com/dotnet/aspnetcore - 8c2a9c9d3f84ac7730be99f4ce040a878d155e97 + d434a4d205cd0da5d0b91af75c1195119197ea6e - + https://github.com/dotnet/aspnetcore - 8c2a9c9d3f84ac7730be99f4ce040a878d155e97 + d434a4d205cd0da5d0b91af75c1195119197ea6e - + https://github.com/dotnet/aspnetcore - 8c2a9c9d3f84ac7730be99f4ce040a878d155e97 + d434a4d205cd0da5d0b91af75c1195119197ea6e https://github.com/dotnet/test-templates @@ -90,32 +90,32 @@ 46638329316539e78e8b6fd9ffbe549132eedbe6 - + https://github.com/dotnet/templating - e1325e22e2f9cb7c13e5af80eb988a2c5a5dc482 + 183ba8d147f2ec507a867df8f677927b6c18e9ae - + https://github.com/dotnet/templating - e1325e22e2f9cb7c13e5af80eb988a2c5a5dc482 + 183ba8d147f2ec507a867df8f677927b6c18e9ae - + https://github.com/dotnet/sdk - e2da5282be4e10868fcd02e1b33a5359eb8bb3a0 + d5579a92bc14ad579f05cbbbdb342ca5930afb08 - + https://github.com/dotnet/sdk - e2da5282be4e10868fcd02e1b33a5359eb8bb3a0 + d5579a92bc14ad579f05cbbbdb342ca5930afb08 - + https://github.com/dotnet/winforms - e283294aefed00a944d0f8e0345859fdc2425a1c + fe12fe1b90a19dba5136505b91172af39d06b09f - + https://github.com/dotnet/wpf - 82383246cc675d61b48b79eaf1a06550cec11cdd + a80b76e3bd81aab6379165456bdc2412a787d171 https://github.com/dotnet/fsharp @@ -126,14 +126,14 @@ 6d626ff0752a77d339f609b4d361787dc9ca93a5 - + https://github.com/microsoft/vstest - 4a77384e324e8a7bd874346a9fc34fdd6f8101ae + 0a43b14b616e57e94a34040ca3d2a211bfbe4c5a - + https://github.com/dotnet/linker - 9781aeb54d1741f421ea3340dafae3526b34e8fe + 853385633a7aeb84d9bd81885b3b221fc3075038 linker diff --git a/eng/Versions.props b/eng/Versions.props index c6d1a08ba..57baa6e05 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -30,15 +30,15 @@ - 7.0.0-alpha.1.21609.2 + 7.0.0-alpha.1.21615.7 - 7.0.0-alpha.1.21611.1 + 7.0.0-alpha.1.21615.8 - 7.0.100-alpha.1.21613.3 + 7.0.100-alpha.1.21617.2 @@ -51,44 +51,44 @@ - 7.0.0-alpha.1.21613.11 - 7.0.0-alpha.1.21613.11 - 7.0.0-alpha.1.21613.11 - 7.0.0-alpha.1.21613.11 - 7.0.0-alpha.1.21613.11 - 7.0.0-alpha.1.21613.11 + 7.0.0-alpha.1.21616.8 + 7.0.0-alpha.1.21616.8 + 7.0.0-alpha.1.21616.8 + 7.0.0-alpha.1.21616.8 + 7.0.0-alpha.1.21616.8 + 7.0.0-alpha.1.21616.8 0.2.0 - 7.0.100-alpha.1.21614.4 - 7.0.100-alpha.1.21614.4 + 7.0.100-alpha.1.21617.6 + 7.0.100-alpha.1.21617.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0-alpha.1.21612.5 + 7.0.0-alpha.1.21616.17 - 7.0.0-alpha.1.21612.5 - 7.0.0-alpha.1.21612.5 - 7.0.0-alpha.1.21612.5 - 7.0.0-alpha.1.21612.5 - 7.0.0-alpha.1.21612.5 - 7.0.0-alpha.1.21612.5 + 7.0.0-alpha.1.21616.17 + 7.0.0-alpha.1.21616.17 + 7.0.0-alpha.1.21616.17 + 7.0.0-alpha.1.21616.17 + 7.0.0-alpha.1.21616.17 + 7.0.0-alpha.1.21616.17 2.1.0 - 7.0.0-alpha.1.21611.2 - 7.0.0-alpha.1.21611.2 - 7.0.0-alpha.1.21611.2 - 7.0.0-alpha.1.21611.2 + 7.0.0-alpha.1.21616.1 + 7.0.0-alpha.1.21616.1 + 7.0.0-alpha.1.21616.1 + 7.0.0-alpha.1.21616.1 @@ -159,7 +159,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.2.0-preview-20211214-01 + 17.2.0-preview-20211214-03 diff --git a/test/EndToEnd/ProjectBuildTests.cs b/test/EndToEnd/ProjectBuildTests.cs index 4413f2973..a2d8d3b99 100644 --- a/test/EndToEnd/ProjectBuildTests.cs +++ b/test/EndToEnd/ProjectBuildTests.cs @@ -361,7 +361,7 @@ namespace EndToEnd.Tests [InlineData("winformscontrollib", "VB")] public void ItCanCreateAndBuildTemplatesWithDefaultFramework_Windows(string templateName, string language = "") { - string framework = DetectExpectedDefaultFramework(); + string framework = DetectExpectedDefaultFramework(templateName); TestTemplateCreateAndBuild(templateName, selfContained: true, language: language, framework: $"{framework}-windows"); } @@ -386,7 +386,7 @@ namespace EndToEnd.Tests } } - private static string DetectExpectedDefaultFramework() + private static string DetectExpectedDefaultFramework(string template = "") { string dotnetFolder = Path.GetDirectoryName(RepoDirectoriesProvider.DotnetUnderTest); string[] runtimeFolders = Directory.GetDirectories(Path.Combine(dotnetFolder, "shared", "Microsoft.NETCore.App")); @@ -394,9 +394,16 @@ namespace EndToEnd.Tests int latestMajorVersion = runtimeFolders.Select(folder => int.Parse(Path.GetFileName(folder).Split('.').First())).Max(); if (latestMajorVersion == 7) { - // TODO: Update + // TODO: This block need to be updated when every template updates their default tfm. + // Currently winforms updated their default templates target but not others. + if (template.StartsWith("winforms")) + { + return $"net{latestMajorVersion}.0"; + } + return "net6.0"; } + throw new Exception("Unsupported version of SDK"); }