diff --git a/src/Microsoft.AspNet.Razor.Runtime/Constants.cs b/src/Microsoft.AspNet.Razor.Runtime/Runtime/TagHelpers/Constants.cs similarity index 86% rename from src/Microsoft.AspNet.Razor.Runtime/Constants.cs rename to src/Microsoft.AspNet.Razor.Runtime/Runtime/TagHelpers/Constants.cs index 5ed71904c0..34710fe909 100644 --- a/src/Microsoft.AspNet.Razor.Runtime/Constants.cs +++ b/src/Microsoft.AspNet.Razor.Runtime/Runtime/TagHelpers/Constants.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNet.Razor.Runtime +namespace Microsoft.AspNet.Razor.Runtime.TagHelpers { internal static class Constants { diff --git a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/DefaultTagHelperContent.cs b/src/Microsoft.AspNet.Razor.Runtime/Runtime/TagHelpers/DefaultTagHelperContent.cs similarity index 99% rename from src/Microsoft.AspNet.Razor.Runtime/TagHelpers/DefaultTagHelperContent.cs rename to src/Microsoft.AspNet.Razor.Runtime/Runtime/TagHelpers/DefaultTagHelperContent.cs index 1b00052c0a..b1a5d6e2f7 100644 --- a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/DefaultTagHelperContent.cs +++ b/src/Microsoft.AspNet.Razor.Runtime/Runtime/TagHelpers/DefaultTagHelperContent.cs @@ -6,6 +6,7 @@ using System.Diagnostics; using System.IO; using System.Text; using Microsoft.AspNet.Html.Abstractions; +using Microsoft.AspNet.Razor.TagHelpers; using Microsoft.Extensions.Internal; using Microsoft.Extensions.WebEncoders; diff --git a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/IMemberInfo.cs b/src/Microsoft.AspNet.Razor.Runtime/Runtime/TagHelpers/IMemberInfo.cs similarity index 100% rename from src/Microsoft.AspNet.Razor.Runtime/TagHelpers/IMemberInfo.cs rename to src/Microsoft.AspNet.Razor.Runtime/Runtime/TagHelpers/IMemberInfo.cs diff --git a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/IPropertyInfo.cs b/src/Microsoft.AspNet.Razor.Runtime/Runtime/TagHelpers/IPropertyInfo.cs similarity index 100% rename from src/Microsoft.AspNet.Razor.Runtime/TagHelpers/IPropertyInfo.cs rename to src/Microsoft.AspNet.Razor.Runtime/Runtime/TagHelpers/IPropertyInfo.cs diff --git a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/ITypeInfo.cs b/src/Microsoft.AspNet.Razor.Runtime/Runtime/TagHelpers/ITypeInfo.cs similarity index 92% rename from src/Microsoft.AspNet.Razor.Runtime/TagHelpers/ITypeInfo.cs rename to src/Microsoft.AspNet.Razor.Runtime/Runtime/TagHelpers/ITypeInfo.cs index 1eb7ea2c34..00b670925f 100644 --- a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/ITypeInfo.cs +++ b/src/Microsoft.AspNet.Razor.Runtime/Runtime/TagHelpers/ITypeInfo.cs @@ -27,9 +27,9 @@ namespace Microsoft.AspNet.Razor.Runtime.TagHelpers /// Gets s for all properties of the current type excluding indexers. /// /// - /// Indexers in this context refer to the CLR notion of an indexer (this [string name] - /// and does not overlap with the semantics of - /// . + /// Indexers in this context refer to the CLR notion of an indexer (this [string name] + /// and does not overlap with the semantics of + /// . /// IEnumerable Properties { get; } @@ -62,7 +62,7 @@ namespace Microsoft.AspNet.Razor.Runtime.TagHelpers /// parameters if the type implements , otherwise null. /// /// - /// For open generic types, for generic type parameters is null. + /// For open generic types, for generic type parameters is null. /// ITypeInfo[] GetGenericDictionaryParameters(); } diff --git a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/RuntimePropertyInfo.cs b/src/Microsoft.AspNet.Razor.Runtime/Runtime/TagHelpers/RuntimePropertyInfo.cs similarity index 95% rename from src/Microsoft.AspNet.Razor.Runtime/TagHelpers/RuntimePropertyInfo.cs rename to src/Microsoft.AspNet.Razor.Runtime/Runtime/TagHelpers/RuntimePropertyInfo.cs index a889ca1c81..03c4d51751 100644 --- a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/RuntimePropertyInfo.cs +++ b/src/Microsoft.AspNet.Razor.Runtime/Runtime/TagHelpers/RuntimePropertyInfo.cs @@ -4,9 +4,8 @@ using System; using System.Collections.Generic; using System.Reflection; -using Microsoft.AspNet.Razor.Runtime.TagHelpers; -namespace Microsoft.AspNet.Razor.Runtime +namespace Microsoft.AspNet.Razor.Runtime.TagHelpers { /// /// adapter for instances. diff --git a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/RuntimeTypeInfo.cs b/src/Microsoft.AspNet.Razor.Runtime/Runtime/TagHelpers/RuntimeTypeInfo.cs similarity index 99% rename from src/Microsoft.AspNet.Razor.Runtime/TagHelpers/RuntimeTypeInfo.cs rename to src/Microsoft.AspNet.Razor.Runtime/Runtime/TagHelpers/RuntimeTypeInfo.cs index 59768fa3ab..eed802bf01 100644 --- a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/RuntimeTypeInfo.cs +++ b/src/Microsoft.AspNet.Razor.Runtime/Runtime/TagHelpers/RuntimeTypeInfo.cs @@ -6,6 +6,7 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; using System.Text.RegularExpressions; +using Microsoft.AspNet.Razor.TagHelpers; using Microsoft.Extensions.Internal; namespace Microsoft.AspNet.Razor.Runtime.TagHelpers diff --git a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperDescriptorFactory.cs b/src/Microsoft.AspNet.Razor.Runtime/Runtime/TagHelpers/TagHelperDescriptorFactory.cs similarity index 99% rename from src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperDescriptorFactory.cs rename to src/Microsoft.AspNet.Razor.Runtime/Runtime/TagHelpers/TagHelperDescriptorFactory.cs index dd0c5e6f40..def04994f4 100644 --- a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperDescriptorFactory.cs +++ b/src/Microsoft.AspNet.Razor.Runtime/Runtime/TagHelpers/TagHelperDescriptorFactory.cs @@ -8,6 +8,7 @@ using System.Linq; using System.Reflection; using System.Text.RegularExpressions; using Microsoft.AspNet.Razor.Compilation.TagHelpers; +using Microsoft.AspNet.Razor.TagHelpers; namespace Microsoft.AspNet.Razor.Runtime.TagHelpers { diff --git a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperDescriptorResolver.cs b/src/Microsoft.AspNet.Razor.Runtime/Runtime/TagHelpers/TagHelperDescriptorResolver.cs similarity index 98% rename from src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperDescriptorResolver.cs rename to src/Microsoft.AspNet.Razor.Runtime/Runtime/TagHelpers/TagHelperDescriptorResolver.cs index cce2bc5d58..d96346ea0a 100644 --- a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperDescriptorResolver.cs +++ b/src/Microsoft.AspNet.Razor.Runtime/Runtime/TagHelpers/TagHelperDescriptorResolver.cs @@ -5,9 +5,8 @@ using System; using System.Collections.Generic; using System.Diagnostics; using System.Linq; -using System.Text.RegularExpressions; -using Microsoft.AspNet.Razor.Parser; using Microsoft.AspNet.Razor.Compilation.TagHelpers; +using Microsoft.AspNet.Razor.Parser; namespace Microsoft.AspNet.Razor.Runtime.TagHelpers { @@ -116,8 +115,8 @@ namespace Microsoft.AspNet.Razor.Runtime.TagHelpers } /// - /// Resolves all s for s from the given - /// . + /// Resolves all s for s from the + /// given . /// /// /// The name of the assembly to resolve s from. @@ -125,7 +124,7 @@ namespace Microsoft.AspNet.Razor.Runtime.TagHelpers /// The of the directive. /// Used to record errors found when resolving s /// within the given . - /// s for s from the given + /// s for s from the given /// . // This is meant to be overridden by tooling to enable assembly level caching. protected virtual IEnumerable ResolveDescriptorsInAssembly( diff --git a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperDesignTimeDescriptorFactory.cs b/src/Microsoft.AspNet.Razor.Runtime/Runtime/TagHelpers/TagHelperDesignTimeDescriptorFactory.cs similarity index 99% rename from src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperDesignTimeDescriptorFactory.cs rename to src/Microsoft.AspNet.Razor.Runtime/Runtime/TagHelpers/TagHelperDesignTimeDescriptorFactory.cs index f014df96e2..22757e37a2 100644 --- a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperDesignTimeDescriptorFactory.cs +++ b/src/Microsoft.AspNet.Razor.Runtime/Runtime/TagHelpers/TagHelperDesignTimeDescriptorFactory.cs @@ -9,6 +9,7 @@ using System.IO; using System.Linq; using System.Reflection; using Microsoft.AspNet.Razor.Compilation.TagHelpers; +using Microsoft.AspNet.Razor.TagHelpers; namespace Microsoft.AspNet.Razor.Runtime.TagHelpers { diff --git a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperExecutionContext.cs b/src/Microsoft.AspNet.Razor.Runtime/Runtime/TagHelpers/TagHelperExecutionContext.cs similarity index 99% rename from src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperExecutionContext.cs rename to src/Microsoft.AspNet.Razor.Runtime/Runtime/TagHelpers/TagHelperExecutionContext.cs index 9dcd7ed21d..1b9068611f 100644 --- a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperExecutionContext.cs +++ b/src/Microsoft.AspNet.Razor.Runtime/Runtime/TagHelpers/TagHelperExecutionContext.cs @@ -4,6 +4,7 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; +using Microsoft.AspNet.Razor.TagHelpers; namespace Microsoft.AspNet.Razor.Runtime.TagHelpers { diff --git a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperRunner.cs b/src/Microsoft.AspNet.Razor.Runtime/Runtime/TagHelpers/TagHelperRunner.cs similarity index 97% rename from src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperRunner.cs rename to src/Microsoft.AspNet.Razor.Runtime/Runtime/TagHelpers/TagHelperRunner.cs index 101d6e41d0..5ec7453277 100644 --- a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperRunner.cs +++ b/src/Microsoft.AspNet.Razor.Runtime/Runtime/TagHelpers/TagHelperRunner.cs @@ -4,6 +4,7 @@ using System; using System.Linq; using System.Threading.Tasks; +using Microsoft.AspNet.Razor.TagHelpers; namespace Microsoft.AspNet.Razor.Runtime.TagHelpers { diff --git a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperScopeManager.cs b/src/Microsoft.AspNet.Razor.Runtime/Runtime/TagHelpers/TagHelperScopeManager.cs similarity index 99% rename from src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperScopeManager.cs rename to src/Microsoft.AspNet.Razor.Runtime/Runtime/TagHelpers/TagHelperScopeManager.cs index ba3228bdaa..f2ae450871 100644 --- a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperScopeManager.cs +++ b/src/Microsoft.AspNet.Razor.Runtime/Runtime/TagHelpers/TagHelperScopeManager.cs @@ -4,6 +4,7 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; +using Microsoft.AspNet.Razor.TagHelpers; using Microsoft.Extensions.Internal; namespace Microsoft.AspNet.Razor.Runtime.TagHelpers diff --git a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperTypeResolver.cs b/src/Microsoft.AspNet.Razor.Runtime/Runtime/TagHelpers/TagHelperTypeResolver.cs similarity index 99% rename from src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperTypeResolver.cs rename to src/Microsoft.AspNet.Razor.Runtime/Runtime/TagHelpers/TagHelperTypeResolver.cs index 4f85ea405b..e132ce345f 100644 --- a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperTypeResolver.cs +++ b/src/Microsoft.AspNet.Razor.Runtime/Runtime/TagHelpers/TagHelperTypeResolver.cs @@ -5,6 +5,7 @@ using System; using System.Collections.Generic; using System.Linq; using System.Reflection; +using Microsoft.AspNet.Razor.TagHelpers; namespace Microsoft.AspNet.Razor.Runtime.TagHelpers { diff --git a/src/Microsoft.AspNet.Razor.Runtime/XMLDocumentationProvider.cs b/src/Microsoft.AspNet.Razor.Runtime/Runtime/TagHelpers/XmlDocumentationProvider.cs similarity index 98% rename from src/Microsoft.AspNet.Razor.Runtime/XMLDocumentationProvider.cs rename to src/Microsoft.AspNet.Razor.Runtime/Runtime/TagHelpers/XmlDocumentationProvider.cs index 589d187199..e7c236af9e 100644 --- a/src/Microsoft.AspNet.Razor.Runtime/XMLDocumentationProvider.cs +++ b/src/Microsoft.AspNet.Razor.Runtime/Runtime/TagHelpers/XmlDocumentationProvider.cs @@ -9,7 +9,7 @@ using System.Reflection; using System.Text; using System.Xml.Linq; -namespace Microsoft.AspNet.Razor.Runtime +namespace Microsoft.AspNet.Razor.Runtime.TagHelpers { /// /// Extracts summary and remarks XML documentation from an XML documentation file. diff --git a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/HtmlAttributeNameAttribute.cs b/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/HtmlAttributeNameAttribute.cs index 07e0649a6b..597aa0a88e 100644 --- a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/HtmlAttributeNameAttribute.cs +++ b/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/HtmlAttributeNameAttribute.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNet.Razor.Runtime.TagHelpers +namespace Microsoft.AspNet.Razor.TagHelpers { /// /// Used to override an property's HTML attribute name. diff --git a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/HtmlAttributeNotBoundAttribute.cs b/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/HtmlAttributeNotBoundAttribute.cs index 7813ab7fc5..15421d0736 100644 --- a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/HtmlAttributeNotBoundAttribute.cs +++ b/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/HtmlAttributeNotBoundAttribute.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNet.Razor.Runtime.TagHelpers +namespace Microsoft.AspNet.Razor.TagHelpers { /// /// Indicates the associated property should not be bound to HTML attributes. diff --git a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/HtmlTargetElementAttribute.cs b/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/HtmlTargetElementAttribute.cs index ad86e36c75..655951cf6c 100644 --- a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/HtmlTargetElementAttribute.cs +++ b/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/HtmlTargetElementAttribute.cs @@ -4,7 +4,7 @@ using System; using Microsoft.AspNet.Razor.Compilation.TagHelpers; -namespace Microsoft.AspNet.Razor.Runtime.TagHelpers +namespace Microsoft.AspNet.Razor.TagHelpers { /// /// Provides an 's target. diff --git a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/IReadOnlyTagHelperAttribute.cs b/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/IReadOnlyTagHelperAttribute.cs index cdf90a0dbd..5b7148b80c 100644 --- a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/IReadOnlyTagHelperAttribute.cs +++ b/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/IReadOnlyTagHelperAttribute.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNet.Razor.Runtime.TagHelpers +namespace Microsoft.AspNet.Razor.TagHelpers { /// /// A read-only HTML tag helper attribute. diff --git a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/ITagHelper.cs b/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/ITagHelper.cs index 211d28939c..ec0a64f41e 100644 --- a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/ITagHelper.cs +++ b/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/ITagHelper.cs @@ -3,7 +3,7 @@ using System.Threading.Tasks; -namespace Microsoft.AspNet.Razor.Runtime.TagHelpers +namespace Microsoft.AspNet.Razor.TagHelpers { /// /// Contract used to filter matching HTML elements. diff --git a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/OutputElementHintAttribute.cs b/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/OutputElementHintAttribute.cs index 3ed807c6fd..a7cae8fd69 100644 --- a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/OutputElementHintAttribute.cs +++ b/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/OutputElementHintAttribute.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNet.Razor.Runtime.TagHelpers +namespace Microsoft.AspNet.Razor.TagHelpers { /// /// Provides a hint of the 's output element. diff --git a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/ReadOnlyTagHelperAttributeList.cs b/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/ReadOnlyTagHelperAttributeList.cs index f17df8d389..19694da295 100644 --- a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/ReadOnlyTagHelperAttributeList.cs +++ b/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/ReadOnlyTagHelperAttributeList.cs @@ -7,7 +7,7 @@ using System.Collections.Generic; using System.Linq; using Microsoft.Extensions.Internal; -namespace Microsoft.AspNet.Razor.Runtime.TagHelpers +namespace Microsoft.AspNet.Razor.TagHelpers { /// /// A read-only collection of s. diff --git a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/RestrictChildrenAttribute.cs b/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/RestrictChildrenAttribute.cs index e1eeb8365f..7f0626c134 100644 --- a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/RestrictChildrenAttribute.cs +++ b/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/RestrictChildrenAttribute.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; -namespace Microsoft.AspNet.Razor.Runtime.TagHelpers +namespace Microsoft.AspNet.Razor.TagHelpers { /// /// Restricts children of the 's element. diff --git a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelper.cs b/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelper.cs index a35d8879e5..ef051505b5 100644 --- a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelper.cs +++ b/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelper.cs @@ -3,7 +3,7 @@ using System.Threading.Tasks; -namespace Microsoft.AspNet.Razor.Runtime.TagHelpers +namespace Microsoft.AspNet.Razor.TagHelpers { /// /// Class used to filter matching HTML elements. diff --git a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperAttribute.cs b/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperAttribute.cs index 8b38c978ec..9262bbe790 100644 --- a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperAttribute.cs +++ b/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperAttribute.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNet.Razor.Runtime.TagHelpers +namespace Microsoft.AspNet.Razor.TagHelpers { /// /// An HTML tag helper attribute. diff --git a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperAttributeList.cs b/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperAttributeList.cs index 4a5c4ff9e5..a98971701d 100644 --- a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperAttributeList.cs +++ b/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperAttributeList.cs @@ -3,9 +3,10 @@ using System; using System.Collections.Generic; +using Microsoft.AspNet.Razor.Runtime; using Microsoft.Extensions.Internal; -namespace Microsoft.AspNet.Razor.Runtime.TagHelpers +namespace Microsoft.AspNet.Razor.TagHelpers { /// /// A collection of s. diff --git a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperContent.cs b/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperContent.cs index 55108977e8..dc89db6061 100644 --- a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperContent.cs +++ b/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperContent.cs @@ -6,7 +6,7 @@ using System.IO; using Microsoft.AspNet.Html.Abstractions; using Microsoft.Extensions.WebEncoders; -namespace Microsoft.AspNet.Razor.Runtime.TagHelpers +namespace Microsoft.AspNet.Razor.TagHelpers { /// /// Abstract class used to buffer content returned by s. diff --git a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperContext.cs b/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperContext.cs index 96cdbc971b..ed6ef0491b 100644 --- a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperContext.cs +++ b/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperContext.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace Microsoft.AspNet.Razor.Runtime.TagHelpers +namespace Microsoft.AspNet.Razor.TagHelpers { /// /// Contains information related to the execution of s. diff --git a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperOutput.cs b/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperOutput.cs index 2bda595413..c418fc7fe5 100644 --- a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperOutput.cs +++ b/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperOutput.cs @@ -2,8 +2,9 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using Microsoft.AspNet.Razor.Runtime.TagHelpers; -namespace Microsoft.AspNet.Razor.Runtime.TagHelpers +namespace Microsoft.AspNet.Razor.TagHelpers { /// /// Class used to represent the output of an . diff --git a/src/Microsoft.AspNet.Razor.Test.Sources/project.json b/src/Microsoft.AspNet.Razor.Test.Sources/project.json index 17cad22996..4796447b44 100644 --- a/src/Microsoft.AspNet.Razor.Test.Sources/project.json +++ b/src/Microsoft.AspNet.Razor.Test.Sources/project.json @@ -6,10 +6,6 @@ }, "frameworks": { "net451": { }, - "dotnet5.4": { - "dependencies": { - "System.Runtime": "4.0.21-beta-*" - } - } + "dotnet5.4": { } } } \ No newline at end of file diff --git a/src/Microsoft.AspNet.Razor/Chunks/TagHelperChunk.cs b/src/Microsoft.AspNet.Razor/Chunks/TagHelperChunk.cs index fbcdd59b8c..3e0a700685 100644 --- a/src/Microsoft.AspNet.Razor/Chunks/TagHelperChunk.cs +++ b/src/Microsoft.AspNet.Razor/Chunks/TagHelperChunk.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Collections.Generic; -using Microsoft.AspNet.Razor.Runtime.TagHelpers; +using Microsoft.AspNet.Razor.TagHelpers; using Microsoft.AspNet.Razor.Compilation.TagHelpers; namespace Microsoft.AspNet.Razor.Chunks diff --git a/src/Microsoft.AspNet.Razor/CodeGenerators/CSharpTagHelperCodeRenderer.cs b/src/Microsoft.AspNet.Razor/CodeGenerators/CSharpTagHelperCodeRenderer.cs index 6bbe592c1b..dbd26e3a2c 100644 --- a/src/Microsoft.AspNet.Razor/CodeGenerators/CSharpTagHelperCodeRenderer.cs +++ b/src/Microsoft.AspNet.Razor/CodeGenerators/CSharpTagHelperCodeRenderer.cs @@ -8,7 +8,7 @@ using System.Globalization; using System.Linq; using Microsoft.AspNet.Razor.Chunks; using Microsoft.AspNet.Razor.CodeGenerators.Visitors; -using Microsoft.AspNet.Razor.Runtime.TagHelpers; +using Microsoft.AspNet.Razor.TagHelpers; using Microsoft.AspNet.Razor.Compilation.TagHelpers; namespace Microsoft.AspNet.Razor.CodeGenerators diff --git a/src/Microsoft.AspNet.Razor/CodeGenerators/Visitors/CSharpUsingVisitor.cs b/src/Microsoft.AspNet.Razor/CodeGenerators/Visitors/CSharpUsingVisitor.cs index 8a957be73f..e776e6c7ce 100644 --- a/src/Microsoft.AspNet.Razor/CodeGenerators/Visitors/CSharpUsingVisitor.cs +++ b/src/Microsoft.AspNet.Razor/CodeGenerators/Visitors/CSharpUsingVisitor.cs @@ -11,7 +11,11 @@ namespace Microsoft.AspNet.Razor.CodeGenerators.Visitors { public class CSharpUsingVisitor : CodeVisitor { - private const string TagHelpersRuntimeNamespace = "Microsoft.AspNet.Razor.Runtime.TagHelpers"; + private static readonly string[] TagHelpersRuntimeNamespaces = new[] + { + "Microsoft.AspNet.Razor.TagHelpers", + "Microsoft.AspNet.Razor.Runtime.TagHelpers" + }; private bool _foundTagHelpers; @@ -28,10 +32,10 @@ namespace Microsoft.AspNet.Razor.CodeGenerators.Visitors throw new ArgumentNullException(nameof(context)); } - ImportedUsings = new List(); + ImportedUsings = new HashSet(StringComparer.Ordinal); } - public IList ImportedUsings { get; set; } + public HashSet ImportedUsings { get; set; } /// public override void Accept(Chunk chunk) @@ -89,15 +93,23 @@ namespace Microsoft.AspNet.Razor.CodeGenerators.Visitors protected override void Visit(TagHelperChunk chunk) { + if (Context.Host.DesignTimeMode) + { + return; + } + if (!_foundTagHelpers) { _foundTagHelpers = true; - if (!ImportedUsings.Contains(TagHelpersRuntimeNamespace)) + foreach (var tagHelperRuntimeNamespace in TagHelpersRuntimeNamespaces) { - // If we find TagHelpers then we need to add the TagHelper runtime namespace to our list of usings. - Writer.WriteUsing(TagHelpersRuntimeNamespace); - ImportedUsings.Add(TagHelpersRuntimeNamespace); + if (ImportedUsings.Add(tagHelperRuntimeNamespace)) + { + // If we find TagHelpers then we need to add the TagHelper runtime namespaces to our list of + // usings. + Writer.WriteUsing(tagHelperRuntimeNamespace); + } } } } diff --git a/src/Microsoft.AspNet.Razor/Compilation/TagHelpers/TagHelperDescriptor.cs b/src/Microsoft.AspNet.Razor/Compilation/TagHelpers/TagHelperDescriptor.cs index 276bcf96a1..1a98a9a18f 100644 --- a/src/Microsoft.AspNet.Razor/Compilation/TagHelpers/TagHelperDescriptor.cs +++ b/src/Microsoft.AspNet.Razor/Compilation/TagHelpers/TagHelperDescriptor.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; using System.Linq; -using Microsoft.AspNet.Razor.Runtime.TagHelpers; +using Microsoft.AspNet.Razor.TagHelpers; namespace Microsoft.AspNet.Razor.Compilation.TagHelpers { diff --git a/src/Microsoft.AspNet.Razor/Parser/TagHelpers/TagHelperBlock.cs b/src/Microsoft.AspNet.Razor/Parser/TagHelpers/TagHelperBlock.cs index 3962d48c67..ab7ab36063 100644 --- a/src/Microsoft.AspNet.Razor/Parser/TagHelpers/TagHelperBlock.cs +++ b/src/Microsoft.AspNet.Razor/Parser/TagHelpers/TagHelperBlock.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Globalization; using System.Linq; using Microsoft.AspNet.Razor.Parser.SyntaxTree; -using Microsoft.AspNet.Razor.Runtime.TagHelpers; +using Microsoft.AspNet.Razor.TagHelpers; using Microsoft.AspNet.Razor.Compilation.TagHelpers; using Microsoft.Extensions.Internal; diff --git a/src/Microsoft.AspNet.Razor/Parser/TagHelpers/TagHelperBlockBuilder.cs b/src/Microsoft.AspNet.Razor/Parser/TagHelpers/TagHelperBlockBuilder.cs index 032ac53979..52e9faea20 100644 --- a/src/Microsoft.AspNet.Razor/Parser/TagHelpers/TagHelperBlockBuilder.cs +++ b/src/Microsoft.AspNet.Razor/Parser/TagHelpers/TagHelperBlockBuilder.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using Microsoft.AspNet.Razor.Chunks.Generators; using Microsoft.AspNet.Razor.Parser.SyntaxTree; -using Microsoft.AspNet.Razor.Runtime.TagHelpers; +using Microsoft.AspNet.Razor.TagHelpers; using Microsoft.AspNet.Razor.Compilation.TagHelpers; namespace Microsoft.AspNet.Razor.Parser.TagHelpers diff --git a/src/Microsoft.AspNet.Razor/Parser/TagHelpers/TagHelperBlockRewriter.cs b/src/Microsoft.AspNet.Razor/Parser/TagHelpers/TagHelperBlockRewriter.cs index 0ed73e343f..610c091cca 100644 --- a/src/Microsoft.AspNet.Razor/Parser/TagHelpers/TagHelperBlockRewriter.cs +++ b/src/Microsoft.AspNet.Razor/Parser/TagHelpers/TagHelperBlockRewriter.cs @@ -7,7 +7,7 @@ using System.Diagnostics; using System.Linq; using Microsoft.AspNet.Razor.Chunks.Generators; using Microsoft.AspNet.Razor.Parser.SyntaxTree; -using Microsoft.AspNet.Razor.Runtime.TagHelpers; +using Microsoft.AspNet.Razor.TagHelpers; using Microsoft.AspNet.Razor.Compilation.TagHelpers; using Microsoft.AspNet.Razor.Tokenizer.Symbols; diff --git a/src/Microsoft.AspNet.Razor/Parser/TagHelpers/TagHelperParseTreeRewriter.cs b/src/Microsoft.AspNet.Razor/Parser/TagHelpers/TagHelperParseTreeRewriter.cs index bff7a03214..413e2ff9ba 100644 --- a/src/Microsoft.AspNet.Razor/Parser/TagHelpers/TagHelperParseTreeRewriter.cs +++ b/src/Microsoft.AspNet.Razor/Parser/TagHelpers/TagHelperParseTreeRewriter.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.Linq; using Microsoft.AspNet.Razor.Parser.SyntaxTree; -using Microsoft.AspNet.Razor.Runtime.TagHelpers; +using Microsoft.AspNet.Razor.TagHelpers; using Microsoft.AspNet.Razor.Compilation.TagHelpers; using Microsoft.AspNet.Razor.Tokenizer.Symbols; diff --git a/src/Microsoft.AspNet.Razor/Runtime/TagHelpers/TagMode.cs b/src/Microsoft.AspNet.Razor/TagHelpers/TagMode.cs similarity index 92% rename from src/Microsoft.AspNet.Razor/Runtime/TagHelpers/TagMode.cs rename to src/Microsoft.AspNet.Razor/TagHelpers/TagMode.cs index 4f1232df17..d6c33d4b4e 100644 --- a/src/Microsoft.AspNet.Razor/Runtime/TagHelpers/TagMode.cs +++ b/src/Microsoft.AspNet.Razor/TagHelpers/TagMode.cs @@ -1,7 +1,7 @@ // 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. -namespace Microsoft.AspNet.Razor.Runtime.TagHelpers +namespace Microsoft.AspNet.Razor.TagHelpers { /// /// The mode in which an element should render. diff --git a/src/Microsoft.AspNet.Razor/Runtime/TagHelpers/TagStructure.cs b/src/Microsoft.AspNet.Razor/TagHelpers/TagStructure.cs similarity index 95% rename from src/Microsoft.AspNet.Razor/Runtime/TagHelpers/TagStructure.cs rename to src/Microsoft.AspNet.Razor/TagHelpers/TagStructure.cs index b7866c220d..5c801f3e27 100644 --- a/src/Microsoft.AspNet.Razor/Runtime/TagHelpers/TagStructure.cs +++ b/src/Microsoft.AspNet.Razor/TagHelpers/TagStructure.cs @@ -1,7 +1,7 @@ // 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. -namespace Microsoft.AspNet.Razor.Runtime.TagHelpers +namespace Microsoft.AspNet.Razor.TagHelpers { /// /// The structure the element should be written in. diff --git a/test/Microsoft.AspNet.Razor.Runtime.Precompilation.Files/TypeWithAttributes.cs b/test/Microsoft.AspNet.Razor.Runtime.Precompilation.Files/TypeWithAttributes.cs index 8f268d5f11..36affcda55 100644 --- a/test/Microsoft.AspNet.Razor.Runtime.Precompilation.Files/TypeWithAttributes.cs +++ b/test/Microsoft.AspNet.Razor.Runtime.Precompilation.Files/TypeWithAttributes.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.ComponentModel; using System.ComponentModel.DataAnnotations; using System.Resources; -using Microsoft.AspNet.Razor.Runtime.TagHelpers; +using Microsoft.AspNet.Razor.TagHelpers; namespace Microsoft.AspNet.Razor.Runtime.Precompilation { diff --git a/test/Microsoft.AspNet.Razor.Runtime.Precompilation.Files/TypeWithComplexPropertyFullNames.cs b/test/Microsoft.AspNet.Razor.Runtime.Precompilation.Files/TypeWithComplexPropertyFullNames.cs index 0928a974ae..bf279a62c0 100644 --- a/test/Microsoft.AspNet.Razor.Runtime.Precompilation.Files/TypeWithComplexPropertyFullNames.cs +++ b/test/Microsoft.AspNet.Razor.Runtime.Precompilation.Files/TypeWithComplexPropertyFullNames.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; using System.Linq; -using Microsoft.AspNet.Razor.Runtime.TagHelpers; +using Microsoft.AspNet.Razor.TagHelpers; namespace Microsoft.AspNet.Razor.Runtime.Precompilation { diff --git a/test/Microsoft.AspNet.Razor.Runtime.Precompilation.Test/BadFiles/TypeWithMalformedAttribute.cs b/test/Microsoft.AspNet.Razor.Runtime.Precompilation.Test/BadFiles/TypeWithMalformedAttribute.cs index ee06a81eba..549191b833 100644 --- a/test/Microsoft.AspNet.Razor.Runtime.Precompilation.Test/BadFiles/TypeWithMalformedAttribute.cs +++ b/test/Microsoft.AspNet.Razor.Runtime.Precompilation.Test/BadFiles/TypeWithMalformedAttribute.cs @@ -4,7 +4,7 @@ using System; using System.ComponentModel; using System.ComponentModel.DataAnnotations; -using Microsoft.AspNet.Razor.Runtime.TagHelpers; +using Microsoft.AspNet.Razor.TagHelpers; namespace Microsoft.AspNet.Mvc.Razor.Precompilation { diff --git a/test/Microsoft.AspNet.Razor.Runtime.Precompilation.Test/PrecompilationTagHelperDescriptorFactoryTest.cs b/test/Microsoft.AspNet.Razor.Runtime.Precompilation.Test/PrecompilationTagHelperDescriptorFactoryTest.cs index de560d0c59..9fad425be0 100644 --- a/test/Microsoft.AspNet.Razor.Runtime.Precompilation.Test/PrecompilationTagHelperDescriptorFactoryTest.cs +++ b/test/Microsoft.AspNet.Razor.Runtime.Precompilation.Test/PrecompilationTagHelperDescriptorFactoryTest.cs @@ -4,8 +4,8 @@ using System; using System.Collections.Generic; using System.Linq; -using Microsoft.AspNet.Razor.Runtime.TagHelpers; using Microsoft.AspNet.Razor.Compilation.TagHelpers; +using Microsoft.AspNet.Razor.Runtime.TagHelpers; using Microsoft.AspNet.Razor.Test.Internal; using Xunit; diff --git a/test/Microsoft.AspNet.Razor.Runtime.Precompilation.Test/PrecompilationTagHelperTypeResolverTest.cs b/test/Microsoft.AspNet.Razor.Runtime.Precompilation.Test/PrecompilationTagHelperTypeResolverTest.cs index c82b86cbd1..bc65328e09 100644 --- a/test/Microsoft.AspNet.Razor.Runtime.Precompilation.Test/PrecompilationTagHelperTypeResolverTest.cs +++ b/test/Microsoft.AspNet.Razor.Runtime.Precompilation.Test/PrecompilationTagHelperTypeResolverTest.cs @@ -8,6 +8,7 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using System.Reflection; using Microsoft.AspNet.Razor.Runtime.TagHelpers; +using Microsoft.AspNet.Razor.TagHelpers; using Microsoft.AspNet.Testing; using Microsoft.CodeAnalysis.CSharp; using Xunit; diff --git a/test/Microsoft.AspNet.Razor.Runtime.Precompilation.Test/project.json b/test/Microsoft.AspNet.Razor.Runtime.Precompilation.Test/project.json index ec6f91d869..46607b1aa6 100644 --- a/test/Microsoft.AspNet.Razor.Runtime.Precompilation.Test/project.json +++ b/test/Microsoft.AspNet.Razor.Runtime.Precompilation.Test/project.json @@ -15,7 +15,7 @@ }, "resource": [ "../Microsoft.AspNet.Razor.Runtime.Precompilation.Files/*.cs", - "../Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TestTagHelpers/*.cs", + "../Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/TestTagHelpers/*.cs", "BadFiles/*.cs" ], "commands": { diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/CaseSensitiveTagHelperAttributeComparer.cs b/test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/CaseSensitiveTagHelperAttributeComparer.cs similarity index 96% rename from test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/CaseSensitiveTagHelperAttributeComparer.cs rename to test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/CaseSensitiveTagHelperAttributeComparer.cs index 0bb90234b8..21eee2b3a5 100644 --- a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/CaseSensitiveTagHelperAttributeComparer.cs +++ b/test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/CaseSensitiveTagHelperAttributeComparer.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; -namespace Microsoft.AspNet.Razor.Runtime.TagHelpers +namespace Microsoft.AspNet.Razor.TagHelpers { public class CaseSensitiveTagHelperAttributeComparer : IEqualityComparer { diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/DefaultTagHelperContentTest.cs b/test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/DefaultTagHelperContentTest.cs similarity index 99% rename from test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/DefaultTagHelperContentTest.cs rename to test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/DefaultTagHelperContentTest.cs index b82ef53a0b..3aa6ab291d 100644 --- a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/DefaultTagHelperContentTest.cs +++ b/test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/DefaultTagHelperContentTest.cs @@ -1,10 +1,9 @@ // 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.Globalization; using System.IO; -using Microsoft.AspNet.Testing; +using Microsoft.AspNet.Razor.TagHelpers; using Microsoft.Extensions.WebEncoders.Testing; using Xunit; @@ -102,7 +101,7 @@ namespace Microsoft.AspNet.Razor.Runtime.TagHelpers "HtmlEncode[[First]] HtmlEncode[[Second]] HtmlEncode[[Third]] HtmlEncode[[Fourth]]!", tagHelperContent.GetContent(new CommonTestEncoder())); } - + [Fact] public void CanAppendFormat_WithCulture() { @@ -173,7 +172,7 @@ namespace Microsoft.AspNet.Razor.Runtime.TagHelpers Assert.True(tagHelperContent.IsModified); } - + [Fact] public void IsModified_TrueAfterAppend() { diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/RuntimePropertyInfoTest.cs b/test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/RuntimePropertyInfoTest.cs similarity index 99% rename from test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/RuntimePropertyInfoTest.cs rename to test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/RuntimePropertyInfoTest.cs index 78b1fb1cb7..3cdf5b87d6 100644 --- a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/RuntimePropertyInfoTest.cs +++ b/test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/RuntimePropertyInfoTest.cs @@ -4,6 +4,7 @@ using System; using System.Linq; using System.Reflection; +using Microsoft.AspNet.Razor.TagHelpers; using Xunit; namespace Microsoft.AspNet.Razor.Runtime.TagHelpers diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/RuntimeTagHelperDescriptorFactoryTest.cs b/test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/RuntimeTagHelperDescriptorFactoryTest.cs similarity index 99% rename from test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/RuntimeTagHelperDescriptorFactoryTest.cs rename to test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/RuntimeTagHelperDescriptorFactoryTest.cs index bbee7fff03..78d88a4842 100644 --- a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/RuntimeTagHelperDescriptorFactoryTest.cs +++ b/test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/RuntimeTagHelperDescriptorFactoryTest.cs @@ -6,6 +6,7 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; using Microsoft.AspNet.Razor.Compilation.TagHelpers; +using Microsoft.AspNet.Razor.TagHelpers; using Microsoft.AspNet.Razor.Test.Internal; using Xunit; diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/RuntimeTypeInfoTest.cs b/test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/RuntimeTypeInfoTest.cs similarity index 99% rename from test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/RuntimeTypeInfoTest.cs rename to test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/RuntimeTypeInfoTest.cs index ff7b0f0d16..c3280fb45b 100644 --- a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/RuntimeTypeInfoTest.cs +++ b/test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/RuntimeTypeInfoTest.cs @@ -7,6 +7,7 @@ using System.Collections.Generic; using System.ComponentModel; using System.Reflection; using System.Threading.Tasks; +using Microsoft.AspNet.Razor.TagHelpers; using Microsoft.AspNet.Testing; using Xunit; diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperDescriptorFactoryTest.cs b/test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperDescriptorFactoryTest.cs similarity index 99% rename from test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperDescriptorFactoryTest.cs rename to test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperDescriptorFactoryTest.cs index 8f80b8fa0c..3905b63327 100644 --- a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperDescriptorFactoryTest.cs +++ b/test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperDescriptorFactoryTest.cs @@ -6,6 +6,7 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; using Microsoft.AspNet.Razor.Compilation.TagHelpers; +using Microsoft.AspNet.Razor.TagHelpers; using Microsoft.AspNet.Razor.Test.Internal; using Xunit; diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperDescriptorResolverTest.cs b/test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperDescriptorResolverTest.cs similarity index 98% rename from test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperDescriptorResolverTest.cs rename to test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperDescriptorResolverTest.cs index 9fd4440130..3dcfcfc69f 100644 --- a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperDescriptorResolverTest.cs +++ b/test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperDescriptorResolverTest.cs @@ -5,8 +5,9 @@ using System; using System.Collections.Generic; using System.Linq; using System.Reflection; -using Microsoft.AspNet.Razor.Parser; using Microsoft.AspNet.Razor.Compilation.TagHelpers; +using Microsoft.AspNet.Razor.Parser; +using Microsoft.AspNet.Razor.TagHelpers; using Microsoft.AspNet.Razor.Test.Internal; using Xunit; @@ -149,7 +150,7 @@ namespace Microsoft.AspNet.Razor.Runtime.TagHelpers }, new TagHelperDirectiveDescriptor { - DirectiveText = "Microsoft.AspNet.Razor.Runtime.TagHelpers.Valid_P*, " + assemblyA, + DirectiveText = "Microsoft.AspNet.Razor.TagHelpers.Valid_P*, " + assemblyA, Location = directiveLocation1, DirectiveType = TagHelperDirectiveType.AddTagHelper } @@ -181,7 +182,7 @@ namespace Microsoft.AspNet.Razor.Runtime.TagHelpers }, new TagHelperDirectiveDescriptor { - DirectiveText = "Microsoft.AspNet.Razor.Runtime.TagHelpers.Valid_Plain*, " + assemblyA, + DirectiveText = "Microsoft.AspNet.Razor.TagHelpers.Valid_Plain*, " + assemblyA, Location = directiveLocation1, DirectiveType = TagHelperDirectiveType.AddTagHelper }, @@ -451,7 +452,7 @@ namespace Microsoft.AspNet.Razor.Runtime.TagHelpers { CreateTagHelperDirectiveDescriptor("", TagHelperDirectiveType.TagHelperPrefix), CreateTagHelperDirectiveDescriptor( - "Microsoft.AspNet.Razor.Runtime.TagHelpers.Valid_Plain*, " + assemblyA, + "Microsoft.AspNet.Razor.TagHelpers.Valid_Plain*, " + assemblyA, TagHelperDirectiveType.AddTagHelper), }, new [] { Valid_PlainTagHelperDescriptor } @@ -462,7 +463,7 @@ namespace Microsoft.AspNet.Razor.Runtime.TagHelpers { CreateTagHelperDirectiveDescriptor("th:", TagHelperDirectiveType.TagHelperPrefix), CreateTagHelperDirectiveDescriptor( - "Microsoft.AspNet.Razor.Runtime.TagHelpers.Valid_Plain*, " + assemblyA, + "Microsoft.AspNet.Razor.TagHelpers.Valid_Plain*, " + assemblyA, TagHelperDirectiveType.AddTagHelper), }, new [] { CreatePrefixedValidPlainDescriptor("th:") } @@ -486,10 +487,10 @@ namespace Microsoft.AspNet.Razor.Runtime.TagHelpers { CreateTagHelperDirectiveDescriptor("th-", TagHelperDirectiveType.TagHelperPrefix), CreateTagHelperDirectiveDescriptor( - "Microsoft.AspNet.Razor.Runtime.TagHelpers.Valid_Plain*, " + assemblyA, + "Microsoft.AspNet.Razor.TagHelpers.Valid_Plain*, " + assemblyA, TagHelperDirectiveType.AddTagHelper), CreateTagHelperDirectiveDescriptor( - "Microsoft.AspNet.Razor.Runtime.TagHelpers.Valid_Inherited*, " + assemblyA, + "Microsoft.AspNet.Razor.TagHelpers.Valid_Inherited*, " + assemblyA, TagHelperDirectiveType.AddTagHelper) }, new [] @@ -504,10 +505,10 @@ namespace Microsoft.AspNet.Razor.Runtime.TagHelpers { CreateTagHelperDirectiveDescriptor("", TagHelperDirectiveType.TagHelperPrefix), CreateTagHelperDirectiveDescriptor( - "Microsoft.AspNet.Razor.Runtime.TagHelpers.Valid_Plain*, " + assemblyA, + "Microsoft.AspNet.Razor.TagHelpers.Valid_Plain*, " + assemblyA, TagHelperDirectiveType.AddTagHelper), CreateTagHelperDirectiveDescriptor( - "Microsoft.AspNet.Razor.Runtime.TagHelpers.Valid_Inherited*, " + assemblyA, + "Microsoft.AspNet.Razor.TagHelpers.Valid_Inherited*, " + assemblyA, TagHelperDirectiveType.AddTagHelper) }, new [] { Valid_PlainTagHelperDescriptor, Valid_InheritedTagHelperDescriptor } diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperDesignTimeDescriptorFactoryTest.cs b/test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperDesignTimeDescriptorFactoryTest.cs similarity index 98% rename from test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperDesignTimeDescriptorFactoryTest.cs rename to test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperDesignTimeDescriptorFactoryTest.cs index 7fe34e49ed..31d581c75c 100644 --- a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperDesignTimeDescriptorFactoryTest.cs +++ b/test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperDesignTimeDescriptorFactoryTest.cs @@ -6,6 +6,7 @@ using System; using System.IO; using System.Reflection; using Microsoft.AspNet.Razor.Compilation.TagHelpers; +using Microsoft.AspNet.Razor.TagHelpers; using Microsoft.AspNet.Razor.Test.Internal; using Microsoft.AspNet.Testing; using Moq; @@ -15,18 +16,18 @@ namespace Microsoft.AspNet.Razor.Runtime.TagHelpers { public class TagHelperDesignTimeDescriptorFactoryTest { - private const string TypeSummary = "The summary for ."; - private const string TypeRemarks = "Inherits from ."; - private const string PropertySummary = "This is of type ."; - private const string PropertyRemarks = "The may be null."; private const string PropertyWithSummaryAndRemarks_Summary = "This is a complex ."; private const string PropertyWithSummaryAndRemarks_Remarks = ""; // These test assemblies don't really exist. They are used to look up corresponding XML for a fake assembly diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperExecutionContextTest.cs b/test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperExecutionContextTest.cs similarity index 99% rename from test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperExecutionContextTest.cs rename to test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperExecutionContextTest.cs index b283a4dcfd..51a5cdf242 100644 --- a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperExecutionContextTest.cs +++ b/test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperExecutionContextTest.cs @@ -5,6 +5,7 @@ using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Microsoft.AspNet.Razor.TagHelpers; using Microsoft.Extensions.WebEncoders.Testing; using Xunit; diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperRunnerTest.cs b/test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperRunnerTest.cs similarity index 99% rename from test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperRunnerTest.cs rename to test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperRunnerTest.cs index 7fe662a710..2500e4c265 100644 --- a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperRunnerTest.cs +++ b/test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperRunnerTest.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.Threading.Tasks; +using Microsoft.AspNet.Razor.TagHelpers; using Xunit; namespace Microsoft.AspNet.Razor.Runtime.TagHelpers diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperScopeManagerTest.cs b/test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperScopeManagerTest.cs similarity index 98% rename from test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperScopeManagerTest.cs rename to test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperScopeManagerTest.cs index aff9500154..f70504271a 100644 --- a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperScopeManagerTest.cs +++ b/test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperScopeManagerTest.cs @@ -4,11 +4,10 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; -using Microsoft.AspNet.Razor.Runtime.TagHelpers; -using Microsoft.AspNet.Razor.Compilation.TagHelpers; +using Microsoft.AspNet.Razor.TagHelpers; using Xunit; -namespace Microsoft.AspNet.Razor.Runtime.Test.TagHelpers +namespace Microsoft.AspNet.Razor.Runtime.TagHelpers { public class TagHelperScopeManagerTest { diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperTypeResolverTest.cs b/test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperTypeResolverTest.cs similarity index 99% rename from test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperTypeResolverTest.cs rename to test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperTypeResolverTest.cs index d72266253f..bcdd56662f 100644 --- a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperTypeResolverTest.cs +++ b/test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperTypeResolverTest.cs @@ -6,6 +6,7 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; using System.Threading.Tasks; +using Microsoft.AspNet.Razor.TagHelpers; using Xunit; namespace Microsoft.AspNet.Razor.Runtime.TagHelpers diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TestTagHelpers/CommonTagHelpers.cs b/test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/TestTagHelpers/CommonTagHelpers.cs similarity index 97% rename from test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TestTagHelpers/CommonTagHelpers.cs rename to test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/TestTagHelpers/CommonTagHelpers.cs index 90f7cd5857..e355593951 100644 --- a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TestTagHelpers/CommonTagHelpers.cs +++ b/test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/TestTagHelpers/CommonTagHelpers.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; -namespace Microsoft.AspNet.Razor.Runtime.TagHelpers +namespace Microsoft.AspNet.Razor.TagHelpers { public class Valid_PlainTagHelper : TagHelper { diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TestTagHelpers/DoesNotImplementRealITagHelper.cs b/test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/TestTagHelpers/DoesNotImplementRealITagHelper.cs similarity index 100% rename from test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TestTagHelpers/DoesNotImplementRealITagHelper.cs rename to test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/TestTagHelpers/DoesNotImplementRealITagHelper.cs diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TestTagHelpers/IFakeTagHelper.cs b/test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/TestTagHelpers/IFakeTagHelper.cs similarity index 85% rename from test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TestTagHelpers/IFakeTagHelper.cs rename to test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/TestTagHelpers/IFakeTagHelper.cs index 1e9ef72e21..560b395b3c 100644 --- a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TestTagHelpers/IFakeTagHelper.cs +++ b/test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/TestTagHelpers/IFakeTagHelper.cs @@ -3,7 +3,7 @@ using System; using System.Threading.Tasks; -using Microsoft.AspNet.Razor.Runtime.TagHelpers; +using Microsoft.AspNet.Razor.TagHelpers; namespace Microsoft.AspNet.Razor.Fake { diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TestTagHelpers/ImplementsRealTagHelper.cs b/test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/TestTagHelpers/ImplementsRealTagHelper.cs similarity index 88% rename from test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TestTagHelpers/ImplementsRealTagHelper.cs rename to test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/TestTagHelpers/ImplementsRealTagHelper.cs index b7d3a21a54..15a2f9f345 100644 --- a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TestTagHelpers/ImplementsRealTagHelper.cs +++ b/test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/TestTagHelpers/ImplementsRealTagHelper.cs @@ -3,11 +3,11 @@ using System; using System.Threading.Tasks; -using Microsoft.AspNet.Razor.Runtime.TagHelpers; +using Microsoft.AspNet.Razor.TagHelpers; namespace Microsoft.AspNet.Razor.Fake { - public class ImplementsRealITagHelper : Microsoft.AspNet.Razor.Runtime.TagHelpers.ITagHelper + public class ImplementsRealITagHelper : Microsoft.AspNet.Razor.TagHelpers.ITagHelper { public int Order { diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TestTagHelpers/TagHelperDescriptorFactoryTagHelpers.cs b/test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/TestTagHelpers/TagHelperDescriptorFactoryTagHelpers.cs similarity index 99% rename from test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TestTagHelpers/TagHelperDescriptorFactoryTagHelpers.cs rename to test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/TestTagHelpers/TagHelperDescriptorFactoryTagHelpers.cs index 34c50f6489..ff2901de7b 100644 --- a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TestTagHelpers/TagHelperDescriptorFactoryTagHelpers.cs +++ b/test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/TestTagHelpers/TagHelperDescriptorFactoryTagHelpers.cs @@ -5,9 +5,9 @@ using System; using System.Collections.Generic; using System.ComponentModel; using System.Threading.Tasks; -using Microsoft.AspNet.Razor.Runtime.TagHelpers; +using Microsoft.AspNet.Razor.TagHelpers; -namespace Microsoft.AspNet.Razor.Runtime.TagHelpers +namespace Microsoft.AspNet.Razor.TagHelpers { [HtmlTargetElement("input", ParentTag = "div")] public class RequiredParentTagHelper : TagHelper diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TestTagHelpers/TestTypeInfo.cs b/test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/TestTagHelpers/TestTypeInfo.cs similarity index 100% rename from test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TestTagHelpers/TestTypeInfo.cs rename to test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/TestTagHelpers/TestTypeInfo.cs diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/XmlDocumentationProviderTest.cs b/test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/XmlDocumentationProviderTest.cs similarity index 93% rename from test/Microsoft.AspNet.Razor.Runtime.Test/XmlDocumentationProviderTest.cs rename to test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/XmlDocumentationProviderTest.cs index 384f166f37..8ed85d645b 100644 --- a/test/Microsoft.AspNet.Razor.Runtime.Test/XmlDocumentationProviderTest.cs +++ b/test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/XmlDocumentationProviderTest.cs @@ -6,10 +6,10 @@ using System; using System.Globalization; using System.IO; using System.Reflection; -using Microsoft.AspNet.Razor.Runtime.TagHelpers; +using Microsoft.AspNet.Razor.TagHelpers; using Xunit; -namespace Microsoft.AspNet.Razor.Runtime +namespace Microsoft.AspNet.Razor.Runtime.TagHelpers { public class XmlDocumentationProviderTest { @@ -41,12 +41,12 @@ namespace Microsoft.AspNet.Razor.Runtime { { $"T:{fullTypeName}", - "The summary for ." }, { $"P:{fullTypeName}.{DocumentedTagHelperSummaryPropertyInfo.Name}", - "This is of type ." }, { @@ -86,7 +86,7 @@ namespace Microsoft.AspNet.Razor.Runtime { { $"T:{fullTypeName}", - "Inherits from ." + "Inherits from ." }, { $"P:{fullTypeName}.{DocumentedTagHelperSummaryPropertyInfo.Name}", @@ -94,13 +94,13 @@ namespace Microsoft.AspNet.Razor.Runtime }, { $"P:{fullTypeName}.{DocumentedTagHelperRemarksPropertyInfo.Name}", - "The may be null." }, { $"P:{fullTypeName}.{DocumentedTagHelperRemarksSummaryPropertyInfo.Name}", - "" } }; diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/ReadOnlyTagHelperAttributeListTest.cs b/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/ReadOnlyTagHelperAttributeListTest.cs index 1655366eef..42e0bfbe6a 100644 --- a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/ReadOnlyTagHelperAttributeListTest.cs +++ b/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/ReadOnlyTagHelperAttributeListTest.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Linq; using Xunit; -namespace Microsoft.AspNet.Razor.Runtime.TagHelpers +namespace Microsoft.AspNet.Razor.TagHelpers { public class ReadOnlyTagHelperAttributeListTest { diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperAttributeListTest.cs b/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperAttributeListTest.cs index 543df5d3b0..6ccde11f05 100644 --- a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperAttributeListTest.cs +++ b/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperAttributeListTest.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Linq; using Xunit; -namespace Microsoft.AspNet.Razor.Runtime.TagHelpers +namespace Microsoft.AspNet.Razor.TagHelpers { public class TagHelperAttributeListTest { diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperAttributeTest.cs b/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperAttributeTest.cs index c7e469b6fb..ac4fe54288 100644 --- a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperAttributeTest.cs +++ b/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperAttributeTest.cs @@ -3,7 +3,7 @@ using Xunit; -namespace Microsoft.AspNet.Razor.Runtime.TagHelpers +namespace Microsoft.AspNet.Razor.TagHelpers { public class TagHelperAttributeTest { diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperContextTest.cs b/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperContextTest.cs index 378789b33d..8ba9269c77 100644 --- a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperContextTest.cs +++ b/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperContextTest.cs @@ -5,9 +5,10 @@ using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Microsoft.AspNet.Razor.Runtime.TagHelpers; using Xunit; -namespace Microsoft.AspNet.Razor.Runtime.TagHelpers +namespace Microsoft.AspNet.Razor.TagHelpers { public class TagHelperContextTest { diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperOutputTest.cs b/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperOutputTest.cs index eda081dd85..3f06c324c7 100644 --- a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperOutputTest.cs +++ b/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperOutputTest.cs @@ -4,7 +4,7 @@ using Microsoft.Extensions.WebEncoders.Testing; using Xunit; -namespace Microsoft.AspNet.Razor.Runtime.TagHelpers +namespace Microsoft.AspNet.Razor.TagHelpers { public class TagHelperOutputTest { diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/TestFiles/Localized/TagHelperDocumentation.nl-BE.xml b/test/Microsoft.AspNet.Razor.Runtime.Test/TestFiles/Localized/TagHelperDocumentation.nl-BE.xml index d9852c18d4..71046041df 100644 --- a/test/Microsoft.AspNet.Razor.Runtime.Test/TestFiles/Localized/TagHelperDocumentation.nl-BE.xml +++ b/test/Microsoft.AspNet.Razor.Runtime.Test/TestFiles/Localized/TagHelperDocumentation.nl-BE.xml @@ -4,30 +4,30 @@ Microsoft.AspNet.Razor.Runtime.Test - + - nl-BE: The summary for . + nl-BE: The summary for . - nl-BE: Inherits from . + nl-BE: Inherits from . - + - nl-BE: This is of type . + nl-BE: This is of type . - + - nl-BE: The may be null. + nl-BE: The may be null. - + nl-BE: This is a complex . - nl-BE: + nl-BE: diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/TestFiles/Localized/en-GB/TagHelperDocumentation.xml b/test/Microsoft.AspNet.Razor.Runtime.Test/TestFiles/Localized/en-GB/TagHelperDocumentation.xml index 55db1e096c..4e846c8a22 100644 --- a/test/Microsoft.AspNet.Razor.Runtime.Test/TestFiles/Localized/en-GB/TagHelperDocumentation.xml +++ b/test/Microsoft.AspNet.Razor.Runtime.Test/TestFiles/Localized/en-GB/TagHelperDocumentation.xml @@ -4,30 +4,30 @@ Microsoft.AspNet.Razor.Runtime.Test - + - en-GB: The summary for . + en-GB: The summary for . - en-GB: Inherits from . + en-GB: Inherits from . - + - en-GB: This is of type . + en-GB: This is of type . - + - en-GB: The may be null. + en-GB: The may be null. - + en-GB: This is a complex . - en-GB: + en-GB: diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/TestFiles/Localized/en/TagHelperDocumentation.xml b/test/Microsoft.AspNet.Razor.Runtime.Test/TestFiles/Localized/en/TagHelperDocumentation.xml index 60bfaa6c5e..28ca4de3b8 100644 --- a/test/Microsoft.AspNet.Razor.Runtime.Test/TestFiles/Localized/en/TagHelperDocumentation.xml +++ b/test/Microsoft.AspNet.Razor.Runtime.Test/TestFiles/Localized/en/TagHelperDocumentation.xml @@ -4,30 +4,30 @@ Microsoft.AspNet.Razor.Runtime.Test - + - en: The summary for . + en: The summary for . - en: Inherits from . + en: Inherits from . - + - en: This is of type . + en: This is of type . - + - en: The may be null. + en: The may be null. - + en: This is a complex . - en: + en: diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/TestFiles/Localized/fr-FR/TagHelperDocumentation.fr-FR.xml b/test/Microsoft.AspNet.Razor.Runtime.Test/TestFiles/Localized/fr-FR/TagHelperDocumentation.fr-FR.xml index fa0c2a3b6e..900df3806e 100644 --- a/test/Microsoft.AspNet.Razor.Runtime.Test/TestFiles/Localized/fr-FR/TagHelperDocumentation.fr-FR.xml +++ b/test/Microsoft.AspNet.Razor.Runtime.Test/TestFiles/Localized/fr-FR/TagHelperDocumentation.fr-FR.xml @@ -4,30 +4,30 @@ Microsoft.AspNet.Razor.Runtime.Test - + - fr-FR: The summary for . + fr-FR: The summary for . - fr-FR: Inherits from . + fr-FR: Inherits from . - + - fr-FR: This is of type . + fr-FR: This is of type . - + - fr-FR: The may be null. + fr-FR: The may be null. - + fr-FR: This is a complex . - fr-FR: + fr-FR: diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/TestFiles/Localized/fr/TagHelperDocumentation.fr.xml b/test/Microsoft.AspNet.Razor.Runtime.Test/TestFiles/Localized/fr/TagHelperDocumentation.fr.xml index 5c409f564f..99a699cc71 100644 --- a/test/Microsoft.AspNet.Razor.Runtime.Test/TestFiles/Localized/fr/TagHelperDocumentation.fr.xml +++ b/test/Microsoft.AspNet.Razor.Runtime.Test/TestFiles/Localized/fr/TagHelperDocumentation.fr.xml @@ -4,30 +4,30 @@ Microsoft.AspNet.Razor.Runtime.Test - + - fr: The summary for . + fr: The summary for . - fr: Inherits from . + fr: Inherits from . - + - fr: This is of type . + fr: This is of type . - + - fr: The may be null. + fr: The may be null. - + fr: This is a complex . - fr: + fr: diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/TestFiles/NotLocalized/TagHelperDocumentation.xml b/test/Microsoft.AspNet.Razor.Runtime.Test/TestFiles/NotLocalized/TagHelperDocumentation.xml index e79e17403f..cfdf292e50 100644 --- a/test/Microsoft.AspNet.Razor.Runtime.Test/TestFiles/NotLocalized/TagHelperDocumentation.xml +++ b/test/Microsoft.AspNet.Razor.Runtime.Test/TestFiles/NotLocalized/TagHelperDocumentation.xml @@ -4,30 +4,30 @@ Microsoft.AspNet.Razor.Runtime.Test - + - The summary for . + The summary for . - Inherits from . + Inherits from . - + - This is of type . + This is of type . - + - The may be null. + The may be null. - + This is a complex . - + diff --git a/test/Microsoft.AspNet.Razor.Test/CodeGenerators/CSharpTagHelperRenderingTest.cs b/test/Microsoft.AspNet.Razor.Test/CodeGenerators/CSharpTagHelperRenderingTest.cs index dc3744075a..96a34aa933 100644 --- a/test/Microsoft.AspNet.Razor.Test/CodeGenerators/CSharpTagHelperRenderingTest.cs +++ b/test/Microsoft.AspNet.Razor.Test/CodeGenerators/CSharpTagHelperRenderingTest.cs @@ -8,7 +8,7 @@ using System.Linq; using System.Reflection; #endif using Microsoft.AspNet.Razor.CodeGenerators; -using Microsoft.AspNet.Razor.Runtime.TagHelpers; +using Microsoft.AspNet.Razor.TagHelpers; using Microsoft.AspNet.Razor.Compilation.TagHelpers; using Xunit; @@ -505,18 +505,20 @@ namespace Microsoft.AspNet.Razor.Test.Generator DefaultPAndInputTagHelperDescriptors, new List { - BuildLineMapping(documentAbsoluteIndex: 14, - documentLineIndex: 0, - generatedAbsoluteIndex: 475, - generatedLineIndex: 15, - characterOffsetIndex: 14, - contentLength: 17), - BuildLineMapping(documentAbsoluteIndex: 63, - documentLineIndex: 2, - generatedAbsoluteIndex: 964, - generatedLineIndex: 34, - characterOffsetIndex: 28, - contentLength: 4) + BuildLineMapping( + documentAbsoluteIndex: 14, + documentLineIndex: 0, + generatedAbsoluteIndex: 421, + generatedLineIndex: 14, + characterOffsetIndex: 14, + contentLength: 17), + BuildLineMapping( + documentAbsoluteIndex: 63, + documentLineIndex: 2, + generatedAbsoluteIndex: 910, + generatedLineIndex: 33, + characterOffsetIndex: 28, + contentLength: 4), } }, { @@ -528,22 +530,22 @@ namespace Microsoft.AspNet.Razor.Test.Generator BuildLineMapping( documentAbsoluteIndex: 14, documentLineIndex: 0, - generatedAbsoluteIndex: 475, - generatedLineIndex: 15, + generatedAbsoluteIndex: 421, + generatedLineIndex: 14, characterOffsetIndex: 14, contentLength: 17), BuildLineMapping( documentAbsoluteIndex: 202, documentLineIndex: 5, - generatedAbsoluteIndex: 1226, - generatedLineIndex: 38, + generatedAbsoluteIndex: 1172, + generatedLineIndex: 37, characterOffsetIndex: 38, contentLength: 23), BuildLineMapping( documentAbsoluteIndex: 285, documentLineIndex: 6, - generatedAbsoluteIndex: 1709, - generatedLineIndex: 49, + generatedAbsoluteIndex: 1655, + generatedLineIndex: 48, characterOffsetIndex: 40, contentLength: 4), } @@ -557,22 +559,22 @@ namespace Microsoft.AspNet.Razor.Test.Generator BuildLineMapping( documentAbsoluteIndex: 17, documentLineIndex: 0, - generatedAbsoluteIndex: 496, - generatedLineIndex: 15, + generatedAbsoluteIndex: 442, + generatedLineIndex: 14, characterOffsetIndex: 17, contentLength: 5), BuildLineMapping( documentAbsoluteIndex: 38, documentLineIndex: 1, - generatedAbsoluteIndex: 655, - generatedLineIndex: 22, + generatedAbsoluteIndex: 601, + generatedLineIndex: 21, characterOffsetIndex: 14, contentLength: 17), BuildLineMapping( documentAbsoluteIndex: 226, documentLineIndex: 7, - generatedAbsoluteIndex: 1480, - generatedLineIndex: 46, + generatedAbsoluteIndex: 1426, + generatedLineIndex: 45, characterOffsetIndex: 43, contentLength: 4), } @@ -586,318 +588,318 @@ namespace Microsoft.AspNet.Razor.Test.Generator BuildLineMapping( documentAbsoluteIndex: 14, documentLineIndex: 0, - generatedAbsoluteIndex: 479, - generatedLineIndex: 15, + generatedAbsoluteIndex: 425, + generatedLineIndex: 14, characterOffsetIndex: 14, contentLength: 17), BuildLineMapping( documentAbsoluteIndex: 36, documentLineIndex: 2, documentCharacterOffsetIndex: 1, - generatedAbsoluteIndex: 1001, - generatedLineIndex: 35, + generatedAbsoluteIndex: 947, + generatedLineIndex: 34, generatedCharacterOffsetIndex: 0, contentLength: 48), BuildLineMapping( documentAbsoluteIndex: 211, documentLineIndex: 9, - generatedAbsoluteIndex: 1119, - generatedLineIndex: 44, + generatedAbsoluteIndex: 1065, + generatedLineIndex: 43, characterOffsetIndex: 0, contentLength: 12), BuildLineMapping( documentAbsoluteIndex: 224, documentLineIndex: 9, documentCharacterOffsetIndex: 13, - generatedAbsoluteIndex: 1215, - generatedLineIndex: 50, + generatedAbsoluteIndex: 1161, + generatedLineIndex: 49, generatedCharacterOffsetIndex: 12, contentLength: 27), BuildLineMapping( documentAbsoluteIndex: 352, documentLineIndex: 12, - generatedAbsoluteIndex: 1613, - generatedLineIndex: 62, + generatedAbsoluteIndex: 1559, + generatedLineIndex: 61, characterOffsetIndex: 0, contentLength: 48), BuildLineMapping( documentAbsoluteIndex: 446, documentLineIndex: 15, - generatedAbsoluteIndex: 1913, - generatedLineIndex: 72, + generatedAbsoluteIndex: 1859, + generatedLineIndex: 71, characterOffsetIndex: 46, contentLength: 8), BuildLineMapping( documentAbsoluteIndex: 463, documentLineIndex: 15, - generatedAbsoluteIndex: 2167, - generatedLineIndex: 79, + generatedAbsoluteIndex: 2113, + generatedLineIndex: 78, characterOffsetIndex: 63, contentLength: 4), BuildLineMapping( documentAbsoluteIndex: 507, documentLineIndex: 16, - generatedAbsoluteIndex: 2468, - generatedLineIndex: 87, + generatedAbsoluteIndex: 2414, + generatedLineIndex: 86, characterOffsetIndex: 31, contentLength: 30), BuildLineMapping( documentAbsoluteIndex: 574, documentLineIndex: 17, documentCharacterOffsetIndex: 30, - generatedAbsoluteIndex: 2846, - generatedLineIndex: 96, + generatedAbsoluteIndex: 2792, + generatedLineIndex: 95, generatedCharacterOffsetIndex: 29, contentLength: 10), BuildLineMapping( documentAbsoluteIndex: 606, documentLineIndex: 17, documentCharacterOffsetIndex: 62, - generatedAbsoluteIndex: 2989, - generatedLineIndex: 102, + generatedAbsoluteIndex: 2935, + generatedLineIndex: 101, generatedCharacterOffsetIndex: 61, contentLength: 1), BuildLineMapping( documentAbsoluteIndex: 607, documentLineIndex: 17, documentCharacterOffsetIndex: 63, - generatedAbsoluteIndex: 3124, - generatedLineIndex: 108, + generatedAbsoluteIndex: 3070, + generatedLineIndex: 107, generatedCharacterOffsetIndex: 62, contentLength: 8), BuildLineMapping( documentAbsoluteIndex: 637, documentLineIndex: 17, documentCharacterOffsetIndex: 93, - generatedAbsoluteIndex: 3295, - generatedLineIndex: 114, + generatedAbsoluteIndex: 3241, + generatedLineIndex: 113, generatedCharacterOffsetIndex: 91, contentLength: 1), BuildLineMapping( documentAbsoluteIndex: 638, documentLineIndex: 17, documentCharacterOffsetIndex: 94, - generatedAbsoluteIndex: 3460, - generatedLineIndex: 120, + generatedAbsoluteIndex: 3406, + generatedLineIndex: 119, generatedCharacterOffsetIndex: 92, contentLength: 1), BuildLineMapping( documentAbsoluteIndex: 643, documentLineIndex: 18, - generatedAbsoluteIndex: 3645, - generatedLineIndex: 128, + generatedAbsoluteIndex: 3591, + generatedLineIndex: 127, characterOffsetIndex: 0, contentLength: 15), BuildLineMapping( documentAbsoluteIndex: 163, documentLineIndex: 7, - generatedAbsoluteIndex: 3820, - generatedLineIndex: 135, + generatedAbsoluteIndex: 3766, + generatedLineIndex: 134, characterOffsetIndex: 32, contentLength: 12), BuildLineMapping( documentAbsoluteIndex: 769, documentLineIndex: 21, - generatedAbsoluteIndex: 3903, - generatedLineIndex: 140, + generatedAbsoluteIndex: 3849, + generatedLineIndex: 139, characterOffsetIndex: 0, contentLength: 12), BuildLineMapping( documentAbsoluteIndex: 783, documentLineIndex: 21, - generatedAbsoluteIndex: 4001, - generatedLineIndex: 146, + generatedAbsoluteIndex: 3947, + generatedLineIndex: 145, characterOffsetIndex: 14, contentLength: 21), BuildLineMapping( documentAbsoluteIndex: 836, documentLineIndex: 22, documentCharacterOffsetIndex: 29, - generatedAbsoluteIndex: 4258, - generatedLineIndex: 154, + generatedAbsoluteIndex: 4204, + generatedLineIndex: 153, generatedCharacterOffsetIndex: 28, contentLength: 1), BuildLineMapping( documentAbsoluteIndex: 837, documentLineIndex: 22, documentCharacterOffsetIndex: 30, - generatedAbsoluteIndex: 4259, - generatedLineIndex: 154, + generatedAbsoluteIndex: 4205, + generatedLineIndex: 153, generatedCharacterOffsetIndex: 29, contentLength: 7), BuildLineMapping( documentAbsoluteIndex: 844, documentLineIndex: 22, documentCharacterOffsetIndex: 37, - generatedAbsoluteIndex: 4266, - generatedLineIndex: 154, + generatedAbsoluteIndex: 4212, + generatedLineIndex: 153, generatedCharacterOffsetIndex: 36, contentLength: 1), BuildLineMapping( documentAbsoluteIndex: 711, documentLineIndex: 20, documentCharacterOffsetIndex: 39, - generatedAbsoluteIndex: 4435, - generatedLineIndex: 160, + generatedAbsoluteIndex: 4381, + generatedLineIndex: 159, generatedCharacterOffsetIndex: 38, contentLength: 23), BuildLineMapping( documentAbsoluteIndex: 734, documentLineIndex: 20, documentCharacterOffsetIndex: 62, - generatedAbsoluteIndex: 4458, - generatedLineIndex: 160, + generatedAbsoluteIndex: 4404, + generatedLineIndex: 159, generatedCharacterOffsetIndex: 61, contentLength: 7), BuildLineMapping( documentAbsoluteIndex: 976, documentLineIndex: 25, documentCharacterOffsetIndex: 61, - generatedAbsoluteIndex: 4732, - generatedLineIndex: 167, + generatedAbsoluteIndex: 4678, + generatedLineIndex: 166, generatedCharacterOffsetIndex: 60, contentLength: 1), BuildLineMapping( documentAbsoluteIndex: 977, documentLineIndex: 25, documentCharacterOffsetIndex: 62, - generatedAbsoluteIndex: 4733, - generatedLineIndex: 167, + generatedAbsoluteIndex: 4679, + generatedLineIndex: 166, generatedCharacterOffsetIndex: 61, contentLength: 30), BuildLineMapping( documentAbsoluteIndex: 1007, documentLineIndex: 25, documentCharacterOffsetIndex: 92, - generatedAbsoluteIndex: 4763, - generatedLineIndex: 167, + generatedAbsoluteIndex: 4709, + generatedLineIndex: 166, generatedCharacterOffsetIndex: 91, contentLength: 1), BuildLineMapping( documentAbsoluteIndex: 879, documentLineIndex: 24, documentCharacterOffsetIndex: 16, - generatedAbsoluteIndex: 4913, - generatedLineIndex: 173, + generatedAbsoluteIndex: 4859, + generatedLineIndex: 172, generatedCharacterOffsetIndex: 19, contentLength: 8), BuildLineMapping( documentAbsoluteIndex: 887, documentLineIndex: 24, documentCharacterOffsetIndex: 24, - generatedAbsoluteIndex: 4921, - generatedLineIndex: 173, + generatedAbsoluteIndex: 4867, + generatedLineIndex: 172, generatedCharacterOffsetIndex: 27, contentLength: 1), BuildLineMapping( documentAbsoluteIndex: 888, documentLineIndex: 24, documentCharacterOffsetIndex: 25, - generatedAbsoluteIndex: 4922, - generatedLineIndex: 173, + generatedAbsoluteIndex: 4868, + generatedLineIndex: 172, generatedCharacterOffsetIndex: 28, contentLength: 23), BuildLineMapping( documentAbsoluteIndex: 1106, documentLineIndex: 28, - generatedAbsoluteIndex: 5180, - generatedLineIndex: 180, + generatedAbsoluteIndex: 5126, + generatedLineIndex: 179, characterOffsetIndex: 28, contentLength: 30), BuildLineMapping( documentAbsoluteIndex: 1044, documentLineIndex: 27, documentCharacterOffsetIndex: 16, - generatedAbsoluteIndex: 5359, - generatedLineIndex: 186, + generatedAbsoluteIndex: 5305, + generatedLineIndex: 185, generatedCharacterOffsetIndex: 19, contentLength: 30), BuildLineMapping( documentAbsoluteIndex: 1234, documentLineIndex: 31, - generatedAbsoluteIndex: 5624, - generatedLineIndex: 193, + generatedAbsoluteIndex: 5570, + generatedLineIndex: 192, characterOffsetIndex: 28, contentLength: 3), BuildLineMapping( documentAbsoluteIndex: 1237, documentLineIndex: 31, - generatedAbsoluteIndex: 5627, - generatedLineIndex: 193, + generatedAbsoluteIndex: 5573, + generatedLineIndex: 192, characterOffsetIndex: 31, contentLength: 2), BuildLineMapping( documentAbsoluteIndex: 1239, documentLineIndex: 31, - generatedAbsoluteIndex: 5629, - generatedLineIndex: 193, + generatedAbsoluteIndex: 5575, + generatedLineIndex: 192, characterOffsetIndex: 33, contentLength: 27), BuildLineMapping( documentAbsoluteIndex: 1266, documentLineIndex: 31, - generatedAbsoluteIndex: 5656, - generatedLineIndex: 193, + generatedAbsoluteIndex: 5602, + generatedLineIndex: 192, characterOffsetIndex: 60, contentLength: 1), BuildLineMapping( documentAbsoluteIndex: 1267, documentLineIndex: 31, - generatedAbsoluteIndex: 5657, - generatedLineIndex: 193, + generatedAbsoluteIndex: 5603, + generatedLineIndex: 192, characterOffsetIndex: 61, contentLength: 10), BuildLineMapping( documentAbsoluteIndex: 1171, documentLineIndex: 30, documentCharacterOffsetIndex: 17, - generatedAbsoluteIndex: 5816, - generatedLineIndex: 199, + generatedAbsoluteIndex: 5762, + generatedLineIndex: 198, generatedCharacterOffsetIndex: 19, contentLength: 1), BuildLineMapping( documentAbsoluteIndex: 1172, documentLineIndex: 30, documentCharacterOffsetIndex: 18, - generatedAbsoluteIndex: 5817, - generatedLineIndex: 199, + generatedAbsoluteIndex: 5763, + generatedLineIndex: 198, generatedCharacterOffsetIndex: 20, contentLength: 29), BuildLineMapping( documentAbsoluteIndex: 1201, documentLineIndex: 30, documentCharacterOffsetIndex: 47, - generatedAbsoluteIndex: 5846, - generatedLineIndex: 199, + generatedAbsoluteIndex: 5792, + generatedLineIndex: 198, generatedCharacterOffsetIndex: 49, contentLength: 1), BuildLineMapping( documentAbsoluteIndex: 1306, documentLineIndex: 33, - generatedAbsoluteIndex: 5927, - generatedLineIndex: 204, + generatedAbsoluteIndex: 5873, + generatedLineIndex: 203, characterOffsetIndex: 9, contentLength: 11), BuildLineMapping( documentAbsoluteIndex: 1361, documentLineIndex: 33, documentCharacterOffsetIndex: 64, - generatedAbsoluteIndex: 6216, - generatedLineIndex: 208, + generatedAbsoluteIndex: 6162, + generatedLineIndex: 207, generatedCharacterOffsetIndex: 63, contentLength: 7), BuildLineMapping( documentAbsoluteIndex: 1326, documentLineIndex: 33, - generatedAbsoluteIndex: 6374, - generatedLineIndex: 214, + generatedAbsoluteIndex: 6320, + generatedLineIndex: 213, characterOffsetIndex: 29, contentLength: 3), BuildLineMapping( documentAbsoluteIndex: 1390, documentLineIndex: 35, - generatedAbsoluteIndex: 6489, - generatedLineIndex: 225, + generatedAbsoluteIndex: 6435, + generatedLineIndex: 224, characterOffsetIndex: 0, contentLength: 1), } @@ -911,31 +913,31 @@ namespace Microsoft.AspNet.Razor.Test.Generator BuildLineMapping( documentAbsoluteIndex: 14, documentLineIndex: 0, - generatedAbsoluteIndex: 493, - generatedLineIndex: 15, + generatedAbsoluteIndex: 439, + generatedLineIndex: 14, characterOffsetIndex: 14, contentLength: 11), BuildLineMapping( documentAbsoluteIndex: 62, documentLineIndex: 3, documentCharacterOffsetIndex: 26, - generatedAbsoluteIndex: 1289, - generatedLineIndex: 39, + generatedAbsoluteIndex: 1235, + generatedLineIndex: 38, generatedCharacterOffsetIndex: 28, contentLength: 0), BuildLineMapping( documentAbsoluteIndex: 122, documentLineIndex: 5, - generatedAbsoluteIndex: 1634, - generatedLineIndex: 48, + generatedAbsoluteIndex: 1580, + generatedLineIndex: 47, characterOffsetIndex: 30, contentLength: 0), BuildLineMapping( documentAbsoluteIndex: 88, documentLineIndex: 4, documentCharacterOffsetIndex: 12, - generatedAbsoluteIndex: 1789, - generatedLineIndex: 54, + generatedAbsoluteIndex: 1735, + generatedLineIndex: 53, generatedCharacterOffsetIndex: 19, contentLength: 0), } @@ -949,29 +951,29 @@ namespace Microsoft.AspNet.Razor.Test.Generator BuildLineMapping( documentAbsoluteIndex: 14, documentLineIndex: 0, - generatedAbsoluteIndex: 479, - generatedLineIndex: 15, + generatedAbsoluteIndex: 425, + generatedLineIndex: 14, characterOffsetIndex: 14, contentLength: 11), BuildLineMapping( documentAbsoluteIndex: 102, documentLineIndex: 3, - generatedAbsoluteIndex: 975, - generatedLineIndex: 34, + generatedAbsoluteIndex: 921, + generatedLineIndex: 33, characterOffsetIndex: 29, contentLength: 12), BuildLineMapping( documentAbsoluteIndex: 200, documentLineIndex: 5, - generatedAbsoluteIndex: 1244, - generatedLineIndex: 41, + generatedAbsoluteIndex: 1190, + generatedLineIndex: 40, characterOffsetIndex: 51, contentLength: 12), BuildLineMapping( documentAbsoluteIndex: 223, documentLineIndex: 5, - generatedAbsoluteIndex: 1512, - generatedLineIndex: 48, + generatedAbsoluteIndex: 1458, + generatedLineIndex: 47, characterOffsetIndex: 74, contentLength: 4), } @@ -985,22 +987,22 @@ namespace Microsoft.AspNet.Razor.Test.Generator BuildLineMapping( documentAbsoluteIndex: 14, documentLineIndex: 0, - generatedAbsoluteIndex: 501, - generatedLineIndex: 15, + generatedAbsoluteIndex: 447, + generatedLineIndex: 14, characterOffsetIndex: 14, contentLength: 14), BuildLineMapping( documentAbsoluteIndex: 186, documentLineIndex: 5, - generatedAbsoluteIndex: 1460, - generatedLineIndex: 41, + generatedAbsoluteIndex: 1406, + generatedLineIndex: 40, characterOffsetIndex: 36, contentLength: 4), BuildLineMapping( documentAbsoluteIndex: 232, documentLineIndex: 6, - generatedAbsoluteIndex: 1900, - generatedLineIndex: 51, + generatedAbsoluteIndex: 1846, + generatedLineIndex: 50, characterOffsetIndex: 36, contentLength: 4), } @@ -1014,87 +1016,87 @@ namespace Microsoft.AspNet.Razor.Test.Generator BuildLineMapping( documentAbsoluteIndex: 14, documentLineIndex: 0, - generatedAbsoluteIndex: 499, - generatedLineIndex: 15, + generatedAbsoluteIndex: 445, + generatedLineIndex: 14, characterOffsetIndex: 14, contentLength: 17), BuildLineMapping( documentAbsoluteIndex: 37, documentLineIndex: 2, - generatedAbsoluteIndex: 996, - generatedLineIndex: 34, + generatedAbsoluteIndex: 942, + generatedLineIndex: 33, characterOffsetIndex: 2, contentLength: 242), BuildLineMapping( documentAbsoluteIndex: 370, documentLineIndex: 15, - generatedAbsoluteIndex: 1499, - generatedLineIndex: 51, + generatedAbsoluteIndex: 1445, + generatedLineIndex: 50, characterOffsetIndex: 43, contentLength: 13), BuildLineMapping( documentAbsoluteIndex: 404, documentLineIndex: 15, - generatedAbsoluteIndex: 1766, - generatedLineIndex: 57, + generatedAbsoluteIndex: 1712, + generatedLineIndex: 56, characterOffsetIndex: 77, contentLength: 16), BuildLineMapping( documentAbsoluteIndex: 468, documentLineIndex: 16, - generatedAbsoluteIndex: 2146, - generatedLineIndex: 65, + generatedAbsoluteIndex: 2092, + generatedLineIndex: 64, characterOffsetIndex: 43, contentLength: 13), BuildLineMapping( documentAbsoluteIndex: 502, documentLineIndex: 16, - generatedAbsoluteIndex: 2413, - generatedLineIndex: 71, + generatedAbsoluteIndex: 2359, + generatedLineIndex: 70, characterOffsetIndex: 77, contentLength: 2), BuildLineMapping( documentAbsoluteIndex: 526, documentLineIndex: 16, - generatedAbsoluteIndex: 2713, - generatedLineIndex: 77, + generatedAbsoluteIndex: 2659, + generatedLineIndex: 76, characterOffsetIndex: 101, contentLength: 2), BuildLineMapping( documentAbsoluteIndex: 590, documentLineIndex: 18, documentCharacterOffsetIndex: 31, - generatedAbsoluteIndex: 3063, - generatedLineIndex: 85, + generatedAbsoluteIndex: 3009, + generatedLineIndex: 84, generatedCharacterOffsetIndex: 32, contentLength: 2), BuildLineMapping( documentAbsoluteIndex: 611, documentLineIndex: 18, - generatedAbsoluteIndex: 3295, - generatedLineIndex: 91, + generatedAbsoluteIndex: 3241, + generatedLineIndex: 90, characterOffsetIndex: 52, contentLength: 2), BuildLineMapping( documentAbsoluteIndex: 634, documentLineIndex: 18, - generatedAbsoluteIndex: 3565, - generatedLineIndex: 97, + generatedAbsoluteIndex: 3511, + generatedLineIndex: 96, characterOffsetIndex: 75, contentLength: 2), BuildLineMapping( documentAbsoluteIndex: 783, documentLineIndex: 20, - generatedAbsoluteIndex: 4178, - generatedLineIndex: 107, + generatedAbsoluteIndex: 4124, + generatedLineIndex: 106, characterOffsetIndex: 42, contentLength: 8), BuildLineMapping( documentAbsoluteIndex: 826, documentLineIndex: 21, documentCharacterOffsetIndex: 29, - generatedAbsoluteIndex: 4657, - generatedLineIndex: 116, + generatedAbsoluteIndex: 4603, + generatedLineIndex: 115, generatedCharacterOffsetIndex: 51, contentLength: 2), } @@ -1108,23 +1110,23 @@ namespace Microsoft.AspNet.Razor.Test.Generator BuildLineMapping( documentAbsoluteIndex: 14, documentLineIndex: 0, - generatedAbsoluteIndex: 501, - generatedLineIndex: 15, + generatedAbsoluteIndex: 447, + generatedLineIndex: 14, characterOffsetIndex: 14, contentLength: 17), BuildLineMapping( documentAbsoluteIndex: 146, documentLineIndex: 4, - generatedAbsoluteIndex: 1567, - generatedLineIndex: 43, + generatedAbsoluteIndex: 1513, + generatedLineIndex: 42, characterOffsetIndex: 34, contentLength: 4), BuildLineMapping( documentAbsoluteIndex: 43, documentLineIndex: 2, documentCharacterOffsetIndex: 8, - generatedAbsoluteIndex: 1730, - generatedLineIndex: 49, + generatedAbsoluteIndex: 1676, + generatedLineIndex: 48, generatedCharacterOffsetIndex: 19, contentLength: 1), } @@ -1138,222 +1140,222 @@ namespace Microsoft.AspNet.Razor.Test.Generator BuildLineMapping( documentAbsoluteIndex: 14, documentLineIndex: 0, - generatedAbsoluteIndex: 497, - generatedLineIndex: 15, + generatedAbsoluteIndex: 443, + generatedLineIndex: 14, characterOffsetIndex: 14, contentLength: 17), BuildLineMapping( documentAbsoluteIndex: 59, documentLineIndex: 2, - generatedAbsoluteIndex: 1020, - generatedLineIndex: 34, + generatedAbsoluteIndex: 966, + generatedLineIndex: 33, characterOffsetIndex: 24, contentLength: 12), BuildLineMapping( documentAbsoluteIndex: 96, documentLineIndex: 4, documentCharacterOffsetIndex: 17, - generatedAbsoluteIndex: 1194, - generatedLineIndex: 40, + generatedAbsoluteIndex: 1140, + generatedLineIndex: 39, generatedCharacterOffsetIndex: 16, contentLength: 12), BuildLineMapping( documentAbsoluteIndex: 109, documentLineIndex: 4, - generatedAbsoluteIndex: 1316, - generatedLineIndex: 46, + generatedAbsoluteIndex: 1262, + generatedLineIndex: 45, characterOffsetIndex: 30, contentLength: 12), BuildLineMapping( documentAbsoluteIndex: 121, documentLineIndex: 4, - generatedAbsoluteIndex: 1449, - generatedLineIndex: 51, + generatedAbsoluteIndex: 1395, + generatedLineIndex: 50, characterOffsetIndex: 42, contentLength: 10), BuildLineMapping( documentAbsoluteIndex: 132, documentLineIndex: 4, - generatedAbsoluteIndex: 1592, - generatedLineIndex: 57, + generatedAbsoluteIndex: 1538, + generatedLineIndex: 56, characterOffsetIndex: 53, contentLength: 5), BuildLineMapping( documentAbsoluteIndex: 137, documentLineIndex: 4, - generatedAbsoluteIndex: 1734, - generatedLineIndex: 62, + generatedAbsoluteIndex: 1680, + generatedLineIndex: 61, characterOffsetIndex: 58, contentLength: 2), BuildLineMapping( documentAbsoluteIndex: 176, documentLineIndex: 6, - generatedAbsoluteIndex: 1905, - generatedLineIndex: 69, + generatedAbsoluteIndex: 1851, + generatedLineIndex: 68, characterOffsetIndex: 22, contentLength: 12), BuildLineMapping( documentAbsoluteIndex: 214, documentLineIndex: 6, - generatedAbsoluteIndex: 2108, - generatedLineIndex: 75, + generatedAbsoluteIndex: 2054, + generatedLineIndex: 74, characterOffsetIndex: 60, contentLength: 12), BuildLineMapping( documentAbsoluteIndex: 256, documentLineIndex: 8, - generatedAbsoluteIndex: 2281, - generatedLineIndex: 81, + generatedAbsoluteIndex: 2227, + generatedLineIndex: 80, characterOffsetIndex: 15, contentLength: 13), BuildLineMapping( documentAbsoluteIndex: 271, documentLineIndex: 8, documentCharacterOffsetIndex: 30, - generatedAbsoluteIndex: 2402, - generatedLineIndex: 86, + generatedAbsoluteIndex: 2348, + generatedLineIndex: 85, generatedCharacterOffsetIndex: 29, contentLength: 12), BuildLineMapping( documentAbsoluteIndex: 284, documentLineIndex: 8, - generatedAbsoluteIndex: 2537, - generatedLineIndex: 92, + generatedAbsoluteIndex: 2483, + generatedLineIndex: 91, characterOffsetIndex: 43, contentLength: 12), BuildLineMapping( documentAbsoluteIndex: 296, documentLineIndex: 8, - generatedAbsoluteIndex: 2683, - generatedLineIndex: 97, + generatedAbsoluteIndex: 2629, + generatedLineIndex: 96, characterOffsetIndex: 55, contentLength: 10), BuildLineMapping( documentAbsoluteIndex: 307, documentLineIndex: 8, - generatedAbsoluteIndex: 2839, - generatedLineIndex: 103, + generatedAbsoluteIndex: 2785, + generatedLineIndex: 102, characterOffsetIndex: 66, contentLength: 5), BuildLineMapping( documentAbsoluteIndex: 312, documentLineIndex: 8, - generatedAbsoluteIndex: 2994, - generatedLineIndex: 108, + generatedAbsoluteIndex: 2940, + generatedLineIndex: 107, characterOffsetIndex: 71, contentLength: 2), BuildLineMapping( documentAbsoluteIndex: 316, documentLineIndex: 8, - generatedAbsoluteIndex: 3151, - generatedLineIndex: 114, + generatedAbsoluteIndex: 3097, + generatedLineIndex: 113, characterOffsetIndex: 75, contentLength: 12), BuildLineMapping( documentAbsoluteIndex: 348, documentLineIndex: 9, - generatedAbsoluteIndex: 3312, - generatedLineIndex: 120, + generatedAbsoluteIndex: 3258, + generatedLineIndex: 119, characterOffsetIndex: 17, contentLength: 13), BuildLineMapping( documentAbsoluteIndex: 363, documentLineIndex: 9, documentCharacterOffsetIndex: 32, - generatedAbsoluteIndex: 3436, - generatedLineIndex: 125, + generatedAbsoluteIndex: 3382, + generatedLineIndex: 124, generatedCharacterOffsetIndex: 31, contentLength: 12), BuildLineMapping( documentAbsoluteIndex: 376, documentLineIndex: 9, - generatedAbsoluteIndex: 3574, - generatedLineIndex: 131, + generatedAbsoluteIndex: 3520, + generatedLineIndex: 130, characterOffsetIndex: 45, contentLength: 12), BuildLineMapping( documentAbsoluteIndex: 388, documentLineIndex: 9, - generatedAbsoluteIndex: 3723, - generatedLineIndex: 136, + generatedAbsoluteIndex: 3669, + generatedLineIndex: 135, characterOffsetIndex: 57, contentLength: 10), BuildLineMapping( documentAbsoluteIndex: 399, documentLineIndex: 9, - generatedAbsoluteIndex: 3882, - generatedLineIndex: 142, + generatedAbsoluteIndex: 3828, + generatedLineIndex: 141, characterOffsetIndex: 68, contentLength: 5), BuildLineMapping( documentAbsoluteIndex: 404, documentLineIndex: 9, - generatedAbsoluteIndex: 4040, - generatedLineIndex: 147, + generatedAbsoluteIndex: 3986, + generatedLineIndex: 146, characterOffsetIndex: 73, contentLength: 2), BuildLineMapping( documentAbsoluteIndex: 408, documentLineIndex: 9, - generatedAbsoluteIndex: 4200, - generatedLineIndex: 153, + generatedAbsoluteIndex: 4146, + generatedLineIndex: 152, characterOffsetIndex: 77, contentLength: 12), BuildLineMapping( documentAbsoluteIndex: 445, documentLineIndex: 11, - generatedAbsoluteIndex: 4376, - generatedLineIndex: 159, + generatedAbsoluteIndex: 4322, + generatedLineIndex: 158, characterOffsetIndex: 17, contentLength: 13), BuildLineMapping( documentAbsoluteIndex: 460, documentLineIndex: 11, - generatedAbsoluteIndex: 4501, - generatedLineIndex: 164, + generatedAbsoluteIndex: 4447, + generatedLineIndex: 163, characterOffsetIndex: 32, contentLength: 12), BuildLineMapping( documentAbsoluteIndex: 492, documentLineIndex: 11, - generatedAbsoluteIndex: 4657, - generatedLineIndex: 169, + generatedAbsoluteIndex: 4603, + generatedLineIndex: 168, characterOffsetIndex: 64, contentLength: 12), BuildLineMapping( documentAbsoluteIndex: 529, documentLineIndex: 13, documentCharacterOffsetIndex: 17, - generatedAbsoluteIndex: 4832, - generatedLineIndex: 175, + generatedAbsoluteIndex: 4778, + generatedLineIndex: 174, generatedCharacterOffsetIndex: 16, contentLength: 12), BuildLineMapping( documentAbsoluteIndex: 542, documentLineIndex: 13, - generatedAbsoluteIndex: 4955, - generatedLineIndex: 181, + generatedAbsoluteIndex: 4901, + generatedLineIndex: 180, characterOffsetIndex: 30, contentLength: 12), BuildLineMapping( documentAbsoluteIndex: 554, documentLineIndex: 13, - generatedAbsoluteIndex: 5089, - generatedLineIndex: 186, + generatedAbsoluteIndex: 5035, + generatedLineIndex: 185, characterOffsetIndex: 42, contentLength: 10), BuildLineMapping( documentAbsoluteIndex: 565, documentLineIndex: 13, - generatedAbsoluteIndex: 5233, - generatedLineIndex: 192, + generatedAbsoluteIndex: 5179, + generatedLineIndex: 191, characterOffsetIndex: 53, contentLength: 5), BuildLineMapping( documentAbsoluteIndex: 570, documentLineIndex: 13, - generatedAbsoluteIndex: 5376, - generatedLineIndex: 197, + generatedAbsoluteIndex: 5322, + generatedLineIndex: 196, characterOffsetIndex: 58, contentLength: 2), } @@ -1367,124 +1369,124 @@ namespace Microsoft.AspNet.Razor.Test.Generator BuildLineMapping( documentAbsoluteIndex: 14, documentLineIndex: 0, - generatedAbsoluteIndex: 509, - generatedLineIndex: 15, + generatedAbsoluteIndex: 455, + generatedLineIndex: 14, characterOffsetIndex: 14, contentLength: 17), BuildLineMapping( documentAbsoluteIndex: 35, documentLineIndex: 1, - generatedAbsoluteIndex: 947, - generatedLineIndex: 33, + generatedAbsoluteIndex: 893, + generatedLineIndex: 32, characterOffsetIndex: 2, contentLength: 59), BuildLineMapping( documentAbsoluteIndex: 122, documentLineIndex: 6, - generatedAbsoluteIndex: 1172, - generatedLineIndex: 42, + generatedAbsoluteIndex: 1118, + generatedLineIndex: 41, characterOffsetIndex: 23, contentLength: 4), BuildLineMapping( documentAbsoluteIndex: 157, documentLineIndex: 7, - generatedAbsoluteIndex: 1332, - generatedLineIndex: 48, + generatedAbsoluteIndex: 1278, + generatedLineIndex: 47, characterOffsetIndex: 12, contentLength: 6), BuildLineMapping( documentAbsoluteIndex: 171, documentLineIndex: 7, - generatedAbsoluteIndex: 1449, - generatedLineIndex: 53, + generatedAbsoluteIndex: 1395, + generatedLineIndex: 52, characterOffsetIndex: 26, contentLength: 2), BuildLineMapping( documentAbsoluteIndex: 202, documentLineIndex: 8, - generatedAbsoluteIndex: 1616, - generatedLineIndex: 59, + generatedAbsoluteIndex: 1562, + generatedLineIndex: 58, characterOffsetIndex: 21, contentLength: 5), BuildLineMapping( documentAbsoluteIndex: 207, documentLineIndex: 8, - generatedAbsoluteIndex: 1621, - generatedLineIndex: 59, + generatedAbsoluteIndex: 1567, + generatedLineIndex: 58, characterOffsetIndex: 26, contentLength: 1), BuildLineMapping( documentAbsoluteIndex: 208, documentLineIndex: 8, - generatedAbsoluteIndex: 1622, - generatedLineIndex: 59, + generatedAbsoluteIndex: 1568, + generatedLineIndex: 58, characterOffsetIndex: 27, contentLength: 3), BuildLineMapping( documentAbsoluteIndex: 241, documentLineIndex: 9, documentCharacterOffsetIndex: 22, - generatedAbsoluteIndex: 1791, - generatedLineIndex: 65, + generatedAbsoluteIndex: 1737, + generatedLineIndex: 64, generatedCharacterOffsetIndex: 21, contentLength: 3), BuildLineMapping( documentAbsoluteIndex: 274, documentLineIndex: 10, documentCharacterOffsetIndex: 22, - generatedAbsoluteIndex: 1960, - generatedLineIndex: 71, + generatedAbsoluteIndex: 1906, + generatedLineIndex: 70, generatedCharacterOffsetIndex: 21, contentLength: 1), BuildLineMapping( documentAbsoluteIndex: 275, documentLineIndex: 10, documentCharacterOffsetIndex: 23, - generatedAbsoluteIndex: 1961, - generatedLineIndex: 71, + generatedAbsoluteIndex: 1907, + generatedLineIndex: 70, generatedCharacterOffsetIndex: 22, contentLength: 4), BuildLineMapping( documentAbsoluteIndex: 279, documentLineIndex: 10, documentCharacterOffsetIndex: 27, - generatedAbsoluteIndex: 1965, - generatedLineIndex: 71, + generatedAbsoluteIndex: 1911, + generatedLineIndex: 70, generatedCharacterOffsetIndex: 26, contentLength: 1), BuildLineMapping( documentAbsoluteIndex: 307, documentLineIndex: 11, - generatedAbsoluteIndex: 2130, - generatedLineIndex: 77, + generatedAbsoluteIndex: 2076, + generatedLineIndex: 76, characterOffsetIndex: 19, contentLength: 6), BuildLineMapping( documentAbsoluteIndex: 321, documentLineIndex: 11, - generatedAbsoluteIndex: 2255, - generatedLineIndex: 82, + generatedAbsoluteIndex: 2201, + generatedLineIndex: 81, characterOffsetIndex: 33, contentLength: 4), BuildLineMapping( documentAbsoluteIndex: 325, documentLineIndex: 11, - generatedAbsoluteIndex: 2259, - generatedLineIndex: 82, + generatedAbsoluteIndex: 2205, + generatedLineIndex: 81, characterOffsetIndex: 37, contentLength: 2), BuildLineMapping( documentAbsoluteIndex: 327, documentLineIndex: 11, - generatedAbsoluteIndex: 2261, - generatedLineIndex: 82, + generatedAbsoluteIndex: 2207, + generatedLineIndex: 81, characterOffsetIndex: 39, contentLength: 8), BuildLineMapping( documentAbsoluteIndex: 335, documentLineIndex: 11, - generatedAbsoluteIndex: 2269, - generatedLineIndex: 82, + generatedAbsoluteIndex: 2215, + generatedLineIndex: 81, characterOffsetIndex: 47, contentLength: 1), } @@ -1498,44 +1500,44 @@ namespace Microsoft.AspNet.Razor.Test.Generator BuildLineMapping( documentAbsoluteIndex: 14, documentLineIndex: 0, - generatedAbsoluteIndex: 495, - generatedLineIndex: 15, + generatedAbsoluteIndex: 441, + generatedLineIndex: 14, characterOffsetIndex: 14, contentLength: 17), BuildLineMapping( documentAbsoluteIndex: 182, documentLineIndex: 5, - generatedAbsoluteIndex: 1033, - generatedLineIndex: 35, + generatedAbsoluteIndex: 979, + generatedLineIndex: 34, characterOffsetIndex: 0, contentLength: 12), BuildLineMapping( documentAbsoluteIndex: 195, documentLineIndex: 5, documentCharacterOffsetIndex: 13, - generatedAbsoluteIndex: 1136, - generatedLineIndex: 41, + generatedAbsoluteIndex: 1082, + generatedLineIndex: 40, generatedCharacterOffsetIndex: 12, contentLength: 30), BuildLineMapping( documentAbsoluteIndex: 339, documentLineIndex: 7, - generatedAbsoluteIndex: 1429, - generatedLineIndex: 49, + generatedAbsoluteIndex: 1375, + generatedLineIndex: 48, characterOffsetIndex: 50, contentLength: 23), BuildLineMapping( documentAbsoluteIndex: 389, documentLineIndex: 7, - generatedAbsoluteIndex: 1736, - generatedLineIndex: 56, + generatedAbsoluteIndex: 1682, + generatedLineIndex: 55, characterOffsetIndex: 100, contentLength: 4), BuildLineMapping( documentAbsoluteIndex: 424, documentLineIndex: 9, - generatedAbsoluteIndex: 1819, - generatedLineIndex: 61, + generatedAbsoluteIndex: 1765, + generatedLineIndex: 60, characterOffsetIndex: 0, contentLength: 15), } @@ -1549,40 +1551,40 @@ namespace Microsoft.AspNet.Razor.Test.Generator BuildLineMapping( documentAbsoluteIndex: 14, documentLineIndex: 0, - generatedAbsoluteIndex: 487, - generatedLineIndex: 15, + generatedAbsoluteIndex: 433, + generatedLineIndex: 14, characterOffsetIndex: 14, contentLength: 9), BuildLineMapping( documentAbsoluteIndex: 296, documentLineIndex: 11, documentCharacterOffsetIndex: 18, - generatedAbsoluteIndex: 1013, - generatedLineIndex: 34, + generatedAbsoluteIndex: 959, + generatedLineIndex: 33, generatedCharacterOffsetIndex: 32, contentLength: 5), BuildLineMapping( documentAbsoluteIndex: 345, documentLineIndex: 12, documentCharacterOffsetIndex: 20, - generatedAbsoluteIndex: 1199, - generatedLineIndex: 40, + generatedAbsoluteIndex: 1145, + generatedLineIndex: 39, generatedCharacterOffsetIndex: 33, contentLength: 5), BuildLineMapping( documentAbsoluteIndex: 399, documentLineIndex: 13, documentCharacterOffsetIndex: 23, - generatedAbsoluteIndex: 1381, - generatedLineIndex: 46, + generatedAbsoluteIndex: 1327, + generatedLineIndex: 45, generatedCharacterOffsetIndex: 29, contentLength: 13), BuildLineMapping( documentAbsoluteIndex: 481, documentLineIndex: 14, documentCharacterOffsetIndex: 24, - generatedAbsoluteIndex: 1571, - generatedLineIndex: 52, + generatedAbsoluteIndex: 1517, + generatedLineIndex: 51, generatedCharacterOffsetIndex: 29, contentLength: 13), } diff --git a/test/Microsoft.AspNet.Razor.Test/CodeGenerators/CSharpTagHelperRenderingUnitTest.cs b/test/Microsoft.AspNet.Razor.Test/CodeGenerators/CSharpTagHelperRenderingUnitTest.cs index 62f237ab67..eccec72aad 100644 --- a/test/Microsoft.AspNet.Razor.Test/CodeGenerators/CSharpTagHelperRenderingUnitTest.cs +++ b/test/Microsoft.AspNet.Razor.Test/CodeGenerators/CSharpTagHelperRenderingUnitTest.cs @@ -6,7 +6,7 @@ using Microsoft.AspNet.Razor.CodeGenerators; using Microsoft.AspNet.Razor.CodeGenerators.Visitors; using Microsoft.AspNet.Razor.Parser.SyntaxTree; using Microsoft.AspNet.Razor.Parser.TagHelpers; -using Microsoft.AspNet.Razor.Runtime.TagHelpers; +using Microsoft.AspNet.Razor.TagHelpers; using Microsoft.AspNet.Razor.Compilation.TagHelpers; using Xunit; diff --git a/test/Microsoft.AspNet.Razor.Test/CodeGenerators/TagHelperAttributeValueCodeRendererTest.cs b/test/Microsoft.AspNet.Razor.Test/CodeGenerators/TagHelperAttributeValueCodeRendererTest.cs index 196d059c58..0fe4b2fe0d 100644 --- a/test/Microsoft.AspNet.Razor.Test/CodeGenerators/TagHelperAttributeValueCodeRendererTest.cs +++ b/test/Microsoft.AspNet.Razor.Test/CodeGenerators/TagHelperAttributeValueCodeRendererTest.cs @@ -7,7 +7,7 @@ using System.Reflection; #endif using Microsoft.AspNet.Razor.CodeGenerators; using Microsoft.AspNet.Razor.CodeGenerators.Visitors; -using Microsoft.AspNet.Razor.Runtime.TagHelpers; +using Microsoft.AspNet.Razor.TagHelpers; using Microsoft.AspNet.Razor.Compilation.TagHelpers; using Xunit; diff --git a/test/Microsoft.AspNet.Razor.Test/Editor/RazorEditorParserTest.cs b/test/Microsoft.AspNet.Razor.Test/Editor/RazorEditorParserTest.cs index 19c82eef6c..169c187600 100644 --- a/test/Microsoft.AspNet.Razor.Test/Editor/RazorEditorParserTest.cs +++ b/test/Microsoft.AspNet.Razor.Test/Editor/RazorEditorParserTest.cs @@ -7,7 +7,7 @@ using System.Web.WebPages.TestUtils; using Microsoft.AspNet.Razor.Editor; using Microsoft.AspNet.Razor.Parser; using Microsoft.AspNet.Razor.Parser.SyntaxTree; -using Microsoft.AspNet.Razor.Runtime.TagHelpers; +using Microsoft.AspNet.Razor.TagHelpers; using Microsoft.AspNet.Razor.Test.Framework; using Microsoft.AspNet.Razor.Test.Generator; using Microsoft.AspNet.Razor.Test.Utils; diff --git a/test/Microsoft.AspNet.Razor.Test/Framework/BlockFactory.cs b/test/Microsoft.AspNet.Razor.Test/Framework/BlockFactory.cs index 73435ea3dc..cbe4a3a0cd 100644 --- a/test/Microsoft.AspNet.Razor.Test/Framework/BlockFactory.cs +++ b/test/Microsoft.AspNet.Razor.Test/Framework/BlockFactory.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using Microsoft.AspNet.Razor.Parser.SyntaxTree; using Microsoft.AspNet.Razor.Parser.TagHelpers; -using Microsoft.AspNet.Razor.Runtime.TagHelpers; +using Microsoft.AspNet.Razor.TagHelpers; namespace Microsoft.AspNet.Razor.Test.Framework { diff --git a/test/Microsoft.AspNet.Razor.Test/Framework/BlockTypes.cs b/test/Microsoft.AspNet.Razor.Test/Framework/BlockTypes.cs index 454b451f75..37b2994059 100644 --- a/test/Microsoft.AspNet.Razor.Test/Framework/BlockTypes.cs +++ b/test/Microsoft.AspNet.Razor.Test/Framework/BlockTypes.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using Microsoft.AspNet.Razor.Chunks.Generators; using Microsoft.AspNet.Razor.Parser.SyntaxTree; using Microsoft.AspNet.Razor.Parser.TagHelpers; -using Microsoft.AspNet.Razor.Runtime.TagHelpers; +using Microsoft.AspNet.Razor.TagHelpers; namespace Microsoft.AspNet.Razor.Test.Framework { diff --git a/test/Microsoft.AspNet.Razor.Test/Framework/ParserTestBase.cs b/test/Microsoft.AspNet.Razor.Test/Framework/ParserTestBase.cs index a0670603ed..cf7aa6479b 100644 --- a/test/Microsoft.AspNet.Razor.Test/Framework/ParserTestBase.cs +++ b/test/Microsoft.AspNet.Razor.Test/Framework/ParserTestBase.cs @@ -10,7 +10,7 @@ using Microsoft.AspNet.Razor.Chunks.Generators; using Microsoft.AspNet.Razor.Parser; using Microsoft.AspNet.Razor.Parser.SyntaxTree; using Microsoft.AspNet.Razor.Parser.TagHelpers; -using Microsoft.AspNet.Razor.Runtime.TagHelpers; +using Microsoft.AspNet.Razor.TagHelpers; using Microsoft.AspNet.Razor.Text; using Xunit; diff --git a/test/Microsoft.AspNet.Razor.Test/Parser/TagHelperBlockTest.cs b/test/Microsoft.AspNet.Razor.Test/Parser/TagHelperBlockTest.cs index 84fcef89ee..ba785cf9d0 100644 --- a/test/Microsoft.AspNet.Razor.Test/Parser/TagHelperBlockTest.cs +++ b/test/Microsoft.AspNet.Razor.Test/Parser/TagHelperBlockTest.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using Microsoft.AspNet.Razor.Parser.SyntaxTree; -using Microsoft.AspNet.Razor.Runtime.TagHelpers; +using Microsoft.AspNet.Razor.TagHelpers; using Microsoft.AspNet.Razor.Test.Framework; using Xunit; diff --git a/test/Microsoft.AspNet.Razor.Test/TagHelpers/TagHelperBlockRewriterTest.cs b/test/Microsoft.AspNet.Razor.Test/TagHelpers/TagHelperBlockRewriterTest.cs index d379e6f0c9..25bade97a5 100644 --- a/test/Microsoft.AspNet.Razor.Test/TagHelpers/TagHelperBlockRewriterTest.cs +++ b/test/Microsoft.AspNet.Razor.Test/TagHelpers/TagHelperBlockRewriterTest.cs @@ -8,7 +8,7 @@ using System.Linq; using Microsoft.AspNet.Razor.Chunks.Generators; using Microsoft.AspNet.Razor.Parser; using Microsoft.AspNet.Razor.Parser.SyntaxTree; -using Microsoft.AspNet.Razor.Runtime.TagHelpers; +using Microsoft.AspNet.Razor.TagHelpers; using Microsoft.AspNet.Razor.Test.Framework; using Microsoft.AspNet.Razor.Test.TagHelpers; using Microsoft.AspNet.Razor.Text; diff --git a/test/Microsoft.AspNet.Razor.Test/TagHelpers/TagHelperDescriptorProviderTest.cs b/test/Microsoft.AspNet.Razor.Test/TagHelpers/TagHelperDescriptorProviderTest.cs index 763fa88428..0ae4a3b428 100644 --- a/test/Microsoft.AspNet.Razor.Test/TagHelpers/TagHelperDescriptorProviderTest.cs +++ b/test/Microsoft.AspNet.Razor.Test/TagHelpers/TagHelperDescriptorProviderTest.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; -using Microsoft.AspNet.Razor.Runtime.TagHelpers; +using Microsoft.AspNet.Razor.TagHelpers; using Microsoft.AspNet.Razor.Test.Internal; using Xunit; diff --git a/test/Microsoft.AspNet.Razor.Test/TagHelpers/TagHelperDescriptorTest.cs b/test/Microsoft.AspNet.Razor.Test/TagHelpers/TagHelperDescriptorTest.cs index 2ac226ba6a..454cb073de 100644 --- a/test/Microsoft.AspNet.Razor.Test/TagHelpers/TagHelperDescriptorTest.cs +++ b/test/Microsoft.AspNet.Razor.Test/TagHelpers/TagHelperDescriptorTest.cs @@ -3,7 +3,7 @@ using System; using System.Linq; -using Microsoft.AspNet.Razor.Runtime.TagHelpers; +using Microsoft.AspNet.Razor.TagHelpers; using Microsoft.AspNet.Razor.Test.Internal; using Newtonsoft.Json; using Xunit; diff --git a/test/Microsoft.AspNet.Razor.Test/TagHelpers/TagHelperParseTreeRewriterTest.cs b/test/Microsoft.AspNet.Razor.Test/TagHelpers/TagHelperParseTreeRewriterTest.cs index 13606e4808..2d04f4f0c3 100644 --- a/test/Microsoft.AspNet.Razor.Test/TagHelpers/TagHelperParseTreeRewriterTest.cs +++ b/test/Microsoft.AspNet.Razor.Test/TagHelpers/TagHelperParseTreeRewriterTest.cs @@ -8,7 +8,7 @@ using System.Linq; using Microsoft.AspNet.Razor.Chunks.Generators; using Microsoft.AspNet.Razor.Parser; using Microsoft.AspNet.Razor.Parser.SyntaxTree; -using Microsoft.AspNet.Razor.Runtime.TagHelpers; +using Microsoft.AspNet.Razor.TagHelpers; using Microsoft.AspNet.Razor.Compilation.TagHelpers; using Microsoft.AspNet.Razor.Test.Framework; using Microsoft.AspNet.Razor.Text; diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/AttributeTargetingTagHelpers.DesignTime.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/AttributeTargetingTagHelpers.DesignTime.cs index 881ec9204b..1089d2acc0 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/AttributeTargetingTagHelpers.DesignTime.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/AttributeTargetingTagHelpers.DesignTime.cs @@ -1,6 +1,5 @@ namespace TestOutput { - using Microsoft.AspNet.Razor.Runtime.TagHelpers; using System; using System.Threading.Tasks; diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/AttributeTargetingTagHelpers.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/AttributeTargetingTagHelpers.cs index 88b3f9feed..4bbde1ebf4 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/AttributeTargetingTagHelpers.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/AttributeTargetingTagHelpers.cs @@ -1,6 +1,7 @@ #pragma checksum "AttributeTargetingTagHelpers.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "edaa271f830648a99892d01bb55f49e328fa621c" namespace TestOutput { + using Microsoft.AspNet.Razor.TagHelpers; using Microsoft.AspNet.Razor.Runtime.TagHelpers; using System; using System.Threading.Tasks; diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.CustomAttributeCodeGenerator.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.CustomAttributeCodeGenerator.cs index 5a616ebf7e..401700404b 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.CustomAttributeCodeGenerator.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.CustomAttributeCodeGenerator.cs @@ -1,6 +1,7 @@ #pragma checksum "BasicTagHelpers.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "3cdbdfa1515b87565e2f00812f0093dbe8e49667" namespace TestOutput { + using Microsoft.AspNet.Razor.TagHelpers; using Microsoft.AspNet.Razor.Runtime.TagHelpers; using System.Threading.Tasks; diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.DesignTime.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.DesignTime.cs index 192b6c04ce..9725c15ff0 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.DesignTime.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.DesignTime.cs @@ -1,6 +1,5 @@ namespace TestOutput { - using Microsoft.AspNet.Razor.Runtime.TagHelpers; using System; using System.Threading.Tasks; diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.Prefixed.DesignTime.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.Prefixed.DesignTime.cs index 18306d1af9..73e5d28fa9 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.Prefixed.DesignTime.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.Prefixed.DesignTime.cs @@ -1,6 +1,5 @@ namespace TestOutput { - using Microsoft.AspNet.Razor.Runtime.TagHelpers; using System; using System.Threading.Tasks; diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.Prefixed.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.Prefixed.cs index 836e3e297d..7460887e16 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.Prefixed.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.Prefixed.cs @@ -1,6 +1,7 @@ #pragma checksum "BasicTagHelpers.Prefixed.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "44eafd8ba2adb5f9e260d37e87544c018e182eed" namespace TestOutput { + using Microsoft.AspNet.Razor.TagHelpers; using Microsoft.AspNet.Razor.Runtime.TagHelpers; using System; using System.Threading.Tasks; diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.cs index 2e0b341bad..9690999ceb 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.cs @@ -1,6 +1,7 @@ #pragma checksum "BasicTagHelpers.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "3cdbdfa1515b87565e2f00812f0093dbe8e49667" namespace TestOutput { + using Microsoft.AspNet.Razor.TagHelpers; using Microsoft.AspNet.Razor.Runtime.TagHelpers; using System; using System.Threading.Tasks; diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/ComplexTagHelpers.DesignTime.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/ComplexTagHelpers.DesignTime.cs index 2a6877f9c8..a7ed2ecb77 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/ComplexTagHelpers.DesignTime.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/ComplexTagHelpers.DesignTime.cs @@ -1,6 +1,5 @@ namespace TestOutput { - using Microsoft.AspNet.Razor.Runtime.TagHelpers; using System; using System.Threading.Tasks; diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/ComplexTagHelpers.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/ComplexTagHelpers.cs index 3c48947d9e..b21b01a659 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/ComplexTagHelpers.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/ComplexTagHelpers.cs @@ -1,6 +1,7 @@ #pragma checksum "ComplexTagHelpers.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "7e06587198159a7cdea48c42e64a766a79a12cf7" namespace TestOutput { + using Microsoft.AspNet.Razor.TagHelpers; using Microsoft.AspNet.Razor.Runtime.TagHelpers; using System; using System.Threading.Tasks; diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/DuplicateAttributeTagHelpers.DesignTime.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/DuplicateAttributeTagHelpers.DesignTime.cs index cec5d58b62..c1858d16c6 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/DuplicateAttributeTagHelpers.DesignTime.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/DuplicateAttributeTagHelpers.DesignTime.cs @@ -1,6 +1,5 @@ namespace TestOutput { - using Microsoft.AspNet.Razor.Runtime.TagHelpers; using System; using System.Threading.Tasks; diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/DuplicateAttributeTagHelpers.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/DuplicateAttributeTagHelpers.cs index e772c2d79d..f01a88799d 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/DuplicateAttributeTagHelpers.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/DuplicateAttributeTagHelpers.cs @@ -1,6 +1,7 @@ #pragma checksum "DuplicateAttributeTagHelpers.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "af64a6adaf73e4143024a1145e70cbd3a24d2c0e" namespace TestOutput { + using Microsoft.AspNet.Razor.TagHelpers; using Microsoft.AspNet.Razor.Runtime.TagHelpers; using System; using System.Threading.Tasks; diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/DuplicateTargetTagHelper.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/DuplicateTargetTagHelper.cs index a286cf0e0d..6fe8c17706 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/DuplicateTargetTagHelper.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/DuplicateTargetTagHelper.cs @@ -1,6 +1,7 @@ #pragma checksum "DuplicateTargetTagHelper.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "77e70e938d77f71e489354b1e7c351c588001690" namespace TestOutput { + using Microsoft.AspNet.Razor.TagHelpers; using Microsoft.AspNet.Razor.Runtime.TagHelpers; using System; using System.Threading.Tasks; diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/DynamicAttributeTagHelpers.DesignTime.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/DynamicAttributeTagHelpers.DesignTime.cs index cfb4bdfbb4..f9fcd9c1ce 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/DynamicAttributeTagHelpers.DesignTime.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/DynamicAttributeTagHelpers.DesignTime.cs @@ -1,6 +1,5 @@ namespace TestOutput { - using Microsoft.AspNet.Razor.Runtime.TagHelpers; using System; using System.Threading.Tasks; diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/DynamicAttributeTagHelpers.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/DynamicAttributeTagHelpers.cs index d6e87f0ec3..9624c5e9c3 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/DynamicAttributeTagHelpers.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/DynamicAttributeTagHelpers.cs @@ -1,6 +1,7 @@ #pragma checksum "DynamicAttributeTagHelpers.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "782463195265ee647cc2fc63fd5095a80090845b" namespace TestOutput { + using Microsoft.AspNet.Razor.TagHelpers; using Microsoft.AspNet.Razor.Runtime.TagHelpers; using System; using System.Threading.Tasks; diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EmptyAttributeTagHelpers.DesignTime.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EmptyAttributeTagHelpers.DesignTime.cs index 8dd7632564..fbc227b466 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EmptyAttributeTagHelpers.DesignTime.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EmptyAttributeTagHelpers.DesignTime.cs @@ -1,6 +1,5 @@ namespace TestOutput { - using Microsoft.AspNet.Razor.Runtime.TagHelpers; using System; using System.Threading.Tasks; diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EmptyAttributeTagHelpers.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EmptyAttributeTagHelpers.cs index 5aacde518f..683a61c8ca 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EmptyAttributeTagHelpers.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EmptyAttributeTagHelpers.cs @@ -1,6 +1,7 @@ #pragma checksum "EmptyAttributeTagHelpers.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "cdf68f4aae781fadf4445e465c23df6d758fcd81" namespace TestOutput { + using Microsoft.AspNet.Razor.TagHelpers; using Microsoft.AspNet.Razor.Runtime.TagHelpers; using System; using System.Threading.Tasks; diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EscapedTagHelpers.DesignTime.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EscapedTagHelpers.DesignTime.cs index 167dbfd76e..9f43d11471 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EscapedTagHelpers.DesignTime.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EscapedTagHelpers.DesignTime.cs @@ -1,6 +1,5 @@ namespace TestOutput { - using Microsoft.AspNet.Razor.Runtime.TagHelpers; using System; using System.Threading.Tasks; diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EscapedTagHelpers.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EscapedTagHelpers.cs index b8602417d6..31aa633b08 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EscapedTagHelpers.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EscapedTagHelpers.cs @@ -1,6 +1,7 @@ #pragma checksum "EscapedTagHelpers.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "dcdd88b4f52fa03367f94849021a84a290cb3c1e" namespace TestOutput { + using Microsoft.AspNet.Razor.TagHelpers; using Microsoft.AspNet.Razor.Runtime.TagHelpers; using System; using System.Threading.Tasks; diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/IncompleteTagHelper.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/IncompleteTagHelper.cs index b117621c44..8a296f157b 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/IncompleteTagHelper.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/IncompleteTagHelper.cs @@ -1,6 +1,7 @@ #pragma checksum "IncompleteTagHelper.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "dba409dce3afe321d920e4e62a5701c09d7bbea8" namespace TestOutput { + using Microsoft.AspNet.Razor.TagHelpers; using Microsoft.AspNet.Razor.Runtime.TagHelpers; using System; using System.Threading.Tasks; diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/MinimizedTagHelpers.DesignTime.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/MinimizedTagHelpers.DesignTime.cs index b1bfeb0bb9..093c8ca719 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/MinimizedTagHelpers.DesignTime.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/MinimizedTagHelpers.DesignTime.cs @@ -1,6 +1,5 @@ namespace TestOutput { - using Microsoft.AspNet.Razor.Runtime.TagHelpers; using System; using System.Threading.Tasks; diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/MinimizedTagHelpers.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/MinimizedTagHelpers.cs index 1154faf0c2..443314a519 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/MinimizedTagHelpers.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/MinimizedTagHelpers.cs @@ -1,6 +1,7 @@ #pragma checksum "MinimizedTagHelpers.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "07839be4304797e30b19b50b95e2247c93cdff06" namespace TestOutput { + using Microsoft.AspNet.Razor.TagHelpers; using Microsoft.AspNet.Razor.Runtime.TagHelpers; using System; using System.Threading.Tasks; diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/NestedScriptTagTagHelpers.DesignTime.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/NestedScriptTagTagHelpers.DesignTime.cs index a40e56fe7b..7fd593fd56 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/NestedScriptTagTagHelpers.DesignTime.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/NestedScriptTagTagHelpers.DesignTime.cs @@ -1,6 +1,5 @@ namespace TestOutput { - using Microsoft.AspNet.Razor.Runtime.TagHelpers; using System; using System.Threading.Tasks; diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/NestedScriptTagTagHelpers.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/NestedScriptTagTagHelpers.cs index 3bdacd5c39..2ae1ee9c25 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/NestedScriptTagTagHelpers.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/NestedScriptTagTagHelpers.cs @@ -1,6 +1,7 @@ #pragma checksum "NestedScriptTagTagHelpers.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "9e6bc8d09df124eda650118b208b7c5e6e058f6b" namespace TestOutput { + using Microsoft.AspNet.Razor.TagHelpers; using Microsoft.AspNet.Razor.Runtime.TagHelpers; using System; using System.Threading.Tasks; diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/PrefixedAttributeTagHelpers.DesignTime.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/PrefixedAttributeTagHelpers.DesignTime.cs index 2ef87b2645..2026d50398 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/PrefixedAttributeTagHelpers.DesignTime.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/PrefixedAttributeTagHelpers.DesignTime.cs @@ -1,6 +1,5 @@ namespace TestOutput { - using Microsoft.AspNet.Razor.Runtime.TagHelpers; using System; using System.Threading.Tasks; diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/PrefixedAttributeTagHelpers.Reversed.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/PrefixedAttributeTagHelpers.Reversed.cs index 889cfddfa5..dc3606e2f3 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/PrefixedAttributeTagHelpers.Reversed.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/PrefixedAttributeTagHelpers.Reversed.cs @@ -1,6 +1,7 @@ #pragma checksum "PrefixedAttributeTagHelpers.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "4e7fe9697b745af1a07d41f6a8532fdc288fa046" namespace TestOutput { + using Microsoft.AspNet.Razor.TagHelpers; using Microsoft.AspNet.Razor.Runtime.TagHelpers; using System; using System.Threading.Tasks; diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/PrefixedAttributeTagHelpers.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/PrefixedAttributeTagHelpers.cs index 6d2b4bcdc8..1b3f871dc4 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/PrefixedAttributeTagHelpers.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/PrefixedAttributeTagHelpers.cs @@ -1,6 +1,7 @@ #pragma checksum "PrefixedAttributeTagHelpers.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "4e7fe9697b745af1a07d41f6a8532fdc288fa046" namespace TestOutput { + using Microsoft.AspNet.Razor.TagHelpers; using Microsoft.AspNet.Razor.Runtime.TagHelpers; using System; using System.Threading.Tasks; diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/SingleTagHelper.DesignTime.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/SingleTagHelper.DesignTime.cs index 693247447b..1064324b54 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/SingleTagHelper.DesignTime.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/SingleTagHelper.DesignTime.cs @@ -1,6 +1,5 @@ namespace TestOutput { - using Microsoft.AspNet.Razor.Runtime.TagHelpers; using System; using System.Threading.Tasks; diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/SingleTagHelper.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/SingleTagHelper.cs index d5e0be91b4..563d4cb514 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/SingleTagHelper.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/SingleTagHelper.cs @@ -1,6 +1,7 @@ #pragma checksum "SingleTagHelper.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "070b72826371f13e4d364e6324cf512220ec1c0f" namespace TestOutput { + using Microsoft.AspNet.Razor.TagHelpers; using Microsoft.AspNet.Razor.Runtime.TagHelpers; using System; using System.Threading.Tasks; diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/SingleTagHelperWithNewlineBeforeAttributes.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/SingleTagHelperWithNewlineBeforeAttributes.cs index 0ae69dc8a5..d431baac9a 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/SingleTagHelperWithNewlineBeforeAttributes.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/SingleTagHelperWithNewlineBeforeAttributes.cs @@ -1,6 +1,7 @@ -#pragma checksum "SingleTagHelperWithNewlineBeforeAttributes.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "95e2e2bab663b8be9934a66150af50a2a6ee08e7" +#pragma checksum "SingleTagHelperWithNewlineBeforeAttributes.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "95e2e2bab663b8be9934a66150af50a2a6ee08e7" namespace TestOutput { + using Microsoft.AspNet.Razor.TagHelpers; using Microsoft.AspNet.Razor.Runtime.TagHelpers; using System; using System.Threading.Tasks; diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/SymbolBoundAttributes.DesignTime.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/SymbolBoundAttributes.DesignTime.cs index 6daaa40afe..da9ceeb4d4 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/SymbolBoundAttributes.DesignTime.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/SymbolBoundAttributes.DesignTime.cs @@ -1,6 +1,5 @@ namespace TestOutput { - using Microsoft.AspNet.Razor.Runtime.TagHelpers; using System; using System.Threading.Tasks; diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/SymbolBoundAttributes.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/SymbolBoundAttributes.cs index 4d1eb601ac..dadfd36c9c 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/SymbolBoundAttributes.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/SymbolBoundAttributes.cs @@ -1,6 +1,7 @@ #pragma checksum "SymbolBoundAttributes.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "65ef0c8f673481f5ab85bd4936f91f31e84c490c" namespace TestOutput { + using Microsoft.AspNet.Razor.TagHelpers; using Microsoft.AspNet.Razor.Runtime.TagHelpers; using System; using System.Threading.Tasks; diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/TagHelpersInSection.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/TagHelpersInSection.cs index cd15346da9..bc9cef9b11 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/TagHelpersInSection.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/TagHelpersInSection.cs @@ -1,6 +1,7 @@ #pragma checksum "TagHelpersInSection.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "b6492c68360b85d4993de94eeac547b7fb012a26" namespace TestOutput { + using Microsoft.AspNet.Razor.TagHelpers; using Microsoft.AspNet.Razor.Runtime.TagHelpers; using System; using System.Threading.Tasks; diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/TagHelpersWithWeirdlySpacedAttributes.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/TagHelpersWithWeirdlySpacedAttributes.cs index 0406162f7e..915571cb3a 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/TagHelpersWithWeirdlySpacedAttributes.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/TagHelpersWithWeirdlySpacedAttributes.cs @@ -1,6 +1,7 @@ #pragma checksum "TagHelpersWithWeirdlySpacedAttributes.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "61ec0611b60d88357a6c3b6551513ebf6223f6ee" namespace TestOutput { + using Microsoft.AspNet.Razor.TagHelpers; using Microsoft.AspNet.Razor.Runtime.TagHelpers; using System; using System.Threading.Tasks; diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/TransitionsInTagHelperAttributes.DesignTime.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/TransitionsInTagHelperAttributes.DesignTime.cs index 8b7bc50850..839b2ea0da 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/TransitionsInTagHelperAttributes.DesignTime.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/TransitionsInTagHelperAttributes.DesignTime.cs @@ -1,6 +1,5 @@ namespace TestOutput { - using Microsoft.AspNet.Razor.Runtime.TagHelpers; using System; using System.Threading.Tasks; diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/TransitionsInTagHelperAttributes.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/TransitionsInTagHelperAttributes.cs index 3a7a249bce..cefc44a931 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/TransitionsInTagHelperAttributes.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/TransitionsInTagHelperAttributes.cs @@ -1,6 +1,7 @@ #pragma checksum "TransitionsInTagHelperAttributes.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "050ce5cabf326eaa117aa12f5a1a10dbf82a8917" namespace TestOutput { + using Microsoft.AspNet.Razor.TagHelpers; using Microsoft.AspNet.Razor.Runtime.TagHelpers; using System; using System.Threading.Tasks;