Moved location of and modified CaseSensitiveTagHelperAttributeComparer

Addresses Mvc https://github.com/aspnet/Mvc/issues/5323

NuGetPackageVerifier.json

@@ -13,7 +13,7 @@
             // Don't run any rules for packages the ADX team creates but doesn't ship.
         ],
         "packages": {
-            "Microsoft.AspNetCore.Razor.Test.Sources": { },
+            "Microsoft.AspNetCore.Razor.TagHelpers.Testing.Sources": { },
             "RazorPageGenerator": { }
         }
     },

src/Microsoft.AspNetCore.Razor.TagHelpers.Testing.Sources/CaseSensitiveTagHelperAttributeComparer.cs

@@ -1,13 +1,15 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
 using System.Collections.Generic;
+using System.IO;
+using Microsoft.AspNetCore.Html;
 using Microsoft.Extensions.Internal;
 
-namespace Microsoft.AspNetCore.Razor.TagHelpers
+namespace Microsoft.AspNetCore.Razor.TagHelpers.Testing
 {
-    public class CaseSensitiveTagHelperAttributeComparer : IEqualityComparer<TagHelperAttribute>
+    internal class CaseSensitiveTagHelperAttributeComparer : IEqualityComparer<TagHelperAttribute>
     {
         public readonly static CaseSensitiveTagHelperAttributeComparer Default =
             new CaseSensitiveTagHelperAttributeComparer();
@@ -27,16 +29,32 @@ namespace Microsoft.AspNetCore.Razor.TagHelpers
             return attributeX != null &&
                 string.Equals(attributeX.Name, attributeY.Name, StringComparison.Ordinal) &&
                 attributeX.ValueStyle == attributeY.ValueStyle &&
-                (attributeX.ValueStyle == HtmlAttributeValueStyle.Minimized || Equals(attributeX.Value, attributeY.Value));
+                (attributeX.ValueStyle == HtmlAttributeValueStyle.Minimized ||
+                 string.Equals(GetString(attributeX.Value), GetString(attributeY.Value)));
         }
 
         public int GetHashCode(TagHelperAttribute attribute)
         {
-            var combiner = HashCodeCombiner.Start();
-            combiner.Add(attribute.Name, StringComparer.Ordinal);
-            combiner.Add(attribute.GetHashCode());
+            var hashCodeCombiner = HashCodeCombiner.Start();
+            hashCodeCombiner.Add(attribute.GetHashCode());
+            hashCodeCombiner.Add(attribute.Name, StringComparer.Ordinal);
 
-            return combiner.CombinedHash;
+            return hashCodeCombiner.CombinedHash;
+        }
+
+        private string GetString(object value)
+        {
+            var htmlContent = value as IHtmlContent;
+            if (htmlContent != null)
+            {
+                using (var writer = new StringWriter())
+                {
+                    htmlContent.WriteTo(writer, NullHtmlEncoder.Default);
+                    return writer.ToString();
+                }
+            }
+
+            return value?.ToString() ?? string.Empty;
         }
     }
 }

src/Microsoft.AspNetCore.Razor.TagHelpers.Testing.Sources/CaseSensitiveTagHelperDescriptorComparer.cs

@@ -2,13 +2,12 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using Microsoft.AspNetCore.Razor.Compilation.TagHelpers;
 using Microsoft.Extensions.Internal;
 using Xunit;
 
