diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets index 70701f7e1a..b0b199856a 100644 --- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets +++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets @@ -33,14 +33,12 @@ Copyright (c) .NET Foundation. All rights reserved. <_TargetFrameworkVersionWithoutV>$(TargetFrameworkVersion.TrimStart('vV')) - - - <_TargetingNETCoreApp30OrLater Condition="'$(_TargetFrameworkVersionWithoutV)' > '2.9'">true + <_TargetingNETCoreApp30OrLater Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND '$(_TargetFrameworkVersionWithoutV)' >= '3.0'">true - 3.0 + 3.0 + Condition="'$(_Targeting30OrNewerRazorLangVersion)' != 'true' AND '$(_TargetingNETCoreApp30OrLater)' == 'true'" /> + { + 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] + [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/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntrospectionTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntrospectionTest.cs index eb7c93e3ff..9af2bb3753 100644 --- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntrospectionTest.cs +++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntrospectionTest.cs @@ -14,17 +14,6 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests { } - [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] [InitializeTestProject("SimpleMvc")] public async Task RazorSdk_AddsProjectCapabilities() diff --git a/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj b/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj index 60f70f66ac..59d6a44c00 100644 --- a/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj +++ b/src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj @@ -14,6 +14,7 @@ + diff --git a/src/Razor/test/testassets/SimpleMvc11NetFx/Program.cs b/src/Razor/test/testassets/SimpleMvc11NetFx/Program.cs new file mode 100644 index 0000000000..5fbbd9ded7 --- /dev/null +++ b/src/Razor/test/testassets/SimpleMvc11NetFx/Program.cs @@ -0,0 +1,13 @@ + +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 new file mode 100644 index 0000000000..b280ec0c9c --- /dev/null +++ b/src/Razor/test/testassets/SimpleMvc11NetFx/SimpleMvc11NetFx.csproj @@ -0,0 +1,19 @@ + + + + + + + net461 + + + + + + + + + diff --git a/src/Razor/test/testassets/SimpleMvc11NetFx/Views/Home/Index.cshtml b/src/Razor/test/testassets/SimpleMvc11NetFx/Views/Home/Index.cshtml new file mode 100644 index 0000000000..00afab6a0c --- /dev/null +++ b/src/Razor/test/testassets/SimpleMvc11NetFx/Views/Home/Index.cshtml @@ -0,0 +1,108 @@ +@{ + 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 new file mode 100644 index 0000000000..2172e5e566 --- /dev/null +++ b/src/Razor/test/testassets/SimpleMvc11NetFx/Views/Shared/_Layout.cshtml @@ -0,0 +1,71 @@ + + + + + + @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 new file mode 100644 index 0000000000..6f6d009d40 --- /dev/null +++ b/src/Razor/test/testassets/SimpleMvc11NetFx/Views/_ViewImports.cshtml @@ -0,0 +1,2 @@ +@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 new file mode 100644 index 0000000000..a5f10045db --- /dev/null +++ b/src/Razor/test/testassets/SimpleMvc11NetFx/Views/_ViewStart.cshtml @@ -0,0 +1,3 @@ +@{ + Layout = "_Layout"; +}