From 68bb44d73e0a4f4f3bd25574e0be7b3aed5109c6 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Mon, 3 Feb 2014 13:29:02 -0800 Subject: [PATCH] Updating Resx designer file to minimize conflicts after resx change --- .../RazorResources.Designer.cs | 20 ++----------------- .../RazorResources.resx | 3 +++ 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/src/Microsoft.AspNet.Razor/RazorResources.Designer.cs b/src/Microsoft.AspNet.Razor/RazorResources.Designer.cs index 09f51ea028..6810597b86 100644 --- a/src/Microsoft.AspNet.Razor/RazorResources.Designer.cs +++ b/src/Microsoft.AspNet.Razor/RazorResources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // 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 // the code is regenerated. @@ -11,7 +11,6 @@ namespace Microsoft.AspNet.Razor.Resources { using System; - using System.Reflection; /// @@ -46,11 +45,7 @@ namespace Microsoft.AspNet.Razor.Resources { if (object.ReferenceEquals(resourceMan, null)) { -#if NET45 - 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 + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.AspNet.Razor.RazorResources", System.Reflection.IntrospectionExtensions.GetTypeInfo(typeof(RazorResources)).Assembly); resourceMan = temp; } return resourceMan; @@ -452,17 +447,6 @@ namespace Microsoft.AspNet.Razor.Resources } } - /// - /// Looks up a localized string similar to "{1}" is not a valid value for the "{0}" option. The "Option {0}" statement must be followed by either "On" or "Off". . - /// - internal static string ParseError_InvalidOptionValue - { - get - { - return ResourceManager.GetString("ParseError_InvalidOptionValue", resourceCulture); - } - } - /// /// 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 "<br>". Instead use self-closing tags like "<br/>".. /// diff --git a/src/Microsoft.AspNet.Razor/RazorResources.resx b/src/Microsoft.AspNet.Razor/RazorResources.resx index 10234812f7..e47ac95da6 100644 --- a/src/Microsoft.AspNet.Razor/RazorResources.resx +++ b/src/Microsoft.AspNet.Razor/RazorResources.resx @@ -403,4 +403,7 @@ Instead, wrap the contents of the block in "{{}}": [BG][{0}] Trees Compared in {1} milliseconds. Different = {2} + + Section blocks ("{0}") cannot be nested. Only one level of section blocks are allowed. + \ No newline at end of file