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

Merge pull request #2511 from aspnet/release/2.2 

Skip BuildIncremental_SimpleMvc_PersistsTargetInputFile on xplat
This commit is contained in:
Pranav K 2018-07-27 14:39:21 -07:00 committed by GitHub
parent 42f8f3eab4 676543b8c9
commit 46974a0b8b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/BuildIncrementalismTest.cs
View File

@ -7,6 +7,7 @@ using System.IO;
using System.Linq; using System.Linq;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNetCore.Testing.xunit;
using Xunit; using Xunit;
namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
@ -18,7 +19,8 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
{ {
} }
[Fact] [ConditionalFact]
[OSSkipCondition(OperatingSystems.MacOSX | OperatingSystems.Linux, SkipReason = "See https://github.com/aspnet/Razor/issues/2219")]
[InitializeTestProject("SimpleMvc")] [InitializeTestProject("SimpleMvc")]
public async Task BuildIncremental_SimpleMvc_PersistsTargetInputFile() public async Task BuildIncremental_SimpleMvc_PersistsTargetInputFile()
{ {
@ -29,21 +31,13 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
var result = await DotnetMSBuild("Build"); var result = await DotnetMSBuild("Build");
var directoryPath = Path.Combine(result.Project.DirectoryPath, IntermediateOutputPath); var directoryPath = Path.Combine(result.Project.DirectoryPath, IntermediateOutputPath);
var filesToIgnore = new List<string>() var filesToIgnore = new[]
{ {
// These files are generated on every build. // These files are generated on every build.
Path.Combine(directoryPath, "SimpleMvc.csproj.CopyComplete"), Path.Combine(directoryPath, "SimpleMvc.csproj.CopyComplete"),
Path.Combine(directoryPath, "SimpleMvc.csproj.FileListAbsolute.txt"), Path.Combine(directoryPath, "SimpleMvc.csproj.FileListAbsolute.txt"),
}; };
if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX) || RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
{
// There is some quirkiness with MsBuild in unix where it regenerates this file
// even though it shouldn't. This is tracked here https://github.com/aspnet/Razor/issues/2219.
filesToIgnore.Add(Path.Combine(directoryPath, "SimpleMvc.TagHelpers.input.cache"));
filesToIgnore.Add(Path.Combine(directoryPath, "SimpleMvc.AssemblyInfo.cs"));
}
var files = Directory.GetFiles(directoryPath).Where(p => !filesToIgnore.Contains(p)); var files = Directory.GetFiles(directoryPath).Where(p => !filesToIgnore.Contains(p));
foreach (var file in files) foreach (var file in files)
{ {