diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.VSCode.FunctionalTest/tests/Completions1_0.test.ts b/src/Razor/test/Microsoft.AspNetCore.Razor.VSCode.FunctionalTest/tests/Completions1_0.test.ts deleted file mode 100644 index 9e66549c281..00000000000 --- a/src/Razor/test/Microsoft.AspNetCore.Razor.VSCode.FunctionalTest/tests/Completions1_0.test.ts +++ /dev/null @@ -1,49 +0,0 @@ -/* -------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - * ------------------------------------------------------------------------------------------ */ - -import * as assert from 'assert'; -import { afterEach, before, beforeEach } from 'mocha'; -import * as path from 'path'; -import * as vscode from 'vscode'; -import { - pollUntil, - simpleMvc11Root, - waitForProjectReady, -} from './TestUtil'; - -let doc: vscode.TextDocument; -let editor: vscode.TextEditor; - -suite('Completions 1.0', () => { - before(async () => { - await waitForProjectReady(simpleMvc11Root); - }); - - beforeEach(async () => { - const filePath = path.join(simpleMvc11Root, 'Views', 'Home', 'Index.cshtml'); - doc = await vscode.workspace.openTextDocument(filePath); - editor = await vscode.window.showTextDocument(doc); - }); - - afterEach(async () => { - await vscode.commands.executeCommand('workbench.action.revertAndCloseActiveEditor'); - await pollUntil(() => vscode.window.visibleTextEditors.length === 0, 1000); - }); - - test('Can complete Razor directive', async () => { - const firstLine = new vscode.Position(0, 0); - await editor.edit(edit => edit.insert(firstLine, '@\n')); - const completions = await vscode.commands.executeCommand( - 'vscode.executeCompletionItemProvider', - doc.uri, - new vscode.Position(0, 1)); - - const hasCompletion = (text: string) => completions!.items.some(item => item.insertText === text); - - assert.ok(!hasCompletion('page'), 'Should not have completion for "page"'); - assert.ok(hasCompletion('inject'), 'Should have completion for "inject"'); - assert.ok(!hasCompletion('div'), 'Should not have completion for "div"'); - }); -}); diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.VSCode.FunctionalTest/tests/TestUtil.ts b/src/Razor/test/Microsoft.AspNetCore.Razor.VSCode.FunctionalTest/tests/TestUtil.ts index ca6a5a6be9c..d55e21387c9 100644 --- a/src/Razor/test/Microsoft.AspNetCore.Razor.VSCode.FunctionalTest/tests/TestUtil.ts +++ b/src/Razor/test/Microsoft.AspNetCore.Razor.VSCode.FunctionalTest/tests/TestUtil.ts @@ -13,7 +13,6 @@ export const razorRoot = path.join(__dirname, '..', '..', '..'); export const testAppsRoot = path.join(razorRoot, 'test', 'testapps'); export const mvcWithComponentsRoot = path.join(testAppsRoot, 'MvcWithComponents'); export const simpleMvc21Root = path.join(testAppsRoot, 'SimpleMvc21'); -export const simpleMvc11Root = path.join(testAppsRoot, 'SimpleMvc11'); export async function pollUntil(fn: () => boolean, timeoutMs: number, pollInterval?: number) { const resolvedPollInterval = pollInterval ? pollInterval : 50; diff --git a/src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/BuildIntegrationTest11.cs b/src/Razor/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/BuildIntegrationTest11.cs deleted file mode 100644 index dc7d470a3c7..00000000000 --- a/src/Razor/test/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/testapps/RestoreTestProjects/RestoreTestProjects.csproj b/src/Razor/test/testapps/RestoreTestProjects/RestoreTestProjects.csproj index ced12b1fa38..90b54c171bb 100644 --- a/src/Razor/test/testapps/RestoreTestProjects/RestoreTestProjects.csproj +++ b/src/Razor/test/testapps/RestoreTestProjects/RestoreTestProjects.csproj @@ -4,8 +4,6 @@ - - diff --git a/src/Razor/test/testapps/SimpleMvc11/Program.cs b/src/Razor/test/testapps/SimpleMvc11/Program.cs deleted file mode 100644 index 5fbbd9ded71..00000000000 --- a/src/Razor/test/testapps/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/testapps/SimpleMvc11/SimpleMvc11.csproj b/src/Razor/test/testapps/SimpleMvc11/SimpleMvc11.csproj deleted file mode 100644 index b1523f9512c..00000000000 --- a/src/Razor/test/testapps/SimpleMvc11/SimpleMvc11.csproj +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - netcoreapp1.1 - - - - - - - - - All - - - - diff --git a/src/Razor/test/testapps/SimpleMvc11/Views/Home/Index.cshtml b/src/Razor/test/testapps/SimpleMvc11/Views/Home/Index.cshtml deleted file mode 100644 index 00afab6a0cb..00000000000 --- a/src/Razor/test/testapps/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/testapps/SimpleMvc11/Views/Shared/_Layout.cshtml b/src/Razor/test/testapps/SimpleMvc11/Views/Shared/_Layout.cshtml deleted file mode 100644 index 2172e5e566d..00000000000 --- a/src/Razor/test/testapps/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/testapps/SimpleMvc11/Views/_ViewImports.cshtml b/src/Razor/test/testapps/SimpleMvc11/Views/_ViewImports.cshtml deleted file mode 100644 index 4d7ce82c245..00000000000 --- a/src/Razor/test/testapps/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/testapps/SimpleMvc11/Views/_ViewStart.cshtml b/src/Razor/test/testapps/SimpleMvc11/Views/_ViewStart.cshtml deleted file mode 100644 index a5f10045db9..00000000000 --- a/src/Razor/test/testapps/SimpleMvc11/Views/_ViewStart.cshtml +++ /dev/null @@ -1,3 +0,0 @@ -@{ - Layout = "_Layout"; -} diff --git a/src/Razor/test/testapps/SimpleMvc11NetFx/Program.cs b/src/Razor/test/testapps/SimpleMvc11NetFx/Program.cs deleted file mode 100644 index 5fbbd9ded71..00000000000 --- a/src/Razor/test/testapps/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/testapps/SimpleMvc11NetFx/SimpleMvc11NetFx.csproj b/src/Razor/test/testapps/SimpleMvc11NetFx/SimpleMvc11NetFx.csproj deleted file mode 100644 index b280ec0c9c8..00000000000 --- a/src/Razor/test/testapps/SimpleMvc11NetFx/SimpleMvc11NetFx.csproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - net461 - - - - - - - - - diff --git a/src/Razor/test/testapps/SimpleMvc11NetFx/Views/Home/Index.cshtml b/src/Razor/test/testapps/SimpleMvc11NetFx/Views/Home/Index.cshtml deleted file mode 100644 index 00afab6a0cb..00000000000 --- a/src/Razor/test/testapps/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/testapps/SimpleMvc11NetFx/Views/Shared/_Layout.cshtml b/src/Razor/test/testapps/SimpleMvc11NetFx/Views/Shared/_Layout.cshtml deleted file mode 100644 index 2172e5e566d..00000000000 --- a/src/Razor/test/testapps/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/testapps/SimpleMvc11NetFx/Views/_ViewImports.cshtml b/src/Razor/test/testapps/SimpleMvc11NetFx/Views/_ViewImports.cshtml deleted file mode 100644 index 6f6d009d404..00000000000 --- a/src/Razor/test/testapps/SimpleMvc11NetFx/Views/_ViewImports.cshtml +++ /dev/null @@ -1,2 +0,0 @@ -@using SimpleMvc11NetFx -@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers diff --git a/src/Razor/test/testapps/SimpleMvc11NetFx/Views/_ViewStart.cshtml b/src/Razor/test/testapps/SimpleMvc11NetFx/Views/_ViewStart.cshtml deleted file mode 100644 index a5f10045db9..00000000000 --- a/src/Razor/test/testapps/SimpleMvc11NetFx/Views/_ViewStart.cshtml +++ /dev/null @@ -1,3 +0,0 @@ -@{ - Layout = "_Layout"; -}