huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move [Layout] 

This will be coordinated with the equivalent change in the runtime repo.
\n\nCommit migrated from c82d53eaaa
This commit is contained in:
Ryan Nowak 2019-07-03 12:49:02 -07:00
parent d9f35d4482
commit cd8ec7ae66
8 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentsApi.cs
View File

@ -28,7 +28,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
public static class LayoutAttribute public static class LayoutAttribute
{ {
public static readonly string FullTypeName = "Microsoft.AspNetCore.Components.Layouts.LayoutAttribute"; public static readonly string FullTypeName = "Microsoft.AspNetCore.Components.LayoutAttribute";
} }
public static class InjectAttribute public static class InjectAttribute

1
src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentDirectiveIntegrationTest.cs
View File

@ -6,7 +6,6 @@ using System.Linq;
using System.Reflection; using System.Reflection;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.Layouts;
using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.CSharp; using Microsoft.CodeAnalysis.CSharp;
using Xunit; using Xunit;

2
src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentImports/_Imports.codegen.cs
View File

@ -22,7 +22,7 @@ using System.Reflection;
#line default #line default
#line hidden #line hidden
#nullable disable #nullable disable
[Microsoft.AspNetCore.Components.Layouts.LayoutAttribute(typeof(MainLayout))] [Microsoft.AspNetCore.Components.LayoutAttribute(typeof(MainLayout))]
public class _Imports : System.Object public class _Imports : System.Object
{ {
#pragma warning disable 219 #pragma warning disable 219

2
src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentImports/_Imports.ir.txt
View File

@ -8,7 +8,7 @@ Document -
UsingDirective - (1:0,1 [17] x:\dir\subdir\Test\_Imports.razor) - System.Text UsingDirective - (1:0,1 [17] x:\dir\subdir\Test\_Imports.razor) - System.Text
UsingDirective - (21:1,1 [23] x:\dir\subdir\Test\_Imports.razor) - System.Reflection UsingDirective - (21:1,1 [23] x:\dir\subdir\Test\_Imports.razor) - System.Reflection
CSharpCode - CSharpCode -
IntermediateToken - - CSharp - [Microsoft.AspNetCore.Components.Layouts.LayoutAttribute(typeof(MainLayout))] IntermediateToken - - CSharp - [Microsoft.AspNetCore.Components.LayoutAttribute(typeof(MainLayout))]
ClassDeclaration - - public - _Imports - System.Object - ClassDeclaration - - public - _Imports - System.Object -
DesignTimeDirective - DesignTimeDirective -
DirectiveToken - (56:3,8 [10] x:\dir\subdir\Test\_Imports.razor) - MainLayout DirectiveToken - (56:3,8 [10] x:\dir\subdir\Test\_Imports.razor) - MainLayout

4
src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/ComponentImports/_Imports.mappings.txt
View File

@ -10,11 +10,11 @@ Generated Location: (448:19,0 [23] )
Source Location: (56:3,8 [10] x:\dir\subdir\Test\_Imports.razor) Source Location: (56:3,8 [10] x:\dir\subdir\Test\_Imports.razor)
|MainLayout| |MainLayout|
Generated Location: (849:32,0 [10] ) Generated Location: (841:32,0 [10] )
|MainLayout| |MainLayout|
Source Location: (69:4,1 [3] x:\dir\subdir\Test\_Imports.razor) Source Location: (69:4,1 [3] x:\dir\subdir\Test\_Imports.razor)
|Foo| |Foo|
Generated Location: (1300:49,6 [3] ) Generated Location: (1292:49,6 [3] )
|Foo| |Foo|

2
src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentImports/_Imports.codegen.cs
View File

@ -22,7 +22,7 @@ using System.Reflection;
#line default #line default
#line hidden #line hidden
#nullable disable #nullable disable
[Microsoft.AspNetCore.Components.Layouts.LayoutAttribute(typeof(MainLayout))] [Microsoft.AspNetCore.Components.LayoutAttribute(typeof(MainLayout))]
public class _Imports : System.Object public class _Imports : System.Object
{ {
#pragma warning disable 1998 #pragma warning disable 1998

2
src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentImports/_Imports.ir.txt
View File

@ -8,7 +8,7 @@ Document -
UsingDirective - (1:0,1 [19] x:\dir\subdir\Test\_Imports.razor) - System.Text UsingDirective - (1:0,1 [19] x:\dir\subdir\Test\_Imports.razor) - System.Text
UsingDirective - (21:1,1 [25] x:\dir\subdir\Test\_Imports.razor) - System.Reflection UsingDirective - (21:1,1 [25] x:\dir\subdir\Test\_Imports.razor) - System.Reflection
CSharpCode - CSharpCode -
IntermediateToken - - CSharp - [Microsoft.AspNetCore.Components.Layouts.LayoutAttribute(typeof(MainLayout))] IntermediateToken - - CSharp - [Microsoft.AspNetCore.Components.LayoutAttribute(typeof(MainLayout))]
ClassDeclaration - - public - _Imports - System.Object - ClassDeclaration - - public - _Imports - System.Object -
MethodDeclaration - - protected - void - Execute MethodDeclaration - - protected - void - Execute
CSharpExpression - (69:4,1 [3] x:\dir\subdir\Test\_Imports.razor) CSharpExpression - (69:4,1 [3] x:\dir\subdir\Test\_Imports.razor)

2
src/Razor/test/Microsoft.AspNetCore.Razor.Test.ComponentShim/Microsoft.AspNetCore.Components.netstandard2.0.cs
View File

@ -656,7 +656,7 @@ namespace Microsoft.AspNetCore.Components.Forms
internal ValidationStateChangedEventArgs() { } internal ValidationStateChangedEventArgs() { }
} }
} }
namespace Microsoft.AspNetCore.Components.Layouts namespace Microsoft.AspNetCore.Components
{ {
[System.AttributeUsageAttribute(System.AttributeTargets.Class, AllowMultiple=false, Inherited=true)] [System.AttributeUsageAttribute(System.AttributeTargets.Class, AllowMultiple=false, Inherited=true)]
public partial class LayoutAttribute : System.Attribute public partial class LayoutAttribute : System.Attribute