From 7c1f18c0a4780a31a682653b29a74d8c72210e14 Mon Sep 17 00:00:00 2001 From: "N. Taylor Mullen" Date: Fri, 18 Sep 2015 16:42:39 -0700 Subject: [PATCH] Update < and > in error messages to not be double encoded. --- NuGet.config | 2 +- .../Properties/Resources.Designer.cs | 4 ++-- .../Properties/RazorResources.Designer.cs | 12 ++++++------ src/Microsoft.AspNet.Razor/RazorResources.resx | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1707938c61..03704957e8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -1,4 +1,4 @@ - + diff --git a/src/Microsoft.AspNet.Razor.Runtime/Properties/Resources.Designer.cs b/src/Microsoft.AspNet.Razor.Runtime/Properties/Resources.Designer.cs index 886d863bf9..43ab78c1f8 100644 --- a/src/Microsoft.AspNet.Razor.Runtime/Properties/Resources.Designer.cs +++ b/src/Microsoft.AspNet.Razor.Runtime/Properties/Resources.Designer.cs @@ -155,7 +155,7 @@ namespace Microsoft.AspNet.Razor.Runtime } /// - /// Invalid tag helper directive '{0}' value. '{1} is not allowed in prefix '{2}'. + /// Invalid tag helper directive '{0}' value. '{1}' is not allowed in prefix '{2}'. /// internal static string TagHelperDescriptorResolver_InvalidTagHelperPrefixValue { @@ -163,7 +163,7 @@ namespace Microsoft.AspNet.Razor.Runtime } /// - /// Invalid tag helper directive '{0}' value. '{1} is not allowed in prefix '{2}'. + /// Invalid tag helper directive '{0}' value. '{1}' is not allowed in prefix '{2}'. /// internal static string FormatTagHelperDescriptorResolver_InvalidTagHelperPrefixValue(object p0, object p1, object p2) { diff --git a/src/Microsoft.AspNet.Razor/Properties/RazorResources.Designer.cs b/src/Microsoft.AspNet.Razor/Properties/RazorResources.Designer.cs index 5d12ab827d..4ffee4c452 100644 --- a/src/Microsoft.AspNet.Razor/Properties/RazorResources.Designer.cs +++ b/src/Microsoft.AspNet.Razor/Properties/RazorResources.Designer.cs @@ -1499,7 +1499,7 @@ namespace Microsoft.AspNet.Razor } /// - /// Found an end tag (&lt;/{0}&gt;) for tag helper '{1}' with tag structure that disallows an end tag ('{2}'). + /// Found an end tag (</{0}>) for tag helper '{1}' with tag structure that disallows an end tag ('{2}'). /// internal static string TagHelperParseTreeRewriter_EndTagTagHelperMustNotHaveAnEndTag { @@ -1507,7 +1507,7 @@ namespace Microsoft.AspNet.Razor } /// - /// Found an end tag (&lt;/{0}&gt;) for tag helper '{1}' with tag structure that disallows an end tag ('{2}'). + /// Found an end tag (</{0}>) for tag helper '{1}' with tag structure that disallows an end tag ('{2}'). /// internal static string FormatTagHelperParseTreeRewriter_EndTagTagHelperMustNotHaveAnEndTag(object p0, object p1, object p2) { @@ -1515,7 +1515,7 @@ namespace Microsoft.AspNet.Razor } /// - /// The parent &lt;{0}&gt; tag helper does not allow non-tag content. Only child tag helper(s) targeting tag name(s) '{1}' are allowed. + /// The parent <{0}> tag helper does not allow non-tag content. Only child tag helper(s) targeting tag name(s) '{1}' are allowed. /// internal static string TagHelperParseTreeRewriter_CannotHaveNonTagContent { @@ -1523,7 +1523,7 @@ namespace Microsoft.AspNet.Razor } /// - /// The parent &lt;{0}&gt; tag helper does not allow non-tag content. Only child tag helper(s) targeting tag name(s) '{1}' are allowed. + /// The parent <{0}> tag helper does not allow non-tag content. Only child tag helper(s) targeting tag name(s) '{1}' are allowed. /// internal static string FormatTagHelperParseTreeRewriter_CannotHaveNonTagContent(object p0, object p1) { @@ -1531,7 +1531,7 @@ namespace Microsoft.AspNet.Razor } /// - /// The &lt;{0}&gt; tag is not allowed by parent &lt;{1}&gt; tag helper. Only child tag helper(s) targeting tag name(s) '{2}' are allowed. + /// The <{0}> tag is not allowed by parent <{1}> tag helper. Only child tag helper(s) targeting tag name(s) '{2}' are allowed. /// internal static string TagHelperParseTreeRewriter_InvalidNestedTag { @@ -1539,7 +1539,7 @@ namespace Microsoft.AspNet.Razor } /// - /// The &lt;{0}&gt; tag is not allowed by parent &lt;{1}&gt; tag helper. Only child tag helper(s) targeting tag name(s) '{2}' are allowed. + /// The <{0}> tag is not allowed by parent <{1}> tag helper. Only child tag helper(s) targeting tag name(s) '{2}' are allowed. /// internal static string FormatTagHelperParseTreeRewriter_InvalidNestedTag(object p0, object p1, object p2) { diff --git a/src/Microsoft.AspNet.Razor/RazorResources.resx b/src/Microsoft.AspNet.Razor/RazorResources.resx index d099d3330c..0fe6f2b018 100644 --- a/src/Microsoft.AspNet.Razor/RazorResources.resx +++ b/src/Microsoft.AspNet.Razor/RazorResources.resx @@ -417,12 +417,12 @@ Instead, wrap the contents of the block in "{{}}": Tag helpers '{0}' and '{1}' targeting element '{2}' must not expect different {3} values. - Found an end tag (&lt;/{0}&gt;) for tag helper '{1}' with tag structure that disallows an end tag ('{2}'). + Found an end tag (</{0}>) for tag helper '{1}' with tag structure that disallows an end tag ('{2}'). - The parent &lt;{0}&gt; tag helper does not allow non-tag content. Only child tag helper(s) targeting tag name(s) '{1}' are allowed. + The parent <{0}> tag helper does not allow non-tag content. Only child tag helper(s) targeting tag name(s) '{1}' are allowed. - The &lt;{0}&gt; tag is not allowed by parent &lt;{1}&gt; tag helper. Only child tag helper(s) targeting tag name(s) '{2}' are allowed. + The <{0}> tag is not allowed by parent <{1}> tag helper. Only child tag helper(s) targeting tag name(s) '{2}' are allowed. \ No newline at end of file