From 1cb68395e69469eeea3362a2c35b582953ade0f9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 16 Sep 2021 23:14:23 +0000 Subject: [PATCH] [release/6.0.1xx-rc2] Update dependencies from dotnet/sdk (#12000) [release/6.0.1xx-rc2] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-rc.2.21459.14 to 6.0.0-rc.2.21465.8 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-rc.2.21459.14 to 6.0.0-rc.2.21465.8 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.0-rc.2.21459.14 to 6.0.0-rc.2.21465.8 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 6.0.0-rc.2.21460.8 to 6.0.0-rc.2.21464.21 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.6.0: from 6.0.0-rc.2.21460.8 to 6.0.0-rc.2.21464.21 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.2.21460.8 to 6.0.0-rc.2.21464.21 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-rc.2.21460.8 to 6.0.0-rc.2.21464.21 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-rc.2.21460.8 to 6.0.0-rc.2.21464.21 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 6.0.0-rc.2.21460.8 to 6.0.0-rc.2.21464.21 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 6.0.0-rc.2.21460.4 to 6.0.0-rc.2.21465.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rc.2.21460.4 to 6.0.0-rc.2.21465.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rc.2.21460.4 to 6.0.0-rc.2.21465.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21460.4 to 6.0.0-rc.2.21465.1 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rc.2.21460.4 to 6.0.0-rc.2.21465.1 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rc.2.21460.4 to 6.0.0-rc.2.21465.1 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-rc.2.21459.6 to 6.0.100-rtm.21465.1 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 6.0.100-rc.2.21459.6 to 6.0.100-rtm.21465.1 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rc.2.21459.14 to 6.0.0-rc.2.21465.8 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-rc.2.21459.12 to 6.0.0-rtm.21464.18 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rc.2.21459.14 to 6.0.0-rc.2.21465.8 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-rc.2.21459.13 to 6.0.0-rc.2.21465.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.Net.Compilers.Toolset: from 4.0.0-5.21457.19 to 4.0.0-5.21466.5 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.0.0-preview-21460-01 to 17.0.0-preview-21465-01 (parent: Microsoft.NET.Sdk) - NuGet.Build.Tasks: from 6.0.0-preview.4.243 to 6.0.0-rc.244 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21460.8 to 6.0.0-rc.2.21464.21 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.source-build: from 0.1.0-alpha.1.21460.1 to 0.1.0-alpha.1.21460.1 (parent: Microsoft.NET.Sdk) - React to https://github.com/dotnet/templating/issues/3898 --- eng/Version.Details.xml | 106 ++++++++++++++--------------- eng/Versions.props | 44 ++++++------ test/EndToEnd/ProjectBuildTests.cs | 10 +-- 3 files changed, 80 insertions(+), 80 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 36793d075..0a35ce58d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,45 +1,45 @@ - + https://github.com/dotnet/windowsdesktop - d98d7fba12f3adb7787dc0d7ae9d2c2b577b075c + c8bdb0e1de2b34e3aa9a9852e6d5faf8348b946f - + https://github.com/dotnet/windowsdesktop - d98d7fba12f3adb7787dc0d7ae9d2c2b577b075c + c8bdb0e1de2b34e3aa9a9852e6d5faf8348b946f - + https://github.com/dotnet/windowsdesktop - d98d7fba12f3adb7787dc0d7ae9d2c2b577b075c + c8bdb0e1de2b34e3aa9a9852e6d5faf8348b946f - + https://github.com/dotnet/windowsdesktop - d98d7fba12f3adb7787dc0d7ae9d2c2b577b075c + c8bdb0e1de2b34e3aa9a9852e6d5faf8348b946f - + https://github.com/dotnet/runtime - 8bfc0302a28bd94fe5078d9ea489b6a8bc8978ee + b3a9b0b740cce9322b03200db0b4ab736d7cd12d - + https://github.com/dotnet/runtime - 8bfc0302a28bd94fe5078d9ea489b6a8bc8978ee + b3a9b0b740cce9322b03200db0b4ab736d7cd12d - + https://github.com/dotnet/runtime - 8bfc0302a28bd94fe5078d9ea489b6a8bc8978ee + b3a9b0b740cce9322b03200db0b4ab736d7cd12d - + https://github.com/dotnet/runtime - 8bfc0302a28bd94fe5078d9ea489b6a8bc8978ee + b3a9b0b740cce9322b03200db0b4ab736d7cd12d - + https://github.com/dotnet/runtime - 8bfc0302a28bd94fe5078d9ea489b6a8bc8978ee + b3a9b0b740cce9322b03200db0b4ab736d7cd12d - + https://github.com/dotnet/runtime - 8bfc0302a28bd94fe5078d9ea489b6a8bc8978ee + b3a9b0b740cce9322b03200db0b4ab736d7cd12d @@ -47,34 +47,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 8bfc0302a28bd94fe5078d9ea489b6a8bc8978ee + b3a9b0b740cce9322b03200db0b4ab736d7cd12d - + https://github.com/dotnet/aspnetcore - 5433e858eb83a55a3bea110bf14e5eda1359db77 + 62302a1590ead12281bc48d1bdf4db92c9151ee4 - + https://github.com/dotnet/aspnetcore - 5433e858eb83a55a3bea110bf14e5eda1359db77 + 62302a1590ead12281bc48d1bdf4db92c9151ee4 - + https://github.com/dotnet/aspnetcore - 5433e858eb83a55a3bea110bf14e5eda1359db77 + 62302a1590ead12281bc48d1bdf4db92c9151ee4 - + https://github.com/dotnet/aspnetcore - 5433e858eb83a55a3bea110bf14e5eda1359db77 + 62302a1590ead12281bc48d1bdf4db92c9151ee4 - + https://github.com/dotnet/aspnetcore - 5433e858eb83a55a3bea110bf14e5eda1359db77 + 62302a1590ead12281bc48d1bdf4db92c9151ee4 - + https://github.com/dotnet/aspnetcore - 5433e858eb83a55a3bea110bf14e5eda1359db77 + 62302a1590ead12281bc48d1bdf4db92c9151ee4 https://github.com/dotnet/test-templates @@ -89,32 +89,32 @@ baf4b38e4f1dbc637efdb41624acbe05b2ff9f35 - + https://github.com/dotnet/templating - 79209eac8a27bcabf5a064a88abb95f32b91d863 + d691479b3e793e983f4d91f3a935421df1493b08 - + https://github.com/dotnet/templating - 79209eac8a27bcabf5a064a88abb95f32b91d863 + d691479b3e793e983f4d91f3a935421df1493b08 - + https://github.com/dotnet/sdk - 608c77bf1451ee87374541a1b4b04d3bfa9abd66 + 07d3e02bd24011a4bb03e5a6881059b331bbefab - + https://github.com/dotnet/sdk - 608c77bf1451ee87374541a1b4b04d3bfa9abd66 + 07d3e02bd24011a4bb03e5a6881059b331bbefab - + https://github.com/dotnet/winforms - 08b8359d86475f6c5caf2e13b66fb9706e225acf + 66889940e6dd576e0a34f8fb87b6994c9d30fa9e - + https://github.com/dotnet/wpf - 0336b71d5a9c2036e0edbbbe5831453e4d242701 + 8d901b581073bde84dd6f793774b2362637428cf https://github.com/dotnet/fsharp @@ -135,19 +135,19 @@ linker - + https://github.com/dotnet/roslyn - dae39045cd460ba44053ff2af2217da126c25dbf + 756dad67d3f52e4c3872e83af07f158dcb5092d0 - + https://github.com/dotnet/msbuild - 8f208e60995dce87ecd5f0edd313b23ef1d67bb8 + d231437ce1ca297c1db96a33e099b95b2544bb40 - + https://github.com/nuget/nuget.client - f82431ecc38a28f396d527446834c7de679a6722 + f4ae349ec18d1ac5d5e7d1b0ed753e1300e9e157 https://github.com/Microsoft/ApplicationInsights-dotnet @@ -164,7 +164,7 @@ https://github.com/dotnet/source-build - ca07d8763334fa66011ed496d444d68355fb9511 + 3fb25b8db3bec654e37e71a5b2b7fde14444bc2f diff --git a/eng/Versions.props b/eng/Versions.props index 1b7f35177..8c5980591 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,15 +24,15 @@ - 6.0.0-rc.2.21459.12 + 6.0.0-rtm.21464.18 - 6.0.0-rc.2.21459.13 + 6.0.0-rc.2.21465.5 - 6.0.100-rc.2.21459.6 + 6.0.100-rtm.21465.1 @@ -45,44 +45,44 @@ - 6.0.0-rc.2.21460.4 - 6.0.0-rc.2.21460.4 - 6.0.0-rc.2.21460.4 - 6.0.0-rc.2.21460.4 - 6.0.0-rc.2.21460.4 - 6.0.0-rc.2.21460.4 + 6.0.0-rc.2.21465.1 + 6.0.0-rc.2.21465.1 + 6.0.0-rc.2.21465.1 + 6.0.0-rc.2.21465.1 + 6.0.0-rc.2.21465.1 + 6.0.0-rc.2.21465.1 0.2.0 - 6.0.100-rc.2.21460.35 - 6.0.100-rc.2.21460.35 + 6.0.100-rc.2.21466.9 + 6.0.100-rc.2.21466.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-rc.2.21460.8 + 6.0.0-rc.2.21464.21 - 6.0.0-rc.2.21460.8 - 6.0.0-rc.2.21460.8 - 6.0.0-rc.2.21460.8 - 6.0.0-rc.2.21460.8 - 6.0.0-rc.2.21460.8 - 6.0.0-rc.2.21460.8 + 6.0.0-rc.2.21464.21 + 6.0.0-rc.2.21464.21 + 6.0.0-rc.2.21464.21 + 6.0.0-rc.2.21464.21 + 6.0.0-rc.2.21464.21 + 6.0.0-rc.2.21464.21 2.1.0 - 6.0.0-rc.2.21459.14 - 6.0.0-rc.2.21459.14 - 6.0.0-rc.2.21459.14 - 6.0.0-rc.2.21459.14 + 6.0.0-rc.2.21465.8 + 6.0.0-rc.2.21465.8 + 6.0.0-rc.2.21465.8 + 6.0.0-rc.2.21465.8 diff --git a/test/EndToEnd/ProjectBuildTests.cs b/test/EndToEnd/ProjectBuildTests.cs index 63a4a3dd4..4a9f97435 100644 --- a/test/EndToEnd/ProjectBuildTests.cs +++ b/test/EndToEnd/ProjectBuildTests.cs @@ -102,7 +102,7 @@ namespace EndToEnd.Tests .WithWorkingDirectory(projectDirectory) .Execute(publishArgs) .Should().Pass(); - + var selfContainedPublishDir = new DirectoryInfo(projectDirectory) .Sub("bin").Sub("Debug").GetDirectories().FirstOrDefault() .Sub("win-arm64").Sub("publish"); @@ -110,7 +110,7 @@ namespace EndToEnd.Tests selfContainedPublishDir.Should().HaveFilesMatching("System.Windows.Forms.dll", SearchOption.TopDirectoryOnly); selfContainedPublishDir.Should().HaveFilesMatching($"{directory.Name}.dll", SearchOption.TopDirectoryOnly); } - + [WindowsOnlyFact] public void ItCanPublishArm64Wpf() { @@ -165,7 +165,7 @@ namespace EndToEnd.Tests public void DotnetNewShowsCuratedListCorrectly() { string locale = System.Threading.Thread.CurrentThread.CurrentUICulture.Name; - if (!string.IsNullOrWhiteSpace(locale) + if (!string.IsNullOrWhiteSpace(locale) && !locale.StartsWith("en", StringComparison.OrdinalIgnoreCase)) { Console.WriteLine($"[{nameof(DotnetNewShowsCuratedListCorrectly)}] CurrentUICulture: {locale}"); @@ -176,7 +176,7 @@ namespace EndToEnd.Tests string expectedOutput = @"[\-\s]+ [\w \.]+webapp,razor\s+\[C#\][\w\ \/]+ -[\w \.]+blazorwasm\s+\[C#\][\w\ \/]+ +[\w \.]+blazorserver\s+\[C#\][\w\ \/]+ [\w \.]+classlib\s+\[C#\],F#,VB[\w\ \/]+ [\w \.]+console\s+\[C#\],F#,VB[\w\ \/]+ "; @@ -247,7 +247,7 @@ namespace EndToEnd.Tests /// /// The test checks if the template creates the template for correct framework by default. - /// For .NET 6 the templates should create the projects targeting net6.0 + /// For .NET 6 the templates should create the projects targeting net6.0 /// [Theory] [InlineData("console")]