From b76fe590ac588baa9fcf0a47b937b21c705a7687 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 11 Oct 2023 20:18:04 +0000 Subject: [PATCH] [release/8.0.1xx] Update dependencies from dotnet/sdk (#17479) [release/8.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 8.0.0-rtm.23504.7 to 8.0.0-rtm.23509.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0: from 8.0.0-rtm.23504.7 to 8.0.0-rtm.23509.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0: from 8.0.0-rtm.23504.7 to 8.0.0-rtm.23509.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.8.0: from 8.0.0-rtm.23504.8 to 8.0.0-rtm.23509.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 8.0.0-rtm.23504.8 to 8.0.0-rtm.23509.5 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.8.0: from 8.0.0-rtm.23504.8 to 8.0.0-rtm.23509.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 8.0.0-rtm.23504.8 to 8.0.0-rtm.23509.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 8.0.0-rtm.23504.8 to 8.0.0-rtm.23509.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 8.0.0-rtm.23504.8 to 8.0.0-rtm.23509.5 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 8.0.0-rtm.23502.22 to 8.0.0-rtm.23510.7 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 8.0.0-rtm.23502.22 to 8.0.0-rtm.23510.7 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 8.0.0-rtm.23502.22 to 8.0.0-rtm.23510.7 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0: from 8.0.0-rtm.23502.22 to 8.0.0-rtm.23510.7 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 8.0.0-rtm.23502.22 to 8.0.0-rtm.23510.7 (parent: Microsoft.NET.Sdk) - dotnet-user-jwts: from 8.0.0-rtm.23502.22 to 8.0.0-rtm.23510.7 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 8.0.0-rtm.23502.22 to 8.0.0-rtm.23510.7 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-rtm.23504.7 to 8.0.0-rtm.23509.3 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 8.0.0-rtm.23504.13 to 8.0.0-rtm.23509.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-rtm.23504.7 to 8.0.0-rtm.23509.3 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 8.0.0-rtm.23504.3 to 8.0.0-rtm.23509.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.NET.ILLink.Tasks: from 8.0.0-rtm.23504.8 to 8.0.0-rtm.23509.5 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.8.0-3.23504.4 to 4.8.0-3.23510.8 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 8.0.0-rtm.23504.8 to 8.0.0-rtm.23509.5 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport: from 8.0.0-rtm.23477.1 to 8.0.0-rtm.23504.4 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Add parens to the pattern to see if it fixes things --- eng/Version.Details.xml | 108 ++++++++++++++--------------- eng/Versions.props | 50 ++++++------- test/EndToEnd/ProjectBuildTests.cs | 10 +-- 3 files changed, 84 insertions(+), 84 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a1dbc4f44..6bd0edb18 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,46 +5,46 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://github.com/dotnet/windowsdesktop - fbc1fdd82c38765663b256e663a51e55b855f345 + 28cb6ed29636b7db978e83ba1a8a2369584e71f4 - + https://github.com/dotnet/windowsdesktop - fbc1fdd82c38765663b256e663a51e55b855f345 + 28cb6ed29636b7db978e83ba1a8a2369584e71f4 - + https://github.com/dotnet/windowsdesktop - fbc1fdd82c38765663b256e663a51e55b855f345 + 28cb6ed29636b7db978e83ba1a8a2369584e71f4 - + https://github.com/dotnet/windowsdesktop - fbc1fdd82c38765663b256e663a51e55b855f345 + 28cb6ed29636b7db978e83ba1a8a2369584e71f4 - + https://github.com/dotnet/runtime - 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a + a9cc3c80fe43d19a38cacda4c1aecc51fb6eabb1 - + https://github.com/dotnet/runtime - 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a + a9cc3c80fe43d19a38cacda4c1aecc51fb6eabb1 - + https://github.com/dotnet/runtime - 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a + a9cc3c80fe43d19a38cacda4c1aecc51fb6eabb1 - + https://github.com/dotnet/runtime - 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a + a9cc3c80fe43d19a38cacda4c1aecc51fb6eabb1 - + https://github.com/dotnet/runtime - 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a + a9cc3c80fe43d19a38cacda4c1aecc51fb6eabb1 - + https://github.com/dotnet/runtime - 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a + a9cc3c80fe43d19a38cacda4c1aecc51fb6eabb1 @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a + a9cc3c80fe43d19a38cacda4c1aecc51fb6eabb1 - + https://github.com/dotnet/aspnetcore - f37eb785c92218e668cf98e8c50139c1395492ad + 7ffeb436ad029d1e1012372b7bb345ad22770f09 - + https://github.com/dotnet/aspnetcore - f37eb785c92218e668cf98e8c50139c1395492ad + 7ffeb436ad029d1e1012372b7bb345ad22770f09 - + https://github.com/dotnet/aspnetcore - f37eb785c92218e668cf98e8c50139c1395492ad + 7ffeb436ad029d1e1012372b7bb345ad22770f09 - + https://github.com/dotnet/aspnetcore - f37eb785c92218e668cf98e8c50139c1395492ad + 7ffeb436ad029d1e1012372b7bb345ad22770f09 - + https://github.com/dotnet/aspnetcore - f37eb785c92218e668cf98e8c50139c1395492ad + 7ffeb436ad029d1e1012372b7bb345ad22770f09 - + https://github.com/dotnet/aspnetcore - f37eb785c92218e668cf98e8c50139c1395492ad + 7ffeb436ad029d1e1012372b7bb345ad22770f09 - + https://github.com/dotnet/aspnetcore - f37eb785c92218e668cf98e8c50139c1395492ad + 7ffeb436ad029d1e1012372b7bb345ad22770f09 - + https://github.com/dotnet/sdk - 857f22d8f051c090fa367d230aebe9b26450f634 + 0580af0fe7593928c8249420cf245dd6bea645ae - + https://github.com/dotnet/sdk - 857f22d8f051c090fa367d230aebe9b26450f634 + 0580af0fe7593928c8249420cf245dd6bea645ae - + https://github.com/dotnet/sdk - 857f22d8f051c090fa367d230aebe9b26450f634 + 0580af0fe7593928c8249420cf245dd6bea645ae - + https://github.com/dotnet/sdk - 857f22d8f051c090fa367d230aebe9b26450f634 + 0580af0fe7593928c8249420cf245dd6bea645ae https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://github.com/dotnet/winforms - 8226c3cbaf595ae2c6fb8ed7ccd69ae77d647bd4 + 34ebe80d29001d352096758b59ac7696317cc0cc - + https://github.com/dotnet/wpf - b892ae845b9832e0873ef2f7c958c46dc6b3d637 + 50d7731991f3d1c4f1efb94821ecc8c2cb7a1c35 https://github.com/dotnet/fsharp @@ -146,13 +146,13 @@ cf7d549fc0197abaabec19d61d2c20d7a7b089f8 - + https://github.com/dotnet/runtime - 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a + a9cc3c80fe43d19a38cacda4c1aecc51fb6eabb1 - + https://github.com/dotnet/roslyn - 81d9274600db701a8b08ed8af3fd6b00a775cc33 + d49b29ecbf9bd72fe6023ad1b8aad9a8db7e7c3a @@ -168,9 +168,9 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - ae4eaab4a9415d7f87ca7c6dc0b41ea482fa6337 + 0c28b5cfe0f9173000450a3edc808dc8c2b9286e diff --git a/eng/Versions.props b/eng/Versions.props index 4d9ec9875..71e20a014 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.0-rtm.23504.13 + 8.0.0-rtm.23509.3 - 8.0.0-rtm.23504.3 + 8.0.0-rtm.23509.3 @@ -72,50 +72,50 @@ - 8.0.0-rtm.23502.22 - 8.0.0-rtm.23502.22 - 8.0.0-rtm.23502.22 - 8.0.0-rtm.23502.22 - 8.0.0-rtm.23502.22 - 8.0.0-rtm.23502.22 - 8.0.0-rtm.23502.22 + 8.0.0-rtm.23510.7 + 8.0.0-rtm.23510.7 + 8.0.0-rtm.23510.7 + 8.0.0-rtm.23510.7 + 8.0.0-rtm.23510.7 + 8.0.0-rtm.23510.7 + 8.0.0-rtm.23510.7 0.2.0 - 8.0.100-rtm.23506.7 - 8.0.100-rtm.23506.7 - 8.0.100-rtm.23506.7 + 8.0.100-rtm.23511.5 + 8.0.100-rtm.23511.5 + 8.0.100-rtm.23511.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.8.0-3.23504.4 + 4.8.0-3.23510.8 - 8.0.0-rtm.23504.8 + 8.0.0-rtm.23509.5 - 8.0.0-rtm.23504.8 - 8.0.0-rtm.23504.8 - 8.0.0-rtm.23504.8 - 8.0.0-rtm.23504.8 - 8.0.0-rtm.23504.8 - 8.0.0-rtm.23504.8 + 8.0.0-rtm.23509.5 + 8.0.0-rtm.23509.5 + 8.0.0-rtm.23509.5 + 8.0.0-rtm.23509.5 + 8.0.0-rtm.23509.5 + 8.0.0-rtm.23509.5 2.1.0 - 8.0.0-rtm.23504.7 - 8.0.0-rtm.23504.7 - 8.0.0-rtm.23504.7 - 8.0.0-rtm.23504.7 + 8.0.0-rtm.23509.3 + 8.0.0-rtm.23509.3 + 8.0.0-rtm.23509.3 + 8.0.0-rtm.23509.3 @@ -247,7 +247,7 @@ 13.3.8825-net8-rc1 16.4.8825-net8-rc1 - 8.0.0-rtm.23477.1 + 8.0.0-rtm.23504.4 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) diff --git a/test/EndToEnd/ProjectBuildTests.cs b/test/EndToEnd/ProjectBuildTests.cs index faad825c8..01925eb5f 100644 --- a/test/EndToEnd/ProjectBuildTests.cs +++ b/test/EndToEnd/ProjectBuildTests.cs @@ -202,16 +202,16 @@ namespace EndToEnd.Tests string expectedOutput = @"[\-\s]+ -[\w \.]+webapp,razor\s+\[C#\][\w\ \/]+ -[\w \.]+classlib\s+\[C#\],F#,VB[\w\ \/]+ -[\w \.]+console\s+\[C#\],F#,VB[\w\ \/]+ +[\w \.\(\)]+webapp,razor\s+\[C#\][\w\ \/]+ +[\w \.\(\)]+classlib\s+\[C#\],F#,VB[\w\ \/]+ +[\w \.\(\)]+console\s+\[C#\],F#,VB[\w\ \/]+ "; if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) { expectedOutput += -@"[\w \.]+winforms\s+\[C#\],VB[\w\ \/]+ -[\w \.]+\wpf\s+\[C#\],VB[\w\ \/]+ +@"[\w \.\(\)]+winforms\s+\[C#\],VB[\w\ \/]+ +[\w \.\(\)]+\wpf\s+\[C#\],VB[\w\ \/]+ "; } //list should end with new line