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

React to aspnet/Razor#604

This commit is contained in:
N. Taylor Mullen 2016-02-04 11:29:26 -08:00
parent 9ea5a939cf
commit 59334dcf17
25 changed files with 271 additions and 261 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/UrlResolutionTagHelper.cs
View File

@ -157,51 +157,52 @@ namespace Microsoft.AspNetCore.Mvc.Razor.TagHelpers
throw new ArgumentNullException(nameof(output)); throw new ArgumentNullException(nameof(output));
} }
IReadOnlyList<TagHelperAttribute> attributes; for (var i = 0; i < output.Attributes.Count; i++)
if (output.Attributes.TryGetAttributes(attributeName, out attributes))
{ {
for (var i = 0; i < attributes.Count; i++) var attribute = output.Attributes[i];
if (!string.Equals(attribute.Name, attributeName, StringComparison.OrdinalIgnoreCase))
{ {
var attribute = attributes[i]; continue;
var stringValue = attribute.Value as string; }
if (stringValue != null)
var stringValue = attribute.Value as string;
if (stringValue != null)
{
string resolvedUrl;
if (TryResolveUrl(stringValue, resolvedUrl: out resolvedUrl))
{ {
string resolvedUrl; output.Attributes[i] = new TagHelperAttribute(attribute.Name, resolvedUrl);
}
}
else
{
var htmlContent = attribute.Value as IHtmlContent;
if (htmlContent != null)
{
var htmlString = htmlContent as HtmlEncodedString;
if (htmlString != null)
{
// No need for a StringWriter in this case.
stringValue = htmlString.ToString();
}
else
{
using (var writer = new StringWriter())
{
htmlContent.WriteTo(writer, HtmlEncoder);
stringValue = writer.ToString();
}
}
IHtmlContent resolvedUrl;
if (TryResolveUrl(stringValue, resolvedUrl: out resolvedUrl)) if (TryResolveUrl(stringValue, resolvedUrl: out resolvedUrl))
{ {
attribute.Value = resolvedUrl; output.Attributes[i] = new TagHelperAttribute(attribute.Name, resolvedUrl);
} }
} else if (htmlString == null)
else
{
var htmlContent = attribute.Value as IHtmlContent;
if (htmlContent != null)
{ {
var htmlString = htmlContent as HtmlEncodedString; // Not a ~/ URL. Just avoid re-encoding the attribute value later.
if (htmlString != null) output.Attributes[i] = new TagHelperAttribute(attribute.Name, new HtmlString(stringValue));
{
// No need for a StringWriter in this case.
stringValue = htmlString.ToString();
}
else
{
using (var writer = new StringWriter())
{
htmlContent.WriteTo(writer, HtmlEncoder);
stringValue = writer.ToString();
}
}
IHtmlContent resolvedUrl;
if (TryResolveUrl(stringValue, resolvedUrl: out resolvedUrl))
{
attribute.Value = resolvedUrl;
}
else if (htmlString == null)
{
// Not a ~/ URL. Just avoid re-encoding the attribute value later.
attribute.Value = new HtmlString(stringValue);
}
} }
} }
} }

2
src/Microsoft.AspNetCore.Mvc.TagHelpers/ImageTagHelper.cs
View File

@ -106,7 +106,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
// not function properly. // not function properly.
Src = output.Attributes[SrcAttributeName].Value as string; Src = output.Attributes[SrcAttributeName].Value as string;
output.Attributes[SrcAttributeName] = _fileVersionProvider.AddFileVersionToPath(Src); output.Attributes.SetAttribute(SrcAttributeName, _fileVersionProvider.AddFileVersionToPath(Src));
} }
} }

2
src/Microsoft.AspNetCore.Mvc.TagHelpers/InputTagHelper.cs
View File

@ -183,7 +183,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
// inputType may be more specific than default the generator chooses below. // inputType may be more specific than default the generator chooses below.
if (!output.Attributes.ContainsName("type")) if (!output.Attributes.ContainsName("type"))
{ {
output.Attributes["type"] = inputType; output.Attributes.SetAttribute("type", inputType);
} }
TagBuilder tagBuilder; TagBuilder tagBuilder;

2
src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/AttributeMatcher.cs
View File

@ -73,7 +73,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers.Internal
// Perf: Avoid allocating enumerator // Perf: Avoid allocating enumerator
for (var i = 0; i < requiredAttributes.Length; i++) for (var i = 0; i < requiredAttributes.Length; i++)
{ {
IReadOnlyTagHelperAttribute attribute; TagHelperAttribute attribute;
if (!context.AllAttributes.TryGetAttribute(requiredAttributes[i], out attribute)) if (!context.AllAttributes.TryGetAttribute(requiredAttributes[i], out attribute))
{ {
// Missing attribute. // Missing attribute.

7
src/Microsoft.AspNetCore.Mvc.TagHelpers/LinkTagHelper.cs
View File

@ -254,7 +254,10 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
if (Href != null) if (Href != null)
{ {
output.Attributes[HrefAttributeName].Value = _fileVersionProvider.AddFileVersionToPath(Href); var index = output.Attributes.IndexOfName(HrefAttributeName);
output.Attributes[index] = new TagHelperAttribute(
HrefAttributeName,
_fileVersionProvider.AddFileVersionToPath(Href));
} }
} }
@ -303,7 +306,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
continue; continue;
} }
attributes[HrefAttributeName] = url; attributes.SetAttribute(HrefAttributeName, url);
BuildLinkTag(attributes, builder); BuildLinkTag(attributes, builder);
} }
} }

7
src/Microsoft.AspNetCore.Mvc.TagHelpers/ScriptTagHelper.cs
View File

@ -217,7 +217,10 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
if (Src != null) if (Src != null)
{ {
output.Attributes[SrcAttributeName].Value = _fileVersionProvider.AddFileVersionToPath(Src); var index = output.Attributes.IndexOfName(SrcAttributeName);
output.Attributes[index] = new TagHelperAttribute(
SrcAttributeName,
_fileVersionProvider.AddFileVersionToPath(Src));
} }
} }
@ -267,7 +270,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
continue; continue;
} }
attributes[SrcAttributeName] = url; attributes.SetAttribute(SrcAttributeName, url);
BuildScriptTag(attributes, builder); BuildScriptTag(attributes, builder);
} }
} }

12
src/Microsoft.AspNetCore.Mvc.TagHelpers/TagHelperOutputExtensions.cs
View File

