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

Fix a bug blocking recompilation

This commit is contained in:
Ryan Nowak 2018-01-09 10:03:17 -08:00
parent a6fe3a67a3
commit 913cefdea2
2 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Microsoft.AspNetCore.Mvc.Razor/Internal/RazorViewCompiler.cs
View File

@ -259,6 +259,18 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Internal
item.ExpirationTokens.Add(_fileProvider.Watch(checksums[i].Identifier));
}
// We also need to create a new descriptor, because the original one doesn't have expiration tokens on
// it. These will be used by the view location cache, which is like an L1 cache for views (this class is
// the L2 cache).
item.Descriptor = new CompiledViewDescriptor()
{
ExpirationTokens = item.ExpirationTokens,
IsPrecompiled = true,
Item = precompiledView.Item,
RelativePath = precompiledView.RelativePath,
ViewAttribute = precompiledView.ViewAttribute,
};
return item;
}

30
test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/RazorViewCompilerTest.cs
View File

@ -204,6 +204,9 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Internal
// Assert
Assert.Same(precompiledView, result);
// This view doesn't have checksums so it can't be recompiled.
Assert.Null(precompiledView.ExpirationTokens);
}
[Theory]
@ -273,7 +276,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Internal
var result = await viewCompiler.CompileAsync(path);
// Assert - 1
Assert.Same(precompiledView, result);
Assert.Same(precompiledView.Item, result.Item);
// Act - 2
fileProvider.Watch(path);
@ -281,7 +284,10 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Internal
result = await viewCompiler.CompileAsync(path);
// Assert - 2
Assert.Same(precompiledView, result);
Assert.Same(precompiledView.Item, result.Item);
// This view doesn't have checksums so it can't be recompiled.
Assert.Null(result.ExpirationTokens);
}
[Fact]
@ -314,6 +320,9 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Internal
// Assert - 2
Assert.Same(precompiledView, result);
// This view doesn't have checksums so it can't be recompiled.
Assert.Null(result.ExpirationTokens);
}
[Fact]
@ -340,7 +349,12 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Internal
var result = await viewCompiler.CompileAsync(path);
// Assert
Assert.Same(precompiledView, result);
Assert.Same(precompiledView.Item, result.Item);
// This view has checksums so it should also have tokens
Assert.Collection(
result.ExpirationTokens,
token => Assert.Same(fileProvider.GetChangeToken(path), token));
}
[Fact]
@ -399,7 +413,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Internal
var result = await viewCompiler.CompileAsync(path);
// Assert - 1
Assert.Same(precompiledView, result);
Assert.Same(precompiledView.Item, result.Item);
// Act - 2
fileInfo.Content = "some other content";
@ -435,14 +449,14 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Internal
var result = await viewCompiler.CompileAsync(path);
// Assert - 1
Assert.Same(precompiledView, result);
Assert.Same(precompiledView.Item, result.Item);
// Act - 2
fileProvider.GetChangeToken(path).HasChanged = true;
result = await viewCompiler.CompileAsync(path);
// Assert - 2
Assert.Same(precompiledView, result);
Assert.Same(precompiledView.Item, result.Item);
}
[Fact]
@ -480,7 +494,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Internal
result = await viewCompiler.CompileAsync(path);
// Assert - 2
Assert.Same(precompiledView, result);
Assert.Same(precompiledView.Item, result.Item);
}
[Fact]
@ -512,7 +526,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Internal
var result = await viewCompiler.CompileAsync(path);
// Assert - 1
Assert.Same(precompiledView, result);
Assert.Same(precompiledView.Item, result.Item);
// Act - 2
importFileInfo.Content = "some import changed";