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

Update view compilation error message 

Update view compilation error message for csproj instead of
project.json.
This commit is contained in:
martincostello 2017-02-18 18:54:54 +00:00 committed by Pranav K
parent f3b1f2ca29
commit 9950325269
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Microsoft.AspNetCore.Mvc.Razor/Internal/DefaultRoslynCompilationService.cs
View File

@ -151,9 +151,8 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Internal
string.Equals(CS0246, g.Id, StringComparison.OrdinalIgnoreCase)))
{
additionalMessage = Resources.FormatCompilation_DependencyContextIsNotSpecified(
"preserveCompilationContext",
"buildOptions",
"project.json");
"PreserveCompilationContext",
"csproj");
}
var compilationFailure = new CompilationFailure(

8
src/Microsoft.AspNetCore.Mvc.Razor/Properties/Resources.Designer.cs generated
View File

@ -447,7 +447,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor
}
/// <summary>
/// One or more compilation references are missing. Possible causes include a missing '{0}' property under '{1}' in the application's {2}.
/// One or more compilation references are missing. Possible causes include a missing '{0}' property in the application's '{1}' file.
/// </summary>
internal static string Compilation_DependencyContextIsNotSpecified
{
@ -455,11 +455,11 @@ namespace Microsoft.AspNetCore.Mvc.Razor
}
/// <summary>
/// One or more compilation references are missing. Possible causes include a missing '{0}' property under '{1}' in the application's {2}.
/// One or more compilation references are missing. Possible causes include a missing '{0}' property in the application's '{1}' file.
/// </summary>
internal static string FormatCompilation_DependencyContextIsNotSpecified(object p0, object p1, object p2)
internal static string FormatCompilation_DependencyContextIsNotSpecified(object p0, object p1)
{
return string.Format(CultureInfo.CurrentCulture, GetString("Compilation_DependencyContextIsNotSpecified"), p0, p1, p2);
return string.Format(CultureInfo.CurrentCulture, GetString("Compilation_DependencyContextIsNotSpecified"), p0, p1);
}
/// <summary>

2
src/Microsoft.AspNetCore.Mvc.Razor/Resources.resx
View File

@ -201,7 +201,7 @@
<value>A circular layout reference was detected when rendering '{0}'. The layout page '{1}' has already been rendered.</value>
</data>
<data name="Compilation_DependencyContextIsNotSpecified" xml:space="preserve">
<value>One or more compilation references are missing. Possible causes include a missing '{0}' property under '{1}' in the application's {2}.</value>
<value>One or more compilation references are missing. Possible causes include a missing '{0}' property in the application's '{1}' file.</value>
</data>
<data name="ViewLocationFormatsIsRequired" xml:space="preserve">
<value>'{0}' cannot be empty. These locations are required to locate a view for rendering.</value>

2
test/Microsoft.AspNetCore.Mvc.FunctionalTests/ErrorPageTests.cs
View File

@ -18,7 +18,7 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests
{
private static readonly string PreserveCompilationContextMessage = HtmlEncoder.Default.Encode(
"One or more compilation references are missing. Possible causes include a missing " +
"'preserveCompilationContext' property under 'buildOptions' in the application's project.json.");
"'PreserveCompilationContext' property in the application's 'csproj' file.");
public ErrorPageTests(MvcTestFixture<ErrorPageMiddlewareWebSite.Startup> fixture)
{
Client = fixture.Client;