From 094a00ed794ec295c800d3e1a1a7f83d656e8c57 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 21 Jun 2023 23:57:03 +0000 Subject: [PATCH 1/4] Update dependencies from https://github.com/dotnet/sdk build 20230621.30 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.6.23321.12 -> To Version 8.0.100-preview.6.23321.30 --- 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 c5be006ee..0c6e4a640 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates e713da5f1f9a4b5918810af40d1a2867d46c8b85 - + https://github.com/dotnet/sdk - 93e55d1c564231556a4ea0b713a248c9e4359b9e + bc7c5a3823e124125101055ae176b1a63f37732a - + https://github.com/dotnet/sdk - 93e55d1c564231556a4ea0b713a248c9e4359b9e + bc7c5a3823e124125101055ae176b1a63f37732a - + https://github.com/dotnet/sdk - 93e55d1c564231556a4ea0b713a248c9e4359b9e + bc7c5a3823e124125101055ae176b1a63f37732a - + https://github.com/dotnet/sdk - 93e55d1c564231556a4ea0b713a248c9e4359b9e + bc7c5a3823e124125101055ae176b1a63f37732a diff --git a/eng/Versions.props b/eng/Versions.props index d7a37b89e..6db0a26a7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -81,9 +81,9 @@ - 8.0.100-preview.6.23321.12 - 8.0.100-preview.6.23321.12 - 8.0.100-preview.6.23321.12 + 8.0.100-preview.6.23321.30 + 8.0.100-preview.6.23321.30 + 8.0.100-preview.6.23321.30 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 72bf4d818c3370c86d849c555423ed12fb243d3b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 22 Jun 2023 00:57:08 +0000 Subject: [PATCH 2/4] Update dependencies from https://github.com/dotnet/sdk build 20230621.35 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.6.23321.12 -> To Version 8.0.100-preview.6.23321.35 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,NuGet.Build.Tasks From Version 8.0.0-preview.6.23320.4 -> To Version 8.0.0-preview.7.23321.5 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0c6e4a640..765febc9c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/windowsdesktop - a220420021ba8a8047ff26b3e86c9fccf6725a5c + 7b256632413443d00be4dc8f186ed3c1ee32c3ca - + https://github.com/dotnet/windowsdesktop - a220420021ba8a8047ff26b3e86c9fccf6725a5c + 7b256632413443d00be4dc8f186ed3c1ee32c3ca - + https://github.com/dotnet/windowsdesktop - a220420021ba8a8047ff26b3e86c9fccf6725a5c + 7b256632413443d00be4dc8f186ed3c1ee32c3ca - + https://github.com/dotnet/windowsdesktop - a220420021ba8a8047ff26b3e86c9fccf6725a5c + 7b256632413443d00be4dc8f186ed3c1ee32c3ca https://github.com/dotnet/runtime @@ -102,31 +102,31 @@ https://github.com/dotnet/test-templates e713da5f1f9a4b5918810af40d1a2867d46c8b85 - + https://github.com/dotnet/sdk - bc7c5a3823e124125101055ae176b1a63f37732a + 92adb1ff5b5fdf0f6fc8ae441e4e74d18481e96a - + https://github.com/dotnet/sdk - bc7c5a3823e124125101055ae176b1a63f37732a + 92adb1ff5b5fdf0f6fc8ae441e4e74d18481e96a - + https://github.com/dotnet/sdk - bc7c5a3823e124125101055ae176b1a63f37732a + 92adb1ff5b5fdf0f6fc8ae441e4e74d18481e96a - + https://github.com/dotnet/sdk - bc7c5a3823e124125101055ae176b1a63f37732a + 92adb1ff5b5fdf0f6fc8ae441e4e74d18481e96a - + https://github.com/dotnet/winforms - c21d0511b6c385922521e62bed9cf8884a30ec53 + b83e2489634e7024280a05e17c6573b375e19938 - + https://github.com/dotnet/wpf - fd8fc8064a119961824319b637a8048ffbb36936 + 57a882d526918751f7bcef09639699ca5f062279 https://github.com/dotnet/fsharp @@ -156,9 +156,9 @@ b58ecd263b4ae464412fde58aff2d7498370ce4f - + https://github.com/nuget/nuget.client - 488693efb590056b7f9e07d3a376d17c60d7f9e6 + 7672998c625fe99464d221d5daa0685f7462a365 diff --git a/eng/Versions.props b/eng/Versions.props index 6db0a26a7..57e52dc6f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,11 +44,11 @@ - 8.0.0-preview.6.23319.1 + 8.0.0-preview.6.23320.8 - 8.0.0-preview.6.23320.1 + 8.0.0-preview.7.23321.2 @@ -81,9 +81,9 @@ - 8.0.100-preview.6.23321.30 - 8.0.100-preview.6.23321.30 - 8.0.100-preview.6.23321.30 + 8.0.100-preview.6.23321.35 + 8.0.100-preview.6.23321.35 + 8.0.100-preview.6.23321.35 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -108,10 +108,10 @@ - 8.0.0-preview.6.23320.4 - 8.0.0-preview.6.23320.4 - 8.0.0-preview.6.23320.4 - 8.0.0-preview.6.23320.4 + 8.0.0-preview.7.23321.5 + 8.0.0-preview.7.23321.5 + 8.0.0-preview.7.23321.5 + 8.0.0-preview.7.23321.5 @@ -123,7 +123,7 @@ - 6.7.0-preview.3.93 + 6.7.0-rc.100 From 6c0c1444a79042fa30fdc6da6a30c1ba0e44373e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 22 Jun 2023 01:56:40 +0000 Subject: [PATCH 3/4] Update dependencies from https://github.com/dotnet/sdk build 20230621.38 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.6.23321.12 -> To Version 8.0.100-preview.7.23321.38 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.NET.ILLink.Tasks,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.6.23320.4 -> To Version 8.0.0-preview.7.23321.5 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 34 +++++++++--------- 2 files changed, 55 insertions(+), 55 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 765febc9c..dd188d301 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop 7b256632413443d00be4dc8f186ed3c1ee32c3ca - + https://github.com/dotnet/runtime - f644e5be3268064485fb74c3c9cb5735e446df4a + 5fd32d998950187970181f55967a715b43ef7797 - + https://github.com/dotnet/runtime - f644e5be3268064485fb74c3c9cb5735e446df4a + 5fd32d998950187970181f55967a715b43ef7797 - + https://github.com/dotnet/runtime - f644e5be3268064485fb74c3c9cb5735e446df4a + 5fd32d998950187970181f55967a715b43ef7797 - + https://github.com/dotnet/runtime - f644e5be3268064485fb74c3c9cb5735e446df4a + 5fd32d998950187970181f55967a715b43ef7797 - + https://github.com/dotnet/runtime - f644e5be3268064485fb74c3c9cb5735e446df4a + 5fd32d998950187970181f55967a715b43ef7797 - + https://github.com/dotnet/runtime - f644e5be3268064485fb74c3c9cb5735e446df4a + 5fd32d998950187970181f55967a715b43ef7797 @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - f644e5be3268064485fb74c3c9cb5735e446df4a + 5fd32d998950187970181f55967a715b43ef7797 - + https://github.com/dotnet/aspnetcore - 53845260d1ffa1a90fe4c499142bc6709dddeacf + 3926560342db8fa6be0217f76088cc913e3ab573 - + https://github.com/dotnet/aspnetcore - 53845260d1ffa1a90fe4c499142bc6709dddeacf + 3926560342db8fa6be0217f76088cc913e3ab573 - + https://github.com/dotnet/aspnetcore - 53845260d1ffa1a90fe4c499142bc6709dddeacf + 3926560342db8fa6be0217f76088cc913e3ab573 - + https://github.com/dotnet/aspnetcore - 53845260d1ffa1a90fe4c499142bc6709dddeacf + 3926560342db8fa6be0217f76088cc913e3ab573 - + https://github.com/dotnet/aspnetcore - 53845260d1ffa1a90fe4c499142bc6709dddeacf + 3926560342db8fa6be0217f76088cc913e3ab573 - + https://github.com/dotnet/aspnetcore - 53845260d1ffa1a90fe4c499142bc6709dddeacf + 3926560342db8fa6be0217f76088cc913e3ab573 - + https://github.com/dotnet/aspnetcore - 53845260d1ffa1a90fe4c499142bc6709dddeacf + 3926560342db8fa6be0217f76088cc913e3ab573 https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates e713da5f1f9a4b5918810af40d1a2867d46c8b85 - + https://github.com/dotnet/sdk - 92adb1ff5b5fdf0f6fc8ae441e4e74d18481e96a + 258f5ce9eef56801c88495b89183edd45bfd22b6 - + https://github.com/dotnet/sdk - 92adb1ff5b5fdf0f6fc8ae441e4e74d18481e96a + 258f5ce9eef56801c88495b89183edd45bfd22b6 - + https://github.com/dotnet/sdk - 92adb1ff5b5fdf0f6fc8ae441e4e74d18481e96a + 258f5ce9eef56801c88495b89183edd45bfd22b6 - + https://github.com/dotnet/sdk - 92adb1ff5b5fdf0f6fc8ae441e4e74d18481e96a + 258f5ce9eef56801c88495b89183edd45bfd22b6 @@ -142,9 +142,9 @@ 919ec8358820228cc5fa77ef000051c1d6875399 - + https://github.com/dotnet/runtime - f644e5be3268064485fb74c3c9cb5735e446df4a + 5fd32d998950187970181f55967a715b43ef7797 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 57e52dc6f..73324ab4c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,22 +68,22 @@ - 8.0.0-preview.6.23320.14 - 8.0.0-preview.6.23320.14 - 8.0.0-preview.6.23320.14 - 8.0.0-preview.6.23320.14 - 8.0.0-preview.6.23320.14 - 8.0.0-preview.6.23320.14 - 8.0.0-preview.6.23320.14 + 8.0.0-preview.6.23321.13 + 8.0.0-preview.6.23321.13 + 8.0.0-preview.6.23321.13 + 8.0.0-preview.6.23321.13 + 8.0.0-preview.6.23321.13 + 8.0.0-preview.6.23321.13 + 8.0.0-preview.6.23321.13 0.2.0 - 8.0.100-preview.6.23321.35 - 8.0.100-preview.6.23321.35 - 8.0.100-preview.6.23321.35 + 8.0.100-preview.7.23321.38 + 8.0.100-preview.7.23321.38 + 8.0.100-preview.7.23321.38 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -94,16 +94,16 @@ - 8.0.0-preview.6.23321.2 + 8.0.0-preview.6.23321.6 - 8.0.0-preview.6.23321.2 - 8.0.0-preview.6.23321.2 - 8.0.0-preview.6.23321.2 - 8.0.0-preview.6.23321.2 - 8.0.0-preview.6.23321.2 - 8.0.0-preview.6.23321.2 + 8.0.0-preview.6.23321.6 + 8.0.0-preview.6.23321.6 + 8.0.0-preview.6.23321.6 + 8.0.0-preview.6.23321.6 + 8.0.0-preview.6.23321.6 + 8.0.0-preview.6.23321.6 2.1.0 From 6eaaf3e9621a846c65d31247cb8bade6e61b8b25 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 22 Jun 2023 11:22:41 -0700 Subject: [PATCH 4/4] Remove blazor server from the installer tests as it was removed from the templates in https://github.com/dotnet/aspnetcore/pull/48615 --- .../Microsoft.DotNet.SourceBuild.SmokeTests/DotNetTemplate.cs | 1 - .../DotNetTemplateExtensions.cs | 1 - .../Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs | 1 - .../Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs | 1 - test/EndToEnd/ProjectBuildTests.cs | 2 -- 5 files changed, 6 deletions(-) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetTemplate.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetTemplate.cs index c4570eb47..e43118abd 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetTemplate.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetTemplate.cs @@ -15,7 +15,6 @@ public enum DotNetTemplate Mvc, Razor, BlazorWasm, - BlazorServer, WebApi, WebApp, Worker, diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetTemplateExtensions.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetTemplateExtensions.cs index 57c02e87d..2736ae854 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetTemplateExtensions.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetTemplateExtensions.cs @@ -16,7 +16,6 @@ public static class DotNetTemplateExtensions || template == DotNetTemplate.WebApi || template == DotNetTemplate.Razor || template == DotNetTemplate.BlazorWasm - || template == DotNetTemplate.BlazorServer || template == DotNetTemplate.Worker || template == DotNetTemplate.Angular; } diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs index 6e8dc7cb1..93794a622 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs @@ -24,7 +24,6 @@ public class OmniSharpTests : SmokeTests [SkippableTheory(Config.ExcludeOmniSharpEnv, skipOnTrue: true)] [InlineData(DotNetTemplate.BlazorWasm)] - [InlineData(DotNetTemplate.BlazorServer)] [InlineData(DotNetTemplate.ClassLib)] [InlineData(DotNetTemplate.Console)] [InlineData(DotNetTemplate.MSTest)] diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs index 680b0d430..3b7787e02 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs @@ -41,7 +41,6 @@ public class WebScenarioTests : SmokeTests yield return new(nameof(WebScenarioTests), DotNetLanguage.CSharp, DotNetTemplate.Razor, DotNetActions.Build | DotNetActions.Run | DotNetActions.Publish); yield return new(nameof(WebScenarioTests), DotNetLanguage.CSharp, DotNetTemplate.BlazorWasm, DotNetActions.Build | DotNetActions.Run | DotNetActions.Publish); - yield return new(nameof(WebScenarioTests), DotNetLanguage.CSharp, DotNetTemplate.BlazorServer, DotNetActions.Build | DotNetActions.Run | DotNetActions.Publish); yield return new(nameof(WebScenarioTests), DotNetLanguage.CSharp, DotNetTemplate.Worker); yield return new(nameof(WebScenarioTests), DotNetLanguage.CSharp, DotNetTemplate.Angular); } diff --git a/test/EndToEnd/ProjectBuildTests.cs b/test/EndToEnd/ProjectBuildTests.cs index e134a102d..421a037ed 100644 --- a/test/EndToEnd/ProjectBuildTests.cs +++ b/test/EndToEnd/ProjectBuildTests.cs @@ -203,7 +203,6 @@ namespace EndToEnd.Tests string expectedOutput = @"[\-\s]+ [\w \.]+webapp,razor\s+\[C#\][\w\ \/]+ -[\w \.]+blazorserver\s+\[C#\][\w\ \/]+ [\w \.]+classlib\s+\[C#\],F#,VB[\w\ \/]+ [\w \.]+console\s+\[C#\],F#,VB[\w\ \/]+ "; @@ -347,7 +346,6 @@ namespace EndToEnd.Tests [InlineData("xunit", "C#")] [InlineData("xunit", "VB")] [InlineData("xunit", "F#")] - [InlineData("blazorserver")] [InlineData("blazorwasm")] [InlineData("web")] [InlineData("web", "C#")]