From a76f16cda8544ed454c456ca01745a7de956b9ea Mon Sep 17 00:00:00 2001 From: "N. Taylor Mullen" Date: Wed, 28 Oct 2015 14:47:38 -0700 Subject: [PATCH] Removed `TagHelper` infrastructure `using` statements. - The using statements had a chance to conflict with user code. Removed them and changed the default configured type names to be `global::` full name based. - Updated test file `TagHelperDescriptor.TypeName`s to have namespaces to make them easier to read. #580 --- .../CSharpTagHelperCodeRenderer.cs | 8 +- .../GeneratedTagHelperContext.cs | 8 +- .../CSharpTagHelperFieldDeclarationVisitor.cs | 45 +- ...arpTagHelperRunnerInitializationVisitor.cs | 2 +- .../Visitors/CSharpUsingVisitor.cs | 31 -- .../CSharpTagHelperRenderingTest.cs | 425 +++++++++--------- ...TagHelperAttributeValueCodeRendererTest.cs | 6 +- ...AttributeTargetingTagHelpers.DesignTime.cs | 34 +- .../Output/AttributeTargetingTagHelpers.cs | 76 ++-- ...TagHelpers.CustomAttributeCodeGenerator.cs | 66 ++- .../Output/BasicTagHelpers.DesignTime.cs | 28 +- .../BasicTagHelpers.Prefixed.DesignTime.cs | 18 +- .../Output/BasicTagHelpers.Prefixed.cs | 44 +- .../CodeGenerator/Output/BasicTagHelpers.cs | 66 ++- .../Output/ComplexTagHelpers.DesignTime.cs | 96 ++-- .../CodeGenerator/Output/ComplexTagHelpers.cs | 224 +++++---- ...DuplicateAttributeTagHelpers.DesignTime.cs | 28 +- .../Output/DuplicateAttributeTagHelpers.cs | 64 ++- .../Output/DuplicateTargetTagHelper.cs | 38 +- .../DynamicAttributeTagHelpers.DesignTime.cs | 18 +- .../Output/DynamicAttributeTagHelpers.cs | 58 ++- .../EmptyAttributeTagHelpers.DesignTime.cs | 30 +- .../Output/EmptyAttributeTagHelpers.cs | 68 ++- .../Output/EnumTagHelpers.DesignTime.cs | 36 +- .../CodeGenerator/Output/EnumTagHelpers.cs | 90 ++-- .../Output/EscapedTagHelpers.DesignTime.cs | 14 +- .../CodeGenerator/Output/EscapedTagHelpers.cs | 36 +- .../Output/IncompleteTagHelper.cs | 20 +- .../Output/MinimizedTagHelpers.DesignTime.cs | 28 +- .../Output/MinimizedTagHelpers.cs | 74 ++- .../NestedScriptTagTagHelpers.DesignTime.cs | 18 +- .../Output/NestedScriptTagTagHelpers.cs | 44 +- .../PrefixedAttributeTagHelpers.DesignTime.cs | 72 +-- .../PrefixedAttributeTagHelpers.Reversed.cs | 174 ++++--- .../Output/PrefixedAttributeTagHelpers.cs | 174 ++++--- .../Output/SingleTagHelper.DesignTime.cs | 6 +- .../CodeGenerator/Output/SingleTagHelper.cs | 24 +- ...gleTagHelperWithNewlineBeforeAttributes.cs | 24 +- .../SymbolBoundAttributes.DesignTime.cs | 28 +- .../Output/SymbolBoundAttributes.cs | 80 ++-- .../Output/TagHelpersInSection.cs | 32 +- .../TagHelpersWithWeirdlySpacedAttributes.cs | 70 ++- ...sitionsInTagHelperAttributes.DesignTime.cs | 26 +- .../TransitionsInTagHelperAttributes.cs | 74 ++- 44 files changed, 1288 insertions(+), 1337 deletions(-) diff --git a/src/Microsoft.AspNet.Razor/CodeGenerators/CSharpTagHelperCodeRenderer.cs b/src/Microsoft.AspNet.Razor/CodeGenerators/CSharpTagHelperCodeRenderer.cs index a53b5c0c98..5c32c3955d 100644 --- a/src/Microsoft.AspNet.Razor/CodeGenerators/CSharpTagHelperCodeRenderer.cs +++ b/src/Microsoft.AspNet.Razor/CodeGenerators/CSharpTagHelperCodeRenderer.cs @@ -125,7 +125,8 @@ namespace Microsoft.AspNet.Razor.CodeGenerators // per call site, e.g. if the tag is on the view twice, there should be two IDs. _writer.WriteStringLiteral(tagName) .WriteParameterSeparator() - .Write(nameof(TagMode)) + .Write("global::") + .Write(typeof(TagMode).FullName) .Write(".") .Write(tagMode.ToString()) .WriteParameterSeparator() @@ -178,8 +179,9 @@ namespace Microsoft.AspNet.Razor.CodeGenerators // Create the tag helper _writer.WriteStartAssignment(tagHelperVariableName) - .WriteStartMethodInvocation(_tagHelperContext.CreateTagHelperMethodName, - tagHelperDescriptor.TypeName) + .WriteStartMethodInvocation( + _tagHelperContext.CreateTagHelperMethodName, + "global::" + tagHelperDescriptor.TypeName) .WriteEndMethodInvocation(); // Execution contexts and throwing errors for null dictionary properties are a runtime feature. diff --git a/src/Microsoft.AspNet.Razor/CodeGenerators/GeneratedTagHelperContext.cs b/src/Microsoft.AspNet.Razor/CodeGenerators/GeneratedTagHelperContext.cs index 138f9a74f1..50120c8012 100644 --- a/src/Microsoft.AspNet.Razor/CodeGenerators/GeneratedTagHelperContext.cs +++ b/src/Microsoft.AspNet.Razor/CodeGenerators/GeneratedTagHelperContext.cs @@ -29,10 +29,10 @@ namespace Microsoft.AspNet.Razor.CodeGenerators MarkAsHtmlEncodedMethodName = "Html.Raw"; StartTagHelperWritingScopeMethodName = "StartTagHelperWritingScope"; EndTagHelperWritingScopeMethodName = "EndTagHelperWritingScope"; - RunnerTypeName = "TagHelperRunner"; - ScopeManagerTypeName = "TagHelperScopeManager"; - ExecutionContextTypeName = "TagHelperExecutionContext"; - TagHelperContentTypeName = "TagHelperContent"; + RunnerTypeName = "Microsoft.AspNet.Razor.Runtime.TagHelperRunner"; + ScopeManagerTypeName = "Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager"; + ExecutionContextTypeName = "Microsoft.AspNet.Razor.Runtime.TagHelperExecutionContext"; + TagHelperContentTypeName = "Microsoft.AspNet.Razor.TagHelperContent"; WriteTagHelperAsyncMethodName = "WriteTagHelperAsync"; WriteTagHelperToAsyncMethodName = "WriteTagHelperToAsync"; TagHelperContentGetContentMethodName = "GetContent"; diff --git a/src/Microsoft.AspNet.Razor/CodeGenerators/Visitors/CSharpTagHelperFieldDeclarationVisitor.cs b/src/Microsoft.AspNet.Razor/CodeGenerators/Visitors/CSharpTagHelperFieldDeclarationVisitor.cs index 0d9436ea4b..4ff1c9d595 100644 --- a/src/Microsoft.AspNet.Razor/CodeGenerators/Visitors/CSharpTagHelperFieldDeclarationVisitor.cs +++ b/src/Microsoft.AspNet.Razor/CodeGenerators/Visitors/CSharpTagHelperFieldDeclarationVisitor.cs @@ -47,28 +47,29 @@ namespace Microsoft.AspNet.Razor.CodeGenerators.Visitors // Need to disable the warning "X is assigned to but never used." for the value buffer since // whether it's used depends on how a TagHelper is used. Writer.WritePragma("warning disable 0414"); - WritePrivateField(_tagHelperContext.TagHelperContentTypeName, - CSharpTagHelperCodeRenderer.StringValueBufferVariableName, - value: null); + WritePrivateField( + "global::" + _tagHelperContext.TagHelperContentTypeName, + CSharpTagHelperCodeRenderer.StringValueBufferVariableName, + value: null); Writer.WritePragma("warning restore 0414"); - WritePrivateField(_tagHelperContext.ExecutionContextTypeName, - CSharpTagHelperCodeRenderer.ExecutionContextVariableName, - value: null); + WritePrivateField( + "global::" + _tagHelperContext.ExecutionContextTypeName, + CSharpTagHelperCodeRenderer.ExecutionContextVariableName, + value: null); - Writer - .Write("private ") - .WriteVariableDeclaration( - _tagHelperContext.RunnerTypeName, + WritePrivateField( + "global::" + _tagHelperContext.RunnerTypeName, CSharpTagHelperCodeRenderer.RunnerVariableName, value: null); - Writer.Write("private ") - .Write(_tagHelperContext.ScopeManagerTypeName) - .Write(" ") - .WriteStartAssignment(CSharpTagHelperCodeRenderer.ScopeManagerVariableName) - .WriteStartNewObject(_tagHelperContext.ScopeManagerTypeName) - .WriteEndMethodInvocation(); + Writer + .Write("private global::") + .Write(_tagHelperContext.ScopeManagerTypeName) + .Write(" ") + .WriteStartAssignment(CSharpTagHelperCodeRenderer.ScopeManagerVariableName) + .WriteStartNewObject("global::" + _tagHelperContext.ScopeManagerTypeName) + .WriteEndMethodInvocation(); } } @@ -78,9 +79,10 @@ namespace Microsoft.AspNet.Razor.CodeGenerators.Visitors { _declaredTagHelpers.Add(descriptor.TypeName); - WritePrivateField(descriptor.TypeName, - CSharpTagHelperCodeRenderer.GetVariableName(descriptor), - value: null); + WritePrivateField( + "global::" + descriptor.TypeName, + CSharpTagHelperCodeRenderer.GetVariableName(descriptor), + value: null); } } @@ -116,8 +118,9 @@ namespace Microsoft.AspNet.Razor.CodeGenerators.Visitors private void WritePrivateField(string type, string name, string value) { - Writer.Write("private ") - .WriteVariableDeclaration(type, name, value); + Writer + .Write("private ") + .WriteVariableDeclaration(type, name, value); } } } \ No newline at end of file diff --git a/src/Microsoft.AspNet.Razor/CodeGenerators/Visitors/CSharpTagHelperRunnerInitializationVisitor.cs b/src/Microsoft.AspNet.Razor/CodeGenerators/Visitors/CSharpTagHelperRunnerInitializationVisitor.cs index ec885464fb..9c8afd5dd5 100644 --- a/src/Microsoft.AspNet.Razor/CodeGenerators/Visitors/CSharpTagHelperRunnerInitializationVisitor.cs +++ b/src/Microsoft.AspNet.Razor/CodeGenerators/Visitors/CSharpTagHelperRunnerInitializationVisitor.cs @@ -74,7 +74,7 @@ namespace Microsoft.AspNet.Razor.CodeGenerators.Visitors .WriteStartAssignment(CSharpTagHelperCodeRenderer.RunnerVariableName) .Write(CSharpTagHelperCodeRenderer.RunnerVariableName) .Write(" ?? ") - .WriteStartNewObject(_tagHelperContext.RunnerTypeName) + .WriteStartNewObject("global::" + _tagHelperContext.RunnerTypeName) .WriteEndMethodInvocation(); } } diff --git a/src/Microsoft.AspNet.Razor/CodeGenerators/Visitors/CSharpUsingVisitor.cs b/src/Microsoft.AspNet.Razor/CodeGenerators/Visitors/CSharpUsingVisitor.cs index e776e6c7ce..e37103f1af 100644 --- a/src/Microsoft.AspNet.Razor/CodeGenerators/Visitors/CSharpUsingVisitor.cs +++ b/src/Microsoft.AspNet.Razor/CodeGenerators/Visitors/CSharpUsingVisitor.cs @@ -11,14 +11,6 @@ namespace Microsoft.AspNet.Razor.CodeGenerators.Visitors { public class CSharpUsingVisitor : CodeVisitor { - private static readonly string[] TagHelpersRuntimeNamespaces = new[] - { - "Microsoft.AspNet.Razor.TagHelpers", - "Microsoft.AspNet.Razor.Runtime.TagHelpers" - }; - - private bool _foundTagHelpers; - public CSharpUsingVisitor(CSharpCodeWriter writer, CodeGeneratorContext context) : base(writer, context) { @@ -90,28 +82,5 @@ namespace Microsoft.AspNet.Razor.CodeGenerators.Visitors Writer.WriteLine(";"); } } - - protected override void Visit(TagHelperChunk chunk) - { - if (Context.Host.DesignTimeMode) - { - return; - } - - if (!_foundTagHelpers) - { - _foundTagHelpers = true; - - foreach (var tagHelperRuntimeNamespace in TagHelpersRuntimeNamespaces) - { - 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/test/Microsoft.AspNet.Razor.Test/CodeGenerators/CSharpTagHelperRenderingTest.cs b/test/Microsoft.AspNet.Razor.Test/CodeGenerators/CSharpTagHelperRenderingTest.cs index 3d15491d9a..c7c77201c8 100644 --- a/test/Microsoft.AspNet.Razor.Test/CodeGenerators/CSharpTagHelperRenderingTest.cs +++ b/test/Microsoft.AspNet.Razor.Test/CodeGenerators/CSharpTagHelperRenderingTest.cs @@ -30,7 +30,7 @@ namespace Microsoft.AspNet.Razor.Test.Generator new TagHelperDescriptor { TagName = "*", - TypeName = "CatchAllTagHelper", + TypeName = "TestNamespace.CatchAllTagHelper", AssemblyName = "SomeAssembly", Attributes = new[] { @@ -46,7 +46,7 @@ namespace Microsoft.AspNet.Razor.Test.Generator new TagHelperDescriptor { TagName = "input", - TypeName = "InputTagHelper", + TypeName = "TestNamespace.InputTagHelper", AssemblyName = "SomeAssembly", Attributes = new[] { @@ -72,7 +72,7 @@ namespace Microsoft.AspNet.Razor.Test.Generator new TagHelperDescriptor { TagName = "*", - TypeName = "CatchAllTagHelper", + TypeName = "TestNamespace.CatchAllTagHelper", AssemblyName = "SomeAssembly", Attributes = new[] { @@ -128,7 +128,7 @@ namespace Microsoft.AspNet.Razor.Test.Generator new TagHelperDescriptor { TagName = "*", - TypeName = "CatchAllTagHelper", + TypeName = "TestNamespace.CatchAllTagHelper", AssemblyName = "SomeAssembly", Attributes = new[] { @@ -145,7 +145,7 @@ namespace Microsoft.AspNet.Razor.Test.Generator new TagHelperDescriptor { TagName = "input", - TypeName = "InputTagHelper", + TypeName = "TestNamespace.InputTagHelper", AssemblyName = "SomeAssembly", Attributes = new[] { @@ -179,7 +179,7 @@ namespace Microsoft.AspNet.Razor.Test.Generator new TagHelperDescriptor { TagName = "input", - TypeName = "InputTagHelper", + TypeName = "TestNamespace.InputTagHelper", AssemblyName = "SomeAssembly", Attributes = new[] { @@ -207,7 +207,7 @@ namespace Microsoft.AspNet.Razor.Test.Generator new TagHelperDescriptor { TagName = "*", - TypeName = "CatchAllTagHelper", + TypeName = "TestNamespace.CatchAllTagHelper", AssemblyName = "SomeAssembly", Attributes = new TagHelperAttributeDescriptor[] { @@ -219,7 +219,7 @@ namespace Microsoft.AspNet.Razor.Test.Generator new TagHelperDescriptor { TagName = "*", - TypeName = "CatchAllTagHelper", + TypeName = "TestNamespace.CatchAllTagHelper", AssemblyName = "SomeAssembly", Attributes = new TagHelperAttributeDescriptor[] { @@ -231,7 +231,7 @@ namespace Microsoft.AspNet.Razor.Test.Generator new TagHelperDescriptor { TagName = "input", - TypeName = "InputTagHelper", + TypeName = "TestNamespace.InputTagHelper", AssemblyName = "SomeAssembly", Attributes = new TagHelperAttributeDescriptor[] { @@ -243,7 +243,7 @@ namespace Microsoft.AspNet.Razor.Test.Generator new TagHelperDescriptor { TagName = "input", - TypeName = "InputTagHelper", + TypeName = "TestNamespace.InputTagHelper", AssemblyName = "SomeAssembly", Attributes = new TagHelperAttributeDescriptor[] { @@ -267,14 +267,14 @@ namespace Microsoft.AspNet.Razor.Test.Generator new TagHelperDescriptor { TagName = "p", - TypeName = "PTagHelper", + TypeName = "TestNamespace.PTagHelper", AssemblyName = "SomeAssembly", RequiredAttributes = new[] { "class" }, }, new TagHelperDescriptor { TagName = "input", - TypeName = "InputTagHelper", + TypeName = "TestNamespace.InputTagHelper", AssemblyName = "SomeAssembly", Attributes = new TagHelperAttributeDescriptor[] { @@ -285,7 +285,7 @@ namespace Microsoft.AspNet.Razor.Test.Generator new TagHelperDescriptor { TagName = "input", - TypeName = "InputTagHelper2", + TypeName = "TestNamespace.InputTagHelper2", AssemblyName = "SomeAssembly", Attributes = new TagHelperAttributeDescriptor[] { @@ -297,7 +297,7 @@ namespace Microsoft.AspNet.Razor.Test.Generator new TagHelperDescriptor { TagName = "*", - TypeName = "CatchAllTagHelper", + TypeName = "TestNamespace.CatchAllTagHelper", AssemblyName = "SomeAssembly", RequiredAttributes = new[] { "catchAll" }, } @@ -314,7 +314,7 @@ namespace Microsoft.AspNet.Razor.Test.Generator new TagHelperDescriptor { TagName = "input", - TypeName = "InputTagHelper1", + TypeName = "TestNamespace.InputTagHelper1", AssemblyName = "SomeAssembly", Attributes = new[] { @@ -363,7 +363,7 @@ namespace Microsoft.AspNet.Razor.Test.Generator new TagHelperDescriptor { TagName = "input", - TypeName = "InputTagHelper2", + TypeName = "TestNamespace.InputTagHelper2", AssemblyName = "SomeAssembly", Attributes = new[] { @@ -557,9 +557,10 @@ namespace Microsoft.AspNet.Razor.Test.Generator BuildLineMapping( documentAbsoluteIndex: 63, documentLineIndex: 2, - generatedAbsoluteIndex: 910, + documentCharacterOffsetIndex: 28, + generatedAbsoluteIndex: 987, generatedLineIndex: 33, - characterOffsetIndex: 28, + generatedCharacterOffsetIndex: 33, contentLength: 4), } }, @@ -579,16 +580,17 @@ namespace Microsoft.AspNet.Razor.Test.Generator BuildLineMapping( documentAbsoluteIndex: 202, documentLineIndex: 5, - generatedAbsoluteIndex: 1172, + generatedAbsoluteIndex: 1388, generatedLineIndex: 37, characterOffsetIndex: 38, contentLength: 23), BuildLineMapping( documentAbsoluteIndex: 285, documentLineIndex: 6, - generatedAbsoluteIndex: 1655, + documentCharacterOffsetIndex: 40, + generatedAbsoluteIndex: 2029, generatedLineIndex: 48, - characterOffsetIndex: 40, + generatedCharacterOffsetIndex: 42, contentLength: 4), } }, @@ -615,7 +617,7 @@ namespace Microsoft.AspNet.Razor.Test.Generator BuildLineMapping( documentAbsoluteIndex: 226, documentLineIndex: 7, - generatedAbsoluteIndex: 1426, + generatedAbsoluteIndex: 1648, generatedLineIndex: 45, characterOffsetIndex: 43, contentLength: 4), @@ -638,14 +640,14 @@ namespace Microsoft.AspNet.Razor.Test.Generator documentAbsoluteIndex: 36, documentLineIndex: 2, documentCharacterOffsetIndex: 1, - generatedAbsoluteIndex: 947, + generatedAbsoluteIndex: 1055, generatedLineIndex: 34, generatedCharacterOffsetIndex: 0, contentLength: 48), BuildLineMapping( documentAbsoluteIndex: 211, documentLineIndex: 9, - generatedAbsoluteIndex: 1065, + generatedAbsoluteIndex: 1173, generatedLineIndex: 43, characterOffsetIndex: 0, contentLength: 12), @@ -653,35 +655,35 @@ namespace Microsoft.AspNet.Razor.Test.Generator documentAbsoluteIndex: 224, documentLineIndex: 9, documentCharacterOffsetIndex: 13, - generatedAbsoluteIndex: 1161, + generatedAbsoluteIndex: 1269, generatedLineIndex: 49, generatedCharacterOffsetIndex: 12, contentLength: 27), BuildLineMapping( documentAbsoluteIndex: 352, documentLineIndex: 12, - generatedAbsoluteIndex: 1559, + generatedAbsoluteIndex: 1817, generatedLineIndex: 61, characterOffsetIndex: 0, contentLength: 48), BuildLineMapping( documentAbsoluteIndex: 446, documentLineIndex: 15, - generatedAbsoluteIndex: 1859, + generatedAbsoluteIndex: 2189, generatedLineIndex: 71, characterOffsetIndex: 46, contentLength: 8), BuildLineMapping( documentAbsoluteIndex: 463, documentLineIndex: 15, - generatedAbsoluteIndex: 2113, + generatedAbsoluteIndex: 2485, generatedLineIndex: 78, characterOffsetIndex: 63, contentLength: 4), BuildLineMapping( documentAbsoluteIndex: 507, documentLineIndex: 16, - generatedAbsoluteIndex: 2414, + generatedAbsoluteIndex: 2894, generatedLineIndex: 86, characterOffsetIndex: 31, contentLength: 30), @@ -689,7 +691,7 @@ namespace Microsoft.AspNet.Razor.Test.Generator documentAbsoluteIndex: 574, documentLineIndex: 17, documentCharacterOffsetIndex: 30, - generatedAbsoluteIndex: 2792, + generatedAbsoluteIndex: 3386, generatedLineIndex: 95, generatedCharacterOffsetIndex: 29, contentLength: 10), @@ -697,7 +699,7 @@ namespace Microsoft.AspNet.Razor.Test.Generator documentAbsoluteIndex: 606, documentLineIndex: 17, documentCharacterOffsetIndex: 62, - generatedAbsoluteIndex: 2935, + generatedAbsoluteIndex: 3529, generatedLineIndex: 101, generatedCharacterOffsetIndex: 61, contentLength: 1), @@ -705,7 +707,7 @@ namespace Microsoft.AspNet.Razor.Test.Generator documentAbsoluteIndex: 607, documentLineIndex: 17, documentCharacterOffsetIndex: 63, - generatedAbsoluteIndex: 3070, + generatedAbsoluteIndex: 3664, generatedLineIndex: 107, generatedCharacterOffsetIndex: 62, contentLength: 8), @@ -713,7 +715,7 @@ namespace Microsoft.AspNet.Razor.Test.Generator documentAbsoluteIndex: 637, documentLineIndex: 17, documentCharacterOffsetIndex: 93, - generatedAbsoluteIndex: 3241, + generatedAbsoluteIndex: 3835, generatedLineIndex: 113, generatedCharacterOffsetIndex: 91, contentLength: 1), @@ -721,35 +723,35 @@ namespace Microsoft.AspNet.Razor.Test.Generator documentAbsoluteIndex: 638, documentLineIndex: 17, documentCharacterOffsetIndex: 94, - generatedAbsoluteIndex: 3406, + generatedAbsoluteIndex: 4000, generatedLineIndex: 119, generatedCharacterOffsetIndex: 92, contentLength: 1), BuildLineMapping( documentAbsoluteIndex: 643, documentLineIndex: 18, - generatedAbsoluteIndex: 3591, + generatedAbsoluteIndex: 4227, generatedLineIndex: 127, characterOffsetIndex: 0, contentLength: 15), BuildLineMapping( documentAbsoluteIndex: 163, documentLineIndex: 7, - generatedAbsoluteIndex: 3766, + generatedAbsoluteIndex: 4438, generatedLineIndex: 134, characterOffsetIndex: 32, contentLength: 12), BuildLineMapping( documentAbsoluteIndex: 769, documentLineIndex: 21, - generatedAbsoluteIndex: 3849, + generatedAbsoluteIndex: 4521, generatedLineIndex: 139, characterOffsetIndex: 0, contentLength: 12), BuildLineMapping( documentAbsoluteIndex: 783, documentLineIndex: 21, - generatedAbsoluteIndex: 3947, + generatedAbsoluteIndex: 4619, generatedLineIndex: 145, characterOffsetIndex: 14, contentLength: 21), @@ -757,31 +759,31 @@ namespace Microsoft.AspNet.Razor.Test.Generator documentAbsoluteIndex: 836, documentLineIndex: 22, documentCharacterOffsetIndex: 29, - generatedAbsoluteIndex: 4204, + generatedAbsoluteIndex: 4962, generatedLineIndex: 153, - generatedCharacterOffsetIndex: 28, + generatedCharacterOffsetIndex: 42, contentLength: 1), BuildLineMapping( documentAbsoluteIndex: 837, documentLineIndex: 22, documentCharacterOffsetIndex: 30, - generatedAbsoluteIndex: 4205, + generatedAbsoluteIndex: 4963, generatedLineIndex: 153, - generatedCharacterOffsetIndex: 29, + generatedCharacterOffsetIndex: 43, contentLength: 7), BuildLineMapping( documentAbsoluteIndex: 844, documentLineIndex: 22, documentCharacterOffsetIndex: 37, - generatedAbsoluteIndex: 4212, + generatedAbsoluteIndex: 4970, generatedLineIndex: 153, - generatedCharacterOffsetIndex: 36, + generatedCharacterOffsetIndex: 50, contentLength: 1), BuildLineMapping( documentAbsoluteIndex: 711, documentLineIndex: 20, documentCharacterOffsetIndex: 39, - generatedAbsoluteIndex: 4381, + generatedAbsoluteIndex: 5175, generatedLineIndex: 159, generatedCharacterOffsetIndex: 38, contentLength: 23), @@ -789,7 +791,7 @@ namespace Microsoft.AspNet.Razor.Test.Generator documentAbsoluteIndex: 734, documentLineIndex: 20, documentCharacterOffsetIndex: 62, - generatedAbsoluteIndex: 4404, + generatedAbsoluteIndex: 5198, generatedLineIndex: 159, generatedCharacterOffsetIndex: 61, contentLength: 7), @@ -797,7 +799,7 @@ namespace Microsoft.AspNet.Razor.Test.Generator documentAbsoluteIndex: 976, documentLineIndex: 25, documentCharacterOffsetIndex: 61, - generatedAbsoluteIndex: 4678, + generatedAbsoluteIndex: 5544, generatedLineIndex: 166, generatedCharacterOffsetIndex: 60, contentLength: 1), @@ -805,7 +807,7 @@ namespace Microsoft.AspNet.Razor.Test.Generator documentAbsoluteIndex: 977, documentLineIndex: 25, documentCharacterOffsetIndex: 62, - generatedAbsoluteIndex: 4679, + generatedAbsoluteIndex: 5545, generatedLineIndex: 166, generatedCharacterOffsetIndex: 61, contentLength: 30), @@ -813,7 +815,7 @@ namespace Microsoft.AspNet.Razor.Test.Generator documentAbsoluteIndex: 1007, documentLineIndex: 25, documentCharacterOffsetIndex: 92, - generatedAbsoluteIndex: 4709, + generatedAbsoluteIndex: 5575, generatedLineIndex: 166, generatedCharacterOffsetIndex: 91, contentLength: 1), @@ -821,104 +823,110 @@ namespace Microsoft.AspNet.Razor.Test.Generator documentAbsoluteIndex: 879, documentLineIndex: 24, documentCharacterOffsetIndex: 16, - generatedAbsoluteIndex: 4859, + generatedAbsoluteIndex: 5775, generatedLineIndex: 172, - generatedCharacterOffsetIndex: 19, + generatedCharacterOffsetIndex: 33, contentLength: 8), BuildLineMapping( documentAbsoluteIndex: 887, documentLineIndex: 24, documentCharacterOffsetIndex: 24, - generatedAbsoluteIndex: 4867, + generatedAbsoluteIndex: 5783, generatedLineIndex: 172, - generatedCharacterOffsetIndex: 27, + generatedCharacterOffsetIndex: 41, contentLength: 1), BuildLineMapping( documentAbsoluteIndex: 888, documentLineIndex: 24, documentCharacterOffsetIndex: 25, - generatedAbsoluteIndex: 4868, + generatedAbsoluteIndex: 5784, generatedLineIndex: 172, - generatedCharacterOffsetIndex: 28, + generatedCharacterOffsetIndex: 42, contentLength: 23), BuildLineMapping( documentAbsoluteIndex: 1106, documentLineIndex: 28, - generatedAbsoluteIndex: 5126, + documentCharacterOffsetIndex: 28, + generatedAbsoluteIndex: 6128, generatedLineIndex: 179, - characterOffsetIndex: 28, + generatedCharacterOffsetIndex: 42, contentLength: 30), BuildLineMapping( documentAbsoluteIndex: 1044, documentLineIndex: 27, documentCharacterOffsetIndex: 16, - generatedAbsoluteIndex: 5305, + generatedAbsoluteIndex: 6357, generatedLineIndex: 185, - generatedCharacterOffsetIndex: 19, + generatedCharacterOffsetIndex: 33, contentLength: 30), BuildLineMapping( documentAbsoluteIndex: 1234, documentLineIndex: 31, - generatedAbsoluteIndex: 5570, + documentCharacterOffsetIndex: 28, + generatedAbsoluteIndex: 6708, generatedLineIndex: 192, - characterOffsetIndex: 28, + generatedCharacterOffsetIndex: 42, contentLength: 3), BuildLineMapping( documentAbsoluteIndex: 1237, documentLineIndex: 31, - generatedAbsoluteIndex: 5573, + documentCharacterOffsetIndex: 31, + generatedAbsoluteIndex: 6711, generatedLineIndex: 192, - characterOffsetIndex: 31, + generatedCharacterOffsetIndex: 45, contentLength: 2), BuildLineMapping( documentAbsoluteIndex: 1239, documentLineIndex: 31, - generatedAbsoluteIndex: 5575, + documentCharacterOffsetIndex: 33, + generatedAbsoluteIndex: 6713, generatedLineIndex: 192, - characterOffsetIndex: 33, + generatedCharacterOffsetIndex: 47, contentLength: 27), BuildLineMapping( documentAbsoluteIndex: 1266, documentLineIndex: 31, - generatedAbsoluteIndex: 5602, + documentCharacterOffsetIndex: 60, + generatedAbsoluteIndex: 6740, generatedLineIndex: 192, - characterOffsetIndex: 60, + generatedCharacterOffsetIndex: 74, contentLength: 1), BuildLineMapping( documentAbsoluteIndex: 1267, documentLineIndex: 31, - generatedAbsoluteIndex: 5603, + documentCharacterOffsetIndex: 61, + generatedAbsoluteIndex: 6741, generatedLineIndex: 192, - characterOffsetIndex: 61, + generatedCharacterOffsetIndex: 75, contentLength: 10), BuildLineMapping( documentAbsoluteIndex: 1171, documentLineIndex: 30, documentCharacterOffsetIndex: 17, - generatedAbsoluteIndex: 5762, + generatedAbsoluteIndex: 6950, generatedLineIndex: 198, - generatedCharacterOffsetIndex: 19, + generatedCharacterOffsetIndex: 33, contentLength: 1), BuildLineMapping( documentAbsoluteIndex: 1172, documentLineIndex: 30, documentCharacterOffsetIndex: 18, - generatedAbsoluteIndex: 5763, + generatedAbsoluteIndex: 6951, generatedLineIndex: 198, - generatedCharacterOffsetIndex: 20, + generatedCharacterOffsetIndex: 34, contentLength: 29), BuildLineMapping( documentAbsoluteIndex: 1201, documentLineIndex: 30, documentCharacterOffsetIndex: 47, - generatedAbsoluteIndex: 5792, + generatedAbsoluteIndex: 6980, generatedLineIndex: 198, - generatedCharacterOffsetIndex: 49, + generatedCharacterOffsetIndex: 63, contentLength: 1), BuildLineMapping( documentAbsoluteIndex: 1306, documentLineIndex: 33, - generatedAbsoluteIndex: 5873, + generatedAbsoluteIndex: 7061, generatedLineIndex: 203, characterOffsetIndex: 9, contentLength: 11), @@ -926,21 +934,22 @@ namespace Microsoft.AspNet.Razor.Test.Generator documentAbsoluteIndex: 1361, documentLineIndex: 33, documentCharacterOffsetIndex: 64, - generatedAbsoluteIndex: 6162, + generatedAbsoluteIndex: 7422, generatedLineIndex: 207, generatedCharacterOffsetIndex: 63, contentLength: 7), BuildLineMapping( documentAbsoluteIndex: 1326, documentLineIndex: 33, - generatedAbsoluteIndex: 6320, + documentCharacterOffsetIndex: 29, + generatedAbsoluteIndex: 7620, generatedLineIndex: 213, - characterOffsetIndex: 29, + generatedCharacterOffsetIndex: 33, contentLength: 3), BuildLineMapping( documentAbsoluteIndex: 1390, documentLineIndex: 35, - generatedAbsoluteIndex: 6435, + generatedAbsoluteIndex: 7735, generatedLineIndex: 224, characterOffsetIndex: 0, contentLength: 1), @@ -963,24 +972,25 @@ namespace Microsoft.AspNet.Razor.Test.Generator documentAbsoluteIndex: 62, documentLineIndex: 3, documentCharacterOffsetIndex: 26, - generatedAbsoluteIndex: 1235, + generatedAbsoluteIndex: 1471, generatedLineIndex: 38, - generatedCharacterOffsetIndex: 28, + generatedCharacterOffsetIndex: 42, contentLength: 0), BuildLineMapping( documentAbsoluteIndex: 122, documentLineIndex: 5, - generatedAbsoluteIndex: 1580, + documentCharacterOffsetIndex: 30, + generatedAbsoluteIndex: 1942, generatedLineIndex: 47, - characterOffsetIndex: 30, + generatedCharacterOffsetIndex: 42, contentLength: 0), BuildLineMapping( documentAbsoluteIndex: 88, documentLineIndex: 4, documentCharacterOffsetIndex: 12, - generatedAbsoluteIndex: 1735, + generatedAbsoluteIndex: 2147, generatedLineIndex: 53, - generatedCharacterOffsetIndex: 19, + generatedCharacterOffsetIndex: 33, contentLength: 0), } }, @@ -1000,21 +1010,21 @@ namespace Microsoft.AspNet.Razor.Test.Generator BuildLineMapping( documentAbsoluteIndex: 102, documentLineIndex: 3, - generatedAbsoluteIndex: 921, + generatedAbsoluteIndex: 993, generatedLineIndex: 33, characterOffsetIndex: 29, contentLength: 12), BuildLineMapping( documentAbsoluteIndex: 200, documentLineIndex: 5, - generatedAbsoluteIndex: 1190, + generatedAbsoluteIndex: 1334, generatedLineIndex: 40, characterOffsetIndex: 51, contentLength: 12), BuildLineMapping( documentAbsoluteIndex: 223, documentLineIndex: 5, - generatedAbsoluteIndex: 1458, + generatedAbsoluteIndex: 1644, generatedLineIndex: 47, characterOffsetIndex: 74, contentLength: 4), @@ -1036,16 +1046,18 @@ namespace Microsoft.AspNet.Razor.Test.Generator BuildLineMapping( documentAbsoluteIndex: 186, documentLineIndex: 5, - generatedAbsoluteIndex: 1406, + documentCharacterOffsetIndex: 36, + generatedAbsoluteIndex: 1706, generatedLineIndex: 40, - characterOffsetIndex: 36, + generatedCharacterOffsetIndex: 42, contentLength: 4), BuildLineMapping( documentAbsoluteIndex: 232, documentLineIndex: 6, - generatedAbsoluteIndex: 1846, + documentCharacterOffsetIndex: 36, + generatedAbsoluteIndex: 2302, generatedLineIndex: 50, - characterOffsetIndex: 36, + generatedCharacterOffsetIndex: 42, contentLength: 4), } }, @@ -1065,42 +1077,44 @@ namespace Microsoft.AspNet.Razor.Test.Generator BuildLineMapping( documentAbsoluteIndex: 37, documentLineIndex: 2, - generatedAbsoluteIndex: 942, + generatedAbsoluteIndex: 1014, generatedLineIndex: 33, characterOffsetIndex: 2, contentLength: 242), BuildLineMapping( documentAbsoluteIndex: 370, documentLineIndex: 15, - generatedAbsoluteIndex: 1445, + documentCharacterOffsetIndex: 43, + generatedAbsoluteIndex: 1602, generatedLineIndex: 50, - characterOffsetIndex: 43, + generatedCharacterOffsetIndex: 56, contentLength: 13), BuildLineMapping( documentAbsoluteIndex: 404, documentLineIndex: 15, - generatedAbsoluteIndex: 1712, + generatedAbsoluteIndex: 1897, generatedLineIndex: 56, characterOffsetIndex: 77, contentLength: 16), BuildLineMapping( documentAbsoluteIndex: 468, documentLineIndex: 16, - generatedAbsoluteIndex: 2092, + documentCharacterOffsetIndex: 43, + generatedAbsoluteIndex: 2390, generatedLineIndex: 64, - characterOffsetIndex: 43, + generatedCharacterOffsetIndex: 56, contentLength: 13), BuildLineMapping( documentAbsoluteIndex: 502, documentLineIndex: 16, - generatedAbsoluteIndex: 2359, + generatedAbsoluteIndex: 2685, generatedLineIndex: 70, characterOffsetIndex: 77, contentLength: 2), BuildLineMapping( documentAbsoluteIndex: 526, documentLineIndex: 16, - generatedAbsoluteIndex: 2659, + generatedAbsoluteIndex: 3013, generatedLineIndex: 76, characterOffsetIndex: 101, contentLength: 2), @@ -1108,28 +1122,29 @@ namespace Microsoft.AspNet.Razor.Test.Generator documentAbsoluteIndex: 590, documentLineIndex: 18, documentCharacterOffsetIndex: 31, - generatedAbsoluteIndex: 3009, + generatedAbsoluteIndex: 3477, generatedLineIndex: 84, - generatedCharacterOffsetIndex: 32, + generatedCharacterOffsetIndex: 46, contentLength: 2), BuildLineMapping( documentAbsoluteIndex: 611, documentLineIndex: 18, - generatedAbsoluteIndex: 3241, + documentCharacterOffsetIndex: 52, + generatedAbsoluteIndex: 3749, generatedLineIndex: 90, - characterOffsetIndex: 52, + generatedCharacterOffsetIndex: 64, contentLength: 2), BuildLineMapping( documentAbsoluteIndex: 634, documentLineIndex: 18, - generatedAbsoluteIndex: 3511, + generatedAbsoluteIndex: 4047, generatedLineIndex: 96, characterOffsetIndex: 75, contentLength: 2), BuildLineMapping( documentAbsoluteIndex: 783, documentLineIndex: 20, - generatedAbsoluteIndex: 4124, + generatedAbsoluteIndex: 4772, generatedLineIndex: 106, characterOffsetIndex: 42, contentLength: 8), @@ -1137,9 +1152,9 @@ namespace Microsoft.AspNet.Razor.Test.Generator documentAbsoluteIndex: 826, documentLineIndex: 21, documentCharacterOffsetIndex: 29, - generatedAbsoluteIndex: 4603, + generatedAbsoluteIndex: 5379, generatedLineIndex: 115, - generatedCharacterOffsetIndex: 51, + generatedCharacterOffsetIndex: 65, contentLength: 2), } }, @@ -1159,17 +1174,18 @@ namespace Microsoft.AspNet.Razor.Test.Generator BuildLineMapping( documentAbsoluteIndex: 146, documentLineIndex: 4, - generatedAbsoluteIndex: 1513, + documentCharacterOffsetIndex: 34, + generatedAbsoluteIndex: 1857, generatedLineIndex: 42, - characterOffsetIndex: 34, + generatedCharacterOffsetIndex: 42, contentLength: 4), BuildLineMapping( documentAbsoluteIndex: 43, documentLineIndex: 2, documentCharacterOffsetIndex: 8, - generatedAbsoluteIndex: 1676, + generatedAbsoluteIndex: 2070, generatedLineIndex: 48, - generatedCharacterOffsetIndex: 19, + generatedCharacterOffsetIndex: 33, contentLength: 1), } }, @@ -1189,7 +1205,7 @@ namespace Microsoft.AspNet.Razor.Test.Generator BuildLineMapping( documentAbsoluteIndex: 59, documentLineIndex: 2, - generatedAbsoluteIndex: 966, + generatedAbsoluteIndex: 1038, generatedLineIndex: 33, characterOffsetIndex: 24, contentLength: 12), @@ -1197,56 +1213,56 @@ namespace Microsoft.AspNet.Razor.Test.Generator documentAbsoluteIndex: 96, documentLineIndex: 4, documentCharacterOffsetIndex: 17, - generatedAbsoluteIndex: 1140, + generatedAbsoluteIndex: 1248, generatedLineIndex: 39, generatedCharacterOffsetIndex: 16, contentLength: 12), BuildLineMapping( documentAbsoluteIndex: 109, documentLineIndex: 4, - generatedAbsoluteIndex: 1262, + generatedAbsoluteIndex: 1370, generatedLineIndex: 45, characterOffsetIndex: 30, contentLength: 12), BuildLineMapping( documentAbsoluteIndex: 121, documentLineIndex: 4, - generatedAbsoluteIndex: 1395, + generatedAbsoluteIndex: 1503, generatedLineIndex: 50, characterOffsetIndex: 42, contentLength: 10), BuildLineMapping( documentAbsoluteIndex: 132, documentLineIndex: 4, - generatedAbsoluteIndex: 1538, + generatedAbsoluteIndex: 1646, generatedLineIndex: 56, characterOffsetIndex: 53, contentLength: 5), BuildLineMapping( documentAbsoluteIndex: 137, documentLineIndex: 4, - generatedAbsoluteIndex: 1680, + generatedAbsoluteIndex: 1788, generatedLineIndex: 61, characterOffsetIndex: 58, contentLength: 2), BuildLineMapping( documentAbsoluteIndex: 176, documentLineIndex: 6, - generatedAbsoluteIndex: 1851, + generatedAbsoluteIndex: 1995, generatedLineIndex: 68, characterOffsetIndex: 22, contentLength: 12), BuildLineMapping( documentAbsoluteIndex: 214, documentLineIndex: 6, - generatedAbsoluteIndex: 2054, + generatedAbsoluteIndex: 2212, generatedLineIndex: 74, characterOffsetIndex: 60, contentLength: 12), BuildLineMapping( documentAbsoluteIndex: 256, documentLineIndex: 8, - generatedAbsoluteIndex: 2227, + generatedAbsoluteIndex: 2421, generatedLineIndex: 80, characterOffsetIndex: 15, contentLength: 13), @@ -1254,49 +1270,49 @@ namespace Microsoft.AspNet.Razor.Test.Generator documentAbsoluteIndex: 271, documentLineIndex: 8, documentCharacterOffsetIndex: 30, - generatedAbsoluteIndex: 2348, + generatedAbsoluteIndex: 2542, generatedLineIndex: 85, generatedCharacterOffsetIndex: 29, contentLength: 12), BuildLineMapping( documentAbsoluteIndex: 284, documentLineIndex: 8, - generatedAbsoluteIndex: 2483, + generatedAbsoluteIndex: 2677, generatedLineIndex: 91, characterOffsetIndex: 43, contentLength: 12), BuildLineMapping( documentAbsoluteIndex: 296, documentLineIndex: 8, - generatedAbsoluteIndex: 2629, + generatedAbsoluteIndex: 2823, generatedLineIndex: 96, characterOffsetIndex: 55, contentLength: 10), BuildLineMapping( documentAbsoluteIndex: 307, documentLineIndex: 8, - generatedAbsoluteIndex: 2785, + generatedAbsoluteIndex: 2979, generatedLineIndex: 102, characterOffsetIndex: 66, contentLength: 5), BuildLineMapping( documentAbsoluteIndex: 312, documentLineIndex: 8, - generatedAbsoluteIndex: 2940, + generatedAbsoluteIndex: 3134, generatedLineIndex: 107, characterOffsetIndex: 71, contentLength: 2), BuildLineMapping( documentAbsoluteIndex: 316, documentLineIndex: 8, - generatedAbsoluteIndex: 3097, + generatedAbsoluteIndex: 3291, generatedLineIndex: 113, characterOffsetIndex: 75, contentLength: 12), BuildLineMapping( documentAbsoluteIndex: 348, documentLineIndex: 9, - generatedAbsoluteIndex: 3258, + generatedAbsoluteIndex: 3466, generatedLineIndex: 119, characterOffsetIndex: 17, contentLength: 13), @@ -1304,63 +1320,63 @@ namespace Microsoft.AspNet.Razor.Test.Generator documentAbsoluteIndex: 363, documentLineIndex: 9, documentCharacterOffsetIndex: 32, - generatedAbsoluteIndex: 3382, + generatedAbsoluteIndex: 3590, generatedLineIndex: 124, generatedCharacterOffsetIndex: 31, contentLength: 12), BuildLineMapping( documentAbsoluteIndex: 376, documentLineIndex: 9, - generatedAbsoluteIndex: 3520, + generatedAbsoluteIndex: 3728, generatedLineIndex: 130, characterOffsetIndex: 45, contentLength: 12), BuildLineMapping( documentAbsoluteIndex: 388, documentLineIndex: 9, - generatedAbsoluteIndex: 3669, + generatedAbsoluteIndex: 3877, generatedLineIndex: 135, characterOffsetIndex: 57, contentLength: 10), BuildLineMapping( documentAbsoluteIndex: 399, documentLineIndex: 9, - generatedAbsoluteIndex: 3828, + generatedAbsoluteIndex: 4036, generatedLineIndex: 141, characterOffsetIndex: 68, contentLength: 5), BuildLineMapping( documentAbsoluteIndex: 404, documentLineIndex: 9, - generatedAbsoluteIndex: 3986, + generatedAbsoluteIndex: 4194, generatedLineIndex: 146, characterOffsetIndex: 73, contentLength: 2), BuildLineMapping( documentAbsoluteIndex: 408, documentLineIndex: 9, - generatedAbsoluteIndex: 4146, + generatedAbsoluteIndex: 4354, generatedLineIndex: 152, characterOffsetIndex: 77, contentLength: 12), BuildLineMapping( documentAbsoluteIndex: 445, documentLineIndex: 11, - generatedAbsoluteIndex: 4322, + generatedAbsoluteIndex: 4566, generatedLineIndex: 158, characterOffsetIndex: 17, contentLength: 13), BuildLineMapping( documentAbsoluteIndex: 460, documentLineIndex: 11, - generatedAbsoluteIndex: 4447, + generatedAbsoluteIndex: 4691, generatedLineIndex: 163, characterOffsetIndex: 32, contentLength: 12), BuildLineMapping( documentAbsoluteIndex: 492, documentLineIndex: 11, - generatedAbsoluteIndex: 4603, + generatedAbsoluteIndex: 4847, generatedLineIndex: 168, characterOffsetIndex: 64, contentLength: 12), @@ -1368,35 +1384,35 @@ namespace Microsoft.AspNet.Razor.Test.Generator documentAbsoluteIndex: 529, documentLineIndex: 13, documentCharacterOffsetIndex: 17, - generatedAbsoluteIndex: 4778, + generatedAbsoluteIndex: 5058, generatedLineIndex: 174, generatedCharacterOffsetIndex: 16, contentLength: 12), BuildLineMapping( documentAbsoluteIndex: 542, documentLineIndex: 13, - generatedAbsoluteIndex: 4901, + generatedAbsoluteIndex: 5181, generatedLineIndex: 180, characterOffsetIndex: 30, contentLength: 12), BuildLineMapping( documentAbsoluteIndex: 554, documentLineIndex: 13, - generatedAbsoluteIndex: 5035, + generatedAbsoluteIndex: 5315, generatedLineIndex: 185, characterOffsetIndex: 42, contentLength: 10), BuildLineMapping( documentAbsoluteIndex: 565, documentLineIndex: 13, - generatedAbsoluteIndex: 5179, + generatedAbsoluteIndex: 5459, generatedLineIndex: 191, characterOffsetIndex: 53, contentLength: 5), BuildLineMapping( documentAbsoluteIndex: 570, documentLineIndex: 13, - generatedAbsoluteIndex: 5322, + generatedAbsoluteIndex: 5602, generatedLineIndex: 196, characterOffsetIndex: 58, contentLength: 2), @@ -1418,116 +1434,121 @@ namespace Microsoft.AspNet.Razor.Test.Generator BuildLineMapping( documentAbsoluteIndex: 35, documentLineIndex: 1, - generatedAbsoluteIndex: 893, + generatedAbsoluteIndex: 929, generatedLineIndex: 32, characterOffsetIndex: 2, contentLength: 59), BuildLineMapping( documentAbsoluteIndex: 122, documentLineIndex: 6, - generatedAbsoluteIndex: 1118, + documentCharacterOffsetIndex: 23, + generatedAbsoluteIndex: 1200, generatedLineIndex: 41, - characterOffsetIndex: 23, + generatedCharacterOffsetIndex: 33, contentLength: 4), BuildLineMapping( documentAbsoluteIndex: 157, documentLineIndex: 7, - generatedAbsoluteIndex: 1278, + generatedAbsoluteIndex: 1396, generatedLineIndex: 47, characterOffsetIndex: 12, contentLength: 6), BuildLineMapping( documentAbsoluteIndex: 171, documentLineIndex: 7, - generatedAbsoluteIndex: 1395, + documentCharacterOffsetIndex: 26, + generatedAbsoluteIndex: 1520, generatedLineIndex: 52, - characterOffsetIndex: 26, + generatedCharacterOffsetIndex: 33, contentLength: 2), BuildLineMapping( documentAbsoluteIndex: 202, documentLineIndex: 8, - generatedAbsoluteIndex: 1562, + documentCharacterOffsetIndex: 21, + generatedAbsoluteIndex: 1735, generatedLineIndex: 58, - characterOffsetIndex: 21, + generatedCharacterOffsetIndex: 33, contentLength: 5), BuildLineMapping( documentAbsoluteIndex: 207, documentLineIndex: 8, - generatedAbsoluteIndex: 1567, + documentCharacterOffsetIndex: 26, + generatedAbsoluteIndex: 1740, generatedLineIndex: 58, - characterOffsetIndex: 26, + generatedCharacterOffsetIndex: 38, contentLength: 1), BuildLineMapping( documentAbsoluteIndex: 208, documentLineIndex: 8, - generatedAbsoluteIndex: 1568, + documentCharacterOffsetIndex: 27, + generatedAbsoluteIndex: 1741, generatedLineIndex: 58, - characterOffsetIndex: 27, + generatedCharacterOffsetIndex: 39, contentLength: 3), BuildLineMapping( documentAbsoluteIndex: 241, documentLineIndex: 9, documentCharacterOffsetIndex: 22, - generatedAbsoluteIndex: 1737, + generatedAbsoluteIndex: 1958, generatedLineIndex: 64, - generatedCharacterOffsetIndex: 21, + generatedCharacterOffsetIndex: 33, contentLength: 3), BuildLineMapping( documentAbsoluteIndex: 274, documentLineIndex: 10, documentCharacterOffsetIndex: 22, - generatedAbsoluteIndex: 1906, + generatedAbsoluteIndex: 2175, generatedLineIndex: 70, - generatedCharacterOffsetIndex: 21, + generatedCharacterOffsetIndex: 33, contentLength: 1), BuildLineMapping( documentAbsoluteIndex: 275, documentLineIndex: 10, documentCharacterOffsetIndex: 23, - generatedAbsoluteIndex: 1907, + generatedAbsoluteIndex: 2176, generatedLineIndex: 70, - generatedCharacterOffsetIndex: 22, + generatedCharacterOffsetIndex: 34, contentLength: 4), BuildLineMapping( documentAbsoluteIndex: 279, documentLineIndex: 10, documentCharacterOffsetIndex: 27, - generatedAbsoluteIndex: 1911, + generatedAbsoluteIndex: 2180, generatedLineIndex: 70, - generatedCharacterOffsetIndex: 26, + generatedCharacterOffsetIndex: 38, contentLength: 1), BuildLineMapping( documentAbsoluteIndex: 307, documentLineIndex: 11, - generatedAbsoluteIndex: 2076, + generatedAbsoluteIndex: 2381, generatedLineIndex: 76, characterOffsetIndex: 19, contentLength: 6), BuildLineMapping( documentAbsoluteIndex: 321, documentLineIndex: 11, - generatedAbsoluteIndex: 2201, + generatedAbsoluteIndex: 2506, generatedLineIndex: 81, characterOffsetIndex: 33, contentLength: 4), BuildLineMapping( documentAbsoluteIndex: 325, documentLineIndex: 11, - generatedAbsoluteIndex: 2205, + generatedAbsoluteIndex: 2510, generatedLineIndex: 81, characterOffsetIndex: 37, contentLength: 2), BuildLineMapping( documentAbsoluteIndex: 327, documentLineIndex: 11, - generatedAbsoluteIndex: 2207, + generatedAbsoluteIndex: 2512, generatedLineIndex: 81, characterOffsetIndex: 39, contentLength: 8), BuildLineMapping( documentAbsoluteIndex: 335, documentLineIndex: 11, - generatedAbsoluteIndex: 2215, + generatedAbsoluteIndex: 2520, generatedLineIndex: 81, characterOffsetIndex: 47, contentLength: 1), @@ -1549,7 +1570,7 @@ namespace Microsoft.AspNet.Razor.Test.Generator BuildLineMapping( documentAbsoluteIndex: 182, documentLineIndex: 5, - generatedAbsoluteIndex: 979, + generatedAbsoluteIndex: 1087, generatedLineIndex: 34, characterOffsetIndex: 0, contentLength: 12), @@ -1557,28 +1578,28 @@ namespace Microsoft.AspNet.Razor.Test.Generator documentAbsoluteIndex: 195, documentLineIndex: 5, documentCharacterOffsetIndex: 13, - generatedAbsoluteIndex: 1082, + generatedAbsoluteIndex: 1190, generatedLineIndex: 40, generatedCharacterOffsetIndex: 12, contentLength: 30), BuildLineMapping( documentAbsoluteIndex: 339, documentLineIndex: 7, - generatedAbsoluteIndex: 1375, + generatedAbsoluteIndex: 1555, generatedLineIndex: 48, characterOffsetIndex: 50, contentLength: 23), BuildLineMapping( documentAbsoluteIndex: 389, documentLineIndex: 7, - generatedAbsoluteIndex: 1682, + generatedAbsoluteIndex: 1904, generatedLineIndex: 55, characterOffsetIndex: 100, contentLength: 4), BuildLineMapping( documentAbsoluteIndex: 424, documentLineIndex: 9, - generatedAbsoluteIndex: 1765, + generatedAbsoluteIndex: 1987, generatedLineIndex: 60, characterOffsetIndex: 0, contentLength: 15), @@ -1601,33 +1622,33 @@ namespace Microsoft.AspNet.Razor.Test.Generator documentAbsoluteIndex: 296, documentLineIndex: 11, documentCharacterOffsetIndex: 18, - generatedAbsoluteIndex: 959, + generatedAbsoluteIndex: 1045, generatedLineIndex: 33, - generatedCharacterOffsetIndex: 32, + generatedCharacterOffsetIndex: 46, contentLength: 5), BuildLineMapping( documentAbsoluteIndex: 345, documentLineIndex: 12, documentCharacterOffsetIndex: 20, - generatedAbsoluteIndex: 1145, + generatedAbsoluteIndex: 1281, generatedLineIndex: 39, - generatedCharacterOffsetIndex: 33, + generatedCharacterOffsetIndex: 47, contentLength: 5), BuildLineMapping( documentAbsoluteIndex: 399, documentLineIndex: 13, documentCharacterOffsetIndex: 23, - generatedAbsoluteIndex: 1327, + generatedAbsoluteIndex: 1513, generatedLineIndex: 45, - generatedCharacterOffsetIndex: 29, + generatedCharacterOffsetIndex: 43, contentLength: 13), BuildLineMapping( documentAbsoluteIndex: 481, documentLineIndex: 14, documentCharacterOffsetIndex: 24, - generatedAbsoluteIndex: 1517, + generatedAbsoluteIndex: 1753, generatedLineIndex: 51, - generatedCharacterOffsetIndex: 29, + generatedCharacterOffsetIndex: 43, contentLength: 13), } }, @@ -1647,7 +1668,7 @@ namespace Microsoft.AspNet.Razor.Test.Generator BuildLineMapping( documentAbsoluteIndex: 37, documentLineIndex: 2, - generatedAbsoluteIndex: 892, + generatedAbsoluteIndex: 964, generatedLineIndex: 33, characterOffsetIndex: 2, contentLength: 39), @@ -1655,14 +1676,14 @@ namespace Microsoft.AspNet.Razor.Test.Generator documentAbsoluteIndex: 96, documentLineIndex: 6, documentCharacterOffsetIndex: 15, - generatedAbsoluteIndex: 1162, + generatedAbsoluteIndex: 1320, generatedLineIndex: 42, - generatedCharacterOffsetIndex: 25, + generatedCharacterOffsetIndex: 39, contentLength: 14), BuildLineMapping( documentAbsoluteIndex: 131, documentLineIndex: 7, - generatedAbsoluteIndex: 1398, + generatedAbsoluteIndex: 1628, generatedLineIndex: 49, characterOffsetIndex: 15, contentLength: 20), @@ -1670,41 +1691,41 @@ namespace Microsoft.AspNet.Razor.Test.Generator documentAbsoluteIndex: 171, documentLineIndex: 8, documentCharacterOffsetIndex: 14, - generatedAbsoluteIndex: 1695, + generatedAbsoluteIndex: 2011, generatedLineIndex: 56, - generatedCharacterOffsetIndex: 70, + generatedCharacterOffsetIndex: 84, contentLength: 7), BuildLineMapping( documentAbsoluteIndex: 198, documentLineIndex: 9, documentCharacterOffsetIndex: 14, - generatedAbsoluteIndex: 1980, + generatedAbsoluteIndex: 2382, generatedLineIndex: 63, - generatedCharacterOffsetIndex: 70, + generatedCharacterOffsetIndex: 84, contentLength: 13), BuildLineMapping( documentAbsoluteIndex: 224, documentLineIndex: 9, documentCharacterOffsetIndex: 40, - generatedAbsoluteIndex: 2146, + generatedAbsoluteIndex: 2553, generatedLineIndex: 68, - generatedCharacterOffsetIndex: 85, + generatedCharacterOffsetIndex: 90, contentLength: 7), BuildLineMapping( documentAbsoluteIndex: 251, documentLineIndex: 10, documentCharacterOffsetIndex: 15, - generatedAbsoluteIndex: 2386, + generatedAbsoluteIndex: 2879, generatedLineIndex: 75, - generatedCharacterOffsetIndex: 25, + generatedCharacterOffsetIndex: 39, contentLength: 9), BuildLineMapping( documentAbsoluteIndex: 274, documentLineIndex: 10, documentCharacterOffsetIndex: 38, - generatedAbsoluteIndex: 2500, + generatedAbsoluteIndex: 3001, generatedLineIndex: 80, - generatedCharacterOffsetIndex: 37, + generatedCharacterOffsetIndex: 45, contentLength: 9), } } @@ -1820,7 +1841,7 @@ namespace Microsoft.AspNet.Razor.Test.Generator new TagHelperDescriptor { TagName = "p", - TypeName = "pTagHelper", + TypeName = "TestNamespace.PTagHelper", AssemblyName = "SomeAssembly" } }); @@ -1831,12 +1852,12 @@ namespace Microsoft.AspNet.Razor.Test.Generator { // Arrange var propertyInfo = typeof(TestType).GetProperty("BoundProperty"); - var tagHelperDescriptors = new TagHelperDescriptor[] + var tagHelperDescriptors = new[] { new TagHelperDescriptor { TagName = "MyTagHelper", - TypeName = "MyTagHelper", + TypeName = "TestNamespace.MyTagHelper", AssemblyName = "SomeAssembly", Attributes = new [] { @@ -1846,7 +1867,7 @@ namespace Microsoft.AspNet.Razor.Test.Generator new TagHelperDescriptor { TagName = "NestedTagHelper", - TypeName = "NestedTagHelper", + TypeName = "TestNamespace.NestedTagHelper", AssemblyName = "SomeAssembly" } }; @@ -1867,7 +1888,7 @@ namespace Microsoft.AspNet.Razor.Test.Generator { Prefix = prefix, TagName = "p", - TypeName = "PTagHelper", + TypeName = "TestNamespace.PTagHelper", AssemblyName = "SomeAssembly", Attributes = new TagHelperAttributeDescriptor[] { @@ -1879,7 +1900,7 @@ namespace Microsoft.AspNet.Razor.Test.Generator { Prefix = prefix, TagName = "input", - TypeName = "InputTagHelper", + TypeName = "TestNamespace.InputTagHelper", AssemblyName = "SomeAssembly", Attributes = new TagHelperAttributeDescriptor[] { @@ -1891,7 +1912,7 @@ namespace Microsoft.AspNet.Razor.Test.Generator { Prefix = prefix, TagName = "input", - TypeName = "InputTagHelper2", + TypeName = "TestNamespace.InputTagHelper2", AssemblyName = "SomeAssembly", Attributes = new TagHelperAttributeDescriptor[] { diff --git a/test/Microsoft.AspNet.Razor.Test/CodeGenerators/TagHelperAttributeValueCodeRendererTest.cs b/test/Microsoft.AspNet.Razor.Test/CodeGenerators/TagHelperAttributeValueCodeRendererTest.cs index 0fe4b2fe0d..a6da3a79bc 100644 --- a/test/Microsoft.AspNet.Razor.Test/CodeGenerators/TagHelperAttributeValueCodeRendererTest.cs +++ b/test/Microsoft.AspNet.Razor.Test/CodeGenerators/TagHelperAttributeValueCodeRendererTest.cs @@ -26,13 +26,13 @@ namespace Microsoft.AspNet.Razor.Test.Generator new TagHelperDescriptor { TagName = "p", - TypeName = "PTagHelper", + TypeName = "TestNamespace.PTagHelper", AssemblyName = "SomeAssembly" }, new TagHelperDescriptor { TagName = "input", - TypeName = "InputTagHelper", + TypeName = "TestNamespace.InputTagHelper", AssemblyName = "SomeAssembly", Attributes = new TagHelperAttributeDescriptor[] { @@ -43,7 +43,7 @@ namespace Microsoft.AspNet.Razor.Test.Generator new TagHelperDescriptor { TagName = "input", - TypeName = "InputTagHelper2", + TypeName = "TestNamespace.InputTagHelper2", AssemblyName = "SomeAssembly", Attributes = new TagHelperAttributeDescriptor[] { 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 1089d2acc0..4f02bdb60f 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 @@ -20,10 +20,10 @@ namespace TestOutput #pragma warning restore 219 } #line hidden - private PTagHelper __PTagHelper = null; - private CatchAllTagHelper __CatchAllTagHelper = null; - private InputTagHelper __InputTagHelper = null; - private InputTagHelper2 __InputTagHelper2 = null; + private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper = null; + private global::TestNamespace.CatchAllTagHelper __TestNamespace_CatchAllTagHelper = null; + private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper = null; + private global::TestNamespace.InputTagHelper2 __TestNamespace_InputTagHelper2 = null; #line hidden public AttributeTargetingTagHelpers() { @@ -32,27 +32,27 @@ namespace TestOutput #pragma warning disable 1998 public override async Task ExecuteAsync() { - __CatchAllTagHelper = CreateTagHelper(); - __InputTagHelper = CreateTagHelper(); - __InputTagHelper2 = CreateTagHelper(); - __InputTagHelper.Type = "checkbox"; - __InputTagHelper2.Type = __InputTagHelper.Type; + __TestNamespace_CatchAllTagHelper = CreateTagHelper(); + __TestNamespace_InputTagHelper = CreateTagHelper(); + __TestNamespace_InputTagHelper2 = CreateTagHelper(); + __TestNamespace_InputTagHelper.Type = "checkbox"; + __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type; #line 6 "AttributeTargetingTagHelpers.cshtml" - __InputTagHelper2.Checked = true; +__TestNamespace_InputTagHelper2.Checked = true; #line default #line hidden - __InputTagHelper = CreateTagHelper(); - __InputTagHelper2 = CreateTagHelper(); - __CatchAllTagHelper = CreateTagHelper(); - __InputTagHelper.Type = "checkbox"; - __InputTagHelper2.Type = __InputTagHelper.Type; + __TestNamespace_InputTagHelper = CreateTagHelper(); + __TestNamespace_InputTagHelper2 = CreateTagHelper(); + __TestNamespace_CatchAllTagHelper = CreateTagHelper(); + __TestNamespace_InputTagHelper.Type = "checkbox"; + __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type; #line 7 "AttributeTargetingTagHelpers.cshtml" - __InputTagHelper2.Checked = true; +__TestNamespace_InputTagHelper2.Checked = true; #line default #line hidden - __PTagHelper = CreateTagHelper(); + __TestNamespace_PTagHelper = CreateTagHelper(); } #pragma warning restore 1998 } 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 4bbde1ebf4..0a8cb2fdf0 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/AttributeTargetingTagHelpers.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/AttributeTargetingTagHelpers.cs @@ -1,8 +1,6 @@ #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; @@ -10,15 +8,15 @@ namespace TestOutput { #line hidden #pragma warning disable 0414 - private TagHelperContent __tagHelperStringValueBuffer = null; + private global::Microsoft.AspNet.Razor.TagHelperContent __tagHelperStringValueBuffer = null; #pragma warning restore 0414 - private TagHelperExecutionContext __tagHelperExecutionContext = null; - private TagHelperRunner __tagHelperRunner = null; - private TagHelperScopeManager __tagHelperScopeManager = new TagHelperScopeManager(); - private PTagHelper __PTagHelper = null; - private CatchAllTagHelper __CatchAllTagHelper = null; - private InputTagHelper __InputTagHelper = null; - private InputTagHelper2 __InputTagHelper2 = null; + private global::Microsoft.AspNet.Razor.Runtime.TagHelperExecutionContext __tagHelperExecutionContext = null; + private global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner __tagHelperRunner = null; + private global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager __tagHelperScopeManager = new global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager(); + private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper = null; + private global::TestNamespace.CatchAllTagHelper __TestNamespace_CatchAllTagHelper = null; + private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper = null; + private global::TestNamespace.InputTagHelper2 __TestNamespace_InputTagHelper2 = null; #line hidden public AttributeTargetingTagHelpers() { @@ -27,22 +25,22 @@ namespace TestOutput #pragma warning disable 1998 public override async Task ExecuteAsync() { - __tagHelperRunner = __tagHelperRunner ?? new TagHelperRunner(); + __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner(); Instrumentation.BeginContext(30, 2, true); WriteLiteral("\r\n"); Instrumentation.EndContext(); - __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", TagMode.StartTagAndEndTag, "test", async() => { + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => { Instrumentation.BeginContext(47, 9, true); WriteLiteral("\r\n

