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

Updating Resx designer file to minimize conflicts after resx change

This commit is contained in:
Pranav K 2014-02-03 13:29:02 -08:00
parent 12fa69c7bc
commit 68bb44d73e
2 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Microsoft.AspNet.Razor/RazorResources.Designer.cs generated
View File

@ -1,7 +1,7 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // This code was generated by a tool.
// Runtime Version:4.0.30319.17929 // Runtime Version:4.0.30319.34003
// //
// Changes to this file may cause incorrect behavior and will be lost if // Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated. // the code is regenerated.
@ -11,7 +11,6 @@
namespace Microsoft.AspNet.Razor.Resources namespace Microsoft.AspNet.Razor.Resources
{ {
using System; using System;
using System.Reflection;
/// <summary> /// <summary>
@ -46,11 +45,7 @@ namespace Microsoft.AspNet.Razor.Resources
{ {
if (object.ReferenceEquals(resourceMan, null)) if (object.ReferenceEquals(resourceMan, null))
{ {
#if NET45 global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.AspNet.Razor.RazorResources", System.Reflection.IntrospectionExtensions.GetTypeInfo(typeof(RazorResources)).Assembly);
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.AspNet.Razor.RazorResources", typeof(RazorResources).Assembly);
#else
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.AspNet.Razor.RazorResources", typeof(RazorResources).GetTypeInfo().Assembly);
#endif
resourceMan = temp; resourceMan = temp;
} }
return resourceMan; return resourceMan;
@ -452,17 +447,6 @@ namespace Microsoft.AspNet.Razor.Resources
} }
} }
/// <summary>
/// Looks up a localized string similar to &quot;{1}&quot; is not a valid value for the &quot;{0}&quot; option. The &quot;Option {0}&quot; statement must be followed by either &quot;On&quot; or &quot;Off&quot;. .
/// </summary>
internal static string ParseError_InvalidOptionValue
{
get
{
return ResourceManager.GetString("ParseError_InvalidOptionValue", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized string similar to Markup in a code block must start with a tag and all start tags must be matched with end tags. Do not use unclosed tags like &quot;&lt;br&gt;&quot;. Instead use self-closing tags like &quot;&lt;br/&gt;&quot;.. /// Looks up a localized string similar to Markup in a code block must start with a tag and all start tags must be matched with end tags. Do not use unclosed tags like &quot;&lt;br&gt;&quot;. Instead use self-closing tags like &quot;&lt;br/&gt;&quot;..
/// </summary> /// </summary>

3
src/Microsoft.AspNet.Razor/RazorResources.resx
View File

@ -403,4 +403,7 @@ Instead, wrap the contents of the block in "{{}}":
<data name="Trace_TreesCompared" xml:space="preserve"> <data name="Trace_TreesCompared" xml:space="preserve">
<value>[BG][{0}] Trees Compared in {1} milliseconds. Different = {2}</value> <value>[BG][{0}] Trees Compared in {1} milliseconds. Different = {2}</value>
</data> </data>
<data name="ParseError_Sections_Cannot_Be_Nested" xml:space="preserve">
<value>Section blocks ("{0}") cannot be nested. Only one level of section blocks are allowed.</value>
</data>
</root> </root>