Merge remote-tracking branch 'origin/release/vs16.1-preview4'
# Conflicts:
# src/Razor/src/Microsoft.AspNetCore.Razor.Language/Extensions/FunctionsDirectivePass.cs
# src/Razor/test/RazorLanguage.Test/Extensions/FunctionsDirectivePassTest.cs
\n\nCommit migrated from de4b0c7854
This commit is contained in:
commit
d388f38f1f