@ -116,7 +116,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
if (tagHelperOutput.Attributes.TryGetAttribute("class", out classAttribute)) if (tagHelperOutput.Attributes.TryGetAttribute("class", out classAttribute))
{ {
tagHelperOutput.Attributes["class"] = classAttribute.Value + " " + attribute.Value; tagHelperOutput.Attributes.SetAttribute("class", classAttribute.Value + " " + attribute.Value);
} }
else else
{ {
@ -158,12 +158,10 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
TagHelperContext context) TagHelperContext context)
{ {
var existingAttribute = context.AllAttributes[allAttributeIndex]; var existingAttribute = context.AllAttributes[allAttributeIndex];
var copiedAttribute = new TagHelperAttribute var copiedAttribute = new TagHelperAttribute(
{ existingAttribute.Name,
Name = existingAttribute.Name, existingAttribute.Value,
Value = existingAttribute.Value, existingAttribute.Minimized);
Minimized = existingAttribute.Minimized
};
// Move backwards through context.AllAttributes from the provided index until we find a familiar attribute // Move backwards through context.AllAttributes from the provided index until we find a familiar attribute
// in tagHelperOutput where we can insert the copied value after the familiar one. // in tagHelperOutput where we can insert the copied value after the familiar one.

6
test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageTest.cs
View File

@ -978,7 +978,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor
page.EndAddHtmlAttributeValues(executionContext); page.EndAddHtmlAttributeValues(executionContext);
// Assert // Assert
var htmlAttribute = Assert.Single(executionContext.HTMLAttributes); var htmlAttribute = Assert.Single(executionContext.HtmlAttributes);
Assert.Equal("someattr", htmlAttribute.Name, StringComparer.Ordinal); Assert.Equal("someattr", htmlAttribute.Name, StringComparer.Ordinal);
var htmlContent = Assert.IsAssignableFrom<IHtmlContent>(htmlAttribute.Value); var htmlContent = Assert.IsAssignableFrom<IHtmlContent>(htmlAttribute.Value);
Assert.Equal(expectedValue, HtmlContentUtilities.HtmlContentToString(htmlContent), StringComparer.Ordinal); Assert.Equal(expectedValue, HtmlContentUtilities.HtmlContentToString(htmlContent), StringComparer.Ordinal);
@ -1016,7 +1016,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor
page.EndAddHtmlAttributeValues(executionContext); page.EndAddHtmlAttributeValues(executionContext);
// Assert // Assert
Assert.Empty(executionContext.HTMLAttributes); Assert.Empty(executionContext.HtmlAttributes);
var attribute = Assert.Single(executionContext.AllAttributes); var attribute = Assert.Single(executionContext.AllAttributes);
Assert.Equal("someattr", attribute.Name, StringComparer.Ordinal); Assert.Equal("someattr", attribute.Name, StringComparer.Ordinal);
Assert.Equal(expectedValue, (string)attribute.Value, StringComparer.Ordinal); Assert.Equal(expectedValue, (string)attribute.Value, StringComparer.Ordinal);
@ -1044,7 +1044,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor
page.EndAddHtmlAttributeValues(executionContext); page.EndAddHtmlAttributeValues(executionContext);
// Assert // Assert
var htmlAttribute = Assert.Single(executionContext.HTMLAttributes); var htmlAttribute = Assert.Single(executionContext.HtmlAttributes);
Assert.Equal("someattr", htmlAttribute.Name, StringComparer.Ordinal); Assert.Equal("someattr", htmlAttribute.Name, StringComparer.Ordinal);
Assert.Equal("someattr", (string)htmlAttribute.Value, StringComparer.Ordinal); Assert.Equal("someattr", (string)htmlAttribute.Value, StringComparer.Ordinal);
Assert.False(htmlAttribute.Minimized); Assert.False(htmlAttribute.Minimized);

24
test/Microsoft.AspNetCore.Mvc.Razor.Test/TagHelpers/UrlResolutionTagHelperTest.cs
View File

@ -59,8 +59,8 @@ namespace Microsoft.AspNetCore.Mvc.Razor.TagHelpers
var tagHelper = new UrlResolutionTagHelper(urlHelperFactory.Object, new HtmlTestEncoder()); var tagHelper = new UrlResolutionTagHelper(urlHelperFactory.Object, new HtmlTestEncoder());
var context = new TagHelperContext( var context = new TagHelperContext(
allAttributes: new ReadOnlyTagHelperAttributeList<IReadOnlyTagHelperAttribute>( allAttributes: new TagHelperAttributeList(
Enumerable.Empty<IReadOnlyTagHelperAttribute>()), Enumerable.Empty<TagHelperAttribute>()),
items: new Dictionary<object, object>(), items: new Dictionary<object, object>(),
uniqueId: "test"); uniqueId: "test");
@ -115,8 +115,8 @@ namespace Microsoft.AspNetCore.Mvc.Razor.TagHelpers
var tagHelper = new UrlResolutionTagHelper(urlHelperFactory.Object, new HtmlTestEncoder()); var tagHelper = new UrlResolutionTagHelper(urlHelperFactory.Object, new HtmlTestEncoder());
var context = new TagHelperContext( var context = new TagHelperContext(
allAttributes: new ReadOnlyTagHelperAttributeList<IReadOnlyTagHelperAttribute>( allAttributes: new TagHelperAttributeList(
Enumerable.Empty<IReadOnlyTagHelperAttribute>()), Enumerable.Empty<TagHelperAttribute>()),
items: new Dictionary<object, object>(), items: new Dictionary<object, object>(),
uniqueId: "test"); uniqueId: "test");
@ -170,8 +170,8 @@ namespace Microsoft.AspNetCore.Mvc.Razor.TagHelpers
var tagHelper = new UrlResolutionTagHelper(urlHelperFactory.Object, new HtmlTestEncoder()); var tagHelper = new UrlResolutionTagHelper(urlHelperFactory.Object, new HtmlTestEncoder());
var context = new TagHelperContext( var context = new TagHelperContext(
allAttributes: new ReadOnlyTagHelperAttributeList<IReadOnlyTagHelperAttribute>( allAttributes: new TagHelperAttributeList(
Enumerable.Empty<IReadOnlyTagHelperAttribute>()), Enumerable.Empty<TagHelperAttribute>()),
items: new Dictionary<object, object>(), items: new Dictionary<object, object>(),
uniqueId: "test"); uniqueId: "test");
@ -225,8 +225,8 @@ namespace Microsoft.AspNetCore.Mvc.Razor.TagHelpers
var tagHelper = new UrlResolutionTagHelper(urlHelperFactory.Object, new HtmlTestEncoder()); var tagHelper = new UrlResolutionTagHelper(urlHelperFactory.Object, new HtmlTestEncoder());
var context = new TagHelperContext( var context = new TagHelperContext(
allAttributes: new ReadOnlyTagHelperAttributeList<IReadOnlyTagHelperAttribute>( allAttributes: new TagHelperAttributeList(
Enumerable.Empty<IReadOnlyTagHelperAttribute>()), Enumerable.Empty<TagHelperAttribute>()),
items: new Dictionary<object, object>(), items: new Dictionary<object, object>(),
uniqueId: "test"); uniqueId: "test");
@ -255,8 +255,8 @@ namespace Microsoft.AspNetCore.Mvc.Razor.TagHelpers
var tagHelper = new UrlResolutionTagHelper(urlHelperFactory: null, htmlEncoder: null); var tagHelper = new UrlResolutionTagHelper(urlHelperFactory: null, htmlEncoder: null);
var context = new TagHelperContext( var context = new TagHelperContext(
allAttributes: new ReadOnlyTagHelperAttributeList<IReadOnlyTagHelperAttribute>( allAttributes: new TagHelperAttributeList(
Enumerable.Empty<IReadOnlyTagHelperAttribute>()), Enumerable.Empty<TagHelperAttribute>()),
items: new Dictionary<object, object>(), items: new Dictionary<object, object>(),
uniqueId: "test"); uniqueId: "test");
@ -300,8 +300,8 @@ namespace Microsoft.AspNetCore.Mvc.Razor.TagHelpers
var tagHelper = new UrlResolutionTagHelper(urlHelperFactory.Object, new HtmlTestEncoder()); var tagHelper = new UrlResolutionTagHelper(urlHelperFactory.Object, new HtmlTestEncoder());
var context = new TagHelperContext( var context = new TagHelperContext(
allAttributes: new ReadOnlyTagHelperAttributeList<IReadOnlyTagHelperAttribute>( allAttributes: new TagHelperAttributeList(
Enumerable.Empty<IReadOnlyTagHelperAttribute>()), Enumerable.Empty<TagHelperAttribute>()),
items: new Dictionary<object, object>(), items: new Dictionary<object, object>(),
uniqueId: "test"); uniqueId: "test");

16
test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/AnchorTagHelperTest.cs
View File

@ -92,8 +92,8 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
{ {
// Arrange // Arrange
var context = new TagHelperContext( var context = new TagHelperContext(
allAttributes: new ReadOnlyTagHelperAttributeList<IReadOnlyTagHelperAttribute>( allAttributes: new TagHelperAttributeList(
Enumerable.Empty<IReadOnlyTagHelperAttribute>()), Enumerable.Empty<TagHelperAttribute>()),
items: new Dictionary<object, object>(), items: new Dictionary<object, object>(),
uniqueId: "test"); uniqueId: "test");
var output = new TagHelperOutput( var output = new TagHelperOutput(
@ -141,8 +141,8 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
{ {
// Arrange // Arrange
var context = new TagHelperContext( var context = new TagHelperContext(
allAttributes: new ReadOnlyTagHelperAttributeList<IReadOnlyTagHelperAttribute>( allAttributes: new TagHelperAttributeList(
Enumerable.Empty<IReadOnlyTagHelperAttribute>()), Enumerable.Empty<TagHelperAttribute>()),
items: new Dictionary<object, object>(), items: new Dictionary<object, object>(),
uniqueId: "test"); uniqueId: "test");
var output = new TagHelperOutput( var output = new TagHelperOutput(
@ -225,8 +225,8 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
"'asp-fragment' attribute."; "'asp-fragment' attribute.";
var context = new TagHelperContext( var context = new TagHelperContext(
allAttributes: new ReadOnlyTagHelperAttributeList<IReadOnlyTagHelperAttribute>( allAttributes: new TagHelperAttributeList(
Enumerable.Empty<IReadOnlyTagHelperAttribute>()), Enumerable.Empty<TagHelperAttribute>()),
items: new Dictionary<object, object>(), items: new Dictionary<object, object>(),
uniqueId: "test"); uniqueId: "test");
@ -260,8 +260,8 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
"'asp-route' must not have an 'asp-action' or 'asp-controller' attribute."; "'asp-route' must not have an 'asp-action' or 'asp-controller' attribute.";
var context = new TagHelperContext( var context = new TagHelperContext(
allAttributes: new ReadOnlyTagHelperAttributeList<IReadOnlyTagHelperAttribute>( allAttributes: new TagHelperAttributeList(
Enumerable.Empty<IReadOnlyTagHelperAttribute>()), Enumerable.Empty<TagHelperAttribute>()),
items: new Dictionary<object, object>(), items: new Dictionary<object, object>(),
uniqueId: "test"); uniqueId: "test");

27
test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/FormTagHelperTest.cs
View File

@ -114,8 +114,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
var viewContext = CreateViewContext(); var viewContext = CreateViewContext();
var expectedAttribute = new TagHelperAttribute("method", method.ToString().ToLowerInvariant()); var expectedAttribute = new TagHelperAttribute("method", method.ToString().ToLowerInvariant());
var context = new TagHelperContext( var context = new TagHelperContext(
allAttributes: new ReadOnlyTagHelperAttributeList<IReadOnlyTagHelperAttribute>( allAttributes: new TagHelperAttributeList(new[] { expectedAttribute }),
new ReadOnlyTagHelperAttributeList<IReadOnlyTagHelperAttribute>(new List<IReadOnlyTagHelperAttribute> { expectedAttribute })),
items: new Dictionary<object, object>(), items: new Dictionary<object, object>(),
uniqueId: "test"); uniqueId: "test");
var output = new TagHelperOutput( var output = new TagHelperOutput(
@ -167,8 +166,8 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
// Arrange // Arrange
var testViewContext = CreateViewContext(); var testViewContext = CreateViewContext();
var context = new TagHelperContext( var context = new TagHelperContext(
allAttributes: new ReadOnlyTagHelperAttributeList<IReadOnlyTagHelperAttribute>( allAttributes: new TagHelperAttributeList(
Enumerable.Empty<IReadOnlyTagHelperAttribute>()), Enumerable.Empty<TagHelperAttribute>()),
items: new Dictionary<object, object>(), items: new Dictionary<object, object>(),
uniqueId: "test"); uniqueId: "test");
var expectedAttribute = new TagHelperAttribute("asp-ROUTEE-NotRoute", "something"); var expectedAttribute = new TagHelperAttribute("asp-ROUTEE-NotRoute", "something");
@ -239,8 +238,8 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
// Arrange // Arrange
var viewContext = CreateViewContext(); var viewContext = CreateViewContext();
var context = new TagHelperContext( var context = new TagHelperContext(
allAttributes: new ReadOnlyTagHelperAttributeList<IReadOnlyTagHelperAttribute>( allAttributes: new TagHelperAttributeList(
Enumerable.Empty<IReadOnlyTagHelperAttribute>()), Enumerable.Empty<TagHelperAttribute>()),
items: new Dictionary<object, object>(), items: new Dictionary<object, object>(),
uniqueId: "test"); uniqueId: "test");
var output = new TagHelperOutput( var output = new TagHelperOutput(
@ -290,8 +289,8 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
// Arrange // Arrange
var viewContext = CreateViewContext(); var viewContext = CreateViewContext();
var context = new TagHelperContext( var context = new TagHelperContext(
allAttributes: new ReadOnlyTagHelperAttributeList<IReadOnlyTagHelperAttribute>( allAttributes: new TagHelperAttributeList(
Enumerable.Empty<IReadOnlyTagHelperAttribute>()), Enumerable.Empty<TagHelperAttribute>()),
items: new Dictionary<object, object>(), items: new Dictionary<object, object>(),
uniqueId: "test"); uniqueId: "test");
var output = new TagHelperOutput( var output = new TagHelperOutput(
@ -371,8 +370,8 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
return Task.FromResult<TagHelperContent>(tagHelperContent); return Task.FromResult<TagHelperContent>(tagHelperContent);
}); });
var context = new TagHelperContext( var context = new TagHelperContext(
allAttributes: new ReadOnlyTagHelperAttributeList<IReadOnlyTagHelperAttribute>( allAttributes: new TagHelperAttributeList(
Enumerable.Empty<IReadOnlyTagHelperAttribute>()), Enumerable.Empty<TagHelperAttribute>()),
items: new Dictionary<object, object>(), items: new Dictionary<object, object>(),
uniqueId: "test"); uniqueId: "test");
@ -419,8 +418,8 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
"'asp-action' or 'asp-controller' or 'asp-route' attribute."; "'asp-action' or 'asp-controller' or 'asp-route' attribute.";
var context = new TagHelperContext( var context = new TagHelperContext(
allAttributes: new ReadOnlyTagHelperAttributeList<IReadOnlyTagHelperAttribute>( allAttributes: new TagHelperAttributeList(
Enumerable.Empty<IReadOnlyTagHelperAttribute>()), Enumerable.Empty<TagHelperAttribute>()),
items: new Dictionary<object, object>(), items: new Dictionary<object, object>(),
uniqueId: "test"); uniqueId: "test");
@ -450,8 +449,8 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
"'asp-route' must not have an 'asp-action' or 'asp-controller' attribute."; "'asp-route' must not have an 'asp-action' or 'asp-controller' attribute.";
var context = new TagHelperContext( var context = new TagHelperContext(
allAttributes: new ReadOnlyTagHelperAttributeList<IReadOnlyTagHelperAttribute>( allAttributes: new TagHelperAttributeList(
Enumerable.Empty<IReadOnlyTagHelperAttribute>()), Enumerable.Empty<TagHelperAttribute>()),
items: new Dictionary<object, object>(), items: new Dictionary<object, object>(),
uniqueId: "test"); uniqueId: "test");

28
test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/InputTagHelperTest.cs
View File

@ -87,8 +87,8 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
"<input name=\"HtmlEncode[[IsACar]]\" type=\"HtmlEncode[[hidden]]\" value=\"HtmlEncode[[false]]\" />"; "<input name=\"HtmlEncode[[IsACar]]\" type=\"HtmlEncode[[hidden]]\" value=\"HtmlEncode[[false]]\" />";
var context = new TagHelperContext( var context = new TagHelperContext(
allAttributes: new ReadOnlyTagHelperAttributeList<IReadOnlyTagHelperAttribute>( allAttributes: new TagHelperAttributeList(
Enumerable.Empty<IReadOnlyTagHelperAttribute>()), Enumerable.Empty<TagHelperAttribute>()),
items: new Dictionary<object, object>(), items: new Dictionary<object, object>(),
uniqueId: "test"); uniqueId: "test");
var output = new TagHelperOutput( var output = new TagHelperOutput(
@ -193,8 +193,8 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
var expectedTagName = "not-input"; var expectedTagName = "not-input";
var context = new TagHelperContext( var context = new TagHelperContext(
allAttributes: new ReadOnlyTagHelperAttributeList<IReadOnlyTagHelperAttribute>( allAttributes: new TagHelperAttributeList(
Enumerable.Empty<IReadOnlyTagHelperAttribute>()), Enumerable.Empty<TagHelperAttribute>()),
items: new Dictionary<object, object>(), items: new Dictionary<object, object>(),
uniqueId: "test"); uniqueId: "test");
var originalAttributes = new TagHelperAttributeList var originalAttributes = new TagHelperAttributeList
@ -257,8 +257,8 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
var expectedPostContent = "original post-content"; var expectedPostContent = "original post-content";
var context = new TagHelperContext( var context = new TagHelperContext(
allAttributes: new ReadOnlyTagHelperAttributeList<IReadOnlyTagHelperAttribute>( allAttributes: new TagHelperAttributeList(
Enumerable.Empty<IReadOnlyTagHelperAttribute>()), Enumerable.Empty<TagHelperAttribute>()),
items: new Dictionary<object, object>(), items: new Dictionary<object, object>(),
uniqueId: "test"); uniqueId: "test");
var originalAttributes = new TagHelperAttributeList var originalAttributes = new TagHelperAttributeList
@ -343,7 +343,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
}; };
if (!string.IsNullOrEmpty(inputTypeName)) if (!string.IsNullOrEmpty(inputTypeName))
{ {
contextAttributes["type"] = inputTypeName; // Support restoration of type attribute, if any. contextAttributes.SetAttribute("type", inputTypeName); // Support restoration of type attribute, if any.
} }
var expectedAttributes = new TagHelperAttributeList var expectedAttributes = new TagHelperAttributeList
@ -444,7 +444,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
}; };
if (!string.IsNullOrEmpty(inputTypeName)) if (!string.IsNullOrEmpty(inputTypeName))
{ {
contextAttributes["type"] = inputTypeName; // Support restoration of type attribute, if any. contextAttributes.SetAttribute("type", inputTypeName); // Support restoration of type attribute, if any.
} }
var expectedAttributes = new TagHelperAttributeList var expectedAttributes = new TagHelperAttributeList
@ -541,7 +541,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
}; };
if (!string.IsNullOrEmpty(inputTypeName)) if (!string.IsNullOrEmpty(inputTypeName))
{ {
contextAttributes["type"] = inputTypeName; // Support restoration of type attribute, if any. contextAttributes.SetAttribute("type", inputTypeName); // Support restoration of type attribute, if any.
} }
var expectedAttributes = new TagHelperAttributeList var expectedAttributes = new TagHelperAttributeList
@ -651,7 +651,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
}; };
if (!string.IsNullOrEmpty(inputTypeName)) if (!string.IsNullOrEmpty(inputTypeName))
{ {
contextAttributes["type"] = inputTypeName; // Support restoration of type attribute, if any. contextAttributes.SetAttribute("type", inputTypeName); // Support restoration of type attribute, if any.
} }
var expectedAttributes = new TagHelperAttributeList var expectedAttributes = new TagHelperAttributeList
@ -784,8 +784,8 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
var expectedTagName = "not-input"; var expectedTagName = "not-input";
var context = new TagHelperContext( var context = new TagHelperContext(
allAttributes: new ReadOnlyTagHelperAttributeList<IReadOnlyTagHelperAttribute>( allAttributes: new TagHelperAttributeList(
Enumerable.Empty<IReadOnlyTagHelperAttribute>()), Enumerable.Empty<TagHelperAttribute>()),
items: new Dictionary<object, object>(), items: new Dictionary<object, object>(),
uniqueId: "test"); uniqueId: "test");
@ -868,8 +868,8 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
var expectedTagName = "not-input"; var expectedTagName = "not-input";
var context = new TagHelperContext( var context = new TagHelperContext(
allAttributes: new ReadOnlyTagHelperAttributeList<IReadOnlyTagHelperAttribute>( allAttributes: new TagHelperAttributeList(
Enumerable.Empty<IReadOnlyTagHelperAttribute>()), Enumerable.Empty<TagHelperAttribute>()),
items: new Dictionary<object, object>(), items: new Dictionary<object, object>(),
uniqueId: "test"); uniqueId: "test");

18
test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/Internal/AttributeMatcherTest.cs
View File

@ -24,8 +24,8 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers.Internal
}; };
var attributes = new TagHelperAttributeList var attributes = new TagHelperAttributeList
{ {
["first-attr"] = "value", new TagHelperAttribute("first-attr", "value"),
["not-in-any-mode"] = "value" new TagHelperAttribute("not-in-any-mode", "value")
}; };
var context = MakeTagHelperContext(attributes); var context = MakeTagHelperContext(attributes);
@ -49,9 +49,9 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers.Internal
}; };
var attributes = new TagHelperAttributeList var attributes = new TagHelperAttributeList
{ {
["first-attr"] = "value", new TagHelperAttribute("first-attr", "value"),
["second-attr"] = "value", new TagHelperAttribute("second-attr", "value"),
["not-in-any-mode"] = "value" new TagHelperAttribute("not-in-any-mode", "value")
}; };
var context = MakeTagHelperContext(attributes); var context = MakeTagHelperContext(attributes);
@ -77,10 +77,10 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers.Internal
}; };
var attributes = new TagHelperAttributeList var attributes = new TagHelperAttributeList
{ {
["first-attr"] = "value", new TagHelperAttribute("first-attr", "value"),
["second-attr"] = "value", new TagHelperAttribute("second-attr", "value"),
["third-attr"] = "value", new TagHelperAttribute("third-attr", "value"),
["not-in-any-mode"] = "value" new TagHelperAttribute("not-in-any-mode", "value")
}; };
var context = MakeTagHelperContext(attributes); var context = MakeTagHelperContext(attributes);

