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

Revert "Skip desktop testing to work around corefx issue." 

This reverts commit 27c6ad410e.
This commit is contained in:
N. Taylor Mullen 2017-06-02 16:45:13 -07:00
parent b9e397ed3b
commit fa8accfa59
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests/RuntimeFlavors.cs
View File

@ -15,11 +15,10 @@ namespace Microsoft.AspNetCore.Mvc.Razor.ViewCompilation
get
{
yield return RuntimeFlavor.CoreClr;
// Can't run on CLR until https://github.com/dotnet/corefx/issues/20364 is resolved.
//if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
//{
// yield return RuntimeFlavor.Clr;
//}
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
yield return RuntimeFlavor.Clr;
}
}
}

2
test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests/SimpleAppX86DesktopOnlyTest.cs
View File

@ -16,7 +16,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.ViewCompilation
public ApplicationTestFixture Fixture { get; }
[Fact(Skip = "https://github.com/dotnet/corefx/issues/20364")]
[Fact(Skip = "https://github.com/aspnet/MvcPrecompilation/issues/134")]
public async Task Precompilation_WorksForSimpleApps()
{
// Arrange

2
testapps/ClassLibraryWithPrecompiledViews/ClassLibraryWithPrecompiledViews.csproj
View File

@ -12,6 +12,6 @@
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(AspNetCoreVersion)" />
</ItemGroup>
<Target Name="PrecompileRazorViews" AfterTargets="Build" DependsOnTargets="MvcRazorPrecompile" Condition="'$(TargetFramework)'!='' AND '$(TargetFramework)'!='net461'" />
<Target Name="PrecompileRazorViews" AfterTargets="Build" DependsOnTargets="MvcRazorPrecompile" Condition="'$(TargetFramework)'!=''" />
</Project>