From c05fca5137e11edd9fc74e0b3c6336473807425e Mon Sep 17 00:00:00 2001 From: Ajay Bhargav Baaskaran Date: Wed, 25 Sep 2019 10:50:13 -0700 Subject: [PATCH] Remove 1.x tests (dotnet/aspnetcore-tooling#1169) \n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/bd71bcf87b1c9a9401454c2df9ebed1f8157f91e --- .../BuildIntegrationTest11.cs | 58 ---------- .../RestoreTestProjects.csproj | 2 - .../test/testassets/SimpleMvc11/Program.cs | 13 --- .../testassets/SimpleMvc11/SimpleMvc11.csproj | 23 ---- .../SimpleMvc11/Views/Home/Index.cshtml | 108 ------------------ .../SimpleMvc11/Views/Shared/_Layout.cshtml | 71 ------------ .../SimpleMvc11/Views/_ViewImports.cshtml | 3 - .../SimpleMvc11/Views/_ViewStart.cshtml | 3 - .../testassets/SimpleMvc11NetFx/Program.cs | 13 --- .../SimpleMvc11NetFx/SimpleMvc11NetFx.csproj | 19 --- .../SimpleMvc11NetFx/Views/Home/Index.cshtml | 108 ------------------ .../Views/Shared/_Layout.cshtml | 71 ------------ .../Views/_ViewImports.cshtml | 2 - .../SimpleMvc11NetFx/Views/_ViewStart.cshtml | 3 - 14 files changed, 497 deletions(-) delete mode 100644 src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest11.cs delete mode 100644 src/Razor/test/testassets/SimpleMvc11/Program.cs delete mode 100644 src/Razor/test/testassets/SimpleMvc11/SimpleMvc11.csproj delete mode 100644 src/Razor/test/testassets/SimpleMvc11/Views/Home/Index.cshtml delete mode 100644 src/Razor/test/testassets/SimpleMvc11/Views/Shared/_Layout.cshtml delete mode 100644 src/Razor/test/testassets/SimpleMvc11/Views/_ViewImports.cshtml delete mode 100644 src/Razor/test/testassets/SimpleMvc11/Views/_ViewStart.cshtml delete mode 100644 src/Razor/test/testassets/SimpleMvc11NetFx/Program.cs delete mode 100644 src/Razor/test/testassets/SimpleMvc11NetFx/SimpleMvc11NetFx.csproj delete mode 100644 src/Razor/test/testassets/SimpleMvc11NetFx/Views/Home/Index.cshtml delete mode 100644 src/Razor/test/testassets/SimpleMvc11NetFx/Views/Shared/_Layout.cshtml delete mode 100644 src/Razor/test/testassets/SimpleMvc11NetFx/Views/_ViewImports.cshtml delete mode 100644 src/Razor/test/testassets/SimpleMvc11NetFx/Views/_ViewStart.cshtml diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest11.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest11.cs deleted file mode 100644 index dc7d470a3c..0000000000 --- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest11.cs +++ /dev/null @@ -1,58 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Threading.Tasks; -using Microsoft.AspNetCore.Testing; -using Xunit; - -namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests -{ - public class BuildIntegrationTest11 : MSBuildIntegrationTestBase, IClassFixture - { - public BuildIntegrationTest11(BuildServerTestFixture buildServer) - : base(buildServer) - { - } - - [Fact] - [InitializeTestProject("SimpleMvc11")] - public async Task RazorSdk_DoesNotAddCoreRazorConfigurationTo11Projects() - { - var result = await DotnetMSBuild("_IntrospectProjectCapabilityItems"); - - Assert.BuildPassed(result); - Assert.BuildOutputContainsLine(result, "ProjectCapability: DotNetCoreRazor"); - Assert.BuildOutputDoesNotContainLine(result, "ProjectCapability: DotNetCoreRazorConfiguration"); - } - - [Fact (Skip = "https://github.com/aspnet/AspNetCore-Tooling/pull/1122#issuecomment-530976125")] - [InitializeTestProject("SimpleMvc11")] - public async Task RazorSdk_DoesNotBuildViewsForNetCoreApp11Projects() - { - MSBuildIntegrationTestBase.TargetFramework = "netcoreapp1.1"; - var result = await DotnetMSBuild("Build"); - - Assert.BuildPassed(result); - Assert.FileExists(result, OutputPath, "SimpleMvc11.dll"); - Assert.FileExists(result, OutputPath, "SimpleMvc11.pdb"); - Assert.FileDoesNotExist(result, OutputPath, "SimpleMvc11.Views.dll"); - Assert.FileDoesNotExist(result, OutputPath, "SimpleMvc11.Views.pdb"); - } - - [ConditionalFact] - [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)] - - [InitializeTestProject("SimpleMvc11NetFx")] - public async Task RazorSdk_DoesNotBuildViewsForNetFx11Projects() - { - MSBuildIntegrationTestBase.TargetFramework = "net461"; - var result = await DotnetMSBuild("Build"); - - Assert.BuildPassed(result); - Assert.FileExists(result, OutputPath, "SimpleMvc11NetFx.exe"); - Assert.FileExists(result, OutputPath, "SimpleMvc11NetFx.pdb"); - Assert.FileDoesNotExist(result, OutputPath, "SimpleMvc11NetFx.Views.dll"); - Assert.FileDoesNotExist(result, OutputPath, "SimpleMvc11NetFx.Views.pdb"); - } - } -} diff --git a/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj b/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj index ced12b1fa3..90b54c171b 100644 --- a/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj +++ b/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj @@ -4,8 +4,6 @@ - - diff --git a/src/Razor/test/testassets/SimpleMvc11/Program.cs b/src/Razor/test/testassets/SimpleMvc11/Program.cs deleted file mode 100644 index 5fbbd9ded7..0000000000 --- a/src/Razor/test/testassets/SimpleMvc11/Program.cs +++ /dev/null @@ -1,13 +0,0 @@ - -namespace SimpleMvc11 -{ - public class Program - { - public static void Main(string[] args) - { - // Just make sure we have a reference to MVC 1.1 - var t = typeof(Microsoft.AspNetCore.Mvc.IActionResult); - System.Console.WriteLine(t.FullName); - } - } -} diff --git a/src/Razor/test/testassets/SimpleMvc11/SimpleMvc11.csproj b/src/Razor/test/testassets/SimpleMvc11/SimpleMvc11.csproj deleted file mode 100644 index b1523f9512..0000000000 --- a/src/Razor/test/testassets/SimpleMvc11/SimpleMvc11.csproj +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - netcoreapp1.1 - - - - - - - - - All - - - - diff --git a/src/Razor/test/testassets/SimpleMvc11/Views/Home/Index.cshtml b/src/Razor/test/testassets/SimpleMvc11/Views/Home/Index.cshtml deleted file mode 100644 index 00afab6a0c..0000000000 --- a/src/Razor/test/testassets/SimpleMvc11/Views/Home/Index.cshtml +++ /dev/null @@ -1,108 +0,0 @@ -@{ - ViewData["Title"] = "Home Page"; -} - - - -
-
-

Application uses

-
    -
  • Sample pages using ASP.NET Core MVC
    • -
  • Bower for managing client-side libraries
    • -
  • Theming using Bootstrap
    • -
-
-
-

How to

- -
-
-

Overview

- -
-
-

Run & Deploy

- -
-
diff --git a/src/Razor/test/testassets/SimpleMvc11/Views/Shared/_Layout.cshtml b/src/Razor/test/testassets/SimpleMvc11/Views/Shared/_Layout.cshtml deleted file mode 100644 index 2172e5e566..0000000000 --- a/src/Razor/test/testassets/SimpleMvc11/Views/Shared/_Layout.cshtml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - @ViewData["Title"] - SimpleMvc11 - - - - - - - - - - - - -
- @RenderBody() -
-
-

© 2018 - SimpleMvc11

-
-
- - - - - - - - - - - - - @RenderSection("Scripts", required: false) - - diff --git a/src/Razor/test/testassets/SimpleMvc11/Views/_ViewImports.cshtml b/src/Razor/test/testassets/SimpleMvc11/Views/_ViewImports.cshtml deleted file mode 100644 index 4d7ce82c24..0000000000 --- a/src/Razor/test/testassets/SimpleMvc11/Views/_ViewImports.cshtml +++ /dev/null @@ -1,3 +0,0 @@ -@using SimpleMvc11 -@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers -@inject DateTime TheTime diff --git a/src/Razor/test/testassets/SimpleMvc11/Views/_ViewStart.cshtml b/src/Razor/test/testassets/SimpleMvc11/Views/_ViewStart.cshtml deleted file mode 100644 index a5f10045db..0000000000 --- a/src/Razor/test/testassets/SimpleMvc11/Views/_ViewStart.cshtml +++ /dev/null @@ -1,3 +0,0 @@ -@{ - Layout = "_Layout"; -} diff --git a/src/Razor/test/testassets/SimpleMvc11NetFx/Program.cs b/src/Razor/test/testassets/SimpleMvc11NetFx/Program.cs deleted file mode 100644 index 5fbbd9ded7..0000000000 --- a/src/Razor/test/testassets/SimpleMvc11NetFx/Program.cs +++ /dev/null @@ -1,13 +0,0 @@ - -namespace SimpleMvc11 -{ - public class Program - { - public static void Main(string[] args) - { - // Just make sure we have a reference to MVC 1.1 - var t = typeof(Microsoft.AspNetCore.Mvc.IActionResult); - System.Console.WriteLine(t.FullName); - } - } -} diff --git a/src/Razor/test/testassets/SimpleMvc11NetFx/SimpleMvc11NetFx.csproj b/src/Razor/test/testassets/SimpleMvc11NetFx/SimpleMvc11NetFx.csproj deleted file mode 100644 index b280ec0c9c..0000000000 --- a/src/Razor/test/testassets/SimpleMvc11NetFx/SimpleMvc11NetFx.csproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - net461 - - - - - - - - - diff --git a/src/Razor/test/testassets/SimpleMvc11NetFx/Views/Home/Index.cshtml b/src/Razor/test/testassets/SimpleMvc11NetFx/Views/Home/Index.cshtml deleted file mode 100644 index 00afab6a0c..0000000000 --- a/src/Razor/test/testassets/SimpleMvc11NetFx/Views/Home/Index.cshtml +++ /dev/null @@ -1,108 +0,0 @@ -@{ - ViewData["Title"] = "Home Page"; -} - - - -
-
-

Application uses

-
    -
  • Sample pages using ASP.NET Core MVC
    • -
  • Bower for managing client-side libraries
    • -
  • Theming using Bootstrap
    • -
-
-
-

How to

- -
-
-

Overview

- -
-
-

Run & Deploy

- -
-
diff --git a/src/Razor/test/testassets/SimpleMvc11NetFx/Views/Shared/_Layout.cshtml b/src/Razor/test/testassets/SimpleMvc11NetFx/Views/Shared/_Layout.cshtml deleted file mode 100644 index 2172e5e566..0000000000 --- a/src/Razor/test/testassets/SimpleMvc11NetFx/Views/Shared/_Layout.cshtml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - @ViewData["Title"] - SimpleMvc11 - - - - - - - - - - - - -
- @RenderBody() -
-
-

© 2018 - SimpleMvc11

-
-
- - - - - - - - - - - - - @RenderSection("Scripts", required: false) - - diff --git a/src/Razor/test/testassets/SimpleMvc11NetFx/Views/_ViewImports.cshtml b/src/Razor/test/testassets/SimpleMvc11NetFx/Views/_ViewImports.cshtml deleted file mode 100644 index 6f6d009d40..0000000000 --- a/src/Razor/test/testassets/SimpleMvc11NetFx/Views/_ViewImports.cshtml +++ /dev/null @@ -1,2 +0,0 @@ -@using SimpleMvc11NetFx -@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers diff --git a/src/Razor/test/testassets/SimpleMvc11NetFx/Views/_ViewStart.cshtml b/src/Razor/test/testassets/SimpleMvc11NetFx/Views/_ViewStart.cshtml deleted file mode 100644 index a5f10045db..0000000000 --- a/src/Razor/test/testassets/SimpleMvc11NetFx/Views/_ViewStart.cshtml +++ /dev/null @@ -1,3 +0,0 @@ -@{ - Layout = "_Layout"; -}