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

Merge branch 'release' into dev

This commit is contained in:
N. Taylor Mullen 2016-04-06 11:41:37 -07:00
parent 206e5c5ecc fad09801f8
commit 7258db9a07
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Microsoft.AspNet.Razor.Runtime.VSRC1/Properties/Resources.Designer.cs generated
View File

@ -8,7 +8,7 @@ namespace Microsoft.AspNet.Razor.Runtime
internal static class Resources
{
private static readonly ResourceManager _resourceManager
= new ResourceManager("Microsoft.AspNet.Razor.Runtime.Resources", typeof(Resources).GetTypeInfo().Assembly);
= new ResourceManager("Microsoft.AspNet.Razor.Runtime.VSRC1.Resources", typeof(Resources).GetTypeInfo().Assembly);
/// <summary>
/// Invalid tag helper directive look up text '{0}'. The correct look up text format is: "typeName, assemblyName".

2
src/Microsoft.AspNet.Razor.VSRC1/Properties/CommonResources.Designer.cs generated
View File

@ -8,7 +8,7 @@ namespace Microsoft.AspNet.Razor
internal static class CommonResources
{
private static readonly ResourceManager _resourceManager
= new ResourceManager("Microsoft.AspNet.Razor.CommonResources", typeof(CommonResources).GetTypeInfo().Assembly);
= new ResourceManager("Microsoft.AspNet.Razor.VSRC1.CommonResources", typeof(CommonResources).GetTypeInfo().Assembly);
/// <summary>
/// Value cannot be null or an empty string.

2
src/Microsoft.AspNet.Razor.VSRC1/Properties/RazorResources.Designer.cs generated
View File

@ -8,7 +8,7 @@ namespace Microsoft.AspNet.Razor
internal static class RazorResources
{
private static readonly ResourceManager _resourceManager
= new ResourceManager("Microsoft.AspNet.Razor.RazorResources", typeof(RazorResources).GetTypeInfo().Assembly);
= new ResourceManager("Microsoft.AspNet.Razor.VSRC1.RazorResources", typeof(RazorResources).GetTypeInfo().Assembly);
/// <summary>
/// The active parser must be the same as either the markup or code parser.