"); Instrumentation.EndContext(); - __tagHelperExecutionContext = __tagHelperScopeManager.Begin("strong", TagMode.StartTagAndEndTag, "test", async() => { + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("strong", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => { Instrumentation.BeginContext(78, 5, true); WriteLiteral("Hello"); Instrumentation.EndContext(); } , StartTagHelperWritingScope, EndTagHelperWritingScope); - __CatchAllTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__CatchAllTagHelper); + __TestNamespace_CatchAllTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_CatchAllTagHelper); __tagHelperExecutionContext.AddHtmlAttribute("catchAll", Html.Raw("hi")); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); Instrumentation.BeginContext(56, 36, false); @@ -52,22 +50,22 @@ namespace TestOutput Instrumentation.BeginContext(92, 62, true); WriteLiteral("World

\r\n \r\n "); Instrumentation.EndContext(); - __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", TagMode.SelfClosing, "test", async() => { + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { } , StartTagHelperWritingScope, EndTagHelperWritingScope); - __InputTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__InputTagHelper); - __InputTagHelper2 = CreateTagHelper(); - __tagHelperExecutionContext.Add(__InputTagHelper2); - __InputTagHelper.Type = "checkbox"; - __tagHelperExecutionContext.AddTagHelperAttribute("type", __InputTagHelper.Type); - __InputTagHelper2.Type = __InputTagHelper.Type; + __TestNamespace_InputTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper); + __TestNamespace_InputTagHelper2 = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper2); + __TestNamespace_InputTagHelper.Type = "checkbox"; + __tagHelperExecutionContext.AddTagHelperAttribute("type", __TestNamespace_InputTagHelper.Type); + __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type; #line 6 "AttributeTargetingTagHelpers.cshtml" - __InputTagHelper2.Checked = true; +__TestNamespace_InputTagHelper2.Checked = true; #line default #line hidden - __tagHelperExecutionContext.AddTagHelperAttribute("checked", __InputTagHelper2.Checked); + __tagHelperExecutionContext.AddTagHelperAttribute("checked", __TestNamespace_InputTagHelper2.Checked); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); Instrumentation.BeginContext(154, 40, false); await WriteTagHelperAsync(__tagHelperExecutionContext); @@ -76,24 +74,24 @@ namespace TestOutput Instrumentation.BeginContext(194, 6, true); WriteLiteral("\r\n "); Instrumentation.EndContext(); - __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", TagMode.SelfClosing, "test", async() => { + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { } , StartTagHelperWritingScope, EndTagHelperWritingScope); - __InputTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__InputTagHelper); - __InputTagHelper2 = CreateTagHelper(); - __tagHelperExecutionContext.Add(__InputTagHelper2); - __CatchAllTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__CatchAllTagHelper); - __InputTagHelper.Type = "checkbox"; - __tagHelperExecutionContext.AddTagHelperAttribute("type", __InputTagHelper.Type); - __InputTagHelper2.Type = __InputTagHelper.Type; + __TestNamespace_InputTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper); + __TestNamespace_InputTagHelper2 = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper2); + __TestNamespace_CatchAllTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_CatchAllTagHelper); + __TestNamespace_InputTagHelper.Type = "checkbox"; + __tagHelperExecutionContext.AddTagHelperAttribute("type", __TestNamespace_InputTagHelper.Type); + __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type; #line 7 "AttributeTargetingTagHelpers.cshtml" - __InputTagHelper2.Checked = true; +__TestNamespace_InputTagHelper2.Checked = true; #line default #line hidden - __tagHelperExecutionContext.AddTagHelperAttribute("checked", __InputTagHelper2.Checked); + __tagHelperExecutionContext.AddTagHelperAttribute("checked", __TestNamespace_InputTagHelper2.Checked); __tagHelperExecutionContext.AddHtmlAttribute("catchAll", Html.Raw("hi")); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); Instrumentation.BeginContext(200, 54, false); @@ -105,8 +103,8 @@ namespace TestOutput Instrumentation.EndContext(); } , StartTagHelperWritingScope, EndTagHelperWritingScope); - __PTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__PTagHelper); + __TestNamespace_PTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_PTagHelper); __tagHelperExecutionContext.AddHtmlAttribute("class", Html.Raw("btn")); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); Instrumentation.BeginContext(32, 228, false); 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 401700404b..98687e8efb 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,22 +1,20 @@ #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; public class BasicTagHelpers { #line hidden #pragma warning disable 0414 - private TagHelperContent __tagHelperStringValueBuffer = null; + private global::Microsoft.AspNet.Razor.TagHelperContent __tagHelperStringValueBuffer = null; #pragma warning restore 0414 - private TagHelperExecutionContext __tagHelperExecutionContext = null; - private TagHelperRunner __tagHelperRunner = null; - private TagHelperScopeManager __tagHelperScopeManager = new TagHelperScopeManager(); - private PTagHelper __PTagHelper = null; - private InputTagHelper __InputTagHelper = null; - private InputTagHelper2 __InputTagHelper2 = null; + private global::Microsoft.AspNet.Razor.Runtime.TagHelperExecutionContext __tagHelperExecutionContext = null; + private global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner __tagHelperRunner = null; + private global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager __tagHelperScopeManager = new global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager(); + private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper = null; + private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper = null; + private global::TestNamespace.InputTagHelper2 __TestNamespace_InputTagHelper2 = null; #line hidden public BasicTagHelpers() { @@ -25,19 +23,19 @@ namespace TestOutput #pragma warning disable 1998 public override async Task ExecuteAsync() { - __tagHelperRunner = __tagHelperRunner ?? new TagHelperRunner(); + __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner(); Instrumentation.BeginContext(33, 71, true); WriteLiteral("\r\n
\r\n "); Instrumentation.EndContext(); - __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", TagMode.StartTagAndEndTag, "test", async() => { + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => { Instrumentation.BeginContext(145, 10, true); WriteLiteral("\r\n "); Instrumentation.EndContext(); - __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", TagMode.StartTagAndEndTag, "test", async() => { + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => { } , StartTagHelperWritingScope, EndTagHelperWritingScope); - __PTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__PTagHelper); + __TestNamespace_PTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_PTagHelper); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); Instrumentation.BeginContext(155, 7, false); await WriteTagHelperAsync(__tagHelperExecutionContext); @@ -46,13 +44,13 @@ namespace TestOutput Instrumentation.BeginContext(162, 10, true); WriteLiteral("\r\n "); Instrumentation.EndContext(); - __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", TagMode.StartTagOnly, "test", async() => { + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagOnly, "test", async() => { } , StartTagHelperWritingScope, EndTagHelperWritingScope); - __InputTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__InputTagHelper); - __InputTagHelper2 = CreateTagHelper(); - __tagHelperExecutionContext.Add(__InputTagHelper2); + __TestNamespace_InputTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper); + __TestNamespace_InputTagHelper2 = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper2); StartTagHelperWritingScope(); WriteLiteral("2000 + "); #line 6 "BasicTagHelpers.cshtml" @@ -63,9 +61,9 @@ namespace TestOutput WriteLiteral(" + 1"); __tagHelperStringValueBuffer = EndTagHelperWritingScope(); __tagHelperExecutionContext.AddHtmlAttribute("data-interval", Html.Raw(__tagHelperStringValueBuffer.GetContent(HtmlEncoder))); - __InputTagHelper.Type = **From custom attribute code renderer**: "text"; - __tagHelperExecutionContext.AddTagHelperAttribute("type", __InputTagHelper.Type); - __InputTagHelper2.Type = __InputTagHelper.Type; + __TestNamespace_InputTagHelper.Type = **From custom attribute code renderer**: "text"; + __tagHelperExecutionContext.AddTagHelperAttribute("type", __TestNamespace_InputTagHelper.Type); + __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type; __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); Instrumentation.BeginContext(172, 71, false); await WriteTagHelperAsync(__tagHelperExecutionContext); @@ -74,22 +72,22 @@ namespace TestOutput Instrumentation.BeginContext(243, 10, true); WriteLiteral("\r\n "); Instrumentation.EndContext(); - __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", TagMode.SelfClosing, "test", async() => { + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { } , StartTagHelperWritingScope, EndTagHelperWritingScope); - __InputTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__InputTagHelper); - __InputTagHelper2 = CreateTagHelper(); - __tagHelperExecutionContext.Add(__InputTagHelper2); - __InputTagHelper.Type = **From custom attribute code renderer**: "checkbox"; - __tagHelperExecutionContext.AddTagHelperAttribute("type", __InputTagHelper.Type); - __InputTagHelper2.Type = __InputTagHelper.Type; + __TestNamespace_InputTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper); + __TestNamespace_InputTagHelper2 = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper2); + __TestNamespace_InputTagHelper.Type = **From custom attribute code renderer**: "checkbox"; + __tagHelperExecutionContext.AddTagHelperAttribute("type", __TestNamespace_InputTagHelper.Type); + __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type; #line 7 "BasicTagHelpers.cshtml" - __InputTagHelper2.Checked = **From custom attribute code renderer**: true; +__TestNamespace_InputTagHelper2.Checked = **From custom attribute code renderer**: true; #line default #line hidden - __tagHelperExecutionContext.AddTagHelperAttribute("checked", __InputTagHelper2.Checked); + __tagHelperExecutionContext.AddTagHelperAttribute("checked", __TestNamespace_InputTagHelper2.Checked); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); Instrumentation.BeginContext(253, 39, false); await WriteTagHelperAsync(__tagHelperExecutionContext); @@ -100,8 +98,8 @@ namespace TestOutput Instrumentation.EndContext(); } , StartTagHelperWritingScope, EndTagHelperWritingScope); - __PTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__PTagHelper); + __TestNamespace_PTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_PTagHelper); __tagHelperExecutionContext.AddHtmlAttribute("class", Html.Raw("Hello World")); __tagHelperExecutionContext.AddHtmlAttribute("data-delay", Html.Raw("1000")); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); 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 9725c15ff0..319bb469c1 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 @@ -20,9 +20,9 @@ namespace TestOutput #pragma warning restore 219 } #line hidden - private PTagHelper __PTagHelper = null; - private InputTagHelper __InputTagHelper = null; - private InputTagHelper2 __InputTagHelper2 = null; + private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper = null; + private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper = null; + private global::TestNamespace.InputTagHelper2 __TestNamespace_InputTagHelper2 = null; #line hidden public BasicTagHelpers() { @@ -31,26 +31,26 @@ namespace TestOutput #pragma warning disable 1998 public override async Task ExecuteAsync() { - __PTagHelper = CreateTagHelper(); - __InputTagHelper = CreateTagHelper(); - __InputTagHelper2 = CreateTagHelper(); + __TestNamespace_PTagHelper = CreateTagHelper(); + __TestNamespace_InputTagHelper = CreateTagHelper(); + __TestNamespace_InputTagHelper2 = CreateTagHelper(); #line 6 "BasicTagHelpers.cshtml" __o = ViewBag.DefaultInterval; #line default #line hidden - __InputTagHelper.Type = "text"; - __InputTagHelper2.Type = __InputTagHelper.Type; - __InputTagHelper = CreateTagHelper(); - __InputTagHelper2 = CreateTagHelper(); - __InputTagHelper.Type = "checkbox"; - __InputTagHelper2.Type = __InputTagHelper.Type; + __TestNamespace_InputTagHelper.Type = "text"; + __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type; + __TestNamespace_InputTagHelper = CreateTagHelper(); + __TestNamespace_InputTagHelper2 = CreateTagHelper(); + __TestNamespace_InputTagHelper.Type = "checkbox"; + __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type; #line 7 "BasicTagHelpers.cshtml" - __InputTagHelper2.Checked = true; +__TestNamespace_InputTagHelper2.Checked = true; #line default #line hidden - __PTagHelper = CreateTagHelper(); + __TestNamespace_PTagHelper = CreateTagHelper(); } #pragma warning restore 1998 } 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 73e5d28fa9..d119bc52ec 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 @@ -27,9 +27,9 @@ namespace TestOutput #pragma warning restore 219 } #line hidden - private PTagHelper __PTagHelper = null; - private InputTagHelper __InputTagHelper = null; - private InputTagHelper2 __InputTagHelper2 = null; + private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper = null; + private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper = null; + private global::TestNamespace.InputTagHelper2 __TestNamespace_InputTagHelper2 = null; #line hidden public BasicTagHelpers.Prefixed() { @@ -38,16 +38,16 @@ namespace TestOutput #pragma warning disable 1998 public override async Task ExecuteAsync() { - __InputTagHelper = CreateTagHelper(); - __InputTagHelper2 = CreateTagHelper(); - __InputTagHelper.Type = "checkbox"; - __InputTagHelper2.Type = __InputTagHelper.Type; + __TestNamespace_InputTagHelper = CreateTagHelper(); + __TestNamespace_InputTagHelper2 = CreateTagHelper(); + __TestNamespace_InputTagHelper.Type = "checkbox"; + __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type; #line 8 "BasicTagHelpers.Prefixed.cshtml" - __InputTagHelper2.Checked = true; + __TestNamespace_InputTagHelper2.Checked = true; #line default #line hidden - __PTagHelper = CreateTagHelper(); + __TestNamespace_PTagHelper = CreateTagHelper(); } #pragma warning restore 1998 } 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 7460887e16..bd4c79849a 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,8 +1,6 @@ #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; @@ -10,14 +8,14 @@ namespace TestOutput { #line hidden #pragma warning disable 0414 - private TagHelperContent __tagHelperStringValueBuffer = null; + private global::Microsoft.AspNet.Razor.TagHelperContent __tagHelperStringValueBuffer = null; #pragma warning restore 0414 - private TagHelperExecutionContext __tagHelperExecutionContext = null; - private TagHelperRunner __tagHelperRunner = null; - private TagHelperScopeManager __tagHelperScopeManager = new TagHelperScopeManager(); - private PTagHelper __PTagHelper = null; - private InputTagHelper __InputTagHelper = null; - private InputTagHelper2 __InputTagHelper2 = null; + private global::Microsoft.AspNet.Razor.Runtime.TagHelperExecutionContext __tagHelperExecutionContext = null; + private global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner __tagHelperRunner = null; + private global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager __tagHelperScopeManager = new global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager(); + private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper = null; + private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper = null; + private global::TestNamespace.InputTagHelper2 __TestNamespace_InputTagHelper2 = null; #line hidden public BasicTagHelpers.Prefixed() { @@ -26,30 +24,30 @@ namespace TestOutput #pragma warning disable 1998 public override async Task ExecuteAsync() { - __tagHelperRunner = __tagHelperRunner ?? new TagHelperRunner(); + __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner(); Instrumentation.BeginContext(57, 52, true); WriteLiteral("\r\n\r\n "); Instrumentation.EndContext(); - __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", TagMode.StartTagAndEndTag, "test", async() => { + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => { Instrumentation.BeginContext(135, 56, true); WriteLiteral("\r\n