-namespace Microsoft.AspNetCore.Razor.Test.Internal
+namespace Microsoft.AspNetCore.Razor.TagHelpers.Testing
 {
     internal class CaseSensitiveTagHelperDescriptorComparer : TagHelperDescriptorComparer
     {

src/Microsoft.AspNetCore.Razor.TagHelpers.Testing.Sources/CaseSensitiveTagHelperRequiredAttributeDescriptorComparer.cs

@@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Razor.Compilation.TagHelpers;
 using Microsoft.Extensions.Internal;
 using Xunit;
 
-namespace Microsoft.AspNetCore.Razor.Test.Internal
+namespace Microsoft.AspNetCore.Razor.TagHelpers.Testing
 {
     internal class CaseSensitiveTagHelperRequiredAttributeDescriptorComparer : TagHelperRequiredAttributeDescriptorComparer
     {

src/Microsoft.AspNetCore.Razor.TagHelpers.Testing.Sources/Microsoft.AspNetCore.Razor.TagHelpers.Testing.Sources.xproj

@@ -6,7 +6,7 @@
   </PropertyGroup>
   <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
-    <ProjectGuid>e3a2a305-634d-4ba6-95db-aa06d6c442b0</ProjectGuid>
+    <ProjectGuid>f247c7b7-0d29-4aed-b948-ee5c420b0dd3</ProjectGuid>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
     <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
   </PropertyGroup>

src/Microsoft.AspNetCore.Razor.TagHelpers.Testing.Sources/TagHelperAttributeDescriptorComparer.cs

@@ -7,7 +7,7 @@ using Microsoft.AspNetCore.Razor.Compilation.TagHelpers;
 using Microsoft.Extensions.Internal;
 using Xunit;
 
-namespace Microsoft.AspNetCore.Razor.Test.Internal
+namespace Microsoft.AspNetCore.Razor.TagHelpers.Testing
 {
     internal class TagHelperAttributeDescriptorComparer : IEqualityComparer<TagHelperAttributeDescriptor>
     {

src/Microsoft.AspNetCore.Razor.TagHelpers.Testing.Sources/TagHelperAttributeDesignTimeDescriptorComparer.cs

@@ -7,7 +7,7 @@ using Microsoft.AspNetCore.Razor.Compilation.TagHelpers;
 using Microsoft.Extensions.Internal;
 using Xunit;
 
-namespace Microsoft.AspNetCore.Razor.Test.Internal
+namespace Microsoft.AspNetCore.Razor.TagHelpers.Testing
 {
     internal class TagHelperAttributeDesignTimeDescriptorComparer :
         IEqualityComparer<TagHelperAttributeDesignTimeDescriptor>

src/Microsoft.AspNetCore.Razor.TagHelpers.Testing.Sources/TagHelperDesignTimeDescriptorComparer.cs

@@ -7,7 +7,7 @@ using Microsoft.AspNetCore.Razor.Compilation.TagHelpers;
 using Microsoft.Extensions.Internal;
 using Xunit;
 
-namespace Microsoft.AspNetCore.Razor.Test.Internal
+namespace Microsoft.AspNetCore.Razor.TagHelpers.Testing
 {
     internal class TagHelperDesignTimeDescriptorComparer : IEqualityComparer<TagHelperDesignTimeDescriptor>
     {

test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperDescriptorFactoryTest.cs

@@ -7,7 +7,7 @@ using System.Linq;
 using System.Reflection;
 using Microsoft.AspNetCore.Razor.Compilation.TagHelpers;
 using Microsoft.AspNetCore.Razor.TagHelpers;
-using Microsoft.AspNetCore.Razor.Test.Internal;
+using Microsoft.AspNetCore.Razor.TagHelpers.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers

test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperDescriptorResolverTest.cs

@@ -8,7 +8,7 @@ using System.Reflection;
 using Microsoft.AspNetCore.Razor.Compilation.TagHelpers;
 using Microsoft.AspNetCore.Razor.Parser;
 using Microsoft.AspNetCore.Razor.TagHelpers;
-using Microsoft.AspNetCore.Razor.Test.Internal;
+using Microsoft.AspNetCore.Razor.TagHelpers.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers

test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperDesignTimeDescriptorFactoryTest.cs

@@ -6,7 +6,7 @@ using System.IO;
 using System.Reflection;
 using Microsoft.AspNetCore.Razor.Compilation.TagHelpers;
 using Microsoft.AspNetCore.Razor.TagHelpers;
-using Microsoft.AspNetCore.Razor.Test.Internal;
+using Microsoft.AspNetCore.Razor.TagHelpers.Testing;
 using Microsoft.AspNetCore.Testing;
 using Moq;
 using Xunit;

test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperExecutionContextTest.cs

@@ -7,6 +7,7 @@ using System.Linq;
 using System.Text.Encodings.Web;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.AspNetCore.Razor.TagHelpers.Testing;
 using Microsoft.Extensions.WebEncoders.Testing;
 using Xunit;
 

test/Microsoft.AspNetCore.Razor.Runtime.Test/TagHelpers/ReadOnlyTagHelperAttributeListTest.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.AspNetCore.Razor.TagHelpers.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.TagHelpers

test/Microsoft.AspNetCore.Razor.Runtime.Test/TagHelpers/TagHelperAttributeListTest.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.AspNetCore.Razor.TagHelpers.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.TagHelpers

test/Microsoft.AspNetCore.Razor.Runtime.Test/TagHelpers/TagHelperOutputTest.cs

@@ -4,11 +4,11 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Text;
 using System.Text.Encodings.Web;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Html;
 using Microsoft.AspNetCore.Razor.Runtime.TagHelpers;
+using Microsoft.AspNetCore.Razor.TagHelpers.Testing;
 using Microsoft.Extensions.WebEncoders.Testing;
 using Xunit;
 

test/Microsoft.AspNetCore.Razor.Runtime.Test/project.json

@@ -7,7 +7,7 @@
   "dependencies": {
     "dotnet-test-xunit": "2.2.0-*",
     "Microsoft.AspNetCore.Razor.Runtime": "1.1.0-*",
-    "Microsoft.AspNetCore.Razor.Test.Sources": {
+    "Microsoft.AspNetCore.Razor.TagHelpers.Testing.Sources": {
       "version": "1.1.0-*",
       "type": "build"
     },

test/Microsoft.AspNetCore.Razor.Test/Compilation/TagHelpers/TagHelperDescriptorProviderTest.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.AspNetCore.Razor.Test.Internal;
+using Microsoft.AspNetCore.Razor.TagHelpers.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Compilation.TagHelpers

test/Microsoft.AspNetCore.Razor.Test/Compilation/TagHelpers/TagHelperDescriptorTest.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Razor.TagHelpers;
-using Microsoft.AspNetCore.Razor.Test.Internal;
+using Microsoft.AspNetCore.Razor.TagHelpers.Testing;
 using Newtonsoft.Json;
 using Xunit;
 

test/Microsoft.AspNetCore.Razor.Test/project.json

@@ -3,7 +3,8 @@
   "dependencies": {
     "dotnet-test-xunit": "2.2.0-*",
     "Microsoft.AspNetCore.Razor": "1.1.0-*",
-    "Microsoft.AspNetCore.Razor.Test.Sources": {
+    "Microsoft.AspNetCore.Razor.Runtime": "1.1.0-*",
+    "Microsoft.AspNetCore.Razor.TagHelpers.Testing.Sources": {
       "version": "1.1.0-*",
       "type": "build"
     },