From 7a234ca513f6c945ab10e0f238b3fd6044681f2c Mon Sep 17 00:00:00 2001 From: Ryan Nowak Date: Wed, 21 Jun 2017 19:54:40 -0700 Subject: [PATCH] Rename UsingStatement>UsingDirective --- .../ModelDirective.cs | 2 +- .../CodeGeneration/BasicWriter.cs | 2 +- .../CodeGeneration/DefaultDocumentWriter.cs | 4 ++-- .../CodeGeneration/DesignTimeBasicWriter.cs | 2 +- .../CodeGeneration/RuntimeBasicWriter.cs | 2 +- ...efaultRazorIntermediateNodeLoweringPhase.cs | 2 +- .../DocumentClassifierPassBase.cs | 4 ++-- .../Intermediate/IntermediateNodeVisitor.cs | 2 +- ...de.cs => UsingDirectiveIntermediateNode.cs} | 4 ++-- .../ModelDirectiveTest.cs | 8 ++++---- .../Basic_DesignTime.ir.txt | 16 ++++++++-------- .../Basic_Runtime.ir.txt | 14 +++++++------- .../IncompleteDirectives_DesignTime.ir.txt | 16 ++++++++-------- .../IncompleteDirectives_Runtime.ir.txt | 14 +++++++------- .../InheritsViewModel_DesignTime.ir.txt | 16 ++++++++-------- .../InheritsViewModel_Runtime.ir.txt | 14 +++++++------- .../InheritsWithViewImports_DesignTime.ir.txt | 16 ++++++++-------- .../InheritsWithViewImports_Runtime.ir.txt | 14 +++++++------- .../InjectWithModel_DesignTime.ir.txt | 16 ++++++++-------- .../InjectWithModel_Runtime.ir.txt | 14 +++++++------- .../InjectWithSemicolon_DesignTime.ir.txt | 16 ++++++++-------- .../InjectWithSemicolon_Runtime.ir.txt | 14 +++++++------- .../Inject_DesignTime.ir.txt | 16 ++++++++-------- .../Inject_Runtime.ir.txt | 14 +++++++------- .../InvalidNamespaceAtEOF_DesignTime.ir.txt | 16 ++++++++-------- .../InvalidNamespaceAtEOF_Runtime.ir.txt | 14 +++++++------- .../MalformedPageDirective_DesignTime.ir.txt | 16 ++++++++-------- .../MalformedPageDirective_Runtime.ir.txt | 14 +++++++------- .../ModelExpressionTagHelper_DesignTime.ir.txt | 16 ++++++++-------- .../ModelExpressionTagHelper_Runtime.ir.txt | 14 +++++++------- .../Model_DesignTime.ir.txt | 16 ++++++++-------- .../Model_Runtime.ir.txt | 14 +++++++------- .../MultipleModels_DesignTime.ir.txt | 16 ++++++++-------- .../PageWithNamespace_DesignTime.ir.txt | 16 ++++++++-------- .../PageWithNamespace_Runtime.ir.txt | 14 +++++++------- .../RazorPagesWithoutModel_DesignTime.ir.txt | 18 +++++++++--------- .../RazorPagesWithoutModel_Runtime.ir.txt | 16 ++++++++-------- .../RazorPages_DesignTime.ir.txt | 18 +++++++++--------- .../RazorPages_Runtime.ir.txt | 16 ++++++++-------- .../ViewComponentTagHelper_DesignTime.ir.txt | 16 ++++++++-------- .../ViewComponentTagHelper_Runtime.ir.txt | 14 +++++++------- .../ViewWithNamespace_DesignTime.ir.txt | 16 ++++++++-------- .../ViewWithNamespace_Runtime.ir.txt | 14 +++++++------- .../_ViewImports_DesignTime.ir.txt | 16 ++++++++-------- .../_ViewImports_Runtime.ir.txt | 14 +++++++------- .../DesignTimeBasicWriterTest.cs | 12 ++++++------ .../CodeGeneration/RuntimeBasicWriterTest.cs | 15 +++++++-------- .../DocumentClassifierPassBaseTest.cs | 4 ++-- .../BasicImports_DesignTime.ir.txt | 6 +++--- .../BasicImports_Runtime.ir.txt | 6 +++--- .../Usings_DesignTime.ir.txt | 12 ++++++------ .../Usings_Runtime.ir.txt | 12 ++++++------ .../IntegrationTests/IntermediateNodeWriter.cs | 2 +- .../Intermediate/IntermediateNodeAssert.cs | 2 +- 54 files changed, 318 insertions(+), 319 deletions(-) rename src/Microsoft.AspNetCore.Razor.Language/Intermediate/{UsingStatementIntermediateNode.cs => UsingDirectiveIntermediateNode.cs} (91%) diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ModelDirective.cs b/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ModelDirective.cs index c0c947ce28..49dc4d40cb 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ModelDirective.cs +++ b/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ModelDirective.cs @@ -81,7 +81,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions // Alias the TModel token to a known type. // This allows design time compilation to succeed for Razor files where the token isn't replaced. var typeName = $"global::{typeof(object).FullName}"; - var usingNode = new UsingStatementIntermediateNode() + var usingNode = new UsingDirectiveIntermediateNode() { Content = $"TModel = {typeName}" }; diff --git a/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/BasicWriter.cs b/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/BasicWriter.cs index c39cf640b0..47074193f3 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/BasicWriter.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/BasicWriter.cs @@ -7,7 +7,7 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration { public abstract class BasicWriter { - public abstract void WriteUsingStatement(CSharpRenderingContext context, UsingStatementIntermediateNode node); + public abstract void WriteUsingDirective(CSharpRenderingContext context, UsingDirectiveIntermediateNode node); public abstract void WriteCSharpExpression(CSharpRenderingContext context, CSharpExpressionIntermediateNode node); diff --git a/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/DefaultDocumentWriter.cs b/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/DefaultDocumentWriter.cs index 205c0d51e3..a280ce9f83 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/DefaultDocumentWriter.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/DefaultDocumentWriter.cs @@ -102,9 +102,9 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration RenderChildren(node); } - public override void VisitUsingStatement(UsingStatementIntermediateNode node) + public override void VisitUsingDirective(UsingDirectiveIntermediateNode node) { - Context.BasicWriter.WriteUsingStatement(Context, node); + Context.BasicWriter.WriteUsingDirective(Context, node); } public override void VisitNamespaceDeclaration(NamespaceDeclarationIntermediateNode node) diff --git a/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/DesignTimeBasicWriter.cs b/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/DesignTimeBasicWriter.cs index 8f53065054..5dbb52af7b 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/DesignTimeBasicWriter.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/DesignTimeBasicWriter.cs @@ -9,7 +9,7 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration { public class DesignTimeBasicWriter : BasicWriter { - public override void WriteUsingStatement(CSharpRenderingContext context, UsingStatementIntermediateNode node) + public override void WriteUsingDirective(CSharpRenderingContext context, UsingDirectiveIntermediateNode node) { if (node.Source.HasValue) { diff --git a/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/RuntimeBasicWriter.cs b/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/RuntimeBasicWriter.cs index 8ac19bd7be..d4928a1bd9 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/RuntimeBasicWriter.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/RuntimeBasicWriter.cs @@ -28,7 +28,7 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration public string TemplateTypeName { get; set; } = "Microsoft.AspNetCore.Mvc.Razor.HelperResult"; - public override void WriteUsingStatement(CSharpRenderingContext context, UsingStatementIntermediateNode node) + public override void WriteUsingDirective(CSharpRenderingContext context, UsingDirectiveIntermediateNode node) { if (node.Source.HasValue) { diff --git a/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorIntermediateNodeLoweringPhase.cs b/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorIntermediateNodeLoweringPhase.cs index 902bd1d252..3e65c31776 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorIntermediateNodeLoweringPhase.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorIntermediateNodeLoweringPhase.cs @@ -64,7 +64,7 @@ namespace Microsoft.AspNetCore.Razor.Language var i = 0; foreach (var @namespace in namespaces) { - var @using = new UsingStatementIntermediateNode() + var @using = new UsingDirectiveIntermediateNode() { Content = @namespace.Key, Source = @namespace.Value, diff --git a/src/Microsoft.AspNetCore.Razor.Language/DocumentClassifierPassBase.cs b/src/Microsoft.AspNetCore.Razor.Language/DocumentClassifierPassBase.cs index cbfaa5b674..06865578a1 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/DocumentClassifierPassBase.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/DocumentClassifierPassBase.cs @@ -123,14 +123,14 @@ namespace Microsoft.AspNetCore.Razor.Language _method = method; } - public override void VisitUsingStatement(UsingStatementIntermediateNode node) + public override void VisitUsingDirective(UsingDirectiveIntermediateNode node) { var children = _namespace.Current.Children; var i = children.Count - 1; for (; i >= 0; i--) { var child = children[i]; - if (child is UsingStatementIntermediateNode) + if (child is UsingDirectiveIntermediateNode) { break; } diff --git a/src/Microsoft.AspNetCore.Razor.Language/Intermediate/IntermediateNodeVisitor.cs b/src/Microsoft.AspNetCore.Razor.Language/Intermediate/IntermediateNodeVisitor.cs index 351f045bc8..1879691f0b 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Intermediate/IntermediateNodeVisitor.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Intermediate/IntermediateNodeVisitor.cs @@ -104,7 +104,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate VisitDefault(node); } - public virtual void VisitUsingStatement(UsingStatementIntermediateNode node) + public virtual void VisitUsingDirective(UsingDirectiveIntermediateNode node) { VisitDefault(node); } diff --git a/src/Microsoft.AspNetCore.Razor.Language/Intermediate/UsingStatementIntermediateNode.cs b/src/Microsoft.AspNetCore.Razor.Language/Intermediate/UsingDirectiveIntermediateNode.cs similarity index 91% rename from src/Microsoft.AspNetCore.Razor.Language/Intermediate/UsingStatementIntermediateNode.cs rename to src/Microsoft.AspNetCore.Razor.Language/Intermediate/UsingDirectiveIntermediateNode.cs index 0d78def441..20cb06a525 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Intermediate/UsingStatementIntermediateNode.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Intermediate/UsingDirectiveIntermediateNode.cs @@ -5,7 +5,7 @@ using System; namespace Microsoft.AspNetCore.Razor.Language.Intermediate { - public sealed class UsingStatementIntermediateNode : IntermediateNode + public sealed class UsingDirectiveIntermediateNode : IntermediateNode { private RazorDiagnosticCollection _diagnostics; @@ -39,7 +39,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate throw new ArgumentNullException(nameof(visitor)); } - visitor.VisitUsingStatement(this); + visitor.VisitUsingDirective(this); } } } diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/ModelDirectiveTest.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/ModelDirectiveTest.cs index 97b0767de7..c5ee1601d0 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/ModelDirectiveTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/ModelDirectiveTest.cs @@ -156,7 +156,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions } [Fact] - public void ModelDirectivePass_DesignTime_AddsTModelUsingStatement() + public void ModelDirectivePass_DesignTime_AddsTModelUsingDirective() { // Arrange var codeDocument = CreateDocument(@" @@ -180,12 +180,12 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions Assert.Equal("BaseType", @class.BaseType); var @namespace = FindNamespaceNode(irDocument); - var usingNode = Assert.IsType(@namespace.Children[0]); + var usingNode = Assert.IsType(@namespace.Children[0]); Assert.Equal($"TModel = global::{typeof(object).FullName}", usingNode.Content); } [Fact] - public void ModelDirectivePass_DesignTime_WithModel_AddsTModelUsingStatement() + public void ModelDirectivePass_DesignTime_WithModel_AddsTModelUsingDirective() { // Arrange var codeDocument = CreateDocument(@" @@ -210,7 +210,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions Assert.Equal("BaseType", @class.BaseType); var @namespace = FindNamespaceNode(irDocument); - var usingNode = Assert.IsType(@namespace.Children[0]); + var usingNode = Assert.IsType(@namespace.Children[0]); Assert.Equal($"TModel = global::System.Object", usingNode.Content); } diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.ir.txt index e67c51d243..9fb2ddeafa 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.ir.txt @@ -2,14 +2,14 @@ Document - CSharpCode - IntermediateToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(null, typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Basic_cshtml))] NamespaceDeclaration - - AspNetCore - UsingStatement - - TModel = global::System.Object - UsingStatement - (1:0,1 [12] ) - System - UsingStatement - (16:1,1 [32] ) - System.Collections.Generic - UsingStatement - (51:2,1 [17] ) - System.Linq - UsingStatement - (71:3,1 [28] ) - System.Threading.Tasks - UsingStatement - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc - UsingStatement - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering - UsingStatement - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures + UsingDirective - - TModel = global::System.Object + UsingDirective - (1:0,1 [12] ) - System + UsingDirective - (16:1,1 [32] ) - System.Collections.Generic + UsingDirective - (51:2,1 [17] ) - System.Linq + UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks + UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc + UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering + UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Basic_cshtml - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage - DesignTimeDirective - DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.ir.txt index b0028d03bb..c4bcd68fcd 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.ir.txt @@ -2,13 +2,13 @@ Document - CSharpCode - IntermediateToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(null, typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Basic_cshtml))] NamespaceDeclaration - - AspNetCore - UsingStatement - (1:0,1 [14] ) - System - UsingStatement - (16:1,1 [34] ) - System.Collections.Generic - UsingStatement - (51:2,1 [19] ) - System.Linq - UsingStatement - (71:3,1 [30] ) - System.Threading.Tasks - UsingStatement - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc - UsingStatement - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering - UsingStatement - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures + UsingDirective - (1:0,1 [14] ) - System + UsingDirective - (16:1,1 [34] ) - System.Collections.Generic + UsingDirective - (51:2,1 [19] ) - System.Linq + UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks + UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc + UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering + UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Basic_cshtml - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage - MethodDeclaration - - public async override - global::System.Threading.Tasks.Task - ExecuteAsync CSharpCode - diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt index ed371aeb7c..dda014a26f 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.ir.txt @@ -2,14 +2,14 @@ Document - CSharpCode - IntermediateToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(null, typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives_cshtml), null)] NamespaceDeclaration - - AspNetCore - UsingStatement - - TModel = global::System.Object - UsingStatement - (1:0,1 [12] ) - System - UsingStatement - (16:1,1 [32] ) - System.Collections.Generic - UsingStatement - (51:2,1 [17] ) - System.Linq - UsingStatement - (71:3,1 [28] ) - System.Threading.Tasks - UsingStatement - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc - UsingStatement - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering - UsingStatement - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures + UsingDirective - - TModel = global::System.Object + UsingDirective - (1:0,1 [12] ) - System + UsingDirective - (16:1,1 [32] ) - System.Collections.Generic + UsingDirective - (51:2,1 [17] ) - System.Linq + UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks + UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc + UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering + UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives_cshtml - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - DesignTimeDirective - DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt index 98612802cc..62638638e4 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt @@ -2,13 +2,13 @@ Document - CSharpCode - IntermediateToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(null, typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives_cshtml), null)] NamespaceDeclaration - - AspNetCore - UsingStatement - (1:0,1 [14] ) - System - UsingStatement - (16:1,1 [34] ) - System.Collections.Generic - UsingStatement - (51:2,1 [19] ) - System.Linq - UsingStatement - (71:3,1 [30] ) - System.Threading.Tasks - UsingStatement - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc - UsingStatement - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering - UsingStatement - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures + UsingDirective - (1:0,1 [14] ) - System + UsingDirective - (16:1,1 [34] ) - System.Collections.Generic + UsingDirective - (51:2,1 [19] ) - System.Linq + UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks + UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc + UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering + UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives_cshtml - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - MethodDeclaration - - public async override - global::System.Threading.Tasks.Task - ExecuteAsync CSharpCode - diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.ir.txt index 435e3fc492..a2c096cb43 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.ir.txt @@ -2,14 +2,14 @@ Document - CSharpCode - IntermediateToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(null, typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsViewModel_cshtml))] NamespaceDeclaration - - AspNetCore - UsingStatement - - TModel = global::System.Object - UsingStatement - (1:0,1 [12] ) - System - UsingStatement - (16:1,1 [32] ) - System.Collections.Generic - UsingStatement - (51:2,1 [17] ) - System.Linq - UsingStatement - (71:3,1 [28] ) - System.Threading.Tasks - UsingStatement - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc - UsingStatement - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering - UsingStatement - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures + UsingDirective - - TModel = global::System.Object + UsingDirective - (1:0,1 [12] ) - System + UsingDirective - (16:1,1 [32] ) - System.Collections.Generic + UsingDirective - (51:2,1 [17] ) - System.Linq + UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks + UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc + UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering + UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsViewModel_cshtml - MyBasePageForViews - DesignTimeDirective - DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_Runtime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_Runtime.ir.txt index 39346a8e15..4b994c2d50 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_Runtime.ir.txt @@ -2,13 +2,13 @@ Document - CSharpCode - IntermediateToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(null, typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsViewModel_cshtml))] NamespaceDeclaration - - AspNetCore - UsingStatement - (1:0,1 [14] ) - System - UsingStatement - (16:1,1 [34] ) - System.Collections.Generic - UsingStatement - (51:2,1 [19] ) - System.Linq - UsingStatement - (71:3,1 [30] ) - System.Threading.Tasks - UsingStatement - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc - UsingStatement - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering - UsingStatement - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures + UsingDirective - (1:0,1 [14] ) - System + UsingDirective - (16:1,1 [34] ) - System.Collections.Generic + UsingDirective - (51:2,1 [19] ) - System.Linq + UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks + UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc + UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering + UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsViewModel_cshtml - MyBasePageForViews - MethodDeclaration - - public async override - global::System.Threading.Tasks.Task - ExecuteAsync Inject - diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.ir.txt index de03eab8d8..38b2a67edb 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.ir.txt @@ -2,14 +2,14 @@ Document - CSharpCode - IntermediateToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(null, typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsWithViewImports_cshtml), null)] NamespaceDeclaration - - AspNetCore - UsingStatement - - TModel = global::System.Object - UsingStatement - (1:0,1 [12] ) - System - UsingStatement - (16:1,1 [32] ) - System.Collections.Generic - UsingStatement - (51:2,1 [17] ) - System.Linq - UsingStatement - (71:3,1 [28] ) - System.Threading.Tasks - UsingStatement - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc - UsingStatement - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering - UsingStatement - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures + UsingDirective - - TModel = global::System.Object + UsingDirective - (1:0,1 [12] ) - System + UsingDirective - (16:1,1 [32] ) - System.Collections.Generic + UsingDirective - (51:2,1 [17] ) - System.Linq + UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks + UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc + UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering + UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsWithViewImports_cshtml - MyPageModel - DesignTimeDirective - DirectiveToken - (10:0,10 [19] InheritsWithViewImports_Imports0.cshtml) - MyPageModel diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Runtime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Runtime.ir.txt index dd848c8971..548bb823f5 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Runtime.ir.txt @@ -2,13 +2,13 @@ Document - CSharpCode - IntermediateToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(null, typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsWithViewImports_cshtml), null)] NamespaceDeclaration - - AspNetCore - UsingStatement - (1:0,1 [14] ) - System - UsingStatement - (16:1,1 [34] ) - System.Collections.Generic - UsingStatement - (51:2,1 [19] ) - System.Linq - UsingStatement - (71:3,1 [30] ) - System.Threading.Tasks - UsingStatement - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc - UsingStatement - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering - UsingStatement - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures + UsingDirective - (1:0,1 [14] ) - System + UsingDirective - (16:1,1 [34] ) - System.Collections.Generic + UsingDirective - (51:2,1 [19] ) - System.Linq + UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks + UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc + UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering + UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsWithViewImports_cshtml - MyPageModel - MethodDeclaration - - public async override - global::System.Threading.Tasks.Task - ExecuteAsync Inject - diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.ir.txt index ecc529e42d..07d1187a5e 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.ir.txt @@ -2,14 +2,14 @@ Document - CSharpCode - IntermediateToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(null, typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithModel_cshtml))] NamespaceDeclaration - - AspNetCore - UsingStatement - - TModel = global::System.Object - UsingStatement - (1:0,1 [12] ) - System - UsingStatement - (16:1,1 [32] ) - System.Collections.Generic - UsingStatement - (51:2,1 [17] ) - System.Linq - UsingStatement - (71:3,1 [28] ) - System.Threading.Tasks - UsingStatement - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc - UsingStatement - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering - UsingStatement - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures + UsingDirective - - TModel = global::System.Object + UsingDirective - (1:0,1 [12] ) - System + UsingDirective - (16:1,1 [32] ) - System.Collections.Generic + UsingDirective - (51:2,1 [17] ) - System.Linq + UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks + UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc + UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering + UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithModel_cshtml - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage - DesignTimeDirective - DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_Runtime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_Runtime.ir.txt index c0f671923f..edd53414fb 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_Runtime.ir.txt @@ -2,13 +2,13 @@ Document - CSharpCode - IntermediateToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(null, typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithModel_cshtml))] NamespaceDeclaration - - AspNetCore - UsingStatement - (1:0,1 [14] ) - System - UsingStatement - (16:1,1 [34] ) - System.Collections.Generic - UsingStatement - (51:2,1 [19] ) - System.Linq - UsingStatement - (71:3,1 [30] ) - System.Threading.Tasks - UsingStatement - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc - UsingStatement - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering - UsingStatement - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures + UsingDirective - (1:0,1 [14] ) - System + UsingDirective - (16:1,1 [34] ) - System.Collections.Generic + UsingDirective - (51:2,1 [19] ) - System.Linq + UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks + UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc + UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering + UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithModel_cshtml - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage - MethodDeclaration - - public async override - global::System.Threading.Tasks.Task - ExecuteAsync Inject - diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.ir.txt index 40cb63f22e..f81ecf4568 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.ir.txt @@ -2,14 +2,14 @@ Document - CSharpCode - IntermediateToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(null, typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithSemicolon_cshtml))] NamespaceDeclaration - - AspNetCore - UsingStatement - - TModel = global::System.Object - UsingStatement - (1:0,1 [12] ) - System - UsingStatement - (16:1,1 [32] ) - System.Collections.Generic - UsingStatement - (51:2,1 [17] ) - System.Linq - UsingStatement - (71:3,1 [28] ) - System.Threading.Tasks - UsingStatement - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc - UsingStatement - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering - UsingStatement - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures + UsingDirective - - TModel = global::System.Object + UsingDirective - (1:0,1 [12] ) - System + UsingDirective - (16:1,1 [32] ) - System.Collections.Generic + UsingDirective - (51:2,1 [17] ) - System.Linq + UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks + UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc + UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering + UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithSemicolon_cshtml - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage - DesignTimeDirective - DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_Runtime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_Runtime.ir.txt index ede3dcad1c..6f1f2b25c2 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_Runtime.ir.txt @@ -2,13 +2,13 @@ Document - CSharpCode - IntermediateToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(null, typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithSemicolon_cshtml))] NamespaceDeclaration - - AspNetCore - UsingStatement - (1:0,1 [14] ) - System - UsingStatement - (16:1,1 [34] ) - System.Collections.Generic - UsingStatement - (51:2,1 [19] ) - System.Linq - UsingStatement - (71:3,1 [30] ) - System.Threading.Tasks - UsingStatement - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc - UsingStatement - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering - UsingStatement - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures + UsingDirective - (1:0,1 [14] ) - System + UsingDirective - (16:1,1 [34] ) - System.Collections.Generic + UsingDirective - (51:2,1 [19] ) - System.Linq + UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks + UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc + UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering + UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWithSemicolon_cshtml - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage - MethodDeclaration - - public async override - global::System.Threading.Tasks.Task - ExecuteAsync Inject - diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.ir.txt index 9412f83f1e..5a39ecd4cf 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.ir.txt @@ -2,14 +2,14 @@ Document - CSharpCode - IntermediateToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(null, typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Inject_cshtml))] NamespaceDeclaration - - AspNetCore - UsingStatement - - TModel = global::System.Object - UsingStatement - (1:0,1 [12] ) - System - UsingStatement - (16:1,1 [32] ) - System.Collections.Generic - UsingStatement - (51:2,1 [17] ) - System.Linq - UsingStatement - (71:3,1 [28] ) - System.Threading.Tasks - UsingStatement - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc - UsingStatement - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering - UsingStatement - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures + UsingDirective - - TModel = global::System.Object + UsingDirective - (1:0,1 [12] ) - System + UsingDirective - (16:1,1 [32] ) - System.Collections.Generic + UsingDirective - (51:2,1 [17] ) - System.Linq + UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks + UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc + UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering + UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Inject_cshtml - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage - DesignTimeDirective - DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_Runtime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_Runtime.ir.txt index eb30019195..e51dcacfeb 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_Runtime.ir.txt @@ -2,13 +2,13 @@ Document - CSharpCode - IntermediateToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(null, typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Inject_cshtml))] NamespaceDeclaration - - AspNetCore - UsingStatement - (1:0,1 [14] ) - System - UsingStatement - (16:1,1 [34] ) - System.Collections.Generic - UsingStatement - (51:2,1 [19] ) - System.Linq - UsingStatement - (71:3,1 [30] ) - System.Threading.Tasks - UsingStatement - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc - UsingStatement - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering - UsingStatement - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures + UsingDirective - (1:0,1 [14] ) - System + UsingDirective - (16:1,1 [34] ) - System.Collections.Generic + UsingDirective - (51:2,1 [19] ) - System.Linq + UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks + UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc + UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering + UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Inject_cshtml - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage - MethodDeclaration - - public async override - global::System.Threading.Tasks.Task - ExecuteAsync Inject - diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.ir.txt index a61b75f209..f2aedc86da 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.ir.txt @@ -2,14 +2,14 @@ Document - CSharpCode - IntermediateToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(null, typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InvalidNamespaceAtEOF_cshtml))] NamespaceDeclaration - - AspNetCore - UsingStatement - - TModel = global::System.Object - UsingStatement - (1:0,1 [12] ) - System - UsingStatement - (16:1,1 [32] ) - System.Collections.Generic - UsingStatement - (51:2,1 [17] ) - System.Linq - UsingStatement - (71:3,1 [28] ) - System.Threading.Tasks - UsingStatement - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc - UsingStatement - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering - UsingStatement - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures + UsingDirective - - TModel = global::System.Object + UsingDirective - (1:0,1 [12] ) - System + UsingDirective - (16:1,1 [32] ) - System.Collections.Generic + UsingDirective - (51:2,1 [17] ) - System.Linq + UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks + UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc + UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering + UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InvalidNamespaceAtEOF_cshtml - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage - DesignTimeDirective - DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.ir.txt index 83c0c72311..77e8f8df38 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.ir.txt @@ -2,13 +2,13 @@ Document - CSharpCode - IntermediateToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(null, typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InvalidNamespaceAtEOF_cshtml))] NamespaceDeclaration - - AspNetCore - UsingStatement - (1:0,1 [14] ) - System - UsingStatement - (16:1,1 [34] ) - System.Collections.Generic - UsingStatement - (51:2,1 [19] ) - System.Linq - UsingStatement - (71:3,1 [30] ) - System.Threading.Tasks - UsingStatement - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc - UsingStatement - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering - UsingStatement - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures + UsingDirective - (1:0,1 [14] ) - System + UsingDirective - (16:1,1 [34] ) - System.Collections.Generic + UsingDirective - (51:2,1 [19] ) - System.Linq + UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks + UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc + UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering + UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InvalidNamespaceAtEOF_cshtml - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage - MethodDeclaration - - public async override - global::System.Threading.Tasks.Task - ExecuteAsync MalformedDirective - (0:0,0 [11] InvalidNamespaceAtEOF.cshtml) diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.ir.txt index c9d08346c9..b05fa8317f 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.ir.txt @@ -2,14 +2,14 @@ Document - CSharpCode - IntermediateToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(null, typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective_cshtml))] NamespaceDeclaration - - AspNetCore - UsingStatement - - TModel = global::System.Object - UsingStatement - (1:0,1 [12] ) - System - UsingStatement - (16:1,1 [32] ) - System.Collections.Generic - UsingStatement - (51:2,1 [17] ) - System.Linq - UsingStatement - (71:3,1 [28] ) - System.Threading.Tasks - UsingStatement - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc - UsingStatement - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering - UsingStatement - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures + UsingDirective - - TModel = global::System.Object + UsingDirective - (1:0,1 [12] ) - System + UsingDirective - (16:1,1 [32] ) - System.Collections.Generic + UsingDirective - (51:2,1 [17] ) - System.Linq + UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks + UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc + UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering + UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective_cshtml - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage - DesignTimeDirective - DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.ir.txt index b64b196ed3..2f07ce6b82 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.ir.txt @@ -2,13 +2,13 @@ Document - CSharpCode - IntermediateToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(null, typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective_cshtml))] NamespaceDeclaration - - AspNetCore - UsingStatement - (1:0,1 [14] ) - System - UsingStatement - (16:1,1 [34] ) - System.Collections.Generic - UsingStatement - (51:2,1 [19] ) - System.Linq - UsingStatement - (71:3,1 [30] ) - System.Threading.Tasks - UsingStatement - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc - UsingStatement - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering - UsingStatement - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures + UsingDirective - (1:0,1 [14] ) - System + UsingDirective - (16:1,1 [34] ) - System.Collections.Generic + UsingDirective - (51:2,1 [19] ) - System.Linq + UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks + UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc + UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering + UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective_cshtml - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage - MethodDeclaration - - public async override - global::System.Threading.Tasks.Task - ExecuteAsync MalformedDirective - (0:0,0 [6] MalformedPageDirective.cshtml) diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.ir.txt index cd0ca20533..6952f04369 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.ir.txt @@ -2,14 +2,14 @@ Document - CSharpCode - IntermediateToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(null, typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ModelExpressionTagHelper_cshtml))] NamespaceDeclaration - - AspNetCore - UsingStatement - - TModel = global::System.Object - UsingStatement - (1:0,1 [12] ) - System - UsingStatement - (16:1,1 [32] ) - System.Collections.Generic - UsingStatement - (51:2,1 [17] ) - System.Linq - UsingStatement - (71:3,1 [28] ) - System.Threading.Tasks - UsingStatement - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc - UsingStatement - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering - UsingStatement - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures + UsingDirective - - TModel = global::System.Object + UsingDirective - (1:0,1 [12] ) - System + UsingDirective - (16:1,1 [32] ) - System.Collections.Generic + UsingDirective - (51:2,1 [17] ) - System.Linq + UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks + UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc + UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering + UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ModelExpressionTagHelper_cshtml - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage - DesignTimeDirective - DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.ir.txt index 74db0d2498..5fbd77976a 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.ir.txt @@ -2,13 +2,13 @@ Document - CSharpCode - IntermediateToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(null, typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ModelExpressionTagHelper_cshtml))] NamespaceDeclaration - - AspNetCore - UsingStatement - (1:0,1 [14] ) - System - UsingStatement - (16:1,1 [34] ) - System.Collections.Generic - UsingStatement - (51:2,1 [19] ) - System.Linq - UsingStatement - (71:3,1 [30] ) - System.Threading.Tasks - UsingStatement - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc - UsingStatement - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering - UsingStatement - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures + UsingDirective - (1:0,1 [14] ) - System + UsingDirective - (16:1,1 [34] ) - System.Collections.Generic + UsingDirective - (51:2,1 [19] ) - System.Linq + UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks + UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc + UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering + UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ModelExpressionTagHelper_cshtml - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage - DeclareTagHelperFields - - InputTestTagHelper MethodDeclaration - - public async override - global::System.Threading.Tasks.Task - ExecuteAsync diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.ir.txt index 0e978084d5..6a74ff4e2f 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.ir.txt @@ -2,14 +2,14 @@ Document - CSharpCode - IntermediateToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(null, typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Model_cshtml))] NamespaceDeclaration - - AspNetCore - UsingStatement - - TModel = global::System.Object - UsingStatement - (1:0,1 [12] ) - System - UsingStatement - (16:1,1 [32] ) - System.Collections.Generic - UsingStatement - (51:2,1 [17] ) - System.Linq - UsingStatement - (71:3,1 [28] ) - System.Threading.Tasks - UsingStatement - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc - UsingStatement - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering - UsingStatement - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures + UsingDirective - - TModel = global::System.Object + UsingDirective - (1:0,1 [12] ) - System + UsingDirective - (16:1,1 [32] ) - System.Collections.Generic + UsingDirective - (51:2,1 [17] ) - System.Linq + UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks + UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc + UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering + UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Model_cshtml - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage - DesignTimeDirective - DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_Runtime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_Runtime.ir.txt index 772ca26522..30bcc7afe1 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_Runtime.ir.txt @@ -2,13 +2,13 @@ Document - CSharpCode - IntermediateToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(null, typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Model_cshtml))] NamespaceDeclaration - - AspNetCore - UsingStatement - (1:0,1 [14] ) - System - UsingStatement - (16:1,1 [34] ) - System.Collections.Generic - UsingStatement - (51:2,1 [19] ) - System.Linq - UsingStatement - (71:3,1 [30] ) - System.Threading.Tasks - UsingStatement - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc - UsingStatement - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering - UsingStatement - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures + UsingDirective - (1:0,1 [14] ) - System + UsingDirective - (16:1,1 [34] ) - System.Collections.Generic + UsingDirective - (51:2,1 [19] ) - System.Linq + UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks + UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc + UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering + UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Model_cshtml - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage - MethodDeclaration - - public async override - global::System.Threading.Tasks.Task - ExecuteAsync Inject - diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.ir.txt index 1385d85b11..7f4244d162 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.ir.txt @@ -2,14 +2,14 @@ Document - CSharpCode - IntermediateToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(null, typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MultipleModels_cshtml))] NamespaceDeclaration - - AspNetCore - UsingStatement - - TModel = global::System.Object - UsingStatement - (1:0,1 [12] ) - System - UsingStatement - (16:1,1 [32] ) - System.Collections.Generic - UsingStatement - (51:2,1 [17] ) - System.Linq - UsingStatement - (71:3,1 [28] ) - System.Threading.Tasks - UsingStatement - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc - UsingStatement - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering - UsingStatement - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures + UsingDirective - - TModel = global::System.Object + UsingDirective - (1:0,1 [12] ) - System + UsingDirective - (16:1,1 [32] ) - System.Collections.Generic + UsingDirective - (51:2,1 [17] ) - System.Linq + UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks + UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc + UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering + UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MultipleModels_cshtml - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage - DesignTimeDirective - DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.ir.txt index 948c2d9838..d53959de0f 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.ir.txt @@ -2,14 +2,14 @@ Document - CSharpCode - IntermediateToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(null, typeof(Test.Namespace.PageWithNamespace_Page), null)] NamespaceDeclaration - - Test.Namespace - UsingStatement - - TModel = global::System.Object - UsingStatement - (1:0,1 [12] ) - System - UsingStatement - (16:1,1 [32] ) - System.Collections.Generic - UsingStatement - (51:2,1 [17] ) - System.Linq - UsingStatement - (71:3,1 [28] ) - System.Threading.Tasks - UsingStatement - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc - UsingStatement - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering - UsingStatement - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures + UsingDirective - - TModel = global::System.Object + UsingDirective - (1:0,1 [12] ) - System + UsingDirective - (16:1,1 [32] ) - System.Collections.Generic + UsingDirective - (51:2,1 [17] ) - System.Linq + UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks + UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc + UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering + UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures ClassDeclaration - - public - PageWithNamespace_Page - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - DesignTimeDirective - DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.ir.txt index d17b42d38a..841a9e1040 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.ir.txt @@ -2,13 +2,13 @@ Document - CSharpCode - IntermediateToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(null, typeof(Test.Namespace.PageWithNamespace_Page), null)] NamespaceDeclaration - - Test.Namespace - UsingStatement - (1:0,1 [14] ) - System - UsingStatement - (16:1,1 [34] ) - System.Collections.Generic - UsingStatement - (51:2,1 [19] ) - System.Linq - UsingStatement - (71:3,1 [30] ) - System.Threading.Tasks - UsingStatement - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc - UsingStatement - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering - UsingStatement - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures + UsingDirective - (1:0,1 [14] ) - System + UsingDirective - (16:1,1 [34] ) - System.Collections.Generic + UsingDirective - (51:2,1 [19] ) - System.Linq + UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks + UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc + UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering + UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures ClassDeclaration - - public - PageWithNamespace_Page - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - MethodDeclaration - - public async override - global::System.Threading.Tasks.Task - ExecuteAsync CSharpCode - diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.ir.txt index 7bfa88ba66..1dc0f9a06c 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.ir.txt @@ -2,15 +2,15 @@ Document - CSharpCode - IntermediateToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(null, typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel_cshtml), null)] NamespaceDeclaration - - AspNetCore - UsingStatement - - TModel = global::System.Object - UsingStatement - (1:0,1 [12] ) - System - UsingStatement - (16:1,1 [32] ) - System.Collections.Generic - UsingStatement - (51:2,1 [17] ) - System.Linq - UsingStatement - (71:3,1 [28] ) - System.Threading.Tasks - UsingStatement - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc - UsingStatement - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering - UsingStatement - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures - UsingStatement - (38:3,1 [41] RazorPagesWithoutModel.cshtml) - Microsoft.AspNetCore.Mvc.RazorPages + UsingDirective - - TModel = global::System.Object + UsingDirective - (1:0,1 [12] ) - System + UsingDirective - (16:1,1 [32] ) - System.Collections.Generic + UsingDirective - (51:2,1 [17] ) - System.Linq + UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks + UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc + UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering + UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures + UsingDirective - (38:3,1 [41] RazorPagesWithoutModel.cshtml) - Microsoft.AspNetCore.Mvc.RazorPages ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel_cshtml - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - DesignTimeDirective - DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.ir.txt index 2a2d2c2847..0fa1416e0e 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.ir.txt @@ -2,14 +2,14 @@ Document - CSharpCode - IntermediateToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(null, typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel_cshtml), null)] NamespaceDeclaration - - AspNetCore - UsingStatement - (1:0,1 [14] ) - System - UsingStatement - (16:1,1 [34] ) - System.Collections.Generic - UsingStatement - (51:2,1 [19] ) - System.Linq - UsingStatement - (71:3,1 [30] ) - System.Threading.Tasks - UsingStatement - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc - UsingStatement - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering - UsingStatement - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures - UsingStatement - (38:3,1 [43] RazorPagesWithoutModel.cshtml) - Microsoft.AspNetCore.Mvc.RazorPages + UsingDirective - (1:0,1 [14] ) - System + UsingDirective - (16:1,1 [34] ) - System.Collections.Generic + UsingDirective - (51:2,1 [19] ) - System.Linq + UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks + UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc + UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering + UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures + UsingDirective - (38:3,1 [43] RazorPagesWithoutModel.cshtml) - Microsoft.AspNetCore.Mvc.RazorPages ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithoutModel_cshtml - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_0 - class - text-danger - AttributeStructure.DoubleQuotes DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_1 - class - col-md-10 - AttributeStructure.DoubleQuotes diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.ir.txt index cb8161091a..4b506b078a 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.ir.txt @@ -2,15 +2,15 @@ Document - CSharpCode - IntermediateToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(null, typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPages_cshtml), null)] NamespaceDeclaration - - AspNetCore - UsingStatement - - TModel = global::System.Object - UsingStatement - (1:0,1 [12] ) - System - UsingStatement - (16:1,1 [32] ) - System.Collections.Generic - UsingStatement - (51:2,1 [17] ) - System.Linq - UsingStatement - (71:3,1 [28] ) - System.Threading.Tasks - UsingStatement - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc - UsingStatement - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering - UsingStatement - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures - UsingStatement - (55:4,1 [41] RazorPages.cshtml) - Microsoft.AspNetCore.Mvc.RazorPages + UsingDirective - - TModel = global::System.Object + UsingDirective - (1:0,1 [12] ) - System + UsingDirective - (16:1,1 [32] ) - System.Collections.Generic + UsingDirective - (51:2,1 [17] ) - System.Linq + UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks + UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc + UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering + UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures + UsingDirective - (55:4,1 [41] RazorPages.cshtml) - Microsoft.AspNetCore.Mvc.RazorPages ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPages_cshtml - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - DesignTimeDirective - DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.ir.txt index 927cce1d41..78ef9aae61 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.ir.txt @@ -2,14 +2,14 @@ Document - CSharpCode - IntermediateToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(null, typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPages_cshtml), null)] NamespaceDeclaration - - AspNetCore - UsingStatement - (1:0,1 [14] ) - System - UsingStatement - (16:1,1 [34] ) - System.Collections.Generic - UsingStatement - (51:2,1 [19] ) - System.Linq - UsingStatement - (71:3,1 [30] ) - System.Threading.Tasks - UsingStatement - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc - UsingStatement - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering - UsingStatement - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures - UsingStatement - (55:4,1 [43] RazorPages.cshtml) - Microsoft.AspNetCore.Mvc.RazorPages + UsingDirective - (1:0,1 [14] ) - System + UsingDirective - (16:1,1 [34] ) - System.Collections.Generic + UsingDirective - (51:2,1 [19] ) - System.Linq + UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks + UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc + UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering + UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures + UsingDirective - (55:4,1 [43] RazorPages.cshtml) - Microsoft.AspNetCore.Mvc.RazorPages ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPages_cshtml - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_0 - class - text-danger - AttributeStructure.DoubleQuotes DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_1 - class - col-md-10 - AttributeStructure.DoubleQuotes diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.ir.txt index 5bd4b90601..7bca09f8de 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.ir.txt @@ -2,14 +2,14 @@ Document - CSharpCode - IntermediateToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(null, typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper_cshtml))] NamespaceDeclaration - - AspNetCore - UsingStatement - - TModel = global::System.Object - UsingStatement - (1:0,1 [12] ) - System - UsingStatement - (16:1,1 [32] ) - System.Collections.Generic - UsingStatement - (51:2,1 [17] ) - System.Linq - UsingStatement - (71:3,1 [28] ) - System.Threading.Tasks - UsingStatement - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc - UsingStatement - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering - UsingStatement - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures + UsingDirective - - TModel = global::System.Object + UsingDirective - (1:0,1 [12] ) - System + UsingDirective - (16:1,1 [32] ) - System.Collections.Generic + UsingDirective - (51:2,1 [17] ) - System.Linq + UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks + UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc + UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering + UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper_cshtml - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage - DesignTimeDirective - DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.ir.txt index 745df89b09..f7bc3e14ec 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.ir.txt @@ -2,13 +2,13 @@ Document - CSharpCode - IntermediateToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(null, typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper_cshtml))] NamespaceDeclaration - - AspNetCore - UsingStatement - (1:0,1 [14] ) - System - UsingStatement - (16:1,1 [34] ) - System.Collections.Generic - UsingStatement - (51:2,1 [19] ) - System.Linq - UsingStatement - (71:3,1 [30] ) - System.Threading.Tasks - UsingStatement - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc - UsingStatement - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering - UsingStatement - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures + UsingDirective - (1:0,1 [14] ) - System + UsingDirective - (16:1,1 [34] ) - System.Collections.Generic + UsingDirective - (51:2,1 [19] ) - System.Linq + UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks + UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc + UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering + UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper_cshtml - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage - DeclarePreallocatedTagHelperAttribute - - __tagHelperAttribute_0 - bar - World - HtmlAttributeValueStyle.DoubleQuotes DeclareTagHelperFields - - AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewComponentTagHelper_cshtml.__Generated__TestViewComponentTagHelper - AllTagHelper diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.ir.txt index 33f728cf91..41da54b39c 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.ir.txt @@ -2,14 +2,14 @@ Document - CSharpCode - IntermediateToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(null, typeof(Test.Namespace.ViewWithNamespace_View))] NamespaceDeclaration - - Test.Namespace - UsingStatement - - TModel = global::System.Object - UsingStatement - (1:0,1 [12] ) - System - UsingStatement - (16:1,1 [32] ) - System.Collections.Generic - UsingStatement - (51:2,1 [17] ) - System.Linq - UsingStatement - (71:3,1 [28] ) - System.Threading.Tasks - UsingStatement - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc - UsingStatement - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering - UsingStatement - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures + UsingDirective - - TModel = global::System.Object + UsingDirective - (1:0,1 [12] ) - System + UsingDirective - (16:1,1 [32] ) - System.Collections.Generic + UsingDirective - (51:2,1 [17] ) - System.Linq + UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks + UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc + UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering + UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures ClassDeclaration - - public - ViewWithNamespace_View - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage - DesignTimeDirective - DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.ir.txt index 2f1d0687a3..fe9408759b 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.ir.txt @@ -2,13 +2,13 @@ Document - CSharpCode - IntermediateToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(null, typeof(Test.Namespace.ViewWithNamespace_View))] NamespaceDeclaration - - Test.Namespace - UsingStatement - (1:0,1 [14] ) - System - UsingStatement - (16:1,1 [34] ) - System.Collections.Generic - UsingStatement - (51:2,1 [19] ) - System.Linq - UsingStatement - (71:3,1 [30] ) - System.Threading.Tasks - UsingStatement - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc - UsingStatement - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering - UsingStatement - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures + UsingDirective - (1:0,1 [14] ) - System + UsingDirective - (16:1,1 [34] ) - System.Collections.Generic + UsingDirective - (51:2,1 [19] ) - System.Linq + UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks + UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc + UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering + UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures ClassDeclaration - - public - ViewWithNamespace_View - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage - MethodDeclaration - - public async override - global::System.Threading.Tasks.Task - ExecuteAsync CSharpCode - diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.ir.txt index 88d5a893db..c5e322e021 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.ir.txt @@ -2,14 +2,14 @@ Document - CSharpCode - IntermediateToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(null, typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest__ViewImports_cshtml))] NamespaceDeclaration - - AspNetCore - UsingStatement - - TModel = global::System.Object - UsingStatement - (1:0,1 [12] ) - System - UsingStatement - (16:1,1 [32] ) - System.Collections.Generic - UsingStatement - (51:2,1 [17] ) - System.Linq - UsingStatement - (71:3,1 [28] ) - System.Threading.Tasks - UsingStatement - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc - UsingStatement - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering - UsingStatement - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures + UsingDirective - - TModel = global::System.Object + UsingDirective - (1:0,1 [12] ) - System + UsingDirective - (16:1,1 [32] ) - System.Collections.Generic + UsingDirective - (51:2,1 [17] ) - System.Linq + UsingDirective - (71:3,1 [28] ) - System.Threading.Tasks + UsingDirective - (102:4,1 [30] ) - Microsoft.AspNetCore.Mvc + UsingDirective - (135:5,1 [40] ) - Microsoft.AspNetCore.Mvc.Rendering + UsingDirective - (178:6,1 [43] ) - Microsoft.AspNetCore.Mvc.ViewFeatures ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest__ViewImports_cshtml - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage - DesignTimeDirective - DirectiveToken - (231:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_Runtime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_Runtime.ir.txt index 7717cfbdab..700715b3e4 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_Runtime.ir.txt @@ -2,13 +2,13 @@ Document - CSharpCode - IntermediateToken - - CSharp - [assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(null, typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest__ViewImports_cshtml))] NamespaceDeclaration - - AspNetCore - UsingStatement - (1:0,1 [14] ) - System - UsingStatement - (16:1,1 [34] ) - System.Collections.Generic - UsingStatement - (51:2,1 [19] ) - System.Linq - UsingStatement - (71:3,1 [30] ) - System.Threading.Tasks - UsingStatement - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc - UsingStatement - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering - UsingStatement - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures + UsingDirective - (1:0,1 [14] ) - System + UsingDirective - (16:1,1 [34] ) - System.Collections.Generic + UsingDirective - (51:2,1 [19] ) - System.Linq + UsingDirective - (71:3,1 [30] ) - System.Threading.Tasks + UsingDirective - (102:4,1 [32] ) - Microsoft.AspNetCore.Mvc + UsingDirective - (135:5,1 [42] ) - Microsoft.AspNetCore.Mvc.Rendering + UsingDirective - (178:6,1 [45] ) - Microsoft.AspNetCore.Mvc.ViewFeatures ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest__ViewImports_cshtml - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage - MethodDeclaration - - public async override - global::System.Threading.Tasks.Task - ExecuteAsync Inject - diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/DesignTimeBasicWriterTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/DesignTimeBasicWriterTest.cs index 262a75e089..4d800c236d 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/DesignTimeBasicWriterTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/DesignTimeBasicWriterTest.cs @@ -12,7 +12,7 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration public class DesignTimeBasicWriterTest { [Fact] - public void WriteUsingStatement_NoSource_WritesContent() + public void WriteUsingDirective_NoSource_WritesContent() { // Arrange var writer = new DesignTimeBasicWriter(); @@ -21,13 +21,13 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration Writer = new CSharpCodeWriter() }; - var node = new UsingStatementIntermediateNode() + var node = new UsingDirectiveIntermediateNode() { Content = "System", }; // Act - writer.WriteUsingStatement(context, node); + writer.WriteUsingDirective(context, node); // Assert var csharp = context.Writer.Builder.ToString(); @@ -39,7 +39,7 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration } [Fact] - public void WriteUsingStatement_WithSource_WritesContentWithLinePragmaAndMapping() + public void WriteUsingDirective_WithSource_WritesContentWithLinePragmaAndMapping() { // Arrange var writer = new DesignTimeBasicWriter(); @@ -53,14 +53,14 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration var originalSpan = new SourceSpan("test.cshtml", 0, 0, 0, 6); var generatedSpan = new SourceSpan(null, 21 + Environment.NewLine.Length, 1, 0, 6); var expectedLineMapping = new LineMapping(originalSpan, generatedSpan); - var node = new UsingStatementIntermediateNode() + var node = new UsingDirectiveIntermediateNode() { Content = "System", Source = originalSpan, }; // Act - writer.WriteUsingStatement(context, node); + writer.WriteUsingDirective(context, node); // Assert var mapping = Assert.Single(context.LineMappings); diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/RuntimeBasicWriterTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/RuntimeBasicWriterTest.cs index 01043e5a83..261056f9bd 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/RuntimeBasicWriterTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/CodeGeneration/RuntimeBasicWriterTest.cs @@ -2,7 +2,6 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using System.Collections.Generic; using System.Linq; using Microsoft.AspNetCore.Razor.Language.Intermediate; using Xunit; @@ -12,7 +11,7 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration public class RuntimeBasicWriterTest { [Fact] - public void WriteUsingStatement_NoSource_WritesContent() + public void WriteUsingDirective_NoSource_WritesContent() { // Arrange var writer = new RuntimeBasicWriter(); @@ -20,14 +19,14 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration { Writer = new CSharpCodeWriter() }; - - var node = new UsingStatementIntermediateNode() + + var node = new UsingDirectiveIntermediateNode() { Content = "System", }; // Act - writer.WriteUsingStatement(context, node); + writer.WriteUsingDirective(context, node); // Assert var csharp = context.Writer.Builder.ToString(); @@ -39,7 +38,7 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration } [Fact] - public void WriteUsingStatement_WithSource_WritesContentWithLinePragma() + public void WriteUsingDirective_WithSource_WritesContentWithLinePragma() { // Arrange var writer = new RuntimeBasicWriter(); @@ -48,14 +47,14 @@ namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration Writer = new CSharpCodeWriter() }; - var node = new UsingStatementIntermediateNode() + var node = new UsingDirectiveIntermediateNode() { Content = "System", Source = new SourceSpan("test.cshtml", 0, 0, 0, 3), }; // Act - writer.WriteUsingStatement(context, node); + writer.WriteUsingDirective(context, node); // Assert var csharp = context.Writer.Builder.ToString(); diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/DocumentClassifierPassBaseTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/DocumentClassifierPassBaseTest.cs index 4ecbcadc02..34ad4c3701 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/DocumentClassifierPassBaseTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/DocumentClassifierPassBaseTest.cs @@ -127,7 +127,7 @@ namespace Microsoft.AspNetCore.Razor.Language }; var builder = IntermediateNodeBuilder.Create(documentNode); - builder.Add(new UsingStatementIntermediateNode()); + builder.Add(new UsingDirectiveIntermediateNode()); var pass = new TestDocumentClassifierPass(); pass.Engine = RazorEngine.CreateEmpty(b => { }); @@ -139,7 +139,7 @@ namespace Microsoft.AspNetCore.Razor.Language var @namespace = SingleChild(documentNode); Children( @namespace, - n => Assert.IsType(n), + n => Assert.IsType(n), n => Assert.IsType(n)); } diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicImports_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicImports_DesignTime.ir.txt index cdd2e5be07..03a2e5312e 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicImports_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicImports_DesignTime.ir.txt @@ -1,8 +1,8 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles - UsingStatement - (31:1,1 [26] BasicImports_Imports0.cshtml) - System.Globalization - UsingStatement - (80:3,1 [27] BasicImports_Imports0.cshtml) - System.ComponentModel - UsingStatement - (23:1,1 [18] BasicImports_Imports1.cshtml) - System.Text + UsingDirective - (31:1,1 [26] BasicImports_Imports0.cshtml) - System.Globalization + UsingDirective - (80:3,1 [27] BasicImports_Imports0.cshtml) - System.ComponentModel + UsingDirective - (23:1,1 [18] BasicImports_Imports1.cshtml) - System.Text ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_BasicImports_DesignTime - Hello - DesignTimeDirective - DirectiveToken - (119:4,10 [5] BasicImports_Imports0.cshtml) - Hello diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicImports_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicImports_Runtime.ir.txt index 8980c30796..eef85bf44a 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicImports_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicImports_Runtime.ir.txt @@ -1,8 +1,8 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles - UsingStatement - (31:1,1 [28] BasicImports_Imports0.cshtml) - System.Globalization - UsingStatement - (80:3,1 [29] BasicImports_Imports0.cshtml) - System.ComponentModel - UsingStatement - (23:1,1 [20] BasicImports_Imports1.cshtml) - System.Text + UsingDirective - (31:1,1 [28] BasicImports_Imports0.cshtml) - System.Globalization + UsingDirective - (80:3,1 [29] BasicImports_Imports0.cshtml) - System.ComponentModel + UsingDirective - (23:1,1 [20] BasicImports_Imports1.cshtml) - System.Text ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_BasicImports_Runtime - Hello - MethodDeclaration - - public async - System.Threading.Tasks.Task - ExecuteAsync HtmlContent - (0:0,0 [18] BasicImports.cshtml) diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_DesignTime.ir.txt index d88ab58cdf..a49c5df3fa 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_DesignTime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_DesignTime.ir.txt @@ -1,11 +1,11 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles - UsingStatement - (1:0,1 [15] Usings.cshtml) - System.IO - UsingStatement - (19:1,1 [32] Usings.cshtml) - Foo = System.Text.Encoding - UsingStatement - (54:2,1 [12] Usings.cshtml) - System - UsingStatement - (71:4,1 [19] Usings.cshtml) - static System - UsingStatement - (93:5,1 [27] Usings.cshtml) - static System.Console - UsingStatement - (123:6,1 [41] Usings.cshtml) - static global::System.Text.Encoding + UsingDirective - (1:0,1 [15] Usings.cshtml) - System.IO + UsingDirective - (19:1,1 [32] Usings.cshtml) - Foo = System.Text.Encoding + UsingDirective - (54:2,1 [12] Usings.cshtml) - System + UsingDirective - (71:4,1 [19] Usings.cshtml) - static System + UsingDirective - (93:5,1 [27] Usings.cshtml) - static System.Console + UsingDirective - (123:6,1 [41] Usings.cshtml) - static global::System.Text.Encoding ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Usings_DesignTime - - DesignTimeDirective - CSharpCode - diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_Runtime.ir.txt index bb680cae6b..5e496ebd41 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_Runtime.ir.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_Runtime.ir.txt @@ -1,11 +1,11 @@ Document - NamespaceDeclaration - - Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles - UsingStatement - (1:0,1 [17] Usings.cshtml) - System.IO - UsingStatement - (19:1,1 [34] Usings.cshtml) - Foo = System.Text.Encoding - UsingStatement - (54:2,1 [14] Usings.cshtml) - System - UsingStatement - (71:4,1 [21] Usings.cshtml) - static System - UsingStatement - (93:5,1 [29] Usings.cshtml) - static System.Console - UsingStatement - (123:6,1 [43] Usings.cshtml) - static global::System.Text.Encoding + UsingDirective - (1:0,1 [17] Usings.cshtml) - System.IO + UsingDirective - (19:1,1 [34] Usings.cshtml) - Foo = System.Text.Encoding + UsingDirective - (54:2,1 [14] Usings.cshtml) - System + UsingDirective - (71:4,1 [21] Usings.cshtml) - static System + UsingDirective - (93:5,1 [29] Usings.cshtml) - static System.Console + UsingDirective - (123:6,1 [43] Usings.cshtml) - static global::System.Text.Encoding ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Usings_Runtime - - MethodDeclaration - - public async - System.Threading.Tasks.Task - ExecuteAsync HtmlContent - (68:3,0 [2] Usings.cshtml) diff --git a/test/Microsoft.AspNetCore.Razor.Test.Common/Langauge/IntegrationTests/IntermediateNodeWriter.cs b/test/Microsoft.AspNetCore.Razor.Test.Common/Langauge/IntegrationTests/IntermediateNodeWriter.cs index 1f5fe36e09..bb78dfe084 100644 --- a/test/Microsoft.AspNetCore.Razor.Test.Common/Langauge/IntegrationTests/IntermediateNodeWriter.cs +++ b/test/Microsoft.AspNetCore.Razor.Test.Common/Langauge/IntegrationTests/IntermediateNodeWriter.cs @@ -80,7 +80,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests WriteContentNode(node, string.Join(" ", node.Modifiers), node.ReturnType, node.Name); } - public override void VisitUsingStatement(UsingStatementIntermediateNode node) + public override void VisitUsingDirective(UsingDirectiveIntermediateNode node) { WriteContentNode(node, node.Content); } diff --git a/test/Microsoft.AspNetCore.Razor.Test.Common/Langauge/Intermediate/IntermediateNodeAssert.cs b/test/Microsoft.AspNetCore.Razor.Test.Common/Langauge/Intermediate/IntermediateNodeAssert.cs index 177ba854fc..f121ad464b 100644 --- a/test/Microsoft.AspNetCore.Razor.Test.Common/Langauge/Intermediate/IntermediateNodeAssert.cs +++ b/test/Microsoft.AspNetCore.Razor.Test.Common/Langauge/Intermediate/IntermediateNodeAssert.cs @@ -167,7 +167,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Intermediate { try { - var @using = Assert.IsType(node); + var @using = Assert.IsType(node); Assert.Equal(expected, @using.Content); } catch (XunitException e)