huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

unskip test 

\n\nCommit migrated from e5c0e3fbb3
This commit is contained in:
Ajay Bhargav Baaskaran 2019-10-11 15:59:13 -07:00 committed by Ajay Bhargav Baaskaran
parent e4fb1d44ce
commit ca63634583
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest11.cs
View File

@ -25,14 +25,14 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
Assert.BuildOutputDoesNotContainLine(result, "ProjectCapability: DotNetCoreRazorConfiguration");
}
[Fact (Skip = "https://github.com/aspnet/AspNetCore-Tooling/pull/1122#issuecomment-530976125")]
[Fact]
[InitializeTestProject("SimpleMvc11")]
public async Task RazorSdk_DoesNotBuildViewsForNetCoreApp11Projects()
{
MSBuildIntegrationTestBase.TargetFramework = "netcoreapp1.1";
var result = await DotnetMSBuild("Build");
Assert.BuildPassed(result);
Assert.BuildPassed(result, allowWarnings: true);
Assert.FileExists(result, OutputPath, "SimpleMvc11.dll");
Assert.FileExists(result, OutputPath, "SimpleMvc11.pdb");
Assert.FileDoesNotExist(result, OutputPath, "SimpleMvc11.Views.dll");

8
src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj
View File

@ -125,6 +125,14 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
<Target Name="RestoreTestProjects" BeforeTargets="Restore;Build" Condition="'$(DotNetBuildFromSource)' != 'true'">
<MSBuild Projects="..\testapps\RestoreTestProjects\RestoreTestProjects.csproj" Targets="Restore" Properties="MicrosoftNetCompilersToolsetPackageVersion=$(MicrosoftNetCompilersToolsetPackageVersion)" />
<!-- This target restores SimpleMvc11 and SimpleMvc11NetFx separately because otherwise the TFMs in SimpleMvc11.csproj and SimpleMvc11NetFx.csproj are not respected. -->
<PropertyGroup>
<TargetFramework11>netcoreapp1.1</TargetFramework11>
<TargetFrameworkNetFx>net461</TargetFrameworkNetFx>
</PropertyGroup>
<MSBuild Projects="..\testapps\SimpleMvc11\SimpleMvc11.csproj" Targets="Restore" Properties="MicrosoftNetCompilersToolsetPackageVersion=$(MicrosoftNetCompilersToolsetPackageVersion);TargetFramework=$(TargetFramework11)" />
<MSBuild Projects="..\testapps\SimpleMvc11NetFx\SimpleMvc11NetFx.csproj" Targets="Restore" Properties="MicrosoftNetCompilersToolsetPackageVersion=$(MicrosoftNetCompilersToolsetPackageVersion);TargetFramework=$(TargetFrameworkNetFx)" />
</Target>
<Target Name="EnsureLogFolder" AfterTargets="Build">

3
src/Razor/test/testassets/RestoreTestProjects/RestoreTestProjects.csproj
View File

@ -4,8 +4,7 @@
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\SimpleMvc11NetFx\SimpleMvc11NetFx.csproj" />
<ProjectReference Include="..\SimpleMvc11\SimpleMvc11.csproj" />
<!-- Intentionally not including SimpleMvc11 and SimpleMvc11NetFx here because they are restored in a separate target. -->
<ProjectReference Include="..\SimpleMvc21\SimpleMvc21.csproj" />
<ProjectReference Include="..\SimpleMvc22\SimpleMvc22.csproj" />
<ProjectReference Include="..\SimpleMvc22NetFx\SimpleMvc22NetFx.csproj" />