From 35719e2fbb674a28266903cc604910133672f6da Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 21 Sep 2021 19:41:55 +0000 Subject: [PATCH] [release/6.0.1xx] Update dependencies from dotnet/sdk (#12005) [release/6.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-rc.2.21461.2 to 6.0.0-rtm.21470.4 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-rc.2.21461.2 to 6.0.0-rtm.21470.4 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.0-rc.2.21461.2 to 6.0.0-rtm.21470.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 6.0.0-rc.2.21461.1 to 6.0.0-rtm.21470.22 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.6.0: from 6.0.0-rc.2.21461.1 to 6.0.0-rtm.21470.22 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.2.21461.1 to 6.0.0-rtm.21470.22 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-rc.2.21461.1 to 6.0.0-rtm.21470.22 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-rc.2.21461.1 to 6.0.0-rtm.21470.22 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 6.0.0-rc.2.21461.1 to 6.0.0-rtm.21470.22 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 6.0.0-rc.2.21462.1 to 6.0.0-rtm.21467.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rc.2.21462.1 to 6.0.0-rtm.21467.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rc.2.21462.1 to 6.0.0-rtm.21467.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21462.1 to 6.0.0-rtm.21467.1 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-rc.2.21462.1 to 6.0.0-rtm.21467.1 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-rc.2.21462.1 to 6.0.0-rtm.21467.1 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-rc.2.21463.2 to 6.0.100-rtm.21465.1 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 6.0.100-rc.2.21463.2 to 6.0.100-rtm.21465.1 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rc.2.21461.2 to 6.0.0-rtm.21470.4 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-rc.2.21461.3 to 6.0.0-rtm.21466.9 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rc.2.21461.2 to 6.0.0-rtm.21470.4 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-rc.2.21461.2 to 6.0.0-rtm.21466.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.Net.Compilers.Toolset: from 4.0.0-5.21457.19 to 4.0.0-5.21471.2 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.0.0-preview-21463-01 to 17.0.0-preview-21470-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.21461.1 to 6.0.0-rtm.21470.22 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Workload.Emscripten.Manifest-6.0.100: from 6.0.0-rc.2.21451.1 to 6.0.0-rc.2.21464.1 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.6.0) - Porting Vlada's change from https://github.com/dotnet/installer/pull/11981 over into 6.0.1xx as it's needed in this PR. - Disable test execution for the ES leg for now as it's triggering failures that will take time to investigate if we decide we want to keep this leg: https://dev.azure.com/dnceng/public/_build/results?buildId=1375668&view=ms.vss-test-web.build-test-results-tab --- .vsts-ci.yml | 2 +- eng/Version.Details.xml | 106 ++++++++++++++--------------- eng/Versions.props | 46 ++++++------- test/EndToEnd/ProjectBuildTests.cs | 2 +- 4 files changed, 78 insertions(+), 78 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 75d9f9f82..2e6b0b2bc 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -75,7 +75,7 @@ stages: _BuildArchitecture: x64 _DOTNET_CLI_UI_LANGUAGE: es _AdditionalBuildParameters: '' - _TestArg: $(_WindowsTestArg) + _TestArg: '' # Internal-only builds ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: Build_Release_x86: diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5b505cd04..4876a4b77 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,45 +1,45 @@ - + https://github.com/dotnet/windowsdesktop - 8da4caa78db8e0bfb18386d4c6ca943944551f04 + 116ac60a07de0a9e3a99bd6e6fb16b6336ae3edf - + https://github.com/dotnet/windowsdesktop - 8da4caa78db8e0bfb18386d4c6ca943944551f04 + 116ac60a07de0a9e3a99bd6e6fb16b6336ae3edf - + https://github.com/dotnet/windowsdesktop - 8da4caa78db8e0bfb18386d4c6ca943944551f04 + 116ac60a07de0a9e3a99bd6e6fb16b6336ae3edf - + https://github.com/dotnet/windowsdesktop - 8da4caa78db8e0bfb18386d4c6ca943944551f04 + 116ac60a07de0a9e3a99bd6e6fb16b6336ae3edf - + https://github.com/dotnet/runtime - 71fe9fb8ecc11197ad8e7bee0a6c4317a667327c + da9d3777afe61bbcfd16ff70ca150433370b4139 - + https://github.com/dotnet/runtime - 71fe9fb8ecc11197ad8e7bee0a6c4317a667327c + da9d3777afe61bbcfd16ff70ca150433370b4139 - + https://github.com/dotnet/runtime - 71fe9fb8ecc11197ad8e7bee0a6c4317a667327c + da9d3777afe61bbcfd16ff70ca150433370b4139 - + https://github.com/dotnet/runtime - 71fe9fb8ecc11197ad8e7bee0a6c4317a667327c + da9d3777afe61bbcfd16ff70ca150433370b4139 - + https://github.com/dotnet/runtime - 71fe9fb8ecc11197ad8e7bee0a6c4317a667327c + da9d3777afe61bbcfd16ff70ca150433370b4139 - + https://github.com/dotnet/runtime - 71fe9fb8ecc11197ad8e7bee0a6c4317a667327c + da9d3777afe61bbcfd16ff70ca150433370b4139 @@ -47,34 +47,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 71fe9fb8ecc11197ad8e7bee0a6c4317a667327c + da9d3777afe61bbcfd16ff70ca150433370b4139 - + https://github.com/dotnet/aspnetcore - baf21f6cf308b81e25cd5c13f7e0bc88ee2488cc + 2fb20b4415cf1402ec437c081d79d8466c6d4e1d - + https://github.com/dotnet/aspnetcore - baf21f6cf308b81e25cd5c13f7e0bc88ee2488cc + 2fb20b4415cf1402ec437c081d79d8466c6d4e1d - + https://github.com/dotnet/aspnetcore - baf21f6cf308b81e25cd5c13f7e0bc88ee2488cc + 2fb20b4415cf1402ec437c081d79d8466c6d4e1d - + https://github.com/dotnet/aspnetcore - baf21f6cf308b81e25cd5c13f7e0bc88ee2488cc + 2fb20b4415cf1402ec437c081d79d8466c6d4e1d - + https://github.com/dotnet/aspnetcore - baf21f6cf308b81e25cd5c13f7e0bc88ee2488cc + 2fb20b4415cf1402ec437c081d79d8466c6d4e1d - + https://github.com/dotnet/aspnetcore - baf21f6cf308b81e25cd5c13f7e0bc88ee2488cc + 2fb20b4415cf1402ec437c081d79d8466c6d4e1d https://github.com/dotnet/test-templates @@ -89,32 +89,32 @@ baf4b38e4f1dbc637efdb41624acbe05b2ff9f35 - + https://github.com/dotnet/templating - 7b1cdc82ac330e5dbb10776173299214619422ac + d691479b3e793e983f4d91f3a935421df1493b08 - + https://github.com/dotnet/templating - 7b1cdc82ac330e5dbb10776173299214619422ac + d691479b3e793e983f4d91f3a935421df1493b08 - + https://github.com/dotnet/sdk - 09168af0a7859da29506d2b73ea08d05513a64bb + af0f154c637c7d2c2be5e7bb01c91645de40fc80 - + https://github.com/dotnet/sdk - 09168af0a7859da29506d2b73ea08d05513a64bb + af0f154c637c7d2c2be5e7bb01c91645de40fc80 - + https://github.com/dotnet/winforms - fe2c8e79cc6bb67d9ef7c96c5b47364ddfbdc30f + 5f525932becdb8846d29136db1e832e27645e7db - + https://github.com/dotnet/wpf - 61634fd9e064574c69a05cbab63e8df3c522f1bd + 004bd018c45002ccc60a06433d5bf1c47bc24187 https://github.com/dotnet/fsharp @@ -135,19 +135,19 @@ linker - + https://github.com/dotnet/roslyn - dae39045cd460ba44053ff2af2217da126c25dbf + 556b14d618a1f01a6a27791a70cb92995368a05b - + https://github.com/dotnet/msbuild - e3e141ff09f1bae32db7ed00f33b17794e66a687 + cb055d28fb0fd51ba872f46105408e7592e6cea8 - + https://github.com/nuget/nuget.client - f82431ecc38a28f396d527446834c7de679a6722 + f4ae349ec18d1ac5d5e7d1b0ed753e1300e9e157 https://github.com/Microsoft/ApplicationInsights-dotnet @@ -158,7 +158,7 @@ https://github.com/aspnet/xdt c01a538851a8ab1a1fbeb2e6243f391fff7587b4 - + https://github.com/dotnet/emsdk 9838ec0843442f761488cfec9cf34612c9f675e6 diff --git a/eng/Versions.props b/eng/Versions.props index 6b3d2b933..81eeab1dd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.0-rc.2.21461.3 + 6.0.0-rtm.21466.9 - 6.0.0-rc.2.21461.2 + 6.0.0-rtm.21466.7 - 6.0.100-rc.2.21463.2 + 6.0.100-rtm.21465.1 @@ -44,44 +44,44 @@ - 6.0.0-rc.2.21462.1 - 6.0.0-rc.2.21462.1 - 6.0.0-rc.2.21462.1 - 6.0.0-rc.2.21462.1 - 6.0.0-rc.2.21462.1 - 6.0.0-rc.2.21462.1 + 6.0.0-rtm.21467.1 + 6.0.0-rtm.21467.1 + 6.0.0-rtm.21467.1 + 6.0.0-rtm.21467.1 + 6.0.0-rtm.21467.1 + 6.0.0-rtm.21467.1 0.2.0 - 6.0.100-rc.2.21463.10 - 6.0.100-rc.2.21463.10 + 6.0.100-rtm.21471.24 + 6.0.100-rtm.21471.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-rc.2.21461.1 + 6.0.0-rtm.21470.22 - 6.0.0-rc.2.21461.1 - 6.0.0-rc.2.21461.1 - 6.0.0-rc.2.21461.1 - 6.0.0-rc.2.21461.1 - 6.0.0-rc.2.21461.1 - 6.0.0-rc.2.21461.1 + 6.0.0-rtm.21470.22 + 6.0.0-rtm.21470.22 + 6.0.0-rtm.21470.22 + 6.0.0-rtm.21470.22 + 6.0.0-rtm.21470.22 + 6.0.0-rtm.21470.22 2.1.0 - 6.0.0-rc.2.21461.2 - 6.0.0-rc.2.21461.2 - 6.0.0-rc.2.21461.2 - 6.0.0-rc.2.21461.2 + 6.0.0-rtm.21470.4 + 6.0.0-rtm.21470.4 + 6.0.0-rtm.21470.4 + 6.0.0-rtm.21470.4 @@ -171,7 +171,7 @@ 12.0.100-rc.1.496 15.0.100-rc.1.496 $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.0-rc.2.21451.1 + 6.0.0-rc.2.21464.1 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) diff --git a/test/EndToEnd/ProjectBuildTests.cs b/test/EndToEnd/ProjectBuildTests.cs index 63a4a3dd4..fad27e88f 100644 --- a/test/EndToEnd/ProjectBuildTests.cs +++ b/test/EndToEnd/ProjectBuildTests.cs @@ -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\ \/]+ ";