\r\n \r\n "); Instrumentation.EndContext(); - __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", TagMode.StartTagOnly, "test", async() => { + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagOnly, "test", async() => { } , StartTagHelperWritingScope, EndTagHelperWritingScope); - __InputTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__InputTagHelper); - __InputTagHelper2 = CreateTagHelper(); - __tagHelperExecutionContext.Add(__InputTagHelper2); - __InputTagHelper.Type = "checkbox"; - __tagHelperExecutionContext.AddTagHelperAttribute("type", __InputTagHelper.Type); - __InputTagHelper2.Type = __InputTagHelper.Type; + __TestNamespace_InputTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper); + __TestNamespace_InputTagHelper2 = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper2); + __TestNamespace_InputTagHelper.Type = "checkbox"; + __tagHelperExecutionContext.AddTagHelperAttribute("type", __TestNamespace_InputTagHelper.Type); + __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type; #line 8 "BasicTagHelpers.Prefixed.cshtml" - __InputTagHelper2.Checked = true; + __TestNamespace_InputTagHelper2.Checked = true; #line default #line hidden - __tagHelperExecutionContext.AddTagHelperAttribute("checked", __InputTagHelper2.Checked); + __tagHelperExecutionContext.AddTagHelperAttribute("checked", __TestNamespace_InputTagHelper2.Checked); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); Instrumentation.BeginContext(191, 41, false); await WriteTagHelperAsync(__tagHelperExecutionContext); @@ -60,8 +58,8 @@ namespace TestOutput Instrumentation.EndContext(); } , StartTagHelperWritingScope, EndTagHelperWritingScope); - __PTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__PTagHelper); + __TestNamespace_PTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_PTagHelper); __tagHelperExecutionContext.AddHtmlAttribute("class", Html.Raw("Hello World")); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); Instrumentation.BeginContext(109, 136, false); 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 9690999ceb..6ef46dacdf 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.cs @@ -1,8 +1,6 @@ #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; @@ -10,14 +8,14 @@ namespace TestOutput { #line hidden #pragma warning disable 0414 - private TagHelperContent __tagHelperStringValueBuffer = null; + private global::Microsoft.AspNet.Razor.TagHelperContent __tagHelperStringValueBuffer = null; #pragma warning restore 0414 - private TagHelperExecutionContext __tagHelperExecutionContext = null; - private TagHelperRunner __tagHelperRunner = null; - private TagHelperScopeManager __tagHelperScopeManager = new TagHelperScopeManager(); - private PTagHelper __PTagHelper = null; - private InputTagHelper __InputTagHelper = null; - private InputTagHelper2 __InputTagHelper2 = null; + private global::Microsoft.AspNet.Razor.Runtime.TagHelperExecutionContext __tagHelperExecutionContext = null; + private global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner __tagHelperRunner = null; + private global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager __tagHelperScopeManager = new global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager(); + private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper = null; + private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper = null; + private global::TestNamespace.InputTagHelper2 __TestNamespace_InputTagHelper2 = null; #line hidden public BasicTagHelpers() { @@ -26,19 +24,19 @@ namespace TestOutput #pragma warning disable 1998 public override async Task ExecuteAsync() { - __tagHelperRunner = __tagHelperRunner ?? new TagHelperRunner(); + __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner(); Instrumentation.BeginContext(33, 71, true); WriteLiteral("\r\n
\r\n "); Instrumentation.EndContext(); - __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", TagMode.StartTagAndEndTag, "test", async() => { + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => { Instrumentation.BeginContext(145, 10, true); WriteLiteral("\r\n "); Instrumentation.EndContext(); - __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", TagMode.StartTagAndEndTag, "test", async() => { + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => { } , StartTagHelperWritingScope, EndTagHelperWritingScope); - __PTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__PTagHelper); + __TestNamespace_PTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_PTagHelper); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); Instrumentation.BeginContext(155, 7, false); await WriteTagHelperAsync(__tagHelperExecutionContext); @@ -47,13 +45,13 @@ namespace TestOutput Instrumentation.BeginContext(162, 10, true); WriteLiteral("\r\n "); Instrumentation.EndContext(); - __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", TagMode.StartTagOnly, "test", async() => { + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagOnly, "test", async() => { } , StartTagHelperWritingScope, EndTagHelperWritingScope); - __InputTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__InputTagHelper); - __InputTagHelper2 = CreateTagHelper(); - __tagHelperExecutionContext.Add(__InputTagHelper2); + __TestNamespace_InputTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper); + __TestNamespace_InputTagHelper2 = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper2); StartTagHelperWritingScope(); WriteLiteral("2000 + "); #line 6 "BasicTagHelpers.cshtml" @@ -64,9 +62,9 @@ namespace TestOutput WriteLiteral(" + 1"); __tagHelperStringValueBuffer = EndTagHelperWritingScope(); __tagHelperExecutionContext.AddHtmlAttribute("data-interval", Html.Raw(__tagHelperStringValueBuffer.GetContent(HtmlEncoder))); - __InputTagHelper.Type = "text"; - __tagHelperExecutionContext.AddTagHelperAttribute("type", __InputTagHelper.Type); - __InputTagHelper2.Type = __InputTagHelper.Type; + __TestNamespace_InputTagHelper.Type = "text"; + __tagHelperExecutionContext.AddTagHelperAttribute("type", __TestNamespace_InputTagHelper.Type); + __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type; __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); Instrumentation.BeginContext(172, 71, false); await WriteTagHelperAsync(__tagHelperExecutionContext); @@ -75,22 +73,22 @@ namespace TestOutput Instrumentation.BeginContext(243, 10, true); WriteLiteral("\r\n "); Instrumentation.EndContext(); - __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", TagMode.SelfClosing, "test", async() => { + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { } , StartTagHelperWritingScope, EndTagHelperWritingScope); - __InputTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__InputTagHelper); - __InputTagHelper2 = CreateTagHelper(); - __tagHelperExecutionContext.Add(__InputTagHelper2); - __InputTagHelper.Type = "checkbox"; - __tagHelperExecutionContext.AddTagHelperAttribute("type", __InputTagHelper.Type); - __InputTagHelper2.Type = __InputTagHelper.Type; + __TestNamespace_InputTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper); + __TestNamespace_InputTagHelper2 = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper2); + __TestNamespace_InputTagHelper.Type = "checkbox"; + __tagHelperExecutionContext.AddTagHelperAttribute("type", __TestNamespace_InputTagHelper.Type); + __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type; #line 7 "BasicTagHelpers.cshtml" - __InputTagHelper2.Checked = true; +__TestNamespace_InputTagHelper2.Checked = true; #line default #line hidden - __tagHelperExecutionContext.AddTagHelperAttribute("checked", __InputTagHelper2.Checked); + __tagHelperExecutionContext.AddTagHelperAttribute("checked", __TestNamespace_InputTagHelper2.Checked); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); Instrumentation.BeginContext(253, 39, false); await WriteTagHelperAsync(__tagHelperExecutionContext); @@ -101,8 +99,8 @@ namespace TestOutput Instrumentation.EndContext(); } , StartTagHelperWritingScope, EndTagHelperWritingScope); - __PTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__PTagHelper); + __TestNamespace_PTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_PTagHelper); __tagHelperExecutionContext.AddHtmlAttribute("class", Html.Raw("Hello World")); __tagHelperExecutionContext.AddHtmlAttribute("data-delay", Html.Raw("1000")); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); 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 a7ed2ecb77..0f908d0e0b 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 @@ -20,9 +20,9 @@ namespace TestOutput #pragma warning restore 219 } #line hidden - private PTagHelper __PTagHelper = null; - private InputTagHelper __InputTagHelper = null; - private InputTagHelper2 __InputTagHelper2 = null; + private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper = null; + private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper = null; + private global::TestNamespace.InputTagHelper2 __TestNamespace_InputTagHelper2 = null; #line hidden public ComplexTagHelpers() { @@ -53,11 +53,11 @@ if (true) #line default #line hidden - __InputTagHelper = CreateTagHelper(); - __InputTagHelper2 = CreateTagHelper(); - __InputTagHelper.Type = "text"; - __InputTagHelper2.Type = __InputTagHelper.Type; - __PTagHelper = CreateTagHelper(); + __TestNamespace_InputTagHelper = CreateTagHelper(); + __TestNamespace_InputTagHelper2 = CreateTagHelper(); + __TestNamespace_InputTagHelper.Type = "text"; + __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type; + __TestNamespace_PTagHelper = CreateTagHelper(); #line 13 "ComplexTagHelpers.cshtml" } else @@ -66,32 +66,32 @@ if (true) #line default #line hidden - __InputTagHelper = CreateTagHelper(); - __InputTagHelper2 = CreateTagHelper(); + __TestNamespace_InputTagHelper = CreateTagHelper(); + __TestNamespace_InputTagHelper2 = CreateTagHelper(); #line 16 "ComplexTagHelpers.cshtml" __o = checkbox; #line default #line hidden - __InputTagHelper.Type = string.Empty; - __InputTagHelper2.Type = __InputTagHelper.Type; + __TestNamespace_InputTagHelper.Type = string.Empty; + __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type; #line 16 "ComplexTagHelpers.cshtml" - __InputTagHelper2.Checked = true; + __TestNamespace_InputTagHelper2.Checked = true; #line default #line hidden - __PTagHelper = CreateTagHelper(); - __InputTagHelper = CreateTagHelper(); - __InputTagHelper2 = CreateTagHelper(); + __TestNamespace_PTagHelper = CreateTagHelper(); + __TestNamespace_InputTagHelper = CreateTagHelper(); + __TestNamespace_InputTagHelper2 = CreateTagHelper(); #line 17 "ComplexTagHelpers.cshtml" __o = true ? "checkbox" : "anything"; #line default #line hidden - __InputTagHelper.Type = string.Empty; - __InputTagHelper2.Type = __InputTagHelper.Type; - __InputTagHelper = CreateTagHelper(); - __InputTagHelper2 = CreateTagHelper(); + __TestNamespace_InputTagHelper.Type = string.Empty; + __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type; + __TestNamespace_InputTagHelper = CreateTagHelper(); + __TestNamespace_InputTagHelper2 = CreateTagHelper(); #line 18 "ComplexTagHelpers.cshtml" if(true) { @@ -122,15 +122,15 @@ if (true) #line default #line hidden - __InputTagHelper.Type = string.Empty; - __InputTagHelper2.Type = __InputTagHelper.Type; + __TestNamespace_InputTagHelper.Type = string.Empty; + __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type; #line 19 "ComplexTagHelpers.cshtml" } #line default #line hidden - __PTagHelper = CreateTagHelper(); + __TestNamespace_PTagHelper = CreateTagHelper(); #line 8 "ComplexTagHelpers.cshtml" __o = DateTime.Now; @@ -148,70 +148,70 @@ if (true) #line default #line hidden - __InputTagHelper = CreateTagHelper(); - __InputTagHelper2 = CreateTagHelper(); + __TestNamespace_InputTagHelper = CreateTagHelper(); + __TestNamespace_InputTagHelper2 = CreateTagHelper(); #line 23 "ComplexTagHelpers.cshtml" -__InputTagHelper2.Checked = (@object); +__TestNamespace_InputTagHelper2.Checked = (@object); #line default #line hidden - __PTagHelper = CreateTagHelper(); + __TestNamespace_PTagHelper = CreateTagHelper(); #line 21 "ComplexTagHelpers.cshtml" - __PTagHelper.Age = DateTimeOffset.Now.Year - 1970; + __TestNamespace_PTagHelper.Age = DateTimeOffset.Now.Year - 1970; #line default #line hidden - __InputTagHelper = CreateTagHelper(); - __InputTagHelper2 = CreateTagHelper(); + __TestNamespace_InputTagHelper = CreateTagHelper(); + __TestNamespace_InputTagHelper2 = CreateTagHelper(); #line 26 "ComplexTagHelpers.cshtml" - __InputTagHelper2.Checked = (DateTimeOffset.Now.Year > 2014); + __TestNamespace_InputTagHelper2.Checked = (DateTimeOffset.Now.Year > 2014); #line default #line hidden - __PTagHelper = CreateTagHelper(); + __TestNamespace_PTagHelper = CreateTagHelper(); #line 25 "ComplexTagHelpers.cshtml" -__PTagHelper.Age = -1970 + @DateTimeOffset.Now.Year; +__TestNamespace_PTagHelper.Age = -1970 + @DateTimeOffset.Now.Year; #line default #line hidden - __InputTagHelper = CreateTagHelper(); - __InputTagHelper2 = CreateTagHelper(); + __TestNamespace_InputTagHelper = CreateTagHelper(); + __TestNamespace_InputTagHelper2 = CreateTagHelper(); #line 29 "ComplexTagHelpers.cshtml" -__InputTagHelper2.Checked = DateTimeOffset.Now.Year > 2014; +__TestNamespace_InputTagHelper2.Checked = DateTimeOffset.Now.Year > 2014; #line default #line hidden - __PTagHelper = CreateTagHelper(); + __TestNamespace_PTagHelper = CreateTagHelper(); #line 28 "ComplexTagHelpers.cshtml" -__PTagHelper.Age = DateTimeOffset.Now.Year - 1970; +__TestNamespace_PTagHelper.Age = DateTimeOffset.Now.Year - 1970; #line default #line hidden - __InputTagHelper = CreateTagHelper(); - __InputTagHelper2 = CreateTagHelper(); + __TestNamespace_InputTagHelper = CreateTagHelper(); + __TestNamespace_InputTagHelper2 = CreateTagHelper(); #line 32 "ComplexTagHelpers.cshtml" -__InputTagHelper2.Checked = @( DateTimeOffset.Now.Year ) > 2014 ; +__TestNamespace_InputTagHelper2.Checked = @( DateTimeOffset.Now.Year ) > 2014 ; #line default #line hidden - __PTagHelper = CreateTagHelper(); + __TestNamespace_PTagHelper = CreateTagHelper(); #line 31 "ComplexTagHelpers.cshtml" -__PTagHelper.Age = ("My age is this long.".Length); +__TestNamespace_PTagHelper.Age = ("My age is this long.".Length); #line default #line hidden #line 34 "ComplexTagHelpers.cshtml" __o = someMethod(item => new Template(async(__razor_template_writer) => { - __InputTagHelper = CreateTagHelper(); - __InputTagHelper2 = CreateTagHelper(); + __TestNamespace_InputTagHelper = CreateTagHelper(); + __TestNamespace_InputTagHelper2 = CreateTagHelper(); #line 34 "ComplexTagHelpers.cshtml" - __InputTagHelper2.Checked = checked; + __TestNamespace_InputTagHelper2.Checked = checked; #line default #line hidden - __PTagHelper = CreateTagHelper(); + __TestNamespace_PTagHelper = CreateTagHelper(); #line 34 "ComplexTagHelpers.cshtml" - __PTagHelper.Age = 123; +__TestNamespace_PTagHelper.Age = 123; #line default #line hidden 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 b21b01a659..4a58d04085 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/ComplexTagHelpers.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/ComplexTagHelpers.cs @@ -1,8 +1,6 @@ #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; @@ -10,14 +8,14 @@ namespace TestOutput { #line hidden #pragma warning disable 0414 - private TagHelperContent __tagHelperStringValueBuffer = null; + private global::Microsoft.AspNet.Razor.TagHelperContent __tagHelperStringValueBuffer = null; #pragma warning restore 0414 - private TagHelperExecutionContext __tagHelperExecutionContext = null; - private TagHelperRunner __tagHelperRunner = null; - private TagHelperScopeManager __tagHelperScopeManager = new TagHelperScopeManager(); - private PTagHelper __PTagHelper = null; - private InputTagHelper __InputTagHelper = null; - private InputTagHelper2 __InputTagHelper2 = null; + private global::Microsoft.AspNet.Razor.Runtime.TagHelperExecutionContext __tagHelperExecutionContext = null; + private global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner __tagHelperRunner = null; + private global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager __tagHelperScopeManager = new global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager(); + private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper = null; + private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper = null; + private global::TestNamespace.InputTagHelper2 __TestNamespace_InputTagHelper2 = null; #line hidden public ComplexTagHelpers() { @@ -26,7 +24,7 @@ namespace TestOutput #pragma warning disable 1998 public override async Task ExecuteAsync() { - __tagHelperRunner = __tagHelperRunner ?? new TagHelperRunner(); + __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner(); Instrumentation.BeginContext(33, 2, true); WriteLiteral("\r\n"); Instrumentation.EndContext(); @@ -42,7 +40,7 @@ namespace TestOutput Instrumentation.BeginContext(84, 55, true); WriteLiteral("
\r\n "); Instrumentation.EndContext(); - __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", TagMode.StartTagAndEndTag, "test", async() => { + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => { Instrumentation.BeginContext(177, 34, true); WriteLiteral("\r\n

Set Time:

\r\n"); Instrumentation.EndContext(); @@ -62,20 +60,20 @@ namespace TestOutput Instrumentation.BeginContext(251, 16, true); WriteLiteral(" "); Instrumentation.EndContext(); - __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", TagMode.StartTagAndEndTag, "test", async() => { + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => { Instrumentation.BeginContext(270, 10, true); WriteLiteral("New Time: "); Instrumentation.EndContext(); - __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", TagMode.SelfClosing, "test", async() => { + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { } , StartTagHelperWritingScope, EndTagHelperWritingScope); - __InputTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__InputTagHelper); - __InputTagHelper2 = CreateTagHelper(); - __tagHelperExecutionContext.Add(__InputTagHelper2); - __InputTagHelper.Type = "text"; - __tagHelperExecutionContext.AddTagHelperAttribute("type", __InputTagHelper.Type); - __InputTagHelper2.Type = __InputTagHelper.Type; + __TestNamespace_InputTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper); + __TestNamespace_InputTagHelper2 = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper2); + __TestNamespace_InputTagHelper.Type = "text"; + __tagHelperExecutionContext.AddTagHelperAttribute("type", __TestNamespace_InputTagHelper.Type); + __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type; __tagHelperExecutionContext.AddHtmlAttribute("value", Html.Raw("")); __tagHelperExecutionContext.AddHtmlAttribute("placeholder", Html.Raw("Enter in a new time...")); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); @@ -85,8 +83,8 @@ namespace TestOutput __tagHelperExecutionContext = __tagHelperScopeManager.End(); } , StartTagHelperWritingScope, EndTagHelperWritingScope); - __PTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__PTagHelper); + __TestNamespace_PTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_PTagHelper); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); Instrumentation.BeginContext(267, 83, false); await WriteTagHelperAsync(__tagHelperExecutionContext); @@ -106,17 +104,17 @@ namespace TestOutput Instrumentation.BeginContext(400, 16, true); WriteLiteral(" "); Instrumentation.EndContext(); - __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", TagMode.StartTagAndEndTag, "test", async() => { + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => { Instrumentation.BeginContext(419, 14, true); WriteLiteral("Current Time: "); Instrumentation.EndContext(); - __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", TagMode.SelfClosing, "test", async() => { + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { } , StartTagHelperWritingScope, EndTagHelperWritingScope); - __InputTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__InputTagHelper); - __InputTagHelper2 = CreateTagHelper(); - __tagHelperExecutionContext.Add(__InputTagHelper2); + __TestNamespace_InputTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper); + __TestNamespace_InputTagHelper2 = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper2); StartTagHelperWritingScope(); #line 16 "ComplexTagHelpers.cshtml" WriteLiteral(checkbox); @@ -124,15 +122,15 @@ namespace TestOutput #line default #line hidden __tagHelperStringValueBuffer = EndTagHelperWritingScope(); - __InputTagHelper.Type = __tagHelperStringValueBuffer.GetContent(HtmlEncoder); - __tagHelperExecutionContext.AddTagHelperAttribute("type", __InputTagHelper.Type); - __InputTagHelper2.Type = __InputTagHelper.Type; + __TestNamespace_InputTagHelper.Type = __tagHelperStringValueBuffer.GetContent(HtmlEncoder); + __tagHelperExecutionContext.AddTagHelperAttribute("type", __TestNamespace_InputTagHelper.Type); + __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type; #line 16 "ComplexTagHelpers.cshtml" - __InputTagHelper2.Checked = true; + __TestNamespace_InputTagHelper2.Checked = true; #line default #line hidden - __tagHelperExecutionContext.AddTagHelperAttribute("checked", __InputTagHelper2.Checked); + __tagHelperExecutionContext.AddTagHelperAttribute("checked", __TestNamespace_InputTagHelper2.Checked); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); Instrumentation.BeginContext(433, 37, false); await WriteTagHelperAsync(__tagHelperExecutionContext); @@ -140,8 +138,8 @@ namespace TestOutput __tagHelperExecutionContext = __tagHelperScopeManager.End(); } , StartTagHelperWritingScope, EndTagHelperWritingScope); - __PTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__PTagHelper); + __TestNamespace_PTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_PTagHelper); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); Instrumentation.BeginContext(416, 58, false); await WriteTagHelperAsync(__tagHelperExecutionContext); @@ -150,13 +148,13 @@ namespace TestOutput Instrumentation.BeginContext(474, 18, true); WriteLiteral("\r\n "); Instrumentation.EndContext(); - __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", TagMode.SelfClosing, "test", async() => { + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { } , StartTagHelperWritingScope, EndTagHelperWritingScope); - __InputTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__InputTagHelper); - __InputTagHelper2 = CreateTagHelper(); - __tagHelperExecutionContext.Add(__InputTagHelper2); + __TestNamespace_InputTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper); + __TestNamespace_InputTagHelper2 = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper2); StartTagHelperWritingScope(); #line 17 "ComplexTagHelpers.cshtml" WriteLiteral(true ? "checkbox" : "anything"); @@ -164,9 +162,9 @@ namespace TestOutput #line default #line hidden __tagHelperStringValueBuffer = EndTagHelperWritingScope(); - __InputTagHelper.Type = __tagHelperStringValueBuffer.GetContent(HtmlEncoder); - __tagHelperExecutionContext.AddTagHelperAttribute("tYPe", __InputTagHelper.Type); - __InputTagHelper2.Type = __InputTagHelper.Type; + __TestNamespace_InputTagHelper.Type = __tagHelperStringValueBuffer.GetContent(HtmlEncoder); + __tagHelperExecutionContext.AddTagHelperAttribute("tYPe", __TestNamespace_InputTagHelper.Type); + __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type; __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); Instrumentation.BeginContext(492, 50, false); await WriteTagHelperAsync(__tagHelperExecutionContext); @@ -175,13 +173,13 @@ namespace TestOutput Instrumentation.BeginContext(542, 18, true); WriteLiteral("\r\n "); Instrumentation.EndContext(); - __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", TagMode.StartTagOnly, "test", async() => { + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagOnly, "test", async() => { } , StartTagHelperWritingScope, EndTagHelperWritingScope); - __InputTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__InputTagHelper); - __InputTagHelper2 = CreateTagHelper(); - __tagHelperExecutionContext.Add(__InputTagHelper2); + __TestNamespace_InputTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper); + __TestNamespace_InputTagHelper2 = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper2); StartTagHelperWritingScope(); #line 18 "ComplexTagHelpers.cshtml" if(true) { @@ -216,9 +214,9 @@ namespace TestOutput #line hidden __tagHelperStringValueBuffer = EndTagHelperWritingScope(); - __InputTagHelper.Type = __tagHelperStringValueBuffer.GetContent(HtmlEncoder); - __tagHelperExecutionContext.AddTagHelperAttribute("type", __InputTagHelper.Type); - __InputTagHelper2.Type = __InputTagHelper.Type; + __TestNamespace_InputTagHelper.Type = __tagHelperStringValueBuffer.GetContent(HtmlEncoder); + __tagHelperExecutionContext.AddTagHelperAttribute("type", __TestNamespace_InputTagHelper.Type); + __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type; __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); Instrumentation.BeginContext(560, 79, false); await WriteTagHelperAsync(__tagHelperExecutionContext); @@ -238,8 +236,8 @@ namespace TestOutput Instrumentation.EndContext(); } , StartTagHelperWritingScope, EndTagHelperWritingScope); - __PTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__PTagHelper); + __TestNamespace_PTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_PTagHelper); BeginAddHtmlAttributeValues(__tagHelperExecutionContext, "time", 3); AddHtmlAttributeValue("", 148, "Current", 148, 7, true); AddHtmlAttributeValue(" ", 155, "Time:", 156, 6, true); @@ -257,7 +255,7 @@ AddHtmlAttributeValue(" ", 161, DateTime.Now, 162, 14, false); Instrumentation.BeginContext(670, 10, true); WriteLiteral("\r\n "); Instrumentation.EndContext(); - __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", TagMode.StartTagAndEndTag, "test", async() => { + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => { Instrumentation.BeginContext(767, 2, true); WriteLiteral("\r\n"); Instrumentation.EndContext(); @@ -276,19 +274,19 @@ AddHtmlAttributeValue(" ", 161, DateTime.Now, 162, 14, false); Instrumentation.BeginContext(807, 12, true); WriteLiteral(" "); Instrumentation.EndContext(); - __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", TagMode.StartTagOnly, "test", async() => { + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagOnly, "test", async() => { } , StartTagHelperWritingScope, EndTagHelperWritingScope); - __InputTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__InputTagHelper); - __InputTagHelper2 = CreateTagHelper(); - __tagHelperExecutionContext.Add(__InputTagHelper2); + __TestNamespace_InputTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper); + __TestNamespace_InputTagHelper2 = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper2); #line 23 "ComplexTagHelpers.cshtml" -__InputTagHelper2.Checked = (@object); +__TestNamespace_InputTagHelper2.Checked = (@object); #line default #line hidden - __tagHelperExecutionContext.AddTagHelperAttribute("ChecKED", __InputTagHelper2.Checked); + __tagHelperExecutionContext.AddTagHelperAttribute("ChecKED", __TestNamespace_InputTagHelper2.Checked); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); Instrumentation.BeginContext(819, 28, false); await WriteTagHelperAsync(__tagHelperExecutionContext); @@ -299,15 +297,15 @@ __InputTagHelper2.Checked = (@object); Instrumentation.EndContext(); } , StartTagHelperWritingScope, EndTagHelperWritingScope); - __PTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__PTagHelper); + __TestNamespace_PTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_PTagHelper); __tagHelperExecutionContext.AddHtmlAttribute("unbound", Html.Raw("first value")); #line 21 "ComplexTagHelpers.cshtml" - __PTagHelper.Age = DateTimeOffset.Now.Year - 1970; + __TestNamespace_PTagHelper.Age = DateTimeOffset.Now.Year - 1970; #line default #line hidden - __tagHelperExecutionContext.AddTagHelperAttribute("age", __PTagHelper.Age); + __tagHelperExecutionContext.AddTagHelperAttribute("age", __TestNamespace_PTagHelper.Age); __tagHelperExecutionContext.AddHtmlAttribute("unbound", Html.Raw("second value")); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); Instrumentation.BeginContext(680, 181, false); @@ -317,25 +315,25 @@ __InputTagHelper2.Checked = (@object); Instrumentation.BeginContext(861, 10, true); WriteLiteral("\r\n "); Instrumentation.EndContext(); - __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", TagMode.StartTagAndEndTag, "test", async() => { + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => { Instrumentation.BeginContext(913, 14, true); WriteLiteral("\r\n "); Instrumentation.EndContext(); - __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", TagMode.SelfClosing, "test", async() => { + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { } , StartTagHelperWritingScope, EndTagHelperWritingScope); - __InputTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__InputTagHelper); - __InputTagHelper2 = CreateTagHelper(); - __tagHelperExecutionContext.Add(__InputTagHelper2); + __TestNamespace_InputTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper); + __TestNamespace_InputTagHelper2 = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper2); __tagHelperExecutionContext.AddHtmlAttribute("unbound", Html.Raw("hello")); __tagHelperExecutionContext.AddHtmlAttribute("unbound", Html.Raw("world")); #line 26 "ComplexTagHelpers.cshtml" - __InputTagHelper2.Checked = (DateTimeOffset.Now.Year > 2014); + __TestNamespace_InputTagHelper2.Checked = (DateTimeOffset.Now.Year > 2014); #line default #line hidden - __tagHelperExecutionContext.AddTagHelperAttribute("checked", __InputTagHelper2.Checked); + __tagHelperExecutionContext.AddTagHelperAttribute("checked", __TestNamespace_InputTagHelper2.Checked); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); Instrumentation.BeginContext(927, 85, false); await WriteTagHelperAsync(__tagHelperExecutionContext); @@ -346,14 +344,14 @@ __InputTagHelper2.Checked = (@object); Instrumentation.EndContext(); } , StartTagHelperWritingScope, EndTagHelperWritingScope); - __PTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__PTagHelper); + __TestNamespace_PTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_PTagHelper); #line 25 "ComplexTagHelpers.cshtml" -__PTagHelper.Age = -1970 + @DateTimeOffset.Now.Year; +__TestNamespace_PTagHelper.Age = -1970 + @DateTimeOffset.Now.Year; #line default #line hidden - __tagHelperExecutionContext.AddTagHelperAttribute("age", __PTagHelper.Age); + __tagHelperExecutionContext.AddTagHelperAttribute("age", __TestNamespace_PTagHelper.Age); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); Instrumentation.BeginContext(871, 155, false); await WriteTagHelperAsync(__tagHelperExecutionContext); @@ -362,23 +360,23 @@ __PTagHelper.Age = -1970 + @DateTimeOffset.Now.Year; Instrumentation.BeginContext(1026, 10, true); WriteLiteral("\r\n "); Instrumentation.EndContext(); - __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", TagMode.StartTagAndEndTag, "test", async() => { + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => { Instrumentation.BeginContext(1076, 14, true); WriteLiteral("\r\n "); Instrumentation.EndContext(); - __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", TagMode.StartTagOnly, "test", async() => { + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagOnly, "test", async() => { } , StartTagHelperWritingScope, EndTagHelperWritingScope); - __InputTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__InputTagHelper); - __InputTagHelper2 = CreateTagHelper(); - __tagHelperExecutionContext.Add(__InputTagHelper2); + __TestNamespace_InputTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper); + __TestNamespace_InputTagHelper2 = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper2); #line 29 "ComplexTagHelpers.cshtml" -__InputTagHelper2.Checked = DateTimeOffset.Now.Year > 2014; +__TestNamespace_InputTagHelper2.Checked = DateTimeOffset.Now.Year > 2014; #line default #line hidden - __tagHelperExecutionContext.AddTagHelperAttribute("checked", __InputTagHelper2.Checked); + __tagHelperExecutionContext.AddTagHelperAttribute("checked", __TestNamespace_InputTagHelper2.Checked); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); Instrumentation.BeginContext(1090, 48, false); await WriteTagHelperAsync(__tagHelperExecutionContext); @@ -389,14 +387,14 @@ __InputTagHelper2.Checked = DateTimeOffset.Now.Year > 2014; Instrumentation.EndContext(); } , StartTagHelperWritingScope, EndTagHelperWritingScope); - __PTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__PTagHelper); + __TestNamespace_PTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_PTagHelper); #line 28 "ComplexTagHelpers.cshtml" -__PTagHelper.Age = DateTimeOffset.Now.Year - 1970; +__TestNamespace_PTagHelper.Age = DateTimeOffset.Now.Year - 1970; #line default #line hidden - __tagHelperExecutionContext.AddTagHelperAttribute("age", __PTagHelper.Age); + __tagHelperExecutionContext.AddTagHelperAttribute("age", __TestNamespace_PTagHelper.Age); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); Instrumentation.BeginContext(1036, 116, false); await WriteTagHelperAsync(__tagHelperExecutionContext); @@ -405,23 +403,23 @@ __PTagHelper.Age = DateTimeOffset.Now.Year - 1970; Instrumentation.BeginContext(1152, 10, true); WriteLiteral("\r\n "); Instrumentation.EndContext(); - __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", TagMode.StartTagAndEndTag, "test", async() => { + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => { Instrumentation.BeginContext(1204, 14, true); WriteLiteral("\r\n "); Instrumentation.EndContext(); - __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", TagMode.SelfClosing, "test", async() => { + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { } , StartTagHelperWritingScope, EndTagHelperWritingScope); - __InputTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__InputTagHelper); - __InputTagHelper2 = CreateTagHelper(); - __tagHelperExecutionContext.Add(__InputTagHelper2); + __TestNamespace_InputTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper); + __TestNamespace_InputTagHelper2 = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper2); #line 32 "ComplexTagHelpers.cshtml" -__InputTagHelper2.Checked = @( DateTimeOffset.Now.Year ) > 2014 ; +__TestNamespace_InputTagHelper2.Checked = @( DateTimeOffset.Now.Year ) > 2014 ; #line default #line hidden - __tagHelperExecutionContext.AddTagHelperAttribute("checked", __InputTagHelper2.Checked); + __tagHelperExecutionContext.AddTagHelperAttribute("checked", __TestNamespace_InputTagHelper2.Checked); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); Instrumentation.BeginContext(1218, 63, false); await WriteTagHelperAsync(__tagHelperExecutionContext); @@ -432,14 +430,14 @@ __InputTagHelper2.Checked = @( DateTimeOffset.Now.Year ) > 2014 ; Instrumentation.EndContext(); } , StartTagHelperWritingScope, EndTagHelperWritingScope); - __PTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__PTagHelper); + __TestNamespace_PTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_PTagHelper); #line 31 "ComplexTagHelpers.cshtml" -__PTagHelper.Age = ("My age is this long.".Length); +__TestNamespace_PTagHelper.Age = ("My age is this long.".Length); #line default #line hidden - __tagHelperExecutionContext.AddTagHelperAttribute("age", __PTagHelper.Age); + __tagHelperExecutionContext.AddTagHelperAttribute("age", __TestNamespace_PTagHelper.Age); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); Instrumentation.BeginContext(1162, 133, false); await WriteTagHelperAsync(__tagHelperExecutionContext); @@ -451,20 +449,20 @@ __PTagHelper.Age = ("My age is this long.".Length); Instrumentation.BeginContext(1306, 11, false); #line 34 "ComplexTagHelpers.cshtml" Write(someMethod(item => new Template(async(__razor_template_writer) => { - __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", TagMode.StartTagAndEndTag, "test", async() => { - __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", TagMode.SelfClosing, "test", async() => { + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => { + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { } , StartTagHelperWritingScope, EndTagHelperWritingScope); - __InputTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__InputTagHelper); - __InputTagHelper2 = CreateTagHelper(); - __tagHelperExecutionContext.Add(__InputTagHelper2); + __TestNamespace_InputTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper); + __TestNamespace_InputTagHelper2 = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper2); #line 34 "ComplexTagHelpers.cshtml" - __InputTagHelper2.Checked = checked; + __TestNamespace_InputTagHelper2.Checked = checked; #line default #line hidden - __tagHelperExecutionContext.AddTagHelperAttribute("checked", __InputTagHelper2.Checked); + __tagHelperExecutionContext.AddTagHelperAttribute("checked", __TestNamespace_InputTagHelper2.Checked); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); Instrumentation.BeginContext(1345, 26, false); await WriteTagHelperAsync(__tagHelperExecutionContext); @@ -472,14 +470,14 @@ __PTagHelper.Age = ("My age is this long.".Length); __tagHelperExecutionContext = __tagHelperScopeManager.End(); } , StartTagHelperWritingScope, EndTagHelperWritingScope); - __PTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__PTagHelper); + __TestNamespace_PTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_PTagHelper); #line 34 "ComplexTagHelpers.cshtml" - __PTagHelper.Age = 123; +__TestNamespace_PTagHelper.Age = 123; #line default #line hidden - __tagHelperExecutionContext.AddTagHelperAttribute("age", __PTagHelper.Age); + __tagHelperExecutionContext.AddTagHelperAttribute("age", __TestNamespace_PTagHelper.Age); __tagHelperExecutionContext.AddHtmlAttribute("class", Html.Raw("hello")); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); Instrumentation.BeginContext(1318, 57, false); 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 c1858d16c6..4a64e9949f 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 @@ -20,9 +20,9 @@ namespace TestOutput #pragma warning restore 219 } #line hidden - private PTagHelper __PTagHelper = null; - private InputTagHelper __InputTagHelper = null; - private InputTagHelper2 __InputTagHelper2 = null; + private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper = null; + private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper = null; + private global::TestNamespace.InputTagHelper2 __TestNamespace_InputTagHelper2 = null; #line hidden public DuplicateAttributeTagHelpers() { @@ -31,22 +31,22 @@ namespace TestOutput #pragma warning disable 1998 public override async Task ExecuteAsync() { - __InputTagHelper = CreateTagHelper(); - __InputTagHelper2 = CreateTagHelper(); - __InputTagHelper.Type = "button"; - __InputTagHelper2.Type = __InputTagHelper.Type; - __InputTagHelper = CreateTagHelper(); - __InputTagHelper2 = CreateTagHelper(); - __InputTagHelper.Type = "button"; - __InputTagHelper2.Type = __InputTagHelper.Type; + __TestNamespace_InputTagHelper = CreateTagHelper(); + __TestNamespace_InputTagHelper2 = CreateTagHelper(); + __TestNamespace_InputTagHelper.Type = "button"; + __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type; + __TestNamespace_InputTagHelper = CreateTagHelper(); + __TestNamespace_InputTagHelper2 = CreateTagHelper(); + __TestNamespace_InputTagHelper.Type = "button"; + __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type; #line 5 "DuplicateAttributeTagHelpers.cshtml" - __InputTagHelper2.Checked = true; +__TestNamespace_InputTagHelper2.Checked = true; #line default #line hidden - __PTagHelper = CreateTagHelper(); + __TestNamespace_PTagHelper = CreateTagHelper(); #line 3 "DuplicateAttributeTagHelpers.cshtml" -__PTagHelper.Age = 3; +__TestNamespace_PTagHelper.Age = 3; #line default #line hidden 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 f01a88799d..d83ce990b5 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/DuplicateAttributeTagHelpers.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/DuplicateAttributeTagHelpers.cs @@ -1,8 +1,6 @@ #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; @@ -10,14 +8,14 @@ namespace TestOutput { #line hidden #pragma warning disable 0414 - private TagHelperContent __tagHelperStringValueBuffer = null; + private global::Microsoft.AspNet.Razor.TagHelperContent __tagHelperStringValueBuffer = null; #pragma warning restore 0414 - private TagHelperExecutionContext __tagHelperExecutionContext = null; - private TagHelperRunner __tagHelperRunner = null; - private TagHelperScopeManager __tagHelperScopeManager = new TagHelperScopeManager(); - private PTagHelper __PTagHelper = null; - private InputTagHelper __InputTagHelper = null; - private InputTagHelper2 __InputTagHelper2 = null; + private global::Microsoft.AspNet.Razor.Runtime.TagHelperExecutionContext __tagHelperExecutionContext = null; + private global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner __tagHelperRunner = null; + private global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager __tagHelperScopeManager = new global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager(); + private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper = null; + private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper = null; + private global::TestNamespace.InputTagHelper2 __TestNamespace_InputTagHelper2 = null; #line hidden public DuplicateAttributeTagHelpers() { @@ -26,24 +24,24 @@ namespace TestOutput #pragma warning disable 1998 public override async Task ExecuteAsync() { - __tagHelperRunner = __tagHelperRunner ?? new TagHelperRunner(); + __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner(); Instrumentation.BeginContext(33, 2, true); WriteLiteral("\r\n"); Instrumentation.EndContext(); - __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", TagMode.StartTagAndEndTag, "test", async() => { + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => { Instrumentation.BeginContext(65, 6, true); WriteLiteral("\r\n "); Instrumentation.EndContext(); - __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", TagMode.SelfClosing, "test", async() => { + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { } , StartTagHelperWritingScope, EndTagHelperWritingScope); - __InputTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__InputTagHelper); - __InputTagHelper2 = CreateTagHelper(); - __tagHelperExecutionContext.Add(__InputTagHelper2); - __InputTagHelper.Type = "button"; - __tagHelperExecutionContext.AddTagHelperAttribute("type", __InputTagHelper.Type); - __InputTagHelper2.Type = __InputTagHelper.Type; + __TestNamespace_InputTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper); + __TestNamespace_InputTagHelper2 = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper2); + __TestNamespace_InputTagHelper.Type = "button"; + __tagHelperExecutionContext.AddTagHelperAttribute("type", __TestNamespace_InputTagHelper.Type); + __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type; __tagHelperExecutionContext.AddHtmlAttribute("TYPE", Html.Raw("checkbox")); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); Instrumentation.BeginContext(71, 39, false); @@ -53,22 +51,22 @@ namespace TestOutput Instrumentation.BeginContext(110, 6, true); WriteLiteral("\r\n "); Instrumentation.EndContext(); - __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", TagMode.SelfClosing, "test", async() => { + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { } , StartTagHelperWritingScope, EndTagHelperWritingScope); - __InputTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__InputTagHelper); - __InputTagHelper2 = CreateTagHelper(); - __tagHelperExecutionContext.Add(__InputTagHelper2); - __InputTagHelper.Type = "button"; - __tagHelperExecutionContext.AddTagHelperAttribute("type", __InputTagHelper.Type); - __InputTagHelper2.Type = __InputTagHelper.Type; + __TestNamespace_InputTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper); + __TestNamespace_InputTagHelper2 = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper2); + __TestNamespace_InputTagHelper.Type = "button"; + __tagHelperExecutionContext.AddTagHelperAttribute("type", __TestNamespace_InputTagHelper.Type); + __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type; #line 5 "DuplicateAttributeTagHelpers.cshtml" - __InputTagHelper2.Checked = true; +__TestNamespace_InputTagHelper2.Checked = true; #line default #line hidden - __tagHelperExecutionContext.AddTagHelperAttribute("checked", __InputTagHelper2.Checked); + __tagHelperExecutionContext.AddTagHelperAttribute("checked", __TestNamespace_InputTagHelper2.Checked); __tagHelperExecutionContext.AddHtmlAttribute("type", Html.Raw("checkbox")); __tagHelperExecutionContext.AddHtmlAttribute("checked", Html.Raw("false")); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); @@ -81,14 +79,14 @@ namespace TestOutput Instrumentation.EndContext(); } , StartTagHelperWritingScope, EndTagHelperWritingScope); - __PTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__PTagHelper); + __TestNamespace_PTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_PTagHelper); #line 3 "DuplicateAttributeTagHelpers.cshtml" -__PTagHelper.Age = 3; +__TestNamespace_PTagHelper.Age = 3; #line default #line hidden - __tagHelperExecutionContext.AddTagHelperAttribute("age", __PTagHelper.Age); + __tagHelperExecutionContext.AddTagHelperAttribute("age", __TestNamespace_PTagHelper.Age); __tagHelperExecutionContext.AddHtmlAttribute("AGE", Html.Raw("40")); __tagHelperExecutionContext.AddHtmlAttribute("Age", Html.Raw("500")); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); 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 6fe8c17706..e349cd9e36 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/DuplicateTargetTagHelper.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/DuplicateTargetTagHelper.cs @@ -1,8 +1,6 @@ #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; @@ -10,13 +8,13 @@ namespace TestOutput { #line hidden #pragma warning disable 0414 - private TagHelperContent __tagHelperStringValueBuffer = null; + private global::Microsoft.AspNet.Razor.TagHelperContent __tagHelperStringValueBuffer = null; #pragma warning restore 0414 - private TagHelperExecutionContext __tagHelperExecutionContext = null; - private TagHelperRunner __tagHelperRunner = null; - private TagHelperScopeManager __tagHelperScopeManager = new TagHelperScopeManager(); - private InputTagHelper __InputTagHelper = null; - private CatchAllTagHelper __CatchAllTagHelper = null; + private global::Microsoft.AspNet.Razor.Runtime.TagHelperExecutionContext __tagHelperExecutionContext = null; + private global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner __tagHelperRunner = null; + private global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager __tagHelperScopeManager = new global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager(); + private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper = null; + private global::TestNamespace.CatchAllTagHelper __TestNamespace_CatchAllTagHelper = null; #line hidden public DuplicateTargetTagHelper() { @@ -25,27 +23,27 @@ namespace TestOutput #pragma warning disable 1998 public override async Task ExecuteAsync() { - __tagHelperRunner = __tagHelperRunner ?? new TagHelperRunner(); + __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner(); Instrumentation.BeginContext(33, 2, true); WriteLiteral("\r\n"); Instrumentation.EndContext(); - __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", TagMode.SelfClosing, "test", async() => { + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { } , StartTagHelperWritingScope, EndTagHelperWritingScope); - __InputTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__InputTagHelper); - __CatchAllTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__CatchAllTagHelper); - __InputTagHelper.Type = "checkbox"; - __tagHelperExecutionContext.AddTagHelperAttribute("type", __InputTagHelper.Type); - __CatchAllTagHelper.Type = __InputTagHelper.Type; + __TestNamespace_InputTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper); + __TestNamespace_CatchAllTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_CatchAllTagHelper); + __TestNamespace_InputTagHelper.Type = "checkbox"; + __tagHelperExecutionContext.AddTagHelperAttribute("type", __TestNamespace_InputTagHelper.Type); + __TestNamespace_CatchAllTagHelper.Type = __TestNamespace_InputTagHelper.Type; #line 3 "DuplicateTargetTagHelper.cshtml" - __InputTagHelper.Checked = true; +__TestNamespace_InputTagHelper.Checked = true; #line default #line hidden - __tagHelperExecutionContext.AddTagHelperAttribute("checked", __InputTagHelper.Checked); - __CatchAllTagHelper.Checked = __InputTagHelper.Checked; + __tagHelperExecutionContext.AddTagHelperAttribute("checked", __TestNamespace_InputTagHelper.Checked); + __TestNamespace_CatchAllTagHelper.Checked = __TestNamespace_InputTagHelper.Checked; __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); Instrumentation.BeginContext(35, 40, false); await WriteTagHelperAsync(__tagHelperExecutionContext); 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 f9fcd9c1ce..da08b546ac 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 @@ -20,7 +20,7 @@ namespace TestOutput #pragma warning restore 219 } #line hidden - private InputTagHelper __InputTagHelper = null; + private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper = null; #line hidden public DynamicAttributeTagHelpers() { @@ -29,13 +29,13 @@ namespace TestOutput #pragma warning disable 1998 public override async Task ExecuteAsync() { - __InputTagHelper = CreateTagHelper(); + __TestNamespace_InputTagHelper = CreateTagHelper(); #line 3 "DynamicAttributeTagHelpers.cshtml" __o = DateTime.Now; #line default #line hidden - __InputTagHelper = CreateTagHelper(); + __TestNamespace_InputTagHelper = CreateTagHelper(); #line 5 "DynamicAttributeTagHelpers.cshtml" if (true) { @@ -64,19 +64,19 @@ namespace TestOutput #line default #line hidden - __InputTagHelper = CreateTagHelper(); + __TestNamespace_InputTagHelper = CreateTagHelper(); #line 7 "DynamicAttributeTagHelpers.cshtml" __o = DateTime.Now; #line default #line hidden - __InputTagHelper.Bound = string.Empty; + __TestNamespace_InputTagHelper.Bound = string.Empty; #line 7 "DynamicAttributeTagHelpers.cshtml" __o = DateTime.Now; #line default #line hidden - __InputTagHelper = CreateTagHelper(); + __TestNamespace_InputTagHelper = CreateTagHelper(); #line 9 "DynamicAttributeTagHelpers.cshtml" __o = long.MinValue; @@ -115,7 +115,7 @@ namespace TestOutput #line default #line hidden - __InputTagHelper.Bound = string.Empty; + __TestNamespace_InputTagHelper.Bound = string.Empty; #line 10 "DynamicAttributeTagHelpers.cshtml" __o = long.MinValue; @@ -154,7 +154,7 @@ namespace TestOutput #line default #line hidden - __InputTagHelper = CreateTagHelper(); + __TestNamespace_InputTagHelper = CreateTagHelper(); #line 12 "DynamicAttributeTagHelpers.cshtml" __o = long.MinValue; @@ -170,7 +170,7 @@ namespace TestOutput #line default #line hidden - __InputTagHelper = CreateTagHelper(); + __TestNamespace_InputTagHelper = CreateTagHelper(); #line 14 "DynamicAttributeTagHelpers.cshtml" if (true) { 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 9624c5e9c3..0f613b3c10 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/DynamicAttributeTagHelpers.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/DynamicAttributeTagHelpers.cs @@ -1,8 +1,6 @@ #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; @@ -10,12 +8,12 @@ namespace TestOutput { #line hidden #pragma warning disable 0414 - private TagHelperContent __tagHelperStringValueBuffer = null; + private global::Microsoft.AspNet.Razor.TagHelperContent __tagHelperStringValueBuffer = null; #pragma warning restore 0414 - private TagHelperExecutionContext __tagHelperExecutionContext = null; - private TagHelperRunner __tagHelperRunner = null; - private TagHelperScopeManager __tagHelperScopeManager = new TagHelperScopeManager(); - private InputTagHelper __InputTagHelper = null; + private global::Microsoft.AspNet.Razor.Runtime.TagHelperExecutionContext __tagHelperExecutionContext = null; + private global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner __tagHelperRunner = null; + private global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager __tagHelperScopeManager = new global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager(); + private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper = null; #line hidden public DynamicAttributeTagHelpers() { @@ -24,15 +22,15 @@ namespace TestOutput #pragma warning disable 1998 public override async Task ExecuteAsync() { - __tagHelperRunner = __tagHelperRunner ?? new TagHelperRunner(); + __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner(); Instrumentation.BeginContext(33, 2, true); WriteLiteral("\r\n"); Instrumentation.EndContext(); - __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", TagMode.SelfClosing, "test", async() => { + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { } , StartTagHelperWritingScope, EndTagHelperWritingScope); - __InputTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__InputTagHelper); + __TestNamespace_InputTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper); BeginAddHtmlAttributeValues(__tagHelperExecutionContext, "unbound", 2); AddHtmlAttributeValue("", 51, "prefix", 51, 6, true); #line 3 "DynamicAttributeTagHelpers.cshtml" @@ -49,11 +47,11 @@ AddHtmlAttributeValue(" ", 57, DateTime.Now, 58, 14, false); Instrumentation.BeginContext(75, 4, true); WriteLiteral("\r\n\r\n"); Instrumentation.EndContext(); - __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", TagMode.SelfClosing, "test", async() => { + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { } , StartTagHelperWritingScope, EndTagHelperWritingScope); - __InputTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__InputTagHelper); + __TestNamespace_InputTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper); BeginAddHtmlAttributeValues(__tagHelperExecutionContext, "unbound", 2); AddHtmlAttributeValue("", 95, new Template((__razor_attribute_value_writer) => { #line 5 "DynamicAttributeTagHelpers.cshtml" @@ -100,11 +98,11 @@ WriteTo(__razor_attribute_value_writer, string.Empty); Instrumentation.BeginContext(150, 4, true); WriteLiteral("\r\n\r\n"); Instrumentation.EndContext(); - __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", TagMode.SelfClosing, "test", async() => { + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { } , StartTagHelperWritingScope, EndTagHelperWritingScope); - __InputTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__InputTagHelper); + __TestNamespace_InputTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper); StartTagHelperWritingScope(); WriteLiteral("prefix "); #line 7 "DynamicAttributeTagHelpers.cshtml" @@ -114,8 +112,8 @@ WriteTo(__razor_attribute_value_writer, string.Empty); #line hidden WriteLiteral(" suffix"); __tagHelperStringValueBuffer = EndTagHelperWritingScope(); - __InputTagHelper.Bound = __tagHelperStringValueBuffer.GetContent(HtmlEncoder); - __tagHelperExecutionContext.AddTagHelperAttribute("bound", __InputTagHelper.Bound); + __TestNamespace_InputTagHelper.Bound = __tagHelperStringValueBuffer.GetContent(HtmlEncoder); + __tagHelperExecutionContext.AddTagHelperAttribute("bound", __TestNamespace_InputTagHelper.Bound); BeginAddHtmlAttributeValues(__tagHelperExecutionContext, "unbound", 3); AddHtmlAttributeValue("", 206, "prefix", 206, 6, true); #line 7 "DynamicAttributeTagHelpers.cshtml" @@ -133,11 +131,11 @@ AddHtmlAttributeValue(" ", 212, DateTime.Now, 213, 14, false); Instrumentation.BeginContext(237, 4, true); WriteLiteral("\r\n\r\n"); Instrumentation.EndContext(); - __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", TagMode.SelfClosing, "test", async() => { + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { } , StartTagHelperWritingScope, EndTagHelperWritingScope); - __InputTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__InputTagHelper); + __TestNamespace_InputTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper); StartTagHelperWritingScope(); #line 9 "DynamicAttributeTagHelpers.cshtml" WriteLiteral(long.MinValue); @@ -180,8 +178,8 @@ AddHtmlAttributeValue(" ", 212, DateTime.Now, 213, 14, false); #line default #line hidden __tagHelperStringValueBuffer = EndTagHelperWritingScope(); - __InputTagHelper.Bound = __tagHelperStringValueBuffer.GetContent(HtmlEncoder); - __tagHelperExecutionContext.AddTagHelperAttribute("bound", __InputTagHelper.Bound); + __TestNamespace_InputTagHelper.Bound = __tagHelperStringValueBuffer.GetContent(HtmlEncoder); + __tagHelperExecutionContext.AddTagHelperAttribute("bound", __TestNamespace_InputTagHelper.Bound); BeginAddHtmlAttributeValues(__tagHelperExecutionContext, "unbound", 3); #line 10 "DynamicAttributeTagHelpers.cshtml" AddHtmlAttributeValue("", 347, long.MinValue, 347, 14, false); @@ -237,11 +235,11 @@ AddHtmlAttributeValue(" ", 406, int.MaxValue, 407, 14, false); Instrumentation.BeginContext(424, 4, true); WriteLiteral("\r\n\r\n"); Instrumentation.EndContext(); - __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", TagMode.SelfClosing, "test", async() => { + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { } , StartTagHelperWritingScope, EndTagHelperWritingScope); - __InputTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__InputTagHelper); + __TestNamespace_InputTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper); BeginAddHtmlAttributeValues(__tagHelperExecutionContext, "unbound", 5); #line 12 "DynamicAttributeTagHelpers.cshtml" AddHtmlAttributeValue("", 444, long.MinValue, 444, 14, false); @@ -269,11 +267,11 @@ AddHtmlAttributeValue(" ", 490, int.MaxValue, 491, 14, false); Instrumentation.BeginContext(508, 4, true); WriteLiteral("\r\n\r\n"); Instrumentation.EndContext(); - __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", TagMode.SelfClosing, "test", async() => { + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { } , StartTagHelperWritingScope, EndTagHelperWritingScope); - __InputTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__InputTagHelper); + __TestNamespace_InputTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper); BeginAddHtmlAttributeValues(__tagHelperExecutionContext, "unbound", 1); AddHtmlAttributeValue("", 528, new Template((__razor_attribute_value_writer) => { #line 14 "DynamicAttributeTagHelpers.cshtml" 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 fbc227b466..92cd01206c 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 @@ -20,9 +20,9 @@ namespace TestOutput #pragma warning restore 219 } #line hidden - private InputTagHelper __InputTagHelper = null; - private InputTagHelper2 __InputTagHelper2 = null; - private PTagHelper __PTagHelper = null; + private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper = null; + private global::TestNamespace.InputTagHelper2 __TestNamespace_InputTagHelper2 = null; + private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper = null; #line hidden public EmptyAttributeTagHelpers() { @@ -31,27 +31,27 @@ namespace TestOutput #pragma warning disable 1998 public override async Task ExecuteAsync() { - __InputTagHelper = CreateTagHelper(); - __InputTagHelper2 = CreateTagHelper(); - __InputTagHelper.Type = ""; - __InputTagHelper2.Type = __InputTagHelper.Type; + __TestNamespace_InputTagHelper = CreateTagHelper(); + __TestNamespace_InputTagHelper2 = CreateTagHelper(); + __TestNamespace_InputTagHelper.Type = ""; + __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type; #line 4 "EmptyAttributeTagHelpers.cshtml" -__InputTagHelper2.Checked = ; +__TestNamespace_InputTagHelper2.Checked = ; #line default #line hidden - __InputTagHelper = CreateTagHelper(); - __InputTagHelper2 = CreateTagHelper(); - __InputTagHelper.Type = ""; - __InputTagHelper2.Type = __InputTagHelper.Type; + __TestNamespace_InputTagHelper = CreateTagHelper(); + __TestNamespace_InputTagHelper2 = CreateTagHelper(); + __TestNamespace_InputTagHelper.Type = ""; + __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type; #line 6 "EmptyAttributeTagHelpers.cshtml" - __InputTagHelper2.Checked = ; +__TestNamespace_InputTagHelper2.Checked = ; #line default #line hidden - __PTagHelper = CreateTagHelper(); + __TestNamespace_PTagHelper = CreateTagHelper(); #line 5 "EmptyAttributeTagHelpers.cshtml" -__PTagHelper.Age = ; +__TestNamespace_PTagHelper.Age = ; #line default #line hidden 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 683a61c8ca..26fe1b2864 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EmptyAttributeTagHelpers.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EmptyAttributeTagHelpers.cs @@ -1,8 +1,6 @@ #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; @@ -10,14 +8,14 @@ namespace TestOutput { #line hidden #pragma warning disable 0414 - private TagHelperContent __tagHelperStringValueBuffer = null; + private global::Microsoft.AspNet.Razor.TagHelperContent __tagHelperStringValueBuffer = null; #pragma warning restore 0414 - private TagHelperExecutionContext __tagHelperExecutionContext = null; - private TagHelperRunner __tagHelperRunner = null; - private TagHelperScopeManager __tagHelperScopeManager = new TagHelperScopeManager(); - private InputTagHelper __InputTagHelper = null; - private InputTagHelper2 __InputTagHelper2 = null; - private PTagHelper __PTagHelper = null; + private global::Microsoft.AspNet.Razor.Runtime.TagHelperExecutionContext __tagHelperExecutionContext = null; + private global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner __tagHelperRunner = null; + private global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager __tagHelperScopeManager = new global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager(); + private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper = null; + private global::TestNamespace.InputTagHelper2 __TestNamespace_InputTagHelper2 = null; + private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper = null; #line hidden public EmptyAttributeTagHelpers() { @@ -26,26 +24,26 @@ namespace TestOutput #pragma warning disable 1998 public override async Task ExecuteAsync() { - __tagHelperRunner = __tagHelperRunner ?? new TagHelperRunner(); + __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner(); Instrumentation.BeginContext(27, 13, true); WriteLiteral("\r\n
\r\n "); Instrumentation.EndContext(); - __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", TagMode.SelfClosing, "test", async() => { + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { } , StartTagHelperWritingScope, EndTagHelperWritingScope); - __InputTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__InputTagHelper); - __InputTagHelper2 = CreateTagHelper(); - __tagHelperExecutionContext.Add(__InputTagHelper2); - __InputTagHelper.Type = ""; - __tagHelperExecutionContext.AddTagHelperAttribute("type", __InputTagHelper.Type); - __InputTagHelper2.Type = __InputTagHelper.Type; + __TestNamespace_InputTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper); + __TestNamespace_InputTagHelper2 = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper2); + __TestNamespace_InputTagHelper.Type = ""; + __tagHelperExecutionContext.AddTagHelperAttribute("type", __TestNamespace_InputTagHelper.Type); + __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type; #line 4 "EmptyAttributeTagHelpers.cshtml" -__InputTagHelper2.Checked = ; +__TestNamespace_InputTagHelper2.Checked = ; #line default #line hidden - __tagHelperExecutionContext.AddTagHelperAttribute("checked", __InputTagHelper2.Checked); + __tagHelperExecutionContext.AddTagHelperAttribute("checked", __TestNamespace_InputTagHelper2.Checked); __tagHelperExecutionContext.AddHtmlAttribute("class", Html.Raw("")); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); Instrumentation.BeginContext(40, 34, false); @@ -55,26 +53,26 @@ __InputTagHelper2.Checked = ; Instrumentation.BeginContext(74, 6, true); WriteLiteral("\r\n "); Instrumentation.EndContext(); - __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", TagMode.StartTagAndEndTag, "test", async() => { + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => { Instrumentation.BeginContext(90, 10, true); WriteLiteral("\r\n "); Instrumentation.EndContext(); - __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", TagMode.SelfClosing, "test", async() => { + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { } , StartTagHelperWritingScope, EndTagHelperWritingScope); - __InputTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__InputTagHelper); - __InputTagHelper2 = CreateTagHelper(); - __tagHelperExecutionContext.Add(__InputTagHelper2); - __InputTagHelper.Type = ""; - __tagHelperExecutionContext.AddTagHelperAttribute("type", __InputTagHelper.Type); - __InputTagHelper2.Type = __InputTagHelper.Type; + __TestNamespace_InputTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper); + __TestNamespace_InputTagHelper2 = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper2); + __TestNamespace_InputTagHelper.Type = ""; + __tagHelperExecutionContext.AddTagHelperAttribute("type", __TestNamespace_InputTagHelper.Type); + __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type; #line 6 "EmptyAttributeTagHelpers.cshtml" - __InputTagHelper2.Checked = ; +__TestNamespace_InputTagHelper2.Checked = ; #line default #line hidden - __tagHelperExecutionContext.AddTagHelperAttribute("checked", __InputTagHelper2.Checked); + __tagHelperExecutionContext.AddTagHelperAttribute("checked", __TestNamespace_InputTagHelper2.Checked); __tagHelperExecutionContext.AddHtmlAttribute("class", Html.Raw("")); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); Instrumentation.BeginContext(100, 34, false); @@ -86,14 +84,14 @@ __InputTagHelper2.Checked = ; Instrumentation.EndContext(); } , StartTagHelperWritingScope, EndTagHelperWritingScope); - __PTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__PTagHelper); + __TestNamespace_PTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_PTagHelper); #line 5 "EmptyAttributeTagHelpers.cshtml" -__PTagHelper.Age = ; +__TestNamespace_PTagHelper.Age = ; #line default #line hidden - __tagHelperExecutionContext.AddTagHelperAttribute("age", __PTagHelper.Age); + __tagHelperExecutionContext.AddTagHelperAttribute("age", __TestNamespace_PTagHelper.Age); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); Instrumentation.BeginContext(80, 64, false); await WriteTagHelperAsync(__tagHelperExecutionContext); diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EnumTagHelpers.DesignTime.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EnumTagHelpers.DesignTime.cs index 694b259346..b1b53cf8a1 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EnumTagHelpers.DesignTime.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EnumTagHelpers.DesignTime.cs @@ -20,8 +20,8 @@ namespace TestOutput #pragma warning restore 219 } #line hidden - private InputTagHelper __InputTagHelper = null; - private CatchAllTagHelper __CatchAllTagHelper = null; + private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper = null; + private global::TestNamespace.CatchAllTagHelper __TestNamespace_CatchAllTagHelper = null; #line hidden public EnumTagHelpers() { @@ -37,48 +37,48 @@ namespace TestOutput #line default #line hidden - __InputTagHelper = CreateTagHelper(); - __CatchAllTagHelper = CreateTagHelper(); + __TestNamespace_InputTagHelper = CreateTagHelper(); + __TestNamespace_CatchAllTagHelper = CreateTagHelper(); #line 7 "EnumTagHelpers.cshtml" -__InputTagHelper.Value = MyEnum.MyValue; +__TestNamespace_InputTagHelper.Value = MyEnum.MyValue; #line default #line hidden - __InputTagHelper = CreateTagHelper(); - __CatchAllTagHelper = CreateTagHelper(); + __TestNamespace_InputTagHelper = CreateTagHelper(); + __TestNamespace_CatchAllTagHelper = CreateTagHelper(); #line 8 "EnumTagHelpers.cshtml" __o = MyEnum.MySecondValue; #line default #line hidden - __InputTagHelper = CreateTagHelper(); - __CatchAllTagHelper = CreateTagHelper(); + __TestNamespace_InputTagHelper = CreateTagHelper(); + __TestNamespace_CatchAllTagHelper = CreateTagHelper(); #line 9 "EnumTagHelpers.cshtml" -__InputTagHelper.Value = Microsoft.AspNet.Razor.Test.Generator.MyEnum.MyValue; +__TestNamespace_InputTagHelper.Value = Microsoft.AspNet.Razor.Test.Generator.MyEnum.MyValue; #line default #line hidden - __InputTagHelper = CreateTagHelper(); - __CatchAllTagHelper = CreateTagHelper(); + __TestNamespace_InputTagHelper = CreateTagHelper(); + __TestNamespace_CatchAllTagHelper = CreateTagHelper(); #line 10 "EnumTagHelpers.cshtml" -__InputTagHelper.Value = Microsoft.AspNet.Razor.Test.Generator.MyEnum.MySecondValue; +__TestNamespace_InputTagHelper.Value = Microsoft.AspNet.Razor.Test.Generator.MyEnum.MySecondValue; #line default #line hidden #line 10 "EnumTagHelpers.cshtml" - __CatchAllTagHelper.CatchAll = Microsoft.AspNet.Razor.Test.Generator.MyEnum.MyValue; +__TestNamespace_CatchAllTagHelper.CatchAll = Microsoft.AspNet.Razor.Test.Generator.MyEnum.MyValue; #line default #line hidden - __InputTagHelper = CreateTagHelper(); - __CatchAllTagHelper = CreateTagHelper(); + __TestNamespace_InputTagHelper = CreateTagHelper(); + __TestNamespace_CatchAllTagHelper = CreateTagHelper(); #line 11 "EnumTagHelpers.cshtml" -__InputTagHelper.Value = enumValue; +__TestNamespace_InputTagHelper.Value = enumValue; #line default #line hidden #line 11 "EnumTagHelpers.cshtml" - __CatchAllTagHelper.CatchAll = enumValue; +__TestNamespace_CatchAllTagHelper.CatchAll = enumValue; #line default #line hidden diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EnumTagHelpers.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EnumTagHelpers.cs index 94b2b37336..4feba44b16 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EnumTagHelpers.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EnumTagHelpers.cs @@ -1,8 +1,6 @@ #pragma checksum "EnumTagHelpers.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "57102d182f8d5da659bb113653552ea18f42bb76" namespace TestOutput { - using Microsoft.AspNet.Razor.TagHelpers; - using Microsoft.AspNet.Razor.Runtime.TagHelpers; using System; using System.Threading.Tasks; @@ -10,13 +8,13 @@ namespace TestOutput { #line hidden #pragma warning disable 0414 - private TagHelperContent __tagHelperStringValueBuffer = null; + private global::Microsoft.AspNet.Razor.TagHelperContent __tagHelperStringValueBuffer = null; #pragma warning restore 0414 - private TagHelperExecutionContext __tagHelperExecutionContext = null; - private TagHelperRunner __tagHelperRunner = null; - private TagHelperScopeManager __tagHelperScopeManager = new TagHelperScopeManager(); - private InputTagHelper __InputTagHelper = null; - private CatchAllTagHelper __CatchAllTagHelper = null; + private global::Microsoft.AspNet.Razor.Runtime.TagHelperExecutionContext __tagHelperExecutionContext = null; + private global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner __tagHelperRunner = null; + private global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager __tagHelperScopeManager = new global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager(); + private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper = null; + private global::TestNamespace.CatchAllTagHelper __TestNamespace_CatchAllTagHelper = null; #line hidden public EnumTagHelpers() { @@ -25,7 +23,7 @@ namespace TestOutput #pragma warning disable 1998 public override async Task ExecuteAsync() { - __tagHelperRunner = __tagHelperRunner ?? new TagHelperRunner(); + __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner(); Instrumentation.BeginContext(33, 2, true); WriteLiteral("\r\n"); Instrumentation.EndContext(); @@ -39,19 +37,19 @@ namespace TestOutput Instrumentation.BeginContext(79, 2, true); WriteLiteral("\r\n"); Instrumentation.EndContext(); - __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", TagMode.SelfClosing, "test", async() => { + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { } , StartTagHelperWritingScope, EndTagHelperWritingScope); - __InputTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__InputTagHelper); - __CatchAllTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__CatchAllTagHelper); + __TestNamespace_InputTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper); + __TestNamespace_CatchAllTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_CatchAllTagHelper); #line 7 "EnumTagHelpers.cshtml" -__InputTagHelper.Value = MyEnum.MyValue; +__TestNamespace_InputTagHelper.Value = MyEnum.MyValue; #line default #line hidden - __tagHelperExecutionContext.AddTagHelperAttribute("value", __InputTagHelper.Value); + __tagHelperExecutionContext.AddTagHelperAttribute("value", __TestNamespace_InputTagHelper.Value); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); Instrumentation.BeginContext(81, 33, false); await WriteTagHelperAsync(__tagHelperExecutionContext); @@ -60,13 +58,13 @@ __InputTagHelper.Value = MyEnum.MyValue; Instrumentation.BeginContext(114, 2, true); WriteLiteral("\r\n"); Instrumentation.EndContext(); - __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", TagMode.SelfClosing, "test", async() => { + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { } , StartTagHelperWritingScope, EndTagHelperWritingScope); - __InputTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__InputTagHelper); - __CatchAllTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__CatchAllTagHelper); + __TestNamespace_InputTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper); + __TestNamespace_CatchAllTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_CatchAllTagHelper); BeginAddHtmlAttributeValues(__tagHelperExecutionContext, "class", 1); #line 8 "EnumTagHelpers.cshtml" AddHtmlAttributeValue("", 130, MyEnum.MySecondValue, 130, 21, false); @@ -82,19 +80,19 @@ AddHtmlAttributeValue("", 130, MyEnum.MySecondValue, 130, 21, false); Instrumentation.BeginContext(155, 2, true); WriteLiteral("\r\n"); Instrumentation.EndContext(); - __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", TagMode.SelfClosing, "test", async() => { + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { } , StartTagHelperWritingScope, EndTagHelperWritingScope); - __InputTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__InputTagHelper); - __CatchAllTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__CatchAllTagHelper); + __TestNamespace_InputTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper); + __TestNamespace_CatchAllTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_CatchAllTagHelper); #line 9 "EnumTagHelpers.cshtml" -__InputTagHelper.Value = Microsoft.AspNet.Razor.Test.Generator.MyEnum.MyValue; +__TestNamespace_InputTagHelper.Value = Microsoft.AspNet.Razor.Test.Generator.MyEnum.MyValue; #line default #line hidden - __tagHelperExecutionContext.AddTagHelperAttribute("value", __InputTagHelper.Value); + __tagHelperExecutionContext.AddTagHelperAttribute("value", __TestNamespace_InputTagHelper.Value); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); Instrumentation.BeginContext(157, 25, false); await WriteTagHelperAsync(__tagHelperExecutionContext); @@ -103,25 +101,25 @@ __InputTagHelper.Value = Microsoft.AspNet.Razor.Test.Generator.MyEnum.MyValue; Instrumentation.BeginContext(182, 2, true); WriteLiteral("\r\n"); Instrumentation.EndContext(); - __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", TagMode.SelfClosing, "test", async() => { + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { } , StartTagHelperWritingScope, EndTagHelperWritingScope); - __InputTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__InputTagHelper); - __CatchAllTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__CatchAllTagHelper); + __TestNamespace_InputTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper); + __TestNamespace_CatchAllTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_CatchAllTagHelper); #line 10 "EnumTagHelpers.cshtml" -__InputTagHelper.Value = Microsoft.AspNet.Razor.Test.Generator.MyEnum.MySecondValue; +__TestNamespace_InputTagHelper.Value = Microsoft.AspNet.Razor.Test.Generator.MyEnum.MySecondValue; #line default #line hidden - __tagHelperExecutionContext.AddTagHelperAttribute("value", __InputTagHelper.Value); + __tagHelperExecutionContext.AddTagHelperAttribute("value", __TestNamespace_InputTagHelper.Value); #line 10 "EnumTagHelpers.cshtml" - __CatchAllTagHelper.CatchAll = Microsoft.AspNet.Razor.Test.Generator.MyEnum.MyValue; +__TestNamespace_CatchAllTagHelper.CatchAll = Microsoft.AspNet.Razor.Test.Generator.MyEnum.MyValue; #line default #line hidden - __tagHelperExecutionContext.AddTagHelperAttribute("catch-all", __CatchAllTagHelper.CatchAll); + __tagHelperExecutionContext.AddTagHelperAttribute("catch-all", __TestNamespace_CatchAllTagHelper.CatchAll); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); Instrumentation.BeginContext(184, 50, false); await WriteTagHelperAsync(__tagHelperExecutionContext); @@ -130,25 +128,25 @@ __InputTagHelper.Value = Microsoft.AspNet.Razor.Test.Generator.MyEnum.MySecondVa Instrumentation.BeginContext(234, 2, true); WriteLiteral("\r\n"); Instrumentation.EndContext(); - __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", TagMode.SelfClosing, "test", async() => { + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { } , StartTagHelperWritingScope, EndTagHelperWritingScope); - __InputTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__InputTagHelper); - __CatchAllTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__CatchAllTagHelper); + __TestNamespace_InputTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper); + __TestNamespace_CatchAllTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_CatchAllTagHelper); #line 11 "EnumTagHelpers.cshtml" -__InputTagHelper.Value = enumValue; +__TestNamespace_InputTagHelper.Value = enumValue; #line default #line hidden - __tagHelperExecutionContext.AddTagHelperAttribute("value", __InputTagHelper.Value); + __tagHelperExecutionContext.AddTagHelperAttribute("value", __TestNamespace_InputTagHelper.Value); #line 11 "EnumTagHelpers.cshtml" - __CatchAllTagHelper.CatchAll = enumValue; +__TestNamespace_CatchAllTagHelper.CatchAll = enumValue; #line default #line hidden - __tagHelperExecutionContext.AddTagHelperAttribute("catch-all", __CatchAllTagHelper.CatchAll); + __tagHelperExecutionContext.AddTagHelperAttribute("catch-all", __TestNamespace_CatchAllTagHelper.CatchAll); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); Instrumentation.BeginContext(236, 51, false); await WriteTagHelperAsync(__tagHelperExecutionContext); 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 9f43d11471..1d18cd9356 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 @@ -20,8 +20,8 @@ namespace TestOutput #pragma warning restore 219 } #line hidden - private InputTagHelper __InputTagHelper = null; - private InputTagHelper2 __InputTagHelper2 = null; + private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper = null; + private global::TestNamespace.InputTagHelper2 __TestNamespace_InputTagHelper2 = null; #line hidden public EscapedTagHelpers() { @@ -35,17 +35,17 @@ namespace TestOutput #line default #line hidden - __InputTagHelper = CreateTagHelper(); - __InputTagHelper2 = CreateTagHelper(); + __TestNamespace_InputTagHelper = CreateTagHelper(); + __TestNamespace_InputTagHelper2 = CreateTagHelper(); #line 6 "EscapedTagHelpers.cshtml" __o = DateTime.Now; #line default #line hidden - __InputTagHelper.Type = string.Empty; - __InputTagHelper2.Type = __InputTagHelper.Type; + __TestNamespace_InputTagHelper.Type = string.Empty; + __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type; #line 6 "EscapedTagHelpers.cshtml" - __InputTagHelper2.Checked = true; + __TestNamespace_InputTagHelper2.Checked = true; #line default #line hidden 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 31aa633b08..b7c675adec 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EscapedTagHelpers.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EscapedTagHelpers.cs @@ -1,8 +1,6 @@ #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; @@ -10,13 +8,13 @@ namespace TestOutput { #line hidden #pragma warning disable 0414 - private TagHelperContent __tagHelperStringValueBuffer = null; + private global::Microsoft.AspNet.Razor.TagHelperContent __tagHelperStringValueBuffer = null; #pragma warning restore 0414 - private TagHelperExecutionContext __tagHelperExecutionContext = null; - private TagHelperRunner __tagHelperRunner = null; - private TagHelperScopeManager __tagHelperScopeManager = new TagHelperScopeManager(); - private InputTagHelper __InputTagHelper = null; - private InputTagHelper2 __InputTagHelper2 = null; + private global::Microsoft.AspNet.Razor.Runtime.TagHelperExecutionContext __tagHelperExecutionContext = null; + private global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner __tagHelperRunner = null; + private global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager __tagHelperScopeManager = new global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager(); + private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper = null; + private global::TestNamespace.InputTagHelper2 __TestNamespace_InputTagHelper2 = null; #line hidden public EscapedTagHelpers() { @@ -25,7 +23,7 @@ namespace TestOutput #pragma warning disable 1998 public override async Task ExecuteAsync() { - __tagHelperRunner = __tagHelperRunner ?? new TagHelperRunner(); + __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner(); Instrumentation.BeginContext(27, 72, true); WriteLiteral("\r\n
\r\n

\r\n \r\n Not a TagHelper: "); Instrumentation.EndContext(); - __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", TagMode.SelfClosing, "test", async() => { + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { } , StartTagHelperWritingScope, EndTagHelperWritingScope); - __InputTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__InputTagHelper); - __InputTagHelper2 = CreateTagHelper(); - __tagHelperExecutionContext.Add(__InputTagHelper2); + __TestNamespace_InputTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper); + __TestNamespace_InputTagHelper2 = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper2); StartTagHelperWritingScope(); #line 6 "EscapedTagHelpers.cshtml" WriteLiteral(DateTime.Now); @@ -53,15 +51,15 @@ namespace TestOutput #line default #line hidden __tagHelperStringValueBuffer = EndTagHelperWritingScope(); - __InputTagHelper.Type = __tagHelperStringValueBuffer.GetContent(HtmlEncoder); - __tagHelperExecutionContext.AddTagHelperAttribute("type", __InputTagHelper.Type); - __InputTagHelper2.Type = __InputTagHelper.Type; + __TestNamespace_InputTagHelper.Type = __tagHelperStringValueBuffer.GetContent(HtmlEncoder); + __tagHelperExecutionContext.AddTagHelperAttribute("type", __TestNamespace_InputTagHelper.Type); + __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type; #line 6 "EscapedTagHelpers.cshtml" - __InputTagHelper2.Checked = true; + __TestNamespace_InputTagHelper2.Checked = true; #line default #line hidden - __tagHelperExecutionContext.AddTagHelperAttribute("checked", __InputTagHelper2.Checked); + __tagHelperExecutionContext.AddTagHelperAttribute("checked", __TestNamespace_InputTagHelper2.Checked); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); Instrumentation.BeginContext(186, 45, false); await WriteTagHelperAsync(__tagHelperExecutionContext); 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 8a296f157b..9aa22725c6 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/IncompleteTagHelper.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/IncompleteTagHelper.cs @@ -1,8 +1,6 @@ #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; @@ -10,12 +8,12 @@ namespace TestOutput { #line hidden #pragma warning disable 0414 - private TagHelperContent __tagHelperStringValueBuffer = null; + private global::Microsoft.AspNet.Razor.TagHelperContent __tagHelperStringValueBuffer = null; #pragma warning restore 0414 - private TagHelperExecutionContext __tagHelperExecutionContext = null; - private TagHelperRunner __tagHelperRunner = null; - private TagHelperScopeManager __tagHelperScopeManager = new TagHelperScopeManager(); - private PTagHelper __PTagHelper = null; + private global::Microsoft.AspNet.Razor.Runtime.TagHelperExecutionContext __tagHelperExecutionContext = null; + private global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner __tagHelperRunner = null; + private global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager __tagHelperScopeManager = new global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager(); + private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper = null; #line hidden public IncompleteTagHelper() { @@ -24,15 +22,15 @@ namespace TestOutput #pragma warning disable 1998 public override async Task ExecuteAsync() { - __tagHelperRunner = __tagHelperRunner ?? new TagHelperRunner(); + __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner(); Instrumentation.BeginContext(33, 2, true); WriteLiteral("\r\n"); Instrumentation.EndContext(); - __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", TagMode.StartTagAndEndTag, "test", async() => { + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => { } , StartTagHelperWritingScope, EndTagHelperWritingScope); - __PTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__PTagHelper); + __TestNamespace_PTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_PTagHelper); __tagHelperExecutionContext.AddHtmlAttribute("class", Html.Raw("")); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); Instrumentation.BeginContext(35, 10, false); 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 093c8ca719..7d10d15c21 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 @@ -20,8 +20,8 @@ namespace TestOutput #pragma warning restore 219 } #line hidden - private CatchAllTagHelper __CatchAllTagHelper = null; - private InputTagHelper __InputTagHelper = null; + private global::TestNamespace.CatchAllTagHelper __TestNamespace_CatchAllTagHelper = null; + private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper = null; #line hidden public MinimizedTagHelpers() { @@ -30,18 +30,18 @@ namespace TestOutput #pragma warning disable 1998 public override async Task ExecuteAsync() { - __CatchAllTagHelper = CreateTagHelper(); - __InputTagHelper = CreateTagHelper(); - __CatchAllTagHelper = CreateTagHelper(); - __InputTagHelper.BoundRequiredString = "hello"; - __InputTagHelper = CreateTagHelper(); - __CatchAllTagHelper = CreateTagHelper(); - __CatchAllTagHelper.BoundRequiredString = "world"; - __InputTagHelper.BoundRequiredString = "hello2"; - __InputTagHelper = CreateTagHelper(); - __CatchAllTagHelper = CreateTagHelper(); - __InputTagHelper.BoundRequiredString = "world"; - __CatchAllTagHelper = CreateTagHelper(); + __TestNamespace_CatchAllTagHelper = CreateTagHelper(); + __TestNamespace_InputTagHelper = CreateTagHelper(); + __TestNamespace_CatchAllTagHelper = CreateTagHelper(); + __TestNamespace_InputTagHelper.BoundRequiredString = "hello"; + __TestNamespace_InputTagHelper = CreateTagHelper(); + __TestNamespace_CatchAllTagHelper = CreateTagHelper(); + __TestNamespace_CatchAllTagHelper.BoundRequiredString = "world"; + __TestNamespace_InputTagHelper.BoundRequiredString = "hello2"; + __TestNamespace_InputTagHelper = CreateTagHelper(); + __TestNamespace_CatchAllTagHelper = CreateTagHelper(); + __TestNamespace_InputTagHelper.BoundRequiredString = "world"; + __TestNamespace_CatchAllTagHelper = CreateTagHelper(); } #pragma warning restore 1998 } 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 443314a519..990d35816c 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/MinimizedTagHelpers.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/MinimizedTagHelpers.cs @@ -1,8 +1,6 @@ #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; @@ -10,13 +8,13 @@ namespace TestOutput { #line hidden #pragma warning disable 0414 - private TagHelperContent __tagHelperStringValueBuffer = null; + private global::Microsoft.AspNet.Razor.TagHelperContent __tagHelperStringValueBuffer = null; #pragma warning restore 0414 - private TagHelperExecutionContext __tagHelperExecutionContext = null; - private TagHelperRunner __tagHelperRunner = null; - private TagHelperScopeManager __tagHelperScopeManager = new TagHelperScopeManager(); - private CatchAllTagHelper __CatchAllTagHelper = null; - private InputTagHelper __InputTagHelper = null; + private global::Microsoft.AspNet.Razor.Runtime.TagHelperExecutionContext __tagHelperExecutionContext = null; + private global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner __tagHelperRunner = null; + private global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager __tagHelperScopeManager = new global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager(); + private global::TestNamespace.CatchAllTagHelper __TestNamespace_CatchAllTagHelper = null; + private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper = null; #line hidden public MinimizedTagHelpers() { @@ -25,19 +23,19 @@ namespace TestOutput #pragma warning disable 1998 public override async Task ExecuteAsync() { - __tagHelperRunner = __tagHelperRunner ?? new TagHelperRunner(); + __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner(); Instrumentation.BeginContext(33, 2, true); WriteLiteral("\r\n"); Instrumentation.EndContext(); - __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", TagMode.StartTagAndEndTag, "test", async() => { + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => { Instrumentation.BeginContext(64, 34, true); WriteLiteral("\r\n \r\n "); Instrumentation.EndContext(); - __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", TagMode.SelfClosing, "test", async() => { + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { } , StartTagHelperWritingScope, EndTagHelperWritingScope); - __CatchAllTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__CatchAllTagHelper); + __TestNamespace_CatchAllTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_CatchAllTagHelper); __tagHelperExecutionContext.AddHtmlAttribute("class", Html.Raw("btn")); __tagHelperExecutionContext.AddMinimizedHtmlAttribute("catchall-unbound-required"); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); @@ -48,18 +46,18 @@ namespace TestOutput Instrumentation.BeginContext(157, 6, true); WriteLiteral("\r\n "); Instrumentation.EndContext(); - __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", TagMode.SelfClosing, "test", async() => { + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { } , StartTagHelperWritingScope, EndTagHelperWritingScope); - __InputTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__InputTagHelper); - __CatchAllTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__CatchAllTagHelper); + __TestNamespace_InputTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper); + __TestNamespace_CatchAllTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_CatchAllTagHelper); __tagHelperExecutionContext.AddHtmlAttribute("class", Html.Raw("btn")); __tagHelperExecutionContext.AddMinimizedHtmlAttribute("catchall-unbound-required"); __tagHelperExecutionContext.AddMinimizedHtmlAttribute("input-unbound-required"); - __InputTagHelper.BoundRequiredString = "hello"; - __tagHelperExecutionContext.AddTagHelperAttribute("input-bound-required-string", __InputTagHelper.BoundRequiredString); + __TestNamespace_InputTagHelper.BoundRequiredString = "hello"; + __tagHelperExecutionContext.AddTagHelperAttribute("input-bound-required-string", __TestNamespace_InputTagHelper.BoundRequiredString); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); Instrumentation.BeginContext(163, 119, false); await WriteTagHelperAsync(__tagHelperExecutionContext); @@ -68,20 +66,20 @@ namespace TestOutput Instrumentation.BeginContext(282, 6, true); WriteLiteral("\r\n "); Instrumentation.EndContext(); - __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", TagMode.SelfClosing, "test", async() => { + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { } , StartTagHelperWritingScope, EndTagHelperWritingScope); - __InputTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__InputTagHelper); - __CatchAllTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__CatchAllTagHelper); + __TestNamespace_InputTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper); + __TestNamespace_CatchAllTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_CatchAllTagHelper); __tagHelperExecutionContext.AddHtmlAttribute("class", Html.Raw("btn")); __tagHelperExecutionContext.AddMinimizedHtmlAttribute("catchall-unbound-required"); __tagHelperExecutionContext.AddMinimizedHtmlAttribute("input-unbound-required"); - __CatchAllTagHelper.BoundRequiredString = "world"; - __tagHelperExecutionContext.AddTagHelperAttribute("catchall-bound-string", __CatchAllTagHelper.BoundRequiredString); - __InputTagHelper.BoundRequiredString = "hello2"; - __tagHelperExecutionContext.AddTagHelperAttribute("input-bound-required-string", __InputTagHelper.BoundRequiredString); + __TestNamespace_CatchAllTagHelper.BoundRequiredString = "world"; + __tagHelperExecutionContext.AddTagHelperAttribute("catchall-bound-string", __TestNamespace_CatchAllTagHelper.BoundRequiredString); + __TestNamespace_InputTagHelper.BoundRequiredString = "hello2"; + __tagHelperExecutionContext.AddTagHelperAttribute("input-bound-required-string", __TestNamespace_InputTagHelper.BoundRequiredString); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); Instrumentation.BeginContext(288, 176, false); await WriteTagHelperAsync(__tagHelperExecutionContext); @@ -90,19 +88,19 @@ namespace TestOutput Instrumentation.BeginContext(464, 6, true); WriteLiteral("\r\n "); Instrumentation.EndContext(); - __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", TagMode.SelfClosing, "test", async() => { + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { } , StartTagHelperWritingScope, EndTagHelperWritingScope); - __InputTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__InputTagHelper); - __CatchAllTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__CatchAllTagHelper); + __TestNamespace_InputTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper); + __TestNamespace_CatchAllTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_CatchAllTagHelper); __tagHelperExecutionContext.AddHtmlAttribute("class", Html.Raw("btn")); __tagHelperExecutionContext.AddHtmlAttribute("catchall-unbound-required", Html.Raw("hello")); __tagHelperExecutionContext.AddHtmlAttribute("input-unbound-required", Html.Raw("hello2")); __tagHelperExecutionContext.AddMinimizedHtmlAttribute("catchall-unbound-required"); - __InputTagHelper.BoundRequiredString = "world"; - __tagHelperExecutionContext.AddTagHelperAttribute("input-bound-required-string", __InputTagHelper.BoundRequiredString); + __TestNamespace_InputTagHelper.BoundRequiredString = "world"; + __tagHelperExecutionContext.AddTagHelperAttribute("input-bound-required-string", __TestNamespace_InputTagHelper.BoundRequiredString); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); Instrumentation.BeginContext(470, 206, false); await WriteTagHelperAsync(__tagHelperExecutionContext); @@ -113,8 +111,8 @@ namespace TestOutput Instrumentation.EndContext(); } , StartTagHelperWritingScope, EndTagHelperWritingScope); - __CatchAllTagHelper = CreateTagHelper(); - __tagHelperExecutionContext.Add(__CatchAllTagHelper); + __TestNamespace_CatchAllTagHelper = CreateTagHelper(); + __tagHelperExecutionContext.Add(__TestNamespace_CatchAllTagHelper); __tagHelperExecutionContext.AddMinimizedHtmlAttribute("catchall-unbound-required"); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); Instrumentation.BeginContext(35, 647, false); 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 7fd593fd56..f300d8730b 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 @@ -20,9 +20,9 @@ namespace TestOutput #pragma warning restore 219 } #line hidden - private PTagHelper __PTagHelper = null; - private InputTagHelper __InputTagHelper = null; - private InputTagHelper2 __InputTagHelper2 = null; + private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper = null; + private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper = null; + private global::TestNamespace.InputTagHelper2 __TestNamespace_InputTagHelper2 = null; #line hidden public NestedScriptTagTagHelpers() { @@ -43,17 +43,17 @@ namespace TestOutput #line default #line hidden - __InputTagHelper = CreateTagHelper(); - __InputTagHelper2 = CreateTagHelper(); + __TestNamespace_InputTagHelper = CreateTagHelper(); + __TestNamespace_InputTagHelper2 = CreateTagHelper(); #line 8 "NestedScriptTagTagHelpers.cshtml" __o = ViewBag.DefaultInterval; #line default #line hidden - __InputTagHelper.Type = "text"; - __InputTagHelper2.Type = __InputTagHelper.Type; + __TestNamespace_InputTagHelper.Type = "text"; + __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type; #line 8 "NestedScriptTagTagHelpers.cshtml" - __InputTagHelper2.Checked = true; + __TestNamespace_InputTagHelper2.Checked = true; #line default #line hidden @@ -63,7 +63,7 @@ namespace TestOutput #line default #line hidden - __PTagHelper = CreateTagHelper(); + __TestNamespace_PTagHelper = CreateTagHelper(); } #pragma warning restore 1998 } 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 2ae1ee9c25..4a7140046c 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/NestedScriptTagTagHelpers.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/NestedScriptTagTagHelpers.cs @@ -1,8 +1,6 @@ #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; @@ -10,14 +8,14 @@ namespace TestOutput { #line hidden #pragma warning disable 0414 - private TagHelperContent __tagHelperStringValueBuffer = null; + private global::Microsoft.AspNet.Razor.TagHelperContent __tagHelperStringValueBuffer = null; #pragma warning restore 0414 - private TagHelperExecutionContext __tagHelperExecutionContext = null; - private TagHelperRunner __tagHelperRunner = null; - private TagHelperScopeManager __tagHelperScopeManager = new TagHelperScopeManager(); - private PTagHelper __PTagHelper = null; - private InputTagHelper __InputTagHelper = null; - private InputTagHelper2 __InputTagHelper2 = null; + private global::Microsoft.AspNet.Razor.Runtime.TagHelperExecutionContext __tagHelperExecutionContext = null; + private global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner __tagHelperRunner = null; + private global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager __tagHelperScopeManager = new global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager(); + private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper = null; + private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper = null; + private global::TestNamespace.InputTagHelper2 __TestNamespace_InputTagHelper2 = null; #line hidden public NestedScriptTagTagHelpers() { @@ -26,12 +24,12 @@ namespace TestOutput #pragma warning disable 1998 public override async Task ExecuteAsync() { - __tagHelperRunner = __tagHelperRunner ?? new TagHelperRunner(); + __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner(); Instrumentation.BeginContext(33, 106, true); WriteLiteral("\r\n