From 6eaaf3e9621a846c65d31247cb8bade6e61b8b25 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 22 Jun 2023 11:22:41 -0700 Subject: [PATCH] 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#")]