3
test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/LabelTagHelperTest.cs
View File

@ -190,8 +190,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
var expectedPostContent = "original post-content"; var expectedPostContent = "original post-content";
var tagHelperContext = new TagHelperContext( var tagHelperContext = new TagHelperContext(
allAttributes: new ReadOnlyTagHelperAttributeList<IReadOnlyTagHelperAttribute>( allAttributes: new TagHelperAttributeList(),
Enumerable.Empty<IReadOnlyTagHelperAttribute>()),
items: new Dictionary<object, object>(), items: new Dictionary<object, object>(),
uniqueId: "test"); uniqueId: "test");
var htmlAttributes = new TagHelperAttributeList var htmlAttributes = new TagHelperAttributeList

93
test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/LinkTagHelperTest.cs
View File

@ -200,10 +200,10 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
{ {
new TagHelperAttributeList new TagHelperAttributeList
{ {
["asp-fallback-href"] = "test.css", new TagHelperAttribute("asp-fallback-href", "test.css"),
["asp-fallback-test-class"] = "hidden", new TagHelperAttribute("asp-fallback-test-class", "hidden"),
["asp-fallback-test-property"] = "visibility", new TagHelperAttribute("asp-fallback-test-property", "visibility"),
["asp-fallback-test-value"] = "hidden" new TagHelperAttribute("asp-fallback-test-value", "hidden")
}, },
tagHelper => tagHelper =>
{ {
@ -216,10 +216,10 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
{ {
new TagHelperAttributeList new TagHelperAttributeList
{ {
["asp-fallback-href-include"] = "*.css", new TagHelperAttribute("asp-fallback-href-include", "*.css"),
["asp-fallback-test-class"] = "hidden", new TagHelperAttribute("asp-fallback-test-class", "hidden"),
["asp-fallback-test-property"] = "visibility", new TagHelperAttribute("asp-fallback-test-property", "visibility"),
["asp-fallback-test-value"] = "hidden" new TagHelperAttribute("asp-fallback-test-value", "hidden")
}, },
tagHelper => tagHelper =>
{ {
@ -233,11 +233,11 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
{ {
new TagHelperAttributeList new TagHelperAttributeList
{ {
["asp-fallback-href"] = "test.css", new TagHelperAttribute("asp-fallback-href", "test.css"),
["asp-fallback-test-class"] = "hidden", new TagHelperAttribute("asp-fallback-test-class", "hidden"),
["asp-fallback-test-property"] = "visibility", new TagHelperAttribute("asp-fallback-test-property", "visibility"),
["asp-fallback-test-value"] = "hidden", new TagHelperAttribute("asp-fallback-test-value", "hidden"),
["asp-append-version"] = "true" new TagHelperAttribute("asp-append-version", "true")
}, },
tagHelper => tagHelper =>
{ {
@ -251,11 +251,11 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
{ {
new TagHelperAttributeList new TagHelperAttributeList
{ {
["asp-fallback-href-include"] = "*.css", new TagHelperAttribute("asp-fallback-href-include", "*.css"),
["asp-fallback-test-class"] = "hidden", new TagHelperAttribute("asp-fallback-test-class", "hidden"),
["asp-fallback-test-property"] = "visibility", new TagHelperAttribute("asp-fallback-test-property", "visibility"),
["asp-fallback-test-value"] = "hidden", new TagHelperAttribute("asp-fallback-test-value", "hidden"),
["asp-append-version"] = "true" new TagHelperAttribute("asp-append-version", "true")
}, },
tagHelper => tagHelper =>
{ {
@ -318,7 +318,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
{ {
new TagHelperAttributeList new TagHelperAttributeList
{ {
["asp-href-include"] = "*.css" new TagHelperAttribute("asp-href-include", "*.css")
}, },
tagHelper => tagHelper =>
{ {
@ -328,8 +328,8 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
{ {
new TagHelperAttributeList new TagHelperAttributeList
{ {
["asp-href-include"] = "*.css", new TagHelperAttribute("asp-href-include", "*.css"),
["asp-href-exclude"] = "*.min.css" new TagHelperAttribute("asp-href-exclude", "*.min.css")
}, },
tagHelper => tagHelper =>
{ {
@ -340,8 +340,8 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
{ {
new TagHelperAttributeList new TagHelperAttributeList
{ {
["asp-href-include"] = "*.css", new TagHelperAttribute("asp-href-include", "*.css"),
["asp-append-version"] = "true" new TagHelperAttribute("asp-append-version", "true")
}, },
tagHelper => tagHelper =>
{ {
@ -352,9 +352,9 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
{ {
new TagHelperAttributeList new TagHelperAttributeList
{ {
["asp-href-include"] = "*.css", new TagHelperAttribute("asp-href-include", "*.css"),
["asp-href-exclude"] = "*.min.css", new TagHelperAttribute("asp-href-exclude", "*.min.css"),
["asp-append-version"] = "true" new TagHelperAttribute("asp-append-version", "true")
}, },
tagHelper => tagHelper =>
{ {
@ -463,8 +463,9 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
{ {
new TagHelperAttributeList new TagHelperAttributeList
{ {
// This is commented out on purpose: ["asp-href-include"] = "*.css", // This is commented out on purpose: new TagHelperAttribute("asp-href-include", "*.css"),
["asp-href-exclude"] = "*.min.css" // Note asp-href-include attribute isn't included.
new TagHelperAttribute("asp-href-exclude", "*.min.css")
}, },
tagHelper => tagHelper =>
{ {
@ -475,10 +476,11 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
{ {
new TagHelperAttributeList new TagHelperAttributeList
{ {
// This is commented out on purpose: ["asp-fallback-href"] = "test.css", // This is commented out on purpose: new TagHelperAttribute("asp-fallback-href", "test.css"),
["asp-fallback-test-class"] = "hidden", // Note asp-href-include attribute isn't included.
["asp-fallback-test-property"] = "visibility", new TagHelperAttribute("asp-fallback-test-class", "hidden"),
["asp-fallback-test-value"] = "hidden" new TagHelperAttribute("asp-fallback-test-property", "visibility"),
new TagHelperAttribute("asp-fallback-test-value", "hidden")
}, },
tagHelper => tagHelper =>
{ {
@ -491,10 +493,11 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
{ {
new TagHelperAttributeList new TagHelperAttributeList
{ {
["asp-fallback-href"] = "test.css", new TagHelperAttribute("asp-fallback-href", "test.css"),
["asp-fallback-test-class"] = "hidden", new TagHelperAttribute("asp-fallback-test-class", "hidden"),
// This is commented out on purpose: ["asp-fallback-test-property"] = "visibility", // This is commented out on purpose: new TagHelperAttribute("asp-fallback-test-property", "visibility"),
["asp-fallback-test-value"] = "hidden" // Note asp-href-include attribute isn't included.
new TagHelperAttribute("asp-fallback-test-value", "hidden")
}, },
tagHelper => tagHelper =>
{ {
@ -507,11 +510,11 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
{ {
new TagHelperAttributeList new TagHelperAttributeList
{ {
// This is commented out on purpose: ["asp-fallback-href-include"] = "test.css", // This is commented out on purpose: new TagHelperAttribute("asp-fallback-href-include", "test.css"),
["asp-fallback-href-exclude"] = "**/*.min.css", new TagHelperAttribute("asp-fallback-href-exclude", "**/*.min.css"),
["asp-fallback-test-class"] = "hidden", new TagHelperAttribute("asp-fallback-test-class", "hidden"),
["asp-fallback-test-property"] = "visibility", new TagHelperAttribute("asp-fallback-test-property", "visibility"),
["asp-fallback-test-value"] = "hidden" new TagHelperAttribute("asp-fallback-test-value", "hidden")
}, },
tagHelper => tagHelper =>
{ {
@ -641,13 +644,13 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
var context = MakeTagHelperContext( var context = MakeTagHelperContext(
attributes: new TagHelperAttributeList attributes: new TagHelperAttributeList
{ {
["rel"] = "stylesheet", new TagHelperAttribute("rel", "stylesheet"),
["href"] = "/css/site.css", new TagHelperAttribute("href", "/css/site.css"),
["asp-href-include"] = "**/*.css" new TagHelperAttribute("asp-href-include", "**/*.css")
}); });
var output = MakeTagHelperOutput("link", attributes: new TagHelperAttributeList var output = MakeTagHelperOutput("link", attributes: new TagHelperAttributeList
{ {
["rel"] = "stylesheet", new TagHelperAttribute("rel", "stylesheet"),
}); });
var hostingEnvironment = MakeHostingEnvironment(); var hostingEnvironment = MakeHostingEnvironment();
var viewContext = MakeViewContext(); var viewContext = MakeViewContext();

2
test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/RenderAtEndOfFormTagHelperTest.cs
View File

@ -63,7 +63,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
}); });
var tagHelperContext = new TagHelperContext( var tagHelperContext = new TagHelperContext(
Enumerable.Empty<IReadOnlyTagHelperAttribute>(), Enumerable.Empty<TagHelperAttribute>(),
new Dictionary<object, object>(), new Dictionary<object, object>(),
"someId"); "someId");

138
test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/ScriptTagHelperTest.cs
View File

@ -102,10 +102,10 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
outputAttributes.Concat( outputAttributes.Concat(
new TagHelperAttributeList new TagHelperAttributeList
{ {
["data-extra"] = "something", new TagHelperAttribute("data-extra", "something"),
["src"] = "/blank.js", new TagHelperAttribute("src", "/blank.js"),
["asp-fallback-src"] = "http://www.example.com/blank.js", new TagHelperAttribute("asp-fallback-src", "http://www.example.com/blank.js"),
["asp-fallback-test"] = "isavailable()", new TagHelperAttribute("asp-fallback-test", "isavailable()"),
})); }));
var tagHelperContext = MakeTagHelperContext(allAttributes); var tagHelperContext = MakeTagHelperContext(allAttributes);
var viewContext = MakeViewContext(); var viewContext = MakeViewContext();
@ -149,8 +149,8 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
{ {
new TagHelperAttributeList new TagHelperAttributeList
{ {
["asp-fallback-src"] = "test.js", new TagHelperAttribute("asp-fallback-src", "test.js"),
["asp-fallback-test"] = "isavailable()" new TagHelperAttribute("asp-fallback-test", "isavailable()")
}, },
tagHelper => tagHelper =>
{ {
@ -161,8 +161,8 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
{ {
new TagHelperAttributeList new TagHelperAttributeList
{ {
["asp-fallback-src-include"] = "*.js", new TagHelperAttribute("asp-fallback-src-include", "*.js"),
["asp-fallback-test"] = "isavailable()" new TagHelperAttribute("asp-fallback-test", "isavailable()")
}, },
tagHelper => tagHelper =>
{ {
@ -173,9 +173,9 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
{ {
new TagHelperAttributeList new TagHelperAttributeList
{ {
["asp-fallback-src"] = "test.js", new TagHelperAttribute("asp-fallback-src", "test.js"),
["asp-fallback-src-include"] = "*.js", new TagHelperAttribute("asp-fallback-src-include", "*.js"),
["asp-fallback-test"] = "isavailable()" new TagHelperAttribute("asp-fallback-test", "isavailable()")
}, },
tagHelper => tagHelper =>
{ {
@ -187,9 +187,9 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
{ {
new TagHelperAttributeList new TagHelperAttributeList
{ {
["asp-fallback-src-include"] = "*.js", new TagHelperAttribute("asp-fallback-src-include", "*.js"),
["asp-fallback-src-exclude"] = "*.min.js", new TagHelperAttribute("asp-fallback-src-exclude", "*.min.js"),
["asp-fallback-test"] = "isavailable()" new TagHelperAttribute("asp-fallback-test", "isavailable()")
}, },
tagHelper => tagHelper =>
{ {
@ -202,9 +202,9 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
{ {
new TagHelperAttributeList new TagHelperAttributeList
{ {
["asp-fallback-src"] = "test.js", new TagHelperAttribute("asp-fallback-src", "test.js"),
["asp-fallback-test"] = "isavailable()", new TagHelperAttribute("asp-fallback-test", "isavailable()"),
["asp-append-version"] = "true" new TagHelperAttribute("asp-append-version", "true")
}, },
tagHelper => tagHelper =>
{ {
@ -216,9 +216,9 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
{ {
new TagHelperAttributeList new TagHelperAttributeList
{ {
["asp-fallback-src-include"] = "*.js", new TagHelperAttribute("asp-fallback-src-include", "*.js"),
["asp-fallback-test"] = "isavailable()", new TagHelperAttribute("asp-fallback-test", "isavailable()"),
["asp-append-version"] = "true" new TagHelperAttribute("asp-append-version", "true")
}, },
tagHelper => tagHelper =>
{ {
@ -230,10 +230,10 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
{ {
new TagHelperAttributeList new TagHelperAttributeList
{ {
["asp-fallback-src"] = "test.js", new TagHelperAttribute("asp-fallback-src", "test.js"),
["asp-fallback-src-include"] = "*.js", new TagHelperAttribute("asp-fallback-src-include", "*.js"),
["asp-fallback-test"] = "isavailable()", new TagHelperAttribute("asp-fallback-test", "isavailable()"),
["asp-append-version"] = "true" new TagHelperAttribute("asp-append-version", "true")
}, },
tagHelper => tagHelper =>
{ {
@ -246,10 +246,10 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
{ {
new TagHelperAttributeList new TagHelperAttributeList
{ {
["asp-fallback-src-include"] = "*.js", new TagHelperAttribute("asp-fallback-src-include", "*.js"),
["asp-fallback-src-exclude"] = "*.min.js", new TagHelperAttribute("asp-fallback-src-exclude", "*.min.js"),
["asp-fallback-test"] = "isavailable()", new TagHelperAttribute("asp-fallback-test", "isavailable()"),
["asp-append-version"] = "true" new TagHelperAttribute("asp-append-version", "true")
}, },
tagHelper => tagHelper =>
{ {
@ -311,7 +311,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
{ {
new TagHelperAttributeList new TagHelperAttributeList
{ {
["asp-src-include"] = "*.js" new TagHelperAttribute("asp-src-include", "*.js")
}, },
tagHelper => tagHelper =>
{ {
@ -321,8 +321,8 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
{ {
new TagHelperAttributeList new TagHelperAttributeList
{ {
["asp-src-include"] = "*.js", new TagHelperAttribute("asp-src-include", "*.js"),
["asp-src-exclude"] = "*.min.js" new TagHelperAttribute("asp-src-exclude", "*.min.js")
}, },
tagHelper => tagHelper =>
{ {
@ -333,8 +333,8 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
{ {
new TagHelperAttributeList new TagHelperAttributeList
{ {
["asp-src-include"] = "*.js", new TagHelperAttribute("asp-src-include", "*.js"),
["asp-append-version"] = "true" new TagHelperAttribute("asp-append-version", "true")
}, },
tagHelper => tagHelper =>
{ {
@ -345,9 +345,9 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
{ {
new TagHelperAttributeList new TagHelperAttributeList
{ {
["asp-src-include"] = "*.js", new TagHelperAttribute("asp-src-include", "*.js"),
["asp-src-exclude"] = "*.min.js", new TagHelperAttribute("asp-src-exclude", "*.min.js"),
["asp-append-version"] = "true" new TagHelperAttribute("asp-append-version", "true")
}, },
tagHelper => tagHelper =>
{ {
@ -408,8 +408,9 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
{ {
new TagHelperAttributeList new TagHelperAttributeList
{ {
// This is commented out on purpose: ["asp-src-include"] = "*.js", // This is commented out on purpose: new TagHelperAttribute("asp-src-include", "*.js"),
["asp-src-exclude"] = "*.min.js" // Note asp-src-include attribute isn't included.
new TagHelperAttribute("asp-src-exclude", "*.min.js")
}, },
tagHelper => tagHelper =>
{ {
@ -420,8 +421,9 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
{ {
new TagHelperAttributeList new TagHelperAttributeList
{ {
// This is commented out on purpose: ["asp-fallback-src"] = "test.js", // This is commented out on purpose: new TagHelperAttribute("asp-fallback-src", "test.js"),
["asp-fallback-test"] = "isavailable()", // Note asp-src-include attribute isn't included.
new TagHelperAttribute("asp-fallback-test", "isavailable()"),
}, },
tagHelper => tagHelper =>
{ {
@ -432,8 +434,9 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
{ {
new TagHelperAttributeList new TagHelperAttributeList
{ {
["asp-fallback-src"] = "test.js", new TagHelperAttribute("asp-fallback-src", "test.js"),
// This is commented out on purpose: ["asp-fallback-test"] = "isavailable()" // This is commented out on purpose: new TagHelperAttribute("asp-fallback-test", "isavailable()")
// Note asp-src-include attribute isn't included.
}, },
tagHelper => tagHelper =>
{ {
@ -444,9 +447,10 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
{ {
new TagHelperAttributeList new TagHelperAttributeList
{ {
// This is commented out on purpose: ["asp-fallback-src-include"] = "test.js", // This is commented out on purpose: new TagHelperAttribute("asp-fallback-src-include", "test.js"),
["asp-fallback-src-exclude"] = "**/*.min.js", // Note asp-src-include attribute isn't included.
["asp-fallback-test"] = "isavailable()", new TagHelperAttribute("asp-fallback-src-exclude", "**/*.min.js"),
new TagHelperAttribute("asp-fallback-test", "isavailable()"),
}, },
tagHelper => tagHelper =>
{ {
@ -528,11 +532,11 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
var tagHelperContext = MakeTagHelperContext( var tagHelperContext = MakeTagHelperContext(
attributes: new TagHelperAttributeList attributes: new TagHelperAttributeList
{ {
["data-extra"] = "something", new TagHelperAttribute("data-extra", "something"),
["src"] = "/blank.js", new TagHelperAttribute("src", "/blank.js"),
["data-more"] = "else", new TagHelperAttribute("data-more", "else"),
["asp-fallback-src"] = "http://www.example.com/blank.js", new TagHelperAttribute("asp-fallback-src", "http://www.example.com/blank.js"),
["asp-fallback-test"] = "isavailable()", new TagHelperAttribute("asp-fallback-test", "isavailable()"),
}); });
var viewContext = MakeViewContext(); var viewContext = MakeViewContext();
@ -540,8 +544,8 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
var output = MakeTagHelperOutput("src", var output = MakeTagHelperOutput("src",
attributes: new TagHelperAttributeList attributes: new TagHelperAttributeList
{ {
["data-extra"] = "something", new TagHelperAttribute("data-extra", "something"),
["data-more"] = "else", new TagHelperAttribute("data-more", "else"),
}); });
var hostingEnvironment = MakeHostingEnvironment(); var hostingEnvironment = MakeHostingEnvironment();
@ -575,8 +579,8 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
var context = MakeTagHelperContext( var context = MakeTagHelperContext(
attributes: new TagHelperAttributeList attributes: new TagHelperAttributeList
{ {
["src"] = "/js/site.js", new TagHelperAttribute("src", "/js/site.js"),
["asp-src-include"] = "**/*.js" new TagHelperAttribute("asp-src-include", "**/*.js")
}); });
var output = MakeTagHelperOutput("script", attributes: new TagHelperAttributeList()); var output = MakeTagHelperOutput("script", attributes: new TagHelperAttributeList());
var hostingEnvironment = MakeHostingEnvironment(); var hostingEnvironment = MakeHostingEnvironment();
@ -617,8 +621,8 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
var context = MakeTagHelperContext( var context = MakeTagHelperContext(
attributes: new TagHelperAttributeList attributes: new TagHelperAttributeList
{ {
["src"] = "/js/site.js", new TagHelperAttribute("src", "/js/site.js"),
["asp-src-include"] = "**/*.js" new TagHelperAttribute("asp-src-include", "**/*.js")
}); });
var output = MakeTagHelperOutput("script", attributes: new TagHelperAttributeList()); var output = MakeTagHelperOutput("script", attributes: new TagHelperAttributeList());
var hostingEnvironment = MakeHostingEnvironment(); var hostingEnvironment = MakeHostingEnvironment();
@ -659,8 +663,8 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
var context = MakeTagHelperContext( var context = MakeTagHelperContext(
attributes: new TagHelperAttributeList attributes: new TagHelperAttributeList
{ {
["src"] = "/js/site.js", new TagHelperAttribute("src", "/js/site.js"),
["asp-append-version"] = "true" new TagHelperAttribute("asp-append-version", "true")
}); });
var output = MakeTagHelperOutput("script", attributes: new TagHelperAttributeList()); var output = MakeTagHelperOutput("script", attributes: new TagHelperAttributeList());
@ -694,8 +698,8 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
var context = MakeTagHelperContext( var context = MakeTagHelperContext(
attributes: new TagHelperAttributeList attributes: new TagHelperAttributeList
{ {
["src"] = "/bar/js/site.js", new TagHelperAttribute("src", "/bar/js/site.js"),
["asp-append-version"] = "true" new TagHelperAttribute("asp-append-version", "true")
}); });
var output = MakeTagHelperOutput("script", attributes: new TagHelperAttributeList()); var output = MakeTagHelperOutput("script", attributes: new TagHelperAttributeList());
var hostingEnvironment = MakeHostingEnvironment(); var hostingEnvironment = MakeHostingEnvironment();
@ -728,10 +732,10 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
var context = MakeTagHelperContext( var context = MakeTagHelperContext(
attributes: new TagHelperAttributeList attributes: new TagHelperAttributeList
{ {
["src"] = "/js/site.js", new TagHelperAttribute("src", "/js/site.js"),
["asp-fallback-src-include"] = "fallback.js", new TagHelperAttribute("asp-fallback-src-include", "fallback.js"),
["asp-fallback-test"] = "isavailable()", new TagHelperAttribute("asp-fallback-test", "isavailable()"),
["asp-append-version"] = "true" new TagHelperAttribute("asp-append-version", "true")
}); });
var output = MakeTagHelperOutput("script", attributes: new TagHelperAttributeList()); var output = MakeTagHelperOutput("script", attributes: new TagHelperAttributeList());
var hostingEnvironment = MakeHostingEnvironment(); var hostingEnvironment = MakeHostingEnvironment();
@ -769,9 +773,9 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
var context = MakeTagHelperContext( var context = MakeTagHelperContext(
attributes: new TagHelperAttributeList attributes: new TagHelperAttributeList
{ {
["src"] = "/js/site.js", new TagHelperAttribute("src", "/js/site.js"),
["asp-src-include"] = "*.js", new TagHelperAttribute("asp-src-include", "*.js"),
["asp-append-version"] = "true" new TagHelperAttribute("asp-append-version", "true")
}); });
var output = MakeTagHelperOutput("script", attributes: new TagHelperAttributeList()); var output = MakeTagHelperOutput("script", attributes: new TagHelperAttributeList());
var hostingEnvironment = MakeHostingEnvironment(); var hostingEnvironment = MakeHostingEnvironment();

16
test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/SelectTagHelperTest.cs
View File

@ -201,8 +201,8 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
var modelExpression = new ModelExpression(nameAndId.Name, modelExplorer); var modelExpression = new ModelExpression(nameAndId.Name, modelExplorer);
var tagHelperContext = new TagHelperContext( var tagHelperContext = new TagHelperContext(
allAttributes: new ReadOnlyTagHelperAttributeList<IReadOnlyTagHelperAttribute>( allAttributes: new TagHelperAttributeList(
Enumerable.Empty<IReadOnlyTagHelperAttribute>()), Enumerable.Empty<TagHelperAttribute>()),
items: new Dictionary<object, object>(), items: new Dictionary<object, object>(),
uniqueId: "test"); uniqueId: "test");
var output = new TagHelperOutput( var output = new TagHelperOutput(
@ -290,8 +290,8 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
var modelExpression = new ModelExpression(nameAndId.Name, modelExplorer); var modelExpression = new ModelExpression(nameAndId.Name, modelExplorer);
var tagHelperContext = new TagHelperContext( var tagHelperContext = new TagHelperContext(
allAttributes: new ReadOnlyTagHelperAttributeList<IReadOnlyTagHelperAttribute>( allAttributes: new TagHelperAttributeList(
Enumerable.Empty<IReadOnlyTagHelperAttribute>()), Enumerable.Empty<TagHelperAttribute>()),
items: new Dictionary<object, object>(), items: new Dictionary<object, object>(),
uniqueId: "test"); uniqueId: "test");
var output = new TagHelperOutput( var output = new TagHelperOutput(
@ -394,8 +394,8 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
var modelExpression = new ModelExpression(name: string.Empty, modelExplorer: modelExplorer); var modelExpression = new ModelExpression(name: string.Empty, modelExplorer: modelExplorer);
var tagHelperContext = new TagHelperContext( var tagHelperContext = new TagHelperContext(
allAttributes: new ReadOnlyTagHelperAttributeList<IReadOnlyTagHelperAttribute>( allAttributes: new TagHelperAttributeList(
Enumerable.Empty<IReadOnlyTagHelperAttribute>()), Enumerable.Empty<TagHelperAttribute>()),
items: new Dictionary<object, object>(), items: new Dictionary<object, object>(),
uniqueId: "test"); uniqueId: "test");
var output = new TagHelperOutput( var output = new TagHelperOutput(
@ -557,8 +557,8 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
bool allowMultiple) bool allowMultiple)
{ {
// Arrange // Arrange
var contextAttributes = new ReadOnlyTagHelperAttributeList<IReadOnlyTagHelperAttribute>( var contextAttributes = new TagHelperAttributeList(
Enumerable.Empty<IReadOnlyTagHelperAttribute>()); Enumerable.Empty<TagHelperAttribute>());
var originalAttributes = new TagHelperAttributeList(); var originalAttributes = new TagHelperAttributeList();
var propertyName = "Property1"; var propertyName = "Property1";
var tagName = "select"; var tagName = "select";

6
test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/TagHelperOutputExtensionsTest.cs
View File

@ -960,7 +960,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
Assert.Equal(expectedBuilderAttribute.Value, attribute.Value); Assert.Equal(expectedBuilderAttribute.Value, attribute.Value);
} }
private class CaseSensitiveTagHelperAttributeComparer : IEqualityComparer<IReadOnlyTagHelperAttribute> private class CaseSensitiveTagHelperAttributeComparer : IEqualityComparer<TagHelperAttribute>
{ {
public readonly static CaseSensitiveTagHelperAttributeComparer Default = public readonly static CaseSensitiveTagHelperAttributeComparer Default =
new CaseSensitiveTagHelperAttributeComparer(); new CaseSensitiveTagHelperAttributeComparer();
@ -969,7 +969,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
{ {
} }
public bool Equals(IReadOnlyTagHelperAttribute attributeX, IReadOnlyTagHelperAttribute attributeY) public bool Equals(TagHelperAttribute attributeX, TagHelperAttribute attributeY)
{ {
if (attributeX == attributeY) if (attributeX == attributeY)
{ {
@ -983,7 +983,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
(attributeX.Minimized || Equals(attributeX.Value, attributeY.Value)); (attributeX.Minimized || Equals(attributeX.Value, attributeY.Value));
} }
public int GetHashCode(IReadOnlyTagHelperAttribute attribute) public int GetHashCode(TagHelperAttribute attribute)
{ {
return attribute.GetHashCode(); return attribute.GetHashCode();
} }

4
test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/TextAreaTagHelperTest.cs
View File

@ -124,8 +124,8 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
}; };
var tagHelperContext = new TagHelperContext( var tagHelperContext = new TagHelperContext(
allAttributes: new ReadOnlyTagHelperAttributeList<IReadOnlyTagHelperAttribute>( allAttributes: new TagHelperAttributeList(
Enumerable.Empty<IReadOnlyTagHelperAttribute>()), Enumerable.Empty<TagHelperAttribute>()),
items: new Dictionary<object, object>(), items: new Dictionary<object, object>(),
uniqueId: "test"); uniqueId: "test");
var htmlAttributes = new TagHelperAttributeList var htmlAttributes = new TagHelperAttributeList

16
test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/ValidationMessageTagHelperTest.cs
View File

@ -114,8 +114,8 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
var expectedContent = "original content"; var expectedContent = "original content";
var expectedPostContent = "original post-content"; var expectedPostContent = "original post-content";
var context = new TagHelperContext( var context = new TagHelperContext(
allAttributes: new ReadOnlyTagHelperAttributeList<IReadOnlyTagHelperAttribute>( allAttributes: new TagHelperAttributeList(
Enumerable.Empty<IReadOnlyTagHelperAttribute>()), Enumerable.Empty<TagHelperAttribute>()),
items: new Dictionary<object, object>(), items: new Dictionary<object, object>(),
uniqueId: "test"); uniqueId: "test");
var output = new TagHelperOutput( var output = new TagHelperOutput(
@ -184,8 +184,8 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
output.Content.AppendHtml(outputContent); output.Content.AppendHtml(outputContent);
var context = new TagHelperContext( var context = new TagHelperContext(
allAttributes: new ReadOnlyTagHelperAttributeList<IReadOnlyTagHelperAttribute>( allAttributes: new TagHelperAttributeList(
Enumerable.Empty<IReadOnlyTagHelperAttribute>()), Enumerable.Empty<TagHelperAttribute>()),
items: new Dictionary<object, object>(), items: new Dictionary<object, object>(),
uniqueId: "test"); uniqueId: "test");
@ -243,8 +243,8 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
}); });
var context = new TagHelperContext( var context = new TagHelperContext(
allAttributes: new ReadOnlyTagHelperAttributeList<IReadOnlyTagHelperAttribute>( allAttributes: new TagHelperAttributeList(
Enumerable.Empty<IReadOnlyTagHelperAttribute>()), Enumerable.Empty<TagHelperAttribute>()),
items: new Dictionary<object, object>(), items: new Dictionary<object, object>(),
uniqueId: "test"); uniqueId: "test");
@ -283,8 +283,8 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
output.PostContent.SetContent(expectedPostContent); output.PostContent.SetContent(expectedPostContent);
var context = new TagHelperContext( var context = new TagHelperContext(
allAttributes: new ReadOnlyTagHelperAttributeList<IReadOnlyTagHelperAttribute>( allAttributes: new TagHelperAttributeList(
Enumerable.Empty<IReadOnlyTagHelperAttribute>()), Enumerable.Empty<TagHelperAttribute>()),
items: new Dictionary<object, object>(), items: new Dictionary<object, object>(),
uniqueId: "test"); uniqueId: "test");

20
test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/ValidationSummaryTagHelperTest.cs
View File

@ -39,8 +39,8 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
var expectedPreContent = "original pre-content"; var expectedPreContent = "original pre-content";
var expectedContent = "original content"; var expectedContent = "original content";
var tagHelperContext = new TagHelperContext( var tagHelperContext = new TagHelperContext(
allAttributes: new ReadOnlyTagHelperAttributeList<IReadOnlyTagHelperAttribute>( allAttributes: new TagHelperAttributeList(
Enumerable.Empty<IReadOnlyTagHelperAttribute>()), Enumerable.Empty<TagHelperAttribute>()),
items: new Dictionary<object, object>(), items: new Dictionary<object, object>(),
uniqueId: "test"); uniqueId: "test");
var output = new TagHelperOutput( var output = new TagHelperOutput(
@ -120,8 +120,8 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
validationSummaryTagHelper.ViewContext = expectedViewContext; validationSummaryTagHelper.ViewContext = expectedViewContext;
var context = new TagHelperContext( var context = new TagHelperContext(
allAttributes: new ReadOnlyTagHelperAttributeList<IReadOnlyTagHelperAttribute>( allAttributes: new TagHelperAttributeList(
Enumerable.Empty<IReadOnlyTagHelperAttribute>()), Enumerable.Empty<TagHelperAttribute>()),
items: new Dictionary<object, object>(), items: new Dictionary<object, object>(),
uniqueId: "test"); uniqueId: "test");
@ -176,8 +176,8 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
validationSummaryTagHelper.ViewContext = viewContext; validationSummaryTagHelper.ViewContext = viewContext;
var context = new TagHelperContext( var context = new TagHelperContext(
allAttributes: new ReadOnlyTagHelperAttributeList<IReadOnlyTagHelperAttribute>( allAttributes: new TagHelperAttributeList(
Enumerable.Empty<IReadOnlyTagHelperAttribute>()), Enumerable.Empty<TagHelperAttribute>()),
items: new Dictionary<object, object>(), items: new Dictionary<object, object>(),
uniqueId: "test"); uniqueId: "test");
@ -225,8 +225,8 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
validationSummaryTagHelper.ViewContext = viewContext; validationSummaryTagHelper.ViewContext = viewContext;
var context = new TagHelperContext( var context = new TagHelperContext(
allAttributes: new ReadOnlyTagHelperAttributeList<IReadOnlyTagHelperAttribute>( allAttributes: new TagHelperAttributeList(
Enumerable.Empty<IReadOnlyTagHelperAttribute>()), Enumerable.Empty<TagHelperAttribute>()),
items: new Dictionary<object, object>(), items: new Dictionary<object, object>(),
uniqueId: "test"); uniqueId: "test");
@ -281,8 +281,8 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
validationSummaryTagHelper.ViewContext = viewContext; validationSummaryTagHelper.ViewContext = viewContext;
var context = new TagHelperContext( var context = new TagHelperContext(
allAttributes: new ReadOnlyTagHelperAttributeList<IReadOnlyTagHelperAttribute>( allAttributes: new TagHelperAttributeList(
Enumerable.Empty<IReadOnlyTagHelperAttribute>()), Enumerable.Empty<TagHelperAttribute>()),
items: new Dictionary<object, object>(), items: new Dictionary<object, object>(),
uniqueId: "test"); uniqueId: "test");

2
test/WebSites/TagHelpersWebSite/TagHelpers/ATagHelper.cs
View File

@ -40,7 +40,7 @@ namespace TagHelpersWebSite.TagHelpers
output.Attributes.Clear(); output.Attributes.Clear();
var urlHelper = UrlHelperFactory.GetUrlHelper(ViewContext); var urlHelper = UrlHelperFactory.GetUrlHelper(ViewContext);
output.Attributes["href"] = urlHelper.Action(Action, Controller, methodParameters); output.Attributes.SetAttribute("href", urlHelper.Action(Action, Controller, methodParameters));
output.PreContent.SetContent("My "); output.PreContent.SetContent("My ");
} }

2
test/WebSites/TagHelpersWebSite/TagHelpers/AddProcessedAttributeTagHelper.cs
View File

@ -10,7 +10,7 @@ namespace TagHelpersWebSite.TagHelpers
{ {
public override void Process(TagHelperContext context, TagHelperOutput output) public override void Process(TagHelperContext context, TagHelperOutput output)
{ {
output.Attributes.Add(new TagHelperAttribute { Name = "processed", Minimized = true }); output.Attributes.Add(new TagHelperAttribute("processed"));
} }
} }
} }

2
test/WebSites/TagHelpersWebSite/TagHelpers/PrettyTagHelper.cs
View File

@ -53,7 +53,7 @@ namespace TagHelpersWebSite.TagHelpers
style += ";"; style += ";";
} }
output.Attributes["style"] = style + prettyStyle; output.Attributes.SetAttribute("style", style + prettyStyle);
} }
} }
} }