From 77ed9f22fc8894fbce796bb8a704d6cd03a3b226 Mon Sep 17 00:00:00 2001 From: Jass Bagga Date: Tue, 1 Nov 2016 14:47:13 -0700 Subject: [PATCH] Moved location of and modified CaseSensitiveTagHelperAttributeComparer Addresses Mvc https://github.com/aspnet/Mvc/issues/5323 --- NuGetPackageVerifier.json | 2 +- ...CaseSensitiveTagHelperAttributeComparer.cs | 34 ++++++++++++++----- ...aseSensitiveTagHelperDescriptorComparer.cs | 3 +- ...lperRequiredAttributeDescriptorComparer.cs | 2 +- ...re.Razor.TagHelpers.Testing.Sources.xproj} | 2 +- .../TagHelperAttributeDescriptorComparer.cs | 2 +- ...erAttributeDesignTimeDescriptorComparer.cs | 2 +- .../TagHelperDesignTimeDescriptorComparer.cs | 2 +- .../project.json | 0 .../TagHelperDescriptorFactoryTest.cs | 2 +- .../TagHelperDescriptorResolverTest.cs | 2 +- ...agHelperDesignTimeDescriptorFactoryTest.cs | 2 +- .../TagHelperExecutionContextTest.cs | 1 + .../ReadOnlyTagHelperAttributeListTest.cs | 1 + .../TagHelpers/TagHelperAttributeListTest.cs | 1 + .../TagHelpers/TagHelperOutputTest.cs | 2 +- .../project.json | 2 +- .../TagHelperDescriptorProviderTest.cs | 2 +- .../TagHelpers/TagHelperDescriptorTest.cs | 2 +- .../project.json | 3 +- 20 files changed, 45 insertions(+), 24 deletions(-) rename {test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers => src/Microsoft.AspNetCore.Razor.TagHelpers.Testing.Sources}/CaseSensitiveTagHelperAttributeComparer.cs (50%) rename src/{Microsoft.AspNetCore.Razor.Test.Sources => Microsoft.AspNetCore.Razor.TagHelpers.Testing.Sources}/CaseSensitiveTagHelperDescriptorComparer.cs (97%) rename src/{Microsoft.AspNetCore.Razor.Test.Sources => Microsoft.AspNetCore.Razor.TagHelpers.Testing.Sources}/CaseSensitiveTagHelperRequiredAttributeDescriptorComparer.cs (96%) rename src/{Microsoft.AspNetCore.Razor.Test.Sources/Microsoft.AspNetCore.Razor.Test.Sources.xproj => Microsoft.AspNetCore.Razor.TagHelpers.Testing.Sources/Microsoft.AspNetCore.Razor.TagHelpers.Testing.Sources.xproj} (92%) rename src/{Microsoft.AspNetCore.Razor.Test.Sources => Microsoft.AspNetCore.Razor.TagHelpers.Testing.Sources}/TagHelperAttributeDescriptorComparer.cs (97%) rename src/{Microsoft.AspNetCore.Razor.Test.Sources => Microsoft.AspNetCore.Razor.TagHelpers.Testing.Sources}/TagHelperAttributeDesignTimeDescriptorComparer.cs (96%) rename src/{Microsoft.AspNetCore.Razor.Test.Sources => Microsoft.AspNetCore.Razor.TagHelpers.Testing.Sources}/TagHelperDesignTimeDescriptorComparer.cs (96%) rename src/{Microsoft.AspNetCore.Razor.Test.Sources => Microsoft.AspNetCore.Razor.TagHelpers.Testing.Sources}/project.json (100%) diff --git a/NuGetPackageVerifier.json b/NuGetPackageVerifier.json index c91ce34b30..0ba00ea82c 100644 --- a/NuGetPackageVerifier.json +++ b/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": { } } }, diff --git a/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/CaseSensitiveTagHelperAttributeComparer.cs b/src/Microsoft.AspNetCore.Razor.TagHelpers.Testing.Sources/CaseSensitiveTagHelperAttributeComparer.cs similarity index 50% rename from test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/CaseSensitiveTagHelperAttributeComparer.cs rename to src/Microsoft.AspNetCore.Razor.TagHelpers.Testing.Sources/CaseSensitiveTagHelperAttributeComparer.cs index 926252ff32..a385327fc8 100644 --- a/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/CaseSensitiveTagHelperAttributeComparer.cs +++ b/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 + internal class CaseSensitiveTagHelperAttributeComparer : IEqualityComparer { 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; } } } \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Razor.Test.Sources/CaseSensitiveTagHelperDescriptorComparer.cs b/src/Microsoft.AspNetCore.Razor.TagHelpers.Testing.Sources/CaseSensitiveTagHelperDescriptorComparer.cs similarity index 97% rename from src/Microsoft.AspNetCore.Razor.Test.Sources/CaseSensitiveTagHelperDescriptorComparer.cs rename to src/Microsoft.AspNetCore.Razor.TagHelpers.Testing.Sources/CaseSensitiveTagHelperDescriptorComparer.cs index c1ab1e3cc2..eefd9e4c3f 100644 --- a/src/Microsoft.AspNetCore.Razor.Test.Sources/CaseSensitiveTagHelperDescriptorComparer.cs +++ b/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 { diff --git a/src/Microsoft.AspNetCore.Razor.Test.Sources/CaseSensitiveTagHelperRequiredAttributeDescriptorComparer.cs b/src/Microsoft.AspNetCore.Razor.TagHelpers.Testing.Sources/CaseSensitiveTagHelperRequiredAttributeDescriptorComparer.cs similarity index 96% rename from src/Microsoft.AspNetCore.Razor.Test.Sources/CaseSensitiveTagHelperRequiredAttributeDescriptorComparer.cs rename to src/Microsoft.AspNetCore.Razor.TagHelpers.Testing.Sources/CaseSensitiveTagHelperRequiredAttributeDescriptorComparer.cs index 9c441f0561..71d75ec6fd 100644 --- a/src/Microsoft.AspNetCore.Razor.Test.Sources/CaseSensitiveTagHelperRequiredAttributeDescriptorComparer.cs +++ b/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 { diff --git a/src/Microsoft.AspNetCore.Razor.Test.Sources/Microsoft.AspNetCore.Razor.Test.Sources.xproj b/src/Microsoft.AspNetCore.Razor.TagHelpers.Testing.Sources/Microsoft.AspNetCore.Razor.TagHelpers.Testing.Sources.xproj similarity index 92% rename from src/Microsoft.AspNetCore.Razor.Test.Sources/Microsoft.AspNetCore.Razor.Test.Sources.xproj rename to src/Microsoft.AspNetCore.Razor.TagHelpers.Testing.Sources/Microsoft.AspNetCore.Razor.TagHelpers.Testing.Sources.xproj index cac3ed6558..2bfe3cf12b 100644 --- a/src/Microsoft.AspNetCore.Razor.Test.Sources/Microsoft.AspNetCore.Razor.Test.Sources.xproj +++ b/src/Microsoft.AspNetCore.Razor.TagHelpers.Testing.Sources/Microsoft.AspNetCore.Razor.TagHelpers.Testing.Sources.xproj @@ -6,7 +6,7 @@ - e3a2a305-634d-4ba6-95db-aa06d6c442b0 + f247c7b7-0d29-4aed-b948-ee5c420b0dd3 .\obj .\bin\ diff --git a/src/Microsoft.AspNetCore.Razor.Test.Sources/TagHelperAttributeDescriptorComparer.cs b/src/Microsoft.AspNetCore.Razor.TagHelpers.Testing.Sources/TagHelperAttributeDescriptorComparer.cs similarity index 97% rename from src/Microsoft.AspNetCore.Razor.Test.Sources/TagHelperAttributeDescriptorComparer.cs rename to src/Microsoft.AspNetCore.Razor.TagHelpers.Testing.Sources/TagHelperAttributeDescriptorComparer.cs index 66711b3a41..65f40c37e0 100644 --- a/src/Microsoft.AspNetCore.Razor.Test.Sources/TagHelperAttributeDescriptorComparer.cs +++ b/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 { diff --git a/src/Microsoft.AspNetCore.Razor.Test.Sources/TagHelperAttributeDesignTimeDescriptorComparer.cs b/src/Microsoft.AspNetCore.Razor.TagHelpers.Testing.Sources/TagHelperAttributeDesignTimeDescriptorComparer.cs similarity index 96% rename from src/Microsoft.AspNetCore.Razor.Test.Sources/TagHelperAttributeDesignTimeDescriptorComparer.cs rename to src/Microsoft.AspNetCore.Razor.TagHelpers.Testing.Sources/TagHelperAttributeDesignTimeDescriptorComparer.cs index 6f9f401efa..9293dd2ef8 100644 --- a/src/Microsoft.AspNetCore.Razor.Test.Sources/TagHelperAttributeDesignTimeDescriptorComparer.cs +++ b/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 diff --git a/src/Microsoft.AspNetCore.Razor.Test.Sources/TagHelperDesignTimeDescriptorComparer.cs b/src/Microsoft.AspNetCore.Razor.TagHelpers.Testing.Sources/TagHelperDesignTimeDescriptorComparer.cs similarity index 96% rename from src/Microsoft.AspNetCore.Razor.Test.Sources/TagHelperDesignTimeDescriptorComparer.cs rename to src/Microsoft.AspNetCore.Razor.TagHelpers.Testing.Sources/TagHelperDesignTimeDescriptorComparer.cs index 6fbfc16499..290d399fce 100644 --- a/src/Microsoft.AspNetCore.Razor.Test.Sources/TagHelperDesignTimeDescriptorComparer.cs +++ b/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 { diff --git a/src/Microsoft.AspNetCore.Razor.Test.Sources/project.json b/src/Microsoft.AspNetCore.Razor.TagHelpers.Testing.Sources/project.json similarity index 100% rename from src/Microsoft.AspNetCore.Razor.Test.Sources/project.json rename to src/Microsoft.AspNetCore.Razor.TagHelpers.Testing.Sources/project.json diff --git a/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperDescriptorFactoryTest.cs b/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperDescriptorFactoryTest.cs index d4f15ae939..75ed9d1863 100644 --- a/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperDescriptorFactoryTest.cs +++ b/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 diff --git a/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperDescriptorResolverTest.cs b/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperDescriptorResolverTest.cs index d36801eba4..f81f71002f 100644 --- a/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperDescriptorResolverTest.cs +++ b/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 diff --git a/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperDesignTimeDescriptorFactoryTest.cs b/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperDesignTimeDescriptorFactoryTest.cs index 77067f01a3..350597844b 100644 --- a/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperDesignTimeDescriptorFactoryTest.cs +++ b/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; diff --git a/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperExecutionContextTest.cs b/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperExecutionContextTest.cs index a06f7c28b6..75937709e5 100644 --- a/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperExecutionContextTest.cs +++ b/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; diff --git a/test/Microsoft.AspNetCore.Razor.Runtime.Test/TagHelpers/ReadOnlyTagHelperAttributeListTest.cs b/test/Microsoft.AspNetCore.Razor.Runtime.Test/TagHelpers/ReadOnlyTagHelperAttributeListTest.cs index f8aaa4fe54..3ceaf67539 100644 --- a/test/Microsoft.AspNetCore.Razor.Runtime.Test/TagHelpers/ReadOnlyTagHelperAttributeListTest.cs +++ b/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 diff --git a/test/Microsoft.AspNetCore.Razor.Runtime.Test/TagHelpers/TagHelperAttributeListTest.cs b/test/Microsoft.AspNetCore.Razor.Runtime.Test/TagHelpers/TagHelperAttributeListTest.cs index e29630d25b..2cac231a0d 100644 --- a/test/Microsoft.AspNetCore.Razor.Runtime.Test/TagHelpers/TagHelperAttributeListTest.cs +++ b/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 diff --git a/test/Microsoft.AspNetCore.Razor.Runtime.Test/TagHelpers/TagHelperOutputTest.cs b/test/Microsoft.AspNetCore.Razor.Runtime.Test/TagHelpers/TagHelperOutputTest.cs index e114fb7f19..ed8899f9ca 100644 --- a/test/Microsoft.AspNetCore.Razor.Runtime.Test/TagHelpers/TagHelperOutputTest.cs +++ b/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; diff --git a/test/Microsoft.AspNetCore.Razor.Runtime.Test/project.json b/test/Microsoft.AspNetCore.Razor.Runtime.Test/project.json index 3b11304b9a..1542ea98ab 100644 --- a/test/Microsoft.AspNetCore.Razor.Runtime.Test/project.json +++ b/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" }, diff --git a/test/Microsoft.AspNetCore.Razor.Test/Compilation/TagHelpers/TagHelperDescriptorProviderTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Compilation/TagHelpers/TagHelperDescriptorProviderTest.cs index 523d6c1772..23b4929aa2 100644 --- a/test/Microsoft.AspNetCore.Razor.Test/Compilation/TagHelpers/TagHelperDescriptorProviderTest.cs +++ b/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 diff --git a/test/Microsoft.AspNetCore.Razor.Test/Compilation/TagHelpers/TagHelperDescriptorTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Compilation/TagHelpers/TagHelperDescriptorTest.cs index aec70ce4f7..f115f14d3e 100644 --- a/test/Microsoft.AspNetCore.Razor.Test/Compilation/TagHelpers/TagHelperDescriptorTest.cs +++ b/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; diff --git a/test/Microsoft.AspNetCore.Razor.Test/project.json b/test/Microsoft.AspNetCore.Razor.Test/project.json index d2456587b4..39342595a8 100644 --- a/test/Microsoft.AspNetCore.Razor.Test/project.json +++ b/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" },