From e6d550acf1a06d47e4c49c4a97a0d5d6d85361dd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 17 Oct 2023 19:23:57 +0000 Subject: [PATCH 1/4] Update dependencies from https://github.com/dotnet/sdk build 20231017.18 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-rtm.23506.7 -> To Version 8.0.200-preview.23517.18 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-rtm.23504.7 -> To Version 8.0.0-rtm.23516.9 (parent: Microsoft.NET.Sdk --- NuGet.config | 1 - eng/Version.Details.xml | 128 ++++++++++++++++++++-------------------- eng/Versions.props | 54 ++++++++--------- 3 files changed, 91 insertions(+), 92 deletions(-) diff --git a/NuGet.config b/NuGet.config index e29400586..9fcb5685f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a1dbc4f44..c8454b071 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 + e846ac57cea8f922cd5eb9b17fb4385db5af2a0f - + https://github.com/dotnet/windowsdesktop - fbc1fdd82c38765663b256e663a51e55b855f345 + e846ac57cea8f922cd5eb9b17fb4385db5af2a0f - + https://github.com/dotnet/windowsdesktop - fbc1fdd82c38765663b256e663a51e55b855f345 + e846ac57cea8f922cd5eb9b17fb4385db5af2a0f - + https://github.com/dotnet/windowsdesktop - fbc1fdd82c38765663b256e663a51e55b855f345 + e846ac57cea8f922cd5eb9b17fb4385db5af2a0f - + https://github.com/dotnet/runtime - 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a + 567f81e719091bd1ba3c751d49bacee2c6a45e66 - + https://github.com/dotnet/runtime - 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a + 567f81e719091bd1ba3c751d49bacee2c6a45e66 - + https://github.com/dotnet/runtime - 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a + 567f81e719091bd1ba3c751d49bacee2c6a45e66 - + https://github.com/dotnet/runtime - 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a + 567f81e719091bd1ba3c751d49bacee2c6a45e66 - + https://github.com/dotnet/runtime - 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a + 567f81e719091bd1ba3c751d49bacee2c6a45e66 - + https://github.com/dotnet/runtime - 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a + 567f81e719091bd1ba3c751d49bacee2c6a45e66 @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a + 567f81e719091bd1ba3c751d49bacee2c6a45e66 - + https://github.com/dotnet/aspnetcore - f37eb785c92218e668cf98e8c50139c1395492ad + 02bdf7077b8d96039bd39d6189a1abdefc41e65e - + https://github.com/dotnet/aspnetcore - f37eb785c92218e668cf98e8c50139c1395492ad + 02bdf7077b8d96039bd39d6189a1abdefc41e65e - + https://github.com/dotnet/aspnetcore - f37eb785c92218e668cf98e8c50139c1395492ad + 02bdf7077b8d96039bd39d6189a1abdefc41e65e - + https://github.com/dotnet/aspnetcore - f37eb785c92218e668cf98e8c50139c1395492ad + 02bdf7077b8d96039bd39d6189a1abdefc41e65e - + https://github.com/dotnet/aspnetcore - f37eb785c92218e668cf98e8c50139c1395492ad + 02bdf7077b8d96039bd39d6189a1abdefc41e65e - + https://github.com/dotnet/aspnetcore - f37eb785c92218e668cf98e8c50139c1395492ad + 02bdf7077b8d96039bd39d6189a1abdefc41e65e - + https://github.com/dotnet/aspnetcore - f37eb785c92218e668cf98e8c50139c1395492ad + 02bdf7077b8d96039bd39d6189a1abdefc41e65e - + https://github.com/dotnet/sdk - 857f22d8f051c090fa367d230aebe9b26450f634 + a405ba0950989e9af2f78a30c465450480ce9899 - + https://github.com/dotnet/sdk - 857f22d8f051c090fa367d230aebe9b26450f634 + a405ba0950989e9af2f78a30c465450480ce9899 - + https://github.com/dotnet/sdk - 857f22d8f051c090fa367d230aebe9b26450f634 + a405ba0950989e9af2f78a30c465450480ce9899 - + https://github.com/dotnet/sdk - 857f22d8f051c090fa367d230aebe9b26450f634 + a405ba0950989e9af2f78a30c465450480ce9899 https://github.com/dotnet/test-templates @@ -124,53 +124,53 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://github.com/dotnet/winforms - 8226c3cbaf595ae2c6fb8ed7ccd69ae77d647bd4 + ecdff75cfde7dc49147be791da1ec15a4eee21a3 - + https://github.com/dotnet/wpf - b892ae845b9832e0873ef2f7c958c46dc6b3d637 + babeeb65b164c87633db21a20223c8d99e2185e9 - + https://github.com/dotnet/fsharp - 38b2bac6361e9b75dc2b51c0f2b78b008872767d + d1de6a8d1e6e18c636cf55894b5158ab0e324394 - + https://github.com/dotnet/fsharp - 38b2bac6361e9b75dc2b51c0f2b78b008872767d + d1de6a8d1e6e18c636cf55894b5158ab0e324394 - + https://github.com/microsoft/vstest - cf7d549fc0197abaabec19d61d2c20d7a7b089f8 + 5f9cc79b6542489218124e304c7118e862ae286f - + https://github.com/dotnet/runtime - 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a + 567f81e719091bd1ba3c751d49bacee2c6a45e66 - + https://github.com/dotnet/roslyn - 81d9274600db701a8b08ed8af3fd6b00a775cc33 + fe6cc3e7227caafafd76ffd1f3f8981926edf3b6 - + https://github.com/dotnet/msbuild - 585e09762f07aa6ec291cb75cf7e98bdded8e373 + 25fdeb3c8c2608f248faec3d6d37733ae144bbbb - + https://github.com/nuget/nuget.client - 0dd5a1ea536201af94725353e4bc711d7560b246 + 62c02514a26464c03574137628e33ed3690c06ef 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 6064718d0..f82990531 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.0-rtm.23504.13 + 8.0.0-rtm.23516.9 - 8.0.0-rtm.23504.3 + 8.0.0-rtm.23516.12 @@ -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.23516.6 + 8.0.0-rtm.23516.6 + 8.0.0-rtm.23516.6 + 8.0.0-rtm.23516.6 + 8.0.0-rtm.23516.6 + 8.0.0-rtm.23516.6 + 8.0.0-rtm.23516.6 0.2.0 - 8.0.100-rtm.23506.7 - 8.0.100-rtm.23506.7 - 8.0.100-rtm.23506.7 + 8.0.200-preview.23517.18 + 8.0.200-preview.23517.18 + 8.0.200-preview.23517.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.8.0-3.23504.4 + 4.9.0-1.23513.7 - 8.0.0-rtm.23504.8 + 8.0.0-rtm.23516.15 - 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.23516.15 + 8.0.0-rtm.23516.15 + 8.0.0-rtm.23516.15 + 8.0.0-rtm.23516.15 + 8.0.0-rtm.23516.15 + 8.0.0-rtm.23516.15 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.23516.9 + 8.0.0-rtm.23516.9 + 8.0.0-rtm.23516.9 + 8.0.0-rtm.23516.9 @@ -127,7 +127,7 @@ - 6.8.0-rc.122 + 6.9.0-preview.1.16 @@ -232,7 +232,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.8.0-release-23468-02 + 17.9.0-preview-23515-01 8.0.0-alpha.1.22557.12 @@ -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*`)) From 3ae2c99e1da854b78b7970c822493e5e3f93446b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 17 Oct 2023 21:07:02 +0000 Subject: [PATCH 2/4] Update dependencies from https://github.com/dotnet/sdk build 20231017.19 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-rtm.23506.7 -> To Version 8.0.200-preview.23517.19 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-rtm.23504.7 -> To Version 8.0.0-rtm.23516.9 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c8454b071..e53a5fa2a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://github.com/dotnet/aspnetcore 02bdf7077b8d96039bd39d6189a1abdefc41e65e - + https://github.com/dotnet/sdk - a405ba0950989e9af2f78a30c465450480ce9899 + d7740eb73034be820b475cf5b64a6ee5f540c3e8 - + https://github.com/dotnet/sdk - a405ba0950989e9af2f78a30c465450480ce9899 + d7740eb73034be820b475cf5b64a6ee5f540c3e8 - + https://github.com/dotnet/sdk - a405ba0950989e9af2f78a30c465450480ce9899 + d7740eb73034be820b475cf5b64a6ee5f540c3e8 - + https://github.com/dotnet/sdk - a405ba0950989e9af2f78a30c465450480ce9899 + d7740eb73034be820b475cf5b64a6ee5f540c3e8 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index f82990531..931984de9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23517.18 - 8.0.200-preview.23517.18 - 8.0.200-preview.23517.18 + 8.0.200-preview.23517.19 + 8.0.200-preview.23517.19 + 8.0.200-preview.23517.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9fa4d237118f0788d0af30eff5ae69bd216b3691 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 17 Oct 2023 22:00:10 +0000 Subject: [PATCH 3/4] Update dependencies from https://github.com/dotnet/sdk build 20231017.27 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-rtm.23506.7 -> To Version 8.0.200-preview.23517.27 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-rtm.23504.7 -> To Version 8.0.0-rtm.23516.9 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e53a5fa2a..679346b36 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://github.com/dotnet/aspnetcore 02bdf7077b8d96039bd39d6189a1abdefc41e65e - + https://github.com/dotnet/sdk - d7740eb73034be820b475cf5b64a6ee5f540c3e8 + 1807d1df497f379d30060a553027fab6d8b804d9 - + https://github.com/dotnet/sdk - d7740eb73034be820b475cf5b64a6ee5f540c3e8 + 1807d1df497f379d30060a553027fab6d8b804d9 - + https://github.com/dotnet/sdk - d7740eb73034be820b475cf5b64a6ee5f540c3e8 + 1807d1df497f379d30060a553027fab6d8b804d9 - + https://github.com/dotnet/sdk - d7740eb73034be820b475cf5b64a6ee5f540c3e8 + 1807d1df497f379d30060a553027fab6d8b804d9 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 931984de9..a80f6d559 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23517.19 - 8.0.200-preview.23517.19 - 8.0.200-preview.23517.19 + 8.0.200-preview.23517.27 + 8.0.200-preview.23517.27 + 8.0.200-preview.23517.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d77c79b49b58ac005c0575a83aefa79923752e0b Mon Sep 17 00:00:00 2001 From: Larry Ewing Date: Wed, 11 Oct 2023 12:02:22 -0500 Subject: [PATCH 4/4] Add parens to the pattern to see if it fixes things --- test/EndToEnd/ProjectBuildTests.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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