diff --git a/Blazor.sln b/Components.sln similarity index 80% rename from Blazor.sln rename to Components.sln index c5344788..1b83ec61 100644 --- a/Blazor.sln +++ b/Components.sln @@ -11,11 +11,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "mono", "mono", "{7B5CAAB1-A EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MonoSanity", "blazor\samples\MonoSanity\MonoSanity.csproj", "{7C53BB6B-5906-4753-B507-C9FCC2F7E5B7}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Blazor.Server", "src\Microsoft.AspNetCore.Components.Server\Microsoft.AspNetCore.Blazor.Server.csproj", "{5A694793-3257-4D37-BB74-4A41B3894685}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.Server", "src\Microsoft.AspNetCore.Components.Server\Microsoft.AspNetCore.Components.Server.csproj", "{5A694793-3257-4D37-BB74-4A41B3894685}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{ADA3AE29-F6DE-49F6-8C7C-B321508CAE8E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Blazor.E2ETest", "test\Microsoft.AspNetCore.Components.E2ETest\Microsoft.AspNetCore.Blazor.E2ETest.csproj", "{5BC2A10D-B6CA-43AE-B73C-2A41AE1039F9}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.E2ETest", "test\Microsoft.AspNetCore.Components.E2ETest\Microsoft.AspNetCore.Components.E2ETest.csproj", "{5BC2A10D-B6CA-43AE-B73C-2A41AE1039F9}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MonoSanityClient", "blazor\samples\MonoSanityClient\MonoSanityClient.csproj", "{06AAAE9E-96DE-4574-97DA-9C4C7D9FE990}" EndProject @@ -27,29 +27,29 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HostedInAspNet.Client", "bl EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HostedInAspNet.Server", "blazor\samples\HostedInAspNet.Server\HostedInAspNet.Server.csproj", "{F8996835-41F7-4663-91DF-3B5652ADC37D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Blazor", "src\Microsoft.AspNetCore.Components\Microsoft.AspNetCore.Blazor.csproj", "{7FD8C650-74B3-4153-AEA1-00F4F6AF393D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components", "src\Microsoft.AspNetCore.Components\Microsoft.AspNetCore.Components.csproj", "{7FD8C650-74B3-4153-AEA1-00F4F6AF393D}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StandaloneApp", "blazor\samples\StandaloneApp\StandaloneApp.csproj", "{B241434A-1642-44CC-AE9A-2012B5C5BD02}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MonoSanity", "MonoSanity", "{2A076721-6081-4517-8329-B9E5110D6DAC}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Blazor.Build.Test", "test\Microsoft.AspNetCore.Components.Build.Test\Microsoft.AspNetCore.Blazor.Build.Test.csproj", "{709C7EBE-EB93-4F6D-9491-D714B0D2E898}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.Build.Test", "test\Microsoft.AspNetCore.Components.Build.Test\Microsoft.AspNetCore.Components.Build.Test.csproj", "{709C7EBE-EB93-4F6D-9491-D714B0D2E898}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Blazor.Build", "src\Microsoft.AspNetCore.Components.Build\Microsoft.AspNetCore.Blazor.Build.csproj", "{8B3D0F1C-0E38-4E6D-BFF1-C4FDA0CD9815}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.Build", "src\Microsoft.AspNetCore.Components.Build\Microsoft.AspNetCore.Components.Build.csproj", "{8B3D0F1C-0E38-4E6D-BFF1-C4FDA0CD9815}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Blazor.Browser.JS", "src\Microsoft.AspNetCore.Components.Browser.JS\Microsoft.AspNetCore.Blazor.Browser.JS.csproj", "{8A19B1CE-9B62-4440-93B3-152DDBB39D0A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.Browser.JS", "src\Microsoft.AspNetCore.Components.Browser.JS\Microsoft.AspNetCore.Components.Browser.JS.csproj", "{8A19B1CE-9B62-4440-93B3-152DDBB39D0A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Blazor.Browser", "src\Microsoft.AspNetCore.Components.Browser\Microsoft.AspNetCore.Blazor.Browser.csproj", "{4874AFF4-335D-4037-8858-BBBB987C124B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.Browser", "src\Microsoft.AspNetCore.Components.Browser\Microsoft.AspNetCore.Components.Browser.csproj", "{4874AFF4-335D-4037-8858-BBBB987C124B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Blazor.Test", "test\Microsoft.AspNetCore.Components.Test\Microsoft.AspNetCore.Blazor.Test.csproj", "{8FD8636E-AFA5-434D-8857-06D02686741A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.Test", "test\Microsoft.AspNetCore.Components.Test\Microsoft.AspNetCore.Components.Test.csproj", "{8FD8636E-AFA5-434D-8857-06D02686741A}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "testapps", "testapps", "{4AE0D35B-D97A-44D0-8392-C9240377DCCE}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BasicTestApp", "test\testapps\BasicTestApp\BasicTestApp.csproj", "{2838CB6F-D2C7-4C0A-A994-C72E56F16984}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Blazor.Razor.Extensions", "src\Microsoft.AspNetCore.Components.Razor.Extensions\Microsoft.AspNetCore.Blazor.Razor.Extensions.csproj", "{D652A019-B765-4922-B7B8-3AB1C58338D7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.Razor.Extensions", "src\Microsoft.AspNetCore.Components.Razor.Extensions\Microsoft.AspNetCore.Components.Razor.Extensions.csproj", "{D652A019-B765-4922-B7B8-3AB1C58338D7}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Blazor.Browser.Test", "test\Microsoft.AspNetCore.Components.Browser.Test\Microsoft.AspNetCore.Blazor.Browser.Test.csproj", "{EC2A38BF-6E77-4A8E-A731-15929544F29C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.Browser.Test", "test\Microsoft.AspNetCore.Components.Browser.Test\Microsoft.AspNetCore.Components.Browser.Test.csproj", "{EC2A38BF-6E77-4A8E-A731-15929544F29C}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestServer", "test\testapps\TestServer\TestServer.csproj", "{29CD3FC6-49E3-4756-B5DF-E03B46E5CD45}" EndProject @@ -59,17 +59,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Blazor EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "templates", "templates", "{E8EBA72C-D555-43AE-BC98-F0B2D05F6A07}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorStandalone-CSharp", "blazor\src\Microsoft.AspNetCore.Blazor.Templates\content\BlazorStandalone-CSharp\BlazorStandalone-CSharp.csproj", "{A092FA91-856B-4ACA-B1C2-10BDBA366185}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BlazorHosted-CSharp", "BlazorHosted-CSharp", "{73DA1DFD-79F0-4BA2-B0B6-4F3A21D2C3F8}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorHosted-CSharp.Client", "blazor\src\Microsoft.AspNetCore.Blazor.Templates\content\BlazorHosted-CSharp\BlazorHosted-CSharp.Client\BlazorHosted-CSharp.Client.csproj", "{7549444A-9C81-44DE-AD0D-2C55501EAAC7}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorHosted-CSharp.Server", "blazor\src\Microsoft.AspNetCore.Blazor.Templates\content\BlazorHosted-CSharp\BlazorHosted-CSharp.Server\BlazorHosted-CSharp.Server.csproj", "{78ED9932-0912-4F36-8F82-33DE850E7A33}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorHosted-CSharp.Shared", "blazor\src\Microsoft.AspNetCore.Blazor.Templates\content\BlazorHosted-CSharp\BlazorHosted-CSharp.Shared\BlazorHosted-CSharp.Shared.csproj", "{F3E02B21-1127-431A-B832-0E53CB72097B}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Blazor.Razor.Extensions.Test", "test\Microsoft.AspNetCore.Components.Razor.Extensions.Test\Microsoft.AspNetCore.Blazor.Razor.Extensions.Test.csproj", "{FF25111E-5A3E-48A3-96D8-08A2C5A2A91C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.Razor.Extensions.Test", "test\Microsoft.AspNetCore.Components.Razor.Extensions.Test\Microsoft.AspNetCore.Components.Razor.Extensions.Test.csproj", "{FF25111E-5A3E-48A3-96D8-08A2C5A2A91C}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tooling", "tooling", "{F563ABB6-85FB-4CFC-B0D2-1D5130E8246D}" EndProject @@ -81,31 +73,25 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestContentPackage", "test\ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarks", "benchmarks", "{36A7DEB7-5F88-4BFB-B57E-79EEC9950E25}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Blazor.Performance", "benchmarks\Microsoft.AspNetCore.Components.Performance\Microsoft.AspNetCore.Blazor.Performance.csproj", "{50F6820F-D058-4E68-9E15-801F893F514E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.Performance", "benchmarks\Microsoft.AspNetCore.Components.Performance\Microsoft.AspNetCore.Components.Performance.csproj", "{50F6820F-D058-4E68-9E15-801F893F514E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorLibrary-CSharp", "blazor\src\Microsoft.AspNetCore.Blazor.Templates\content\BlazorLibrary-CSharp\BlazorLibrary-CSharp.csproj", "{3A457B14-D91B-4FFF-A81A-8F350BDB911F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.Analyzers", "src\Microsoft.AspNetCore.Components.Analyzers\Microsoft.AspNetCore.Components.Analyzers.csproj", "{6DDD6A29-0A3E-417F-976C-5FE3FDA74055}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Blazor.Analyzers", "src\Microsoft.AspNetCore.Components.Analyzers\Microsoft.AspNetCore.Blazor.Analyzers.csproj", "{6DDD6A29-0A3E-417F-976C-5FE3FDA74055}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.Analyzers.Test", "test\Microsoft.AspNetCore.Components.Analyzers.Test\Microsoft.AspNetCore.Components.Analyzers.Test.csproj", "{CF3B5990-7A05-4993-AACA-D2C8D7AFF6E6}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Blazor.Analyzers.Test", "test\Microsoft.AspNetCore.Components.Analyzers.Test\Microsoft.AspNetCore.Blazor.Analyzers.Test.csproj", "{CF3B5990-7A05-4993-AACA-D2C8D7AFF6E6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.Server.Test", "test\Microsoft.AspNetCore.Components.Server.Test\Microsoft.AspNetCore.Components.Server.Test.csproj", "{142AA6BC-5110-486B-A34D-6878E5E2CE95}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspnetCore.Blazor.Server.Test", "test\Microsoft.AspNetCore.Components.Server.Test\Microsoft.AspnetCore.Blazor.Server.Test.csproj", "{142AA6BC-5110-486B-A34D-6878E5E2CE95}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ComponentsApp", "ComponentsApp", "{3173A9C0-4F66-4064-83EC-3C206F1430FB}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ServerSideBlazor", "ServerSideBlazor", "{3173A9C0-4F66-4064-83EC-3C206F1430FB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComponentsApp.Server", "samples\ComponentsApp.Server\ComponentsApp.Server.csproj", "{5655AFF9-612C-4947-8221-7DB6949A6CA4}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServerSideBlazor.Server", "samples\ServerSideBlazor.Server\ServerSideBlazor.Server.csproj", "{5655AFF9-612C-4947-8221-7DB6949A6CA4}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServerSideBlazor.Client", "samples\ServerSideBlazor.Client\ServerSideBlazor.Client.csproj", "{33C361D8-CAF1-47C0-A344-251AEF4FE1FE}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComponentsApp.App", "samples\ComponentsApp.App\ComponentsApp.App.csproj", "{33C361D8-CAF1-47C0-A344-251AEF4FE1FE}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BlazorServerSide-CSharp", "BlazorServerSide-CSharp", "{6BDD3018-3961-488E-97D3-1FB7320A8AC6}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorServerSide-CSharp.App", "blazor\src\Microsoft.AspNetCore.Blazor.Templates\content\BlazorServerSide-CSharp\BlazorServerSide-CSharp.App\BlazorServerSide-CSharp.App.csproj", "{49F0DC0E-D8E6-4E74-8A3F-F024EAAECB8B}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorServerSide-CSharp.Server", "blazor\src\Microsoft.AspNetCore.Blazor.Templates\content\BlazorServerSide-CSharp\BlazorServerSide-CSharp.Server\BlazorServerSide-CSharp.Server.csproj", "{72004416-E278-4787-B84F-40C7E5668D74}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Blazor.E2EPerformance", "blazor\benchmarks\Microsoft.AspNetCore.Blazor.E2EPerformance\Microsoft.AspNetCore.Blazor.E2EPerformance.csproj", "{CCEC81C4-1A3C-40DC-952F-074712C46180}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Blazor.TagHelperWorkaround", "src\Microsoft.AspNetCore.Components.TagHelperWorkaround\Microsoft.AspNetCore.Blazor.TagHelperWorkaround.csproj", "{F71D78AB-A07E-415D-BF3F-1B9991628214}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.TagHelperWorkaround", "src\Microsoft.AspNetCore.Components.TagHelperWorkaround\Microsoft.AspNetCore.Components.TagHelperWorkaround.csproj", "{F71D78AB-A07E-415D-BF3F-1B9991628214}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.WebAssembly.Interop", "modules\jsinterop\src\Mono.WebAssembly.Interop\Mono.WebAssembly.Interop.csproj", "{37856984-9702-4062-B8B7-91A38AD8F2BF}" EndProject @@ -297,23 +283,6 @@ Global {8C160273-0A1D-4D79-9F7B-7687B2D2F7C4}.Release|Any CPU.Build.0 = Release|Any CPU {8C160273-0A1D-4D79-9F7B-7687B2D2F7C4}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU {8C160273-0A1D-4D79-9F7B-7687B2D2F7C4}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU - {A092FA91-856B-4ACA-B1C2-10BDBA366185}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A092FA91-856B-4ACA-B1C2-10BDBA366185}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU - {A092FA91-856B-4ACA-B1C2-10BDBA366185}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A092FA91-856B-4ACA-B1C2-10BDBA366185}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU - {7549444A-9C81-44DE-AD0D-2C55501EAAC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7549444A-9C81-44DE-AD0D-2C55501EAAC7}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU - {7549444A-9C81-44DE-AD0D-2C55501EAAC7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7549444A-9C81-44DE-AD0D-2C55501EAAC7}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU - {78ED9932-0912-4F36-8F82-33DE850E7A33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {78ED9932-0912-4F36-8F82-33DE850E7A33}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU - {78ED9932-0912-4F36-8F82-33DE850E7A33}.Release|Any CPU.ActiveCfg = Release|Any CPU - {78ED9932-0912-4F36-8F82-33DE850E7A33}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU - {F3E02B21-1127-431A-B832-0E53CB72097B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F3E02B21-1127-431A-B832-0E53CB72097B}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU - {F3E02B21-1127-431A-B832-0E53CB72097B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F3E02B21-1127-431A-B832-0E53CB72097B}.Release|Any CPU.Build.0 = Release|Any CPU - {F3E02B21-1127-431A-B832-0E53CB72097B}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU {FF25111E-5A3E-48A3-96D8-08A2C5A2A91C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FF25111E-5A3E-48A3-96D8-08A2C5A2A91C}.Debug|Any CPU.Build.0 = Debug|Any CPU {FF25111E-5A3E-48A3-96D8-08A2C5A2A91C}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU @@ -352,10 +321,6 @@ Global {50F6820F-D058-4E68-9E15-801F893F514E}.Release|Any CPU.Build.0 = Release|Any CPU {50F6820F-D058-4E68-9E15-801F893F514E}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU {50F6820F-D058-4E68-9E15-801F893F514E}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU - {3A457B14-D91B-4FFF-A81A-8F350BDB911F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3A457B14-D91B-4FFF-A81A-8F350BDB911F}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU - {3A457B14-D91B-4FFF-A81A-8F350BDB911F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3A457B14-D91B-4FFF-A81A-8F350BDB911F}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU {6DDD6A29-0A3E-417F-976C-5FE3FDA74055}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6DDD6A29-0A3E-417F-976C-5FE3FDA74055}.Debug|Any CPU.Build.0 = Debug|Any CPU {6DDD6A29-0A3E-417F-976C-5FE3FDA74055}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU @@ -396,22 +361,6 @@ Global {33C361D8-CAF1-47C0-A344-251AEF4FE1FE}.Release|Any CPU.Build.0 = Release|Any CPU {33C361D8-CAF1-47C0-A344-251AEF4FE1FE}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU {33C361D8-CAF1-47C0-A344-251AEF4FE1FE}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU - {49F0DC0E-D8E6-4E74-8A3F-F024EAAECB8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {49F0DC0E-D8E6-4E74-8A3F-F024EAAECB8B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {49F0DC0E-D8E6-4E74-8A3F-F024EAAECB8B}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU - {49F0DC0E-D8E6-4E74-8A3F-F024EAAECB8B}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU - {49F0DC0E-D8E6-4E74-8A3F-F024EAAECB8B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {49F0DC0E-D8E6-4E74-8A3F-F024EAAECB8B}.Release|Any CPU.Build.0 = Release|Any CPU - {49F0DC0E-D8E6-4E74-8A3F-F024EAAECB8B}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU - {49F0DC0E-D8E6-4E74-8A3F-F024EAAECB8B}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU - {72004416-E278-4787-B84F-40C7E5668D74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {72004416-E278-4787-B84F-40C7E5668D74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {72004416-E278-4787-B84F-40C7E5668D74}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU - {72004416-E278-4787-B84F-40C7E5668D74}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU - {72004416-E278-4787-B84F-40C7E5668D74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {72004416-E278-4787-B84F-40C7E5668D74}.Release|Any CPU.Build.0 = Release|Any CPU - {72004416-E278-4787-B84F-40C7E5668D74}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU - {72004416-E278-4787-B84F-40C7E5668D74}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU {CCEC81C4-1A3C-40DC-952F-074712C46180}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CCEC81C4-1A3C-40DC-952F-074712C46180}.Debug|Any CPU.Build.0 = Debug|Any CPU {CCEC81C4-1A3C-40DC-952F-074712C46180}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU @@ -498,18 +447,13 @@ Global {AF79BB84-BAE6-4F9A-9AD5-B0E3D7455288} = {AD41FFD8-2C0C-4F0C-9537-25C2A3A7A1F4} {8C160273-0A1D-4D79-9F7B-7687B2D2F7C4} = {AD41FFD8-2C0C-4F0C-9537-25C2A3A7A1F4} {E8EBA72C-D555-43AE-BC98-F0B2D05F6A07} = {E5DDF29D-DFC9-43E3-AC3A-5B6D54B786D5} - {A092FA91-856B-4ACA-B1C2-10BDBA366185} = {E8EBA72C-D555-43AE-BC98-F0B2D05F6A07} {73DA1DFD-79F0-4BA2-B0B6-4F3A21D2C3F8} = {E8EBA72C-D555-43AE-BC98-F0B2D05F6A07} - {7549444A-9C81-44DE-AD0D-2C55501EAAC7} = {73DA1DFD-79F0-4BA2-B0B6-4F3A21D2C3F8} - {78ED9932-0912-4F36-8F82-33DE850E7A33} = {73DA1DFD-79F0-4BA2-B0B6-4F3A21D2C3F8} - {F3E02B21-1127-431A-B832-0E53CB72097B} = {73DA1DFD-79F0-4BA2-B0B6-4F3A21D2C3F8} {FF25111E-5A3E-48A3-96D8-08A2C5A2A91C} = {ADA3AE29-F6DE-49F6-8C7C-B321508CAE8E} {F563ABB6-85FB-4CFC-B0D2-1D5130E8246D} = {E5DDF29D-DFC9-43E3-AC3A-5B6D54B786D5} {43E39257-7DC1-46BD-9BD9-2319A1313D07} = {F563ABB6-85FB-4CFC-B0D2-1D5130E8246D} {9088E4E4-B855-457F-AE9E-D86709A5E1F4} = {F563ABB6-85FB-4CFC-B0D2-1D5130E8246D} {C57382BC-EE93-49D5-BC40-5C98AF8AA048} = {4AE0D35B-D97A-44D0-8392-C9240377DCCE} {50F6820F-D058-4E68-9E15-801F893F514E} = {36A7DEB7-5F88-4BFB-B57E-79EEC9950E25} - {3A457B14-D91B-4FFF-A81A-8F350BDB911F} = {E8EBA72C-D555-43AE-BC98-F0B2D05F6A07} {6DDD6A29-0A3E-417F-976C-5FE3FDA74055} = {B867E038-B3CE-43E3-9292-61568C46CDEB} {CF3B5990-7A05-4993-AACA-D2C8D7AFF6E6} = {ADA3AE29-F6DE-49F6-8C7C-B321508CAE8E} {142AA6BC-5110-486B-A34D-6878E5E2CE95} = {ADA3AE29-F6DE-49F6-8C7C-B321508CAE8E} @@ -517,8 +461,6 @@ Global {5655AFF9-612C-4947-8221-7DB6949A6CA4} = {3173A9C0-4F66-4064-83EC-3C206F1430FB} {33C361D8-CAF1-47C0-A344-251AEF4FE1FE} = {3173A9C0-4F66-4064-83EC-3C206F1430FB} {6BDD3018-3961-488E-97D3-1FB7320A8AC6} = {E8EBA72C-D555-43AE-BC98-F0B2D05F6A07} - {49F0DC0E-D8E6-4E74-8A3F-F024EAAECB8B} = {6BDD3018-3961-488E-97D3-1FB7320A8AC6} - {72004416-E278-4787-B84F-40C7E5668D74} = {6BDD3018-3961-488E-97D3-1FB7320A8AC6} {CCEC81C4-1A3C-40DC-952F-074712C46180} = {DDE4B710-6936-4E17-9CA0-54C45333ED15} {F71D78AB-A07E-415D-BF3F-1B9991628214} = {B867E038-B3CE-43E3-9292-61568C46CDEB} {37856984-9702-4062-B8B7-91A38AD8F2BF} = {1386F99B-3862-40C2-B24D-796C07DC7921} diff --git a/Directory.Build.props b/Directory.Build.props index 7e11478f..676dcf69 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -25,7 +25,7 @@ - $(ArtifactsBinDir)Microsoft.AspNetCore.Blazor.Build\netcoreapp2.1\ + $(ArtifactsBinDir)Microsoft.AspNetCore.Components.Build\netcoreapp2.1\ diff --git a/README.md b/README.md index 2edd9e82..7b5f4868 100644 --- a/README.md +++ b/README.md @@ -74,7 +74,7 @@ Before attempting to open the Blazor repo in Visual Studio, restore Git submodul git submodule update --init --recursive -If you have problems using Visual Studio with `Blazor.sln` please refer to the [developer documentation](https://github.com/aspnet/Home/wiki/Building-from-source). +If you have problems using Visual Studio with `Components.sln` please refer to the [developer documentation](https://github.com/aspnet/Home/wiki/Building-from-source). ## Developing the Blazor VS Tooling @@ -112,8 +112,8 @@ You can browse https://dotnet.myget.org/gallery/blazor-dev to find the current v ```xml - - + + ``` diff --git a/benchmarks/Microsoft.AspNetCore.Components.Performance/Microsoft.AspNetCore.Blazor.Performance.csproj b/benchmarks/Microsoft.AspNetCore.Components.Performance/Microsoft.AspNetCore.Components.Performance.csproj similarity index 87% rename from benchmarks/Microsoft.AspNetCore.Components.Performance/Microsoft.AspNetCore.Blazor.Performance.csproj rename to benchmarks/Microsoft.AspNetCore.Components.Performance/Microsoft.AspNetCore.Components.Performance.csproj index 54479b35..6412df14 100644 --- a/benchmarks/Microsoft.AspNetCore.Components.Performance/Microsoft.AspNetCore.Blazor.Performance.csproj +++ b/benchmarks/Microsoft.AspNetCore.Components.Performance/Microsoft.AspNetCore.Components.Performance.csproj @@ -1,4 +1,4 @@ - + netcoreapp2.1 @@ -8,7 +8,7 @@ - + diff --git a/benchmarks/Microsoft.AspNetCore.Components.Performance/Program.cs b/benchmarks/Microsoft.AspNetCore.Components.Performance/Program.cs index 71532fa8..8602bc94 100644 --- a/benchmarks/Microsoft.AspNetCore.Components.Performance/Program.cs +++ b/benchmarks/Microsoft.AspNetCore.Components.Performance/Program.cs @@ -3,7 +3,7 @@ using System; using System.Diagnostics; -using Microsoft.AspNetCore.Blazor.Performance; +using Microsoft.AspNetCore.Components.Performance; namespace Microsoft.AspNetCore.BenchmarkDotNet.Runner { diff --git a/benchmarks/Microsoft.AspNetCore.Components.Performance/RenderTreeDiffBuilderBenchmark.cs b/benchmarks/Microsoft.AspNetCore.Components.Performance/RenderTreeDiffBuilderBenchmark.cs index 58f4ff0d..ffde079d 100644 --- a/benchmarks/Microsoft.AspNetCore.Components.Performance/RenderTreeDiffBuilderBenchmark.cs +++ b/benchmarks/Microsoft.AspNetCore.Components.Performance/RenderTreeDiffBuilderBenchmark.cs @@ -2,14 +2,12 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using System.Linq; using System.Threading.Tasks; using BenchmarkDotNet.Attributes; -using Microsoft.AspNetCore.Blazor.Components; -using Microsoft.AspNetCore.Blazor.Rendering; -using Microsoft.AspNetCore.Blazor.RenderTree; +using Microsoft.AspNetCore.Components.Rendering; +using Microsoft.AspNetCore.Components.RenderTree; -namespace Microsoft.AspNetCore.Blazor.Performance +namespace Microsoft.AspNetCore.Components.Performance { public class RenderTreeDiffBuilderBenchmark { diff --git a/blazor/benchmarks/Microsoft.AspNetCore.Blazor.E2EPerformance/Microsoft.AspNetCore.Blazor.E2EPerformance.csproj b/blazor/benchmarks/Microsoft.AspNetCore.Blazor.E2EPerformance/Microsoft.AspNetCore.Blazor.E2EPerformance.csproj index 1bf363a7..60f660a4 100644 --- a/blazor/benchmarks/Microsoft.AspNetCore.Blazor.E2EPerformance/Microsoft.AspNetCore.Blazor.E2EPerformance.csproj +++ b/blazor/benchmarks/Microsoft.AspNetCore.Blazor.E2EPerformance/Microsoft.AspNetCore.Blazor.E2EPerformance.csproj @@ -9,8 +9,8 @@ - - + + diff --git a/blazor/benchmarks/Microsoft.AspNetCore.Blazor.E2EPerformance/Program.cs b/blazor/benchmarks/Microsoft.AspNetCore.Blazor.E2EPerformance/Program.cs index f498eb02..197f8367 100644 --- a/blazor/benchmarks/Microsoft.AspNetCore.Blazor.E2EPerformance/Program.cs +++ b/blazor/benchmarks/Microsoft.AspNetCore.Blazor.E2EPerformance/Program.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNetCore.Blazor.Hosting; +using Microsoft.AspNetCore.Components.Hosting; namespace Microsoft.AspNetCore.Blazor.E2EPerformance { diff --git a/blazor/benchmarks/Microsoft.AspNetCore.Blazor.E2EPerformance/Shared/MainLayout.cshtml b/blazor/benchmarks/Microsoft.AspNetCore.Blazor.E2EPerformance/Shared/MainLayout.cshtml index cdbe5f8c..259daf45 100644 --- a/blazor/benchmarks/Microsoft.AspNetCore.Blazor.E2EPerformance/Shared/MainLayout.cshtml +++ b/blazor/benchmarks/Microsoft.AspNetCore.Blazor.E2EPerformance/Shared/MainLayout.cshtml @@ -1,4 +1,4 @@ -@inherits BlazorLayoutComponent +@inherits LayoutComponentBase

E2E Performance

diff --git a/blazor/benchmarks/Microsoft.AspNetCore.Blazor.E2EPerformance/Startup.cs b/blazor/benchmarks/Microsoft.AspNetCore.Blazor.E2EPerformance/Startup.cs index 35027da4..415eb210 100644 --- a/blazor/benchmarks/Microsoft.AspNetCore.Blazor.E2EPerformance/Startup.cs +++ b/blazor/benchmarks/Microsoft.AspNetCore.Blazor.E2EPerformance/Startup.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNetCore.Blazor.Builder; +using Microsoft.AspNetCore.Components.Builder; using Microsoft.Extensions.DependencyInjection; namespace Microsoft.AspNetCore.Blazor.E2EPerformance diff --git a/blazor/benchmarks/Microsoft.AspNetCore.Blazor.E2EPerformance/_ViewImports.cshtml b/blazor/benchmarks/Microsoft.AspNetCore.Blazor.E2EPerformance/_ViewImports.cshtml index 7246c54e..aaba22f6 100644 --- a/blazor/benchmarks/Microsoft.AspNetCore.Blazor.E2EPerformance/_ViewImports.cshtml +++ b/blazor/benchmarks/Microsoft.AspNetCore.Blazor.E2EPerformance/_ViewImports.cshtml @@ -1,6 +1,6 @@ @using System.Net.Http -@using Microsoft.AspNetCore.Blazor.Layouts -@using Microsoft.AspNetCore.Blazor.Routing +@using Microsoft.AspNetCore.Components.Layouts +@using Microsoft.AspNetCore.Components.Routing @using Microsoft.JSInterop @using Microsoft.AspNetCore.Blazor.E2EPerformance @using Microsoft.AspNetCore.Blazor.E2EPerformance.Shared diff --git a/blazor/samples/HostedInAspNet.Client/HostedInAspNet.Client.csproj b/blazor/samples/HostedInAspNet.Client/HostedInAspNet.Client.csproj index 70fe7be7..6819e113 100644 --- a/blazor/samples/HostedInAspNet.Client/HostedInAspNet.Client.csproj +++ b/blazor/samples/HostedInAspNet.Client/HostedInAspNet.Client.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/blazor/samples/HostedInAspNet.Client/Program.cs b/blazor/samples/HostedInAspNet.Client/Program.cs index 1da39bae..71369f20 100644 --- a/blazor/samples/HostedInAspNet.Client/Program.cs +++ b/blazor/samples/HostedInAspNet.Client/Program.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNetCore.Blazor.Browser.Rendering; +using Microsoft.AspNetCore.Components.Browser.Rendering; namespace HostedInAspNet.Client { diff --git a/blazor/samples/HostedInAspNet.Server/HostedInAspNet.Server.csproj b/blazor/samples/HostedInAspNet.Server/HostedInAspNet.Server.csproj index 8ef6f407..248eba21 100644 --- a/blazor/samples/HostedInAspNet.Server/HostedInAspNet.Server.csproj +++ b/blazor/samples/HostedInAspNet.Server/HostedInAspNet.Server.csproj @@ -10,7 +10,7 @@ - + diff --git a/blazor/samples/MonoSanity/MonoSanity.csproj b/blazor/samples/MonoSanity/MonoSanity.csproj index 6cbe42a5..d444ef9f 100644 --- a/blazor/samples/MonoSanity/MonoSanity.csproj +++ b/blazor/samples/MonoSanity/MonoSanity.csproj @@ -10,7 +10,7 @@ - + diff --git a/blazor/samples/StandaloneApp/Program.cs b/blazor/samples/StandaloneApp/Program.cs index 530de728..25774cea 100644 --- a/blazor/samples/StandaloneApp/Program.cs +++ b/blazor/samples/StandaloneApp/Program.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNetCore.Blazor.Hosting; +using Microsoft.AspNetCore.Components.Hosting; namespace StandaloneApp { diff --git a/blazor/samples/StandaloneApp/Shared/MainLayout.cshtml b/blazor/samples/StandaloneApp/Shared/MainLayout.cshtml index c38b136e..902e3edb 100644 --- a/blazor/samples/StandaloneApp/Shared/MainLayout.cshtml +++ b/blazor/samples/StandaloneApp/Shared/MainLayout.cshtml @@ -1,4 +1,4 @@ -@inherits BlazorLayoutComponent +@inherits LayoutComponentBase
diff --git a/blazor/samples/StandaloneApp/StandaloneApp.csproj b/blazor/samples/StandaloneApp/StandaloneApp.csproj index 3e52b0ca..9e6c4486 100644 --- a/blazor/samples/StandaloneApp/StandaloneApp.csproj +++ b/blazor/samples/StandaloneApp/StandaloneApp.csproj @@ -9,8 +9,8 @@ - - + + diff --git a/blazor/samples/StandaloneApp/Startup.cs b/blazor/samples/StandaloneApp/Startup.cs index 91d4e2dc..55cba929 100644 --- a/blazor/samples/StandaloneApp/Startup.cs +++ b/blazor/samples/StandaloneApp/Startup.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNetCore.Blazor.Builder; +using Microsoft.AspNetCore.Components.Builder; using Microsoft.Extensions.DependencyInjection; namespace StandaloneApp diff --git a/blazor/samples/StandaloneApp/_ViewImports.cshtml b/blazor/samples/StandaloneApp/_ViewImports.cshtml index ebe42919..632972be 100644 --- a/blazor/samples/StandaloneApp/_ViewImports.cshtml +++ b/blazor/samples/StandaloneApp/_ViewImports.cshtml @@ -1,5 +1,5 @@ @using System.Net.Http -@using Microsoft.AspNetCore.Blazor.Layouts -@using Microsoft.AspNetCore.Blazor.Routing +@using Microsoft.AspNetCore.Components.Layouts +@using Microsoft.AspNetCore.Components.Routing @using StandaloneApp @using StandaloneApp.Shared diff --git a/blazor/src/Microsoft.AspNetCore.Blazor.Cli/Microsoft.AspNetCore.Blazor.Cli.csproj b/blazor/src/Microsoft.AspNetCore.Blazor.Cli/Microsoft.AspNetCore.Blazor.Cli.csproj index c09a31ce..4fe36910 100644 --- a/blazor/src/Microsoft.AspNetCore.Blazor.Cli/Microsoft.AspNetCore.Blazor.Cli.csproj +++ b/blazor/src/Microsoft.AspNetCore.Blazor.Cli/Microsoft.AspNetCore.Blazor.Cli.csproj @@ -17,6 +17,6 @@ - + diff --git a/blazor/src/Microsoft.AspNetCore.Blazor.Cli/Properties/AssemblyInfo.cs b/blazor/src/Microsoft.AspNetCore.Blazor.Cli/Properties/AssemblyInfo.cs index d72c8260..965fe90f 100644 --- a/blazor/src/Microsoft.AspNetCore.Blazor.Cli/Properties/AssemblyInfo.cs +++ b/blazor/src/Microsoft.AspNetCore.Blazor.Cli/Properties/AssemblyInfo.cs @@ -1,3 +1,3 @@ using System.Runtime.CompilerServices; -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Blazor.E2ETest")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Components.E2ETest")] diff --git a/blazor/src/Microsoft.AspNetCore.Blazor.Cli/Server/Startup.cs b/blazor/src/Microsoft.AspNetCore.Blazor.Cli/Server/Startup.cs index 300f6471..3623b447 100644 --- a/blazor/src/Microsoft.AspNetCore.Blazor.Cli/Server/Startup.cs +++ b/blazor/src/Microsoft.AspNetCore.Blazor.Cli/Server/Startup.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNetCore.Blazor.Server; +using Microsoft.AspNetCore.Components.Server; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; diff --git a/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/BlazorHosted-CSharp.Client.csproj b/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/BlazorHosted-CSharp.Client.csproj index 2df8de15..be9b4726 100644 --- a/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/BlazorHosted-CSharp.Client.csproj +++ b/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/BlazorHosted-CSharp.Client.csproj @@ -10,7 +10,7 @@ - + diff --git a/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Program.cs b/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Program.cs index 459d0050..0a53a7ba 100644 --- a/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Program.cs +++ b/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Program.cs @@ -1,4 +1,4 @@ -using Microsoft.AspNetCore.Blazor.Hosting; +using Microsoft.AspNetCore.Components.Hosting; namespace BlazorHosted_CSharp.Client { diff --git a/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Shared/MainLayout.cshtml b/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Shared/MainLayout.cshtml index 8b8a5d62..0f4e22a9 100644 --- a/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Shared/MainLayout.cshtml +++ b/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Shared/MainLayout.cshtml @@ -1,4 +1,4 @@ -@inherits BlazorLayoutComponent +@inherits LayoutComponentBase
diff --git a/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/_ViewImports.cshtml b/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/_ViewImports.cshtml index d281a74f..6c4eae0f 100644 --- a/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/_ViewImports.cshtml +++ b/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/_ViewImports.cshtml @@ -1,6 +1,6 @@ @using System.Net.Http -@using Microsoft.AspNetCore.Blazor.Layouts -@using Microsoft.AspNetCore.Blazor.Routing +@using Microsoft.AspNetCore.Components.Layouts +@using Microsoft.AspNetCore.Components.Routing @using Microsoft.JSInterop @using BlazorHosted_CSharp.Client @using BlazorHosted_CSharp.Client.Shared diff --git a/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Server/BlazorHosted-CSharp.Server.csproj b/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Server/BlazorHosted-CSharp.Server.csproj index ab819c7f..d60d4c28 100644 --- a/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Server/BlazorHosted-CSharp.Server.csproj +++ b/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Server/BlazorHosted-CSharp.Server.csproj @@ -10,7 +10,7 @@ - + diff --git a/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Server/Startup.cs b/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Server/Startup.cs index 197ba551..0c62dfd1 100644 --- a/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Server/Startup.cs +++ b/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Server/Startup.cs @@ -1,4 +1,4 @@ -using Microsoft.AspNetCore.Blazor.Server; +using Microsoft.AspNetCore.Components.Server; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.ResponseCompression; diff --git a/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary-CSharp/BlazorLibrary-CSharp.csproj b/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary-CSharp/BlazorLibrary-CSharp.csproj index a7798b19..b0a94d8d 100644 --- a/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary-CSharp/BlazorLibrary-CSharp.csproj +++ b/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary-CSharp/BlazorLibrary-CSharp.csproj @@ -19,7 +19,7 @@ - + diff --git a/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/BlazorServerSide-CSharp.App.csproj b/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/BlazorServerSide-CSharp.App.csproj index 038d4bf3..4f0b12c2 100644 --- a/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/BlazorServerSide-CSharp.App.csproj +++ b/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/BlazorServerSide-CSharp.App.csproj @@ -13,7 +13,7 @@ - + diff --git a/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/Program.cs b/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/Program.cs index 859a3ef1..94a0f082 100644 --- a/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/Program.cs +++ b/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/Program.cs @@ -1,4 +1,4 @@ -using Microsoft.AspNetCore.Blazor.Hosting; +using Microsoft.AspNetCore.Components.Hosting; namespace BlazorServerSide_CSharp.App { diff --git a/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/Shared/MainLayout.cshtml b/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/Shared/MainLayout.cshtml index 51eb6f47..d5eeb142 100644 --- a/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/Shared/MainLayout.cshtml +++ b/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/Shared/MainLayout.cshtml @@ -1,4 +1,4 @@ -@inherits BlazorLayoutComponent +@inherits LayoutComponentBase
diff --git a/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/_ViewImports.cshtml b/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/_ViewImports.cshtml index a3225fb1..d55166f2 100644 --- a/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/_ViewImports.cshtml +++ b/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/_ViewImports.cshtml @@ -1,6 +1,6 @@ @using System.Net.Http -@using Microsoft.AspNetCore.Blazor.Layouts -@using Microsoft.AspNetCore.Blazor.Routing +@using Microsoft.AspNetCore.Components.Layouts +@using Microsoft.AspNetCore.Components.Routing @using Microsoft.JSInterop @using BlazorServerSide_CSharp.App @using BlazorServerSide_CSharp.App.Shared diff --git a/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.Server/BlazorServerSide-CSharp.Server.csproj b/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.Server/BlazorServerSide-CSharp.Server.csproj index de40d7b7..03d5d75f 100644 --- a/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.Server/BlazorServerSide-CSharp.Server.csproj +++ b/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.Server/BlazorServerSide-CSharp.Server.csproj @@ -10,7 +10,7 @@ - + diff --git a/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.Server/Startup.cs b/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.Server/Startup.cs index 5b2e1cf5..67dc66b8 100644 --- a/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.Server/Startup.cs +++ b/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.Server/Startup.cs @@ -1,4 +1,4 @@ -using Microsoft.AspNetCore.Blazor.Server; +using Microsoft.AspNetCore.Components.Server; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.ResponseCompression; diff --git a/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/BlazorStandalone-CSharp.csproj b/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/BlazorStandalone-CSharp.csproj index 63266ae3..df25211a 100644 --- a/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/BlazorStandalone-CSharp.csproj +++ b/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/BlazorStandalone-CSharp.csproj @@ -11,7 +11,7 @@ - + diff --git a/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/Program.cs b/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/Program.cs index dd72b78e..3c8cb66f 100644 --- a/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/Program.cs +++ b/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/Program.cs @@ -1,4 +1,4 @@ -using Microsoft.AspNetCore.Blazor.Hosting; +using Microsoft.AspNetCore.Components.Hosting; namespace BlazorStandalone_CSharp { diff --git a/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/Shared/MainLayout.cshtml b/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/Shared/MainLayout.cshtml index c38b136e..902e3edb 100644 --- a/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/Shared/MainLayout.cshtml +++ b/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/Shared/MainLayout.cshtml @@ -1,4 +1,4 @@ -@inherits BlazorLayoutComponent +@inherits LayoutComponentBase
diff --git a/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/_ViewImports.cshtml b/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/_ViewImports.cshtml index 6a845c24..491a46a9 100644 --- a/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/_ViewImports.cshtml +++ b/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/_ViewImports.cshtml @@ -1,6 +1,6 @@ @using System.Net.Http -@using Microsoft.AspNetCore.Blazor.Layouts -@using Microsoft.AspNetCore.Blazor.Routing +@using Microsoft.AspNetCore.Components.Layouts +@using Microsoft.AspNetCore.Components.Routing @using Microsoft.JSInterop @using BlazorStandalone_CSharp @using BlazorStandalone_CSharp.Shared diff --git a/blazor/tooling/Microsoft.VisualStudio.BlazorExtension/Microsoft.VisualStudio.BlazorExtension.csproj b/blazor/tooling/Microsoft.VisualStudio.BlazorExtension/Microsoft.VisualStudio.BlazorExtension.csproj index a29866fa..ea8408f7 100644 --- a/blazor/tooling/Microsoft.VisualStudio.BlazorExtension/Microsoft.VisualStudio.BlazorExtension.csproj +++ b/blazor/tooling/Microsoft.VisualStudio.BlazorExtension/Microsoft.VisualStudio.BlazorExtension.csproj @@ -130,16 +130,16 @@ - - Microsoft.AspNetCore.Blazor.Razor.Extensions + + Microsoft.AspNetCore.Components.Razor.Extensions False - - Microsoft.AspNetCore.Blazor.Razor.Extensions.dll + + Microsoft.AspNetCore.Components.Razor.Extensions.dll true PreserveNewest false diff --git a/blazor/tooling/Microsoft.VisualStudio.BlazorExtension/Properties/AssemblyInfo.cs b/blazor/tooling/Microsoft.VisualStudio.BlazorExtension/Properties/AssemblyInfo.cs index 51066b0c..a4b5c761 100644 --- a/blazor/tooling/Microsoft.VisualStudio.BlazorExtension/Properties/AssemblyInfo.cs +++ b/blazor/tooling/Microsoft.VisualStudio.BlazorExtension/Properties/AssemblyInfo.cs @@ -7,9 +7,9 @@ using Microsoft.VisualStudio.Shell; // up in the Load context, which means that we can use ServiceHub and other nice things. // // The versions here need to match what the build is producing. If you change the version numbers -// for the Blazor assemblies, this needs to change as well. +// for the referenced assemblies, this needs to change as well. [assembly: ProvideBindingRedirection( - AssemblyName = "Microsoft.AspNetCore.Blazor.Razor.Extensions", + AssemblyName = "Microsoft.AspNetCore.Components.Razor.Extensions", GenerateCodeBase = true, PublicKeyToken = "", OldVersionLowerBound = "0.0.0.0", diff --git a/blazor/tooling/Microsoft.VisualStudio.BlazorExtension/source.extension.vsixmanifest b/blazor/tooling/Microsoft.VisualStudio.BlazorExtension/source.extension.vsixmanifest index 3042dc14..21587ca0 100644 --- a/blazor/tooling/Microsoft.VisualStudio.BlazorExtension/source.extension.vsixmanifest +++ b/blazor/tooling/Microsoft.VisualStudio.BlazorExtension/source.extension.vsixmanifest @@ -21,7 +21,7 @@ - + diff --git a/blazor/tooling/Microsoft.VisualStudio.LanguageServices.Blazor/BlazorProjectEngineFactory.cs b/blazor/tooling/Microsoft.VisualStudio.LanguageServices.Blazor/BlazorProjectEngineFactory.cs index eb46f9dc..0979c7e8 100644 --- a/blazor/tooling/Microsoft.VisualStudio.LanguageServices.Blazor/BlazorProjectEngineFactory.cs +++ b/blazor/tooling/Microsoft.VisualStudio.LanguageServices.Blazor/BlazorProjectEngineFactory.cs @@ -3,7 +3,7 @@ using System; using System.Linq; -using Microsoft.AspNetCore.Blazor.Razor; +using Microsoft.AspNetCore.Components.Razor; using Microsoft.AspNetCore.Razor.Language; using Microsoft.CodeAnalysis.Razor; diff --git a/blazor/tooling/Microsoft.VisualStudio.LanguageServices.Blazor/Microsoft.VisualStudio.LanguageServices.Blazor.csproj b/blazor/tooling/Microsoft.VisualStudio.LanguageServices.Blazor/Microsoft.VisualStudio.LanguageServices.Blazor.csproj index 467944ff..2c8b84d1 100644 --- a/blazor/tooling/Microsoft.VisualStudio.LanguageServices.Blazor/Microsoft.VisualStudio.LanguageServices.Blazor.csproj +++ b/blazor/tooling/Microsoft.VisualStudio.LanguageServices.Blazor/Microsoft.VisualStudio.LanguageServices.Blazor.csproj @@ -16,6 +16,6 @@ - + diff --git a/build/SignToolData.json b/build/SignToolData.json index 0ca637fd..8c249e37 100644 --- a/build/SignToolData.json +++ b/build/SignToolData.json @@ -3,16 +3,16 @@ { "certificate": "Microsoft400", "values": [ - "bin/Microsoft.AspNetCore.Blazor.Analyzers/netstandard1.3/Microsoft.AspNetCore.Blazor.Analyzers.dll", - "bin/Microsoft.AspNetCore.Blazor.Browser.JS/netcoreapp2.1/Microsoft.AspNetCore.Blazor.Browser.JS.dll", - "bin/Microsoft.AspNetCore.Blazor.Browser/netstandard2.0/Microsoft.AspNetCore.Blazor.Browser.dll", - "bin/Microsoft.AspNetCore.Blazor.Server/netstandard2.0/Microsoft.AspNetCore.Blazor.Server.dll", - "bin/Microsoft.AspNetCore.Blazor.TagHelperWorkaround/netstandard1.0/Microsoft.AspNetCore.Blazor.TagHelperWorkaround.dll", - "bin/Microsoft.AspNetCore.Blazor.Build/netcoreapp2.1/Microsoft.AspNetCore.Blazor.Build.dll", + "bin/Microsoft.AspNetCore.Components.Analyzers/netstandard1.3/Microsoft.AspNetCore.Components.Analyzers.dll", + "bin/Microsoft.AspNetCore.Components.Browser.JS/netcoreapp2.1/Microsoft.AspNetCore.Components.Browser.JS.dll", + "bin/Microsoft.AspNetCore.Components.Browser/netstandard2.0/Microsoft.AspNetCore.Components.Browser.dll", + "bin/Microsoft.AspNetCore.Components.Server/netstandard2.0/Microsoft.AspNetCore.Components.Server.dll", + "bin/Microsoft.AspNetCore.Components.TagHelperWorkaround/netstandard1.0/Microsoft.AspNetCore.Components.TagHelperWorkaround.dll", + "bin/Microsoft.AspNetCore.Components.Build/netcoreapp2.1/Microsoft.AspNetCore.Components.Build.dll", "bin/Microsoft.AspNetCore.Blazor.Cli/netcoreapp2.1/dotnet-blazor.dll", - "bin/Microsoft.AspNetCore.Blazor.Razor.Extensions/net461/Microsoft.AspNetCore.Blazor.Razor.Extensions.dll", - "bin/Microsoft.AspNetCore.Blazor.Razor.Extensions/netstandard2.0/Microsoft.AspNetCore.Blazor.Razor.Extensions.dll", - "bin/Microsoft.AspNetCore.Blazor/netstandard2.0/Microsoft.AspNetCore.Blazor.dll", + "bin/Microsoft.AspNetCore.Components.Razor.Extensions/net461/Microsoft.AspNetCore.Components.Razor.Extensions.dll", + "bin/Microsoft.AspNetCore.Components.Razor.Extensions/netstandard2.0/Microsoft.AspNetCore.Components.Razor.Extensions.dll", + "bin/Microsoft.AspNetCore.Components/netstandard2.0/Microsoft.AspNetCore.Components.dll", "bin/Microsoft.JSInterop/netstandard2.0/Microsoft.JSInterop.dll", "bin/Microsoft.VisualStudio.BlazorExtension/Microsoft.VisualStudio.BlazorExtension.dll", "bin/Microsoft.VisualStudio.LanguageServices.Blazor/net461/Microsoft.VisualStudio.LanguageServices.Blazor.dll", @@ -22,7 +22,7 @@ { "certificate": "3PartySHA2", "values": [ - "bin/Microsoft.AspNetCore.Blazor.Build/netcoreapp2.1/AngleSharp.dll", + "bin/Microsoft.AspNetCore.Components.Build/netcoreapp2.1/AngleSharp.dll", "bin/Microsoft.VisualStudio.BlazorExtension/AngleSharp.dll" ] }, diff --git a/build/repo.props b/build/repo.props index ac4f8ba8..2db8b851 100644 --- a/build/repo.props +++ b/build/repo.props @@ -40,7 +40,7 @@ The CI will script these directly by passing BlazorAllTests=true --> - + diff --git a/build/repo.targets b/build/repo.targets index cbd94c07..b9ef5200 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -1,7 +1,7 @@  - + Configuration=$(Configuration)NoVSIX diff --git a/samples/ServerSideBlazor.Client/App.cshtml b/samples/ComponentsApp.App/App.cshtml similarity index 68% rename from samples/ServerSideBlazor.Client/App.cshtml rename to samples/ComponentsApp.App/App.cshtml index ebaa9cf9..c89d889f 100644 --- a/samples/ServerSideBlazor.Client/App.cshtml +++ b/samples/ComponentsApp.App/App.cshtml @@ -2,4 +2,4 @@ Configuring this stuff here is temporary. Later we'll move the app config into Program.cs, and it won't be necessary to specify AppAssembly. --> - + diff --git a/samples/ServerSideBlazor.Client/ServerSideBlazor.Client.csproj b/samples/ComponentsApp.App/ComponentsApp.App.csproj similarity index 73% rename from samples/ServerSideBlazor.Client/ServerSideBlazor.Client.csproj rename to samples/ComponentsApp.App/ComponentsApp.App.csproj index 1dcf3e91..3626c485 100644 --- a/samples/ServerSideBlazor.Client/ServerSideBlazor.Client.csproj +++ b/samples/ComponentsApp.App/ComponentsApp.App.csproj @@ -6,11 +6,11 @@ - - + + - + \ No newline at end of file diff --git a/samples/ServerSideBlazor.Client/Pages/Counter.cshtml b/samples/ComponentsApp.App/Pages/Counter.cshtml similarity index 100% rename from samples/ServerSideBlazor.Client/Pages/Counter.cshtml rename to samples/ComponentsApp.App/Pages/Counter.cshtml diff --git a/samples/ServerSideBlazor.Client/Pages/FetchData.cshtml b/samples/ComponentsApp.App/Pages/FetchData.cshtml similarity index 100% rename from samples/ServerSideBlazor.Client/Pages/FetchData.cshtml rename to samples/ComponentsApp.App/Pages/FetchData.cshtml diff --git a/samples/ServerSideBlazor.Client/Pages/Index.cshtml b/samples/ComponentsApp.App/Pages/Index.cshtml similarity index 100% rename from samples/ServerSideBlazor.Client/Pages/Index.cshtml rename to samples/ComponentsApp.App/Pages/Index.cshtml diff --git a/samples/ServerSideBlazor.Client/Pages/_ViewImports.cshtml b/samples/ComponentsApp.App/Pages/_ViewImports.cshtml similarity index 100% rename from samples/ServerSideBlazor.Client/Pages/_ViewImports.cshtml rename to samples/ComponentsApp.App/Pages/_ViewImports.cshtml diff --git a/samples/ServerSideBlazor.Client/Program.cs b/samples/ComponentsApp.App/Program.cs similarity index 86% rename from samples/ServerSideBlazor.Client/Program.cs rename to samples/ComponentsApp.App/Program.cs index c14653b7..152ed2f4 100644 --- a/samples/ServerSideBlazor.Client/Program.cs +++ b/samples/ComponentsApp.App/Program.cs @@ -1,9 +1,9 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNetCore.Blazor.Hosting; +using Microsoft.AspNetCore.Components.Hosting; -namespace ServerSideBlazor.Client +namespace ComponentsApp.App { public class Program { diff --git a/samples/ServerSideBlazor.Client/Shared/MainLayout.cshtml b/samples/ComponentsApp.App/Shared/MainLayout.cshtml similarity index 88% rename from samples/ServerSideBlazor.Client/Shared/MainLayout.cshtml rename to samples/ComponentsApp.App/Shared/MainLayout.cshtml index c38b136e..902e3edb 100644 --- a/samples/ServerSideBlazor.Client/Shared/MainLayout.cshtml +++ b/samples/ComponentsApp.App/Shared/MainLayout.cshtml @@ -1,4 +1,4 @@ -@inherits BlazorLayoutComponent +@inherits LayoutComponentBase
diff --git a/samples/ServerSideBlazor.Client/Shared/NavMenu.cshtml b/samples/ComponentsApp.App/Shared/NavMenu.cshtml similarity index 100% rename from samples/ServerSideBlazor.Client/Shared/NavMenu.cshtml rename to samples/ComponentsApp.App/Shared/NavMenu.cshtml diff --git a/samples/ServerSideBlazor.Client/Startup.cs b/samples/ComponentsApp.App/Startup.cs similarity index 85% rename from samples/ServerSideBlazor.Client/Startup.cs rename to samples/ComponentsApp.App/Startup.cs index 71ef9609..0ff0878b 100644 --- a/samples/ServerSideBlazor.Client/Startup.cs +++ b/samples/ComponentsApp.App/Startup.cs @@ -1,10 +1,10 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNetCore.Blazor.Builder; +using Microsoft.AspNetCore.Components.Builder; using Microsoft.Extensions.DependencyInjection; -namespace ServerSideBlazor.Client +namespace ComponentsApp.App { public class Startup { diff --git a/samples/ServerSideBlazor.Client/WeatherForecast.cs b/samples/ComponentsApp.App/WeatherForecast.cs similarity index 93% rename from samples/ServerSideBlazor.Client/WeatherForecast.cs rename to samples/ComponentsApp.App/WeatherForecast.cs index 75b11f57..e13884fa 100644 --- a/samples/ServerSideBlazor.Client/WeatherForecast.cs +++ b/samples/ComponentsApp.App/WeatherForecast.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -namespace ServerSideBlazor +namespace ComponentsApp { public class WeatherForecast { diff --git a/samples/ServerSideBlazor.Client/WeatherForecastService.cs b/samples/ComponentsApp.App/WeatherForecastService.cs similarity index 93% rename from samples/ServerSideBlazor.Client/WeatherForecastService.cs rename to samples/ComponentsApp.App/WeatherForecastService.cs index 257c23fd..16808011 100644 --- a/samples/ServerSideBlazor.Client/WeatherForecastService.cs +++ b/samples/ComponentsApp.App/WeatherForecastService.cs @@ -4,7 +4,7 @@ using System; using System.Threading.Tasks; -namespace ServerSideBlazor +namespace ComponentsApp { public abstract class WeatherForecastService { diff --git a/samples/ComponentsApp.App/_ViewImports.cshtml b/samples/ComponentsApp.App/_ViewImports.cshtml new file mode 100644 index 00000000..ba45d525 --- /dev/null +++ b/samples/ComponentsApp.App/_ViewImports.cshtml @@ -0,0 +1,5 @@ +@using System.Net.Http +@using Microsoft.AspNetCore.Components.Layouts +@using Microsoft.AspNetCore.Components.Routing +@using ComponentsApp.App +@using ComponentsApp.App.Shared diff --git a/samples/ServerSideBlazor.Client/wwwroot/css/bootstrap/bootstrap.min.css b/samples/ComponentsApp.App/wwwroot/css/bootstrap/bootstrap.min.css similarity index 100% rename from samples/ServerSideBlazor.Client/wwwroot/css/bootstrap/bootstrap.min.css rename to samples/ComponentsApp.App/wwwroot/css/bootstrap/bootstrap.min.css diff --git a/samples/ServerSideBlazor.Client/wwwroot/css/bootstrap/bootstrap.min.css.map b/samples/ComponentsApp.App/wwwroot/css/bootstrap/bootstrap.min.css.map similarity index 100% rename from samples/ServerSideBlazor.Client/wwwroot/css/bootstrap/bootstrap.min.css.map rename to samples/ComponentsApp.App/wwwroot/css/bootstrap/bootstrap.min.css.map diff --git a/samples/ServerSideBlazor.Client/wwwroot/css/open-iconic/FONT-LICENSE b/samples/ComponentsApp.App/wwwroot/css/open-iconic/FONT-LICENSE similarity index 100% rename from samples/ServerSideBlazor.Client/wwwroot/css/open-iconic/FONT-LICENSE rename to samples/ComponentsApp.App/wwwroot/css/open-iconic/FONT-LICENSE diff --git a/samples/ServerSideBlazor.Client/wwwroot/css/open-iconic/ICON-LICENSE b/samples/ComponentsApp.App/wwwroot/css/open-iconic/ICON-LICENSE similarity index 100% rename from samples/ServerSideBlazor.Client/wwwroot/css/open-iconic/ICON-LICENSE rename to samples/ComponentsApp.App/wwwroot/css/open-iconic/ICON-LICENSE diff --git a/samples/ServerSideBlazor.Client/wwwroot/css/open-iconic/README.md b/samples/ComponentsApp.App/wwwroot/css/open-iconic/README.md similarity index 100% rename from samples/ServerSideBlazor.Client/wwwroot/css/open-iconic/README.md rename to samples/ComponentsApp.App/wwwroot/css/open-iconic/README.md diff --git a/samples/ServerSideBlazor.Client/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css b/samples/ComponentsApp.App/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css similarity index 100% rename from samples/ServerSideBlazor.Client/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css rename to samples/ComponentsApp.App/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css diff --git a/samples/ServerSideBlazor.Client/wwwroot/css/open-iconic/font/fonts/open-iconic.eot b/samples/ComponentsApp.App/wwwroot/css/open-iconic/font/fonts/open-iconic.eot similarity index 100% rename from samples/ServerSideBlazor.Client/wwwroot/css/open-iconic/font/fonts/open-iconic.eot rename to samples/ComponentsApp.App/wwwroot/css/open-iconic/font/fonts/open-iconic.eot diff --git a/samples/ServerSideBlazor.Client/wwwroot/css/open-iconic/font/fonts/open-iconic.otf b/samples/ComponentsApp.App/wwwroot/css/open-iconic/font/fonts/open-iconic.otf similarity index 100% rename from samples/ServerSideBlazor.Client/wwwroot/css/open-iconic/font/fonts/open-iconic.otf rename to samples/ComponentsApp.App/wwwroot/css/open-iconic/font/fonts/open-iconic.otf diff --git a/samples/ServerSideBlazor.Client/wwwroot/css/open-iconic/font/fonts/open-iconic.svg b/samples/ComponentsApp.App/wwwroot/css/open-iconic/font/fonts/open-iconic.svg similarity index 100% rename from samples/ServerSideBlazor.Client/wwwroot/css/open-iconic/font/fonts/open-iconic.svg rename to samples/ComponentsApp.App/wwwroot/css/open-iconic/font/fonts/open-iconic.svg diff --git a/samples/ServerSideBlazor.Client/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf b/samples/ComponentsApp.App/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf similarity index 100% rename from samples/ServerSideBlazor.Client/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf rename to samples/ComponentsApp.App/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf diff --git a/samples/ServerSideBlazor.Client/wwwroot/css/open-iconic/font/fonts/open-iconic.woff b/samples/ComponentsApp.App/wwwroot/css/open-iconic/font/fonts/open-iconic.woff similarity index 100% rename from samples/ServerSideBlazor.Client/wwwroot/css/open-iconic/font/fonts/open-iconic.woff rename to samples/ComponentsApp.App/wwwroot/css/open-iconic/font/fonts/open-iconic.woff diff --git a/samples/ServerSideBlazor.Client/wwwroot/css/site.css b/samples/ComponentsApp.App/wwwroot/css/site.css similarity index 100% rename from samples/ServerSideBlazor.Client/wwwroot/css/site.css rename to samples/ComponentsApp.App/wwwroot/css/site.css diff --git a/samples/ServerSideBlazor.Client/wwwroot/index.html b/samples/ComponentsApp.App/wwwroot/index.html similarity index 100% rename from samples/ServerSideBlazor.Client/wwwroot/index.html rename to samples/ComponentsApp.App/wwwroot/index.html diff --git a/samples/ServerSideBlazor.Server/ServerSideBlazor.Server.csproj b/samples/ComponentsApp.Server/ComponentsApp.Server.csproj similarity index 76% rename from samples/ServerSideBlazor.Server/ServerSideBlazor.Server.csproj rename to samples/ComponentsApp.Server/ComponentsApp.Server.csproj index 38d7a8c2..04c0b6e8 100644 --- a/samples/ServerSideBlazor.Server/ServerSideBlazor.Server.csproj +++ b/samples/ComponentsApp.Server/ComponentsApp.Server.csproj @@ -10,8 +10,8 @@ - - + + diff --git a/samples/ServerSideBlazor.Server/DefaultWeatherForecastService.cs b/samples/ComponentsApp.Server/DefaultWeatherForecastService.cs similarity index 97% rename from samples/ServerSideBlazor.Server/DefaultWeatherForecastService.cs rename to samples/ComponentsApp.Server/DefaultWeatherForecastService.cs index 79022109..2b6abae1 100644 --- a/samples/ServerSideBlazor.Server/DefaultWeatherForecastService.cs +++ b/samples/ComponentsApp.Server/DefaultWeatherForecastService.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Hosting; using Newtonsoft.Json; -namespace ServerSideBlazor.Server +namespace ComponentsApp.Server { public class DefaultWeatherForecastService : WeatherForecastService { diff --git a/samples/ServerSideBlazor.Server/Program.cs b/samples/ComponentsApp.Server/Program.cs similarity index 95% rename from samples/ServerSideBlazor.Server/Program.cs rename to samples/ComponentsApp.Server/Program.cs index 5fbc7df7..20209d27 100644 --- a/samples/ServerSideBlazor.Server/Program.cs +++ b/samples/ComponentsApp.Server/Program.cs @@ -4,7 +4,7 @@ using Microsoft.AspNetCore; using Microsoft.AspNetCore.Hosting; -namespace ServerSideBlazor.Server +namespace ComponentsApp.Server { public class Program { diff --git a/samples/ServerSideBlazor.Server/Startup.cs b/samples/ComponentsApp.Server/Startup.cs similarity index 85% rename from samples/ServerSideBlazor.Server/Startup.cs rename to samples/ComponentsApp.Server/Startup.cs index cb460b2d..f5cacbb4 100644 --- a/samples/ServerSideBlazor.Server/Startup.cs +++ b/samples/ComponentsApp.Server/Startup.cs @@ -4,16 +4,16 @@ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; -using ServerSideBlazor.Client; +using ComponentsApp.App; -namespace ServerSideBlazor.Server +namespace ComponentsApp.Server { public class Startup { public void ConfigureServices(IServiceCollection services) { // Adds the Server-Side Blazor services, and those registered by the client startup. - services.AddServerSideBlazor(); + services.AddServerSideBlazor(); // Since Blazor is running on the server, we can use an application service // to read the forecast data. @@ -28,7 +28,7 @@ namespace ServerSideBlazor.Server } // Use component registrations and static files from the client startup. - app.UseServerSideBlazor(); + app.UseServerSideBlazor(); } } } diff --git a/samples/ServerSideBlazor.Server/sample-data/weather.json b/samples/ComponentsApp.Server/sample-data/weather.json similarity index 100% rename from samples/ServerSideBlazor.Server/sample-data/weather.json rename to samples/ComponentsApp.Server/sample-data/weather.json diff --git a/samples/ServerSideBlazor.Client/_ViewImports.cshtml b/samples/ServerSideBlazor.Client/_ViewImports.cshtml deleted file mode 100644 index b747fdcd..00000000 --- a/samples/ServerSideBlazor.Client/_ViewImports.cshtml +++ /dev/null @@ -1,5 +0,0 @@ -@using System.Net.Http -@using Microsoft.AspNetCore.Blazor.Layouts -@using Microsoft.AspNetCore.Blazor.Routing -@using ServerSideBlazor.Client -@using ServerSideBlazor.Client.Shared diff --git a/src/Microsoft.AspNetCore.Components.Analyzers/ComponentParametersShouldNotBePublicAnalyzer.cs b/src/Microsoft.AspNetCore.Components.Analyzers/ComponentParametersShouldNotBePublicAnalyzer.cs index 0297461f..95a3881d 100644 --- a/src/Microsoft.AspNetCore.Components.Analyzers/ComponentParametersShouldNotBePublicAnalyzer.cs +++ b/src/Microsoft.AspNetCore.Components.Analyzers/ComponentParametersShouldNotBePublicAnalyzer.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNetCore.Blazor.Shared; +using Microsoft.AspNetCore.Components.Shared; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CSharp; using Microsoft.CodeAnalysis.CSharp.Syntax; @@ -9,7 +9,7 @@ using Microsoft.CodeAnalysis.Diagnostics; using System.Collections.Immutable; using System.Linq; -namespace Microsoft.AspNetCore.Blazor.Analyzers +namespace Microsoft.AspNetCore.Components.Analyzers { [DiagnosticAnalyzer(LanguageNames.CSharp)] public class ComponentParametersShouldNotBePublicAnalyzer : DiagnosticAnalyzer @@ -44,7 +44,7 @@ namespace Microsoft.AspNetCore.Blazor.Analyzers var parameterAttribute = declaration.AttributeLists .SelectMany(list => list.Attributes) - .Where(attr => semanticModel.GetTypeInfo(attr).Type?.ToDisplayString() == BlazorApi.ParameterAttribute.FullTypeName) + .Where(attr => semanticModel.GetTypeInfo(attr).Type?.ToDisplayString() == ComponentsApi.ParameterAttribute.FullTypeName) .FirstOrDefault(); if (parameterAttribute != null && IsPublic(declaration)) diff --git a/src/Microsoft.AspNetCore.Components.Analyzers/ComponentParametersShouldNotBePublicCodeFixProvider.cs b/src/Microsoft.AspNetCore.Components.Analyzers/ComponentParametersShouldNotBePublicCodeFixProvider.cs index 1226bd18..001e7615 100644 --- a/src/Microsoft.AspNetCore.Components.Analyzers/ComponentParametersShouldNotBePublicCodeFixProvider.cs +++ b/src/Microsoft.AspNetCore.Components.Analyzers/ComponentParametersShouldNotBePublicCodeFixProvider.cs @@ -11,7 +11,7 @@ using System.Composition; using System.Linq; using System.Threading.Tasks; -namespace Microsoft.AspNetCore.Blazor.Analyzers +namespace Microsoft.AspNetCore.Components.Analyzers { [ExportCodeFixProvider(LanguageNames.CSharp, Name = nameof(ComponentParametersShouldNotBePublicCodeFixProvider)), Shared] public class ComponentParametersShouldNotBePublicCodeFixProvider : CodeFixProvider diff --git a/src/Microsoft.AspNetCore.Components.Analyzers/Microsoft.AspNetCore.Blazor.Analyzers.csproj b/src/Microsoft.AspNetCore.Components.Analyzers/Microsoft.AspNetCore.Components.Analyzers.csproj similarity index 92% rename from src/Microsoft.AspNetCore.Components.Analyzers/Microsoft.AspNetCore.Blazor.Analyzers.csproj rename to src/Microsoft.AspNetCore.Components.Analyzers/Microsoft.AspNetCore.Components.Analyzers.csproj index f773578d..410461d2 100644 --- a/src/Microsoft.AspNetCore.Components.Analyzers/Microsoft.AspNetCore.Blazor.Analyzers.csproj +++ b/src/Microsoft.AspNetCore.Components.Analyzers/Microsoft.AspNetCore.Components.Analyzers.csproj @@ -30,7 +30,7 @@ - + diff --git a/src/Microsoft.AspNetCore.Components.Analyzers/Resources.Designer.cs b/src/Microsoft.AspNetCore.Components.Analyzers/Resources.Designer.cs index 32ae5ee7..6c62a981 100644 --- a/src/Microsoft.AspNetCore.Components.Analyzers/Resources.Designer.cs +++ b/src/Microsoft.AspNetCore.Components.Analyzers/Resources.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace Microsoft.AspNetCore.Blazor.Analyzers { +namespace Microsoft.AspNetCore.Components.Analyzers { using System; using System.Reflection; @@ -40,7 +40,7 @@ namespace Microsoft.AspNetCore.Blazor.Analyzers { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.AspNetCore.Blazor.Analyzers.Resources", typeof(Resources).GetTypeInfo().Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.AspNetCore.Components.Analyzers.Resources", typeof(Resources).GetTypeInfo().Assembly); resourceMan = temp; } return resourceMan; diff --git a/src/Microsoft.AspNetCore.Components.Browser.JS/Microsoft.AspNetCore.Blazor.Browser.JS.csproj b/src/Microsoft.AspNetCore.Components.Browser.JS/Microsoft.AspNetCore.Components.Browser.JS.csproj similarity index 100% rename from src/Microsoft.AspNetCore.Components.Browser.JS/Microsoft.AspNetCore.Blazor.Browser.JS.csproj rename to src/Microsoft.AspNetCore.Components.Browser.JS/Microsoft.AspNetCore.Components.Browser.JS.csproj diff --git a/src/Microsoft.AspNetCore.Components.Browser.JS/src/BootCommon.ts b/src/Microsoft.AspNetCore.Components.Browser.JS/src/BootCommon.ts index 543b3573..ae45c574 100644 --- a/src/Microsoft.AspNetCore.Components.Browser.JS/src/BootCommon.ts +++ b/src/Microsoft.AspNetCore.Components.Browser.JS/src/BootCommon.ts @@ -28,7 +28,7 @@ function loadResourceFromElement(element: HTMLElement) { }); } -// Keep in sync with BootJsonData in Microsoft.AspNetCore.Blazor.Build +// Keep in sync with BootJsonData in Microsoft.AspNetCore.Components.Build interface BootJsonData { main: string; entryPoint: string; diff --git a/src/Microsoft.AspNetCore.Components.Browser.JS/src/Rendering/BrowserRenderer.ts b/src/Microsoft.AspNetCore.Components.Browser.JS/src/Rendering/BrowserRenderer.ts index 5015384e..37443238 100644 --- a/src/Microsoft.AspNetCore.Components.Browser.JS/src/Rendering/BrowserRenderer.ts +++ b/src/Microsoft.AspNetCore.Components.Browser.JS/src/Rendering/BrowserRenderer.ts @@ -368,7 +368,7 @@ function raiseEvent(event: Event, browserRendererId: number, componentId: number }; return DotNet.invokeMethodAsync( - 'Microsoft.AspNetCore.Blazor.Browser', + 'Microsoft.AspNetCore.Components.Browser', 'DispatchEvent', eventDescriptor, JSON.stringify(eventArgs.data)); diff --git a/src/Microsoft.AspNetCore.Components.Browser.JS/src/Services/Http.ts b/src/Microsoft.AspNetCore.Components.Browser.JS/src/Services/Http.ts index 610b2448..cdfa6e4a 100644 --- a/src/Microsoft.AspNetCore.Components.Browser.JS/src/Services/Http.ts +++ b/src/Microsoft.AspNetCore.Components.Browser.JS/src/Services/Http.ts @@ -1,6 +1,6 @@ import { platform } from '../Environment'; import { MethodHandle, System_String, System_Array } from '../Platform/Platform'; -const httpClientAssembly = 'Microsoft.AspNetCore.Blazor.Browser'; +const httpClientAssembly = 'Microsoft.AspNetCore.Components.Browser'; const httpClientNamespace = `${httpClientAssembly}.Http`; const httpClientTypeName = 'BrowserHttpMessageHandler'; const httpClientFullTypeName = `${httpClientNamespace}.${httpClientTypeName}`; diff --git a/src/Microsoft.AspNetCore.Components.Browser/Builder/BlazorApplicationBuilderExtensions.cs b/src/Microsoft.AspNetCore.Components.Browser/Builder/BlazorApplicationBuilderExtensions.cs index 415abcba..d1b0e627 100644 --- a/src/Microsoft.AspNetCore.Components.Browser/Builder/BlazorApplicationBuilderExtensions.cs +++ b/src/Microsoft.AspNetCore.Components.Browser/Builder/BlazorApplicationBuilderExtensions.cs @@ -1,9 +1,9 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; -namespace Microsoft.AspNetCore.Blazor.Builder +namespace Microsoft.AspNetCore.Components.Builder { /// /// Provides extension methods for . diff --git a/src/Microsoft.AspNetCore.Components.Browser/Builder/IBlazorApplicationBuilder.cs b/src/Microsoft.AspNetCore.Components.Browser/Builder/IBlazorApplicationBuilder.cs index 3a4c24bd..ff14af07 100644 --- a/src/Microsoft.AspNetCore.Components.Browser/Builder/IBlazorApplicationBuilder.cs +++ b/src/Microsoft.AspNetCore.Components.Browser/Builder/IBlazorApplicationBuilder.cs @@ -2,9 +2,9 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; -namespace Microsoft.AspNetCore.Blazor.Builder +namespace Microsoft.AspNetCore.Components.Builder { /// /// A builder for constructing a Blazor application. diff --git a/src/Microsoft.AspNetCore.Components.Browser/Builder/WebAssemblyBlazorApplicationBuilder.cs b/src/Microsoft.AspNetCore.Components.Browser/Builder/WebAssemblyBlazorApplicationBuilder.cs index 35557007..95e8190f 100644 --- a/src/Microsoft.AspNetCore.Components.Browser/Builder/WebAssemblyBlazorApplicationBuilder.cs +++ b/src/Microsoft.AspNetCore.Components.Browser/Builder/WebAssemblyBlazorApplicationBuilder.cs @@ -3,10 +3,10 @@ using System; using System.Collections.Generic; -using Microsoft.AspNetCore.Blazor.Browser.Rendering; -using Microsoft.AspNetCore.Blazor.Builder; +using Microsoft.AspNetCore.Components.Browser.Rendering; +using Microsoft.AspNetCore.Components.Builder; -namespace Microsoft.AspNetCore.Blazor.Hosting +namespace Microsoft.AspNetCore.Components.Hosting { internal class WebAssemblyBlazorApplicationBuilder : IBlazorApplicationBuilder { diff --git a/src/Microsoft.AspNetCore.Components.Browser/Hosting/BlazorWebAssemblyHost.cs b/src/Microsoft.AspNetCore.Components.Browser/Hosting/BlazorWebAssemblyHost.cs index 224b731c..893485f2 100644 --- a/src/Microsoft.AspNetCore.Components.Browser/Hosting/BlazorWebAssemblyHost.cs +++ b/src/Microsoft.AspNetCore.Components.Browser/Hosting/BlazorWebAssemblyHost.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -namespace Microsoft.AspNetCore.Blazor.Hosting +namespace Microsoft.AspNetCore.Components.Hosting { /// /// Used to to create instances a Blazor host builder for a Browser application. diff --git a/src/Microsoft.AspNetCore.Components.Browser/Hosting/ConventionBasedStartup.cs b/src/Microsoft.AspNetCore.Components.Browser/Hosting/ConventionBasedStartup.cs index ee316fcd..e8e7d791 100644 --- a/src/Microsoft.AspNetCore.Components.Browser/Hosting/ConventionBasedStartup.cs +++ b/src/Microsoft.AspNetCore.Components.Browser/Hosting/ConventionBasedStartup.cs @@ -6,10 +6,10 @@ using System.Diagnostics; using System.Linq; using System.Reflection; using System.Runtime.ExceptionServices; -using Microsoft.AspNetCore.Blazor.Builder; +using Microsoft.AspNetCore.Components.Builder; using Microsoft.Extensions.DependencyInjection; -namespace Microsoft.AspNetCore.Blazor.Hosting +namespace Microsoft.AspNetCore.Components.Hosting { // Keeping this simple for now to focus on predictable and reasonable behaviors. // Startup in WebHost supports lots of things we don't yet support, and some we diff --git a/src/Microsoft.AspNetCore.Components.Browser/Hosting/IBlazorStartup.cs b/src/Microsoft.AspNetCore.Components.Browser/Hosting/IBlazorStartup.cs index ab9cabca..7277c727 100644 --- a/src/Microsoft.AspNetCore.Components.Browser/Hosting/IBlazorStartup.cs +++ b/src/Microsoft.AspNetCore.Components.Browser/Hosting/IBlazorStartup.cs @@ -2,10 +2,10 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNetCore.Blazor.Builder; +using Microsoft.AspNetCore.Components.Builder; using Microsoft.Extensions.DependencyInjection; -namespace Microsoft.AspNetCore.Blazor.Hosting +namespace Microsoft.AspNetCore.Components.Hosting { internal interface IBlazorStartup { diff --git a/src/Microsoft.AspNetCore.Components.Browser/Hosting/IWebAssemblyHost.cs b/src/Microsoft.AspNetCore.Components.Browser/Hosting/IWebAssemblyHost.cs index 8f21f934..5a5a452a 100644 --- a/src/Microsoft.AspNetCore.Components.Browser/Hosting/IWebAssemblyHost.cs +++ b/src/Microsoft.AspNetCore.Components.Browser/Hosting/IWebAssemblyHost.cs @@ -5,7 +5,7 @@ using System; using System.Threading; using System.Threading.Tasks; -namespace Microsoft.AspNetCore.Blazor.Hosting +namespace Microsoft.AspNetCore.Components.Hosting { /// /// A program abstraction. diff --git a/src/Microsoft.AspNetCore.Components.Browser/Hosting/IWebAssemblyHostBuilder.cs b/src/Microsoft.AspNetCore.Components.Browser/Hosting/IWebAssemblyHostBuilder.cs index 4b9b8cff..6ede4fa6 100644 --- a/src/Microsoft.AspNetCore.Components.Browser/Hosting/IWebAssemblyHostBuilder.cs +++ b/src/Microsoft.AspNetCore.Components.Browser/Hosting/IWebAssemblyHostBuilder.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; using Microsoft.Extensions.DependencyInjection; -namespace Microsoft.AspNetCore.Blazor.Hosting +namespace Microsoft.AspNetCore.Components.Hosting { /// /// Abstraction for configuring a Blazor browser-based application. diff --git a/src/Microsoft.AspNetCore.Components.Browser/Hosting/WebAssemblyHost.cs b/src/Microsoft.AspNetCore.Components.Browser/Hosting/WebAssemblyHost.cs index 234d10b5..80c2cce6 100644 --- a/src/Microsoft.AspNetCore.Components.Browser/Hosting/WebAssemblyHost.cs +++ b/src/Microsoft.AspNetCore.Components.Browser/Hosting/WebAssemblyHost.cs @@ -6,12 +6,12 @@ using System.Net.Http; using System.Reflection; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNetCore.Blazor.Browser.Http; -using Microsoft.AspNetCore.Blazor.Browser.Rendering; +using Microsoft.AspNetCore.Components.Browser.Http; +using Microsoft.AspNetCore.Components.Browser.Rendering; using Microsoft.Extensions.DependencyInjection; using Microsoft.JSInterop; -namespace Microsoft.AspNetCore.Blazor.Hosting +namespace Microsoft.AspNetCore.Components.Hosting { internal class WebAssemblyHost : IWebAssemblyHost { diff --git a/src/Microsoft.AspNetCore.Components.Browser/Hosting/WebAssemblyHostBuilder.cs b/src/Microsoft.AspNetCore.Components.Browser/Hosting/WebAssemblyHostBuilder.cs index 3ea908ec..4e63b864 100644 --- a/src/Microsoft.AspNetCore.Components.Browser/Hosting/WebAssemblyHostBuilder.cs +++ b/src/Microsoft.AspNetCore.Components.Browser/Hosting/WebAssemblyHostBuilder.cs @@ -4,13 +4,13 @@ using System; using System.Collections.Generic; using System.Net.Http; -using Microsoft.AspNetCore.Blazor.Browser.Services; -using Microsoft.AspNetCore.Blazor.Services; +using Microsoft.AspNetCore.Components.Browser.Services; +using Microsoft.AspNetCore.Components.Services; using Microsoft.Extensions.DependencyInjection; using Microsoft.JSInterop; using Mono.WebAssembly.Interop; -namespace Microsoft.AspNetCore.Blazor.Hosting +namespace Microsoft.AspNetCore.Components.Hosting { // // This code was taken virtually as-is from the Microsoft.Extensions.Hosting project in aspnet/Hosting and then diff --git a/src/Microsoft.AspNetCore.Components.Browser/Hosting/WebAssemblyHostBuilderContext.cs b/src/Microsoft.AspNetCore.Components.Browser/Hosting/WebAssemblyHostBuilderContext.cs index c7b7dd6f..c758a905 100644 --- a/src/Microsoft.AspNetCore.Components.Browser/Hosting/WebAssemblyHostBuilderContext.cs +++ b/src/Microsoft.AspNetCore.Components.Browser/Hosting/WebAssemblyHostBuilderContext.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; -namespace Microsoft.AspNetCore.Blazor.Hosting +namespace Microsoft.AspNetCore.Components.Hosting { /// /// Context containing the common services on the . Some properties may be null until set by the . diff --git a/src/Microsoft.AspNetCore.Components.Browser/Hosting/WebAssemblyHostBuilderExtensions.cs b/src/Microsoft.AspNetCore.Components.Browser/Hosting/WebAssemblyHostBuilderExtensions.cs index 9b03c097..e6338192 100644 --- a/src/Microsoft.AspNetCore.Components.Browser/Hosting/WebAssemblyHostBuilderExtensions.cs +++ b/src/Microsoft.AspNetCore.Components.Browser/Hosting/WebAssemblyHostBuilderExtensions.cs @@ -4,7 +4,7 @@ using System; using Microsoft.Extensions.DependencyInjection; -namespace Microsoft.AspNetCore.Blazor.Hosting +namespace Microsoft.AspNetCore.Components.Hosting { /// /// Provides Blazor-specific support for . diff --git a/src/Microsoft.AspNetCore.Components.Browser/Hosting/WebAssemblyHostExtensions.cs b/src/Microsoft.AspNetCore.Components.Browser/Hosting/WebAssemblyHostExtensions.cs index 988ea88a..7a55fbd1 100644 --- a/src/Microsoft.AspNetCore.Components.Browser/Hosting/WebAssemblyHostExtensions.cs +++ b/src/Microsoft.AspNetCore.Components.Browser/Hosting/WebAssemblyHostExtensions.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -namespace Microsoft.AspNetCore.Blazor.Hosting +namespace Microsoft.AspNetCore.Components.Hosting { /// /// Extension methods for . diff --git a/src/Microsoft.AspNetCore.Components.Browser/Http/BrowserHttpMessageHandler.cs b/src/Microsoft.AspNetCore.Components.Browser/Http/BrowserHttpMessageHandler.cs index 8f5ad493..edcb5044 100644 --- a/src/Microsoft.AspNetCore.Components.Browser/Http/BrowserHttpMessageHandler.cs +++ b/src/Microsoft.AspNetCore.Components.Browser/Http/BrowserHttpMessageHandler.cs @@ -11,7 +11,7 @@ using System.Net.Http; using System.Threading; using System.Threading.Tasks; -namespace Microsoft.AspNetCore.Blazor.Browser.Http +namespace Microsoft.AspNetCore.Components.Browser.Http { /// /// A browser-compatible implementation of diff --git a/src/Microsoft.AspNetCore.Components.Browser/Http/FetchCredentialsOption.cs b/src/Microsoft.AspNetCore.Components.Browser/Http/FetchCredentialsOption.cs index 1a5d9585..63d5f4dd 100644 --- a/src/Microsoft.AspNetCore.Components.Browser/Http/FetchCredentialsOption.cs +++ b/src/Microsoft.AspNetCore.Components.Browser/Http/FetchCredentialsOption.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -namespace Microsoft.AspNetCore.Blazor.Browser.Http +namespace Microsoft.AspNetCore.Components.Browser.Http { /// /// Specifies a value for the 'credentials' option on outbound HTTP requests. diff --git a/src/Microsoft.AspNetCore.Components.Browser/Microsoft.AspNetCore.Blazor.Browser.csproj b/src/Microsoft.AspNetCore.Components.Browser/Microsoft.AspNetCore.Components.Browser.csproj similarity index 91% rename from src/Microsoft.AspNetCore.Components.Browser/Microsoft.AspNetCore.Blazor.Browser.csproj rename to src/Microsoft.AspNetCore.Components.Browser/Microsoft.AspNetCore.Components.Browser.csproj index ee2db15d..36f517dc 100644 --- a/src/Microsoft.AspNetCore.Components.Browser/Microsoft.AspNetCore.Blazor.Browser.csproj +++ b/src/Microsoft.AspNetCore.Components.Browser/Microsoft.AspNetCore.Components.Browser.csproj @@ -9,8 +9,8 @@ - + diff --git a/src/Microsoft.AspNetCore.Components.Browser/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.Components.Browser/Properties/AssemblyInfo.cs index f2835c09..20bc7680 100644 --- a/src/Microsoft.AspNetCore.Components.Browser/Properties/AssemblyInfo.cs +++ b/src/Microsoft.AspNetCore.Components.Browser/Properties/AssemblyInfo.cs @@ -1,3 +1,3 @@ using System.Runtime.CompilerServices; -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Blazor.Browser.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Components.Browser.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] diff --git a/src/Microsoft.AspNetCore.Components.Browser/Rendering/BrowserRenderer.cs b/src/Microsoft.AspNetCore.Components.Browser/Rendering/BrowserRenderer.cs index fb6458ce..8e5f734e 100644 --- a/src/Microsoft.AspNetCore.Components.Browser/Rendering/BrowserRenderer.cs +++ b/src/Microsoft.AspNetCore.Components.Browser/Rendering/BrowserRenderer.cs @@ -1,15 +1,14 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNetCore.Blazor.Browser.Services; -using Microsoft.AspNetCore.Blazor.Components; -using Microsoft.AspNetCore.Blazor.Rendering; +using Microsoft.AspNetCore.Components.Browser.Services; +using Microsoft.AspNetCore.Components.Rendering; using Microsoft.JSInterop; using Mono.WebAssembly.Interop; using System; using System.Threading.Tasks; -namespace Microsoft.AspNetCore.Blazor.Browser.Rendering +namespace Microsoft.AspNetCore.Components.Browser.Rendering { /// /// Provides mechanisms for rendering instances in a diff --git a/src/Microsoft.AspNetCore.Components.Browser/Rendering/BrowserRendererEventDispatcher.cs b/src/Microsoft.AspNetCore.Components.Browser/Rendering/BrowserRendererEventDispatcher.cs index ac6604db..73b680bc 100644 --- a/src/Microsoft.AspNetCore.Components.Browser/Rendering/BrowserRendererEventDispatcher.cs +++ b/src/Microsoft.AspNetCore.Components.Browser/Rendering/BrowserRendererEventDispatcher.cs @@ -1,11 +1,12 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNetCore.Blazor.Rendering; +using Microsoft.AspNetCore.Components.Rendering; +using Microsoft.AspNetCore.Components; using Microsoft.JSInterop; using System; -namespace Microsoft.AspNetCore.Blazor.Browser.Rendering +namespace Microsoft.AspNetCore.Components.Browser.Rendering { /// /// Provides mechanisms for dispatching events to components in a . diff --git a/src/Microsoft.AspNetCore.Components.Browser/Rendering/RendererRegistry.cs b/src/Microsoft.AspNetCore.Components.Browser/Rendering/RendererRegistry.cs index 18e76770..23b25dd8 100644 --- a/src/Microsoft.AspNetCore.Components.Browser/Rendering/RendererRegistry.cs +++ b/src/Microsoft.AspNetCore.Components.Browser/Rendering/RendererRegistry.cs @@ -1,10 +1,11 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +using Microsoft.AspNetCore.Components.Rendering; using System.Collections.Generic; using System.Threading; -namespace Microsoft.AspNetCore.Blazor.Rendering +namespace Microsoft.AspNetCore.Components.Rendering { // Provides mechanisms for locating instances // by ID. This is used when receiving incoming events. It also implicitly diff --git a/src/Microsoft.AspNetCore.Components.Browser/Services/ActivateMonoJSRuntime.cs b/src/Microsoft.AspNetCore.Components.Browser/Services/ActivateMonoJSRuntime.cs index fe0172d6..d5b2cbb9 100644 --- a/src/Microsoft.AspNetCore.Components.Browser/Services/ActivateMonoJSRuntime.cs +++ b/src/Microsoft.AspNetCore.Components.Browser/Services/ActivateMonoJSRuntime.cs @@ -4,7 +4,7 @@ using Microsoft.JSInterop; using Mono.WebAssembly.Interop; -namespace Microsoft.AspNetCore.Blazor.Browser.Services +namespace Microsoft.AspNetCore.Components.Browser.Services { /// /// Temporary mechanism for registering the Mono JS runtime. Developers do not need to diff --git a/src/Microsoft.AspNetCore.Components.Browser/Services/BrowserServiceProvider.cs b/src/Microsoft.AspNetCore.Components.Browser/Services/BrowserServiceProvider.cs index d924c763..115bbb01 100644 --- a/src/Microsoft.AspNetCore.Components.Browser/Services/BrowserServiceProvider.cs +++ b/src/Microsoft.AspNetCore.Components.Browser/Services/BrowserServiceProvider.cs @@ -3,11 +3,11 @@ using System; using System.Net.Http; -using Microsoft.AspNetCore.Blazor.Browser.Http; -using Microsoft.AspNetCore.Blazor.Services; +using Microsoft.AspNetCore.Components.Browser.Http; +using Microsoft.AspNetCore.Components.Services; using Microsoft.Extensions.DependencyInjection; -namespace Microsoft.AspNetCore.Blazor.Browser.Services +namespace Microsoft.AspNetCore.Components.Browser.Services { /// /// An implementation of configured with diff --git a/src/Microsoft.AspNetCore.Components.Browser/Services/BrowserUriHelper.cs b/src/Microsoft.AspNetCore.Components.Browser/Services/BrowserUriHelper.cs index ff993b14..8cd50f9c 100644 --- a/src/Microsoft.AspNetCore.Components.Browser/Services/BrowserUriHelper.cs +++ b/src/Microsoft.AspNetCore.Components.Browser/Services/BrowserUriHelper.cs @@ -2,11 +2,11 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNetCore.Blazor.Services; +using Microsoft.AspNetCore.Components.Services; using Microsoft.JSInterop; -using Interop = Microsoft.AspNetCore.Blazor.Browser.Services.BrowserUriHelperInterop; +using Interop = Microsoft.AspNetCore.Components.Browser.Services.BrowserUriHelperInterop; -namespace Microsoft.AspNetCore.Blazor.Browser.Services +namespace Microsoft.AspNetCore.Components.Browser.Services { /// /// Default browser implementation of . diff --git a/src/Microsoft.AspNetCore.Components.Browser/Services/BrowserUriHelperInterop.cs b/src/Microsoft.AspNetCore.Components.Browser/Services/BrowserUriHelperInterop.cs index 6b07cb50..d36e1290 100644 --- a/src/Microsoft.AspNetCore.Components.Browser/Services/BrowserUriHelperInterop.cs +++ b/src/Microsoft.AspNetCore.Components.Browser/Services/BrowserUriHelperInterop.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -namespace Microsoft.AspNetCore.Blazor.Browser.Services +namespace Microsoft.AspNetCore.Components.Browser.Services { // Shared interop constants internal static class BrowserUriHelperInterop diff --git a/src/Microsoft.AspNetCore.Components.Build/Cli/Commands/ResolveRuntimeDependenciesCommand.cs b/src/Microsoft.AspNetCore.Components.Build/Cli/Commands/ResolveRuntimeDependenciesCommand.cs index e749713c..288f6f8f 100644 --- a/src/Microsoft.AspNetCore.Components.Build/Cli/Commands/ResolveRuntimeDependenciesCommand.cs +++ b/src/Microsoft.AspNetCore.Components.Build/Cli/Commands/ResolveRuntimeDependenciesCommand.cs @@ -5,7 +5,7 @@ using System; using System.IO; using Microsoft.Extensions.CommandLineUtils; -namespace Microsoft.AspNetCore.Blazor.Build.Cli.Commands +namespace Microsoft.AspNetCore.Components.Build.Cli.Commands { class ResolveRuntimeDependenciesCommand { diff --git a/src/Microsoft.AspNetCore.Components.Build/Cli/Commands/WriteBootJsonCommand.cs b/src/Microsoft.AspNetCore.Components.Build/Cli/Commands/WriteBootJsonCommand.cs index 275f4e75..7abee7eb 100644 --- a/src/Microsoft.AspNetCore.Components.Build/Cli/Commands/WriteBootJsonCommand.cs +++ b/src/Microsoft.AspNetCore.Components.Build/Cli/Commands/WriteBootJsonCommand.cs @@ -5,7 +5,7 @@ using Microsoft.Extensions.CommandLineUtils; using System; using System.IO; -namespace Microsoft.AspNetCore.Blazor.Build.Cli.Commands +namespace Microsoft.AspNetCore.Components.Build.Cli.Commands { internal class WriteBootJsonCommand { diff --git a/src/Microsoft.AspNetCore.Components.Build/Cli/Program.cs b/src/Microsoft.AspNetCore.Components.Build/Cli/Program.cs index 1eac086f..59dd11cd 100644 --- a/src/Microsoft.AspNetCore.Components.Build/Cli/Program.cs +++ b/src/Microsoft.AspNetCore.Components.Build/Cli/Program.cs @@ -1,10 +1,10 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNetCore.Blazor.Build.Cli.Commands; +using Microsoft.AspNetCore.Components.Build.Cli.Commands; using Microsoft.Extensions.CommandLineUtils; -namespace Microsoft.AspNetCore.Blazor.Build +namespace Microsoft.AspNetCore.Components.Build { static class Program { @@ -12,7 +12,7 @@ namespace Microsoft.AspNetCore.Blazor.Build { var app = new CommandLineApplication { - Name = "Microsoft.AspNetCore.Blazor.Build" + Name = "Microsoft.AspNetCore.Components.Build" }; app.HelpOption("-?|-h|--help"); diff --git a/src/Microsoft.AspNetCore.Components.Build/Core/BootJsonWriter.cs b/src/Microsoft.AspNetCore.Components.Build/Core/BootJsonWriter.cs index 50a09fa8..d26e942b 100644 --- a/src/Microsoft.AspNetCore.Components.Build/Core/BootJsonWriter.cs +++ b/src/Microsoft.AspNetCore.Components.Build/Core/BootJsonWriter.cs @@ -8,7 +8,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; -namespace Microsoft.AspNetCore.Blazor.Build +namespace Microsoft.AspNetCore.Components.Build { internal class BootJsonWriter { diff --git a/src/Microsoft.AspNetCore.Components.Build/Core/EmbeddedResources/EmbeddedResourceInfo.cs b/src/Microsoft.AspNetCore.Components.Build/Core/EmbeddedResources/EmbeddedResourceInfo.cs index 97331537..012ac016 100644 --- a/src/Microsoft.AspNetCore.Components.Build/Core/EmbeddedResources/EmbeddedResourceInfo.cs +++ b/src/Microsoft.AspNetCore.Components.Build/Core/EmbeddedResources/EmbeddedResourceInfo.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -namespace Microsoft.AspNetCore.Blazor.Build +namespace Microsoft.AspNetCore.Components.Build { internal class EmbeddedResourceInfo { diff --git a/src/Microsoft.AspNetCore.Components.Build/Core/EmbeddedResources/EmbeddedResourceKind.cs b/src/Microsoft.AspNetCore.Components.Build/Core/EmbeddedResources/EmbeddedResourceKind.cs index caf322ee..3fb349fa 100644 --- a/src/Microsoft.AspNetCore.Components.Build/Core/EmbeddedResources/EmbeddedResourceKind.cs +++ b/src/Microsoft.AspNetCore.Components.Build/Core/EmbeddedResources/EmbeddedResourceKind.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -namespace Microsoft.AspNetCore.Blazor.Build +namespace Microsoft.AspNetCore.Components.Build { internal enum EmbeddedResourceKind { diff --git a/src/Microsoft.AspNetCore.Components.Build/Core/EmbeddedResources/EmbeddedResourcesProcessor.cs b/src/Microsoft.AspNetCore.Components.Build/Core/EmbeddedResources/EmbeddedResourcesProcessor.cs index 21a28597..22fbdc2a 100644 --- a/src/Microsoft.AspNetCore.Components.Build/Core/EmbeddedResources/EmbeddedResourcesProcessor.cs +++ b/src/Microsoft.AspNetCore.Components.Build/Core/EmbeddedResources/EmbeddedResourcesProcessor.cs @@ -7,7 +7,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; -namespace Microsoft.AspNetCore.Blazor.Build +namespace Microsoft.AspNetCore.Components.Build { internal class EmbeddedResourcesProcessor { diff --git a/src/Microsoft.AspNetCore.Components.Build/Core/RuntimeDependenciesResolver.cs b/src/Microsoft.AspNetCore.Components.Build/Core/RuntimeDependenciesResolver.cs index 18637753..daa7e7f2 100644 --- a/src/Microsoft.AspNetCore.Components.Build/Core/RuntimeDependenciesResolver.cs +++ b/src/Microsoft.AspNetCore.Components.Build/Core/RuntimeDependenciesResolver.cs @@ -8,7 +8,7 @@ using System.IO; using System.Linq; using Mono.Cecil; -namespace Microsoft.AspNetCore.Blazor.Build +namespace Microsoft.AspNetCore.Components.Build { internal class RuntimeDependenciesResolver { diff --git a/src/Microsoft.AspNetCore.Components.Build/Microsoft.AspNetCore.Blazor.Build.csproj b/src/Microsoft.AspNetCore.Components.Build/Microsoft.AspNetCore.Components.Build.csproj similarity index 82% rename from src/Microsoft.AspNetCore.Components.Build/Microsoft.AspNetCore.Blazor.Build.csproj rename to src/Microsoft.AspNetCore.Components.Build/Microsoft.AspNetCore.Components.Build.csproj index 7a80697e..41b12945 100644 --- a/src/Microsoft.AspNetCore.Components.Build/Microsoft.AspNetCore.Blazor.Build.csproj +++ b/src/Microsoft.AspNetCore.Components.Build/Microsoft.AspNetCore.Components.Build.csproj @@ -9,7 +9,7 @@ true - Microsoft.AspNetCore.Blazor.Build.nuspec + Microsoft.AspNetCore.Components.Build.nuspec $(OutputPath)publish\ $(IntermediatePackDir)$(TargetFramework)/ @@ -31,17 +31,17 @@ - + PreserveNewest false - - - - + + + + diff --git a/src/Microsoft.AspNetCore.Components.Build/Microsoft.AspNetCore.Blazor.Build.nuspec b/src/Microsoft.AspNetCore.Components.Build/Microsoft.AspNetCore.Components.Build.nuspec similarity index 80% rename from src/Microsoft.AspNetCore.Components.Build/Microsoft.AspNetCore.Blazor.Build.nuspec rename to src/Microsoft.AspNetCore.Components.Build/Microsoft.AspNetCore.Components.Build.nuspec index 08c6f7ac..17a4164c 100644 --- a/src/Microsoft.AspNetCore.Components.Build/Microsoft.AspNetCore.Blazor.Build.nuspec +++ b/src/Microsoft.AspNetCore.Components.Build/Microsoft.AspNetCore.Components.Build.nuspec @@ -1,7 +1,7 @@ - Microsoft.AspNetCore.Blazor.Build + Microsoft.AspNetCore.Components.Build $version$ Microsoft © Microsoft Corporation. All rights reserved. @@ -11,11 +11,11 @@ - + - + diff --git a/src/Microsoft.AspNetCore.Components.Build/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.Components.Build/Properties/AssemblyInfo.cs index 65917c9a..106dba0b 100644 --- a/src/Microsoft.AspNetCore.Components.Build/Properties/AssemblyInfo.cs +++ b/src/Microsoft.AspNetCore.Components.Build/Properties/AssemblyInfo.cs @@ -1,3 +1,3 @@ using System.Runtime.CompilerServices; -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Blazor.Build.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Components.Build.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] diff --git a/src/Microsoft.AspNetCore.Components.Build/ReferenceFromSource.props b/src/Microsoft.AspNetCore.Components.Build/ReferenceFromSource.props index 01c8e109..31bf95c4 100644 --- a/src/Microsoft.AspNetCore.Components.Build/ReferenceFromSource.props +++ b/src/Microsoft.AspNetCore.Components.Build/ReferenceFromSource.props @@ -2,7 +2,7 @@ - + - + diff --git a/src/Microsoft.AspNetCore.Components.Build/targets/All.targets b/src/Microsoft.AspNetCore.Components.Build/targets/All.targets index c68a3526..481480df 100644 --- a/src/Microsoft.AspNetCore.Components.Build/targets/All.targets +++ b/src/Microsoft.AspNetCore.Components.Build/targets/All.targets @@ -7,7 +7,7 @@ $(MSBuildThisFileDirectory)../tools/ - dotnet "$(BlazorToolsDir)Microsoft.AspNetCore.Blazor.Build.dll" + dotnet "$(BlazorToolsDir)Microsoft.AspNetCore.Components.Build.dll" true diff --git a/src/Microsoft.AspNetCore.Components.Build/targets/RazorCompilation.targets b/src/Microsoft.AspNetCore.Components.Build/targets/RazorCompilation.targets index 0b2e7b98..7d06e765 100644 --- a/src/Microsoft.AspNetCore.Components.Build/targets/RazorCompilation.targets +++ b/src/Microsoft.AspNetCore.Components.Build/targets/RazorCompilation.targets @@ -9,7 +9,7 @@ <_AngleSharpAssemblyPath>$(BlazorToolsDir)AngleSharp.dll - <_BlazorExtensionAssemblyPath>$(BlazorToolsDir)Microsoft.AspNetCore.Blazor.Razor.Extensions.dll + <_BlazorExtensionAssemblyPath>$(BlazorToolsDir)Microsoft.AspNetCore.Components.Razor.Extensions.dll false @@ -50,7 +50,7 @@ $(_AngleSharpAssemblyPath) - Microsoft.AspNetCore.Blazor.Razor.Extensions + Microsoft.AspNetCore.Components.Razor.Extensions $(_BlazorExtensionAssemblyPath) diff --git a/src/Microsoft.AspNetCore.Components.Razor.Extensions/BindLoweringPass.cs b/src/Microsoft.AspNetCore.Components.Razor.Extensions/BindLoweringPass.cs index ddd1d2c5..92c8661e 100644 --- a/src/Microsoft.AspNetCore.Components.Razor.Extensions/BindLoweringPass.cs +++ b/src/Microsoft.AspNetCore.Components.Razor.Extensions/BindLoweringPass.cs @@ -3,12 +3,12 @@ using System.Collections.Generic; using System.Linq; -using Microsoft.AspNetCore.Blazor.Shared; +using Microsoft.AspNetCore.Components.Shared; using Microsoft.AspNetCore.Razor.Language; using Microsoft.AspNetCore.Razor.Language.Extensions; using Microsoft.AspNetCore.Razor.Language.Intermediate; -namespace Microsoft.AspNetCore.Blazor.Razor +namespace Microsoft.AspNetCore.Components.Razor { internal class BindLoweringPass : IntermediateNodePassBase, IRazorOptimizationPass { @@ -209,7 +209,7 @@ namespace Microsoft.AspNetCore.Blazor.Razor var valueExpressionTokens = new List(); valueExpressionTokens.Add(new IntermediateToken() { - Content = $"{BlazorApi.BindMethods.GetValue}(", + Content = $"{ComponentsApi.BindMethods.GetValue}(", Kind = TokenKind.CSharp }); valueExpressionTokens.Add(original); @@ -245,11 +245,11 @@ namespace Microsoft.AspNetCore.Blazor.Razor string changeExpressionContent = null; if (changeAttribute == null && format == null) { - changeExpressionContent = $"{BlazorApi.BindMethods.SetValueHandler}(__value => {original.Content} = __value, {original.Content})"; + changeExpressionContent = $"{ComponentsApi.BindMethods.SetValueHandler}(__value => {original.Content} = __value, {original.Content})"; } else if (changeAttribute == null && format != null) { - changeExpressionContent = $"{BlazorApi.BindMethods.SetValueHandler}(__value => {original.Content} = __value, {original.Content}, {format.Content})"; + changeExpressionContent = $"{ComponentsApi.BindMethods.SetValueHandler}(__value => {original.Content} = __value, {original.Content}, {format.Content})"; } else { diff --git a/src/Microsoft.AspNetCore.Components.Razor.Extensions/BindTagHelperDescriptorProvider.cs b/src/Microsoft.AspNetCore.Components.Razor.Extensions/BindTagHelperDescriptorProvider.cs index e7d8634c..c81f3c09 100644 --- a/src/Microsoft.AspNetCore.Components.Razor.Extensions/BindTagHelperDescriptorProvider.cs +++ b/src/Microsoft.AspNetCore.Components.Razor.Extensions/BindTagHelperDescriptorProvider.cs @@ -4,12 +4,12 @@ using System; using System.Collections.Generic; using System.Linq; -using Microsoft.AspNetCore.Blazor.Shared; +using Microsoft.AspNetCore.Components.Shared; using Microsoft.AspNetCore.Razor.Language; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.Razor; -namespace Microsoft.AspNetCore.Blazor.Razor +namespace Microsoft.AspNetCore.Components.Razor { internal class BindTagHelperDescriptorProvider : ITagHelperDescriptorProvider { @@ -88,7 +88,7 @@ namespace Microsoft.AspNetCore.Blazor.Razor return; } - var bindMethods = compilation.GetTypeByMetadataName(BlazorApi.BindMethods.FullTypeName); + var bindMethods = compilation.GetTypeByMetadataName(ComponentsApi.BindMethods.FullTypeName); if (bindMethods == null) { // If we can't find BindMethods, then just bail. We won't be able to compile the @@ -119,7 +119,7 @@ namespace Microsoft.AspNetCore.Blazor.Razor private TagHelperDescriptor CreateFallbackBindTagHelper() { - var builder = TagHelperDescriptorBuilder.Create(BlazorMetadata.Bind.TagHelperKind, "Bind", BlazorApi.AssemblyName); + var builder = TagHelperDescriptorBuilder.Create(BlazorMetadata.Bind.TagHelperKind, "Bind", ComponentsApi.AssemblyName); builder.Documentation = Resources.BindTagHelper_Fallback_Documentation; builder.Metadata.Add(BlazorMetadata.SpecialKindKey, BlazorMetadata.Bind.TagHelperKind); @@ -128,7 +128,7 @@ namespace Microsoft.AspNetCore.Blazor.Razor // WTE has a bug in 15.7p1 where a Tag Helper without a display-name that looks like // a C# property will crash trying to create the toolips. - builder.SetTypeName("Microsoft.AspNetCore.Blazor.Components.Bind"); + builder.SetTypeName("Microsoft.AspNetCore.Components.Bind"); builder.TagMatchingRule(rule => { @@ -171,8 +171,8 @@ namespace Microsoft.AspNetCore.Blazor.Razor private List GetElementBindData(Compilation compilation) { - var bindElement = compilation.GetTypeByMetadataName(BlazorApi.BindElementAttribute.FullTypeName); - var bindInputElement = compilation.GetTypeByMetadataName(BlazorApi.BindInputElementAttribute.FullTypeName); + var bindElement = compilation.GetTypeByMetadataName(ComponentsApi.BindElementAttribute.FullTypeName); + var bindInputElement = compilation.GetTypeByMetadataName(ComponentsApi.BindInputElementAttribute.FullTypeName); if (bindElement == null || bindInputElement == null) { diff --git a/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorCSharpLoweringPhase.cs b/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorCSharpLoweringPhase.cs index 2677dddf..46802249 100644 --- a/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorCSharpLoweringPhase.cs +++ b/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorCSharpLoweringPhase.cs @@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Razor.Language; using Microsoft.AspNetCore.Razor.Language.CodeGeneration; using Microsoft.AspNetCore.Razor.Language.Intermediate; -namespace Microsoft.AspNetCore.Blazor.Razor +namespace Microsoft.AspNetCore.Components.Razor { internal class BlazorRazorCSharpLoweringPhase : RazorEnginePhaseBase, IRazorCSharpLoweringPhase { diff --git a/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorCodeTarget.cs b/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorCodeTarget.cs index 9e52a736..b5e2a7ac 100644 --- a/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorCodeTarget.cs +++ b/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorCodeTarget.cs @@ -6,7 +6,7 @@ using System.Linq; using Microsoft.AspNetCore.Razor.Language; using Microsoft.AspNetCore.Razor.Language.CodeGeneration; -namespace Microsoft.AspNetCore.Blazor.Razor +namespace Microsoft.AspNetCore.Components.Razor { /// /// Directs a to use . diff --git a/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorDesignTimeNodeWriter.cs b/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorDesignTimeNodeWriter.cs index ddf672c4..0f84aeef 100644 --- a/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorDesignTimeNodeWriter.cs +++ b/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorDesignTimeNodeWriter.cs @@ -4,13 +4,13 @@ using System; using System.Collections.Generic; using System.Linq; -using Microsoft.AspNetCore.Blazor.Shared; +using Microsoft.AspNetCore.Components.Shared; using Microsoft.AspNetCore.Razor.Language; using Microsoft.AspNetCore.Razor.Language.CodeGeneration; using Microsoft.AspNetCore.Razor.Language.Extensions; using Microsoft.AspNetCore.Razor.Language.Intermediate; -namespace Microsoft.AspNetCore.Blazor.Razor +namespace Microsoft.AspNetCore.Components.Razor { // Based on the DesignTimeNodeWriter from Razor repo. internal class BlazorDesignTimeNodeWriter : BlazorNodeWriter @@ -324,7 +324,7 @@ namespace Microsoft.AspNetCore.Blazor.Razor } codeWriter - .WriteStartMethodInvocation($"{_scopeStack.BuilderVarName}.{nameof(BlazorApi.RenderTreeBuilder.AddAttribute)}") + .WriteStartMethodInvocation($"{_scopeStack.BuilderVarName}.{nameof(ComponentsApi.RenderTreeBuilder.AddAttribute)}") .Write("-1") .WriteParameterSeparator() .WriteStringLiteral(key) @@ -379,7 +379,7 @@ namespace Microsoft.AspNetCore.Blazor.Razor // for any code that the user types. context.RenderNode(new ComponentChildContentIntermediateNode() { - TypeName = BlazorApi.RenderFragment.FullTypeName, + TypeName = ComponentsApi.RenderFragment.FullTypeName, }); } @@ -550,7 +550,7 @@ namespace Microsoft.AspNetCore.Blazor.Razor // If we have a parameter type, then add a type check. if (canTypeCheck && NeedsTypeCheck(node)) { - context.CodeWriter.Write(BlazorApi.RuntimeHelpers.TypeCheck); + context.CodeWriter.Write(ComponentsApi.RuntimeHelpers.TypeCheck); context.CodeWriter.Write("<"); context.CodeWriter.Write(node.TypeName); context.CodeWriter.Write(">"); @@ -709,7 +709,7 @@ namespace Microsoft.AspNetCore.Blazor.Razor // errors will be equivalent var captureTypeName = node.IsComponentCapture ? node.ComponentCaptureTypeName - : BlazorApi.ElementRef.FullTypeName; + : ComponentsApi.ElementRef.FullTypeName; WriteCSharpCode(context, new CSharpCodeIntermediateNode { Source = node.Source, diff --git a/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorDiagnosticFactory.cs b/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorDiagnosticFactory.cs index bbf6f84b..c911f98b 100644 --- a/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorDiagnosticFactory.cs +++ b/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorDiagnosticFactory.cs @@ -9,7 +9,7 @@ using System.Linq; using Microsoft.AspNetCore.Razor.Language; using Microsoft.AspNetCore.Razor.Language.Intermediate; -namespace Microsoft.AspNetCore.Blazor.Razor +namespace Microsoft.AspNetCore.Components.Razor { internal static class BlazorDiagnosticFactory { diff --git a/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorExtensionInitializer.cs b/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorExtensionInitializer.cs index 403c3d73..ff8f8548 100644 --- a/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorExtensionInitializer.cs +++ b/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorExtensionInitializer.cs @@ -6,7 +6,7 @@ using System.Linq; using Microsoft.AspNetCore.Razor.Language; using Microsoft.AspNetCore.Razor.Language.Extensions; -namespace Microsoft.AspNetCore.Blazor.Razor +namespace Microsoft.AspNetCore.Components.Razor { /// /// Initializes the Blazor extension. diff --git a/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorImportProjectFeature.cs b/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorImportProjectFeature.cs index 5a3b700e..8aafa5b1 100644 --- a/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorImportProjectFeature.cs +++ b/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorImportProjectFeature.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; @@ -6,10 +6,10 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Text; -using Microsoft.AspNetCore.Blazor.Shared; +using Microsoft.AspNetCore.Components.Shared; using Microsoft.AspNetCore.Razor.Language; -namespace Microsoft.AspNetCore.Blazor.Razor +namespace Microsoft.AspNetCore.Components.Razor { internal class BlazorImportProjectFeature : IImportProjectFeature { @@ -24,8 +24,7 @@ namespace Microsoft.AspNetCore.Blazor.Razor "@using System.Collections.Generic\r\n" + "@using System.Linq\r\n" + "@using System.Threading.Tasks\r\n" + - "@using " + BlazorApi.RenderFragment.Namespace + "\r\n" + // Microsoft.AspNetCore.Blazor - "@using " + BlazorApi.BlazorComponent.Namespace + "\r\n"; // Microsoft.AspNetCore.Blazor.Components + "@using " + ComponentsApi.RenderFragment.Namespace + "\r\n"; // Microsoft.AspNetCore.Components public RazorProjectEngine ProjectEngine { get; set; } @@ -39,7 +38,7 @@ namespace Microsoft.AspNetCore.Blazor.Razor var imports = new List() { new VirtualProjectItem(DefaultUsingImportContent), - new VirtualProjectItem(@"@addTagHelper ""*, Microsoft.AspNetCore.Blazor"""), + new VirtualProjectItem(@"@addTagHelper ""*, Microsoft.AspNetCore.Components"""), }; // Try and infer a namespace from the project directory. We don't yet have the ability to pass diff --git a/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorMetadata.cs b/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorMetadata.cs index b6b4d5b1..0c5afc3a 100644 --- a/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorMetadata.cs +++ b/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorMetadata.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -namespace Microsoft.AspNetCore.Blazor.Razor +namespace Microsoft.AspNetCore.Components.Razor { // Metadata used for Blazor's interactions with the tag helper system internal static class BlazorMetadata diff --git a/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorNodeWriter.cs b/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorNodeWriter.cs index 432dec10..d5991bd2 100644 --- a/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorNodeWriter.cs +++ b/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorNodeWriter.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNetCore.Blazor.Shared; +using Microsoft.AspNetCore.Components.Shared; using Microsoft.AspNetCore.Razor.Language.CodeGeneration; using Microsoft.AspNetCore.Razor.Language.Extensions; using Microsoft.AspNetCore.Razor.Language.Intermediate; @@ -9,7 +9,7 @@ using System; using System.Collections.Generic; using System.Linq; -namespace Microsoft.AspNetCore.Blazor.Razor +namespace Microsoft.AspNetCore.Components.Razor { internal abstract class BlazorNodeWriter : IntermediateNodeWriter { @@ -103,7 +103,7 @@ namespace Microsoft.AspNetCore.Blazor.Razor writer.Write("("); writer.Write("global::"); - writer.Write(BlazorApi.RenderTreeBuilder.FullTypeName); + writer.Write(ComponentsApi.RenderTreeBuilder.FullTypeName); writer.Write(" builder"); writer.Write(", "); writer.Write("int seq"); @@ -137,7 +137,7 @@ namespace Microsoft.AspNetCore.Blazor.Razor // builder.OpenComponent(42); context.CodeWriter.Write("builder"); context.CodeWriter.Write("."); - context.CodeWriter.Write(BlazorApi.RenderTreeBuilder.OpenComponent); + context.CodeWriter.Write(ComponentsApi.RenderTreeBuilder.OpenComponent); context.CodeWriter.Write("<"); context.CodeWriter.Write(node.Component.TypeName); context.CodeWriter.Write(">("); @@ -148,7 +148,7 @@ namespace Microsoft.AspNetCore.Blazor.Razor var index = 0; foreach (var attribute in node.Component.Attributes) { - context.CodeWriter.WriteStartInstanceMethodInvocation("builder", BlazorApi.RenderTreeBuilder.AddAttribute); + context.CodeWriter.WriteStartInstanceMethodInvocation("builder", ComponentsApi.RenderTreeBuilder.AddAttribute); context.CodeWriter.Write(parameters[index].seqName); context.CodeWriter.Write(", "); @@ -163,7 +163,7 @@ namespace Microsoft.AspNetCore.Blazor.Razor foreach (var childContent in node.Component.ChildContents) { - context.CodeWriter.WriteStartInstanceMethodInvocation("builder", BlazorApi.RenderTreeBuilder.AddAttribute); + context.CodeWriter.WriteStartInstanceMethodInvocation("builder", ComponentsApi.RenderTreeBuilder.AddAttribute); context.CodeWriter.Write(parameters[index].seqName); context.CodeWriter.Write(", "); @@ -178,7 +178,7 @@ namespace Microsoft.AspNetCore.Blazor.Razor foreach (var capture in node.Component.Captures) { - context.CodeWriter.WriteStartInstanceMethodInvocation("builder", capture.IsComponentCapture ? BlazorApi.RenderTreeBuilder.AddComponentReferenceCapture : BlazorApi.RenderTreeBuilder.AddElementReferenceCapture); + context.CodeWriter.WriteStartInstanceMethodInvocation("builder", capture.IsComponentCapture ? ComponentsApi.RenderTreeBuilder.AddComponentReferenceCapture : ComponentsApi.RenderTreeBuilder.AddElementReferenceCapture); context.CodeWriter.Write(parameters[index].seqName); context.CodeWriter.Write(", "); @@ -189,7 +189,7 @@ namespace Microsoft.AspNetCore.Blazor.Razor index++; } - context.CodeWriter.WriteInstanceMethodInvocation("builder", BlazorApi.RenderTreeBuilder.CloseComponent); + context.CodeWriter.WriteInstanceMethodInvocation("builder", ComponentsApi.RenderTreeBuilder.CloseComponent); writer.WriteLine("}"); diff --git a/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorRuntimeNodeWriter.cs b/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorRuntimeNodeWriter.cs index 043aea85..3d3ed6c1 100644 --- a/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorRuntimeNodeWriter.cs +++ b/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorRuntimeNodeWriter.cs @@ -6,13 +6,13 @@ using System.Collections.Generic; using System.Diagnostics; using System.Linq; using System.Text; -using Microsoft.AspNetCore.Blazor.Shared; +using Microsoft.AspNetCore.Components.Shared; using Microsoft.AspNetCore.Razor.Language; using Microsoft.AspNetCore.Razor.Language.CodeGeneration; using Microsoft.AspNetCore.Razor.Language.Extensions; using Microsoft.AspNetCore.Razor.Language.Intermediate; -namespace Microsoft.AspNetCore.Blazor.Razor +namespace Microsoft.AspNetCore.Components.Razor { /// /// Generates the C# code corresponding to Razor source document contents. @@ -100,7 +100,7 @@ namespace Microsoft.AspNetCore.Blazor.Razor // Since we're not in the middle of writing an element, this must evaluate as some // text to display context.CodeWriter - .WriteStartMethodInvocation($"{_scopeStack.BuilderVarName}.{nameof(BlazorApi.RenderTreeBuilder.AddContent)}") + .WriteStartMethodInvocation($"{_scopeStack.BuilderVarName}.{nameof(ComponentsApi.RenderTreeBuilder.AddContent)}") .Write((_sourceSequence++).ToString()) .WriteParameterSeparator(); @@ -160,7 +160,7 @@ namespace Microsoft.AspNetCore.Blazor.Razor } context.CodeWriter - .WriteStartMethodInvocation($"{_scopeStack.BuilderVarName}.{nameof(BlazorApi.RenderTreeBuilder.AddMarkupContent)}") + .WriteStartMethodInvocation($"{_scopeStack.BuilderVarName}.{nameof(ComponentsApi.RenderTreeBuilder.AddMarkupContent)}") .Write((_sourceSequence++).ToString()) .WriteParameterSeparator() .WriteStringLiteral(node.Content) @@ -180,7 +180,7 @@ namespace Microsoft.AspNetCore.Blazor.Razor } context.CodeWriter - .WriteStartMethodInvocation($"{_scopeStack.BuilderVarName}.{nameof(BlazorApi.RenderTreeBuilder.OpenElement)}") + .WriteStartMethodInvocation($"{_scopeStack.BuilderVarName}.{nameof(ComponentsApi.RenderTreeBuilder.OpenElement)}") .Write((_sourceSequence++).ToString()) .WriteParameterSeparator() .WriteStringLiteral(node.TagName) @@ -204,7 +204,7 @@ namespace Microsoft.AspNetCore.Blazor.Razor } context.CodeWriter - .WriteStartMethodInvocation($"{_scopeStack.BuilderVarName}.{BlazorApi.RenderTreeBuilder.CloseElement}") + .WriteStartMethodInvocation($"{_scopeStack.BuilderVarName}.{ComponentsApi.RenderTreeBuilder.CloseElement}") .WriteEndMethodInvocation(); } @@ -258,7 +258,7 @@ namespace Microsoft.AspNetCore.Blazor.Razor // Text node var content = GetHtmlContent(node); context.CodeWriter - .WriteStartMethodInvocation($"{_scopeStack.BuilderVarName}.{nameof(BlazorApi.RenderTreeBuilder.AddContent)}") + .WriteStartMethodInvocation($"{_scopeStack.BuilderVarName}.{nameof(ComponentsApi.RenderTreeBuilder.AddContent)}") .Write((_sourceSequence++).ToString()) .WriteParameterSeparator() .WriteStringLiteral(content) @@ -308,7 +308,7 @@ namespace Microsoft.AspNetCore.Blazor.Razor // builder.OpenComponent(42); context.CodeWriter.Write(_scopeStack.BuilderVarName); context.CodeWriter.Write("."); - context.CodeWriter.Write(BlazorApi.RenderTreeBuilder.OpenComponent); + context.CodeWriter.Write(ComponentsApi.RenderTreeBuilder.OpenComponent); context.CodeWriter.Write("<"); context.CodeWriter.Write(node.TypeName); context.CodeWriter.Write(">("); @@ -337,7 +337,7 @@ namespace Microsoft.AspNetCore.Blazor.Razor // builder.CloseComponent(); context.CodeWriter.Write(_scopeStack.BuilderVarName); context.CodeWriter.Write("."); - context.CodeWriter.Write(BlazorApi.RenderTreeBuilder.CloseComponent); + context.CodeWriter.Write(ComponentsApi.RenderTreeBuilder.CloseComponent); context.CodeWriter.Write("();"); context.CodeWriter.WriteLine(); } @@ -429,7 +429,7 @@ namespace Microsoft.AspNetCore.Blazor.Razor // builder.AddAttribute(1, "Foo", 42); context.CodeWriter.Write(_scopeStack.BuilderVarName); context.CodeWriter.Write("."); - context.CodeWriter.Write(BlazorApi.RenderTreeBuilder.AddAttribute); + context.CodeWriter.Write(ComponentsApi.RenderTreeBuilder.AddAttribute); context.CodeWriter.Write("("); context.CodeWriter.Write((_sourceSequence++).ToString()); context.CodeWriter.Write(", "); @@ -488,7 +488,7 @@ namespace Microsoft.AspNetCore.Blazor.Razor { if (canTypeCheck && NeedsTypeCheck(node)) { - context.CodeWriter.Write(BlazorApi.RuntimeHelpers.TypeCheck); + context.CodeWriter.Write(ComponentsApi.RuntimeHelpers.TypeCheck); context.CodeWriter.Write("<"); context.CodeWriter.Write(node.TypeName); context.CodeWriter.Write(">"); @@ -605,8 +605,8 @@ namespace Microsoft.AspNetCore.Blazor.Razor var codeWriter = context.CodeWriter; var methodName = node.IsComponentCapture - ? nameof(BlazorApi.RenderTreeBuilder.AddComponentReferenceCapture) - : nameof(BlazorApi.RenderTreeBuilder.AddElementReferenceCapture); + ? nameof(ComponentsApi.RenderTreeBuilder.AddComponentReferenceCapture) + : nameof(ComponentsApi.RenderTreeBuilder.AddElementReferenceCapture); codeWriter .WriteStartMethodInvocation($"{_scopeStack.BuilderVarName}.{methodName}") .Write((_sourceSequence++).ToString()) @@ -654,7 +654,7 @@ namespace Microsoft.AspNetCore.Blazor.Razor public override void BeginWriteAttribute(CodeWriter codeWriter, string key) { codeWriter - .WriteStartMethodInvocation($"{_scopeStack.BuilderVarName}.{nameof(BlazorApi.RenderTreeBuilder.AddAttribute)}") + .WriteStartMethodInvocation($"{_scopeStack.BuilderVarName}.{nameof(ComponentsApi.RenderTreeBuilder.AddAttribute)}") .Write((_sourceSequence++).ToString()) .WriteParameterSeparator() .WriteStringLiteral(key) diff --git a/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorTemplateTargetExtension.cs b/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorTemplateTargetExtension.cs index 7c55e2b9..287ca46d 100644 --- a/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorTemplateTargetExtension.cs +++ b/src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorTemplateTargetExtension.cs @@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Razor.Language.CodeGeneration; using Microsoft.AspNetCore.Razor.Language.Extensions; -namespace Microsoft.AspNetCore.Blazor.Razor +namespace Microsoft.AspNetCore.Components.Razor { internal class BlazorTemplateTargetExtension : ITemplateTargetExtension { diff --git a/src/Microsoft.AspNetCore.Components.Razor.Extensions/CSharpIdentifier.cs b/src/Microsoft.AspNetCore.Components.Razor.Extensions/CSharpIdentifier.cs index cb2d5a6d..a2420610 100644 --- a/src/Microsoft.AspNetCore.Components.Razor.Extensions/CSharpIdentifier.cs +++ b/src/Microsoft.AspNetCore.Components.Razor.Extensions/CSharpIdentifier.cs @@ -5,7 +5,7 @@ using System; using System.Globalization; using System.Text; -namespace Microsoft.AspNetCore.Blazor.Razor +namespace Microsoft.AspNetCore.Components.Razor { // Copied from the Razor repo internal static class CSharpIdentifier diff --git a/src/Microsoft.AspNetCore.Components.Razor.Extensions/ChildContentDiagnosticPass.cs b/src/Microsoft.AspNetCore.Components.Razor.Extensions/ChildContentDiagnosticPass.cs index bdb5e377..5d85308e 100644 --- a/src/Microsoft.AspNetCore.Components.Razor.Extensions/ChildContentDiagnosticPass.cs +++ b/src/Microsoft.AspNetCore.Components.Razor.Extensions/ChildContentDiagnosticPass.cs @@ -5,7 +5,7 @@ using System; using Microsoft.AspNetCore.Razor.Language; using Microsoft.AspNetCore.Razor.Language.Intermediate; -namespace Microsoft.AspNetCore.Blazor.Razor +namespace Microsoft.AspNetCore.Components.Razor { internal class ChildContentDiagnosticPass : IntermediateNodePassBase, IRazorOptimizationPass { diff --git a/src/Microsoft.AspNetCore.Components.Razor.Extensions/CodeWriterExtensions.cs b/src/Microsoft.AspNetCore.Components.Razor.Extensions/CodeWriterExtensions.cs index 050406c8..ac02f126 100644 --- a/src/Microsoft.AspNetCore.Components.Razor.Extensions/CodeWriterExtensions.cs +++ b/src/Microsoft.AspNetCore.Components.Razor.Extensions/CodeWriterExtensions.cs @@ -12,7 +12,7 @@ using System.Linq; // Copied directly from https://github.com/aspnet/Razor/blob/ff40124594b58b17988d50841175430a4b73d1a9/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/CodeWriterExtensions.cs // (other than the namespace change) because it's internal -namespace Microsoft.AspNetCore.Blazor.Razor +namespace Microsoft.AspNetCore.Components.Razor { internal static class CodeWriterExtensions { diff --git a/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComplexAttributeContentPass.cs b/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComplexAttributeContentPass.cs index 641170ba..bd858e2c 100644 --- a/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComplexAttributeContentPass.cs +++ b/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComplexAttributeContentPass.cs @@ -5,7 +5,7 @@ using System.Linq; using Microsoft.AspNetCore.Razor.Language; using Microsoft.AspNetCore.Razor.Language.Intermediate; -namespace Microsoft.AspNetCore.Blazor.Razor +namespace Microsoft.AspNetCore.Components.Razor { // We don't support 'complex' content for components (mixed C# and markup) right now. // It's not clear yet if Blazor will have a good scenario to use these constructs. diff --git a/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentAttributeExtensionNode.cs b/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentAttributeExtensionNode.cs index 0a347d5b..2419cfad 100644 --- a/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentAttributeExtensionNode.cs +++ b/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentAttributeExtensionNode.cs @@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Razor.Language; using Microsoft.AspNetCore.Razor.Language.CodeGeneration; using Microsoft.AspNetCore.Razor.Language.Intermediate; -namespace Microsoft.AspNetCore.Blazor.Razor +namespace Microsoft.AspNetCore.Components.Razor { internal class ComponentAttributeExtensionNode : ExtensionIntermediateNode { diff --git a/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentChildContentIntermediateNode.cs b/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentChildContentIntermediateNode.cs index 6b39021b..cebcbc8e 100644 --- a/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentChildContentIntermediateNode.cs +++ b/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentChildContentIntermediateNode.cs @@ -2,16 +2,16 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNetCore.Blazor.Shared; +using Microsoft.AspNetCore.Components.Shared; using Microsoft.AspNetCore.Razor.Language; using Microsoft.AspNetCore.Razor.Language.CodeGeneration; using Microsoft.AspNetCore.Razor.Language.Intermediate; -namespace Microsoft.AspNetCore.Blazor.Razor +namespace Microsoft.AspNetCore.Components.Razor { internal class ComponentChildContentIntermediateNode : ExtensionIntermediateNode { - public string AttributeName => BoundAttribute?.Name ?? BlazorApi.RenderTreeBuilder.ChildContent; + public string AttributeName => BoundAttribute?.Name ?? ComponentsApi.RenderTreeBuilder.ChildContent; public BoundAttributeDescriptor BoundAttribute { get; set; } diff --git a/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentDocumentClassifierPass.cs b/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentDocumentClassifierPass.cs index 9e89eac4..38a90059 100644 --- a/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentDocumentClassifierPass.cs +++ b/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentDocumentClassifierPass.cs @@ -6,12 +6,12 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Text; -using Microsoft.AspNetCore.Blazor.Shared; +using Microsoft.AspNetCore.Components.Shared; using Microsoft.AspNetCore.Razor.Language; using Microsoft.AspNetCore.Razor.Language.CodeGeneration; using Microsoft.AspNetCore.Razor.Language.Intermediate; -namespace Microsoft.AspNetCore.Blazor.Razor +namespace Microsoft.AspNetCore.Components.Razor { /// /// A that recognizes Blazor components. @@ -87,7 +87,7 @@ namespace Microsoft.AspNetCore.Blazor.Razor @namespace.Content = computedNamespace; - @class.BaseType = BlazorApi.BlazorComponent.FullTypeName; + @class.BaseType = ComponentsApi.ComponentBase.FullTypeName; @class.ClassName = computedClass; @class.Modifiers.Clear(); @class.Modifiers.Add("public"); @@ -106,7 +106,7 @@ namespace Microsoft.AspNetCore.Blazor.Razor } method.ReturnType = "void"; - method.MethodName = BlazorApi.BlazorComponent.BuildRenderTree; + method.MethodName = ComponentsApi.ComponentBase.BuildRenderTree; method.Modifiers.Clear(); method.Modifiers.Add("protected"); method.Modifiers.Add("override"); @@ -115,7 +115,7 @@ namespace Microsoft.AspNetCore.Blazor.Razor method.Parameters.Add(new MethodParameter() { ParameterName = "builder", - TypeName = BlazorApi.RenderTreeBuilder.FullTypeName, + TypeName = ComponentsApi.RenderTreeBuilder.FullTypeName, }); // We need to call the 'base' method as the first statement. @@ -124,7 +124,7 @@ namespace Microsoft.AspNetCore.Blazor.Razor callBase.Children.Add(new IntermediateToken { Kind = TokenKind.CSharp, - Content = $"base.{BlazorApi.BlazorComponent.BuildRenderTree}(builder);" + Content = $"base.{ComponentsApi.ComponentBase.BuildRenderTree}(builder);" }); method.Children.Insert(0, callBase); } diff --git a/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentDocumentRewritePass.cs b/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentDocumentRewritePass.cs index 81e7dfac..96edcbf2 100644 --- a/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentDocumentRewritePass.cs +++ b/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentDocumentRewritePass.cs @@ -13,7 +13,7 @@ using System.Diagnostics; using System.Linq; using System.Text; -namespace Microsoft.AspNetCore.Blazor.Razor +namespace Microsoft.AspNetCore.Components.Razor { // Rewrites the standard IR to a format more suitable for Blazor // diff --git a/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentExtensionNode.cs b/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentExtensionNode.cs index 28eaf624..146c116c 100644 --- a/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentExtensionNode.cs +++ b/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentExtensionNode.cs @@ -9,7 +9,7 @@ using Microsoft.AspNetCore.Razor.Language; using Microsoft.AspNetCore.Razor.Language.CodeGeneration; using Microsoft.AspNetCore.Razor.Language.Intermediate; -namespace Microsoft.AspNetCore.Blazor.Razor +namespace Microsoft.AspNetCore.Components.Razor { internal class ComponentExtensionNode : ExtensionIntermediateNode { diff --git a/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentLoweringPass.cs b/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentLoweringPass.cs index 10eb13ec..eef4b286 100644 --- a/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentLoweringPass.cs +++ b/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentLoweringPass.cs @@ -3,11 +3,11 @@ using System; using System.Linq; -using Microsoft.AspNetCore.Blazor.Shared; +using Microsoft.AspNetCore.Components.Shared; using Microsoft.AspNetCore.Razor.Language; using Microsoft.AspNetCore.Razor.Language.Intermediate; -namespace Microsoft.AspNetCore.Blazor.Razor +namespace Microsoft.AspNetCore.Components.Razor { internal class ComponentLoweringPass : IntermediateNodePassBase, IRazorOptimizationPass { @@ -167,7 +167,7 @@ namespace Microsoft.AspNetCore.Blazor.Razor { // This node has implicit child content. It may or may not have an attribute that matches. var attribute = _component.Component.BoundAttributes - .Where(a => string.Equals(a.Name, BlazorApi.RenderTreeBuilder.ChildContent, StringComparison.Ordinal)) + .Where(a => string.Equals(a.Name, ComponentsApi.RenderTreeBuilder.ChildContent, StringComparison.Ordinal)) .FirstOrDefault(); _children.Add(RewriteChildContent(attribute, node.Source, node.Children)); return; @@ -221,7 +221,7 @@ namespace Microsoft.AspNetCore.Blazor.Razor { BoundAttribute = attribute, Source = source, - TypeName = attribute?.TypeName ?? BlazorApi.RenderFragment.FullTypeName, + TypeName = attribute?.TypeName ?? ComponentsApi.RenderFragment.FullTypeName, }; // There are two cases here: diff --git a/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentTagHelperDescriptorProvider.cs b/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentTagHelperDescriptorProvider.cs index 3d79bcd0..9e8972b5 100644 --- a/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentTagHelperDescriptorProvider.cs +++ b/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentTagHelperDescriptorProvider.cs @@ -6,13 +6,13 @@ using System.Collections.Generic; using System.Diagnostics; using System.Linq; using System.Reflection; -using Microsoft.AspNetCore.Blazor.Shared; +using Microsoft.AspNetCore.Components.Shared; using Microsoft.AspNetCore.Razor.Language; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CSharp; using Microsoft.CodeAnalysis.Razor; -namespace Microsoft.AspNetCore.Blazor.Razor +namespace Microsoft.AspNetCore.Components.Razor { internal class ComponentTagHelperDescriptorProvider : RazorEngineFeatureBase, ITagHelperDescriptorProvider { @@ -305,9 +305,9 @@ namespace Microsoft.AspNetCore.Blazor.Razor var properties = new Dictionary(StringComparer.Ordinal); do { - if (type == symbols.BlazorComponent) + if (type == symbols.ComponentBase) { - // The BlazorComponent base class doesn't have any [Parameter]. + // The ComponentBase base class doesn't have any [Parameter]. // Bail out now to avoid walking through its many members, plus the members // of the System.Object base class. break; @@ -400,34 +400,34 @@ namespace Microsoft.AspNetCore.Blazor.Razor public static BlazorSymbols Create(Compilation compilation) { var symbols = new BlazorSymbols(); - symbols.BlazorComponent = compilation.GetTypeByMetadataName(BlazorApi.BlazorComponent.MetadataName); - if (symbols.BlazorComponent == null) + symbols.ComponentBase = compilation.GetTypeByMetadataName(ComponentsApi.ComponentBase.MetadataName); + if (symbols.ComponentBase == null) { - // No definition for BlazorComponent, nothing to do. + // No definition for ComponentBase, nothing to do. return null; } - symbols.IComponent = compilation.GetTypeByMetadataName(BlazorApi.IComponent.MetadataName); + symbols.IComponent = compilation.GetTypeByMetadataName(ComponentsApi.IComponent.MetadataName); if (symbols.IComponent == null) { // No definition for IComponent, nothing to do. return null; } - symbols.ParameterAttribute = compilation.GetTypeByMetadataName(BlazorApi.ParameterAttribute.MetadataName); + symbols.ParameterAttribute = compilation.GetTypeByMetadataName(ComponentsApi.ParameterAttribute.MetadataName); if (symbols.ParameterAttribute == null) { // No definition for [Parameter], nothing to do. return null; } - symbols.RenderFragment = compilation.GetTypeByMetadataName(BlazorApi.RenderFragment.MetadataName); + symbols.RenderFragment = compilation.GetTypeByMetadataName(ComponentsApi.RenderFragment.MetadataName); if (symbols.RenderFragment == null) { // No definition for RenderFragment, nothing to do. } - symbols.RenderFragmentOfT = compilation.GetTypeByMetadataName(BlazorApi.RenderFragmentOfT.MetadataName); + symbols.RenderFragmentOfT = compilation.GetTypeByMetadataName(ComponentsApi.RenderFragmentOfT.MetadataName); if (symbols.RenderFragmentOfT == null) { // No definition for RenderFragment, nothing to do. @@ -440,7 +440,7 @@ namespace Microsoft.AspNetCore.Blazor.Razor { } - public INamedTypeSymbol BlazorComponent { get; private set; } + public INamedTypeSymbol ComponentBase { get; private set; } public INamedTypeSymbol IComponent { get; private set; } diff --git a/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentTypeArgumentExtensionNode.cs b/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentTypeArgumentExtensionNode.cs index 6f5e5e0a..20bbc114 100644 --- a/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentTypeArgumentExtensionNode.cs +++ b/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentTypeArgumentExtensionNode.cs @@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Razor.Language; using Microsoft.AspNetCore.Razor.Language.CodeGeneration; using Microsoft.AspNetCore.Razor.Language.Intermediate; -namespace Microsoft.AspNetCore.Blazor.Razor +namespace Microsoft.AspNetCore.Components.Razor { internal class ComponentTypeArgumentExtensionNode : ExtensionIntermediateNode { diff --git a/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentTypeInferenceMethodIntermediateNode.cs b/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentTypeInferenceMethodIntermediateNode.cs index cf08c02f..8716473d 100644 --- a/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentTypeInferenceMethodIntermediateNode.cs +++ b/src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentTypeInferenceMethodIntermediateNode.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using Microsoft.AspNetCore.Razor.Language.CodeGeneration; using Microsoft.AspNetCore.Razor.Language.Intermediate; -namespace Microsoft.AspNetCore.Blazor.Razor +namespace Microsoft.AspNetCore.Components.Razor { /// /// Represents a type-inference thunk that is used by the generated component code. diff --git a/src/Microsoft.AspNetCore.Components.Razor.Extensions/EliminateMethodBodyPass.cs b/src/Microsoft.AspNetCore.Components.Razor.Extensions/EliminateMethodBodyPass.cs index 1efd6e1b..ee507753 100644 --- a/src/Microsoft.AspNetCore.Components.Razor.Extensions/EliminateMethodBodyPass.cs +++ b/src/Microsoft.AspNetCore.Components.Razor.Extensions/EliminateMethodBodyPass.cs @@ -5,7 +5,7 @@ using System; using Microsoft.AspNetCore.Razor.Language; using Microsoft.AspNetCore.Razor.Language.Intermediate; -namespace Microsoft.AspNetCore.Blazor.Razor +namespace Microsoft.AspNetCore.Components.Razor { internal class EliminateMethodBodyPass : IntermediateNodePassBase, IRazorOptimizationPass { diff --git a/src/Microsoft.AspNetCore.Components.Razor.Extensions/EventHandlerLoweringPass.cs b/src/Microsoft.AspNetCore.Components.Razor.Extensions/EventHandlerLoweringPass.cs index 5d0dc4bd..1997d7f3 100644 --- a/src/Microsoft.AspNetCore.Components.Razor.Extensions/EventHandlerLoweringPass.cs +++ b/src/Microsoft.AspNetCore.Components.Razor.Extensions/EventHandlerLoweringPass.cs @@ -3,12 +3,12 @@ using System.Collections.Generic; using System.Linq; -using Microsoft.AspNetCore.Blazor.Shared; +using Microsoft.AspNetCore.Components.Shared; using Microsoft.AspNetCore.Razor.Language; using Microsoft.AspNetCore.Razor.Language.Extensions; using Microsoft.AspNetCore.Razor.Language.Intermediate; -namespace Microsoft.AspNetCore.Blazor.Razor +namespace Microsoft.AspNetCore.Components.Razor { internal class EventHandlerLoweringPass : IntermediateNodePassBase, IRazorOptimizationPass { @@ -129,7 +129,7 @@ namespace Microsoft.AspNetCore.Blazor.Razor { new IntermediateToken() { - Content = $"{BlazorApi.BindMethods.GetEventHandlerValue}<{eventArgsType}>(", + Content = $"{ComponentsApi.BindMethods.GetEventHandlerValue}<{eventArgsType}>(", Kind = TokenKind.CSharp }, new IntermediateToken() diff --git a/src/Microsoft.AspNetCore.Components.Razor.Extensions/EventHandlerTagHelperDescriptorProvider.cs b/src/Microsoft.AspNetCore.Components.Razor.Extensions/EventHandlerTagHelperDescriptorProvider.cs index e5ef926c..5daa724c 100644 --- a/src/Microsoft.AspNetCore.Components.Razor.Extensions/EventHandlerTagHelperDescriptorProvider.cs +++ b/src/Microsoft.AspNetCore.Components.Razor.Extensions/EventHandlerTagHelperDescriptorProvider.cs @@ -3,12 +3,12 @@ using System; using System.Collections.Generic; -using Microsoft.AspNetCore.Blazor.Shared; +using Microsoft.AspNetCore.Components.Shared; using Microsoft.AspNetCore.Razor.Language; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.Razor; -namespace Microsoft.AspNetCore.Blazor.Razor +namespace Microsoft.AspNetCore.Components.Razor { internal class EventHandlerTagHelperDescriptorProvider : ITagHelperDescriptorProvider { @@ -29,7 +29,7 @@ namespace Microsoft.AspNetCore.Blazor.Razor return; } - var bindMethods = compilation.GetTypeByMetadataName(BlazorApi.BindMethods.FullTypeName); + var bindMethods = compilation.GetTypeByMetadataName(ComponentsApi.BindMethods.FullTypeName); if (bindMethods == null) { // If we can't find BindMethods, then just bail. We won't be able to compile the @@ -48,7 +48,7 @@ namespace Microsoft.AspNetCore.Blazor.Razor private List GetEventHandlerData(Compilation compilation) { - var eventHandlerAttribute = compilation.GetTypeByMetadataName(BlazorApi.EventHandlerAttribute.FullTypeName); + var eventHandlerAttribute = compilation.GetTypeByMetadataName(ComponentsApi.EventHandlerAttribute.FullTypeName); if (eventHandlerAttribute == null) { // This won't likely happen, but just in case. diff --git a/src/Microsoft.AspNetCore.Components.Razor.Extensions/GenericComponentPass.cs b/src/Microsoft.AspNetCore.Components.Razor.Extensions/GenericComponentPass.cs index f57bbe41..bd9974a3 100644 --- a/src/Microsoft.AspNetCore.Components.Razor.Extensions/GenericComponentPass.cs +++ b/src/Microsoft.AspNetCore.Components.Razor.Extensions/GenericComponentPass.cs @@ -3,13 +3,13 @@ using System.Collections.Generic; using System.Linq; -using Microsoft.AspNetCore.Blazor.Shared; +using Microsoft.AspNetCore.Components.Shared; using Microsoft.AspNetCore.Razor.Language; using Microsoft.AspNetCore.Razor.Language.Intermediate; using Microsoft.CodeAnalysis.CSharp; using Microsoft.CodeAnalysis.CSharp.Syntax; -namespace Microsoft.AspNetCore.Blazor.Razor +namespace Microsoft.AspNetCore.Components.Razor { // This pass: // 1. Adds diagnostics for missing generic type arguments @@ -222,12 +222,12 @@ namespace Microsoft.AspNetCore.Blazor.Razor else if (childContent.IsParameterized) { // This is a weakly typed parameterized child content, treat it as RenderFragment - childContent.TypeName = BlazorApi.RenderFragment.FullTypeName + ""; + childContent.TypeName = ComponentsApi.RenderFragment.FullTypeName + ""; } else { // This is a weakly typed child content, treat it as RenderFragment - childContent.TypeName = BlazorApi.RenderFragment.FullTypeName; + childContent.TypeName = ComponentsApi.RenderFragment.FullTypeName; } } } diff --git a/src/Microsoft.AspNetCore.Components.Razor.Extensions/GenericTypeNameRewriter.cs b/src/Microsoft.AspNetCore.Components.Razor.Extensions/GenericTypeNameRewriter.cs index a98e520e..33ccacd6 100644 --- a/src/Microsoft.AspNetCore.Components.Razor.Extensions/GenericTypeNameRewriter.cs +++ b/src/Microsoft.AspNetCore.Components.Razor.Extensions/GenericTypeNameRewriter.cs @@ -7,7 +7,7 @@ using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CSharp; using Microsoft.CodeAnalysis.CSharp.Syntax; -namespace Microsoft.AspNetCore.Blazor.Razor +namespace Microsoft.AspNetCore.Components.Razor { internal class GenericTypeNameRewriter : CSharpSyntaxRewriter { diff --git a/src/Microsoft.AspNetCore.Components.Razor.Extensions/GlobalQualifiedTypeNameRewriter.cs b/src/Microsoft.AspNetCore.Components.Razor.Extensions/GlobalQualifiedTypeNameRewriter.cs index a5ca68c8..f1f62516 100644 --- a/src/Microsoft.AspNetCore.Components.Razor.Extensions/GlobalQualifiedTypeNameRewriter.cs +++ b/src/Microsoft.AspNetCore.Components.Razor.Extensions/GlobalQualifiedTypeNameRewriter.cs @@ -6,7 +6,7 @@ using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CSharp; using Microsoft.CodeAnalysis.CSharp.Syntax; -namespace Microsoft.AspNetCore.Blazor.Razor +namespace Microsoft.AspNetCore.Components.Razor { // Rewrites type names to use the 'global::' prefix for identifiers. // diff --git a/src/Microsoft.AspNetCore.Components.Razor.Extensions/HtmlBlockIntermediateNode.cs b/src/Microsoft.AspNetCore.Components.Razor.Extensions/HtmlBlockIntermediateNode.cs index ea9df100..55574ad3 100644 --- a/src/Microsoft.AspNetCore.Components.Razor.Extensions/HtmlBlockIntermediateNode.cs +++ b/src/Microsoft.AspNetCore.Components.Razor.Extensions/HtmlBlockIntermediateNode.cs @@ -6,7 +6,7 @@ using System.Diagnostics; using Microsoft.AspNetCore.Razor.Language.CodeGeneration; using Microsoft.AspNetCore.Razor.Language.Intermediate; -namespace Microsoft.AspNetCore.Blazor.Razor +namespace Microsoft.AspNetCore.Components.Razor { [DebuggerDisplay("{DebuggerDisplay,nq}")] internal class HtmlBlockIntermediateNode : ExtensionIntermediateNode diff --git a/src/Microsoft.AspNetCore.Components.Razor.Extensions/HtmlBlockPass.cs b/src/Microsoft.AspNetCore.Components.Razor.Extensions/HtmlBlockPass.cs index 5481273f..f4098ac1 100644 --- a/src/Microsoft.AspNetCore.Components.Razor.Extensions/HtmlBlockPass.cs +++ b/src/Microsoft.AspNetCore.Components.Razor.Extensions/HtmlBlockPass.cs @@ -9,7 +9,7 @@ using AngleSharp.Html; using Microsoft.AspNetCore.Razor.Language; using Microsoft.AspNetCore.Razor.Language.Intermediate; -namespace Microsoft.AspNetCore.Blazor.Razor +namespace Microsoft.AspNetCore.Components.Razor { // Rewrites contiguous subtrees of HTML into a special node type to reduce the // size of the Render tree. diff --git a/src/Microsoft.AspNetCore.Components.Razor.Extensions/HtmlElementIntermediateNode.cs b/src/Microsoft.AspNetCore.Components.Razor.Extensions/HtmlElementIntermediateNode.cs index c75f2064..4ba3ffbd 100644 --- a/src/Microsoft.AspNetCore.Components.Razor.Extensions/HtmlElementIntermediateNode.cs +++ b/src/Microsoft.AspNetCore.Components.Razor.Extensions/HtmlElementIntermediateNode.cs @@ -9,7 +9,7 @@ using System.Text; using Microsoft.AspNetCore.Razor.Language.CodeGeneration; using Microsoft.AspNetCore.Razor.Language.Intermediate; -namespace Microsoft.AspNetCore.Blazor.Razor +namespace Microsoft.AspNetCore.Components.Razor { [DebuggerDisplay("{DebuggerDisplay,nq}")] internal class HtmlElementIntermediateNode : ExtensionIntermediateNode diff --git a/src/Microsoft.AspNetCore.Components.Razor.Extensions/ImplementsDirective.cs b/src/Microsoft.AspNetCore.Components.Razor.Extensions/ImplementsDirective.cs index 8fab91d0..6ebceb3e 100644 --- a/src/Microsoft.AspNetCore.Components.Razor.Extensions/ImplementsDirective.cs +++ b/src/Microsoft.AspNetCore.Components.Razor.Extensions/ImplementsDirective.cs @@ -4,7 +4,7 @@ using System; using Microsoft.AspNetCore.Razor.Language; -namespace Microsoft.AspNetCore.Blazor.Razor +namespace Microsoft.AspNetCore.Components.Razor { internal static class ImplementsDirective { diff --git a/src/Microsoft.AspNetCore.Components.Razor.Extensions/ImplementsDirectivePass.cs b/src/Microsoft.AspNetCore.Components.Razor.Extensions/ImplementsDirectivePass.cs index 23ca598e..8acdd08d 100644 --- a/src/Microsoft.AspNetCore.Components.Razor.Extensions/ImplementsDirectivePass.cs +++ b/src/Microsoft.AspNetCore.Components.Razor.Extensions/ImplementsDirectivePass.cs @@ -7,7 +7,7 @@ using Microsoft.AspNetCore.Razor.Language; using Microsoft.AspNetCore.Razor.Language.Extensions; using Microsoft.AspNetCore.Razor.Language.Intermediate; -namespace Microsoft.AspNetCore.Blazor.Razor +namespace Microsoft.AspNetCore.Components.Razor { internal class ImplementsDirectivePass : IntermediateNodePassBase, IRazorDirectiveClassifierPass { diff --git a/src/Microsoft.AspNetCore.Components.Razor.Extensions/InjectDirective.cs b/src/Microsoft.AspNetCore.Components.Razor.Extensions/InjectDirective.cs index 43fcfe58..659d7472 100644 --- a/src/Microsoft.AspNetCore.Components.Razor.Extensions/InjectDirective.cs +++ b/src/Microsoft.AspNetCore.Components.Razor.Extensions/InjectDirective.cs @@ -1,6 +1,7 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +using Microsoft.AspNetCore.Components.Shared; using Microsoft.AspNetCore.Razor.Language; using Microsoft.AspNetCore.Razor.Language.CodeGeneration; using Microsoft.AspNetCore.Razor.Language.Intermediate; @@ -8,7 +9,7 @@ using System; using System.Collections.Generic; using System.Linq; -namespace Microsoft.AspNetCore.Blazor.Razor +namespace Microsoft.AspNetCore.Components.Razor { // Much of the following is equivalent to Microsoft.AspNetCore.Mvc.Razor.Extensions's InjectDirective, // but this one outputs properties annotated for Blazor's property injector, plus it doesn't need to @@ -16,8 +17,6 @@ namespace Microsoft.AspNetCore.Blazor.Razor internal class InjectDirective { - const string InjectAttributeTypeName = "Microsoft.AspNetCore.Blazor.Components.InjectAttribute"; - public static readonly DirectiveDescriptor Directive = DirectiveDescriptor.CreateDirective( "inject", DirectiveKind.SingleLine, @@ -86,7 +85,7 @@ namespace Microsoft.AspNetCore.Blazor.Razor { private static readonly IList _injectedPropertyModifiers = new[] { - $"[global::{InjectAttributeTypeName}]", + $"[global::{ComponentsApi.InjectAttribute.FullTypeName}]", "private" // Encapsulation is the default }; diff --git a/src/Microsoft.AspNetCore.Components.Razor.Extensions/LayoutDirective.cs b/src/Microsoft.AspNetCore.Components.Razor.Extensions/LayoutDirective.cs index e645fb34..b54694f6 100644 --- a/src/Microsoft.AspNetCore.Components.Razor.Extensions/LayoutDirective.cs +++ b/src/Microsoft.AspNetCore.Components.Razor.Extensions/LayoutDirective.cs @@ -4,7 +4,7 @@ using System; using Microsoft.AspNetCore.Razor.Language; -namespace Microsoft.AspNetCore.Blazor.Razor +namespace Microsoft.AspNetCore.Components.Razor { internal static class LayoutDirective { diff --git a/src/Microsoft.AspNetCore.Components.Razor.Extensions/LayoutDirectivePass.cs b/src/Microsoft.AspNetCore.Components.Razor.Extensions/LayoutDirectivePass.cs index d4f3acb0..c86c66dc 100644 --- a/src/Microsoft.AspNetCore.Components.Razor.Extensions/LayoutDirectivePass.cs +++ b/src/Microsoft.AspNetCore.Components.Razor.Extensions/LayoutDirectivePass.cs @@ -3,11 +3,11 @@ using System; using System.Linq; -using Microsoft.AspNetCore.Blazor.Shared; +using Microsoft.AspNetCore.Components.Shared; using Microsoft.AspNetCore.Razor.Language; using Microsoft.AspNetCore.Razor.Language.Intermediate; -namespace Microsoft.AspNetCore.Blazor.Razor +namespace Microsoft.AspNetCore.Components.Razor { internal class LayoutDirectivePass : IntermediateNodePassBase, IRazorDirectiveClassifierPass { @@ -36,7 +36,7 @@ namespace Microsoft.AspNetCore.Blazor.Razor attributeNode.Children.Add(new IntermediateToken() { Kind = TokenKind.CSharp, - Content = $"[{BlazorApi.LayoutAttribute.FullTypeName}(typeof({token.Content}))]" + Environment.NewLine, + Content = $"[{ComponentsApi.LayoutAttribute.FullTypeName}(typeof({token.Content}))]" + Environment.NewLine, }); // Insert the new attribute on top of the class diff --git a/src/Microsoft.AspNetCore.Components.Razor.Extensions/Microsoft.AspNetCore.Blazor.Razor.Extensions.csproj b/src/Microsoft.AspNetCore.Components.Razor.Extensions/Microsoft.AspNetCore.Components.Razor.Extensions.csproj similarity index 87% rename from src/Microsoft.AspNetCore.Components.Razor.Extensions/Microsoft.AspNetCore.Blazor.Razor.Extensions.csproj rename to src/Microsoft.AspNetCore.Components.Razor.Extensions/Microsoft.AspNetCore.Components.Razor.Extensions.csproj index 787baad8..bb40d71e 100644 --- a/src/Microsoft.AspNetCore.Components.Razor.Extensions/Microsoft.AspNetCore.Blazor.Razor.Extensions.csproj +++ b/src/Microsoft.AspNetCore.Components.Razor.Extensions/Microsoft.AspNetCore.Components.Razor.Extensions.csproj @@ -3,7 +3,7 @@ netstandard2.0 $(TargetFrameworks);net461 - Microsoft.AspNetCore.Blazor.Razor + Microsoft.AspNetCore.Components.Razor true @@ -31,6 +31,6 @@ - + diff --git a/src/Microsoft.AspNetCore.Components.Razor.Extensions/PageDirective.cs b/src/Microsoft.AspNetCore.Components.Razor.Extensions/PageDirective.cs index 2812e7a8..107ddc61 100644 --- a/src/Microsoft.AspNetCore.Components.Razor.Extensions/PageDirective.cs +++ b/src/Microsoft.AspNetCore.Components.Razor.Extensions/PageDirective.cs @@ -5,7 +5,7 @@ using System; using Microsoft.AspNetCore.Razor.Language; using Microsoft.AspNetCore.Razor.Language.Intermediate; -namespace Microsoft.AspNetCore.Blazor.Razor +namespace Microsoft.AspNetCore.Components.Razor { internal class PageDirective { diff --git a/src/Microsoft.AspNetCore.Components.Razor.Extensions/PageDirectivePass.cs b/src/Microsoft.AspNetCore.Components.Razor.Extensions/PageDirectivePass.cs index 8d5ac68a..02d9dfad 100644 --- a/src/Microsoft.AspNetCore.Components.Razor.Extensions/PageDirectivePass.cs +++ b/src/Microsoft.AspNetCore.Components.Razor.Extensions/PageDirectivePass.cs @@ -7,7 +7,7 @@ using Microsoft.AspNetCore.Razor.Language; using Microsoft.AspNetCore.Razor.Language.CodeGeneration; using Microsoft.AspNetCore.Razor.Language.Intermediate; -namespace Microsoft.AspNetCore.Blazor.Razor +namespace Microsoft.AspNetCore.Components.Razor { internal class PageDirectivePass : IntermediateNodePassBase, IRazorDirectiveClassifierPass { diff --git a/src/Microsoft.AspNetCore.Components.Razor.Extensions/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.Components.Razor.Extensions/Properties/AssemblyInfo.cs index 59ac6703..aeed5583 100644 --- a/src/Microsoft.AspNetCore.Components.Razor.Extensions/Properties/AssemblyInfo.cs +++ b/src/Microsoft.AspNetCore.Components.Razor.Extensions/Properties/AssemblyInfo.cs @@ -2,12 +2,12 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Runtime.CompilerServices; -using Microsoft.AspNetCore.Blazor.Razor; +using Microsoft.AspNetCore.Components.Razor; using Microsoft.AspNetCore.Razor.Language; // These should match the configuration names specified by the Blazor MSBuild files. [assembly: ProvideRazorExtensionInitializer("Blazor-0.1", typeof(BlazorExtensionInitializer))] [assembly: ProvideRazorExtensionInitializer("BlazorDeclaration-0.1", typeof(BlazorExtensionInitializer))] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Blazor.Build.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Blazor.Razor.Extensions.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] \ No newline at end of file +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Components.Build.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Components.Razor.Extensions.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Components.Razor.Extensions/RazorCompilerException.cs b/src/Microsoft.AspNetCore.Components.Razor.Extensions/RazorCompilerException.cs index 5a981de1..dbf64be1 100644 --- a/src/Microsoft.AspNetCore.Components.Razor.Extensions/RazorCompilerException.cs +++ b/src/Microsoft.AspNetCore.Components.Razor.Extensions/RazorCompilerException.cs @@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Razor.Language; using System; -namespace Microsoft.AspNetCore.Blazor.Razor +namespace Microsoft.AspNetCore.Components.Razor { /// /// Represents a fatal error during the transformation of a Blazor component from diff --git a/src/Microsoft.AspNetCore.Components.Razor.Extensions/RefExtensionNode.cs b/src/Microsoft.AspNetCore.Components.Razor.Extensions/RefExtensionNode.cs index 22a23ac9..dd7c131e 100644 --- a/src/Microsoft.AspNetCore.Components.Razor.Extensions/RefExtensionNode.cs +++ b/src/Microsoft.AspNetCore.Components.Razor.Extensions/RefExtensionNode.cs @@ -1,12 +1,12 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNetCore.Blazor.Shared; +using Microsoft.AspNetCore.Components.Shared; using Microsoft.AspNetCore.Razor.Language.CodeGeneration; using Microsoft.AspNetCore.Razor.Language.Intermediate; using System; -namespace Microsoft.AspNetCore.Blazor.Razor +namespace Microsoft.AspNetCore.Components.Razor { internal class RefExtensionNode : ExtensionIntermediateNode { @@ -36,7 +36,7 @@ namespace Microsoft.AspNetCore.Blazor.Razor public string ComponentCaptureTypeName { get; set; } - public string TypeName => $"global::System.Action<{(IsComponentCapture ? ComponentCaptureTypeName : "global::" + BlazorApi.ElementRef.FullTypeName)}>"; + public string TypeName => $"global::System.Action<{(IsComponentCapture ? ComponentCaptureTypeName : "global::" + ComponentsApi.ElementRef.FullTypeName)}>"; public override void Accept(IntermediateNodeVisitor visitor) { diff --git a/src/Microsoft.AspNetCore.Components.Razor.Extensions/RefLoweringPass.cs b/src/Microsoft.AspNetCore.Components.Razor.Extensions/RefLoweringPass.cs index 3a3ef3b6..01ee14e0 100644 --- a/src/Microsoft.AspNetCore.Components.Razor.Extensions/RefLoweringPass.cs +++ b/src/Microsoft.AspNetCore.Components.Razor.Extensions/RefLoweringPass.cs @@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Razor.Language; using Microsoft.AspNetCore.Razor.Language.Intermediate; -namespace Microsoft.AspNetCore.Blazor.Razor +namespace Microsoft.AspNetCore.Components.Razor { internal class RefLoweringPass : IntermediateNodePassBase, IRazorOptimizationPass { diff --git a/src/Microsoft.AspNetCore.Components.Razor.Extensions/RefTagHelperDescriptorProvider.cs b/src/Microsoft.AspNetCore.Components.Razor.Extensions/RefTagHelperDescriptorProvider.cs index 9b7a4343..ecb9dda0 100644 --- a/src/Microsoft.AspNetCore.Components.Razor.Extensions/RefTagHelperDescriptorProvider.cs +++ b/src/Microsoft.AspNetCore.Components.Razor.Extensions/RefTagHelperDescriptorProvider.cs @@ -1,11 +1,11 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNetCore.Blazor.Shared; +using Microsoft.AspNetCore.Components.Shared; using Microsoft.AspNetCore.Razor.Language; using System; -namespace Microsoft.AspNetCore.Blazor.Razor +namespace Microsoft.AspNetCore.Components.Razor { internal class RefTagHelperDescriptorProvider : ITagHelperDescriptorProvider { @@ -26,7 +26,7 @@ namespace Microsoft.AspNetCore.Blazor.Razor private TagHelperDescriptor CreateRefTagHelper() { - var builder = TagHelperDescriptorBuilder.Create(BlazorMetadata.Ref.TagHelperKind, "Ref", BlazorApi.AssemblyName); + var builder = TagHelperDescriptorBuilder.Create(BlazorMetadata.Ref.TagHelperKind, "Ref", ComponentsApi.AssemblyName); builder.Documentation = Resources.RefTagHelper_Documentation; builder.Metadata.Add(BlazorMetadata.SpecialKindKey, BlazorMetadata.Ref.TagHelperKind); @@ -34,7 +34,7 @@ namespace Microsoft.AspNetCore.Blazor.Razor // WTE has a bug in 15.7p1 where a Tag Helper without a display-name that looks like // a C# property will crash trying to create the tooltips. - builder.SetTypeName("Microsoft.AspNetCore.Blazor.Components.Ref"); + builder.SetTypeName("Microsoft.AspNetCore.Components.Ref"); builder.TagMatchingRule(rule => { diff --git a/src/Microsoft.AspNetCore.Components.Razor.Extensions/Resources.Designer.cs b/src/Microsoft.AspNetCore.Components.Razor.Extensions/Resources.Designer.cs index a4a4271f..a1254633 100644 --- a/src/Microsoft.AspNetCore.Components.Razor.Extensions/Resources.Designer.cs +++ b/src/Microsoft.AspNetCore.Components.Razor.Extensions/Resources.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace Microsoft.AspNetCore.Blazor.Razor { +namespace Microsoft.AspNetCore.Components.Razor { using System; @@ -39,7 +39,7 @@ namespace Microsoft.AspNetCore.Blazor.Razor { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.AspNetCore.Blazor.Razor.Resources", typeof(Resources).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.AspNetCore.Components.Razor.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; diff --git a/src/Microsoft.AspNetCore.Components.Razor.Extensions/RouteAttributeExtensionNode.cs b/src/Microsoft.AspNetCore.Components.Razor.Extensions/RouteAttributeExtensionNode.cs index 0f36b5f3..6c37269b 100644 --- a/src/Microsoft.AspNetCore.Components.Razor.Extensions/RouteAttributeExtensionNode.cs +++ b/src/Microsoft.AspNetCore.Components.Razor.Extensions/RouteAttributeExtensionNode.cs @@ -1,11 +1,11 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNetCore.Blazor.Shared; +using Microsoft.AspNetCore.Components.Shared; using Microsoft.AspNetCore.Razor.Language.CodeGeneration; using Microsoft.AspNetCore.Razor.Language.Intermediate; -namespace Microsoft.AspNetCore.Blazor.Razor +namespace Microsoft.AspNetCore.Components.Razor { internal class RouteAttributeExtensionNode : ExtensionIntermediateNode { @@ -23,7 +23,7 @@ namespace Microsoft.AspNetCore.Blazor.Razor public override void WriteNode(CodeTarget target, CodeRenderingContext context) { context.CodeWriter.Write("["); - context.CodeWriter.Write(BlazorApi.RouteAttribute.FullTypeName); + context.CodeWriter.Write(ComponentsApi.RouteAttribute.FullTypeName); context.CodeWriter.Write("(\""); context.CodeWriter.Write(Template); context.CodeWriter.Write("\")"); diff --git a/src/Microsoft.AspNetCore.Components.Razor.Extensions/ScopeStack.cs b/src/Microsoft.AspNetCore.Components.Razor.Extensions/ScopeStack.cs index db015b93..065af81c 100644 --- a/src/Microsoft.AspNetCore.Components.Razor.Extensions/ScopeStack.cs +++ b/src/Microsoft.AspNetCore.Components.Razor.Extensions/ScopeStack.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; using Microsoft.AspNetCore.Razor.Language.CodeGeneration; -namespace Microsoft.AspNetCore.Blazor.Razor +namespace Microsoft.AspNetCore.Components.Razor { /// /// Keeps track of the nesting of elements/containers while writing out the C# source code diff --git a/src/Microsoft.AspNetCore.Components.Razor.Extensions/ScriptTagPass.cs b/src/Microsoft.AspNetCore.Components.Razor.Extensions/ScriptTagPass.cs index 4e5c29ab..c983ce83 100644 --- a/src/Microsoft.AspNetCore.Components.Razor.Extensions/ScriptTagPass.cs +++ b/src/Microsoft.AspNetCore.Components.Razor.Extensions/ScriptTagPass.cs @@ -12,7 +12,7 @@ using AngleSharp.Parser.Html; using Microsoft.AspNetCore.Razor.Language; using Microsoft.AspNetCore.Razor.Language.Intermediate; -namespace Microsoft.AspNetCore.Blazor.Razor +namespace Microsoft.AspNetCore.Components.Razor { internal class ScriptTagPass : IntermediateNodePassBase, IRazorDocumentClassifierPass { diff --git a/src/Microsoft.AspNetCore.Components.Razor.Extensions/TagHelperBoundAttributeDescriptorExtensions.cs b/src/Microsoft.AspNetCore.Components.Razor.Extensions/TagHelperBoundAttributeDescriptorExtensions.cs index 10996b28..36443779 100644 --- a/src/Microsoft.AspNetCore.Components.Razor.Extensions/TagHelperBoundAttributeDescriptorExtensions.cs +++ b/src/Microsoft.AspNetCore.Components.Razor.Extensions/TagHelperBoundAttributeDescriptorExtensions.cs @@ -2,10 +2,10 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNetCore.Blazor.Shared; +using Microsoft.AspNetCore.Components.Shared; using Microsoft.AspNetCore.Razor.Language; -namespace Microsoft.AspNetCore.Blazor.Razor +namespace Microsoft.AspNetCore.Components.Razor { internal static class TagHelperBoundAttributeDescriptorExtensions { @@ -111,7 +111,7 @@ namespace Microsoft.AspNetCore.Blazor.Razor } return attribute.IsChildContentProperty() && - !string.Equals(attribute.TypeName, BlazorApi.RenderFragment.FullTypeName, StringComparison.Ordinal); + !string.Equals(attribute.TypeName, ComponentsApi.RenderFragment.FullTypeName, StringComparison.Ordinal); } /// @@ -128,7 +128,7 @@ namespace Microsoft.AspNetCore.Blazor.Razor } return attribute.IsChildContentProperty() && - !string.Equals(attribute.TypeName, BlazorApi.RenderFragment.FullTypeName, StringComparison.Ordinal); + !string.Equals(attribute.TypeName, ComponentsApi.RenderFragment.FullTypeName, StringComparison.Ordinal); } /// diff --git a/src/Microsoft.AspNetCore.Components.Razor.Extensions/TagHelperDescriptorExtensions.cs b/src/Microsoft.AspNetCore.Components.Razor.Extensions/TagHelperDescriptorExtensions.cs index 0b8beec5..19198b76 100644 --- a/src/Microsoft.AspNetCore.Components.Razor.Extensions/TagHelperDescriptorExtensions.cs +++ b/src/Microsoft.AspNetCore.Components.Razor.Extensions/TagHelperDescriptorExtensions.cs @@ -6,7 +6,7 @@ using System; using System.Collections.Generic; using Microsoft.AspNetCore.Razor.Language; -namespace Microsoft.AspNetCore.Blazor.Razor +namespace Microsoft.AspNetCore.Components.Razor { internal static class TagHelperDescriptorExtensions { diff --git a/src/Microsoft.AspNetCore.Components.Razor.Extensions/TemplateDiagnosticPass.cs b/src/Microsoft.AspNetCore.Components.Razor.Extensions/TemplateDiagnosticPass.cs index 1b5d4d74..7a57f442 100644 --- a/src/Microsoft.AspNetCore.Components.Razor.Extensions/TemplateDiagnosticPass.cs +++ b/src/Microsoft.AspNetCore.Components.Razor.Extensions/TemplateDiagnosticPass.cs @@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Razor.Language.Extensions; using Microsoft.AspNetCore.Razor.Language.Intermediate; using System.Collections.Generic; -namespace Microsoft.AspNetCore.Blazor.Razor +namespace Microsoft.AspNetCore.Components.Razor { internal class TemplateDiagnosticPass : IntermediateNodePassBase, IRazorOptimizationPass { diff --git a/src/Microsoft.AspNetCore.Components.Razor.Extensions/TrimWhitespacePass.cs b/src/Microsoft.AspNetCore.Components.Razor.Extensions/TrimWhitespacePass.cs index 1c7d1b9a..d7e31862 100644 --- a/src/Microsoft.AspNetCore.Components.Razor.Extensions/TrimWhitespacePass.cs +++ b/src/Microsoft.AspNetCore.Components.Razor.Extensions/TrimWhitespacePass.cs @@ -5,7 +5,7 @@ using Microsoft.AspNetCore.Razor.Language; using Microsoft.AspNetCore.Razor.Language.Intermediate; using System; -namespace Microsoft.AspNetCore.Blazor.Razor +namespace Microsoft.AspNetCore.Components.Razor { internal class TrimWhitespacePass : IntermediateNodePassBase, IRazorDirectiveClassifierPass { diff --git a/src/Microsoft.AspNetCore.Components.Razor.Extensions/TypeParamDirective.cs b/src/Microsoft.AspNetCore.Components.Razor.Extensions/TypeParamDirective.cs index 53ee3160..e6f58592 100644 --- a/src/Microsoft.AspNetCore.Components.Razor.Extensions/TypeParamDirective.cs +++ b/src/Microsoft.AspNetCore.Components.Razor.Extensions/TypeParamDirective.cs @@ -4,7 +4,7 @@ using System; using Microsoft.AspNetCore.Razor.Language; -namespace Microsoft.AspNetCore.Blazor.Razor +namespace Microsoft.AspNetCore.Components.Razor { internal class TypeParamDirective { diff --git a/src/Microsoft.AspNetCore.Components.Server/AutoRebuild/AutoRebuildExtensions.cs b/src/Microsoft.AspNetCore.Components.Server/AutoRebuild/AutoRebuildExtensions.cs index 78d71d1e..d230aa03 100644 --- a/src/Microsoft.AspNetCore.Components.Server/AutoRebuild/AutoRebuildExtensions.cs +++ b/src/Microsoft.AspNetCore.Components.Server/AutoRebuild/AutoRebuildExtensions.cs @@ -1,8 +1,8 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNetCore.Blazor.Server; -using Microsoft.AspNetCore.Blazor.Server.AutoRebuild; +using Microsoft.AspNetCore.Components.Server; +using Microsoft.AspNetCore.Components.Server.AutoRebuild; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using System; diff --git a/src/Microsoft.AspNetCore.Components.Server/AutoRebuild/IRebuildService.cs b/src/Microsoft.AspNetCore.Components.Server/AutoRebuild/IRebuildService.cs index ee48b025..5e31af2d 100644 --- a/src/Microsoft.AspNetCore.Components.Server/AutoRebuild/IRebuildService.cs +++ b/src/Microsoft.AspNetCore.Components.Server/AutoRebuild/IRebuildService.cs @@ -4,7 +4,7 @@ using System; using System.Threading.Tasks; -namespace Microsoft.AspNetCore.Blazor.Server.AutoRebuild +namespace Microsoft.AspNetCore.Components.Server.AutoRebuild { /// /// Represents a mechanism for rebuilding a .NET project. For example, it diff --git a/src/Microsoft.AspNetCore.Components.Server/AutoRebuild/ProcessUtils.cs b/src/Microsoft.AspNetCore.Components.Server/AutoRebuild/ProcessUtils.cs index 4ede95e2..22320847 100644 --- a/src/Microsoft.AspNetCore.Components.Server/AutoRebuild/ProcessUtils.cs +++ b/src/Microsoft.AspNetCore.Components.Server/AutoRebuild/ProcessUtils.cs @@ -6,7 +6,7 @@ using System.ComponentModel; using System.Diagnostics; using System.Runtime.InteropServices; -namespace Microsoft.AspNetCore.Blazor.Server.AutoRebuild +namespace Microsoft.AspNetCore.Components.Server.AutoRebuild { internal static class ProcessUtils { diff --git a/src/Microsoft.AspNetCore.Components.Server/AutoRebuild/StreamProtocolExtensions.cs b/src/Microsoft.AspNetCore.Components.Server/AutoRebuild/StreamProtocolExtensions.cs index ae7aa964..cd8e375f 100644 --- a/src/Microsoft.AspNetCore.Components.Server/AutoRebuild/StreamProtocolExtensions.cs +++ b/src/Microsoft.AspNetCore.Components.Server/AutoRebuild/StreamProtocolExtensions.cs @@ -6,7 +6,7 @@ using System.IO; using System.Text; using System.Threading.Tasks; -namespace Microsoft.AspNetCore.Blazor.Server.AutoRebuild +namespace Microsoft.AspNetCore.Components.Server.AutoRebuild { internal static class StreamProtocolExtensions { diff --git a/src/Microsoft.AspNetCore.Components.Server/AutoRebuild/VSForWindowsRebuildService.cs b/src/Microsoft.AspNetCore.Components.Server/AutoRebuild/VSForWindowsRebuildService.cs index 5e49dcc7..d5217ae6 100644 --- a/src/Microsoft.AspNetCore.Components.Server/AutoRebuild/VSForWindowsRebuildService.cs +++ b/src/Microsoft.AspNetCore.Components.Server/AutoRebuild/VSForWindowsRebuildService.cs @@ -7,7 +7,7 @@ using System.IO.Pipes; using System.Runtime.InteropServices; using System.Threading.Tasks; -namespace Microsoft.AspNetCore.Blazor.Server.AutoRebuild +namespace Microsoft.AspNetCore.Components.Server.AutoRebuild { /// /// Finds the VS process that launched this app process (if any), and uses diff --git a/src/Microsoft.AspNetCore.Components.Server/BlazorConfig.cs b/src/Microsoft.AspNetCore.Components.Server/BlazorConfig.cs index 79bf6ac6..da74faf2 100644 --- a/src/Microsoft.AspNetCore.Components.Server/BlazorConfig.cs +++ b/src/Microsoft.AspNetCore.Components.Server/BlazorConfig.cs @@ -5,7 +5,7 @@ using System; using System.IO; using System.Linq; -namespace Microsoft.AspNetCore.Blazor.Server +namespace Microsoft.AspNetCore.Components.Server { internal class BlazorConfig { diff --git a/src/Microsoft.AspNetCore.Components.Server/BlazorHub.cs b/src/Microsoft.AspNetCore.Components.Server/BlazorHub.cs index abc6bbba..e2a0b071 100644 --- a/src/Microsoft.AspNetCore.Components.Server/BlazorHub.cs +++ b/src/Microsoft.AspNetCore.Components.Server/BlazorHub.cs @@ -3,14 +3,14 @@ using System; using System.Threading.Tasks; -using Microsoft.AspNetCore.Blazor.Server.Circuits; -using Microsoft.AspNetCore.Blazor.Services; +using Microsoft.AspNetCore.Components.Server.Circuits; +using Microsoft.AspNetCore.Components.Services; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.SignalR; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNetCore.Blazor.Server +namespace Microsoft.AspNetCore.Components.Server { /// /// A SignalR hub that accepts connections to a Server-Side Blazor app. diff --git a/src/Microsoft.AspNetCore.Components.Server/Builder/BlazorApplicationBuilderExtensions.cs b/src/Microsoft.AspNetCore.Components.Server/Builder/BlazorApplicationBuilderExtensions.cs index dbe8cebb..2b80da74 100644 --- a/src/Microsoft.AspNetCore.Components.Server/Builder/BlazorApplicationBuilderExtensions.cs +++ b/src/Microsoft.AspNetCore.Components.Server/Builder/BlazorApplicationBuilderExtensions.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Blazor.Server; +using Microsoft.AspNetCore.Components.Server; using Microsoft.AspNetCore.StaticFiles; using Microsoft.Extensions.FileProviders; using Microsoft.AspNetCore.Hosting; diff --git a/src/Microsoft.AspNetCore.Components.Server/Builder/ServerSideBlazorApplicationBuilder.cs b/src/Microsoft.AspNetCore.Components.Server/Builder/ServerSideBlazorApplicationBuilder.cs index 02f1ae2d..d774f0fe 100644 --- a/src/Microsoft.AspNetCore.Components.Server/Builder/ServerSideBlazorApplicationBuilder.cs +++ b/src/Microsoft.AspNetCore.Components.Server/Builder/ServerSideBlazorApplicationBuilder.cs @@ -3,9 +3,9 @@ using System; using System.Collections.Generic; -using Microsoft.AspNetCore.Blazor.Builder; +using Microsoft.AspNetCore.Components.Builder; -namespace Microsoft.AspNetCore.Blazor.Hosting +namespace Microsoft.AspNetCore.Components.Hosting { internal class ServerSideBlazorApplicationBuilder : IBlazorApplicationBuilder { diff --git a/src/Microsoft.AspNetCore.Components.Server/Builder/ServerSideBlazorApplicationBuilderExtensions.cs b/src/Microsoft.AspNetCore.Components.Server/Builder/ServerSideBlazorApplicationBuilderExtensions.cs index 86d1167d..b08618d3 100644 --- a/src/Microsoft.AspNetCore.Components.Server/Builder/ServerSideBlazorApplicationBuilderExtensions.cs +++ b/src/Microsoft.AspNetCore.Components.Server/Builder/ServerSideBlazorApplicationBuilderExtensions.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNetCore.Blazor.Server; +using Microsoft.AspNetCore.Components.Server; using Microsoft.AspNetCore.Http; namespace Microsoft.AspNetCore.Builder diff --git a/src/Microsoft.AspNetCore.Components.Server/Circuits/AutoCancelTaskCompletionSource.cs b/src/Microsoft.AspNetCore.Components.Server/Circuits/AutoCancelTaskCompletionSource.cs index d45540f6..11aae7c6 100644 --- a/src/Microsoft.AspNetCore.Components.Server/Circuits/AutoCancelTaskCompletionSource.cs +++ b/src/Microsoft.AspNetCore.Components.Server/Circuits/AutoCancelTaskCompletionSource.cs @@ -5,7 +5,7 @@ using System; using System.Threading; using System.Threading.Tasks; -namespace Microsoft.AspNetCore.Blazor.Server.Circuits +namespace Microsoft.AspNetCore.Components.Server.Circuits { /// /// Behaves like a , but automatically times out diff --git a/src/Microsoft.AspNetCore.Components.Server/Circuits/Circuit.cs b/src/Microsoft.AspNetCore.Components.Server/Circuits/Circuit.cs index b928eeb6..643683e3 100644 --- a/src/Microsoft.AspNetCore.Components.Server/Circuits/Circuit.cs +++ b/src/Microsoft.AspNetCore.Components.Server/Circuits/Circuit.cs @@ -4,7 +4,7 @@ using System; using Microsoft.JSInterop; -namespace Microsoft.AspNetCore.Blazor.Server.Circuits +namespace Microsoft.AspNetCore.Components.Server.Circuits { /// /// Represents an active connection between a Blazor server and a client. diff --git a/src/Microsoft.AspNetCore.Components.Server/Circuits/CircuitFactory.cs b/src/Microsoft.AspNetCore.Components.Server/Circuits/CircuitFactory.cs index 920f058b..fbe4a8c7 100644 --- a/src/Microsoft.AspNetCore.Components.Server/Circuits/CircuitFactory.cs +++ b/src/Microsoft.AspNetCore.Components.Server/Circuits/CircuitFactory.cs @@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.SignalR; -namespace Microsoft.AspNetCore.Blazor.Server.Circuits +namespace Microsoft.AspNetCore.Components.Server.Circuits { internal abstract class CircuitFactory { diff --git a/src/Microsoft.AspNetCore.Components.Server/Circuits/CircuitHost.cs b/src/Microsoft.AspNetCore.Components.Server/Circuits/CircuitHost.cs index 66fbcb9d..ca3207fd 100644 --- a/src/Microsoft.AspNetCore.Components.Server/Circuits/CircuitHost.cs +++ b/src/Microsoft.AspNetCore.Components.Server/Circuits/CircuitHost.cs @@ -4,15 +4,15 @@ using System; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNetCore.Blazor.Browser.Rendering; -using Microsoft.AspNetCore.Blazor.Builder; -using Microsoft.AspNetCore.Blazor.Hosting; -using Microsoft.AspNetCore.Blazor.Rendering; +using Microsoft.AspNetCore.Components.Browser.Rendering; +using Microsoft.AspNetCore.Components.Builder; +using Microsoft.AspNetCore.Components.Hosting; +using Microsoft.AspNetCore.Components.Rendering; using Microsoft.AspNetCore.SignalR; using Microsoft.Extensions.DependencyInjection; using Microsoft.JSInterop; -namespace Microsoft.AspNetCore.Blazor.Server.Circuits +namespace Microsoft.AspNetCore.Components.Server.Circuits { internal class CircuitHost : IDisposable { diff --git a/src/Microsoft.AspNetCore.Components.Server/Circuits/CircuitSynchronizationContext.cs b/src/Microsoft.AspNetCore.Components.Server/Circuits/CircuitSynchronizationContext.cs index 6909566d..ec8abe35 100644 --- a/src/Microsoft.AspNetCore.Components.Server/Circuits/CircuitSynchronizationContext.cs +++ b/src/Microsoft.AspNetCore.Components.Server/Circuits/CircuitSynchronizationContext.cs @@ -6,7 +6,7 @@ using System.Diagnostics; using System.Threading; using System.Threading.Tasks; -namespace Microsoft.AspNetCore.Blazor.Server.Circuits +namespace Microsoft.AspNetCore.Components.Server.Circuits { [DebuggerDisplay("{_state,nq}")] internal class CircuitSynchronizationContext : SynchronizationContext diff --git a/src/Microsoft.AspNetCore.Components.Server/Circuits/DefaultCircuitAccessor.cs b/src/Microsoft.AspNetCore.Components.Server/Circuits/DefaultCircuitAccessor.cs index 7c7cfaf5..4d3bd170 100644 --- a/src/Microsoft.AspNetCore.Components.Server/Circuits/DefaultCircuitAccessor.cs +++ b/src/Microsoft.AspNetCore.Components.Server/Circuits/DefaultCircuitAccessor.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -namespace Microsoft.AspNetCore.Blazor.Server.Circuits +namespace Microsoft.AspNetCore.Components.Server.Circuits { internal class DefaultCircuitAccessor : ICircuitAccessor { diff --git a/src/Microsoft.AspNetCore.Components.Server/Circuits/DefaultCircuitFactory.cs b/src/Microsoft.AspNetCore.Components.Server/Circuits/DefaultCircuitFactory.cs index f82e3991..38cdacaf 100644 --- a/src/Microsoft.AspNetCore.Components.Server/Circuits/DefaultCircuitFactory.cs +++ b/src/Microsoft.AspNetCore.Components.Server/Circuits/DefaultCircuitFactory.cs @@ -2,14 +2,14 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNetCore.Blazor.Browser.Rendering; -using Microsoft.AspNetCore.Blazor.Rendering; +using Microsoft.AspNetCore.Components.Browser.Rendering; +using Microsoft.AspNetCore.Components.Rendering; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.SignalR; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; -namespace Microsoft.AspNetCore.Blazor.Server.Circuits +namespace Microsoft.AspNetCore.Components.Server.Circuits { internal class DefaultCircuitFactory : CircuitFactory { diff --git a/src/Microsoft.AspNetCore.Components.Server/Circuits/DefaultCircuitFactoryOptions.cs b/src/Microsoft.AspNetCore.Components.Server/Circuits/DefaultCircuitFactoryOptions.cs index d12072c6..11852b40 100644 --- a/src/Microsoft.AspNetCore.Components.Server/Circuits/DefaultCircuitFactoryOptions.cs +++ b/src/Microsoft.AspNetCore.Components.Server/Circuits/DefaultCircuitFactoryOptions.cs @@ -3,10 +3,10 @@ using System; using System.Collections.Generic; -using Microsoft.AspNetCore.Blazor.Builder; +using Microsoft.AspNetCore.Components.Builder; using Microsoft.AspNetCore.Http; -namespace Microsoft.AspNetCore.Blazor.Server.Circuits +namespace Microsoft.AspNetCore.Components.Server.Circuits { internal class DefaultCircuitFactoryOptions { diff --git a/src/Microsoft.AspNetCore.Components.Server/Circuits/DefaultJSRuntimeAccessor.cs b/src/Microsoft.AspNetCore.Components.Server/Circuits/DefaultJSRuntimeAccessor.cs index b88d4d50..a890098e 100644 --- a/src/Microsoft.AspNetCore.Components.Server/Circuits/DefaultJSRuntimeAccessor.cs +++ b/src/Microsoft.AspNetCore.Components.Server/Circuits/DefaultJSRuntimeAccessor.cs @@ -3,7 +3,7 @@ using Microsoft.JSInterop; -namespace Microsoft.AspNetCore.Blazor.Server.Circuits +namespace Microsoft.AspNetCore.Components.Server.Circuits { internal class DefaultJSRuntimeAccessor : IJSRuntimeAccessor { diff --git a/src/Microsoft.AspNetCore.Components.Server/Circuits/ICircuitAccessor.cs b/src/Microsoft.AspNetCore.Components.Server/Circuits/ICircuitAccessor.cs index 88776f5a..2bd1418c 100644 --- a/src/Microsoft.AspNetCore.Components.Server/Circuits/ICircuitAccessor.cs +++ b/src/Microsoft.AspNetCore.Components.Server/Circuits/ICircuitAccessor.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -namespace Microsoft.AspNetCore.Blazor.Server.Circuits +namespace Microsoft.AspNetCore.Components.Server.Circuits { internal interface ICircuitAccessor { diff --git a/src/Microsoft.AspNetCore.Components.Server/Circuits/IJSRuntimeAccessor.cs b/src/Microsoft.AspNetCore.Components.Server/Circuits/IJSRuntimeAccessor.cs index d4d4306e..023e39ee 100644 --- a/src/Microsoft.AspNetCore.Components.Server/Circuits/IJSRuntimeAccessor.cs +++ b/src/Microsoft.AspNetCore.Components.Server/Circuits/IJSRuntimeAccessor.cs @@ -3,7 +3,7 @@ using Microsoft.JSInterop; -namespace Microsoft.AspNetCore.Blazor.Server.Circuits +namespace Microsoft.AspNetCore.Components.Server.Circuits { internal interface IJSRuntimeAccessor { diff --git a/src/Microsoft.AspNetCore.Components.Server/Circuits/MessagePackBufferStream.cs b/src/Microsoft.AspNetCore.Components.Server/Circuits/MessagePackBufferStream.cs index f3a6e0a3..aec2593d 100644 --- a/src/Microsoft.AspNetCore.Components.Server/Circuits/MessagePackBufferStream.cs +++ b/src/Microsoft.AspNetCore.Components.Server/Circuits/MessagePackBufferStream.cs @@ -5,7 +5,7 @@ using MessagePack; using System; using System.IO; -namespace Microsoft.AspNetCore.Blazor.Server.Circuits +namespace Microsoft.AspNetCore.Components.Server.Circuits { /// /// Provides Stream APIs for writing to a MessagePack-supplied expandable buffer. diff --git a/src/Microsoft.AspNetCore.Components.Server/Circuits/RemoteJSRuntime.cs b/src/Microsoft.AspNetCore.Components.Server/Circuits/RemoteJSRuntime.cs index 97c61fd1..3c9df0e7 100644 --- a/src/Microsoft.AspNetCore.Components.Server/Circuits/RemoteJSRuntime.cs +++ b/src/Microsoft.AspNetCore.Components.Server/Circuits/RemoteJSRuntime.cs @@ -5,7 +5,7 @@ using System; using Microsoft.AspNetCore.SignalR; using Microsoft.JSInterop; -namespace Microsoft.AspNetCore.Blazor.Server.Circuits +namespace Microsoft.AspNetCore.Components.Server.Circuits { internal class RemoteJSRuntime : JSRuntimeBase { diff --git a/src/Microsoft.AspNetCore.Components.Server/Circuits/RemoteRenderer.cs b/src/Microsoft.AspNetCore.Components.Server/Circuits/RemoteRenderer.cs index fbb01c6b..465b2009 100644 --- a/src/Microsoft.AspNetCore.Components.Server/Circuits/RemoteRenderer.cs +++ b/src/Microsoft.AspNetCore.Components.Server/Circuits/RemoteRenderer.cs @@ -6,13 +6,12 @@ using System.Collections.Concurrent; using System.Threading; using System.Threading.Tasks; using MessagePack; -using Microsoft.AspNetCore.Blazor.Components; -using Microsoft.AspNetCore.Blazor.Rendering; -using Microsoft.AspNetCore.Blazor.Server.Circuits; +using Microsoft.AspNetCore.Components.Rendering; +using Microsoft.AspNetCore.Components.Server.Circuits; using Microsoft.AspNetCore.SignalR; using Microsoft.JSInterop; -namespace Microsoft.AspNetCore.Blazor.Browser.Rendering +namespace Microsoft.AspNetCore.Components.Browser.Rendering { internal class RemoteRenderer : Renderer { diff --git a/src/Microsoft.AspNetCore.Components.Server/Circuits/RemoteRendererException.cs b/src/Microsoft.AspNetCore.Components.Server/Circuits/RemoteRendererException.cs index 4bd38f35..3305daf5 100644 --- a/src/Microsoft.AspNetCore.Components.Server/Circuits/RemoteRendererException.cs +++ b/src/Microsoft.AspNetCore.Components.Server/Circuits/RemoteRendererException.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNetCore.Blazor.Browser.Rendering +namespace Microsoft.AspNetCore.Components.Browser.Rendering { /// /// Represents an exception related to remote rendering. diff --git a/src/Microsoft.AspNetCore.Components.Server/Circuits/RemoteUriHelper.cs b/src/Microsoft.AspNetCore.Components.Server/Circuits/RemoteUriHelper.cs index bc82b039..9b7eaa7e 100644 --- a/src/Microsoft.AspNetCore.Components.Server/Circuits/RemoteUriHelper.cs +++ b/src/Microsoft.AspNetCore.Components.Server/Circuits/RemoteUriHelper.cs @@ -2,12 +2,12 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNetCore.Blazor.Services; +using Microsoft.AspNetCore.Components.Services; using Microsoft.Extensions.DependencyInjection; using Microsoft.JSInterop; -using Interop = Microsoft.AspNetCore.Blazor.Browser.Services.BrowserUriHelperInterop; +using Interop = Microsoft.AspNetCore.Components.Browser.Services.BrowserUriHelperInterop; -namespace Microsoft.AspNetCore.Blazor.Server.Circuits +namespace Microsoft.AspNetCore.Components.Server.Circuits { /// /// A Server-Side Blazor implementation of . diff --git a/src/Microsoft.AspNetCore.Components.Server/Circuits/RenderBatchFormatterResolver.cs b/src/Microsoft.AspNetCore.Components.Server/Circuits/RenderBatchFormatterResolver.cs index efbf1cd9..6e5be49b 100644 --- a/src/Microsoft.AspNetCore.Components.Server/Circuits/RenderBatchFormatterResolver.cs +++ b/src/Microsoft.AspNetCore.Components.Server/Circuits/RenderBatchFormatterResolver.cs @@ -3,10 +3,10 @@ using MessagePack; using MessagePack.Formatters; -using Microsoft.AspNetCore.Blazor.Rendering; +using Microsoft.AspNetCore.Components.Rendering; using System; -namespace Microsoft.AspNetCore.Blazor.Server.Circuits +namespace Microsoft.AspNetCore.Components.Server.Circuits { /// /// A MessagePack IFormatterResolver that provides an efficient binary serialization diff --git a/src/Microsoft.AspNetCore.Components.Server/Circuits/RenderBatchWriter.cs b/src/Microsoft.AspNetCore.Components.Server/Circuits/RenderBatchWriter.cs index 28c8d9b4..321bef10 100644 --- a/src/Microsoft.AspNetCore.Components.Server/Circuits/RenderBatchWriter.cs +++ b/src/Microsoft.AspNetCore.Components.Server/Circuits/RenderBatchWriter.cs @@ -1,14 +1,14 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNetCore.Blazor.Rendering; -using Microsoft.AspNetCore.Blazor.RenderTree; +using Microsoft.AspNetCore.Components.Rendering; +using Microsoft.AspNetCore.Components.RenderTree; using System; using System.Collections.Generic; using System.IO; using System.Text; -namespace Microsoft.AspNetCore.Blazor.Server.Circuits +namespace Microsoft.AspNetCore.Components.Server.Circuits { // TODO: We should consider *not* having this type of infrastructure in the .Server // project, but instead in some new project called .Remote or similar, since it diff --git a/src/Microsoft.AspNetCore.Components.Server/DependencyInjection/ServerSideBlazorServiceCollectionExtensions.cs b/src/Microsoft.AspNetCore.Components.Server/DependencyInjection/ServerSideBlazorServiceCollectionExtensions.cs index de030805..8b103a9c 100644 --- a/src/Microsoft.AspNetCore.Components.Server/DependencyInjection/ServerSideBlazorServiceCollectionExtensions.cs +++ b/src/Microsoft.AspNetCore.Components.Server/DependencyInjection/ServerSideBlazorServiceCollectionExtensions.cs @@ -2,10 +2,10 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNetCore.Blazor.Hosting; -using Microsoft.AspNetCore.Blazor.Server; -using Microsoft.AspNetCore.Blazor.Server.Circuits; -using Microsoft.AspNetCore.Blazor.Services; +using Microsoft.AspNetCore.Components.Hosting; +using Microsoft.AspNetCore.Components.Server; +using Microsoft.AspNetCore.Components.Server.Circuits; +using Microsoft.AspNetCore.Components.Services; using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.JSInterop; diff --git a/src/Microsoft.AspNetCore.Components.Server/Microsoft.AspNetCore.Blazor.Server.csproj b/src/Microsoft.AspNetCore.Components.Server/Microsoft.AspNetCore.Components.Server.csproj similarity index 93% rename from src/Microsoft.AspNetCore.Components.Server/Microsoft.AspNetCore.Blazor.Server.csproj rename to src/Microsoft.AspNetCore.Components.Server/Microsoft.AspNetCore.Components.Server.csproj index 73c90066..b48c8f50 100644 --- a/src/Microsoft.AspNetCore.Components.Server/Microsoft.AspNetCore.Blazor.Server.csproj +++ b/src/Microsoft.AspNetCore.Components.Server/Microsoft.AspNetCore.Components.Server.csproj @@ -22,8 +22,8 @@ - - + + diff --git a/src/Microsoft.AspNetCore.Components.Server/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.Components.Server/Properties/AssemblyInfo.cs index 90bb6036..acb0e9cf 100644 --- a/src/Microsoft.AspNetCore.Components.Server/Properties/AssemblyInfo.cs +++ b/src/Microsoft.AspNetCore.Components.Server/Properties/AssemblyInfo.cs @@ -1,4 +1,4 @@ using System.Runtime.CompilerServices; [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Blazor.Cli, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Blazor.Server.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Components.Server.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] diff --git a/src/Microsoft.AspNetCore.Components.Server/WasmMediaTypeNames.cs b/src/Microsoft.AspNetCore.Components.Server/WasmMediaTypeNames.cs index 97b15a83..f632d62f 100644 --- a/src/Microsoft.AspNetCore.Components.Server/WasmMediaTypeNames.cs +++ b/src/Microsoft.AspNetCore.Components.Server/WasmMediaTypeNames.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -namespace Microsoft.AspNetCore.Blazor.Server +namespace Microsoft.AspNetCore.Components.Server { /// /// Contains values for WASM-related media types. diff --git a/src/Microsoft.AspNetCore.Components.TagHelperWorkaround/Microsoft.AspNetCore.Blazor.TagHelperWorkaround.csproj b/src/Microsoft.AspNetCore.Components.TagHelperWorkaround/Microsoft.AspNetCore.Components.TagHelperWorkaround.csproj similarity index 77% rename from src/Microsoft.AspNetCore.Components.TagHelperWorkaround/Microsoft.AspNetCore.Blazor.TagHelperWorkaround.csproj rename to src/Microsoft.AspNetCore.Components.TagHelperWorkaround/Microsoft.AspNetCore.Components.TagHelperWorkaround.csproj index 762ab88b..dbd2f312 100644 --- a/src/Microsoft.AspNetCore.Components.TagHelperWorkaround/Microsoft.AspNetCore.Blazor.TagHelperWorkaround.csproj +++ b/src/Microsoft.AspNetCore.Components.TagHelperWorkaround/Microsoft.AspNetCore.Components.TagHelperWorkaround.csproj @@ -1,6 +1,6 @@ - + netstandard1.0 false diff --git a/src/Microsoft.AspNetCore.Components/Components/BindAttributes.cs b/src/Microsoft.AspNetCore.Components/BindAttributes.cs similarity index 95% rename from src/Microsoft.AspNetCore.Components/Components/BindAttributes.cs rename to src/Microsoft.AspNetCore.Components/BindAttributes.cs index 15addbcc..6651f8db 100644 --- a/src/Microsoft.AspNetCore.Components/Components/BindAttributes.cs +++ b/src/Microsoft.AspNetCore.Components/BindAttributes.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -namespace Microsoft.AspNetCore.Blazor.Components +namespace Microsoft.AspNetCore.Components { /// /// Infrastructure for the discovery of bind attributes for markup elements. diff --git a/src/Microsoft.AspNetCore.Components/Components/BindElementAttribute.cs b/src/Microsoft.AspNetCore.Components/BindElementAttribute.cs similarity index 98% rename from src/Microsoft.AspNetCore.Components/Components/BindElementAttribute.cs rename to src/Microsoft.AspNetCore.Components/BindElementAttribute.cs index 5b31829e..ffc17a60 100644 --- a/src/Microsoft.AspNetCore.Components/Components/BindElementAttribute.cs +++ b/src/Microsoft.AspNetCore.Components/BindElementAttribute.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNetCore.Blazor.Components +namespace Microsoft.AspNetCore.Components { /// /// Configures options for binding specific element types. diff --git a/src/Microsoft.AspNetCore.Components/Components/BindInputElementAttribute.cs b/src/Microsoft.AspNetCore.Components/BindInputElementAttribute.cs similarity index 97% rename from src/Microsoft.AspNetCore.Components/Components/BindInputElementAttribute.cs rename to src/Microsoft.AspNetCore.Components/BindInputElementAttribute.cs index 80f36086..fe618ca7 100644 --- a/src/Microsoft.AspNetCore.Components/Components/BindInputElementAttribute.cs +++ b/src/Microsoft.AspNetCore.Components/BindInputElementAttribute.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNetCore.Blazor.Components +namespace Microsoft.AspNetCore.Components { /// /// Configures options for binding subtypes of an HTML input element. diff --git a/src/Microsoft.AspNetCore.Components/Components/BindMethods.cs b/src/Microsoft.AspNetCore.Components/BindMethods.cs similarity index 99% rename from src/Microsoft.AspNetCore.Components/Components/BindMethods.cs rename to src/Microsoft.AspNetCore.Components/BindMethods.cs index c9766ff6..fc74f6c6 100644 --- a/src/Microsoft.AspNetCore.Components/Components/BindMethods.cs +++ b/src/Microsoft.AspNetCore.Components/BindMethods.cs @@ -5,7 +5,7 @@ using System; using System.Globalization; using System.Threading.Tasks; -namespace Microsoft.AspNetCore.Blazor.Components +namespace Microsoft.AspNetCore.Components { /// /// Methods used internally by @bind syntax. Not intended to be used directly. diff --git a/src/Microsoft.AspNetCore.Components/Components/CascadingParameterAttribute.cs b/src/Microsoft.AspNetCore.Components/CascadingParameterAttribute.cs similarity index 95% rename from src/Microsoft.AspNetCore.Components/Components/CascadingParameterAttribute.cs rename to src/Microsoft.AspNetCore.Components/CascadingParameterAttribute.cs index db3cb4ec..f4855da3 100644 --- a/src/Microsoft.AspNetCore.Components/Components/CascadingParameterAttribute.cs +++ b/src/Microsoft.AspNetCore.Components/CascadingParameterAttribute.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNetCore.Blazor.Components +namespace Microsoft.AspNetCore.Components { /// /// Denotes the target member as a cascading component parameter. Its value will be diff --git a/src/Microsoft.AspNetCore.Components/Components/CascadingParameterState.cs b/src/Microsoft.AspNetCore.Components/CascadingParameterState.cs similarity index 98% rename from src/Microsoft.AspNetCore.Components/Components/CascadingParameterState.cs rename to src/Microsoft.AspNetCore.Components/CascadingParameterState.cs index 680e38c6..453fb969 100644 --- a/src/Microsoft.AspNetCore.Components/Components/CascadingParameterState.cs +++ b/src/Microsoft.AspNetCore.Components/CascadingParameterState.cs @@ -1,13 +1,13 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNetCore.Blazor.Rendering; +using Microsoft.AspNetCore.Components.Rendering; using System; using System.Collections.Concurrent; using System.Collections.Generic; using System.Reflection; -namespace Microsoft.AspNetCore.Blazor.Components +namespace Microsoft.AspNetCore.Components { internal readonly struct CascadingParameterState { diff --git a/src/Microsoft.AspNetCore.Components/Components/CascadingValue.cs b/src/Microsoft.AspNetCore.Components/CascadingValue.cs similarity index 98% rename from src/Microsoft.AspNetCore.Components/Components/CascadingValue.cs rename to src/Microsoft.AspNetCore.Components/CascadingValue.cs index e130d41d..006fca44 100644 --- a/src/Microsoft.AspNetCore.Components/Components/CascadingValue.cs +++ b/src/Microsoft.AspNetCore.Components/CascadingValue.cs @@ -1,12 +1,12 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNetCore.Blazor.Rendering; -using Microsoft.AspNetCore.Blazor.RenderTree; +using Microsoft.AspNetCore.Components.Rendering; +using Microsoft.AspNetCore.Components.RenderTree; using System; using System.Collections.Generic; -namespace Microsoft.AspNetCore.Blazor.Components +namespace Microsoft.AspNetCore.Components { /// /// A component that provides a cascading value to all descendant components. diff --git a/src/Microsoft.AspNetCore.Components/Components/ChangeDetection.cs b/src/Microsoft.AspNetCore.Components/ChangeDetection.cs similarity index 97% rename from src/Microsoft.AspNetCore.Components/Components/ChangeDetection.cs rename to src/Microsoft.AspNetCore.Components/ChangeDetection.cs index 9ed115ca..82ef2158 100644 --- a/src/Microsoft.AspNetCore.Components/Components/ChangeDetection.cs +++ b/src/Microsoft.AspNetCore.Components/ChangeDetection.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNetCore.Blazor.Components +namespace Microsoft.AspNetCore.Components { internal class ChangeDetection { diff --git a/src/Microsoft.AspNetCore.Components/Components/BlazorComponent.cs b/src/Microsoft.AspNetCore.Components/ComponentBase.cs similarity index 92% rename from src/Microsoft.AspNetCore.Components/Components/BlazorComponent.cs rename to src/Microsoft.AspNetCore.Components/ComponentBase.cs index 151ca90e..1ff2b60b 100644 --- a/src/Microsoft.AspNetCore.Components/Components/BlazorComponent.cs +++ b/src/Microsoft.AspNetCore.Components/ComponentBase.cs @@ -1,29 +1,29 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNetCore.Blazor.RenderTree; +using Microsoft.AspNetCore.Components.RenderTree; using System; using System.Threading.Tasks; -namespace Microsoft.AspNetCore.Blazor.Components +namespace Microsoft.AspNetCore.Components { // IMPORTANT // // Many of these names are used in code generation. Keep these in sync with the code generation code - // See: src/Microsoft.AspNetCore.Components.Razor.Extensions/BlazorApi.cs + // See: src/Microsoft.AspNetCore.Components.Razor.Extensions/ComponentsApi.cs // Most of the developer-facing component lifecycle concepts are encapsulated in this - // base class. The core Blazor rendering system doesn't know about them (it only knows + // base class. The core components rendering system doesn't know about them (it only knows // about IComponent). This gives us flexibility to change the lifecycle concepts easily, // or for developers to design their own lifecycles as different base classes. - // TODO: When the component lifecycle design stabilises, add proper unit tests for BlazorComponent. + // TODO: When the component lifecycle design stabilises, add proper unit tests for ComponentBase. /// - /// Optional base class for Blazor components. Alternatively, Blazor components may + /// Optional base class for components. Alternatively, components may /// implement directly. /// - public abstract class BlazorComponent : IComponent, IHandleEvent, IHandleAfterRender + public abstract class ComponentBase : IComponent, IHandleEvent, IHandleAfterRender { /// /// Specifies the name of the -building method. @@ -37,9 +37,9 @@ namespace Microsoft.AspNetCore.Blazor.Components private bool _hasPendingQueuedRender; /// - /// Constructs an instance of . + /// Constructs an instance of . /// - public BlazorComponent() + public ComponentBase() { _renderFragment = BuildRenderTree; } @@ -134,12 +134,12 @@ namespace Microsoft.AspNetCore.Blazor.Components void IComponent.Init(RenderHandle renderHandle) { - // This implicitly means a BlazorComponent can only be associated with a single + // This implicitly means a ComponentBase can only be associated with a single // renderer. That's the only use case we have right now. If there was ever a need, // a component could hold a collection of render handles. if (_renderHandle.IsInitialized) { - throw new InvalidOperationException($"The render handle is already set. Cannot initialize a {nameof(BlazorComponent)} more than once."); + throw new InvalidOperationException($"The render handle is already set. Cannot initialize a {nameof(ComponentBase)} more than once."); } _renderHandle = renderHandle; diff --git a/src/Microsoft.AspNetCore.Components/Components/ComponentFactory.cs b/src/Microsoft.AspNetCore.Components/ComponentFactory.cs similarity index 97% rename from src/Microsoft.AspNetCore.Components/Components/ComponentFactory.cs rename to src/Microsoft.AspNetCore.Components/ComponentFactory.cs index e0b35b23..78f3b7db 100644 --- a/src/Microsoft.AspNetCore.Components/Components/ComponentFactory.cs +++ b/src/Microsoft.AspNetCore.Components/ComponentFactory.cs @@ -1,14 +1,14 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNetCore.Blazor.Reflection; +using Microsoft.AspNetCore.Components.Reflection; using System; using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; using System.Reflection; -namespace Microsoft.AspNetCore.Blazor.Components +namespace Microsoft.AspNetCore.Components { internal class ComponentFactory { diff --git a/src/Microsoft.AspNetCore.Components/Components/ComponentResolver.cs b/src/Microsoft.AspNetCore.Components/ComponentResolver.cs similarity index 98% rename from src/Microsoft.AspNetCore.Components/Components/ComponentResolver.cs rename to src/Microsoft.AspNetCore.Components/ComponentResolver.cs index ff93d033..77f47bc5 100644 --- a/src/Microsoft.AspNetCore.Components/Components/ComponentResolver.cs +++ b/src/Microsoft.AspNetCore.Components/ComponentResolver.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; -namespace Microsoft.AspNetCore.Blazor.Components +namespace Microsoft.AspNetCore.Components { /// /// Resolves components for an application. diff --git a/src/Microsoft.AspNetCore.Components/ElementRef.cs b/src/Microsoft.AspNetCore.Components/ElementRef.cs index 9c82e7db..139a091d 100644 --- a/src/Microsoft.AspNetCore.Components/ElementRef.cs +++ b/src/Microsoft.AspNetCore.Components/ElementRef.cs @@ -6,7 +6,7 @@ using System; using System.Collections.Generic; using System.Threading; -namespace Microsoft.AspNetCore.Blazor +namespace Microsoft.AspNetCore.Components { /// /// Represents a reference to a rendered element. diff --git a/src/Microsoft.AspNetCore.Components/Components/EventHandlerAttribute.cs b/src/Microsoft.AspNetCore.Components/EventHandlerAttribute.cs similarity index 96% rename from src/Microsoft.AspNetCore.Components/Components/EventHandlerAttribute.cs rename to src/Microsoft.AspNetCore.Components/EventHandlerAttribute.cs index 1e3960e7..767b3c5b 100644 --- a/src/Microsoft.AspNetCore.Components/Components/EventHandlerAttribute.cs +++ b/src/Microsoft.AspNetCore.Components/EventHandlerAttribute.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNetCore.Blazor.Components +namespace Microsoft.AspNetCore.Components { /// /// Associates an event argument type with an event attribute name. diff --git a/src/Microsoft.AspNetCore.Components/Components/EventHandlerInvoker.cs b/src/Microsoft.AspNetCore.Components/EventHandlerInvoker.cs similarity index 97% rename from src/Microsoft.AspNetCore.Components/Components/EventHandlerInvoker.cs rename to src/Microsoft.AspNetCore.Components/EventHandlerInvoker.cs index c73d76fd..9e65c665 100644 --- a/src/Microsoft.AspNetCore.Components/Components/EventHandlerInvoker.cs +++ b/src/Microsoft.AspNetCore.Components/EventHandlerInvoker.cs @@ -4,7 +4,7 @@ using System; using System.Threading.Tasks; -namespace Microsoft.AspNetCore.Blazor.Components +namespace Microsoft.AspNetCore.Components { /// /// A bound event handler delegate. diff --git a/src/Microsoft.AspNetCore.Components/Components/EventHandlers.cs b/src/Microsoft.AspNetCore.Components/EventHandlers.cs similarity index 99% rename from src/Microsoft.AspNetCore.Components/Components/EventHandlers.cs rename to src/Microsoft.AspNetCore.Components/EventHandlers.cs index 150c7331..bc307eb7 100644 --- a/src/Microsoft.AspNetCore.Components/Components/EventHandlers.cs +++ b/src/Microsoft.AspNetCore.Components/EventHandlers.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNetCore.Blazor.Components +namespace Microsoft.AspNetCore.Components { /// /// Holds attributes to configure the mappings between event names and diff --git a/src/Microsoft.AspNetCore.Components/HttpClientJsonExtensions.cs b/src/Microsoft.AspNetCore.Components/HttpClientJsonExtensions.cs index ed29ada2..aa376f6c 100644 --- a/src/Microsoft.AspNetCore.Components/HttpClientJsonExtensions.cs +++ b/src/Microsoft.AspNetCore.Components/HttpClientJsonExtensions.cs @@ -6,7 +6,7 @@ using System.Net.Http; using System.Text; using System.Threading.Tasks; -namespace Microsoft.AspNetCore.Blazor +namespace Microsoft.AspNetCore.Components { /// /// Extension methods for working with JSON APIs. diff --git a/src/Microsoft.AspNetCore.Components/Components/ICascadingValueComponent.cs b/src/Microsoft.AspNetCore.Components/ICascadingValueComponent.cs similarity index 87% rename from src/Microsoft.AspNetCore.Components/Components/ICascadingValueComponent.cs rename to src/Microsoft.AspNetCore.Components/ICascadingValueComponent.cs index d64940e7..de9da715 100644 --- a/src/Microsoft.AspNetCore.Components/Components/ICascadingValueComponent.cs +++ b/src/Microsoft.AspNetCore.Components/ICascadingValueComponent.cs @@ -1,10 +1,10 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNetCore.Blazor.Rendering; +using Microsoft.AspNetCore.Components.Rendering; using System; -namespace Microsoft.AspNetCore.Blazor.Components +namespace Microsoft.AspNetCore.Components { internal interface ICascadingValueComponent { diff --git a/src/Microsoft.AspNetCore.Components/Components/IComponent.cs b/src/Microsoft.AspNetCore.Components/IComponent.cs similarity index 94% rename from src/Microsoft.AspNetCore.Components/Components/IComponent.cs rename to src/Microsoft.AspNetCore.Components/IComponent.cs index 23a07c94..69f20fc7 100644 --- a/src/Microsoft.AspNetCore.Components/Components/IComponent.cs +++ b/src/Microsoft.AspNetCore.Components/IComponent.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -namespace Microsoft.AspNetCore.Blazor.Components +namespace Microsoft.AspNetCore.Components { /// /// Represents a UI component. diff --git a/src/Microsoft.AspNetCore.Components/Components/IHandleAfterRender.cs b/src/Microsoft.AspNetCore.Components/IHandleAfterRender.cs similarity index 91% rename from src/Microsoft.AspNetCore.Components/Components/IHandleAfterRender.cs rename to src/Microsoft.AspNetCore.Components/IHandleAfterRender.cs index 4ed3eaa5..13dea200 100644 --- a/src/Microsoft.AspNetCore.Components/Components/IHandleAfterRender.cs +++ b/src/Microsoft.AspNetCore.Components/IHandleAfterRender.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -namespace Microsoft.AspNetCore.Blazor.Components +namespace Microsoft.AspNetCore.Components { /// /// Interface implemented by components that receive notification that they have been rendered. diff --git a/src/Microsoft.AspNetCore.Components/Components/IHandleEvent.cs b/src/Microsoft.AspNetCore.Components/IHandleEvent.cs similarity index 93% rename from src/Microsoft.AspNetCore.Components/Components/IHandleEvent.cs rename to src/Microsoft.AspNetCore.Components/IHandleEvent.cs index b4f95a44..647c1862 100644 --- a/src/Microsoft.AspNetCore.Components/Components/IHandleEvent.cs +++ b/src/Microsoft.AspNetCore.Components/IHandleEvent.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -namespace Microsoft.AspNetCore.Blazor.Components +namespace Microsoft.AspNetCore.Components { /// /// Interface implemented by components that receive notification of their events. diff --git a/src/Microsoft.AspNetCore.Components/Components/InjectAttribute.cs b/src/Microsoft.AspNetCore.Components/InjectAttribute.cs similarity index 90% rename from src/Microsoft.AspNetCore.Components/Components/InjectAttribute.cs rename to src/Microsoft.AspNetCore.Components/InjectAttribute.cs index 1fd08ae4..3490c456 100644 --- a/src/Microsoft.AspNetCore.Components/Components/InjectAttribute.cs +++ b/src/Microsoft.AspNetCore.Components/InjectAttribute.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNetCore.Blazor.Components +namespace Microsoft.AspNetCore.Components { /// /// Indicates that the associated property should have a value injected from the diff --git a/src/Microsoft.AspNetCore.Components/Json/JsonUtil.cs b/src/Microsoft.AspNetCore.Components/Json/JsonUtil.cs index 4b232386..ae565b12 100644 --- a/src/Microsoft.AspNetCore.Components/Json/JsonUtil.cs +++ b/src/Microsoft.AspNetCore.Components/Json/JsonUtil.cs @@ -4,7 +4,7 @@ using Microsoft.JSInterop; using System; -namespace Microsoft.AspNetCore.Blazor +namespace Microsoft.AspNetCore.Components { /// /// Provides mechanisms for converting between .NET objects and JSON strings. diff --git a/src/Microsoft.AspNetCore.Components/Layouts/LayoutAttribute.cs b/src/Microsoft.AspNetCore.Components/Layouts/LayoutAttribute.cs index e2c891d1..011d1b99 100644 --- a/src/Microsoft.AspNetCore.Components/Layouts/LayoutAttribute.cs +++ b/src/Microsoft.AspNetCore.Components/Layouts/LayoutAttribute.cs @@ -1,10 +1,10 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; using System; -namespace Microsoft.AspNetCore.Blazor.Layouts +namespace Microsoft.AspNetCore.Components.Layouts { /// /// Indicates that the associated component type uses a specified layout. diff --git a/src/Microsoft.AspNetCore.Components/Layouts/BlazorLayoutComponent.cs b/src/Microsoft.AspNetCore.Components/Layouts/LayoutComponentBase.cs similarity index 55% rename from src/Microsoft.AspNetCore.Components/Layouts/BlazorLayoutComponent.cs rename to src/Microsoft.AspNetCore.Components/Layouts/LayoutComponentBase.cs index 7eabf772..97caa00d 100644 --- a/src/Microsoft.AspNetCore.Components/Layouts/BlazorLayoutComponent.cs +++ b/src/Microsoft.AspNetCore.Components/Layouts/LayoutComponentBase.cs @@ -1,16 +1,14 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNetCore.Blazor.Components; - -namespace Microsoft.AspNetCore.Blazor.Layouts +namespace Microsoft.AspNetCore.Components.Layouts { /// /// Optional base class for components that represent a layout. - /// Alternatively, Blazor components may implement directly - /// and declare their own parameter named . + /// Alternatively, components may implement directly + /// and declare their own parameter named . /// - public abstract class BlazorLayoutComponent : BlazorComponent + public abstract class LayoutComponentBase : ComponentBase { internal const string BodyPropertyName = nameof(Body); diff --git a/src/Microsoft.AspNetCore.Components/Layouts/LayoutDisplay.cs b/src/Microsoft.AspNetCore.Components/Layouts/LayoutDisplay.cs index c37404d6..c9b26ea8 100644 --- a/src/Microsoft.AspNetCore.Components/Layouts/LayoutDisplay.cs +++ b/src/Microsoft.AspNetCore.Components/Layouts/LayoutDisplay.cs @@ -4,10 +4,10 @@ using System; using System.Collections.Generic; using System.Reflection; -using Microsoft.AspNetCore.Blazor.Components; -using Microsoft.AspNetCore.Blazor.RenderTree; +using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components.RenderTree; -namespace Microsoft.AspNetCore.Blazor.Layouts +namespace Microsoft.AspNetCore.Components.Layouts { /// /// Displays the specified page component, rendering it inside its layout @@ -67,7 +67,7 @@ namespace Microsoft.AspNetCore.Blazor.Layouts builder.OpenComponent(0, componentType); if (bodyParam != null) { - builder.AddAttribute(1, BlazorLayoutComponent.BodyPropertyName, bodyParam); + builder.AddAttribute(1, LayoutComponentBase.BodyPropertyName, bodyParam); } else { diff --git a/src/Microsoft.AspNetCore.Components/MarkupString.cs b/src/Microsoft.AspNetCore.Components/MarkupString.cs index c9562246..fff1baaf 100644 --- a/src/Microsoft.AspNetCore.Components/MarkupString.cs +++ b/src/Microsoft.AspNetCore.Components/MarkupString.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -namespace Microsoft.AspNetCore.Blazor +namespace Microsoft.AspNetCore.Components { /// /// A string value that can be rendered as markup such as HTML. diff --git a/src/Microsoft.AspNetCore.Components/Microsoft.AspNetCore.Blazor.csproj b/src/Microsoft.AspNetCore.Components/Microsoft.AspNetCore.Components.csproj similarity index 100% rename from src/Microsoft.AspNetCore.Components/Microsoft.AspNetCore.Blazor.csproj rename to src/Microsoft.AspNetCore.Components/Microsoft.AspNetCore.Components.csproj diff --git a/src/Microsoft.AspNetCore.Components/Components/Parameter.cs b/src/Microsoft.AspNetCore.Components/Parameter.cs similarity index 95% rename from src/Microsoft.AspNetCore.Components/Components/Parameter.cs rename to src/Microsoft.AspNetCore.Components/Parameter.cs index 8e4b9db9..3ba8cdff 100644 --- a/src/Microsoft.AspNetCore.Components/Components/Parameter.cs +++ b/src/Microsoft.AspNetCore.Components/Parameter.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -namespace Microsoft.AspNetCore.Blazor.Components +namespace Microsoft.AspNetCore.Components { /// /// Represents a single parameter supplied to an diff --git a/src/Microsoft.AspNetCore.Components/Components/ParameterAttribute.cs b/src/Microsoft.AspNetCore.Components/ParameterAttribute.cs similarity index 90% rename from src/Microsoft.AspNetCore.Components/Components/ParameterAttribute.cs rename to src/Microsoft.AspNetCore.Components/ParameterAttribute.cs index 51ff9e09..ffe39191 100644 --- a/src/Microsoft.AspNetCore.Components/Components/ParameterAttribute.cs +++ b/src/Microsoft.AspNetCore.Components/ParameterAttribute.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNetCore.Blazor.Components +namespace Microsoft.AspNetCore.Components { /// /// Denotes the target member as a component parameter. diff --git a/src/Microsoft.AspNetCore.Components/Components/ParameterCollection.cs b/src/Microsoft.AspNetCore.Components/ParameterCollection.cs similarity index 98% rename from src/Microsoft.AspNetCore.Components/Components/ParameterCollection.cs rename to src/Microsoft.AspNetCore.Components/ParameterCollection.cs index 4a51a95d..18915c67 100644 --- a/src/Microsoft.AspNetCore.Components/Components/ParameterCollection.cs +++ b/src/Microsoft.AspNetCore.Components/ParameterCollection.cs @@ -3,9 +3,9 @@ using System; using System.Collections.Generic; -using Microsoft.AspNetCore.Blazor.RenderTree; +using Microsoft.AspNetCore.Components.RenderTree; -namespace Microsoft.AspNetCore.Blazor.Components +namespace Microsoft.AspNetCore.Components { /// /// Represents a collection of parameters supplied to an diff --git a/src/Microsoft.AspNetCore.Components/Components/ParameterCollectionExtensions.cs b/src/Microsoft.AspNetCore.Components/ParameterCollectionExtensions.cs similarity index 98% rename from src/Microsoft.AspNetCore.Components/Components/ParameterCollectionExtensions.cs rename to src/Microsoft.AspNetCore.Components/ParameterCollectionExtensions.cs index 389a332a..23197087 100644 --- a/src/Microsoft.AspNetCore.Components/Components/ParameterCollectionExtensions.cs +++ b/src/Microsoft.AspNetCore.Components/ParameterCollectionExtensions.cs @@ -1,13 +1,13 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNetCore.Blazor.Reflection; +using Microsoft.AspNetCore.Components.Reflection; using System; using System.Collections.Concurrent; using System.Collections.Generic; using System.Reflection; -namespace Microsoft.AspNetCore.Blazor.Components +namespace Microsoft.AspNetCore.Components { /// /// Extension methods for the type. diff --git a/src/Microsoft.AspNetCore.Components/Components/ParameterEnumerator.cs b/src/Microsoft.AspNetCore.Components/ParameterEnumerator.cs similarity index 98% rename from src/Microsoft.AspNetCore.Components/Components/ParameterEnumerator.cs rename to src/Microsoft.AspNetCore.Components/ParameterEnumerator.cs index 9de7197b..6abc92e8 100644 --- a/src/Microsoft.AspNetCore.Components/Components/ParameterEnumerator.cs +++ b/src/Microsoft.AspNetCore.Components/ParameterEnumerator.cs @@ -1,11 +1,11 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNetCore.Blazor.RenderTree; +using Microsoft.AspNetCore.Components.RenderTree; using System; using System.Collections.Generic; -namespace Microsoft.AspNetCore.Blazor.Components +namespace Microsoft.AspNetCore.Components { /// /// An enumerator that iterates through a . diff --git a/src/Microsoft.AspNetCore.Components/PlatformInfo.cs b/src/Microsoft.AspNetCore.Components/PlatformInfo.cs index 12978114..81338cab 100644 --- a/src/Microsoft.AspNetCore.Components/PlatformInfo.cs +++ b/src/Microsoft.AspNetCore.Components/PlatformInfo.cs @@ -3,7 +3,7 @@ using System.Runtime.InteropServices; -namespace Microsoft.AspNetCore.Blazor +namespace Microsoft.AspNetCore.Components { internal static class PlatformInfo { diff --git a/src/Microsoft.AspNetCore.Components/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.Components/Properties/AssemblyInfo.cs index bc72d0e0..a7721525 100644 --- a/src/Microsoft.AspNetCore.Components/Properties/AssemblyInfo.cs +++ b/src/Microsoft.AspNetCore.Components/Properties/AssemblyInfo.cs @@ -1,7 +1,7 @@ using System.Runtime.CompilerServices; -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Blazor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Blazor.Browser.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Blazor.Build.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Blazor.Performance, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Blazor.Server.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Components.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Components.Browser.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Components.Build.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Components.Performance, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Components.Server.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] diff --git a/src/Microsoft.AspNetCore.Components/Reflection/IPropertySetter.cs b/src/Microsoft.AspNetCore.Components/Reflection/IPropertySetter.cs index a106a4d7..061580f2 100644 --- a/src/Microsoft.AspNetCore.Components/Reflection/IPropertySetter.cs +++ b/src/Microsoft.AspNetCore.Components/Reflection/IPropertySetter.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNetCore.Blazor.Reflection +namespace Microsoft.AspNetCore.Components.Reflection { internal interface IPropertySetter { diff --git a/src/Microsoft.AspNetCore.Components/Reflection/MemberAssignment.cs b/src/Microsoft.AspNetCore.Components/Reflection/MemberAssignment.cs index 10fdb47b..eff055a1 100644 --- a/src/Microsoft.AspNetCore.Components/Reflection/MemberAssignment.cs +++ b/src/Microsoft.AspNetCore.Components/Reflection/MemberAssignment.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; -namespace Microsoft.AspNetCore.Blazor.Reflection +namespace Microsoft.AspNetCore.Components.Reflection { internal class MemberAssignment { diff --git a/src/Microsoft.AspNetCore.Components/RenderFragment.cs b/src/Microsoft.AspNetCore.Components/RenderFragment.cs index 56a1e6c2..19959669 100644 --- a/src/Microsoft.AspNetCore.Components/RenderFragment.cs +++ b/src/Microsoft.AspNetCore.Components/RenderFragment.cs @@ -1,9 +1,9 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNetCore.Blazor.RenderTree; +using Microsoft.AspNetCore.Components.RenderTree; -namespace Microsoft.AspNetCore.Blazor +namespace Microsoft.AspNetCore.Components { /// /// Represents a segment of UI content, implemented as a delegate that diff --git a/src/Microsoft.AspNetCore.Components/Components/RenderHandle.cs b/src/Microsoft.AspNetCore.Components/RenderHandle.cs similarity index 90% rename from src/Microsoft.AspNetCore.Components/Components/RenderHandle.cs rename to src/Microsoft.AspNetCore.Components/RenderHandle.cs index 9da5a86a..416fca5d 100644 --- a/src/Microsoft.AspNetCore.Components/Components/RenderHandle.cs +++ b/src/Microsoft.AspNetCore.Components/RenderHandle.cs @@ -1,11 +1,11 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNetCore.Blazor.Rendering; -using Microsoft.AspNetCore.Blazor.RenderTree; +using Microsoft.AspNetCore.Components.Rendering; +using Microsoft.AspNetCore.Components.RenderTree; using System; -namespace Microsoft.AspNetCore.Blazor.Components +namespace Microsoft.AspNetCore.Components { /// /// Allows a component to notify the renderer that it should be rendered. diff --git a/src/Microsoft.AspNetCore.Components/RenderTree/ArrayBuilder.cs b/src/Microsoft.AspNetCore.Components/RenderTree/ArrayBuilder.cs index 979ec0df..918766ae 100644 --- a/src/Microsoft.AspNetCore.Components/RenderTree/ArrayBuilder.cs +++ b/src/Microsoft.AspNetCore.Components/RenderTree/ArrayBuilder.cs @@ -4,7 +4,7 @@ using System; using System.Runtime.CompilerServices; -namespace Microsoft.AspNetCore.Blazor.RenderTree +namespace Microsoft.AspNetCore.Components.RenderTree { /// /// Implements a list that uses an array of objects to store the elements. diff --git a/src/Microsoft.AspNetCore.Components/RenderTree/ArrayRange.cs b/src/Microsoft.AspNetCore.Components/RenderTree/ArrayRange.cs index 63d5cd69..3b6e5457 100644 --- a/src/Microsoft.AspNetCore.Components/RenderTree/ArrayRange.cs +++ b/src/Microsoft.AspNetCore.Components/RenderTree/ArrayRange.cs @@ -5,7 +5,7 @@ using System; using System.Collections; using System.Collections.Generic; -namespace Microsoft.AspNetCore.Blazor.RenderTree +namespace Microsoft.AspNetCore.Components.RenderTree { /// /// Represents a range of elements in an array that are in use. diff --git a/src/Microsoft.AspNetCore.Components/RenderTree/RenderTreeBuilder.cs b/src/Microsoft.AspNetCore.Components/RenderTree/RenderTreeBuilder.cs index 447fd9c9..ede97f7d 100644 --- a/src/Microsoft.AspNetCore.Components/RenderTree/RenderTreeBuilder.cs +++ b/src/Microsoft.AspNetCore.Components/RenderTree/RenderTreeBuilder.cs @@ -4,10 +4,10 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; -using Microsoft.AspNetCore.Blazor.Components; -using Microsoft.AspNetCore.Blazor.Rendering; +using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components.Rendering; -namespace Microsoft.AspNetCore.Blazor.RenderTree +namespace Microsoft.AspNetCore.Components.RenderTree { // IMPORTANT // diff --git a/src/Microsoft.AspNetCore.Components/RenderTree/RenderTreeDiff.cs b/src/Microsoft.AspNetCore.Components/RenderTree/RenderTreeDiff.cs index e7351013..aa874a16 100644 --- a/src/Microsoft.AspNetCore.Components/RenderTree/RenderTreeDiff.cs +++ b/src/Microsoft.AspNetCore.Components/RenderTree/RenderTreeDiff.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNetCore.Blazor.RenderTree +namespace Microsoft.AspNetCore.Components.RenderTree { /// /// Describes changes to a component's render tree between successive renders. diff --git a/src/Microsoft.AspNetCore.Components/RenderTree/RenderTreeDiffBuilder.cs b/src/Microsoft.AspNetCore.Components/RenderTree/RenderTreeDiffBuilder.cs index 56c1e7b9..4e94c3d2 100644 --- a/src/Microsoft.AspNetCore.Components/RenderTree/RenderTreeDiffBuilder.cs +++ b/src/Microsoft.AspNetCore.Components/RenderTree/RenderTreeDiffBuilder.cs @@ -3,10 +3,10 @@ using System; using System.Collections.Generic; -using Microsoft.AspNetCore.Blazor.Components; -using Microsoft.AspNetCore.Blazor.Rendering; +using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components.Rendering; -namespace Microsoft.AspNetCore.Blazor.RenderTree +namespace Microsoft.AspNetCore.Components.RenderTree { internal static class RenderTreeDiffBuilder { diff --git a/src/Microsoft.AspNetCore.Components/RenderTree/RenderTreeEdit.cs b/src/Microsoft.AspNetCore.Components/RenderTree/RenderTreeEdit.cs index 9ea6ded6..d7c0daa7 100644 --- a/src/Microsoft.AspNetCore.Components/RenderTree/RenderTreeEdit.cs +++ b/src/Microsoft.AspNetCore.Components/RenderTree/RenderTreeEdit.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNetCore.Blazor.RenderTree +namespace Microsoft.AspNetCore.Components.RenderTree { /// /// Represents a single edit operation on a component's render tree. diff --git a/src/Microsoft.AspNetCore.Components/RenderTree/RenderTreeEditType.cs b/src/Microsoft.AspNetCore.Components/RenderTree/RenderTreeEditType.cs index 7a28a78b..aa7ca3a6 100644 --- a/src/Microsoft.AspNetCore.Components/RenderTree/RenderTreeEditType.cs +++ b/src/Microsoft.AspNetCore.Components/RenderTree/RenderTreeEditType.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -namespace Microsoft.AspNetCore.Blazor.RenderTree +namespace Microsoft.AspNetCore.Components.RenderTree { /// /// Describes the type of a render tree edit operation. diff --git a/src/Microsoft.AspNetCore.Components/RenderTree/RenderTreeFrame.cs b/src/Microsoft.AspNetCore.Components/RenderTree/RenderTreeFrame.cs index c9f624fb..920d0752 100644 --- a/src/Microsoft.AspNetCore.Components/RenderTree/RenderTreeFrame.cs +++ b/src/Microsoft.AspNetCore.Components/RenderTree/RenderTreeFrame.cs @@ -3,10 +3,10 @@ using System; using System.Runtime.InteropServices; -using Microsoft.AspNetCore.Blazor.Components; -using Microsoft.AspNetCore.Blazor.Rendering; +using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components.Rendering; -namespace Microsoft.AspNetCore.Blazor.RenderTree +namespace Microsoft.AspNetCore.Components.RenderTree { /// /// Represents an entry in a tree of user interface (UI) items. diff --git a/src/Microsoft.AspNetCore.Components/RenderTree/RenderTreeFrameType.cs b/src/Microsoft.AspNetCore.Components/RenderTree/RenderTreeFrameType.cs index 397e43b0..799185e2 100644 --- a/src/Microsoft.AspNetCore.Components/RenderTree/RenderTreeFrameType.cs +++ b/src/Microsoft.AspNetCore.Components/RenderTree/RenderTreeFrameType.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -namespace Microsoft.AspNetCore.Blazor.RenderTree +namespace Microsoft.AspNetCore.Components.RenderTree { /// /// Describes the type of a . diff --git a/src/Microsoft.AspNetCore.Components/Rendering/ComponentState.cs b/src/Microsoft.AspNetCore.Components/Rendering/ComponentState.cs index 3b0a4eae..a0ecb672 100644 --- a/src/Microsoft.AspNetCore.Components/Rendering/ComponentState.cs +++ b/src/Microsoft.AspNetCore.Components/Rendering/ComponentState.cs @@ -3,10 +3,10 @@ using System; using System.Collections.Generic; -using Microsoft.AspNetCore.Blazor.Components; -using Microsoft.AspNetCore.Blazor.RenderTree; +using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components.RenderTree; -namespace Microsoft.AspNetCore.Blazor.Rendering +namespace Microsoft.AspNetCore.Components.Rendering { /// /// Tracks the rendering state associated with an instance diff --git a/src/Microsoft.AspNetCore.Components/Rendering/RenderBatch.cs b/src/Microsoft.AspNetCore.Components/Rendering/RenderBatch.cs index b962ddd5..cb79c0ff 100644 --- a/src/Microsoft.AspNetCore.Components/Rendering/RenderBatch.cs +++ b/src/Microsoft.AspNetCore.Components/Rendering/RenderBatch.cs @@ -1,9 +1,9 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNetCore.Blazor.RenderTree; +using Microsoft.AspNetCore.Components.RenderTree; -namespace Microsoft.AspNetCore.Blazor.Rendering +namespace Microsoft.AspNetCore.Components.Rendering { /// /// Describes a set of UI changes. diff --git a/src/Microsoft.AspNetCore.Components/Rendering/RenderBatchBuilder.cs b/src/Microsoft.AspNetCore.Components/Rendering/RenderBatchBuilder.cs index b3ecada8..bde7ea58 100644 --- a/src/Microsoft.AspNetCore.Components/Rendering/RenderBatchBuilder.cs +++ b/src/Microsoft.AspNetCore.Components/Rendering/RenderBatchBuilder.cs @@ -2,9 +2,9 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Collections.Generic; -using Microsoft.AspNetCore.Blazor.RenderTree; +using Microsoft.AspNetCore.Components.RenderTree; -namespace Microsoft.AspNetCore.Blazor.Rendering +namespace Microsoft.AspNetCore.Components.Rendering { /// /// Collects the data produced by the rendering system during the course diff --git a/src/Microsoft.AspNetCore.Components/Rendering/RenderQueueEntry.cs b/src/Microsoft.AspNetCore.Components/Rendering/RenderQueueEntry.cs index 3b832548..09e5e9c3 100644 --- a/src/Microsoft.AspNetCore.Components/Rendering/RenderQueueEntry.cs +++ b/src/Microsoft.AspNetCore.Components/Rendering/RenderQueueEntry.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNetCore.Blazor.Rendering +namespace Microsoft.AspNetCore.Components.Rendering { internal readonly struct RenderQueueEntry { diff --git a/src/Microsoft.AspNetCore.Components/Rendering/Renderer.cs b/src/Microsoft.AspNetCore.Components/Rendering/Renderer.cs index cb48ed54..84986119 100644 --- a/src/Microsoft.AspNetCore.Components/Rendering/Renderer.cs +++ b/src/Microsoft.AspNetCore.Components/Rendering/Renderer.cs @@ -1,14 +1,14 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNetCore.Blazor.Components; -using Microsoft.AspNetCore.Blazor.RenderTree; +using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components.RenderTree; using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace Microsoft.AspNetCore.Blazor.Rendering +namespace Microsoft.AspNetCore.Components.Rendering { /// /// Provides mechanisms for rendering hierarchies of instances, diff --git a/src/Microsoft.AspNetCore.Components/Components/RouteAttribute.cs b/src/Microsoft.AspNetCore.Components/RouteAttribute.cs similarity index 95% rename from src/Microsoft.AspNetCore.Components/Components/RouteAttribute.cs rename to src/Microsoft.AspNetCore.Components/RouteAttribute.cs index 313eb560..f46d0491 100644 --- a/src/Microsoft.AspNetCore.Components/Components/RouteAttribute.cs +++ b/src/Microsoft.AspNetCore.Components/RouteAttribute.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNetCore.Blazor.Components +namespace Microsoft.AspNetCore.Components { /// /// Indicates that the associated component should match the specified route template pattern. diff --git a/src/Microsoft.AspNetCore.Components/Routing/NavLink.cs b/src/Microsoft.AspNetCore.Components/Routing/NavLink.cs index 668e4890..f73882e9 100644 --- a/src/Microsoft.AspNetCore.Components/Routing/NavLink.cs +++ b/src/Microsoft.AspNetCore.Components/Routing/NavLink.cs @@ -1,14 +1,14 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNetCore.Blazor.Components; -using Microsoft.AspNetCore.Blazor.RenderTree; -using Microsoft.AspNetCore.Blazor.Services; +using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components.RenderTree; +using Microsoft.AspNetCore.Components.Services; using System; using System.Collections.Generic; using System.Linq; -namespace Microsoft.AspNetCore.Blazor.Routing +namespace Microsoft.AspNetCore.Components.Routing { // NOTE: This could be implemented in a more performant way by iterating through // the ParameterCollection only once (instead of multiple TryGetValue calls), and diff --git a/src/Microsoft.AspNetCore.Components/Routing/NavLinkMatch.cs b/src/Microsoft.AspNetCore.Components/Routing/NavLinkMatch.cs index 1e08d6f7..a6dad176 100644 --- a/src/Microsoft.AspNetCore.Components/Routing/NavLinkMatch.cs +++ b/src/Microsoft.AspNetCore.Components/Routing/NavLinkMatch.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -namespace Microsoft.AspNetCore.Blazor.Routing +namespace Microsoft.AspNetCore.Components.Routing { /// /// Modifies the URL matching behavior for a . diff --git a/src/Microsoft.AspNetCore.Components/Routing/RouteConstraint.cs b/src/Microsoft.AspNetCore.Components/Routing/RouteConstraint.cs index db316ecd..766f6a2f 100644 --- a/src/Microsoft.AspNetCore.Components/Routing/RouteConstraint.cs +++ b/src/Microsoft.AspNetCore.Components/Routing/RouteConstraint.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; using System.Globalization; -namespace Microsoft.AspNetCore.Blazor.Routing +namespace Microsoft.AspNetCore.Components.Routing { internal abstract class RouteConstraint { diff --git a/src/Microsoft.AspNetCore.Components/Routing/RouteContext.cs b/src/Microsoft.AspNetCore.Components/Routing/RouteContext.cs index 605e4558..4830249e 100644 --- a/src/Microsoft.AspNetCore.Components/Routing/RouteContext.cs +++ b/src/Microsoft.AspNetCore.Components/Routing/RouteContext.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; -namespace Microsoft.AspNetCore.Blazor.Routing +namespace Microsoft.AspNetCore.Components.Routing { internal class RouteContext { diff --git a/src/Microsoft.AspNetCore.Components/Routing/RouteEntry.cs b/src/Microsoft.AspNetCore.Components/Routing/RouteEntry.cs index c84b189b..d9631715 100644 --- a/src/Microsoft.AspNetCore.Components/Routing/RouteEntry.cs +++ b/src/Microsoft.AspNetCore.Components/Routing/RouteEntry.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; -namespace Microsoft.AspNetCore.Blazor.Routing +namespace Microsoft.AspNetCore.Components.Routing { internal class RouteEntry { diff --git a/src/Microsoft.AspNetCore.Components/Routing/RouteTable.cs b/src/Microsoft.AspNetCore.Components/Routing/RouteTable.cs index 81f374e7..0a30f7cb 100644 --- a/src/Microsoft.AspNetCore.Components/Routing/RouteTable.cs +++ b/src/Microsoft.AspNetCore.Components/Routing/RouteTable.cs @@ -5,9 +5,9 @@ using System; using System.Collections.Generic; using System.Linq; using System.Reflection; -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; -namespace Microsoft.AspNetCore.Blazor.Routing +namespace Microsoft.AspNetCore.Components.Routing { internal class RouteTable { diff --git a/src/Microsoft.AspNetCore.Components/Routing/RouteTemplate.cs b/src/Microsoft.AspNetCore.Components/Routing/RouteTemplate.cs index d673ecb3..1856ef20 100644 --- a/src/Microsoft.AspNetCore.Components/Routing/RouteTemplate.cs +++ b/src/Microsoft.AspNetCore.Components/Routing/RouteTemplate.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -namespace Microsoft.AspNetCore.Blazor.Routing +namespace Microsoft.AspNetCore.Components.Routing { internal class RouteTemplate { diff --git a/src/Microsoft.AspNetCore.Components/Routing/Router.cs b/src/Microsoft.AspNetCore.Components/Routing/Router.cs index 1925bba6..8ccbfc11 100644 --- a/src/Microsoft.AspNetCore.Components/Routing/Router.cs +++ b/src/Microsoft.AspNetCore.Components/Routing/Router.cs @@ -4,12 +4,12 @@ using System; using System.Collections.Generic; using System.Reflection; -using Microsoft.AspNetCore.Blazor.Components; -using Microsoft.AspNetCore.Blazor.Layouts; -using Microsoft.AspNetCore.Blazor.RenderTree; -using Microsoft.AspNetCore.Blazor.Services; +using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components.Layouts; +using Microsoft.AspNetCore.Components.RenderTree; +using Microsoft.AspNetCore.Components.Services; -namespace Microsoft.AspNetCore.Blazor.Routing +namespace Microsoft.AspNetCore.Components.Routing { /// /// A component that displays whichever other component corresponds to the diff --git a/src/Microsoft.AspNetCore.Components/Routing/TemplateParser.cs b/src/Microsoft.AspNetCore.Components/Routing/TemplateParser.cs index d41500d0..d4563ebf 100644 --- a/src/Microsoft.AspNetCore.Components/Routing/TemplateParser.cs +++ b/src/Microsoft.AspNetCore.Components/Routing/TemplateParser.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -namespace Microsoft.AspNetCore.Blazor.Routing +namespace Microsoft.AspNetCore.Components.Routing { // This implementation is temporary, in the future we'll want to have // a more performant/properly designed routing set of abstractions. diff --git a/src/Microsoft.AspNetCore.Components/Routing/TemplateSegment.cs b/src/Microsoft.AspNetCore.Components/Routing/TemplateSegment.cs index 6e698662..9f732598 100644 --- a/src/Microsoft.AspNetCore.Components/Routing/TemplateSegment.cs +++ b/src/Microsoft.AspNetCore.Components/Routing/TemplateSegment.cs @@ -4,7 +4,7 @@ using System; using System.Linq; -namespace Microsoft.AspNetCore.Blazor.Routing +namespace Microsoft.AspNetCore.Components.Routing { internal class TemplateSegment { diff --git a/src/Microsoft.AspNetCore.Components/Routing/TypeRouteConstraint.cs b/src/Microsoft.AspNetCore.Components/Routing/TypeRouteConstraint.cs index fcb44580..1026e88e 100644 --- a/src/Microsoft.AspNetCore.Components/Routing/TypeRouteConstraint.cs +++ b/src/Microsoft.AspNetCore.Components/Routing/TypeRouteConstraint.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -namespace Microsoft.AspNetCore.Blazor.Routing +namespace Microsoft.AspNetCore.Components.Routing { /// /// A route constraint that requires the value to be parseable as a specified type. diff --git a/src/Microsoft.AspNetCore.Components/Components/RuntimeHelpers.cs b/src/Microsoft.AspNetCore.Components/RuntimeHelpers.cs similarity index 93% rename from src/Microsoft.AspNetCore.Components/Components/RuntimeHelpers.cs rename to src/Microsoft.AspNetCore.Components/RuntimeHelpers.cs index 44330770..3ef9517c 100644 --- a/src/Microsoft.AspNetCore.Components/Components/RuntimeHelpers.cs +++ b/src/Microsoft.AspNetCore.Components/RuntimeHelpers.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -namespace Microsoft.AspNetCore.Blazor.Components +namespace Microsoft.AspNetCore.Components { /// /// Used by generated code produced by the Blazor code generator. Not intended or supported diff --git a/src/Microsoft.AspNetCore.Components/Services/IUriHelper.cs b/src/Microsoft.AspNetCore.Components/Services/IUriHelper.cs index 8440a1d7..e8deebaf 100644 --- a/src/Microsoft.AspNetCore.Components/Services/IUriHelper.cs +++ b/src/Microsoft.AspNetCore.Components/Services/IUriHelper.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNetCore.Blazor.Services +namespace Microsoft.AspNetCore.Components.Services { /// /// Helpers for working with URIs and navigation state. diff --git a/src/Microsoft.AspNetCore.Components/Services/UriHelperBase.cs b/src/Microsoft.AspNetCore.Components/Services/UriHelperBase.cs index 69586b1e..78f2c2fa 100644 --- a/src/Microsoft.AspNetCore.Components/Services/UriHelperBase.cs +++ b/src/Microsoft.AspNetCore.Components/Services/UriHelperBase.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNetCore.Blazor.Services +namespace Microsoft.AspNetCore.Components.Services { /// /// A base class for implementations. diff --git a/src/Microsoft.AspNetCore.Components/UIEventArgs.cs b/src/Microsoft.AspNetCore.Components/UIEventArgs.cs index f66541ec..eceff45c 100644 --- a/src/Microsoft.AspNetCore.Components/UIEventArgs.cs +++ b/src/Microsoft.AspNetCore.Components/UIEventArgs.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -namespace Microsoft.AspNetCore.Blazor +namespace Microsoft.AspNetCore.Components { /// /// Supplies information about an event that is being raised. @@ -45,7 +45,7 @@ namespace Microsoft.AspNetCore.Blazor /// /// The data that underlies a drag-and-drop operation, known as the drag data store. - /// See . + /// See . /// public DataTransfer DataTransfer { get; set; } diff --git a/src/Microsoft.AspNetCore.Components/UIEventArgsRenderTreeBuilderExtensions.cs b/src/Microsoft.AspNetCore.Components/UIEventArgsRenderTreeBuilderExtensions.cs index 66f89a67..0efb0679 100644 --- a/src/Microsoft.AspNetCore.Components/UIEventArgsRenderTreeBuilderExtensions.cs +++ b/src/Microsoft.AspNetCore.Components/UIEventArgsRenderTreeBuilderExtensions.cs @@ -3,9 +3,9 @@ using System; using System.Threading.Tasks; -using Microsoft.AspNetCore.Blazor.RenderTree; +using Microsoft.AspNetCore.Components.RenderTree; -namespace Microsoft.AspNetCore.Blazor +namespace Microsoft.AspNetCore.Components { /// /// Extensions methods on for event handlers. diff --git a/src/shared/BlazorApi.cs b/src/shared/ComponentsApi.cs similarity index 78% rename from src/shared/BlazorApi.cs rename to src/shared/ComponentsApi.cs index a70bb9f4..7506853e 100644 --- a/src/shared/BlazorApi.cs +++ b/src/shared/ComponentsApi.cs @@ -1,18 +1,18 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -namespace Microsoft.AspNetCore.Blazor.Shared +namespace Microsoft.AspNetCore.Components.Shared { // Constants for method names used in code-generation // Keep these in sync with the actual definitions - internal static class BlazorApi + internal static class ComponentsApi { - public static readonly string AssemblyName = "Microsoft.AspNetCore.Blazor"; + public static readonly string AssemblyName = "Microsoft.AspNetCore.Components"; - public static class BlazorComponent + public static class ComponentBase { - public static readonly string Namespace = "Microsoft.AspNetCore.Blazor.Components"; - public static readonly string FullTypeName = Namespace + ".BlazorComponent"; + public static readonly string Namespace = "Microsoft.AspNetCore.Components"; + public static readonly string FullTypeName = Namespace + ".ComponentBase"; public static readonly string MetadataName = FullTypeName; public static readonly string BuildRenderTree = nameof(BuildRenderTree); @@ -20,18 +20,23 @@ namespace Microsoft.AspNetCore.Blazor.Shared public static class ParameterAttribute { - public static readonly string FullTypeName = "Microsoft.AspNetCore.Blazor.Components.ParameterAttribute"; + public static readonly string FullTypeName = "Microsoft.AspNetCore.Components.ParameterAttribute"; public static readonly string MetadataName = FullTypeName; } public static class LayoutAttribute { - public static readonly string FullTypeName = "Microsoft.AspNetCore.Blazor.Layouts.LayoutAttribute"; + public static readonly string FullTypeName = "Microsoft.AspNetCore.Components.Layouts.LayoutAttribute"; + } + + public static class InjectAttribute + { + public static readonly string FullTypeName = "Microsoft.AspNetCore.Components.InjectAttribute"; } public static class IComponent { - public static readonly string FullTypeName = "Microsoft.AspNetCore.Blazor.Components.IComponent"; + public static readonly string FullTypeName = "Microsoft.AspNetCore.Components.IComponent"; public static readonly string MetadataName = FullTypeName; } @@ -43,21 +48,21 @@ namespace Microsoft.AspNetCore.Blazor.Shared public static class RenderFragment { - public static readonly string Namespace = "Microsoft.AspNetCore.Blazor"; + public static readonly string Namespace = "Microsoft.AspNetCore.Components"; public static readonly string FullTypeName = Namespace + ".RenderFragment"; public static readonly string MetadataName = FullTypeName; } public static class RenderFragmentOfT { - public static readonly string Namespace = "Microsoft.AspNetCore.Blazor"; + public static readonly string Namespace = "Microsoft.AspNetCore.Components"; public static readonly string FullTypeName = Namespace + ".RenderFragment<>"; public static readonly string MetadataName = Namespace + ".RenderFragment`1"; } public static class RenderTreeBuilder { - public static readonly string FullTypeName = "Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder"; + public static readonly string FullTypeName = "Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder"; public static readonly string OpenElement = nameof(OpenElement); @@ -86,43 +91,43 @@ namespace Microsoft.AspNetCore.Blazor.Shared public static class RuntimeHelpers { - public static readonly string TypeCheck = "Microsoft.AspNetCore.Blazor.Components.RuntimeHelpers.TypeCheck"; + public static readonly string TypeCheck = "Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck"; } public static class RouteAttribute { - public static readonly string FullTypeName = "Microsoft.AspNetCore.Blazor.Components.RouteAttribute"; + public static readonly string FullTypeName = "Microsoft.AspNetCore.Components.RouteAttribute"; } public static class BindElementAttribute { - public static readonly string FullTypeName = "Microsoft.AspNetCore.Blazor.Components.BindElementAttribute"; + public static readonly string FullTypeName = "Microsoft.AspNetCore.Components.BindElementAttribute"; } public static class BindInputElementAttribute { - public static readonly string FullTypeName = "Microsoft.AspNetCore.Blazor.Components.BindInputElementAttribute"; + public static readonly string FullTypeName = "Microsoft.AspNetCore.Components.BindInputElementAttribute"; } public static class BindMethods { - public static readonly string FullTypeName = "Microsoft.AspNetCore.Blazor.Components.BindMethods"; + public static readonly string FullTypeName = "Microsoft.AspNetCore.Components.BindMethods"; - public static readonly string GetValue = "Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue"; + public static readonly string GetValue = "Microsoft.AspNetCore.Components.BindMethods.GetValue"; - public static readonly string GetEventHandlerValue = "Microsoft.AspNetCore.Blazor.Components.BindMethods.GetEventHandlerValue"; + public static readonly string GetEventHandlerValue = "Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue"; - public static readonly string SetValueHandler = "Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler"; + public static readonly string SetValueHandler = "Microsoft.AspNetCore.Components.BindMethods.SetValueHandler"; } public static class EventHandlerAttribute { - public static readonly string FullTypeName = "Microsoft.AspNetCore.Blazor.Components.EventHandlerAttribute"; + public static readonly string FullTypeName = "Microsoft.AspNetCore.Components.EventHandlerAttribute"; } public static class ElementRef { - public static readonly string FullTypeName = "Microsoft.AspNetCore.Blazor.ElementRef"; + public static readonly string FullTypeName = "Microsoft.AspNetCore.Components.ElementRef"; } } } diff --git a/test/Microsoft.AspNetCore.Components.Analyzers.Test/ComponentParametersShouldNotBePublicTest.cs b/test/Microsoft.AspNetCore.Components.Analyzers.Test/ComponentParametersShouldNotBePublicTest.cs index 4b229e8a..832c37b3 100644 --- a/test/Microsoft.AspNetCore.Components.Analyzers.Test/ComponentParametersShouldNotBePublicTest.cs +++ b/test/Microsoft.AspNetCore.Components.Analyzers.Test/ComponentParametersShouldNotBePublicTest.cs @@ -1,14 +1,14 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CodeFixes; using Microsoft.CodeAnalysis.Diagnostics; using TestHelper; using Xunit; -namespace Microsoft.AspNetCore.Blazor.Analyzers.Test +namespace Microsoft.AspNetCore.Components.Analyzers.Test { public class ComponentParametersShouldNotBePublic : CodeFixVerifier { diff --git a/test/Microsoft.AspNetCore.Components.Analyzers.Test/Microsoft.AspNetCore.Blazor.Analyzers.Test.csproj b/test/Microsoft.AspNetCore.Components.Analyzers.Test/Microsoft.AspNetCore.Components.Analyzers.Test.csproj similarity index 84% rename from test/Microsoft.AspNetCore.Components.Analyzers.Test/Microsoft.AspNetCore.Blazor.Analyzers.Test.csproj rename to test/Microsoft.AspNetCore.Components.Analyzers.Test/Microsoft.AspNetCore.Components.Analyzers.Test.csproj index 4715aa21..0c0a4fc5 100644 --- a/test/Microsoft.AspNetCore.Components.Analyzers.Test/Microsoft.AspNetCore.Blazor.Analyzers.Test.csproj +++ b/test/Microsoft.AspNetCore.Components.Analyzers.Test/Microsoft.AspNetCore.Components.Analyzers.Test.csproj @@ -13,8 +13,8 @@ - - + + diff --git a/test/Microsoft.AspNetCore.Components.Browser.Test/BrowserUriHelperTest.cs b/test/Microsoft.AspNetCore.Components.Browser.Test/BrowserUriHelperTest.cs index 14980adf..d4a42809 100644 --- a/test/Microsoft.AspNetCore.Components.Browser.Test/BrowserUriHelperTest.cs +++ b/test/Microsoft.AspNetCore.Components.Browser.Test/BrowserUriHelperTest.cs @@ -1,11 +1,11 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNetCore.Blazor.Browser.Services; +using Microsoft.AspNetCore.Components.Browser.Services; using System; using Xunit; -namespace Microsoft.AspNetCore.Blazor.Browser.Test +namespace Microsoft.AspNetCore.Components.Browser.Test { public class BrowserUriHelperTest { diff --git a/test/Microsoft.AspNetCore.Components.Browser.Test/Hosting/ConventionBasedStartupTest.cs b/test/Microsoft.AspNetCore.Components.Browser.Test/Hosting/ConventionBasedStartupTest.cs index ea5b114d..c1fa676e 100644 --- a/test/Microsoft.AspNetCore.Components.Browser.Test/Hosting/ConventionBasedStartupTest.cs +++ b/test/Microsoft.AspNetCore.Components.Browser.Test/Hosting/ConventionBasedStartupTest.cs @@ -3,11 +3,11 @@ using System; using System.Collections.Generic; -using Microsoft.AspNetCore.Blazor.Builder; +using Microsoft.AspNetCore.Components.Builder; using Microsoft.Extensions.DependencyInjection; using Xunit; -namespace Microsoft.AspNetCore.Blazor.Hosting +namespace Microsoft.AspNetCore.Components.Hosting { public class ConventionBasedStartupTest { diff --git a/test/Microsoft.AspNetCore.Components.Browser.Test/Hosting/WebAssemblyHostBuilderTest.cs b/test/Microsoft.AspNetCore.Components.Browser.Test/Hosting/WebAssemblyHostBuilderTest.cs index c9f9596d..63b57453 100644 --- a/test/Microsoft.AspNetCore.Components.Browser.Test/Hosting/WebAssemblyHostBuilderTest.cs +++ b/test/Microsoft.AspNetCore.Components.Browser.Test/Hosting/WebAssemblyHostBuilderTest.cs @@ -6,7 +6,7 @@ using System.Text; using Microsoft.Extensions.DependencyInjection; using Xunit; -namespace Microsoft.AspNetCore.Blazor.Hosting +namespace Microsoft.AspNetCore.Components.Hosting { public class WebAssemblyHostBuilderTest { diff --git a/test/Microsoft.AspNetCore.Components.Browser.Test/Hosting/WebAssemblyHostTest.cs b/test/Microsoft.AspNetCore.Components.Browser.Test/Hosting/WebAssemblyHostTest.cs index cb9d1481..476f8882 100644 --- a/test/Microsoft.AspNetCore.Components.Browser.Test/Hosting/WebAssemblyHostTest.cs +++ b/test/Microsoft.AspNetCore.Components.Browser.Test/Hosting/WebAssemblyHostTest.cs @@ -3,13 +3,13 @@ using System; using System.Threading.Tasks; -using Microsoft.AspNetCore.Blazor.Builder; +using Microsoft.AspNetCore.Components.Builder; using Microsoft.Extensions.DependencyInjection; using Microsoft.JSInterop; using Mono.WebAssembly.Interop; using Xunit; -namespace Microsoft.AspNetCore.Blazor.Hosting +namespace Microsoft.AspNetCore.Components.Hosting { public class WebAssemblyHostTest { diff --git a/test/Microsoft.AspNetCore.Components.Browser.Test/Microsoft.AspNetCore.Blazor.Browser.Test.csproj b/test/Microsoft.AspNetCore.Components.Browser.Test/Microsoft.AspNetCore.Components.Browser.Test.csproj similarity index 91% rename from test/Microsoft.AspNetCore.Components.Browser.Test/Microsoft.AspNetCore.Blazor.Browser.Test.csproj rename to test/Microsoft.AspNetCore.Components.Browser.Test/Microsoft.AspNetCore.Components.Browser.Test.csproj index 72ac4bd1..2a25b2f2 100644 --- a/test/Microsoft.AspNetCore.Components.Browser.Test/Microsoft.AspNetCore.Blazor.Browser.Test.csproj +++ b/test/Microsoft.AspNetCore.Components.Browser.Test/Microsoft.AspNetCore.Components.Browser.Test.csproj @@ -14,7 +14,7 @@ - + diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/BindRazorIntegrationTest.cs b/test/Microsoft.AspNetCore.Components.Build.Test/BindRazorIntegrationTest.cs index 126b0e87..fb913c4f 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/BindRazorIntegrationTest.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/BindRazorIntegrationTest.cs @@ -1,12 +1,12 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNetCore.Blazor.Test.Helpers; -using Microsoft.CodeAnalysis.CSharp; +using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components.Test.Helpers; using Xunit; -namespace Microsoft.AspNetCore.Blazor.Build.Test +namespace Microsoft.AspNetCore.Components.Build.Test { public class BindRazorIntegrationTest : RazorIntegrationTestBase { @@ -18,11 +18,11 @@ namespace Microsoft.AspNetCore.Blazor.Build.Test // Arrange AdditionalSyntaxTrees.Add(Parse(@" using System; -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { [Parameter] int Value { get; set; } @@ -56,11 +56,11 @@ namespace Test // Arrange AdditionalSyntaxTrees.Add(Parse(@" using System; -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent, IComponent + public class MyComponent : ComponentBase, IComponent { void IComponent.SetParameters(ParameterCollection parameters) { @@ -92,11 +92,11 @@ namespace Test // Arrange AdditionalSyntaxTrees.Add(Parse(@" using System; -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { [Parameter] int Value { get; set; } @@ -130,11 +130,11 @@ namespace Test // Arrange AdditionalSyntaxTrees.Add(Parse(@" using System; -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent, IComponent + public class MyComponent : ComponentBase, IComponent { void IComponent.SetParameters(ParameterCollection parameters) { @@ -166,7 +166,7 @@ namespace Test // Arrange AdditionalSyntaxTrees.Add(Parse(@" using System; -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { @@ -200,7 +200,7 @@ namespace Test // Arrange AdditionalSyntaxTrees.Add(Parse(@" using System; -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { @@ -234,7 +234,7 @@ namespace Test // Arrange AdditionalSyntaxTrees.Add(Parse(@" using System; -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/BootJsonWriterTest.cs b/test/Microsoft.AspNetCore.Components.Build.Test/BootJsonWriterTest.cs index 3632a082..648f85cb 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/BootJsonWriterTest.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/BootJsonWriterTest.cs @@ -7,7 +7,7 @@ using System; using System.Linq; using Xunit; -namespace Microsoft.AspNetCore.Blazor.Build.Test +namespace Microsoft.AspNetCore.Components.Build.Test { public class BootJsonWriterTest { diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/ChildContentRazorIntegrationTest.cs b/test/Microsoft.AspNetCore.Components.Build.Test/ChildContentRazorIntegrationTest.cs index ca48bf2f..dcedc6e6 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/ChildContentRazorIntegrationTest.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/ChildContentRazorIntegrationTest.cs @@ -2,23 +2,23 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Linq; -using Microsoft.AspNetCore.Blazor.Razor; -using Microsoft.AspNetCore.Blazor.RenderTree; -using Microsoft.AspNetCore.Blazor.Test.Helpers; +using Microsoft.AspNetCore.Components.Razor; +using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components.RenderTree; +using Microsoft.AspNetCore.Components.Test.Helpers; using Microsoft.CodeAnalysis.CSharp; using Xunit; -namespace Microsoft.AspNetCore.Blazor.Build.Test +namespace Microsoft.AspNetCore.Components.Build.Test { public class ChildContentRazorIntegrationTest : RazorIntegrationTestBase { private readonly CSharpSyntaxTree RenderChildContentComponent = Parse(@" -using Microsoft.AspNetCore.Blazor; -using Microsoft.AspNetCore.Blazor.Components; -using Microsoft.AspNetCore.Blazor.RenderTree; +using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components.RenderTree; namespace Test { - public class RenderChildContent : BlazorComponent + public class RenderChildContent : ComponentBase { protected override void BuildRenderTree(RenderTreeBuilder builder) { @@ -32,12 +32,11 @@ namespace Test "); private readonly CSharpSyntaxTree RenderChildContentStringComponent = Parse(@" -using Microsoft.AspNetCore.Blazor; -using Microsoft.AspNetCore.Blazor.Components; -using Microsoft.AspNetCore.Blazor.RenderTree; +using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components.RenderTree; namespace Test { - public class RenderChildContentString : BlazorComponent + public class RenderChildContentString : ComponentBase { protected override void BuildRenderTree(RenderTreeBuilder builder) { @@ -54,12 +53,11 @@ namespace Test "); private readonly CSharpSyntaxTree RenderMultipleChildContent = Parse(@" -using Microsoft.AspNetCore.Blazor; -using Microsoft.AspNetCore.Blazor.Components; -using Microsoft.AspNetCore.Blazor.RenderTree; +using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components.RenderTree; namespace Test { - public class RenderMultipleChildContent : BlazorComponent + public class RenderMultipleChildContent : ComponentBase { protected override void BuildRenderTree(RenderTreeBuilder builder) { diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/CodeGenerationTestBase.cs b/test/Microsoft.AspNetCore.Components.Build.Test/CodeGenerationTestBase.cs index c6dd704e..aca9366c 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/CodeGenerationTestBase.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/CodeGenerationTestBase.cs @@ -4,7 +4,7 @@ using System.Linq; using Xunit; -namespace Microsoft.AspNetCore.Blazor.Build.Test +namespace Microsoft.AspNetCore.Components.Build.Test { public abstract class CodeGenerationTestBase : RazorBaselineIntegrationTestBase { @@ -22,11 +22,11 @@ namespace Microsoft.AspNetCore.Blazor.Build.Test { // Arrange AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { } } @@ -48,7 +48,7 @@ namespace Test { // Arrange AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { @@ -56,7 +56,7 @@ namespace Test { } - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { [Parameter] int IntProperty { get; set; } [Parameter] bool BoolProperty { get; set; } @@ -88,7 +88,7 @@ namespace Test // Act var generated = CompileToCSharp(@" -@using Microsoft.AspNetCore.Blazor; +@using Microsoft.AspNetCore.Components; @typeparam TItem1 @typeparam TItem2 @@ -116,11 +116,11 @@ namespace Test { // Arrange AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { [Parameter] string StringProperty { get; set; } @@ -144,11 +144,11 @@ namespace Test { // Arrange AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { } } @@ -170,11 +170,11 @@ namespace Test { // Arrange AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class CoolnessMeter : BlazorComponent + public class CoolnessMeter : ComponentBase { [Parameter] private int Coolness { get; set; } } @@ -208,11 +208,11 @@ namespace Test // Arrange AdditionalSyntaxTrees.Add(Parse(@" using System; -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { [Parameter] int Value { get; set; } @@ -242,11 +242,11 @@ namespace Test // Arrange AdditionalSyntaxTrees.Add(Parse(@" using System; -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { [Parameter] int Value { get; set; } @@ -282,11 +282,11 @@ namespace Test // Arrange AdditionalSyntaxTrees.Add(Parse(@" using System; -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent, IComponent + public class MyComponent : ComponentBase, IComponent { void IComponent.SetParameters(ParameterCollection parameters) { @@ -314,11 +314,11 @@ namespace Test // Arrange AdditionalSyntaxTrees.Add(Parse(@" using System; -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { [Parameter] int Value { get; set; } @@ -347,11 +347,11 @@ namespace Test // Arrange AdditionalSyntaxTrees.Add(Parse(@" using System; -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent, IComponent + public class MyComponent : ComponentBase, IComponent { void IComponent.SetParameters(ParameterCollection parameters) { @@ -378,7 +378,7 @@ namespace Test // Arrange AdditionalSyntaxTrees.Add(Parse(@" using System; -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { @@ -408,7 +408,7 @@ namespace Test // Arrange AdditionalSyntaxTrees.Add(Parse(@" using System; -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { @@ -575,12 +575,11 @@ namespace Test { // Arrange AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Blazor; -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { [Parameter] string MyAttr { get; set; } @@ -607,12 +606,11 @@ namespace Test { // Arrange AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Blazor; -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { [Parameter] string MyAttr { get; set; } @@ -640,12 +638,11 @@ namespace Test { // Arrange AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Blazor; -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { [Parameter] string MyAttr { get; set; } @@ -676,12 +673,11 @@ namespace Test { // Arrange AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Blazor; -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { [Parameter] string MyAttr { get; set; } @@ -712,12 +708,11 @@ namespace Test { // Arrange AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Blazor; -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { [Parameter] RenderFragment ChildContent { get; set; } @@ -741,12 +736,11 @@ namespace Test { // Arrange AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Blazor; -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { [Parameter] RenderFragment ChildContent { get; set; } @@ -770,12 +764,11 @@ namespace Test { // Arrange AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Blazor; -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { [Parameter] RenderFragment ChildContent { get; set; } @@ -799,12 +792,11 @@ namespace Test { // Arrange AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Blazor; -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { [Parameter] RenderFragment Header { get; set; } @@ -834,12 +826,11 @@ namespace Test { // Arrange AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Blazor; -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { [Parameter] RenderFragment Header { get; set; } @@ -871,12 +862,11 @@ namespace Test { // Arrange AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Blazor; -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { [Parameter] RenderFragment Header { get; set; } @@ -914,11 +904,11 @@ namespace Test { // Arrange AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { } } @@ -947,12 +937,11 @@ namespace Test // Arrange AdditionalSyntaxTrees.Add(Parse(@" using System; -using Microsoft.AspNetCore.Blazor; -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { [Parameter] Action OnClick { get; set; } @@ -986,12 +975,11 @@ namespace Test // Arrange AdditionalSyntaxTrees.Add(Parse(@" using System; -using Microsoft.AspNetCore.Blazor; -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class DynamicElement : BlazorComponent + public class DynamicElement : ComponentBase { } } @@ -1018,12 +1006,11 @@ namespace Test // Arrange AdditionalSyntaxTrees.Add(Parse(@" using System; -using Microsoft.AspNetCore.Blazor; -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { [Parameter] Action OnClick { get; set; } @@ -1272,11 +1259,11 @@ namespace Test { // Arrange AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { [Parameter] TItem Item { get; set; } } @@ -1299,11 +1286,11 @@ namespace Test { // Arrange AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { [Parameter] TItem Item { get; set; } } @@ -1326,11 +1313,11 @@ namespace Test { // Arrange AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { [Parameter] TItem Item { get; set; } } @@ -1355,11 +1342,11 @@ namespace Test { // Arrange AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { [Parameter] TItem Item { get; set; } } @@ -1382,11 +1369,11 @@ namespace Test { // Arrange AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { [Parameter] TItem Item { get; set; } } @@ -1410,11 +1397,11 @@ namespace Test // Arrange AdditionalSyntaxTrees.Add(Parse(@" using System; -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { [Parameter] TItem Item { get; set; } @@ -1445,11 +1432,11 @@ namespace Test // Arrange AdditionalSyntaxTrees.Add(Parse(@" using System; -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { [Parameter] TItem Item { get; set; } @@ -1480,11 +1467,11 @@ namespace Test // Arrange AdditionalSyntaxTrees.Add(Parse(@" using System; -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { } } @@ -1510,11 +1497,11 @@ namespace Test // Arrange AdditionalSyntaxTrees.Add(Parse(@" using System; -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { [Parameter] TItem Value { get; set; } } @@ -1540,12 +1527,11 @@ namespace Test { // Arrange AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Blazor; -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { [Parameter] TItem Item { get; set; } @@ -1572,12 +1558,11 @@ namespace Test { // Arrange AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Blazor; -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { [Parameter] TItem Item { get; set; } @@ -1604,12 +1589,11 @@ namespace Test { // Arrange AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Blazor; -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { [Parameter] TItem1 Item { get; set; } @@ -1647,12 +1631,11 @@ namespace Test // Arrange AdditionalSyntaxTrees.Add(Parse(@" using System.Collections.Generic; -using Microsoft.AspNetCore.Blazor; -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { [Parameter] TItem1 Item { get; set; } @@ -1691,12 +1674,11 @@ namespace Test { // Arrange AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Blazor; -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { [Parameter] TItem Item { get; set; } } @@ -1725,12 +1707,11 @@ namespace Test { // Arrange AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Blazor; -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { [Parameter] TItem Item { get; set; } } @@ -1766,7 +1747,7 @@ namespace Test Hello @functions { - private Microsoft.AspNetCore.Blazor.ElementRef myElem; + private Microsoft.AspNetCore.Components.ElementRef myElem; public void Foo() { System.GC.KeepAlive(myElem); } } "); @@ -1782,11 +1763,11 @@ namespace Test { // Arrange AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { } } @@ -1814,11 +1795,11 @@ namespace Test { // Arrange AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { } } @@ -1939,11 +1920,11 @@ namespace Test { // Arrange AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { [Parameter] string Name { get; set; } } @@ -1975,11 +1956,11 @@ namespace Test { // Arrange AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { [Parameter] string Name { get; set; } } @@ -2014,12 +1995,11 @@ namespace Test { // Arrange AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Blazor; -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { [Parameter] RenderFragment Template { get; set; } } @@ -2044,12 +2024,11 @@ namespace Test { // Arrange AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Blazor; -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { [Parameter] RenderFragment PersonTemplate { get; set; } } @@ -2079,12 +2058,11 @@ namespace Test { // Arrange AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Blazor; -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { [Parameter] RenderFragment Template { get; set; } } @@ -2151,11 +2129,11 @@ namespace Test { // Arrange AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class SomeOtherComponent : BlazorComponent + public class SomeOtherComponent : ComponentBase { } } @@ -2214,11 +2192,11 @@ namespace Test { // Arrange AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class SomeOtherComponent : BlazorComponent + public class SomeOtherComponent : ComponentBase { } } @@ -2284,11 +2262,11 @@ namespace Test { // Arrange AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class Counter : BlazorComponent + public class Counter : ComponentBase { public int Count { get; set; } } @@ -2316,11 +2294,11 @@ namespace Test // Arrange AdditionalSyntaxTrees.Add(Parse(@" using System; -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class User : BlazorComponent + public class User : ComponentBase { public string Name { get; set; } public Action NameChanged { get; set; } @@ -2352,11 +2330,11 @@ namespace Test { // Arrange AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class SurveyPrompt : BlazorComponent + public class SurveyPrompt : ComponentBase { [Parameter] private string Title { get; set; } } @@ -2391,11 +2369,11 @@ Welcome to your new app. { // Arrange AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class SurveyPrompt : BlazorComponent + public class SurveyPrompt : ComponentBase { [Parameter] private string Title { get; set; } } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/ComponentDiscoveryRazorIntegrationTest.cs b/test/Microsoft.AspNetCore.Components.Build.Test/ComponentDiscoveryRazorIntegrationTest.cs index e1a9c409..ad3bdd8d 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/ComponentDiscoveryRazorIntegrationTest.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/ComponentDiscoveryRazorIntegrationTest.cs @@ -3,12 +3,12 @@ using System.IO; using System.Text; -using Microsoft.AspNetCore.Blazor.Test.Helpers; +using Microsoft.AspNetCore.Components.Test.Helpers; using Microsoft.AspNetCore.Razor.Language; using Microsoft.CodeAnalysis.CSharp; using Xunit; -namespace Microsoft.AspNetCore.Blazor.Build.Test +namespace Microsoft.AspNetCore.Components.Build.Test { public class ComponentDiscoveryRazorIntegrationTest : RazorIntegrationTestBase { @@ -19,11 +19,11 @@ namespace Microsoft.AspNetCore.Blazor.Build.Test { // Arrange AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { } } @@ -42,11 +42,11 @@ namespace Test { // Arrange AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test.AnotherNamespace { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { } } @@ -79,11 +79,11 @@ namespace Test.AnotherNamespace // Arrange // Act - var result = CompileToCSharp("@addTagHelper *, Microsoft.AspNetCore.Blazor"); + var result = CompileToCSharp("@addTagHelper *, Microsoft.AspNetCore.Components"); // Assert var bindings = result.CodeDocument.GetTagHelperContext(); - Assert.Single(bindings.TagHelpers, t => t.Name == "Microsoft.AspNetCore.Blazor.Routing.NavLink"); + Assert.Single(bindings.TagHelpers, t => t.Name == "Microsoft.AspNetCore.Components.Routing.NavLink"); } [Fact] diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/ComponentRenderingRazorIntegrationTest.cs b/test/Microsoft.AspNetCore.Components.Build.Test/ComponentRenderingRazorIntegrationTest.cs index 22cec149..42c2848e 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/ComponentRenderingRazorIntegrationTest.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/ComponentRenderingRazorIntegrationTest.cs @@ -3,12 +3,12 @@ using System; using System.Linq; -using Microsoft.AspNetCore.Blazor.RenderTree; -using Microsoft.AspNetCore.Blazor.Test.Helpers; -using Microsoft.CodeAnalysis.CSharp; +using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components.RenderTree; +using Microsoft.AspNetCore.Components.Test.Helpers; using Xunit; -namespace Microsoft.AspNetCore.Blazor.Build.Test +namespace Microsoft.AspNetCore.Components.Build.Test { public class ComponentRenderingRazorIntegrationTest : RazorIntegrationTestBase { @@ -19,11 +19,11 @@ namespace Microsoft.AspNetCore.Blazor.Build.Test { // Arrange AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { } } @@ -47,7 +47,7 @@ namespace Test { // Arrange AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { @@ -55,7 +55,7 @@ namespace Test { } - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { [Parameter] int IntProperty { get; set; } [Parameter] bool BoolProperty { get; set; } @@ -95,11 +95,11 @@ namespace Test { // Arrange AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { public int IntProperty { get; set; } } @@ -125,11 +125,11 @@ namespace Test { // Arrange AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { [Parameter] string StringProperty { get; set; } @@ -156,11 +156,11 @@ namespace Test { // Arrange AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent, IComponent + public class MyComponent : ComponentBase, IComponent { void IComponent.SetParameters(ParameterCollection parameters) { @@ -198,12 +198,11 @@ namespace Test // Arrange AdditionalSyntaxTrees.Add(Parse(@" using System; -using Microsoft.AspNetCore.Blazor; -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { [Parameter] Action OnClick { get; set; } @@ -245,12 +244,11 @@ namespace Test // Arrange AdditionalSyntaxTrees.Add(Parse(@" using System; -using Microsoft.AspNetCore.Blazor; -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { [Parameter] Action OnClick { get; set; } @@ -292,11 +290,11 @@ namespace Test { // Arrange AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { [Parameter] bool BoolProperty { get; set; } @@ -322,11 +320,10 @@ namespace Test { // Arrange AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Blazor; -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { [Parameter] string MyAttr { get; set; } @@ -367,12 +364,11 @@ namespace Test { // Arrange AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Blazor; -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { [Parameter] RenderFragment ChildContent { get; set; } @@ -416,11 +412,11 @@ namespace Test { // Arrange AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class SurveyPrompt : BlazorComponent + public class SurveyPrompt : ComponentBase { [Parameter] private string Title { get; set; } } @@ -495,11 +491,10 @@ namespace Test { // Arrange AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Blazor; -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { [Parameter] RenderFragment ChildContent { get; set; } @@ -560,13 +555,12 @@ namespace Test { // Arrange AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Blazor; -using Microsoft.AspNetCore.Blazor.Components; -using Microsoft.AspNetCore.Blazor.RenderTree; +using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components.RenderTree; namespace Test { - public class Repeater : BlazorComponent + public class Repeater : ComponentBase { [Parameter] int Count { get; set; } [Parameter] RenderFragment Template { get; set; } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/DeclarationRazorIntegrationTest.cs b/test/Microsoft.AspNetCore.Components.Build.Test/DeclarationRazorIntegrationTest.cs index 8357843e..59b776ca 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/DeclarationRazorIntegrationTest.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/DeclarationRazorIntegrationTest.cs @@ -1,14 +1,14 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Reflection; using System.Text; -using Microsoft.AspNetCore.Blazor.Components; -using Microsoft.AspNetCore.Blazor.Razor; +using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components.Razor; using Microsoft.AspNetCore.Razor.Language; using Xunit; -namespace Microsoft.AspNetCore.Blazor.Build.Test +namespace Microsoft.AspNetCore.Components.Build.Test { public class DeclarationRazorIntegrationTest : RazorIntegrationTestBase { @@ -125,12 +125,11 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { } #pragma warning restore 1998 @@ -158,7 +157,7 @@ namespace Test Assert.Equal(1, position.StartLinePosition.Line); } - public class BaseClass : BlazorComponent + public class BaseClass : ComponentBase { } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/DesignTimeCodeGenerationTest.cs b/test/Microsoft.AspNetCore.Components.Build.Test/DesignTimeCodeGenerationTest.cs index 858f6de5..233df797 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/DesignTimeCodeGenerationTest.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/DesignTimeCodeGenerationTest.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -namespace Microsoft.AspNetCore.Blazor.Build.Test +namespace Microsoft.AspNetCore.Components.Build.Test { public class DesignTimeCodeGenerationTest : CodeGenerationTestBase { diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/DiagnosticRazorIntegrationTest.cs b/test/Microsoft.AspNetCore.Components.Build.Test/DiagnosticRazorIntegrationTest.cs index 6cfbf742..8ffe0656 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/DiagnosticRazorIntegrationTest.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/DiagnosticRazorIntegrationTest.cs @@ -3,7 +3,7 @@ using Xunit; -namespace Microsoft.AspNetCore.Blazor.Build.Test +namespace Microsoft.AspNetCore.Components.Build.Test { public class DiagnosticRazorIntegrationTest : RazorIntegrationTestBase { diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/DirectiveRazorIntegrationTest.cs b/test/Microsoft.AspNetCore.Components.Build.Test/DirectiveRazorIntegrationTest.cs index 531f18b1..229956cc 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/DirectiveRazorIntegrationTest.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/DirectiveRazorIntegrationTest.cs @@ -1,15 +1,15 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; using System.Linq; using System.Reflection; -using Microsoft.AspNetCore.Blazor.Components; -using Microsoft.AspNetCore.Blazor.Layouts; -using Microsoft.AspNetCore.Blazor.Test.Helpers; +using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components.Layouts; +using Microsoft.AspNetCore.Components.Test.Helpers; using Xunit; -namespace Microsoft.AspNetCore.Blazor.Build.Test +namespace Microsoft.AspNetCore.Components.Build.Test { // Integration tests for Blazor's directives public class DirectiveRazorIntegrationTest : RazorIntegrationTestBase @@ -156,7 +156,7 @@ namespace Microsoft.AspNetCore.Blazor.Build.Test public interface ITestInterface2 { } - public class TestBaseClass : BlazorComponent { } + public class TestBaseClass : ComponentBase { } public interface IMyService1 { } public interface IMyService2 { } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/FilePathRazorIntegrationTest.cs b/test/Microsoft.AspNetCore.Components.Build.Test/FilePathRazorIntegrationTest.cs index 750d9f50..6358a38c 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/FilePathRazorIntegrationTest.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/FilePathRazorIntegrationTest.cs @@ -4,7 +4,7 @@ using System.IO; using Xunit; -namespace Microsoft.AspNetCore.Blazor.Build.Test +namespace Microsoft.AspNetCore.Components.Build.Test { // Integration tests focused on file path handling for class/namespace names public class FilePathRazorIntegrationTest : RazorIntegrationTestBase diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/GenericComponentRazorIntegrationTest.cs b/test/Microsoft.AspNetCore.Components.Build.Test/GenericComponentRazorIntegrationTest.cs index f52c7c2e..3e374302 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/GenericComponentRazorIntegrationTest.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/GenericComponentRazorIntegrationTest.cs @@ -1,29 +1,28 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNetCore.Blazor.Components; -using Microsoft.AspNetCore.Blazor.Razor; -using Microsoft.AspNetCore.Blazor.RenderTree; -using Microsoft.AspNetCore.Blazor.Test.Helpers; +using Microsoft.AspNetCore.Components.Razor; +using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components.RenderTree; +using Microsoft.AspNetCore.Components.Test.Helpers; using Microsoft.CodeAnalysis.CSharp; using System; using System.Collections.Generic; using System.Linq; using Xunit; -namespace Microsoft.AspNetCore.Blazor.Build.Test +namespace Microsoft.AspNetCore.Components.Build.Test { public class GenericComponentRazorIntegrationTest : RazorIntegrationTestBase { private readonly CSharpSyntaxTree GenericContextComponent = Parse(@" using System; using System.Collections.Generic; -using Microsoft.AspNetCore.Blazor; -using Microsoft.AspNetCore.Blazor.Components; -using Microsoft.AspNetCore.Blazor.RenderTree; +using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components.RenderTree; namespace Test { - public class GenericContext : BlazorComponent + public class GenericContext : ComponentBase { protected override void BuildRenderTree(RenderTreeBuilder builder) { @@ -57,12 +56,11 @@ namespace Test "); private readonly CSharpSyntaxTree MultipleGenericParameterComponent = Parse(@" -using Microsoft.AspNetCore.Blazor; -using Microsoft.AspNetCore.Blazor.Components; -using Microsoft.AspNetCore.Blazor.RenderTree; +using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components.RenderTree; namespace Test { - public class MultipleGenericParameter : BlazorComponent + public class MultipleGenericParameter : ComponentBase { protected override void BuildRenderTree(RenderTreeBuilder builder) { diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/Microsoft.AspNetCore.Blazor.Build.Test.csproj b/test/Microsoft.AspNetCore.Components.Build.Test/Microsoft.AspNetCore.Components.Build.Test.csproj similarity index 85% rename from test/Microsoft.AspNetCore.Components.Build.Test/Microsoft.AspNetCore.Blazor.Build.Test.csproj rename to test/Microsoft.AspNetCore.Components.Build.Test/Microsoft.AspNetCore.Components.Build.Test.csproj index 77f41b63..f5d8905b 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/Microsoft.AspNetCore.Blazor.Build.Test.csproj +++ b/test/Microsoft.AspNetCore.Components.Build.Test/Microsoft.AspNetCore.Components.Build.Test.csproj @@ -18,6 +18,10 @@ GENERATE_BASELINES;$(DefineConstants) + + TRACE + + @@ -28,7 +32,8 @@ - + + @@ -39,8 +44,4 @@ - - - - diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/Razor/InitializeTestFileAttribute.cs b/test/Microsoft.AspNetCore.Components.Build.Test/Razor/InitializeTestFileAttribute.cs index ac5b99ca..f166b3fc 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/Razor/InitializeTestFileAttribute.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/Razor/InitializeTestFileAttribute.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Reflection; -using Microsoft.AspNetCore.Blazor.Build.Test; +using Microsoft.AspNetCore.Components.Build.Test; using Xunit.Sdk; namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/Razor/IntermediateNodeWriter.cs b/test/Microsoft.AspNetCore.Components.Build.Test/Razor/IntermediateNodeWriter.cs index a4d56fa4..4c0fa6a3 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/Razor/IntermediateNodeWriter.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/Razor/IntermediateNodeWriter.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.IO; using System.Security.Cryptography; using System.Text; -using Microsoft.AspNetCore.Blazor.Razor; +using Microsoft.AspNetCore.Components.Razor; using Microsoft.AspNetCore.Razor.Language.Intermediate; namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/Razor/TestProject.cs b/test/Microsoft.AspNetCore.Components.Build.Test/Razor/TestProject.cs index fcc73ee4..5f14ef4b 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/Razor/TestProject.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/Razor/TestProject.cs @@ -10,18 +10,10 @@ namespace Microsoft.AspNetCore.Razor.Language { public static string GetProjectDirectory(Type type) { - var solutionDir = GetSolutionRootDirectory("Blazor"); + var solutionDir = GetSolutionRootDirectory("Components"); var assemblyName = type.Assembly.GetName().Name; - // Temporary special case during code migration - // TODO: Remove this when all renames are finished - var componentsPrefix = "Microsoft.AspNetCore.Blazor."; - if (assemblyName.StartsWith(componentsPrefix)) - { - assemblyName = "Microsoft.AspNetCore.Components." + assemblyName.Substring(componentsPrefix.Length); - } - var projectDirectory = Path.Combine(solutionDir, "test", assemblyName); if (!Directory.Exists(projectDirectory)) { diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/RazorBaselineIntegrationTestBase.cs b/test/Microsoft.AspNetCore.Components.Build.Test/RazorBaselineIntegrationTestBase.cs index f7a94eb6..1c3e5d44 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/RazorBaselineIntegrationTestBase.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/RazorBaselineIntegrationTestBase.cs @@ -10,7 +10,7 @@ using Microsoft.AspNetCore.Razor.Language.IntegrationTests; using Xunit; using Xunit.Sdk; -namespace Microsoft.AspNetCore.Blazor.Build.Test +namespace Microsoft.AspNetCore.Components.Build.Test { [InitializeTestFile] public abstract class RazorBaselineIntegrationTestBase : RazorIntegrationTestBase @@ -39,7 +39,7 @@ namespace Microsoft.AspNetCore.Blazor.Build.Test #else protected bool GenerateBaselines { get; } = false; #endif - + protected string TestProjectRoot { get; } // For consistent line endings because the character counts are going to be recorded in files. diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/RazorIntegrationTestBase.cs b/test/Microsoft.AspNetCore.Components.Build.Test/RazorIntegrationTestBase.cs index 7da9f3ce..09fdd8a5 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/RazorIntegrationTestBase.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/RazorIntegrationTestBase.cs @@ -9,11 +9,11 @@ using System.Reflection; using System.Runtime.InteropServices; using System.Text; using System.Threading.Tasks; -using Microsoft.AspNetCore.Blazor.Components; -using Microsoft.AspNetCore.Blazor.Razor; -using Microsoft.AspNetCore.Blazor.Rendering; -using Microsoft.AspNetCore.Blazor.RenderTree; -using Microsoft.AspNetCore.Blazor.Test.Helpers; +using Microsoft.AspNetCore.Components.Razor; +using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components.Rendering; +using Microsoft.AspNetCore.Components.RenderTree; +using Microsoft.AspNetCore.Components.Test.Helpers; using Microsoft.AspNetCore.Razor.Language; using Microsoft.AspNetCore.Razor.Language.CodeGeneration; using Microsoft.CodeAnalysis; @@ -22,7 +22,7 @@ using Microsoft.CodeAnalysis.Razor; using Xunit; using Xunit.Sdk; -namespace Microsoft.AspNetCore.Blazor.Build.Test +namespace Microsoft.AspNetCore.Components.Build.Test { public class RazorIntegrationTestBase { @@ -40,7 +40,7 @@ namespace Microsoft.AspNetCore.Blazor.Build.Test var referenceAssemblyRoots = new[] { typeof(System.Runtime.AssemblyTargetedPatchBandAttribute).Assembly, // System.Runtime - typeof(BlazorComponent).Assembly, + typeof(ComponentBase).Assembly, typeof(RazorIntegrationTestBase).Assembly, // Reference this assembly, so that we can refer to test component types }; diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/RenderingRazorIntegrationTest.cs b/test/Microsoft.AspNetCore.Components.Build.Test/RenderingRazorIntegrationTest.cs index 2457c44e..34f95722 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/RenderingRazorIntegrationTest.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/RenderingRazorIntegrationTest.cs @@ -3,11 +3,12 @@ using System; using System.Collections.Generic; -using Microsoft.AspNetCore.Blazor.RenderTree; -using Microsoft.AspNetCore.Blazor.Test.Helpers; +using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components.RenderTree; +using Microsoft.AspNetCore.Components.Test.Helpers; using Xunit; -namespace Microsoft.AspNetCore.Blazor.Build.Test +namespace Microsoft.AspNetCore.Components.Build.Test { // Integration tests for the end-to-end of successful Razor compilation of component definitions // Includes running the component code to verify the output. @@ -307,7 +308,7 @@ namespace Microsoft.AspNetCore.Blazor.Build.Test @functions { public bool HandlerWasCalled { get; set; } = false; - void MyHandleEvent(Microsoft.AspNetCore.Blazor.UIEventArgs eventArgs) + void MyHandleEvent(Microsoft.AspNetCore.Components.UIEventArgs eventArgs) { HandlerWasCalled = true; } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/RuntimeCodeGenerationTest.cs b/test/Microsoft.AspNetCore.Components.Build.Test/RuntimeCodeGenerationTest.cs index 271daee8..9cb34bb4 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/RuntimeCodeGenerationTest.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/RuntimeCodeGenerationTest.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -namespace Microsoft.AspNetCore.Blazor.Build.Test +namespace Microsoft.AspNetCore.Components.Build.Test { public class RuntimeCodeGenerationTest : CodeGenerationTestBase { diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/RuntimeDependenciesResolverTest.cs b/test/Microsoft.AspNetCore.Components.Build.Test/RuntimeDependenciesResolverTest.cs index 4b370797..5acb467f 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/RuntimeDependenciesResolverTest.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/RuntimeDependenciesResolverTest.cs @@ -6,7 +6,7 @@ using System.IO; using System.Linq; using Xunit; -namespace Microsoft.AspNetCore.Blazor.Build.Test +namespace Microsoft.AspNetCore.Components.Build.Test { public class RuntimeDependenciesResolverTest { @@ -23,8 +23,8 @@ namespace Microsoft.AspNetCore.Blazor.Build.Test "referenceHints.txt")); var references = new[] { - "Microsoft.AspNetCore.Blazor.Browser.dll", - "Microsoft.AspNetCore.Blazor.dll", + "Microsoft.AspNetCore.Components.Browser.dll", + "Microsoft.AspNetCore.Components.dll", "Microsoft.Extensions.DependencyInjection.Abstractions.dll", "Microsoft.Extensions.DependencyInjection.dll", "Microsoft.JSInterop.dll", @@ -57,10 +57,10 @@ namespace Microsoft.AspNetCore.Blazor.Build.Test fewer assemblies from the server, and during publishing, illink would remove all the uncalled implementation code from mscorlib.dll anyway. */ - "Microsoft.AspNetCore.Blazor.Browser.dll", - "Microsoft.AspNetCore.Blazor.Browser.pdb", - "Microsoft.AspNetCore.Blazor.dll", - "Microsoft.AspNetCore.Blazor.pdb", + "Microsoft.AspNetCore.Components.Browser.dll", + "Microsoft.AspNetCore.Components.Browser.pdb", + "Microsoft.AspNetCore.Components.dll", + "Microsoft.AspNetCore.Components.pdb", "Microsoft.Extensions.DependencyInjection.Abstractions.dll", "Microsoft.Extensions.DependencyInjection.dll", "Microsoft.JSInterop.dll", diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TemplateRazorIntegrationTest.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TemplateRazorIntegrationTest.cs index a94bbc72..3ab6ea1b 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TemplateRazorIntegrationTest.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TemplateRazorIntegrationTest.cs @@ -3,7 +3,7 @@ using Xunit; -namespace Microsoft.AspNetCore.Blazor.Build.Test +namespace Microsoft.AspNetCore.Components.Build.Test { public class TemplateRazorIntegrationTest : RazorIntegrationTestBase { @@ -42,12 +42,11 @@ namespace Microsoft.AspNetCore.Blazor.Build.Test { // Arrange AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Blazor; -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { } } @@ -66,12 +65,11 @@ namespace Test { // Arrange AdditionalSyntaxTrees.Add(Parse(@" -using Microsoft.AspNetCore.Blazor; -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { } } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs index c96ce34c..61e2a26f 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs @@ -11,9 +11,8 @@ using System.Threading.Tasks; #line default #line hidden - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -23,10 +22,10 @@ using System.Threading.Tasks; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Blazor.Components.BindMethods.GetEventHandlerValue("async (e) => await Task.Delay(10)"); + __o = Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue("async (e) => await Task.Delay(10)"); } #pragma warning restore 1998 } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.ir.txt index 7b969397..144a2514 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (1:0,1 [28] x:\dir\subdir\Test\TestComponent.cshtml) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" CSharpCode - IntermediateToken - - CSharp - #pragma warning disable 0414 @@ -24,7 +23,7 @@ Document - HtmlElement - (31:1,0 [53] x:\dir\subdir\Test\TestComponent.cshtml) - input HtmlAttribute - (47:1,16 [33] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - " CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetEventHandlerValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue( IntermediateToken - - CSharp - "async (e) => await Task.Delay(10)" IntermediateToken - - CSharp - ) HtmlContent - (84:1,53 [2] x:\dir\subdir\Test\TestComponent.cshtml) diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs index 514e469a..31d66c35 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs @@ -11,9 +11,8 @@ using System.Threading.Tasks; #line default #line hidden - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -23,10 +22,10 @@ using System.Threading.Tasks; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Blazor.Components.BindMethods.GetEventHandlerValue(OnClick); + __o = Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue(OnClick); } #pragma warning restore 1998 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml" diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt index f1b3128c..a1079f87 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (1:0,1 [28] x:\dir\subdir\Test\TestComponent.cshtml) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" CSharpCode - IntermediateToken - - CSharp - #pragma warning disable 0414 @@ -24,7 +23,7 @@ Document - HtmlElement - (31:1,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input HtmlAttribute - (47:1,16 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - " CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetEventHandlerValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue( IntermediateToken - (48:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick IntermediateToken - - CSharp - ) HtmlContent - (59:1,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt index 6147abee..8a79bc7d 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt @@ -5,7 +5,7 @@ Generated Location: (222:9,0 [28] ) Source Location: (48:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) |OnClick| -Generated Location: (1083:28,136 [7] ) +Generated Location: (1028:27,133 [7] ) |OnClick| Source Location: (73:2,12 [91] x:\dir\subdir\Test\TestComponent.cshtml) @@ -15,7 +15,7 @@ Source Location: (73:2,12 [91] x:\dir\subdir\Test\TestComponent.cshtml) return Task.CompletedTask; } | -Generated Location: (1206:32,12 [91] ) +Generated Location: (1151:31,12 [91] ) | Task OnClick(UIMouseEventArgs e) { diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs index c96ce34c..61e2a26f 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs @@ -11,9 +11,8 @@ using System.Threading.Tasks; #line default #line hidden - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -23,10 +22,10 @@ using System.Threading.Tasks; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Blazor.Components.BindMethods.GetEventHandlerValue("async (e) => await Task.Delay(10)"); + __o = Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue("async (e) => await Task.Delay(10)"); } #pragma warning restore 1998 } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.ir.txt index 7b969397..144a2514 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (1:0,1 [28] x:\dir\subdir\Test\TestComponent.cshtml) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" CSharpCode - IntermediateToken - - CSharp - #pragma warning disable 0414 @@ -24,7 +23,7 @@ Document - HtmlElement - (31:1,0 [53] x:\dir\subdir\Test\TestComponent.cshtml) - input HtmlAttribute - (47:1,16 [33] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - " CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetEventHandlerValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue( IntermediateToken - - CSharp - "async (e) => await Task.Delay(10)" IntermediateToken - - CSharp - ) HtmlContent - (84:1,53 [2] x:\dir\subdir\Test\TestComponent.cshtml) diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs index f422d1ba..b3d22cea 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs @@ -11,9 +11,8 @@ using System.Threading.Tasks; #line default #line hidden - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -23,10 +22,10 @@ using System.Threading.Tasks; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Blazor.Components.BindMethods.GetEventHandlerValue(OnClick); + __o = Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue(OnClick); } #pragma warning restore 1998 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml" diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt index 8c786711..9a54bc60 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (1:0,1 [28] x:\dir\subdir\Test\TestComponent.cshtml) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" CSharpCode - IntermediateToken - - CSharp - #pragma warning disable 0414 @@ -24,7 +23,7 @@ Document - HtmlElement - (31:1,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input HtmlAttribute - (47:1,16 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - " CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetEventHandlerValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue( IntermediateToken - (48:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick IntermediateToken - - CSharp - ) HtmlContent - (59:1,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt index 85802aac..62cdec4a 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt @@ -5,7 +5,7 @@ Generated Location: (222:9,0 [28] ) Source Location: (48:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) |OnClick| -Generated Location: (1083:28,136 [7] ) +Generated Location: (1028:27,133 [7] ) |OnClick| Source Location: (73:2,12 [73] x:\dir\subdir\Test\TestComponent.cshtml) @@ -15,7 +15,7 @@ Source Location: (73:2,12 [73] x:\dir\subdir\Test\TestComponent.cshtml) return Task.CompletedTask; } | -Generated Location: (1206:32,12 [73] ) +Generated Location: (1151:31,12 [73] ) | Task OnClick() { diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs index 3c6f9a50..d0abedaf 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -23,10 +22,10 @@ global::System.Object __typeHelper = "*, TestAssembly"; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Blazor.Components.RuntimeHelpers.TypeCheck(Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue( + __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck(Microsoft.AspNetCore.Components.BindMethods.GetValue( #line 2 "x:\dir\subdir\Test\TestComponent.cshtml" ParentValue @@ -35,7 +34,7 @@ global::System.Object __typeHelper = "*, TestAssembly"; )); __o = new System.Action( __value => ParentValue = __value); - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Blazor.RenderFragment)((builder2) => { + builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { } )); } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt index ec4f382d..7295ad37 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly CSharpCode - @@ -25,7 +24,7 @@ Document - ComponentExtensionNode - (31:1,0 [50] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent ComponentAttributeExtensionNode - (66:1,35 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - Value CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( IntermediateToken - (66:1,35 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue IntermediateToken - - CSharp - ) ComponentAttributeExtensionNode - (66:1,35 [11] x:\dir\subdir\Test\TestComponent.cshtml) - OnChanged - OnChanged diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt index 8d1e9e64..ebd53f04 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt @@ -1,18 +1,18 @@ Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) |*, TestAssembly| -Generated Location: (559:16,38 [15] ) +Generated Location: (503:15,38 [15] ) |*, TestAssembly| Source Location: (66:1,35 [11] x:\dir\subdir\Test\TestComponent.cshtml) |ParentValue| -Generated Location: (1230:30,35 [11] ) +Generated Location: (1164:29,35 [11] ) |ParentValue| Source Location: (95:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) | public int ParentValue { get; set; } = 42; | -Generated Location: (1650:43,12 [50] ) +Generated Location: (1588:42,12 [50] ) | public int ParentValue { get; set; } = 42; | diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs index 5687b842..5a8ecbc7 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -23,18 +22,18 @@ global::System.Object __typeHelper = "*, TestAssembly"; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue( + __o = Microsoft.AspNetCore.Components.BindMethods.GetValue( #line 2 "x:\dir\subdir\Test\TestComponent.cshtml" ParentValue #line default #line hidden ); - __o = Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue); - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Blazor.RenderFragment)((builder2) => { + __o = Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue); + builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { } )); } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt index 890d6d35..68aa44af 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly CSharpCode - @@ -25,12 +24,12 @@ Document - ComponentExtensionNode - (31:1,0 [50] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent ComponentAttributeExtensionNode - (66:1,35 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( IntermediateToken - (66:1,35 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue IntermediateToken - - CSharp - ) ComponentAttributeExtensionNode - (66:1,35 [11] x:\dir\subdir\Test\TestComponent.cshtml) - OnChanged - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue) + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue) HtmlContent - (81:1,50 [2] x:\dir\subdir\Test\TestComponent.cshtml) IntermediateToken - (81:1,50 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n CSharpCode - (95:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt index c8932d87..eb3e730a 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt @@ -1,18 +1,18 @@ Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) |*, TestAssembly| -Generated Location: (559:16,38 [15] ) +Generated Location: (503:15,38 [15] ) |*, TestAssembly| Source Location: (66:1,35 [11] x:\dir\subdir\Test\TestComponent.cshtml) |ParentValue| -Generated Location: (1152:30,35 [11] ) +Generated Location: (1093:29,35 [11] ) |ParentValue| Source Location: (95:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) | public int ParentValue { get; set; } = 42; | -Generated Location: (1605:42,12 [50] ) +Generated Location: (1543:41,12 [50] ) | public int ParentValue { get; set; } = 42; | diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs index b109d04d..aa91ac79 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -23,10 +22,10 @@ global::System.Object __typeHelper = "*, TestAssembly"; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Blazor.Components.RuntimeHelpers.TypeCheck(Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue( + __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck(Microsoft.AspNetCore.Components.BindMethods.GetValue( #line 2 "x:\dir\subdir\Test\TestComponent.cshtml" ParentValue @@ -35,7 +34,7 @@ global::System.Object __typeHelper = "*, TestAssembly"; )); __o = new System.Action( __value => ParentValue = __value); - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Blazor.RenderFragment)((builder2) => { + builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { } )); } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt index 3c253a9e..c75da470 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly CSharpCode - @@ -25,7 +24,7 @@ Document - ComponentExtensionNode - (31:1,0 [40] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent ComponentAttributeExtensionNode - (56:1,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - Value CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( IntermediateToken - (56:1,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue IntermediateToken - - CSharp - ) ComponentAttributeExtensionNode - (56:1,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - ValueChanged diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt index 8ceeeaa7..bf42d527 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt @@ -1,18 +1,18 @@ Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) |*, TestAssembly| -Generated Location: (559:16,38 [15] ) +Generated Location: (503:15,38 [15] ) |*, TestAssembly| Source Location: (56:1,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) |ParentValue| -Generated Location: (1220:30,25 [11] ) +Generated Location: (1154:29,25 [11] ) |ParentValue| Source Location: (85:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) | public int ParentValue { get; set; } = 42; | -Generated Location: (1640:43,12 [50] ) +Generated Location: (1578:42,12 [50] ) | public int ParentValue { get; set; } = 42; | diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs index 4b8bad20..611acf6c 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -23,18 +22,18 @@ global::System.Object __typeHelper = "*, TestAssembly"; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue( + __o = Microsoft.AspNetCore.Components.BindMethods.GetValue( #line 2 "x:\dir\subdir\Test\TestComponent.cshtml" ParentValue #line default #line hidden ); - __o = Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue); - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Blazor.RenderFragment)((builder2) => { + __o = Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue); + builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { } )); } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt index 97887650..b933602f 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly CSharpCode - @@ -25,12 +24,12 @@ Document - ComponentExtensionNode - (31:1,0 [40] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent ComponentAttributeExtensionNode - (56:1,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( IntermediateToken - (56:1,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue IntermediateToken - - CSharp - ) ComponentAttributeExtensionNode - (56:1,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue) + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue) HtmlContent - (71:1,40 [2] x:\dir\subdir\Test\TestComponent.cshtml) IntermediateToken - (71:1,40 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n CSharpCode - (85:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt index 34d79351..ed41ba9e 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt @@ -1,18 +1,18 @@ Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) |*, TestAssembly| -Generated Location: (559:16,38 [15] ) +Generated Location: (503:15,38 [15] ) |*, TestAssembly| Source Location: (56:1,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) |ParentValue| -Generated Location: (1142:30,25 [11] ) +Generated Location: (1083:29,25 [11] ) |ParentValue| Source Location: (85:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) | public int ParentValue { get; set; } = 42; | -Generated Location: (1595:42,12 [50] ) +Generated Location: (1533:41,12 [50] ) | public int ParentValue { get; set; } = 42; | diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs index e84b4260..f028961e 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -23,10 +22,10 @@ global::System.Object __typeHelper = "*, TestAssembly"; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Blazor.Components.RuntimeHelpers.TypeCheck(Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue( + __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck(Microsoft.AspNetCore.Components.BindMethods.GetValue( #line 2 "x:\dir\subdir\Test\TestComponent.cshtml" ParentValue @@ -35,7 +34,7 @@ global::System.Object __typeHelper = "*, TestAssembly"; )); __o = new System.Action( __value => ParentValue = __value); - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Blazor.RenderFragment)((builder2) => { + builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { } )); } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt index 836a9a60..8a43c85c 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly CSharpCode - @@ -25,7 +24,7 @@ Document - ComponentExtensionNode - (31:1,0 [40] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent ComponentAttributeExtensionNode - (56:1,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - Value CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( IntermediateToken - (56:1,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue IntermediateToken - - CSharp - ) ComponentAttributeExtensionNode - (56:1,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - ValueChanged diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt index be8d4cbc..a3e10bc4 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt @@ -1,18 +1,18 @@ Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) |*, TestAssembly| -Generated Location: (559:16,38 [15] ) +Generated Location: (503:15,38 [15] ) |*, TestAssembly| Source Location: (56:1,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) |ParentValue| -Generated Location: (1220:30,25 [11] ) +Generated Location: (1154:29,25 [11] ) |ParentValue| Source Location: (85:2,12 [55] x:\dir\subdir\Test\TestComponent.cshtml) | public string ParentValue { get; set; } = "42"; | -Generated Location: (1640:43,12 [55] ) +Generated Location: (1578:42,12 [55] ) | public string ParentValue { get; set; } = "42"; | diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs index 445686e6..96562a89 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -23,11 +22,11 @@ global::System.Object __typeHelper = "*, TestAssembly"; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue(CurrentDate, "MM/dd"); - __o = Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler(__value => CurrentDate = __value, CurrentDate, "MM/dd"); + __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(CurrentDate, "MM/dd"); + __o = Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => CurrentDate = __value, CurrentDate, "MM/dd"); } #pragma warning restore 1998 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml" diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt index 48992662..45daf14a 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly CSharpCode - @@ -28,14 +27,14 @@ Document - IntermediateToken - (44:1,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text HtmlAttribute - (71:1,40 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - " CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( IntermediateToken - (72:1,41 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate IntermediateToken - - CSharp - , IntermediateToken - - CSharp - "MM/dd" IntermediateToken - - CSharp - ) HtmlAttribute - (71:1,40 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - " CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler(__value => CurrentDate = __value, CurrentDate, "MM/dd") + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => CurrentDate = __value, CurrentDate, "MM/dd") HtmlContent - (108:1,77 [2] x:\dir\subdir\Test\TestComponent.cshtml) IntermediateToken - (108:1,77 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n CSharpCode - (122:2,12 [77] x:\dir\subdir\Test\TestComponent.cshtml) diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt index dbbb7af1..87ca7a8a 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt @@ -1,18 +1,18 @@ Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) |*, TestAssembly| -Generated Location: (559:16,38 [15] ) +Generated Location: (503:15,38 [15] ) |*, TestAssembly| Source Location: (72:1,41 [11] x:\dir\subdir\Test\TestComponent.cshtml) |CurrentDate| -Generated Location: (1064:28,78 [11] ) +Generated Location: (1005:27,71 [11] ) |CurrentDate| Source Location: (122:2,12 [77] x:\dir\subdir\Test\TestComponent.cshtml) | public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1); | -Generated Location: (1343:33,12 [77] ) +Generated Location: (1277:32,12 [77] ) | public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1); | diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs index 1c3a81aa..684f352a 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -23,11 +22,11 @@ global::System.Object __typeHelper = "*, TestAssembly"; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue(ParentValue); - __o = Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue); + __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue); + __o = Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue); } #pragma warning restore 1998 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml" diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt index 9f48811f..dadfe059 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly CSharpCode - @@ -28,12 +27,12 @@ Document - IntermediateToken - (44:1,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text HtmlAttribute - (71:1,40 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - " CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( IntermediateToken - (72:1,41 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue IntermediateToken - - CSharp - ) HtmlAttribute - (71:1,40 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - " CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue) + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue) HtmlContent - (87:1,56 [2] x:\dir\subdir\Test\TestComponent.cshtml) IntermediateToken - (87:1,56 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n CSharpCode - (101:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt index 50a9abfc..e629286e 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt @@ -1,18 +1,18 @@ Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) |*, TestAssembly| -Generated Location: (559:16,38 [15] ) +Generated Location: (503:15,38 [15] ) |*, TestAssembly| Source Location: (72:1,41 [11] x:\dir\subdir\Test\TestComponent.cshtml) |ParentValue| -Generated Location: (1064:28,78 [11] ) +Generated Location: (1005:27,71 [11] ) |ParentValue| Source Location: (101:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) | public int ParentValue { get; set; } = 42; | -Generated Location: (1325:33,12 [50] ) +Generated Location: (1259:32,12 [50] ) | public int ParentValue { get; set; } = 42; | diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs index f30c2715..e768b0f0 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -23,11 +22,11 @@ global::System.Object __typeHelper = "*, TestAssembly"; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue(ParentValue); - __o = Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue); + __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue); + __o = Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue); } #pragma warning restore 1998 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml" diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt index 12ba94f2..8621ce9b 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly CSharpCode - @@ -25,12 +24,12 @@ Document - HtmlElement - (31:1,0 [33] x:\dir\subdir\Test\TestComponent.cshtml) - div HtmlAttribute - (48:1,17 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myvalue=" - " CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( IntermediateToken - (49:1,18 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue IntermediateToken - - CSharp - ) HtmlAttribute - (48:1,17 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myevent=" - " CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue) + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue) HtmlContent - (64:1,33 [2] x:\dir\subdir\Test\TestComponent.cshtml) IntermediateToken - (64:1,33 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n CSharpCode - (78:2,12 [55] x:\dir\subdir\Test\TestComponent.cshtml) diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt index f201c3c7..2e15f746 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt @@ -1,18 +1,18 @@ Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) |*, TestAssembly| -Generated Location: (559:16,38 [15] ) +Generated Location: (503:15,38 [15] ) |*, TestAssembly| Source Location: (49:1,18 [11] x:\dir\subdir\Test\TestComponent.cshtml) |ParentValue| -Generated Location: (1064:28,78 [11] ) +Generated Location: (1005:27,71 [11] ) |ParentValue| Source Location: (78:2,12 [55] x:\dir\subdir\Test\TestComponent.cshtml) | public string ParentValue { get; set; } = "hi"; | -Generated Location: (1325:33,12 [55] ) +Generated Location: (1259:32,12 [55] ) | public string ParentValue { get; set; } = "hi"; | diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs index f30c2715..e768b0f0 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -23,11 +22,11 @@ global::System.Object __typeHelper = "*, TestAssembly"; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue(ParentValue); - __o = Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue); + __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue); + __o = Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue); } #pragma warning restore 1998 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml" diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt index c88e7e10..6bf6c30c 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly CSharpCode - @@ -25,12 +24,12 @@ Document - HtmlElement - (31:1,0 [27] x:\dir\subdir\Test\TestComponent.cshtml) - div HtmlAttribute - (42:1,11 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myvalue=" - " CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( IntermediateToken - (43:1,12 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue IntermediateToken - - CSharp - ) HtmlAttribute - (42:1,11 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myevent=" - " CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue) + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue) HtmlContent - (58:1,27 [2] x:\dir\subdir\Test\TestComponent.cshtml) IntermediateToken - (58:1,27 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n CSharpCode - (72:2,12 [55] x:\dir\subdir\Test\TestComponent.cshtml) diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt index 85d50bbc..cd366f62 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt @@ -1,18 +1,18 @@ Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) |*, TestAssembly| -Generated Location: (559:16,38 [15] ) +Generated Location: (503:15,38 [15] ) |*, TestAssembly| Source Location: (43:1,12 [11] x:\dir\subdir\Test\TestComponent.cshtml) |ParentValue| -Generated Location: (1064:28,78 [11] ) +Generated Location: (1005:27,71 [11] ) |ParentValue| Source Location: (72:2,12 [55] x:\dir\subdir\Test\TestComponent.cshtml) | public string ParentValue { get; set; } = "hi"; | -Generated Location: (1325:33,12 [55] ) +Generated Location: (1259:32,12 [55] ) | public string ParentValue { get; set; } = "hi"; | diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs index 874370cd..4b556e64 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -23,7 +22,7 @@ global::System.Object __typeHelper = "*, TestAssembly"; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); #line 2 "x:\dir\subdir\Test\TestComponent.cshtml" @@ -43,14 +42,14 @@ global::System.Object __typeHelper = "*, TestAssembly"; #line default #line hidden - __o = new Microsoft.AspNetCore.Blazor.RenderFragment( + __o = new Microsoft.AspNetCore.Components.RenderFragment( #line 3 "x:\dir\subdir\Test\TestComponent.cshtml" header #line default #line hidden ); - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Blazor.RenderFragment)((builder2) => { + builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { } )); } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.ir.txt index 81cff48b..2da9c6fd 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly CSharpCode - diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt index 23e2dfca..325cb343 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt @@ -1,25 +1,25 @@ Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) |*, TestAssembly| -Generated Location: (559:16,38 [15] ) +Generated Location: (503:15,38 [15] ) |*, TestAssembly| Source Location: (33:1,2 [46] x:\dir\subdir\Test\TestComponent.cshtml) | RenderFragment header = (context) => | -Generated Location: (1039:29,2 [46] ) +Generated Location: (987:28,2 [46] ) | RenderFragment header = (context) => | Source Location: (86:1,55 [26] x:\dir\subdir\Test\TestComponent.cshtml) |context.ToLowerInvariant()| -Generated Location: (1253:35,55 [26] ) +Generated Location: (1201:34,55 [26] ) |context.ToLowerInvariant()| Source Location: (118:1,87 [2] x:\dir\subdir\Test\TestComponent.cshtml) |; | -Generated Location: (1466:41,87 [2] ) +Generated Location: (1414:40,87 [2] ) |; | Source Location: (144:2,21 [6] x:\dir\subdir\Test\TestComponent.cshtml) |header| -Generated Location: (1655:47,21 [6] ) +Generated Location: (1607:46,21 [6] ) |header| diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs index 7704b55c..d2554d64 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -23,7 +22,7 @@ global::System.Object __typeHelper = "*, TestAssembly"; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); #line 2 "x:\dir\subdir\Test\TestComponent.cshtml" @@ -43,17 +42,17 @@ global::System.Object __typeHelper = "*, TestAssembly"; #line default #line hidden - __o = new Microsoft.AspNetCore.Blazor.RenderFragment( + __o = new Microsoft.AspNetCore.Components.RenderFragment( #line 3 "x:\dir\subdir\Test\TestComponent.cshtml" header #line default #line hidden ); - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Blazor.RenderFragment)((builder2) => { + builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { } )); - builder.AddAttribute(-1, "Footer", (Microsoft.AspNetCore.Blazor.RenderFragment)((builder2) => { + builder.AddAttribute(-1, "Footer", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { } )); } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.ir.txt index e47457ae..53a2f512 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly CSharpCode - diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt index 23e2dfca..325cb343 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt @@ -1,25 +1,25 @@ Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) |*, TestAssembly| -Generated Location: (559:16,38 [15] ) +Generated Location: (503:15,38 [15] ) |*, TestAssembly| Source Location: (33:1,2 [46] x:\dir\subdir\Test\TestComponent.cshtml) | RenderFragment header = (context) => | -Generated Location: (1039:29,2 [46] ) +Generated Location: (987:28,2 [46] ) | RenderFragment header = (context) => | Source Location: (86:1,55 [26] x:\dir\subdir\Test\TestComponent.cshtml) |context.ToLowerInvariant()| -Generated Location: (1253:35,55 [26] ) +Generated Location: (1201:34,55 [26] ) |context.ToLowerInvariant()| Source Location: (118:1,87 [2] x:\dir\subdir\Test\TestComponent.cshtml) |; | -Generated Location: (1466:41,87 [2] ) +Generated Location: (1414:40,87 [2] ) |; | Source Location: (144:2,21 [6] x:\dir\subdir\Test\TestComponent.cshtml) |header| -Generated Location: (1655:47,21 [6] ) +Generated Location: (1607:46,21 [6] ) |header| diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs index 94de5915..72169e0d 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -23,11 +22,11 @@ global::System.Object __typeHelper = "*, TestAssembly"; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue(Enabled); - __o = Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler(__value => Enabled = __value, Enabled); + __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(Enabled); + __o = Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => Enabled = __value, Enabled); } #pragma warning restore 1998 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml" diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt index 8e2a9724..5349927f 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly CSharpCode - @@ -28,12 +27,12 @@ Document - IntermediateToken - (44:1,13 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Html - checkbox HtmlAttribute - (60:1,29 [8] x:\dir\subdir\Test\TestComponent.cshtml) - checked=" - " CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( IntermediateToken - (61:1,30 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Enabled IntermediateToken - - CSharp - ) HtmlAttribute - (60:1,29 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - " CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler(__value => Enabled = __value, Enabled) + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => Enabled = __value, Enabled) HtmlContent - (72:1,41 [2] x:\dir\subdir\Test\TestComponent.cshtml) IntermediateToken - (72:1,41 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n CSharpCode - (86:2,12 [41] x:\dir\subdir\Test\TestComponent.cshtml) diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt index 3843a710..4535b981 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt @@ -1,18 +1,18 @@ Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) |*, TestAssembly| -Generated Location: (559:16,38 [15] ) +Generated Location: (503:15,38 [15] ) |*, TestAssembly| Source Location: (61:1,30 [7] x:\dir\subdir\Test\TestComponent.cshtml) |Enabled| -Generated Location: (1064:28,78 [7] ) +Generated Location: (1005:27,71 [7] ) |Enabled| Source Location: (86:2,12 [41] x:\dir\subdir\Test\TestComponent.cshtml) | public bool Enabled { get; set; } | -Generated Location: (1313:33,12 [41] ) +Generated Location: (1247:32,12 [41] ) | public bool Enabled { get; set; } | diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs index 2decaaf6..7d61f92d 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -23,11 +22,11 @@ global::System.Object __typeHelper = "*, TestAssembly"; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue(CurrentDate, Format); - __o = Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler(__value => CurrentDate = __value, CurrentDate, Format); + __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(CurrentDate, Format); + __o = Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => CurrentDate = __value, CurrentDate, Format); } #pragma warning restore 1998 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml" diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt index 1a3a5054..bdd5856a 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly CSharpCode - @@ -28,14 +27,14 @@ Document - IntermediateToken - (44:1,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text HtmlAttribute - (56:1,25 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - " CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( IntermediateToken - (57:1,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate IntermediateToken - - CSharp - , IntermediateToken - (85:1,54 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Format IntermediateToken - - CSharp - ) HtmlAttribute - (56:1,25 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - " CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler(__value => CurrentDate = __value, CurrentDate, Format) + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => CurrentDate = __value, CurrentDate, Format) HtmlContent - (94:1,63 [2] x:\dir\subdir\Test\TestComponent.cshtml) IntermediateToken - (94:1,63 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n CSharpCode - (108:2,12 [135] x:\dir\subdir\Test\TestComponent.cshtml) diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt index ddf19b51..466721d4 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt @@ -1,16 +1,16 @@ Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) |*, TestAssembly| -Generated Location: (559:16,38 [15] ) +Generated Location: (503:15,38 [15] ) |*, TestAssembly| Source Location: (57:1,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) |CurrentDate| -Generated Location: (1064:28,78 [11] ) +Generated Location: (1005:27,71 [11] ) |CurrentDate| Source Location: (85:1,54 [6] x:\dir\subdir\Test\TestComponent.cshtml) |Format| -Generated Location: (1077:28,91 [6] ) +Generated Location: (1018:27,84 [6] ) |Format| Source Location: (108:2,12 [135] x:\dir\subdir\Test\TestComponent.cshtml) @@ -19,7 +19,7 @@ Source Location: (108:2,12 [135] x:\dir\subdir\Test\TestComponent.cshtml) public string Format { get; set; } = "MM/dd/yyyy"; | -Generated Location: (1341:33,12 [135] ) +Generated Location: (1275:32,12 [135] ) | public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs index 12ddefdd..f9fb164b 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -23,11 +22,11 @@ global::System.Object __typeHelper = "*, TestAssembly"; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue(CurrentDate, "MM/dd/yyyy"); - __o = Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler(__value => CurrentDate = __value, CurrentDate, "MM/dd/yyyy"); + __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(CurrentDate, "MM/dd/yyyy"); + __o = Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => CurrentDate = __value, CurrentDate, "MM/dd/yyyy"); } #pragma warning restore 1998 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml" diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt index fa9946dc..72fc1f0f 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly CSharpCode - @@ -28,14 +27,14 @@ Document - IntermediateToken - (44:1,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text HtmlAttribute - (56:1,25 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - " CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( IntermediateToken - (57:1,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate IntermediateToken - - CSharp - , IntermediateToken - - CSharp - "MM/dd/yyyy" IntermediateToken - - CSharp - ) HtmlAttribute - (56:1,25 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - " CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler(__value => CurrentDate = __value, CurrentDate, "MM/dd/yyyy") + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => CurrentDate = __value, CurrentDate, "MM/dd/yyyy") HtmlContent - (97:1,66 [2] x:\dir\subdir\Test\TestComponent.cshtml) IntermediateToken - (97:1,66 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n CSharpCode - (111:2,12 [77] x:\dir\subdir\Test\TestComponent.cshtml) diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt index dbbea66d..7170fa64 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt @@ -1,18 +1,18 @@ Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) |*, TestAssembly| -Generated Location: (559:16,38 [15] ) +Generated Location: (503:15,38 [15] ) |*, TestAssembly| Source Location: (57:1,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) |CurrentDate| -Generated Location: (1064:28,78 [11] ) +Generated Location: (1005:27,71 [11] ) |CurrentDate| Source Location: (111:2,12 [77] x:\dir\subdir\Test\TestComponent.cshtml) | public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1); | -Generated Location: (1353:33,12 [77] ) +Generated Location: (1287:32,12 [77] ) | public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1); | diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs index 1c3a81aa..684f352a 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -23,11 +22,11 @@ global::System.Object __typeHelper = "*, TestAssembly"; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue(ParentValue); - __o = Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue); + __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue); + __o = Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue); } #pragma warning restore 1998 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml" diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt index 2859cada..28134714 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly CSharpCode - @@ -28,12 +27,12 @@ Document - IntermediateToken - (44:1,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text HtmlAttribute - (56:1,25 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - " CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( IntermediateToken - (57:1,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue IntermediateToken - - CSharp - ) HtmlAttribute - (56:1,25 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - " CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue) + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue) HtmlContent - (72:1,41 [2] x:\dir\subdir\Test\TestComponent.cshtml) IntermediateToken - (72:1,41 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n CSharpCode - (86:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt index 1bfeb6cd..d2b22b61 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt @@ -1,18 +1,18 @@ Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) |*, TestAssembly| -Generated Location: (559:16,38 [15] ) +Generated Location: (503:15,38 [15] ) |*, TestAssembly| Source Location: (57:1,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) |ParentValue| -Generated Location: (1064:28,78 [11] ) +Generated Location: (1005:27,71 [11] ) |ParentValue| Source Location: (86:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) | public int ParentValue { get; set; } = 42; | -Generated Location: (1325:33,12 [50] ) +Generated Location: (1259:32,12 [50] ) | public int ParentValue { get; set; } = 42; | diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs index 1c3a81aa..684f352a 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -23,11 +22,11 @@ global::System.Object __typeHelper = "*, TestAssembly"; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue(ParentValue); - __o = Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue); + __o = Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue); + __o = Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue); } #pragma warning restore 1998 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml" diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt index 3cea43d6..b7910801 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly CSharpCode - @@ -25,12 +24,12 @@ Document - HtmlElement - (31:1,0 [29] x:\dir\subdir\Test\TestComponent.cshtml) - input HtmlAttribute - (44:1,13 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - " CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( IntermediateToken - (45:1,14 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue IntermediateToken - - CSharp - ) HtmlAttribute - (44:1,13 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - " CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue) + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue) HtmlContent - (60:1,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) IntermediateToken - (60:1,29 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n CSharpCode - (74:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt index c7bebd05..08dab60e 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt @@ -1,18 +1,18 @@ Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) |*, TestAssembly| -Generated Location: (559:16,38 [15] ) +Generated Location: (503:15,38 [15] ) |*, TestAssembly| Source Location: (45:1,14 [11] x:\dir\subdir\Test\TestComponent.cshtml) |ParentValue| -Generated Location: (1064:28,78 [11] ) +Generated Location: (1005:27,71 [11] ) |ParentValue| Source Location: (74:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) | public int ParentValue { get; set; } = 42; | -Generated Location: (1325:33,12 [50] ) +Generated Location: (1259:32,12 [50] ) | public int ParentValue { get; set; } = 42; | diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs index 93fe02db..ea8dc2f9 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -23,7 +22,7 @@ global::System.Object __typeHelper = "*, TestAssembly"; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); __o = typeof( @@ -33,14 +32,14 @@ global::System.Object __typeHelper = "*, TestAssembly"; #line default #line hidden ); - __o = Microsoft.AspNetCore.Blazor.Components.RuntimeHelpers.TypeCheck( + __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck( #line 2 "x:\dir\subdir\Test\TestComponent.cshtml" "hi" #line default #line hidden ); - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Blazor.RenderFragment)((builder2) => { + builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { } )); } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.ir.txt index 146087d7..6d9d0292 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly CSharpCode - diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.mappings.txt index 6f3c26f8..c8cfdec1 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic/TestComponent.mappings.txt @@ -1,15 +1,15 @@ Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) |*, TestAssembly| -Generated Location: (559:16,38 [15] ) +Generated Location: (503:15,38 [15] ) |*, TestAssembly| Source Location: (50:1,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) |string| -Generated Location: (1083:30,19 [6] ) +Generated Location: (1031:29,19 [6] ) |string| Source Location: (65:1,34 [4] x:\dir\subdir\Test\TestComponent.cshtml) |"hi"| -Generated Location: (1315:37,34 [4] ) +Generated Location: (1256:36,34 [4] ) |"hi"| diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs index 731424d4..9564c397 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -23,7 +22,7 @@ global::System.Object __typeHelper = "*, TestAssembly"; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); __o = typeof( @@ -33,7 +32,7 @@ global::System.Object __typeHelper = "*, TestAssembly"; #line default #line hidden ); - __o = Microsoft.AspNetCore.Blazor.Components.RuntimeHelpers.TypeCheck(Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue( + __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck(Microsoft.AspNetCore.Components.BindMethods.GetValue( #line 2 "x:\dir\subdir\Test\TestComponent.cshtml" Value @@ -42,7 +41,7 @@ global::System.Object __typeHelper = "*, TestAssembly"; )); __o = new System.Action( __value => Value = __value); - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Blazor.RenderFragment)((builder2) => { + builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { } )); } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt index d3374ea9..0028e0a5 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly CSharpCode - @@ -27,7 +26,7 @@ Document - IntermediateToken - (50:1,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - string ComponentAttributeExtensionNode - (67:1,36 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( IntermediateToken - (67:1,36 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value IntermediateToken - - CSharp - ) ComponentAttributeExtensionNode - (67:1,36 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - ItemChanged diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt index 7d8a6b03..07633fc4 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt @@ -1,23 +1,23 @@ Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) |*, TestAssembly| -Generated Location: (559:16,38 [15] ) +Generated Location: (503:15,38 [15] ) |*, TestAssembly| Source Location: (50:1,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) |string| -Generated Location: (1083:30,19 [6] ) +Generated Location: (1031:29,19 [6] ) |string| Source Location: (67:1,36 [5] x:\dir\subdir\Test\TestComponent.cshtml) |Value| -Generated Location: (1377:37,36 [5] ) +Generated Location: (1311:36,36 [5] ) |Value| Source Location: (88:2,12 [21] x:\dir\subdir\Test\TestComponent.cshtml) | string Value; | -Generated Location: (1779:50,12 [21] ) +Generated Location: (1717:49,12 [21] ) | string Value; | diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs index 68a6c9d5..03f32dce 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -23,7 +22,7 @@ global::System.Object __typeHelper = "*, TestAssembly"; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); __o = typeof( @@ -33,15 +32,15 @@ global::System.Object __typeHelper = "*, TestAssembly"; #line default #line hidden ); - __o = Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue( + __o = Microsoft.AspNetCore.Components.BindMethods.GetValue( #line 2 "x:\dir\subdir\Test\TestComponent.cshtml" Value #line default #line hidden ); - __o = Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler(__value => Value = __value, Value); - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Blazor.RenderFragment)((builder2) => { + __o = Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => Value = __value, Value); + builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { } )); } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt index 716a6113..eead159f 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly CSharpCode - @@ -27,12 +26,12 @@ Document - IntermediateToken - (50:1,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - string ComponentAttributeExtensionNode - (67:1,36 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( IntermediateToken - (67:1,36 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value IntermediateToken - - CSharp - ) ComponentAttributeExtensionNode - (67:1,36 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler(__value => Value = __value, Value) + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => Value = __value, Value) HtmlContent - (74:1,43 [2] x:\dir\subdir\Test\TestComponent.cshtml) IntermediateToken - (74:1,43 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n CSharpCode - (88:2,12 [21] x:\dir\subdir\Test\TestComponent.cshtml) diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt index 24f508cd..10234758 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt @@ -1,23 +1,23 @@ Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) |*, TestAssembly| -Generated Location: (559:16,38 [15] ) +Generated Location: (503:15,38 [15] ) |*, TestAssembly| Source Location: (50:1,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) |string| -Generated Location: (1083:30,19 [6] ) +Generated Location: (1031:29,19 [6] ) |string| Source Location: (67:1,36 [5] x:\dir\subdir\Test\TestComponent.cshtml) |Value| -Generated Location: (1305:37,36 [5] ) +Generated Location: (1246:36,36 [5] ) |Value| Source Location: (88:2,12 [21] x:\dir\subdir\Test\TestComponent.cshtml) | string Value; | -Generated Location: (1740:49,12 [21] ) +Generated Location: (1678:48,12 [21] ) | string Value; | diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs index 2b1ad577..d1412ef3 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -23,7 +22,7 @@ global::System.Object __typeHelper = "*, TestAssembly"; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, @@ -32,13 +31,13 @@ global::System.Object __typeHelper = "*, TestAssembly"; #line default #line hidden - , -1, Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue( + , -1, Microsoft.AspNetCore.Components.BindMethods.GetValue( #line 2 "x:\dir\subdir\Test\TestComponent.cshtml" Value #line default #line hidden - ), -1, Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler(__value => Value = __value, Value)); + ), -1, Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => Value = __value, Value)); } #pragma warning restore 1998 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml" @@ -54,7 +53,7 @@ namespace __Blazor.Test.TestComponent #line hidden internal static class TypeInference { - public static void CreateMyComponent_0(global::Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, System.Object __arg1, int __seq2, System.Object __arg2) + public static void CreateMyComponent_0(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, System.Object __arg1, int __seq2, System.Object __arg2) { builder.OpenComponent>(seq); builder.AddAttribute(__seq0, "Value", __arg0); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt index eed79cdf..3ce37a7d 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly CSharpCode - @@ -28,12 +27,12 @@ Document - IntermediateToken - (68:1,37 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 18 ComponentAttributeExtensionNode - (54:1,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( IntermediateToken - (54:1,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value IntermediateToken - - CSharp - ) ComponentAttributeExtensionNode - (54:1,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler(__value => Value = __value, Value) + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => Value = __value, Value) HtmlContent - (73:1,42 [2] x:\dir\subdir\Test\TestComponent.cshtml) IntermediateToken - (73:1,42 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n CSharpCode - (87:2,12 [21] x:\dir\subdir\Test\TestComponent.cshtml) diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt index 2003c3d8..23f5de23 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt @@ -1,23 +1,23 @@ Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) |*, TestAssembly| -Generated Location: (559:16,38 [15] ) +Generated Location: (503:15,38 [15] ) |*, TestAssembly| Source Location: (68:1,37 [2] x:\dir\subdir\Test\TestComponent.cshtml) |18| -Generated Location: (1167:30,37 [2] ) +Generated Location: (1115:29,37 [2] ) |18| Source Location: (54:1,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) |Value| -Generated Location: (1356:36,23 [5] ) +Generated Location: (1297:35,23 [5] ) |Value| Source Location: (87:2,12 [21] x:\dir\subdir\Test\TestComponent.cshtml) | string Value; | -Generated Location: (1630:44,12 [21] ) +Generated Location: (1564:43,12 [21] ) | string Value; | diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs index 45133e3c..a50ae877 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -23,10 +22,10 @@ global::System.Object __typeHelper = "*, TestAssembly"; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); - __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue( + __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, Microsoft.AspNetCore.Components.BindMethods.GetValue( #line 2 "x:\dir\subdir\Test\TestComponent.cshtml" Value @@ -49,7 +48,7 @@ namespace __Blazor.Test.TestComponent #line hidden internal static class TypeInference { - public static void CreateMyComponent_0(global::Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::System.Action __arg1) + public static void CreateMyComponent_0(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::System.Action __arg1) { builder.OpenComponent>(seq); builder.AddAttribute(__seq0, "Item", __arg0); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt index 574589d5..8da25b3d 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly CSharpCode - @@ -25,7 +24,7 @@ Document - ComponentExtensionNode - (31:1,0 [30] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - global::Test.MyComponent ComponentAttributeExtensionNode - (54:1,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( IntermediateToken - (54:1,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value IntermediateToken - - CSharp - ) ComponentAttributeExtensionNode - (54:1,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - ItemChanged diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt index 811a36f0..566c12bf 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt @@ -1,18 +1,18 @@ Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) |*, TestAssembly| -Generated Location: (559:16,38 [15] ) +Generated Location: (503:15,38 [15] ) |*, TestAssembly| Source Location: (54:1,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) |Value| -Generated Location: (1213:30,23 [5] ) +Generated Location: (1154:29,23 [5] ) |Value| Source Location: (75:2,12 [21] x:\dir\subdir\Test\TestComponent.cshtml) | string Value; | -Generated Location: (1426:39,12 [21] ) +Generated Location: (1367:38,12 [21] ) | string Value; | diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs index efd94b19..84bb22d4 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -23,7 +22,7 @@ global::System.Object __typeHelper = "*, TestAssembly"; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); __o = typeof( @@ -33,14 +32,14 @@ global::System.Object __typeHelper = "*, TestAssembly"; #line default #line hidden ); - __o = Microsoft.AspNetCore.Blazor.Components.RuntimeHelpers.TypeCheck( + __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck( #line 2 "x:\dir\subdir\Test\TestComponent.cshtml" "hi" #line default #line hidden ); - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Blazor.RenderFragment)((context) => (builder2) => { + builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((context) => (builder2) => { #line 3 "x:\dir\subdir\Test\TestComponent.cshtml" __o = context.ToLower(); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.ir.txt index 7ad56e0a..5b20b6f6 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly CSharpCode - diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.mappings.txt index bc3d4f0c..62f2c6c6 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.mappings.txt @@ -1,20 +1,20 @@ Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) |*, TestAssembly| -Generated Location: (559:16,38 [15] ) +Generated Location: (503:15,38 [15] ) |*, TestAssembly| Source Location: (50:1,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) |string| -Generated Location: (1083:30,19 [6] ) +Generated Location: (1031:29,19 [6] ) |string| Source Location: (65:1,34 [4] x:\dir\subdir\Test\TestComponent.cshtml) |"hi"| -Generated Location: (1315:37,34 [4] ) +Generated Location: (1256:36,34 [4] ) |"hi"| Source Location: (82:2,8 [17] x:\dir\subdir\Test\TestComponent.cshtml) |context.ToLower()| -Generated Location: (1563:44,8 [17] ) +Generated Location: (1508:43,8 [17] ) |context.ToLower()| diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs index 7e11a1c1..3952832c 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -23,7 +22,7 @@ global::System.Object __typeHelper = "*, TestAssembly"; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, @@ -49,7 +48,7 @@ namespace __Blazor.Test.TestComponent #line hidden internal static class TypeInference { - public static void CreateMyComponent_0(global::Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Blazor.RenderFragment __arg1) + public static void CreateMyComponent_0(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment __arg1) { builder.OpenComponent>(seq); builder.AddAttribute(__seq0, "Item", __arg0); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.ir.txt index 4ad0e226..0c8dec9c 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly CSharpCode - diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.mappings.txt index f87ad7df..d966dab3 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.mappings.txt @@ -1,15 +1,15 @@ Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) |*, TestAssembly| -Generated Location: (559:16,38 [15] ) +Generated Location: (503:15,38 [15] ) |*, TestAssembly| Source Location: (52:1,21 [4] x:\dir\subdir\Test\TestComponent.cshtml) |"hi"| -Generated Location: (1151:30,21 [4] ) +Generated Location: (1099:29,21 [4] ) |"hi"| Source Location: (69:2,8 [17] x:\dir\subdir\Test\TestComponent.cshtml) |context.ToLower()| -Generated Location: (1295:36,8 [17] ) +Generated Location: (1243:35,8 [17] ) |context.ToLower()| diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs index 4eb98577..e3f7ea64 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -23,7 +22,7 @@ global::System.Object __typeHelper = "*, TestAssembly"; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); __o = typeof( @@ -33,7 +32,7 @@ global::System.Object __typeHelper = "*, TestAssembly"; #line default #line hidden ); - __o = Microsoft.AspNetCore.Blazor.Components.RuntimeHelpers.TypeCheck( + __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck( #line 2 "x:\dir\subdir\Test\TestComponent.cshtml" "hi" @@ -47,7 +46,7 @@ global::System.Object __typeHelper = "*, TestAssembly"; #line default #line hidden ; - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Blazor.RenderFragment)((builder2) => { + builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { } )); } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.ir.txt index 2cd9694d..18d0da6b 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly CSharpCode - diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.mappings.txt index a1b8e804..3fe96bdb 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.mappings.txt @@ -1,20 +1,20 @@ Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) |*, TestAssembly| -Generated Location: (559:16,38 [15] ) +Generated Location: (503:15,38 [15] ) |*, TestAssembly| Source Location: (50:1,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) |string| -Generated Location: (1083:30,19 [6] ) +Generated Location: (1031:29,19 [6] ) |string| Source Location: (65:1,34 [4] x:\dir\subdir\Test\TestComponent.cshtml) |"hi"| -Generated Location: (1315:37,34 [4] ) +Generated Location: (1256:36,34 [4] ) |"hi"| Source Location: (81:1,50 [2] x:\dir\subdir\Test\TestComponent.cshtml) |17| -Generated Location: (1489:44,50 [2] ) +Generated Location: (1430:43,50 [2] ) |17| diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs index f361f20b..959b2015 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -23,7 +22,7 @@ global::System.Object __typeHelper = "*, TestAssembly"; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, @@ -48,7 +47,7 @@ namespace __Blazor.Test.TestComponent #line hidden internal static class TypeInference { - public static void CreateMyComponent_0(global::Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, System.Object __arg1) + public static void CreateMyComponent_0(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, System.Object __arg1) { builder.OpenComponent>(seq); builder.AddAttribute(__seq0, "Item", __arg0); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.ir.txt index 405e24e5..fffdaf96 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly CSharpCode - diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.mappings.txt index 4c563282..565d3538 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.mappings.txt @@ -1,15 +1,15 @@ Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) |*, TestAssembly| -Generated Location: (559:16,38 [15] ) +Generated Location: (503:15,38 [15] ) |*, TestAssembly| Source Location: (52:1,21 [4] x:\dir\subdir\Test\TestComponent.cshtml) |"hi"| -Generated Location: (1151:30,21 [4] ) +Generated Location: (1099:29,21 [4] ) |"hi"| Source Location: (68:1,37 [2] x:\dir\subdir\Test\TestComponent.cshtml) |17| -Generated Location: (1296:36,37 [2] ) +Generated Location: (1244:35,37 [2] ) |17| diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs index 1d555832..d77ffc4e 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -23,7 +22,7 @@ global::System.Object __typeHelper = "*, TestAssembly"; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, @@ -42,7 +41,7 @@ namespace __Blazor.Test.TestComponent #line hidden internal static class TypeInference { - public static void CreateMyComponent_0(global::Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0) + public static void CreateMyComponent_0(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0) { builder.OpenComponent>(seq); builder.AddAttribute(__seq0, "Item", __arg0); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.ir.txt index 7c438780..ffc822ec 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly CSharpCode - diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.mappings.txt index 08fbfce2..ae90183a 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.mappings.txt @@ -1,10 +1,10 @@ Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) |*, TestAssembly| -Generated Location: (559:16,38 [15] ) +Generated Location: (503:15,38 [15] ) |*, TestAssembly| Source Location: (52:1,21 [4] x:\dir\subdir\Test\TestComponent.cshtml) |"hi"| -Generated Location: (1151:30,21 [4] ) +Generated Location: (1099:29,21 [4] ) |"hi"| diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs index 5e55330f..ee03dbe3 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -23,7 +22,7 @@ global::System.Object __typeHelper = "*, TestAssembly"; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, @@ -56,19 +55,19 @@ namespace __Blazor.Test.TestComponent #line hidden internal static class TypeInference { - public static void CreateMyComponent_0(global::Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0) + public static void CreateMyComponent_0(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0) { builder.OpenComponent>(seq); builder.AddAttribute(__seq0, "Item", __arg0); builder.CloseComponent(); } - public static void CreateMyComponent_1(global::Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0) + public static void CreateMyComponent_1(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0) { builder.OpenComponent>(seq); builder.AddAttribute(__seq0, "Item", __arg0); builder.CloseComponent(); } - public static void CreateMyComponent_2(global::Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0) + public static void CreateMyComponent_2(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0) { builder.OpenComponent>(seq); builder.AddAttribute(__seq0, "Item", __arg0); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.ir.txt index 7b1d9277..4c544937 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly CSharpCode - diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.mappings.txt index bf76f545..cde7b926 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.mappings.txt @@ -1,20 +1,20 @@ Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) |*, TestAssembly| -Generated Location: (559:16,38 [15] ) +Generated Location: (503:15,38 [15] ) |*, TestAssembly| Source Location: (52:1,21 [4] x:\dir\subdir\Test\TestComponent.cshtml) |"hi"| -Generated Location: (1151:30,21 [4] ) +Generated Location: (1099:29,21 [4] ) |"hi"| Source Location: (83:2,21 [14] x:\dir\subdir\Test\TestComponent.cshtml) |"how are you?"| -Generated Location: (1369:37,21 [14] ) +Generated Location: (1317:36,21 [14] ) |"how are you?"| Source Location: (124:3,21 [6] x:\dir\subdir\Test\TestComponent.cshtml) |"bye!"| -Generated Location: (1597:44,21 [6] ) +Generated Location: (1545:43,21 [6] ) |"bye!"| diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs index 508ac452..1ed68c5b 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -23,7 +22,7 @@ global::System.Object __typeHelper = "*, TestAssembly"; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); __o = typeof( @@ -40,14 +39,14 @@ global::System.Object __typeHelper = "*, TestAssembly"; #line default #line hidden ); - __o = Microsoft.AspNetCore.Blazor.Components.RuntimeHelpers.TypeCheck( + __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck( #line 2 "x:\dir\subdir\Test\TestComponent.cshtml" "hi" #line default #line hidden ); - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Blazor.RenderFragment)((context) => (builder2) => { + builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((context) => (builder2) => { #line 3 "x:\dir\subdir\Test\TestComponent.cshtml" __o = context.ToLower(); @@ -55,7 +54,7 @@ global::System.Object __typeHelper = "*, TestAssembly"; #line hidden } )); - builder.AddAttribute(-1, "AnotherChildContent", (Microsoft.AspNetCore.Blazor.RenderFragment.Context>)((item) => (builder2) => { + builder.AddAttribute(-1, "AnotherChildContent", (Microsoft.AspNetCore.Components.RenderFragment.Context>)((item) => (builder2) => { #line 5 "x:\dir\subdir\Test\TestComponent.cshtml" __o = System.Math.Max(0, item.Item); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.ir.txt index e51bbc93..099d94fb 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly CSharpCode - diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.mappings.txt index c84693dd..d0914a96 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.mappings.txt @@ -1,30 +1,30 @@ Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) |*, TestAssembly| -Generated Location: (559:16,38 [15] ) +Generated Location: (503:15,38 [15] ) |*, TestAssembly| Source Location: (51:1,20 [6] x:\dir\subdir\Test\TestComponent.cshtml) |string| -Generated Location: (1084:30,20 [6] ) +Generated Location: (1032:29,20 [6] ) |string| Source Location: (65:1,34 [3] x:\dir\subdir\Test\TestComponent.cshtml) |int| -Generated Location: (1251:37,34 [3] ) +Generated Location: (1199:36,34 [3] ) |int| Source Location: (77:1,46 [4] x:\dir\subdir\Test\TestComponent.cshtml) |"hi"| -Generated Location: (1492:44,46 [4] ) +Generated Location: (1433:43,46 [4] ) |"hi"| Source Location: (108:2,22 [17] x:\dir\subdir\Test\TestComponent.cshtml) |context.ToLower()| -Generated Location: (1754:51,22 [17] ) +Generated Location: (1699:50,22 [17] ) |context.ToLower()| Source Location: (189:4,3 [29] x:\dir\subdir\Test\TestComponent.cshtml) |System.Math.Max(0, item.Item)| -Generated Location: (2065:59,6 [29] ) +Generated Location: (2014:58,6 [29] ) |System.Math.Max(0, item.Item)| diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs index a83b0b0f..3933f941 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -23,7 +22,7 @@ global::System.Object __typeHelper = "*, TestAssembly"; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, @@ -62,7 +61,7 @@ namespace __Blazor.Test.TestComponent #line hidden internal static class TypeInference { - public static void CreateMyComponent_0(global::Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem1 __arg0, int __seq1, global::System.Collections.Generic.List __arg1, int __seq2, global::Microsoft.AspNetCore.Blazor.RenderFragment __arg2, int __seq3, global::Microsoft.AspNetCore.Blazor.RenderFragment.Context> __arg3) + public static void CreateMyComponent_0(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem1 __arg0, int __seq1, global::System.Collections.Generic.List __arg1, int __seq2, global::Microsoft.AspNetCore.Components.RenderFragment __arg2, int __seq3, global::Microsoft.AspNetCore.Components.RenderFragment.Context> __arg3) { builder.OpenComponent>(seq); builder.AddAttribute(__seq0, "Item", __arg0); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.ir.txt index ae43425e..a388f982 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly CSharpCode - diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.mappings.txt index 7303b56d..3e407852 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.mappings.txt @@ -1,25 +1,25 @@ Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) |*, TestAssembly| -Generated Location: (559:16,38 [15] ) +Generated Location: (503:15,38 [15] ) |*, TestAssembly| Source Location: (52:1,21 [4] x:\dir\subdir\Test\TestComponent.cshtml) |"hi"| -Generated Location: (1151:30,21 [4] ) +Generated Location: (1099:29,21 [4] ) |"hi"| Source Location: (67:1,36 [16] x:\dir\subdir\Test\TestComponent.cshtml) |new List()| -Generated Location: (1295:36,36 [16] ) +Generated Location: (1243:35,36 [16] ) |new List()| Source Location: (109:2,22 [17] x:\dir\subdir\Test\TestComponent.cshtml) |context.ToLower()| -Generated Location: (1465:42,22 [17] ) +Generated Location: (1413:41,22 [17] ) |context.ToLower()| Source Location: (190:4,3 [29] x:\dir\subdir\Test\TestComponent.cshtml) |System.Math.Max(0, item.Item)| -Generated Location: (1633:49,6 [29] ) +Generated Location: (1581:48,6 [29] ) |System.Math.Max(0, item.Item)| diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs index 37a30096..3c8fef10 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -23,10 +22,10 @@ global::System.Object __typeHelper = "*, TestAssembly"; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Blazor.RenderFragment)((builder2) => { + builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { } )); } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Simple/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Simple/TestComponent.ir.txt index c7164648..04bb07c5 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Simple/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Simple/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly CSharpCode - diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Simple/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Simple/TestComponent.mappings.txt index 75b2c90a..3917573a 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Simple/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_Simple/TestComponent.mappings.txt @@ -1,5 +1,5 @@ Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) |*, TestAssembly| -Generated Location: (559:16,38 [15] ) +Generated Location: (503:15,38 [15] ) |*, TestAssembly| diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs index 37b905a5..288be779 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -23,11 +22,11 @@ global::System.Object __typeHelper = "*, TestAssembly"; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); __o = ""; - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Blazor.RenderFragment)((builder2) => { + builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { } )); } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.ir.txt index c921265f..f32a0f1d 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly CSharpCode - diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.mappings.txt index 75b2c90a..3917573a 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.mappings.txt @@ -1,5 +1,5 @@ Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) |*, TestAssembly| -Generated Location: (559:16,38 [15] ) +Generated Location: (503:15,38 [15] ) |*, TestAssembly| diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs index 37a30096..3c8fef10 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -23,10 +22,10 @@ global::System.Object __typeHelper = "*, TestAssembly"; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Blazor.RenderFragment)((builder2) => { + builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { } )); } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.ir.txt index 9dc149f9..f08cf8b7 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly CSharpCode - diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.mappings.txt index 75b2c90a..3917573a 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.mappings.txt @@ -1,5 +1,5 @@ Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) |*, TestAssembly| -Generated Location: (559:16,38 [15] ) +Generated Location: (503:15,38 [15] ) |*, TestAssembly| diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs index 37a30096..3c8fef10 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -23,10 +22,10 @@ global::System.Object __typeHelper = "*, TestAssembly"; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Blazor.RenderFragment)((builder2) => { + builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { } )); } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.ir.txt index 8b2563d0..48021f51 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly CSharpCode - diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.mappings.txt index 75b2c90a..3917573a 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.mappings.txt @@ -1,5 +1,5 @@ Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) |*, TestAssembly| -Generated Location: (559:16,38 [15] ) +Generated Location: (503:15,38 [15] ) |*, TestAssembly| diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs index 80ef9154..61d34f78 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -23,17 +22,17 @@ global::System.Object __typeHelper = "*, TestAssembly"; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); - __o = new System.Action( + __o = new System.Action( #line 2 "x:\dir\subdir\Test\TestComponent.cshtml" Increment #line default #line hidden ); - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Blazor.RenderFragment)((builder2) => { + builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { } )); } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.ir.txt index 0d8159d2..ae39bbd0 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly CSharpCode - diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt index f2561d95..c6405d7c 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt @@ -1,11 +1,11 @@ Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) |*, TestAssembly| -Generated Location: (559:16,38 [15] ) +Generated Location: (503:15,38 [15] ) |*, TestAssembly| Source Location: (54:1,23 [9] x:\dir\subdir\Test\TestComponent.cshtml) |Increment| -Generated Location: (1139:30,23 [9] ) +Generated Location: (1091:29,23 [9] ) |Increment| Source Location: (82:3,12 [100] x:\dir\subdir\Test\TestComponent.cshtml) @@ -15,7 +15,7 @@ Source Location: (82:3,12 [100] x:\dir\subdir\Test\TestComponent.cshtml) counter++; } | -Generated Location: (1456:41,12 [100] ) +Generated Location: (1412:40,12 [100] ) | private int counter; private void Increment(UIEventArgs e) { diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs index d651e6bd..a2c06654 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -23,10 +22,10 @@ global::System.Object __typeHelper = "*, TestAssembly"; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Blazor.RenderFragment)((context) => (builder2) => { + builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((context) => (builder2) => { #line 2 "x:\dir\subdir\Test\TestComponent.cshtml" __o = context; diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.ir.txt index 2304ddd2..26e2f26f 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly CSharpCode - diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.mappings.txt index 940513b3..ca548bcd 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.mappings.txt @@ -1,10 +1,10 @@ Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) |*, TestAssembly| -Generated Location: (559:16,38 [15] ) +Generated Location: (503:15,38 [15] ) |*, TestAssembly| Source Location: (59:1,28 [7] x:\dir\subdir\Test\TestComponent.cshtml) |context| -Generated Location: (1208:30,28 [7] ) +Generated Location: (1160:29,28 [7] ) |context| diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs index 6b3b9823..ef634834 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -23,17 +22,17 @@ global::System.Object __typeHelper = "*, TestAssembly"; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Blazor.Components.RuntimeHelpers.TypeCheck( + __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck( #line 2 "x:\dir\subdir\Test\TestComponent.cshtml" 42.ToString() #line default #line hidden ); - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Blazor.RenderFragment)((builder2) => { + builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { } )); } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.ir.txt index 8b15ed35..a1f995fc 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly CSharpCode - diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.mappings.txt index ce035f81..81e7979f 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.mappings.txt @@ -1,10 +1,10 @@ Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) |*, TestAssembly| -Generated Location: (559:16,38 [15] ) +Generated Location: (503:15,38 [15] ) |*, TestAssembly| Source Location: (62:1,31 [13] x:\dir\subdir\Test\TestComponent.cshtml) |42.ToString()| -Generated Location: (1167:30,31 [13] ) +Generated Location: (1108:29,31 [13] ) |42.ToString()| diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs index 4839a7dc..5b51e73b 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -23,11 +22,11 @@ global::System.Object __typeHelper = "*, TestAssembly"; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); __o = ""; - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Blazor.RenderFragment)((context) => (builder2) => { + builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((context) => (builder2) => { #line 2 "x:\dir\subdir\Test\TestComponent.cshtml" __o = context.ToLowerInvariant(); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.ir.txt index f493489d..5ac19051 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly CSharpCode - diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.mappings.txt index a9d74640..81a696b3 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.mappings.txt @@ -1,10 +1,10 @@ Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) |*, TestAssembly| -Generated Location: (559:16,38 [15] ) +Generated Location: (503:15,38 [15] ) |*, TestAssembly| Source Location: (85:1,54 [26] x:\dir\subdir\Test\TestComponent.cshtml) |context.ToLowerInvariant()| -Generated Location: (1257:31,54 [26] ) +Generated Location: (1209:30,54 [26] ) |context.ToLowerInvariant()| diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs index 6e6d1eeb..b7253041 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -23,11 +22,11 @@ global::System.Object __typeHelper = "*, TestAssembly"; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); __o = ""; - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Blazor.RenderFragment)((item) => (builder2) => { + builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((item) => (builder2) => { #line 4 "x:\dir\subdir\Test\TestComponent.cshtml" __o = item.ToLowerInvariant(); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.ir.txt index 9e4657e0..af1d1720 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly CSharpCode - diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.mappings.txt index 611fa5c8..5031c585 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.mappings.txt @@ -1,10 +1,10 @@ Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) |*, TestAssembly| -Generated Location: (559:16,38 [15] ) +Generated Location: (503:15,38 [15] ) |*, TestAssembly| Source Location: (124:3,32 [23] x:\dir\subdir\Test\TestComponent.cshtml) |item.ToLowerInvariant()| -Generated Location: (1232:31,32 [23] ) +Generated Location: (1184:30,32 [23] ) |item.ToLowerInvariant()| diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs index 6e6d1eeb..b7253041 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -23,11 +22,11 @@ global::System.Object __typeHelper = "*, TestAssembly"; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); __o = ""; - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Blazor.RenderFragment)((item) => (builder2) => { + builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((item) => (builder2) => { #line 4 "x:\dir\subdir\Test\TestComponent.cshtml" __o = item.ToLowerInvariant(); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.ir.txt index a89ac46d..abe03502 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly CSharpCode - diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.mappings.txt index 611fa5c8..5031c585 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.mappings.txt @@ -1,10 +1,10 @@ Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) |*, TestAssembly| -Generated Location: (559:16,38 [15] ) +Generated Location: (503:15,38 [15] ) |*, TestAssembly| Source Location: (124:3,32 [23] x:\dir\subdir\Test\TestComponent.cshtml) |item.ToLowerInvariant()| -Generated Location: (1232:31,32 [23] ) +Generated Location: (1184:30,32 [23] ) |item.ToLowerInvariant()| diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs index dff0bcaa..e40582d4 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -23,17 +22,17 @@ global::System.Object __typeHelper = "*, TestAssembly"; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); - __o = new System.Action( + __o = new System.Action( #line 2 "x:\dir\subdir\Test\TestComponent.cshtml" e => { Increment(); } #line default #line hidden ); - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Blazor.RenderFragment)((builder2) => { + builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { } )); } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.ir.txt index f5eec3c9..4bc5d5e6 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly CSharpCode - diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt index e93f4f0c..52bd5077 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt @@ -1,11 +1,11 @@ Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) |*, TestAssembly| -Generated Location: (559:16,38 [15] ) +Generated Location: (503:15,38 [15] ) |*, TestAssembly| Source Location: (55:1,24 [21] x:\dir\subdir\Test\TestComponent.cshtml) |e => { Increment(); }| -Generated Location: (1140:30,24 [21] ) +Generated Location: (1092:29,24 [21] ) |e => { Increment(); }| Source Location: (96:3,12 [87] x:\dir\subdir\Test\TestComponent.cshtml) @@ -15,7 +15,7 @@ Source Location: (96:3,12 [87] x:\dir\subdir\Test\TestComponent.cshtml) counter++; } | -Generated Location: (1469:41,12 [87] ) +Generated Location: (1425:40,12 [87] ) | private int counter; private void Increment() { diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs index 2493afaa..eb6a8195 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -23,7 +22,7 @@ global::System.Object __typeHelper = "*, TestAssembly"; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); __o = ""; @@ -34,7 +33,7 @@ global::System.Object __typeHelper = "*, TestAssembly"; #line default #line hidden ; - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Blazor.RenderFragment)((builder2) => { + builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { } )); } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.ir.txt index 258374b1..7a7abec5 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly CSharpCode - diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.mappings.txt index dc2183fe..e441ce9d 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.mappings.txt @@ -1,10 +1,10 @@ Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) |*, TestAssembly| -Generated Location: (559:16,38 [15] ) +Generated Location: (503:15,38 [15] ) |*, TestAssembly| Source Location: (86:1,55 [13] x:\dir\subdir\Test\TestComponent.cshtml) |43.ToString()| -Generated Location: (1135:31,55 [13] ) +Generated Location: (1083:30,55 [13] ) |43.ToString()| diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs index aa907c15..264122c8 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs @@ -7,11 +7,10 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - [Microsoft.AspNetCore.Blazor.Components.RouteAttribute("/MyPage")] - [Microsoft.AspNetCore.Blazor.Components.RouteAttribute("/AnotherRoute/{id}")] - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + [Microsoft.AspNetCore.Components.RouteAttribute("/MyPage")] + [Microsoft.AspNetCore.Components.RouteAttribute("/AnotherRoute/{id}")] + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -33,10 +32,10 @@ global::System.Object __typeHelper = "/AnotherRoute/{id}"; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Blazor.RenderFragment)((builder2) => { + builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { } )); } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.ir.txt index f87c22ab..bfbbf794 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.ir.txt @@ -4,13 +4,12 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components RouteAttributeExtensionNode - - /MyPage RouteAttributeExtensionNode - - /AnotherRoute/{id} - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly DirectiveToken - (37:1,6 [9] x:\dir\subdir\Test\TestComponent.cshtml) - "/MyPage" diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.mappings.txt index 53489fb3..201fe3fc 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.mappings.txt @@ -1,15 +1,15 @@ Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) |*, TestAssembly| -Generated Location: (714:18,38 [15] ) +Generated Location: (644:17,38 [15] ) |*, TestAssembly| Source Location: (37:1,6 [9] x:\dir\subdir\Test\TestComponent.cshtml) |"/MyPage"| -Generated Location: (830:22,37 [9] ) +Generated Location: (760:21,37 [9] ) |"/MyPage"| Source Location: (54:2,6 [20] x:\dir\subdir\Test\TestComponent.cshtml) |"/AnotherRoute/{id}"| -Generated Location: (939:26,37 [20] ) +Generated Location: (869:25,37 [20] ) |"/AnotherRoute/{id}"| diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs index 84d497b7..14f9c64f 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -23,17 +22,17 @@ global::System.Object __typeHelper = "*, TestAssembly"; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Blazor.Components.RuntimeHelpers.TypeCheck( + __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck( #line 3 "x:\dir\subdir\Test\TestComponent.cshtml" 123 #line default #line hidden ); - __o = Microsoft.AspNetCore.Blazor.Components.RuntimeHelpers.TypeCheck( + __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck( #line 4 "x:\dir\subdir\Test\TestComponent.cshtml" true @@ -41,14 +40,14 @@ global::System.Object __typeHelper = "*, TestAssembly"; #line hidden ); __o = ""; - __o = Microsoft.AspNetCore.Blazor.Components.RuntimeHelpers.TypeCheck( + __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck( #line 6 "x:\dir\subdir\Test\TestComponent.cshtml" new SomeType() #line default #line hidden ); - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Blazor.RenderFragment)((builder2) => { + builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { } )); } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.ir.txt index 5eb412c5..75f100aa 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly CSharpCode - diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.mappings.txt index 3ac58aa1..c8b0c010 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.mappings.txt @@ -1,20 +1,20 @@ Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) |*, TestAssembly| -Generated Location: (559:16,38 [15] ) +Generated Location: (503:15,38 [15] ) |*, TestAssembly| Source Location: (63:2,17 [3] x:\dir\subdir\Test\TestComponent.cshtml) |123| -Generated Location: (1152:30,17 [3] ) +Generated Location: (1093:29,17 [3] ) |123| Source Location: (87:3,18 [4] x:\dir\subdir\Test\TestComponent.cshtml) |true| -Generated Location: (1373:37,18 [4] ) +Generated Location: (1307:36,18 [4] ) |true| Source Location: (146:5,20 [14] x:\dir\subdir\Test\TestComponent.cshtml) |new SomeType()| -Generated Location: (1619:45,20 [14] ) +Generated Location: (1546:44,20 [14] ) |new SomeType()| diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs index 64eaf8d5..d6a9b814 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -23,17 +22,17 @@ global::System.Object __typeHelper = "*, TestAssembly"; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Blazor.Components.BindMethods.GetEventHandlerValue( + __o = Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue( #line 2 "x:\dir\subdir\Test\TestComponent.cshtml" OnClick #line default #line hidden ); - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Blazor.RenderFragment)((builder2) => { + builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { } )); } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt index 604f3fa8..c745f2e3 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly CSharpCode - @@ -25,7 +24,7 @@ Document - ComponentExtensionNode - (31:1,0 [37] x:\dir\subdir\Test\TestComponent.cshtml) - DynamicElement - Test.DynamicElement ComponentAttributeExtensionNode - (56:1,25 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick - onclick CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetEventHandlerValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue( IntermediateToken - (57:1,26 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick IntermediateToken - - CSharp - ) HtmlContent - (68:1,37 [4] x:\dir\subdir\Test\TestComponent.cshtml) diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt index ecad042f..4902958c 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt @@ -1,18 +1,18 @@ Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) |*, TestAssembly| -Generated Location: (559:16,38 [15] ) +Generated Location: (503:15,38 [15] ) |*, TestAssembly| Source Location: (57:1,26 [7] x:\dir\subdir\Test\TestComponent.cshtml) |OnClick| -Generated Location: (1201:30,26 [7] ) +Generated Location: (1146:29,26 [7] ) |OnClick| Source Location: (84:3,12 [62] x:\dir\subdir\Test\TestComponent.cshtml) | private Action OnClick { get; set; } | -Generated Location: (1516:41,12 [62] ) +Generated Location: (1465:40,12 [62] ) | private Action OnClick { get; set; } | diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs index b2ce5612..2aa30acc 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -23,17 +22,17 @@ global::System.Object __typeHelper = "*, TestAssembly"; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Blazor.Components.RuntimeHelpers.TypeCheck( + __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck( #line 2 "x:\dir\subdir\Test\TestComponent.cshtml" "very-cool" #line default #line hidden ); - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Blazor.RenderFragment)((builder2) => { + builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { } )); } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.ir.txt index 20f0a9c4..00684495 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly CSharpCode - diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.mappings.txt index 23d1a88d..2e5b8954 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.mappings.txt @@ -1,10 +1,10 @@ Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) |*, TestAssembly| -Generated Location: (559:16,38 [15] ) +Generated Location: (503:15,38 [15] ) |*, TestAssembly| Source Location: (58:1,27 [11] x:\dir\subdir\Test\TestComponent.cshtml) |"very-cool"| -Generated Location: (1162:30,27 [11] ) +Generated Location: (1103:29,27 [11] ) |"very-cool"| diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs index fa3845b8..b7cb3a15 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs @@ -8,12 +8,11 @@ namespace Test using System.Linq; using System.Threading.Tasks; #line 1 "x:\dir\subdir\Test\TestComponent.cshtml" -using Microsoft.AspNetCore.Blazor; +using Microsoft.AspNetCore.Components; #line default #line hidden - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -31,7 +30,7 @@ global::System.Object TItem2 = null; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); #line 6 "x:\dir\subdir\Test\TestComponent.cshtml" diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.ir.txt index ca67ec22..e7daa631 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.ir.txt @@ -4,14 +4,13 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (1:0,1 [34] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (1:0,1 [38] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (48:1,11 [6] x:\dir\subdir\Test\TestComponent.cshtml) - TItem1 - DirectiveToken - (67:2,11 [6] x:\dir\subdir\Test\TestComponent.cshtml) - TItem2 + DirectiveToken - (52:1,11 [6] x:\dir\subdir\Test\TestComponent.cshtml) - TItem1 + DirectiveToken - (71:2,11 [6] x:\dir\subdir\Test\TestComponent.cshtml) - TItem2 CSharpCode - IntermediateToken - - CSharp - #pragma warning disable 0414 CSharpCode - @@ -21,27 +20,27 @@ Document - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (35:0,35 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (35:0,35 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - HtmlContent - (75:3,0 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (75:3,0 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - HtmlElement - (77:4,0 [14] x:\dir\subdir\Test\TestComponent.cshtml) - h1 - HtmlContent - (81:4,4 [5] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (81:4,4 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Item1 - HtmlContent - (91:4,14 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (91:4,14 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - CSharpCode - (94:5,1 [38] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (94:5,1 [38] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - foreach (var item2 in Items2)\n{\n - HtmlElement - (132:7,4 [40] x:\dir\subdir\Test\TestComponent.cshtml) - p - HtmlContent - (135:7,7 [6] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (135:7,7 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - CSharpExpression - (142:8,5 [19] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (142:8,5 [19] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ChildContent(item2) - HtmlContent - (161:8,24 [7] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (161:8,24 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Html - ;\n - CSharpCode - (172:9,8 [3] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (172:9,8 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n} - HtmlContent - (175:10,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (175:10,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - CSharpCode - (189:11,12 [164] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (189:11,12 [164] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n [Parameter] TItem1 Item1 { get; set; }\n [Parameter] List Items2 { get; set; }\n [Parameter] RenderFragment ChildContent { get; set; }\n + HtmlContent - (39:0,39 [2] x:\dir\subdir\Test\TestComponent.cshtml) + IntermediateToken - (39:0,39 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n + HtmlContent - (79:3,0 [2] x:\dir\subdir\Test\TestComponent.cshtml) + IntermediateToken - (79:3,0 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n + HtmlElement - (81:4,0 [14] x:\dir\subdir\Test\TestComponent.cshtml) - h1 + HtmlContent - (85:4,4 [5] x:\dir\subdir\Test\TestComponent.cshtml) + IntermediateToken - (85:4,4 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Item1 + HtmlContent - (95:4,14 [2] x:\dir\subdir\Test\TestComponent.cshtml) + IntermediateToken - (95:4,14 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n + CSharpCode - (98:5,1 [38] x:\dir\subdir\Test\TestComponent.cshtml) + IntermediateToken - (98:5,1 [38] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - foreach (var item2 in Items2)\n{\n + HtmlElement - (136:7,4 [40] x:\dir\subdir\Test\TestComponent.cshtml) - p + HtmlContent - (139:7,7 [6] x:\dir\subdir\Test\TestComponent.cshtml) + IntermediateToken - (139:7,7 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n + CSharpExpression - (146:8,5 [19] x:\dir\subdir\Test\TestComponent.cshtml) + IntermediateToken - (146:8,5 [19] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ChildContent(item2) + HtmlContent - (165:8,24 [7] x:\dir\subdir\Test\TestComponent.cshtml) + IntermediateToken - (165:8,24 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Html - ;\n + CSharpCode - (176:9,8 [3] x:\dir\subdir\Test\TestComponent.cshtml) + IntermediateToken - (176:9,8 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n} + HtmlContent - (179:10,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) + IntermediateToken - (179:10,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n + CSharpCode - (193:11,12 [164] x:\dir\subdir\Test\TestComponent.cshtml) + IntermediateToken - (193:11,12 [164] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n [Parameter] TItem1 Item1 { get; set; }\n [Parameter] List Items2 { get; set; }\n [Parameter] RenderFragment ChildContent { get; set; }\n diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt index 114a9d97..d2ba18a0 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt @@ -1,46 +1,46 @@ -Source Location: (1:0,1 [34] x:\dir\subdir\Test\TestComponent.cshtml) -|using Microsoft.AspNetCore.Blazor;| -Generated Location: (257:10,0 [34] ) -|using Microsoft.AspNetCore.Blazor;| +Source Location: (1:0,1 [38] x:\dir\subdir\Test\TestComponent.cshtml) +|using Microsoft.AspNetCore.Components;| +Generated Location: (257:10,0 [38] ) +|using Microsoft.AspNetCore.Components;| -Source Location: (48:1,11 [6] x:\dir\subdir\Test\TestComponent.cshtml) +Source Location: (52:1,11 [6] x:\dir\subdir\Test\TestComponent.cshtml) |TItem1| -Generated Location: (637:20,22 [6] ) +Generated Location: (581:19,22 [6] ) |TItem1| -Source Location: (67:2,11 [6] x:\dir\subdir\Test\TestComponent.cshtml) +Source Location: (71:2,11 [6] x:\dir\subdir\Test\TestComponent.cshtml) |TItem2| -Generated Location: (735:24,22 [6] ) +Generated Location: (679:23,22 [6] ) |TItem2| -Source Location: (94:5,1 [38] x:\dir\subdir\Test\TestComponent.cshtml) +Source Location: (98:5,1 [38] x:\dir\subdir\Test\TestComponent.cshtml) |foreach (var item2 in Items2) { | -Generated Location: (1211:37,1 [38] ) +Generated Location: (1159:36,1 [38] ) |foreach (var item2 in Items2) { | -Source Location: (142:8,5 [19] x:\dir\subdir\Test\TestComponent.cshtml) +Source Location: (146:8,5 [19] x:\dir\subdir\Test\TestComponent.cshtml) |ChildContent(item2)| -Generated Location: (1339:44,6 [19] ) +Generated Location: (1287:43,6 [19] ) |ChildContent(item2)| -Source Location: (172:9,8 [3] x:\dir\subdir\Test\TestComponent.cshtml) +Source Location: (176:9,8 [3] x:\dir\subdir\Test\TestComponent.cshtml) | }| -Generated Location: (1452:49,8 [3] ) +Generated Location: (1400:48,8 [3] ) | }| -Source Location: (189:11,12 [164] x:\dir\subdir\Test\TestComponent.cshtml) +Source Location: (193:11,12 [164] x:\dir\subdir\Test\TestComponent.cshtml) | [Parameter] TItem1 Item1 { get; set; } [Parameter] List Items2 { get; set; } [Parameter] RenderFragment ChildContent { get; set; } | -Generated Location: (1601:57,12 [164] ) +Generated Location: (1549:56,12 [164] ) | [Parameter] TItem1 Item1 { get; set; } [Parameter] List Items2 { get; set; } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs index 6119cd65..919a59d5 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -19,7 +18,7 @@ namespace Test private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Component_WithDocType/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Component_WithDocType/TestComponent.ir.txt index 79bc37c8..bd6aceb1 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Component_WithDocType/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Component_WithDocType/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" CSharpCode - IntermediateToken - - CSharp - #pragma warning disable 0414 diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs index 164b0e5e..633fcbe5 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -23,12 +22,12 @@ global::System.Object __typeHelper = "*, TestAssembly"; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); __o = ""; __o = ""; - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Blazor.RenderFragment)((builder2) => { + builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { } )); #line 2 "x:\dir\subdir\Test\TestComponent.cshtml" diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt index adee9b61..938a2971 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly CSharpCode - diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt index 00f26500..8a41bd41 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt @@ -1,11 +1,11 @@ Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) |*, TestAssembly| -Generated Location: (559:16,38 [15] ) +Generated Location: (503:15,38 [15] ) |*, TestAssembly| Source Location: (70:1,39 [10] x:\dir\subdir\Test\TestComponent.cshtml) |myInstance| -Generated Location: (1269:34,39 [10] ) +Generated Location: (1221:33,39 [10] ) |myInstance| Source Location: (119:3,12 [104] x:\dir\subdir\Test\TestComponent.cshtml) @@ -13,7 +13,7 @@ Source Location: (119:3,12 [104] x:\dir\subdir\Test\TestComponent.cshtml) private Test.MyComponent myInstance; public void Foo() { System.GC.KeepAlive(myInstance); } | -Generated Location: (1453:41,12 [104] ) +Generated Location: (1405:40,12 [104] ) | private Test.MyComponent myInstance; public void Foo() { System.GC.KeepAlive(myInstance); } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs index dbbf2adf..4622f728 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -23,11 +22,11 @@ global::System.Object __typeHelper = "*, TestAssembly"; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); __o = ""; - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Blazor.RenderFragment)((builder2) => { + builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { } )); #line 2 "x:\dir\subdir\Test\TestComponent.cshtml" diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt index 8bcf5f5a..7817dcfe 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly CSharpCode - diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt index 8f0e8651..3d1c3b4c 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt @@ -1,11 +1,11 @@ Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) |*, TestAssembly| -Generated Location: (559:16,38 [15] ) +Generated Location: (503:15,38 [15] ) |*, TestAssembly| Source Location: (49:1,18 [10] x:\dir\subdir\Test\TestComponent.cshtml) |myInstance| -Generated Location: (1225:33,18 [10] ) +Generated Location: (1177:32,18 [10] ) |myInstance| Source Location: (143:5,12 [104] x:\dir\subdir\Test\TestComponent.cshtml) @@ -13,7 +13,7 @@ Source Location: (143:5,12 [104] x:\dir\subdir\Test\TestComponent.cshtml) private Test.MyComponent myInstance; public void Foo() { System.GC.KeepAlive(myInstance); } | -Generated Location: (1409:40,12 [104] ) +Generated Location: (1361:39,12 [104] ) | private Test.MyComponent myInstance; public void Foo() { System.GC.KeepAlive(myInstance); } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs index c430656f..652f5243 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -19,11 +18,11 @@ namespace Test private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); #line 1 "x:\dir\subdir\Test\TestComponent.cshtml" - myElem = default(Microsoft.AspNetCore.Blazor.ElementRef); + myElem = default(Microsoft.AspNetCore.Components.ElementRef); #line default #line hidden @@ -31,7 +30,7 @@ namespace Test #pragma warning restore 1998 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - private Microsoft.AspNetCore.Blazor.ElementRef myElem; + private Microsoft.AspNetCore.Components.ElementRef myElem; public void Foo() { System.GC.KeepAlive(myElem); } #line default diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt index 2c8d389e..a073fd2d 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" CSharpCode - IntermediateToken - - CSharp - #pragma warning disable 0414 @@ -31,7 +30,7 @@ Document - IntermediateToken - (60:0,60 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after HtmlContent - (79:0,79 [4] x:\dir\subdir\Test\TestComponent.cshtml) IntermediateToken - (79:0,79 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n - HtmlContent - (214:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (214:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - CSharpCode - (95:2,12 [118] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (95:2,12 [118] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n private Microsoft.AspNetCore.Blazor.ElementRef myElem;\n public void Foo() { System.GC.KeepAlive(myElem); }\n + HtmlContent - (218:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) + IntermediateToken - (218:5,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n + CSharpCode - (95:2,12 [122] x:\dir\subdir\Test\TestComponent.cshtml) + IntermediateToken - (95:2,12 [122] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n private Microsoft.AspNetCore.Components.ElementRef myElem;\n public void Foo() { System.GC.KeepAlive(myElem); }\n diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt index 9cc58eaa..595c999d 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt @@ -1,16 +1,16 @@ Source Location: (36:0,36 [6] x:\dir\subdir\Test\TestComponent.cshtml) |myElem| -Generated Location: (956:25,36 [6] ) +Generated Location: (904:24,36 [6] ) |myElem| -Source Location: (95:2,12 [118] x:\dir\subdir\Test\TestComponent.cshtml) +Source Location: (95:2,12 [122] x:\dir\subdir\Test\TestComponent.cshtml) | - private Microsoft.AspNetCore.Blazor.ElementRef myElem; + private Microsoft.AspNetCore.Components.ElementRef myElem; public void Foo() { System.GC.KeepAlive(myElem); } | -Generated Location: (1158:32,12 [118] ) +Generated Location: (1110:31,12 [122] ) | - private Microsoft.AspNetCore.Blazor.ElementRef myElem; + private Microsoft.AspNetCore.Components.ElementRef myElem; public void Foo() { System.GC.KeepAlive(myElem); } | diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs index eff729f3..b4a0c15d 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -19,10 +18,10 @@ namespace Test private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Blazor.Components.BindMethods.GetEventHandlerValue("alert(\"Test\");"); + __o = Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue("alert(\"Test\");"); } #pragma warning restore 1998 } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.ir.txt index 17d77bcd..adc6fd4a 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" CSharpCode - IntermediateToken - - CSharp - #pragma warning disable 0414 @@ -22,7 +21,7 @@ Document - HtmlElement - (0:0,0 [34] x:\dir\subdir\Test\TestComponent.cshtml) - input HtmlAttribute - (16:0,16 [14] x:\dir\subdir\Test\TestComponent.cshtml) - onfocus=" - " CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetEventHandlerValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue( IntermediateToken - - CSharp - "alert(\"Test\");" IntermediateToken - - CSharp - ) HtmlContent - (34:0,34 [2] x:\dir\subdir\Test\TestComponent.cshtml) diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs index f9599038..1232e09d 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -19,10 +18,10 @@ namespace Test private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Blazor.Components.BindMethods.GetEventHandlerValue(OnClick); + __o = Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue(OnClick); } #pragma warning restore 1998 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml" diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt index 4e62bc1f..694f284e 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" CSharpCode - IntermediateToken - - CSharp - #pragma warning disable 0414 @@ -22,7 +21,7 @@ Document - HtmlElement - (0:0,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input HtmlAttribute - (16:0,16 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - " CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetEventHandlerValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue( IntermediateToken - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick IntermediateToken - - CSharp - ) HtmlContent - (28:0,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt index c85b977f..965fd755 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt @@ -1,6 +1,6 @@ Source Location: (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) |OnClick| -Generated Location: (1005:24,136 [7] ) +Generated Location: (950:23,133 [7] ) |OnClick| Source Location: (42:1,12 [44] x:\dir\subdir\Test\TestComponent.cshtml) @@ -8,7 +8,7 @@ Source Location: (42:1,12 [44] x:\dir\subdir\Test\TestComponent.cshtml) void OnClick(UIEventArgs e) { } | -Generated Location: (1128:28,12 [44] ) +Generated Location: (1073:27,12 [44] ) | void OnClick(UIEventArgs e) { } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs index 4c994b80..6dc4a075 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -19,10 +18,10 @@ namespace Test private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Blazor.Components.BindMethods.GetEventHandlerValue(OnClick); + __o = Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue(OnClick); } #pragma warning restore 1998 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml" diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt index 1637168f..a29f78db 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" CSharpCode - IntermediateToken - - CSharp - #pragma warning disable 0414 @@ -22,7 +21,7 @@ Document - HtmlElement - (0:0,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input HtmlAttribute - (16:0,16 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - " CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetEventHandlerValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue( IntermediateToken - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick IntermediateToken - - CSharp - ) HtmlContent - (28:0,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt index 646a3d5f..0a370a2d 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt @@ -1,6 +1,6 @@ Source Location: (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) |OnClick| -Generated Location: (1005:24,136 [7] ) +Generated Location: (950:23,133 [7] ) |OnClick| Source Location: (42:1,12 [49] x:\dir\subdir\Test\TestComponent.cshtml) @@ -8,7 +8,7 @@ Source Location: (42:1,12 [49] x:\dir\subdir\Test\TestComponent.cshtml) void OnClick(UIMouseEventArgs e) { } | -Generated Location: (1128:28,12 [49] ) +Generated Location: (1073:27,12 [49] ) | void OnClick(UIMouseEventArgs e) { } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs index 9e6ebcef..c49c3e26 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -19,10 +18,10 @@ namespace Test private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Blazor.Components.BindMethods.GetEventHandlerValue(x => { }); + __o = Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue(x => { }); } #pragma warning restore 1998 } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.ir.txt index c67fddb0..43fa8cb7 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" CSharpCode - IntermediateToken - - CSharp - #pragma warning disable 0414 @@ -22,6 +21,6 @@ Document - HtmlElement - (0:0,0 [31] x:\dir\subdir\Test\TestComponent.cshtml) - input HtmlAttribute - (16:0,16 [11] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - " CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetEventHandlerValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue( IntermediateToken - (18:0,18 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - x => { } IntermediateToken - - CSharp - ) diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.mappings.txt index 2da1e515..610f3730 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.mappings.txt @@ -1,5 +1,5 @@ Source Location: (18:0,18 [8] x:\dir\subdir\Test\TestComponent.cshtml) |x => { }| -Generated Location: (1005:24,136 [8] ) +Generated Location: (950:23,133 [8] ) |x => { }| diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs index 4c994b80..6dc4a075 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -19,10 +18,10 @@ namespace Test private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Blazor.Components.BindMethods.GetEventHandlerValue(OnClick); + __o = Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue(OnClick); } #pragma warning restore 1998 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml" diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt index 1637168f..a29f78db 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" CSharpCode - IntermediateToken - - CSharp - #pragma warning disable 0414 @@ -22,7 +21,7 @@ Document - HtmlElement - (0:0,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input HtmlAttribute - (16:0,16 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - " CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetEventHandlerValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue( IntermediateToken - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick IntermediateToken - - CSharp - ) HtmlContent - (28:0,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt index 646a3d5f..0a370a2d 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt @@ -1,6 +1,6 @@ Source Location: (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) |OnClick| -Generated Location: (1005:24,136 [7] ) +Generated Location: (950:23,133 [7] ) |OnClick| Source Location: (42:1,12 [49] x:\dir\subdir\Test\TestComponent.cshtml) @@ -8,7 +8,7 @@ Source Location: (42:1,12 [49] x:\dir\subdir\Test\TestComponent.cshtml) void OnClick(UIMouseEventArgs e) { } | -Generated Location: (1128:28,12 [49] ) +Generated Location: (1073:27,12 [49] ) | void OnClick(UIMouseEventArgs e) { } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs index 9e6ebcef..c49c3e26 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -19,10 +18,10 @@ namespace Test private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Blazor.Components.BindMethods.GetEventHandlerValue(x => { }); + __o = Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue(x => { }); } #pragma warning restore 1998 } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt index c67fddb0..43fa8cb7 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" CSharpCode - IntermediateToken - - CSharp - #pragma warning disable 0414 @@ -22,6 +21,6 @@ Document - HtmlElement - (0:0,0 [31] x:\dir\subdir\Test\TestComponent.cshtml) - input HtmlAttribute - (16:0,16 [11] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - " CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetEventHandlerValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue( IntermediateToken - (18:0,18 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - x => { } IntermediateToken - - CSharp - ) diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.mappings.txt index 2da1e515..610f3730 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.mappings.txt @@ -1,5 +1,5 @@ Source Location: (18:0,18 [8] x:\dir\subdir\Test\TestComponent.cshtml) |x => { }| -Generated Location: (1005:24,136 [8] ) +Generated Location: (950:23,133 [8] ) |x => { }| diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs index 7a84a849..b339a6b8 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -19,10 +18,10 @@ namespace Test private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Blazor.Components.BindMethods.GetEventHandlerValue(OnClick); + __o = Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue(OnClick); } #pragma warning restore 1998 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml" diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt index 09083f3d..ce1ec8f7 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" CSharpCode - IntermediateToken - - CSharp - #pragma warning disable 0414 @@ -22,7 +21,7 @@ Document - HtmlElement - (0:0,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input HtmlAttribute - (16:0,16 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - " CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetEventHandlerValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue( IntermediateToken - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick IntermediateToken - - CSharp - ) HtmlContent - (28:0,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt index c6fefa55..f95192d9 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt @@ -1,6 +1,6 @@ Source Location: (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) |OnClick| -Generated Location: (1005:24,136 [7] ) +Generated Location: (950:23,133 [7] ) |OnClick| Source Location: (42:1,12 [31] x:\dir\subdir\Test\TestComponent.cshtml) @@ -8,7 +8,7 @@ Source Location: (42:1,12 [31] x:\dir\subdir\Test\TestComponent.cshtml) void OnClick() { } | -Generated Location: (1128:28,12 [31] ) +Generated Location: (1073:27,12 [31] ) | void OnClick() { } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs index 2b38a71d..2479d0a2 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -19,10 +18,10 @@ namespace Test private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Blazor.Components.BindMethods.GetEventHandlerValue(() => { }); + __o = Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue(() => { }); } #pragma warning restore 1998 } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.ir.txt index af1e2ba5..95e52fa8 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" CSharpCode - IntermediateToken - - CSharp - #pragma warning disable 0414 @@ -22,6 +21,6 @@ Document - HtmlElement - (0:0,0 [32] x:\dir\subdir\Test\TestComponent.cshtml) - input HtmlAttribute - (16:0,16 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - " CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetEventHandlerValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue( IntermediateToken - (18:0,18 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - () => { } IntermediateToken - - CSharp - ) diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.mappings.txt index 8e4e60f6..5d5d60fe 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.mappings.txt @@ -1,5 +1,5 @@ Source Location: (18:0,18 [9] x:\dir\subdir\Test\TestComponent.cshtml) |() => { }| -Generated Location: (1005:24,136 [9] ) +Generated Location: (950:23,133 [9] ) |() => { }| diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs index 140cec02..87a6b631 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -19,10 +18,10 @@ namespace Test private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Blazor.Components.BindMethods.GetEventHandlerValue("foo"); + __o = Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue("foo"); } #pragma warning restore 1998 } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.ir.txt index c6ee0ccb..4cd6780e 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" CSharpCode - IntermediateToken - - CSharp - #pragma warning disable 0414 @@ -22,6 +21,6 @@ Document - HtmlElement - (0:0,0 [23] x:\dir\subdir\Test\TestComponent.cshtml) - input HtmlAttribute - (16:0,16 [3] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - " CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetEventHandlerValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue( IntermediateToken - - CSharp - "foo" IntermediateToken - - CSharp - ) diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.codegen.cs index 4a105073..b545b347 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -23,7 +22,7 @@ global::System.Object __typeHelper = "*, TestAssembly"; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); __o = typeof( @@ -33,14 +32,14 @@ global::System.Object __typeHelper = "*, TestAssembly"; #line default #line hidden ); - __o = Microsoft.AspNetCore.Blazor.Components.RuntimeHelpers.TypeCheck( + __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck( #line 2 "x:\dir\subdir\Test\TestComponent.cshtml" 3 #line default #line hidden ); - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Blazor.RenderFragment)((builder2) => { + builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { } )); #line 2 "x:\dir\subdir\Test\TestComponent.cshtml" diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.ir.txt index 74f1d58a..af3f05c9 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly CSharpCode - diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.mappings.txt index e4deae0a..0a61d8b6 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.mappings.txt @@ -1,21 +1,21 @@ Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) |*, TestAssembly| -Generated Location: (559:16,38 [15] ) +Generated Location: (503:15,38 [15] ) |*, TestAssembly| Source Location: (50:1,19 [3] x:\dir\subdir\Test\TestComponent.cshtml) |int| -Generated Location: (1083:30,19 [3] ) +Generated Location: (1031:29,19 [3] ) |int| Source Location: (60:1,29 [1] x:\dir\subdir\Test\TestComponent.cshtml) |3| -Generated Location: (1304:37,29 [1] ) +Generated Location: (1245:36,29 [1] ) |3| Source Location: (68:1,37 [3] x:\dir\subdir\Test\TestComponent.cshtml) |_my| -Generated Location: (1589:46,37 [3] ) +Generated Location: (1534:45,37 [3] ) |_my| Source Location: (91:3,12 [90] x:\dir\subdir\Test\TestComponent.cshtml) @@ -23,7 +23,7 @@ Source Location: (91:3,12 [90] x:\dir\subdir\Test\TestComponent.cshtml) private MyComponent _my; public void Foo() { System.GC.KeepAlive(_my); } | -Generated Location: (1771:53,12 [90] ) +Generated Location: (1716:52,12 [90] ) | private MyComponent _my; public void Foo() { System.GC.KeepAlive(_my); } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.codegen.cs index 61cdaa1d..eba8acca 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -23,7 +22,7 @@ global::System.Object __typeHelper = "*, TestAssembly"; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, -1, -1, @@ -56,7 +55,7 @@ namespace __Blazor.Test.TestComponent #line hidden internal static class TypeInference { - public static void CreateMyComponent_0(global::Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::System.Action> __arg1) + public static void CreateMyComponent_0(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::System.Action> __arg1) { builder.OpenComponent>(seq); builder.AddAttribute(__seq0, "Item", __arg0); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.ir.txt index a6918b6c..6cd775d3 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly CSharpCode - diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.mappings.txt index bfa35147..870211d4 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.mappings.txt @@ -1,16 +1,16 @@ Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) |*, TestAssembly| -Generated Location: (559:16,38 [15] ) +Generated Location: (503:15,38 [15] ) |*, TestAssembly| Source Location: (50:1,19 [1] x:\dir\subdir\Test\TestComponent.cshtml) |3| -Generated Location: (1149:30,19 [1] ) +Generated Location: (1097:29,19 [1] ) |3| Source Location: (58:1,27 [3] x:\dir\subdir\Test\TestComponent.cshtml) |_my| -Generated Location: (1295:36,27 [3] ) +Generated Location: (1243:35,27 [3] ) |_my| Source Location: (81:3,12 [90] x:\dir\subdir\Test\TestComponent.cshtml) @@ -18,7 +18,7 @@ Source Location: (81:3,12 [90] x:\dir\subdir\Test\TestComponent.cshtml) private MyComponent _my; public void Foo() { System.GC.KeepAlive(_my); } | -Generated Location: (1485:45,12 [90] ) +Generated Location: (1433:44,12 [90] ) | private MyComponent _my; public void Foo() { System.GC.KeepAlive(_my); } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs index 60ed5933..06575bce 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -19,7 +18,7 @@ namespace Test private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); #line 1 "x:\dir\subdir\Test\TestComponent.cshtml" diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt index b39e7880..1e3e6ce8 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" CSharpCode - IntermediateToken - - CSharp - #pragma warning disable 0414 diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.mappings.txt index fb7c9fa1..e4acf4e9 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.mappings.txt @@ -1,5 +1,5 @@ Source Location: (2:0,2 [10] x:\dir\subdir\Test\TestComponent.cshtml) |"My value"| -Generated Location: (926:25,6 [10] ) +Generated Location: (874:24,6 [10] ) |"My value"| diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs index 37a30096..3c8fef10 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -23,10 +22,10 @@ global::System.Object __typeHelper = "*, TestAssembly"; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Blazor.RenderFragment)((builder2) => { + builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { } )); } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.ir.txt index 2e241fc4..b0631390 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly CSharpCode - diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.mappings.txt index 75b2c90a..3917573a 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.mappings.txt @@ -1,5 +1,5 @@ Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) |*, TestAssembly| -Generated Location: (559:16,38 [15] ) +Generated Location: (503:15,38 [15] ) |*, TestAssembly| diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs index aa179a2e..296887ef 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs @@ -11,9 +11,8 @@ using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -23,7 +22,7 @@ using System; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.ir.txt index bd386d93..b3851b37 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" CSharpCode - IntermediateToken - - CSharp - #pragma warning disable 0414 diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs index c1814ade..69a65f5c 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -23,13 +22,13 @@ global::System.Object __typeHelper = "*, TestAssembly"; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); - builder.AddAttribute(-1, "Header", (Microsoft.AspNetCore.Blazor.RenderFragment)((builder2) => { + builder.AddAttribute(-1, "Header", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { } )); - builder.AddAttribute(-1, "Footer", (Microsoft.AspNetCore.Blazor.RenderFragment)((builder2) => { + builder.AddAttribute(-1, "Footer", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { #line 4 "x:\dir\subdir\Test\TestComponent.cshtml" __o = "bye!"; diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.ir.txt index 237f2365..9cc23593 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly CSharpCode - diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.mappings.txt index bc5f908a..cedac611 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.mappings.txt @@ -1,10 +1,10 @@ Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) |*, TestAssembly| -Generated Location: (559:16,38 [15] ) +Generated Location: (503:15,38 [15] ) |*, TestAssembly| Source Location: (86:3,14 [6] x:\dir\subdir\Test\TestComponent.cshtml) |"bye!"| -Generated Location: (1301:33,14 [6] ) +Generated Location: (1257:32,14 [6] ) |"bye!"| diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter/TestComponent.codegen.cs deleted file mode 100644 index 6cf479f4..00000000 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter/TestComponent.codegen.cs +++ /dev/null @@ -1,60 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::System.Object __typeHelper = "*, TestAssembly"; - } - ))(); - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - RenderFragment template = - -#line default -#line hidden - (builder2) => { -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - __o = context.Name; - -#line default -#line hidden - } -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - ; - -#line default -#line hidden - __o = new Microsoft.AspNetCore.Blazor.RenderFragment( -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - template - -#line default -#line hidden - ); - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Blazor.RenderFragment)((builder2) => { - } - )); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter/TestComponent.ir.txt deleted file mode 100644 index 39c162e3..00000000 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter/TestComponent.ir.txt +++ /dev/null @@ -1,38 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - DirectiveToken - (14:0,14 [17] x:\dir\subdir\Test\TestComponent.cshtml) - "*, TestAssembly" - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - (31:0,31 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (31:0,31 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - CSharpCode - (35:1,2 [35] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (35:1,2 [35] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - RenderFragment template = - Template - (71:1,38 [23] x:\dir\subdir\Test\TestComponent.cshtml) - HtmlElement - (71:1,38 [24] x:\dir\subdir\Test\TestComponent.cshtml) - div - CSharpExpression - (77:1,44 [12] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (77:1,44 [12] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context.Name - CSharpCode - (95:1,62 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (95:1,62 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ; - ComponentExtensionNode - (100:2,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentAttributeExtensionNode - (129:2,29 [9] x:\dir\subdir\Test\TestComponent.cshtml) - PersonTemplate - PersonTemplate - CSharpExpression - (130:2,30 [8] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (130:2,30 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - template - HtmlContent - (141:2,41 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (141:2,41 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter/TestComponent.mappings.txt deleted file mode 100644 index 9d437ce2..00000000 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter/TestComponent.mappings.txt +++ /dev/null @@ -1,25 +0,0 @@ -Source Location: (14:0,14 [17] x:\dir\subdir\Test\TestComponent.cshtml) -|"*, TestAssembly"| -Generated Location: (558:16,37 [17] ) -|"*, TestAssembly"| - -Source Location: (35:1,2 [35] x:\dir\subdir\Test\TestComponent.cshtml) -| RenderFragment template = | -Generated Location: (1039:29,2 [35] ) -| RenderFragment template = | - -Source Location: (77:1,44 [12] x:\dir\subdir\Test\TestComponent.cshtml) -|context.Name| -Generated Location: (1231:35,44 [12] ) -|context.Name| - -Source Location: (95:1,62 [2] x:\dir\subdir\Test\TestComponent.cshtml) -|; | -Generated Location: (1405:41,62 [2] ) -|; | - -Source Location: (130:2,30 [8] x:\dir\subdir\Test\TestComponent.cshtml) -|template| -Generated Location: (1601:47,30 [8] ) -|template| - diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs index f07f1324..a95a14e7 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -23,7 +22,7 @@ global::System.Object __typeHelper = "*, TestAssembly"; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); #line 2 "x:\dir\subdir\Test\TestComponent.cshtml" @@ -48,14 +47,14 @@ global::System.Object __typeHelper = "*, TestAssembly"; #line default #line hidden - __o = new Microsoft.AspNetCore.Blazor.RenderFragment( + __o = new Microsoft.AspNetCore.Components.RenderFragment( #line 3 "x:\dir\subdir\Test\TestComponent.cshtml" template #line default #line hidden ); - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Blazor.RenderFragment)((builder2) => { + builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { } )); } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.ir.txt index 62076ad6..5c76c02c 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" DirectiveToken - (14:0,14 [17] x:\dir\subdir\Test\TestComponent.cshtml) - "*, TestAssembly" CSharpCode - diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt index 09183888..b518bb32 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt @@ -1,30 +1,30 @@ Source Location: (14:0,14 [17] x:\dir\subdir\Test\TestComponent.cshtml) |"*, TestAssembly"| -Generated Location: (558:16,37 [17] ) +Generated Location: (502:15,37 [17] ) |"*, TestAssembly"| Source Location: (35:1,2 [54] x:\dir\subdir\Test\TestComponent.cshtml) | RenderFragment template = (context) => | -Generated Location: (1039:29,2 [54] ) +Generated Location: (987:28,2 [54] ) | RenderFragment template = (context) => | Source Location: (96:1,63 [13] x:\dir\subdir\Test\TestComponent.cshtml) |context.Index| -Generated Location: (1269:35,63 [13] ) +Generated Location: (1217:34,63 [13] ) |context.Index| Source Location: (113:1,80 [22] x:\dir\subdir\Test\TestComponent.cshtml) |context.Item.ToLower()| -Generated Location: (1447:40,80 [22] ) +Generated Location: (1395:39,80 [22] ) |context.Item.ToLower()| Source Location: (140:1,107 [2] x:\dir\subdir\Test\TestComponent.cshtml) |; | -Generated Location: (1676:46,107 [2] ) +Generated Location: (1624:45,107 [2] ) |; | Source Location: (169:2,24 [8] x:\dir\subdir\Test\TestComponent.cshtml) |template| -Generated Location: (1867:52,24 [8] ) +Generated Location: (1819:51,24 [8] ) |template| diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs index b89987f9..64b2cd06 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -23,7 +22,7 @@ global::System.Object __typeHelper = "*, TestAssembly"; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); #line 2 "x:\dir\subdir\Test\TestComponent.cshtml" @@ -33,14 +32,14 @@ global::System.Object __typeHelper = "*, TestAssembly"; #line default #line hidden (builder2) => { - __o = Microsoft.AspNetCore.Blazor.Components.RuntimeHelpers.TypeCheck( + __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck( #line 3 "x:\dir\subdir\Test\TestComponent.cshtml" person.Name #line default #line hidden ); - builder2.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Blazor.RenderFragment)((builder3) => { + builder2.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder3) => { } )); } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.ir.txt index 5757b618..66189852 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" DirectiveToken - (14:0,14 [17] x:\dir\subdir\Test\TestComponent.cshtml) - "*, TestAssembly" CSharpCode - diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt index 0d3c926d..2617c56e 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt @@ -1,24 +1,24 @@ Source Location: (14:0,14 [17] x:\dir\subdir\Test\TestComponent.cshtml) |"*, TestAssembly"| -Generated Location: (558:16,37 [17] ) +Generated Location: (502:15,37 [17] ) |"*, TestAssembly"| Source Location: (35:1,2 [45] x:\dir\subdir\Test\TestComponent.cshtml) | RenderFragment p = (person) => | -Generated Location: (1039:29,2 [45] ) +Generated Location: (987:28,2 [45] ) | RenderFragment p = (person) => | Source Location: (106:2,69 [11] x:\dir\subdir\Test\TestComponent.cshtml) |person.Name| -Generated Location: (1369:37,69 [11] ) +Generated Location: (1310:36,69 [11] ) |person.Name| Source Location: (126:2,89 [3] x:\dir\subdir\Test\TestComponent.cshtml) |; | -Generated Location: (1748:47,89 [3] ) +Generated Location: (1693:46,89 [3] ) |; | @@ -29,7 +29,7 @@ Source Location: (144:4,12 [76] x:\dir\subdir\Test\TestComponent.cshtml) public string Name { get; set; } } | -Generated Location: (1894:54,12 [76] ) +Generated Location: (1839:53,12 [76] ) | class Person { diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs index 47d4f7a8..dbbb8065 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -23,7 +22,7 @@ global::System.Object __typeHelper = "*, TestAssembly"; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); #line 2 "x:\dir\subdir\Test\TestComponent.cshtml" @@ -33,14 +32,14 @@ global::System.Object __typeHelper = "*, TestAssembly"; #line default #line hidden (builder2) => { - __o = Microsoft.AspNetCore.Blazor.Components.RuntimeHelpers.TypeCheck( + __o = Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck( #line 3 "x:\dir\subdir\Test\TestComponent.cshtml" person.Name #line default #line hidden ); - builder2.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Blazor.RenderFragment)((builder3) => { + builder2.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder3) => { } )); } @@ -49,7 +48,7 @@ global::System.Object __typeHelper = "*, TestAssembly"; #line default #line hidden - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Blazor.RenderFragment)((builder2) => { + builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { #line 6 "x:\dir\subdir\Test\TestComponent.cshtml" __o = "hello, world!"; diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.ir.txt index a8f64cd6..4674bf0e 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" DirectiveToken - (14:0,14 [17] x:\dir\subdir\Test\TestComponent.cshtml) - "*, TestAssembly" CSharpCode - diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt index d053ab75..dea3d842 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt @@ -1,30 +1,30 @@ Source Location: (14:0,14 [17] x:\dir\subdir\Test\TestComponent.cshtml) |"*, TestAssembly"| -Generated Location: (558:16,37 [17] ) +Generated Location: (502:15,37 [17] ) |"*, TestAssembly"| Source Location: (35:1,2 [45] x:\dir\subdir\Test\TestComponent.cshtml) | RenderFragment p = (person) => | -Generated Location: (1039:29,2 [45] ) +Generated Location: (987:28,2 [45] ) | RenderFragment p = (person) => | Source Location: (106:2,69 [11] x:\dir\subdir\Test\TestComponent.cshtml) |person.Name| -Generated Location: (1369:37,69 [11] ) +Generated Location: (1310:36,69 [11] ) |person.Name| Source Location: (126:2,89 [3] x:\dir\subdir\Test\TestComponent.cshtml) |; | -Generated Location: (1748:47,89 [3] ) +Generated Location: (1693:46,89 [3] ) |; | Source Location: (149:5,2 [15] x:\dir\subdir\Test\TestComponent.cshtml) |"hello, world!"| -Generated Location: (1954:53,6 [15] ) +Generated Location: (1903:52,6 [15] ) |"hello, world!"| Source Location: (197:8,12 [76] x:\dir\subdir\Test\TestComponent.cshtml) @@ -34,7 +34,7 @@ Source Location: (197:8,12 [76] x:\dir\subdir\Test\TestComponent.cshtml) public string Name { get; set; } } | -Generated Location: (2147:62,12 [76] ) +Generated Location: (2096:61,12 [76] ) | class Person { diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs index d0607a92..1c2e655a 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -23,7 +22,7 @@ global::System.Object __typeHelper = "*, TestAssembly"; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); #line 2 "x:\dir\subdir\Test\TestComponent.cshtml" @@ -43,14 +42,14 @@ global::System.Object __typeHelper = "*, TestAssembly"; #line default #line hidden - __o = new Microsoft.AspNetCore.Blazor.RenderFragment( + __o = new Microsoft.AspNetCore.Components.RenderFragment( #line 3 "x:\dir\subdir\Test\TestComponent.cshtml" template #line default #line hidden ); - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Blazor.RenderFragment)((builder2) => { + builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { } )); } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.ir.txt index 78cc76ac..0b2d2a7e 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" DirectiveToken - (14:0,14 [17] x:\dir\subdir\Test\TestComponent.cshtml) - "*, TestAssembly" CSharpCode - diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt index 44cfddf8..83d796d9 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt @@ -1,25 +1,25 @@ Source Location: (14:0,14 [17] x:\dir\subdir\Test\TestComponent.cshtml) |"*, TestAssembly"| -Generated Location: (558:16,37 [17] ) +Generated Location: (502:15,37 [17] ) |"*, TestAssembly"| Source Location: (35:1,2 [47] x:\dir\subdir\Test\TestComponent.cshtml) | RenderFragment template = (person) => | -Generated Location: (1039:29,2 [47] ) +Generated Location: (987:28,2 [47] ) | RenderFragment template = (person) => | Source Location: (89:1,56 [11] x:\dir\subdir\Test\TestComponent.cshtml) |person.Name| -Generated Location: (1255:35,56 [11] ) +Generated Location: (1203:34,56 [11] ) |person.Name| Source Location: (106:1,73 [2] x:\dir\subdir\Test\TestComponent.cshtml) |; | -Generated Location: (1439:41,73 [2] ) +Generated Location: (1387:40,73 [2] ) |; | Source Location: (141:2,30 [8] x:\dir\subdir\Test\TestComponent.cshtml) |template| -Generated Location: (1635:47,30 [8] ) +Generated Location: (1587:46,30 [8] ) |template| diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs index a590086a..fe3b5a38 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -19,7 +18,7 @@ namespace Test private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); #line 1 "x:\dir\subdir\Test\TestComponent.cshtml" diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.ir.txt index c8db0f08..04ddbdf5 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" CSharpCode - IntermediateToken - - CSharp - #pragma warning disable 0414 diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt index dd80c12c..b37981c1 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt @@ -1,16 +1,16 @@ Source Location: (1:0,1 [25] x:\dir\subdir\Test\TestComponent.cshtml) |RenderPerson((person) => | -Generated Location: (926:25,6 [25] ) +Generated Location: (874:24,6 [25] ) |RenderPerson((person) => | Source Location: (33:0,33 [11] x:\dir\subdir\Test\TestComponent.cshtml) |person.Name| -Generated Location: (1052:27,33 [11] ) +Generated Location: (1000:26,33 [11] ) |person.Name| Source Location: (50:0,50 [1] x:\dir\subdir\Test\TestComponent.cshtml) |)| -Generated Location: (1100:32,0 [1] ) +Generated Location: (1048:31,0 [1] ) |)| Source Location: (65:1,12 [138] x:\dir\subdir\Test\TestComponent.cshtml) @@ -22,7 +22,7 @@ Source Location: (65:1,12 [138] x:\dir\subdir\Test\TestComponent.cshtml) object RenderPerson(RenderFragment p) => null; | -Generated Location: (1247:39,12 [138] ) +Generated Location: (1195:38,12 [138] ) | class Person { diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InAttribute/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InAttribute/TestComponent.codegen.cs deleted file mode 100644 index da003dcf..00000000 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InAttribute/TestComponent.codegen.cs +++ /dev/null @@ -1,43 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); -#line 1 "x:\dir\subdir\Test\TestComponent.cshtml" - __o = ; - -#line default -#line hidden - } - #pragma warning restore 1998 -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - - class Person - { - public string Name { get; set; } - } - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InAttribute/TestComponent.diagnostics.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InAttribute/TestComponent.diagnostics.txt deleted file mode 100644 index 18b722ba..00000000 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InAttribute/TestComponent.diagnostics.txt +++ /dev/null @@ -1 +0,0 @@ -x:\dir\subdir\Test\TestComponent.cshtml(1,15): Error BL9994: Razor templates cannot be used in markup-attribute, bind attributes, ref attributes, or event handler attributes. diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InAttribute/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InAttribute/TestComponent.ir.txt deleted file mode 100644 index 540f596f..00000000 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InAttribute/TestComponent.ir.txt +++ /dev/null @@ -1,29 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlElement - (0:0,0 [44] x:\dir\subdir\Test\TestComponent.cshtml) - div - HtmlAttribute - (4:0,4 [33] x:\dir\subdir\Test\TestComponent.cshtml) - attr=" - " - CSharpExpressionAttributeValue - (11:0,11 [25] x:\dir\subdir\Test\TestComponent.cshtml) - - IntermediateToken - (35:0,35 [0] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - - HtmlContent - (44:0,44 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (44:0,44 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - CSharpCode - (58:1,12 [76] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (58:1,12 [76] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n class Person\n {\n public string Name { get; set; }\n }\n diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InAttribute/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InAttribute/TestComponent.mappings.txt deleted file mode 100644 index 84beff5b..00000000 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InAttribute/TestComponent.mappings.txt +++ /dev/null @@ -1,20 +0,0 @@ -Source Location: (35:0,35 [0] x:\dir\subdir\Test\TestComponent.cshtml) -|| -Generated Location: (955:25,35 [0] ) -|| - -Source Location: (58:1,12 [76] x:\dir\subdir\Test\TestComponent.cshtml) -| - class Person - { - public string Name { get; set; } - } -| -Generated Location: (1101:32,12 [76] ) -| - class Person - { - public string Name { get; set; } - } -| - diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs index 08f3ab44..1a513d9b 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -19,7 +18,7 @@ namespace Test private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); #line 1 "x:\dir\subdir\Test\TestComponent.cshtml" diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.ir.txt index 0daa3f21..d04fb1ff 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" CSharpCode - IntermediateToken - - CSharp - #pragma warning disable 0414 diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt index ad61715d..b9045e5b 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt @@ -1,19 +1,19 @@ Source Location: (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml) | RenderFragment p = (person) => | -Generated Location: (922:25,2 [45] ) +Generated Location: (870:24,2 [45] ) | RenderFragment p = (person) => | Source Location: (54:1,50 [11] x:\dir\subdir\Test\TestComponent.cshtml) |person.Name| -Generated Location: (1130:32,50 [11] ) +Generated Location: (1078:31,50 [11] ) |person.Name| Source Location: (71:1,67 [3] x:\dir\subdir\Test\TestComponent.cshtml) |; | -Generated Location: (1308:38,67 [3] ) +Generated Location: (1256:37,67 [3] ) |; | @@ -24,7 +24,7 @@ Source Location: (89:3,12 [76] x:\dir\subdir\Test\TestComponent.cshtml) public string Name { get; set; } } | -Generated Location: (1454:45,12 [76] ) +Generated Location: (1402:44,12 [76] ) | class Person { diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock_Dynamic/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock_Dynamic/TestComponent.codegen.cs deleted file mode 100644 index 213f9068..00000000 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock_Dynamic/TestComponent.codegen.cs +++ /dev/null @@ -1,56 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); -#line 1 "x:\dir\subdir\Test\TestComponent.cshtml" - - RenderFragment p = - -#line default -#line hidden - (builder2, item) => { -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - __o = item.Name; - -#line default -#line hidden - } -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - ; - -#line default -#line hidden - } - #pragma warning restore 1998 -#line 4 "x:\dir\subdir\Test\TestComponent.cshtml" - - class Person - { - public string Name { get; set; } - } - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock_Dynamic/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock_Dynamic/TestComponent.ir.txt deleted file mode 100644 index 1209aa65..00000000 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock_Dynamic/TestComponent.ir.txt +++ /dev/null @@ -1,31 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - CSharpCode - (2:0,2 [34] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (2:0,2 [34] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n RenderFragment p = - Template - (37:1,33 [20] x:\dir\subdir\Test\TestComponent.cshtml) - HtmlElement - (37:1,33 [21] x:\dir\subdir\Test\TestComponent.cshtml) - div - CSharpExpression - (43:1,39 [9] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (43:1,39 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - item.Name - CSharpCode - (58:1,54 [3] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (58:1,54 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ;\n - CSharpCode - (76:3,12 [76] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (76:3,12 [76] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n class Person\n {\n public string Name { get; set; }\n }\n diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock_Dynamic/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock_Dynamic/TestComponent.mappings.txt deleted file mode 100644 index 201a81cb..00000000 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InCodeBlock_Dynamic/TestComponent.mappings.txt +++ /dev/null @@ -1,34 +0,0 @@ -Source Location: (2:0,2 [34] x:\dir\subdir\Test\TestComponent.cshtml) -| - RenderFragment p = | -Generated Location: (922:25,2 [34] ) -| - RenderFragment p = | - -Source Location: (43:1,39 [9] x:\dir\subdir\Test\TestComponent.cshtml) -|item.Name| -Generated Location: (1114:32,39 [9] ) -|item.Name| - -Source Location: (58:1,54 [3] x:\dir\subdir\Test\TestComponent.cshtml) -|; -| -Generated Location: (1277:38,54 [3] ) -|; -| - -Source Location: (76:3,12 [76] x:\dir\subdir\Test\TestComponent.cshtml) -| - class Person - { - public string Name { get; set; } - } -| -Generated Location: (1423:45,12 [76] ) -| - class Person - { - public string Name { get; set; } - } -| - diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs index ccf68e72..0da3a367 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -19,7 +18,7 @@ namespace Test private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); #line 1 "x:\dir\subdir\Test\TestComponent.cshtml" diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.ir.txt index bda53687..abc67e57 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" CSharpCode - IntermediateToken - - CSharp - #pragma warning disable 0414 diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt index fd279ffb..c11ce14a 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt @@ -1,16 +1,16 @@ Source Location: (2:0,2 [25] x:\dir\subdir\Test\TestComponent.cshtml) |RenderPerson((person) => | -Generated Location: (926:25,6 [25] ) +Generated Location: (874:24,6 [25] ) |RenderPerson((person) => | Source Location: (34:0,34 [11] x:\dir\subdir\Test\TestComponent.cshtml) |person.Name| -Generated Location: (1053:27,34 [11] ) +Generated Location: (1001:26,34 [11] ) |person.Name| Source Location: (51:0,51 [1] x:\dir\subdir\Test\TestComponent.cshtml) |)| -Generated Location: (1101:32,0 [1] ) +Generated Location: (1049:31,0 [1] ) |)| Source Location: (67:1,12 [138] x:\dir\subdir\Test\TestComponent.cshtml) @@ -22,7 +22,7 @@ Source Location: (67:1,12 [138] x:\dir\subdir\Test\TestComponent.cshtml) object RenderPerson(RenderFragment p) => null; | -Generated Location: (1248:39,12 [138] ) +Generated Location: (1196:38,12 [138] ) | class Person { diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InImplicitExpression/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InImplicitExpression/TestComponent.codegen.cs deleted file mode 100644 index db863eb6..00000000 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InImplicitExpression/TestComponent.codegen.cs +++ /dev/null @@ -1,52 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); -#line 1 "x:\dir\subdir\Test\TestComponent.cshtml" -__o = RenderPerson((builder2) => { -#line 1 "x:\dir\subdir\Test\TestComponent.cshtml" - __o = context.Name; - -#line default -#line hidden -} -); - -#line default -#line hidden - } - #pragma warning restore 1998 -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - - class Person - { - public string Name { get; set; } - } - - object RenderPerson(RenderFragment p) => null; - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InImplicitExpression/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InImplicitExpression/TestComponent.ir.txt deleted file mode 100644 index aa8c3866..00000000 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InImplicitExpression/TestComponent.ir.txt +++ /dev/null @@ -1,32 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - CSharpExpression - (1:0,1 [37] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (1:0,1 [13] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - RenderPerson( - Template - (15:0,15 [23] x:\dir\subdir\Test\TestComponent.cshtml) - HtmlElement - (15:0,15 [24] x:\dir\subdir\Test\TestComponent.cshtml) - div - CSharpExpression - (21:0,21 [12] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (21:0,21 [12] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context.Name - IntermediateToken - (39:0,39 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ) - HtmlContent - (40:0,40 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (40:0,40 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - CSharpCode - (54:1,12 [138] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (54:1,12 [138] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n class Person\n {\n public string Name { get; set; }\n }\n\n object RenderPerson(RenderFragment p) => null;\n diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InImplicitExpression/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InImplicitExpression/TestComponent.mappings.txt deleted file mode 100644 index 99bbf632..00000000 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_InImplicitExpression/TestComponent.mappings.txt +++ /dev/null @@ -1,34 +0,0 @@ -Source Location: (1:0,1 [13] x:\dir\subdir\Test\TestComponent.cshtml) -|RenderPerson(| -Generated Location: (926:25,6 [13] ) -|RenderPerson(| - -Source Location: (21:0,21 [12] x:\dir\subdir\Test\TestComponent.cshtml) -|context.Name| -Generated Location: (1028:27,21 [12] ) -|context.Name| - -Source Location: (39:0,39 [1] x:\dir\subdir\Test\TestComponent.cshtml) -|)| -Generated Location: (1077:32,0 [1] ) -|)| - -Source Location: (54:1,12 [138] x:\dir\subdir\Test\TestComponent.cshtml) -| - class Person - { - public string Name { get; set; } - } - - object RenderPerson(RenderFragment p) => null; -| -Generated Location: (1224:39,12 [138] ) -| - class Person - { - public string Name { get; set; } - } - - object RenderPerson(RenderFragment p) => null; -| - diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_MultipleRoots/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_MultipleRoots/TestComponent.codegen.cs deleted file mode 100644 index 7a1232d3..00000000 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_MultipleRoots/TestComponent.codegen.cs +++ /dev/null @@ -1,56 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent - { - #pragma warning disable 219 - private void __RazorDirectiveTokenHelpers__() { - } - #pragma warning restore 219 - #pragma warning disable 0414 - private static System.Object __o = null; - #pragma warning restore 0414 - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); -#line 1 "x:\dir\subdir\Test\TestComponent.cshtml" - - RenderFragment p = - -#line default -#line hidden - (builder2, item) => { -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - __o = item.Name; - -#line default -#line hidden - } -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" -
another
; - -#line default -#line hidden - } - #pragma warning restore 1998 -#line 4 "x:\dir\subdir\Test\TestComponent.cshtml" - - class Person - { - public string Name { get; set; } - } - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_MultipleRoots/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_MultipleRoots/TestComponent.ir.txt deleted file mode 100644 index 539a261b..00000000 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_MultipleRoots/TestComponent.ir.txt +++ /dev/null @@ -1,31 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [12] ) - System - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic - UsingDirective - (53:3,1 [17] ) - System.Linq - UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" - DirectiveToken - (14:0,14 [9] ) - "*, Test" - CSharpCode - - IntermediateToken - - CSharp - #pragma warning disable 0414 - CSharpCode - - IntermediateToken - - CSharp - private static System.Object __o = null; - CSharpCode - - IntermediateToken - - CSharp - #pragma warning restore 0414 - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - CSharpCode - (2:0,2 [33] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (2:0,2 [33] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n RenderFragment p = - Template - (36:1,32 [20] x:\dir\subdir\Test\TestComponent.cshtml) - HtmlElement - (36:1,32 [21] x:\dir\subdir\Test\TestComponent.cshtml) - div - CSharpExpression - (42:1,38 [9] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (42:1,38 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - item.Name - CSharpCode - (57:1,53 [21] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (57:1,53 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -
another
;\n - CSharpCode - (93:3,12 [76] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (93:3,12 [76] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n class Person\n {\n public string Name { get; set; }\n }\n diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_MultipleRoots/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_MultipleRoots/TestComponent.mappings.txt deleted file mode 100644 index 3d8fcdb0..00000000 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_MultipleRoots/TestComponent.mappings.txt +++ /dev/null @@ -1,34 +0,0 @@ -Source Location: (2:0,2 [33] x:\dir\subdir\Test\TestComponent.cshtml) -| - RenderFragment p = | -Generated Location: (922:25,2 [33] ) -| - RenderFragment p = | - -Source Location: (42:1,38 [9] x:\dir\subdir\Test\TestComponent.cshtml) -|item.Name| -Generated Location: (1112:32,38 [9] ) -|item.Name| - -Source Location: (57:1,53 [21] x:\dir\subdir\Test\TestComponent.cshtml) -|
another
; -| -Generated Location: (1274:38,53 [21] ) -|
another
; -| - -Source Location: (93:3,12 [76] x:\dir\subdir\Test\TestComponent.cshtml) -| - class Person - { - public string Name { get; set; } - } -| -Generated Location: (1438:45,12 [76] ) -| - class Person - { - public string Name { get; set; } - } -| - diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs index 7a586822..a9dfa2f0 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -23,7 +22,7 @@ global::System.Object __typeHelper = "*, TestAssembly"; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); #line 2 "x:\dir\subdir\Test\TestComponent.cshtml" @@ -45,7 +44,7 @@ global::System.Object __typeHelper = "*, TestAssembly"; #line default #line hidden ; - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Blazor.RenderFragment)((builder2) => { + builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { } )); } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.ir.txt index e84c84fa..ce6182b3 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" DirectiveToken - (14:0,14 [17] x:\dir\subdir\Test\TestComponent.cshtml) - "*, TestAssembly" CSharpCode - diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt index 659c7d4a..4d643995 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt @@ -1,20 +1,20 @@ Source Location: (14:0,14 [17] x:\dir\subdir\Test\TestComponent.cshtml) |"*, TestAssembly"| -Generated Location: (558:16,37 [17] ) +Generated Location: (502:15,37 [17] ) |"*, TestAssembly"| Source Location: (35:1,2 [27] x:\dir\subdir\Test\TestComponent.cshtml) | RenderFragment template = | -Generated Location: (1039:29,2 [27] ) +Generated Location: (987:28,2 [27] ) | RenderFragment template = | Source Location: (78:1,45 [2] x:\dir\subdir\Test\TestComponent.cshtml) |; | -Generated Location: (1239:36,45 [2] ) +Generated Location: (1187:35,45 [2] ) |; | Source Location: (105:2,22 [8] x:\dir\subdir\Test\TestComponent.cshtml) |template| -Generated Location: (1367:42,22 [8] ) +Generated Location: (1315:41,22 [8] ) |template| diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs index d6048816..aef14271 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -19,7 +18,7 @@ namespace Test private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); #line 1 "x:\dir\subdir\Test\TestComponent.cshtml" diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.ir.txt index d9beb963..99a41a79 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" CSharpCode - IntermediateToken - - CSharp - #pragma warning disable 0414 diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt index 64452dbc..53fef3ea 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt @@ -1,18 +1,18 @@ Source Location: (1:0,1 [13] x:\dir\subdir\Test\TestComponent.cshtml) |RenderPerson(| -Generated Location: (926:25,6 [13] ) +Generated Location: (874:24,6 [13] ) |RenderPerson(| Source Location: (28:0,28 [1] x:\dir\subdir\Test\TestComponent.cshtml) |)| -Generated Location: (959:27,0 [1] ) +Generated Location: (907:26,0 [1] ) |)| Source Location: (43:1,12 [54] x:\dir\subdir\Test\TestComponent.cshtml) | object RenderPerson(RenderFragment p) => null; | -Generated Location: (1106:34,12 [54] ) +Generated Location: (1054:33,12 [54] ) | object RenderPerson(RenderFragment p) => null; | diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs index f3830bd1..866e1f96 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -23,18 +22,18 @@ global::System.Object __typeHelper = "*, TestAssembly"; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue( + __o = Microsoft.AspNetCore.Components.BindMethods.GetValue( #line 2 "x:\dir\subdir\Test\TestComponent.cshtml" y #line default #line hidden ); - __o = Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler(__value => y = __value, y); - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Blazor.RenderFragment)((builder2) => { + __o = Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => y = __value, y); + builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { } )); } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_597/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_597/TestComponent.ir.txt index 0a508ca3..bd039a21 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_597/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_597/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly CSharpCode - @@ -25,12 +24,12 @@ Document - ComponentExtensionNode - (31:1,0 [22] x:\dir\subdir\Test\TestComponent.cshtml) - Counter - Test.Counter ComponentAttributeExtensionNode - (48:1,17 [1] x:\dir\subdir\Test\TestComponent.cshtml) - v - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( IntermediateToken - (48:1,17 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - y IntermediateToken - - CSharp - ) ComponentAttributeExtensionNode - (48:1,17 [1] x:\dir\subdir\Test\TestComponent.cshtml) - vChanged - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler(__value => y = __value, y) + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => y = __value, y) HtmlContent - (53:1,22 [2] x:\dir\subdir\Test\TestComponent.cshtml) IntermediateToken - (53:1,22 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n HtmlContent - (92:4,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt index 40856fa9..b0437247 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt @@ -1,18 +1,18 @@ Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) |*, TestAssembly| -Generated Location: (559:16,38 [15] ) +Generated Location: (503:15,38 [15] ) |*, TestAssembly| Source Location: (48:1,17 [1] x:\dir\subdir\Test\TestComponent.cshtml) |y| -Generated Location: (1134:30,17 [1] ) +Generated Location: (1075:29,17 [1] ) |y| Source Location: (67:2,12 [24] x:\dir\subdir\Test\TestComponent.cshtml) | string y = null; | -Generated Location: (1557:42,12 [24] ) +Generated Location: (1495:41,12 [24] ) | string y = null; | diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs index 770bd9a0..825aae87 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -23,26 +22,26 @@ global::System.Object __typeHelper = "*, TestAssembly"; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue( + __o = Microsoft.AspNetCore.Components.BindMethods.GetValue( #line 2 "x:\dir\subdir\Test\TestComponent.cshtml" UserName #line default #line hidden ); - __o = Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler(__value => UserName = __value, UserName); - __o = Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue( + __o = Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => UserName = __value, UserName); + __o = Microsoft.AspNetCore.Components.BindMethods.GetValue( #line 2 "x:\dir\subdir\Test\TestComponent.cshtml" UserIsActive #line default #line hidden ); - __o = Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler(__value => UserIsActive = __value, UserIsActive); - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Blazor.RenderFragment)((builder2) => { + __o = Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => UserIsActive = __value, UserIsActive); + builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { } )); } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_609/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_609/TestComponent.ir.txt index d50ed410..762f8737 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_609/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_609/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly CSharpCode - @@ -25,20 +24,20 @@ Document - ComponentExtensionNode - (31:1,0 [60] x:\dir\subdir\Test\TestComponent.cshtml) - User - Test.User ComponentAttributeExtensionNode - (48:1,17 [9] x:\dir\subdir\Test\TestComponent.cshtml) - Name - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( IntermediateToken - (49:1,18 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - UserName IntermediateToken - - CSharp - ) ComponentAttributeExtensionNode - (48:1,17 [9] x:\dir\subdir\Test\TestComponent.cshtml) - NameChanged - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler(__value => UserName = __value, UserName) + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => UserName = __value, UserName) ComponentAttributeExtensionNode - (74:1,43 [13] x:\dir\subdir\Test\TestComponent.cshtml) - IsActive - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( IntermediateToken - (75:1,44 [12] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - UserIsActive IntermediateToken - - CSharp - ) ComponentAttributeExtensionNode - (74:1,43 [13] x:\dir\subdir\Test\TestComponent.cshtml) - IsActiveChanged - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler(__value => UserIsActive = __value, UserIsActive) + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => UserIsActive = __value, UserIsActive) HtmlContent - (91:1,60 [4] x:\dir\subdir\Test\TestComponent.cshtml) IntermediateToken - (91:1,60 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n HtmlContent - (196:6,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt index 77e487f3..d01e84b9 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt @@ -1,16 +1,16 @@ Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) |*, TestAssembly| -Generated Location: (559:16,38 [15] ) +Generated Location: (503:15,38 [15] ) |*, TestAssembly| Source Location: (49:1,18 [8] x:\dir\subdir\Test\TestComponent.cshtml) |UserName| -Generated Location: (1135:30,18 [8] ) +Generated Location: (1076:29,18 [8] ) |UserName| Source Location: (75:1,44 [12] x:\dir\subdir\Test\TestComponent.cshtml) |UserIsActive| -Generated Location: (1495:38,44 [12] ) +Generated Location: (1422:37,44 [12] ) |UserIsActive| Source Location: (107:3,12 [88] x:\dir\subdir\Test\TestComponent.cshtml) @@ -18,7 +18,7 @@ Source Location: (107:3,12 [88] x:\dir\subdir\Test\TestComponent.cshtml) public string UserName { get; set; } public bool UserIsActive { get; set; } | -Generated Location: (1951:50,12 [88] ) +Generated Location: (1875:49,12 [88] ) | public string UserName { get; set; } public bool UserIsActive { get; set; } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs index 599e6cbf..4f3db087 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs @@ -7,10 +7,9 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - [Microsoft.AspNetCore.Blazor.Components.RouteAttribute("/")] - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + [Microsoft.AspNetCore.Components.RouteAttribute("/")] + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -28,11 +27,11 @@ global::System.Object __typeHelper = "/"; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); __o = ""; - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Blazor.RenderFragment)((builder2) => { + builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { } )); } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_772/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_772/TestComponent.ir.txt index 593ec5c5..37b5fb19 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_772/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_772/TestComponent.ir.txt @@ -4,12 +4,11 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components RouteAttributeExtensionNode - - / - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly DirectiveToken - (37:1,6 [3] x:\dir\subdir\Test\TestComponent.cshtml) - "/" diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_772/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_772/TestComponent.mappings.txt index ed2bbca8..a9b5edf7 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_772/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_772/TestComponent.mappings.txt @@ -1,10 +1,10 @@ Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) |*, TestAssembly| -Generated Location: (625:17,38 [15] ) +Generated Location: (562:16,38 [15] ) |*, TestAssembly| Source Location: (37:1,6 [3] x:\dir\subdir\Test\TestComponent.cshtml) |"/"| -Generated Location: (741:21,37 [3] ) +Generated Location: (678:20,37 [3] ) |"/"| diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs index 599e6cbf..4f3db087 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs @@ -7,10 +7,9 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - [Microsoft.AspNetCore.Blazor.Components.RouteAttribute("/")] - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + [Microsoft.AspNetCore.Components.RouteAttribute("/")] + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -28,11 +27,11 @@ global::System.Object __typeHelper = "/"; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); __o = ""; - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Blazor.RenderFragment)((builder2) => { + builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { } )); } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_773/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_773/TestComponent.ir.txt index cb620a3f..8e11bee9 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_773/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_773/TestComponent.ir.txt @@ -4,12 +4,11 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components RouteAttributeExtensionNode - - / - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly DirectiveToken - (37:1,6 [3] x:\dir\subdir\Test\TestComponent.cshtml) - "/" diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_773/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_773/TestComponent.mappings.txt index ed2bbca8..a9b5edf7 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_773/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_773/TestComponent.mappings.txt @@ -1,10 +1,10 @@ Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) |*, TestAssembly| -Generated Location: (625:17,38 [15] ) +Generated Location: (562:16,38 [15] ) |*, TestAssembly| Source Location: (37:1,6 [3] x:\dir\subdir\Test\TestComponent.cshtml) |"/"| -Generated Location: (741:21,37 [3] ) +Generated Location: (678:20,37 [3] ) |"/"| diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs index ef395436..e27aca9e 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -19,10 +18,10 @@ namespace Test private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); - __o = Microsoft.AspNetCore.Blazor.Components.BindMethods.GetEventHandlerValue(OnComponentHover); + __o = Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue(OnComponentHover); #line 1 "x:\dir\subdir\Test\TestComponent.cshtml" __o = ParentBgColor; diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_784/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_784/TestComponent.ir.txt index ec6d1a0a..f05985b0 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_784/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_784/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" CSharpCode - IntermediateToken - - CSharp - #pragma warning disable 0414 @@ -22,7 +21,7 @@ Document - HtmlElement - (0:0,0 [73] x:\dir\subdir\Test\TestComponent.cshtml) - p HtmlAttribute - (16:0,16 [17] x:\dir\subdir\Test\TestComponent.cshtml) - onmouseover=" - " CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetEventHandlerValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue( IntermediateToken - (17:0,17 [16] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnComponentHover IntermediateToken - - CSharp - ) HtmlAttribute - - style=" - " diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt index ef9ed398..dfe4ea33 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt @@ -1,11 +1,11 @@ Source Location: (17:0,17 [16] x:\dir\subdir\Test\TestComponent.cshtml) |OnComponentHover| -Generated Location: (1005:24,136 [16] ) +Generated Location: (950:23,133 [16] ) |OnComponentHover| Source Location: (55:0,55 [13] x:\dir\subdir\Test\TestComponent.cshtml) |ParentBgColor| -Generated Location: (1131:26,55 [13] ) +Generated Location: (1076:25,55 [13] ) |ParentBgColor| Source Location: (87:1,12 [132] x:\dir\subdir\Test\TestComponent.cshtml) @@ -16,7 +16,7 @@ Source Location: (87:1,12 [132] x:\dir\subdir\Test\TestComponent.cshtml) { } | -Generated Location: (1290:33,12 [132] ) +Generated Location: (1235:32,12 [132] ) | public string ParentBgColor { get; set; } = "#FFFFFF"; diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs index 6119cd65..919a59d5 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -19,7 +18,7 @@ namespace Test private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.ir.txt index 6305970b..50d67b6e 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" CSharpCode - IntermediateToken - - CSharp - #pragma warning disable 0414 diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs index 4885f2d2..a041c175 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -19,7 +18,7 @@ namespace Test private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); #line 3 "x:\dir\subdir\Test\TestComponent.cshtml" diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt index 69d6d4da..e35b5118 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" CSharpCode - IntermediateToken - - CSharp - #pragma warning disable 0414 diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.mappings.txt index c0996e98..1184d613 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.mappings.txt @@ -1,5 +1,5 @@ Source Location: (20:2,2 [10] x:\dir\subdir\Test\TestComponent.cshtml) |"My value"| -Generated Location: (926:25,6 [10] ) +Generated Location: (874:24,6 [10] ) |"My value"| diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs index 37a30096..3c8fef10 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs @@ -7,9 +7,8 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -23,10 +22,10 @@ global::System.Object __typeHelper = "*, TestAssembly"; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); - builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Blazor.RenderFragment)((builder2) => { + builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { } )); } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.ir.txt index 9a88c5ef..f837db0a 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" DirectiveToken - (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) - *, TestAssembly CSharpCode - diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.mappings.txt index 75b2c90a..3917573a 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.mappings.txt @@ -1,5 +1,5 @@ Source Location: (14:0,14 [15] x:\dir\subdir\Test\TestComponent.cshtml) |*, TestAssembly| -Generated Location: (559:16,38 [15] ) +Generated Location: (503:15,38 [15] ) |*, TestAssembly| diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.codegen.cs index 44ab249f..138dcf99 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.codegen.cs @@ -7,10 +7,9 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - [Microsoft.AspNetCore.Blazor.Components.RouteAttribute("/my/url")] - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + [Microsoft.AspNetCore.Components.RouteAttribute("/my/url")] + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { @@ -24,7 +23,7 @@ global::System.Object __typeHelper = "/my/url"; private static System.Object __o = null; #pragma warning restore 0414 #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.ir.txt index 928f611c..d2200462 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.ir.txt @@ -4,12 +4,11 @@ Document - UsingDirective - (18:2,1 [32] ) - System.Collections.Generic UsingDirective - (53:3,1 [17] ) - System.Linq UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [33] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [44] ) - Microsoft.AspNetCore.Blazor.Components + UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components RouteAttributeExtensionNode - - /my/url - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - DesignTimeDirective - - DirectiveToken - (14:0,14 [32] ) - "*, Microsoft.AspNetCore.Blazor" + DirectiveToken - (14:0,14 [36] ) - "*, Microsoft.AspNetCore.Components" DirectiveToken - (14:0,14 [9] ) - "*, Test" DirectiveToken - (24:2,6 [9] x:\dir\subdir\Test\TestComponent.cshtml) - "/my/url" CSharpCode - diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.mappings.txt index cba8722d..1b7602da 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/DesignTimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.mappings.txt @@ -1,5 +1,5 @@ Source Location: (24:2,6 [9] x:\dir\subdir\Test\TestComponent.cshtml) |"/my/url"| -Generated Location: (630:17,37 [9] ) +Generated Location: (567:16,37 [9] ) |"/my/url"| diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs index 1a0cd523..41f6e2e7 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.codegen.cs @@ -7,16 +7,15 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.OpenElement(0, "input"); - builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Blazor.Components.BindMethods.GetEventHandlerValue("async (e) => await Task.Delay(10)")); + builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue("async (e) => await Task.Delay(10)")); builder.CloseElement(); } #pragma warning restore 1998 diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.ir.txt index 8aaeae9e..11e8351e 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_Lambda/TestComponent.ir.txt @@ -4,15 +4,14 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (1:0,1 [30] x:\dir\subdir\Test\TestComponent.cshtml) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); HtmlElement - (31:1,0 [53] x:\dir\subdir\Test\TestComponent.cshtml) - input HtmlAttribute - (47:1,16 [33] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - " CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetEventHandlerValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue( IntermediateToken - - CSharp - "async (e) => await Task.Delay(10)" IntermediateToken - - CSharp - ) diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs index 4d285bd2..c574e2b3 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.codegen.cs @@ -7,16 +7,15 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.OpenElement(0, "input"); - builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Blazor.Components.BindMethods.GetEventHandlerValue(OnClick)); + builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue(OnClick)); builder.CloseElement(); } #pragma warning restore 1998 diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt index cc95230d..06163dd4 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.ir.txt @@ -4,16 +4,15 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (1:0,1 [30] x:\dir\subdir\Test\TestComponent.cshtml) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); HtmlElement - (31:1,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input HtmlAttribute - (47:1,16 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - " CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetEventHandlerValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue( IntermediateToken - (48:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick IntermediateToken - - CSharp - ) CSharpCode - (73:2,12 [91] x:\dir\subdir\Test\TestComponent.cshtml) diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt index 20f7bd02..5bada684 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_ActionEventArgs_MethodGroup/TestComponent.mappings.txt @@ -5,7 +5,7 @@ Source Location: (73:2,12 [91] x:\dir\subdir\Test\TestComponent.cshtml) return Task.CompletedTask; } | -Generated Location: (973:23,12 [91] ) +Generated Location: (918:22,12 [91] ) | Task OnClick(UIMouseEventArgs e) { diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs index 1a0cd523..41f6e2e7 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.codegen.cs @@ -7,16 +7,15 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.OpenElement(0, "input"); - builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Blazor.Components.BindMethods.GetEventHandlerValue("async (e) => await Task.Delay(10)")); + builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue("async (e) => await Task.Delay(10)")); builder.CloseElement(); } #pragma warning restore 1998 diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.ir.txt index 8aaeae9e..11e8351e 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_Lambda/TestComponent.ir.txt @@ -4,15 +4,14 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (1:0,1 [30] x:\dir\subdir\Test\TestComponent.cshtml) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); HtmlElement - (31:1,0 [53] x:\dir\subdir\Test\TestComponent.cshtml) - input HtmlAttribute - (47:1,16 [33] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - " CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetEventHandlerValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue( IntermediateToken - - CSharp - "async (e) => await Task.Delay(10)" IntermediateToken - - CSharp - ) diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs index cb67da82..06021847 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.codegen.cs @@ -7,16 +7,15 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.OpenElement(0, "input"); - builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Blazor.Components.BindMethods.GetEventHandlerValue(OnClick)); + builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue(OnClick)); builder.CloseElement(); } #pragma warning restore 1998 diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt index b161a2c9..07447941 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.ir.txt @@ -4,16 +4,15 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (1:0,1 [30] x:\dir\subdir\Test\TestComponent.cshtml) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); HtmlElement - (31:1,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input HtmlAttribute - (47:1,16 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - " CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetEventHandlerValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue( IntermediateToken - (48:1,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick IntermediateToken - - CSharp - ) CSharpCode - (73:2,12 [73] x:\dir\subdir\Test\TestComponent.cshtml) diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt index bfb62f20..f459f653 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/AsyncEventHandler_OnElement_Action_MethodGroup/TestComponent.mappings.txt @@ -5,7 +5,7 @@ Source Location: (73:2,12 [73] x:\dir\subdir\Test\TestComponent.cshtml) return Task.CompletedTask; } | -Generated Location: (973:23,12 [73] ) +Generated Location: (918:22,12 [73] ) | Task OnClick() { diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs index f634509d..10243589 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs @@ -7,16 +7,15 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.OpenComponent(0); - builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Blazor.Components.RuntimeHelpers.TypeCheck(Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue(ParentValue))); + builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck(Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue))); builder.AddAttribute(2, "OnChanged", new System.Action(__value => ParentValue = __value)); builder.CloseComponent(); } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt index cf2cad57..828e856c 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.ir.txt @@ -4,16 +4,15 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); ComponentExtensionNode - (31:1,0 [50] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent ComponentAttributeExtensionNode - (66:1,35 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - Value CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( IntermediateToken - (66:1,35 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue IntermediateToken - - CSharp - ) ComponentAttributeExtensionNode - (66:1,35 [11] x:\dir\subdir\Test\TestComponent.cshtml) - OnChanged - OnChanged diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt index 8bca6e39..39e53751 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt @@ -2,7 +2,7 @@ Source Location: (95:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) | public int ParentValue { get; set; } = 42; | -Generated Location: (1127:24,12 [50] ) +Generated Location: (1061:23,12 [50] ) | public int ParentValue { get; set; } = 42; | diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs index 12f74d4b..e7807b0b 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs @@ -7,17 +7,16 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.OpenComponent(0); - builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue(ParentValue)); - builder.AddAttribute(2, "OnChanged", Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue)); + builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue)); + builder.AddAttribute(2, "OnChanged", Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue)); builder.CloseComponent(); } #pragma warning restore 1998 diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt index 3a193ed6..8381d3fa 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.ir.txt @@ -4,20 +4,19 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); ComponentExtensionNode - (31:1,0 [50] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent ComponentAttributeExtensionNode - (66:1,35 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( IntermediateToken - (66:1,35 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue IntermediateToken - - CSharp - ) ComponentAttributeExtensionNode - (66:1,35 [11] x:\dir\subdir\Test\TestComponent.cshtml) - OnChanged - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue) + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue) CSharpCode - (95:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) IntermediateToken - (95:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n public int ParentValue { get; set; } = 42;\n diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt index b2c81c25..33a43a37 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt @@ -2,7 +2,7 @@ Source Location: (95:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) | public int ParentValue { get; set; } = 42; | -Generated Location: (1096:24,12 [50] ) +Generated Location: (1030:23,12 [50] ) | public int ParentValue { get; set; } = 42; | diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs index 0bb206af..5a8c21bf 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs @@ -7,16 +7,15 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.OpenComponent(0); - builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Blazor.Components.RuntimeHelpers.TypeCheck(Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue(ParentValue))); + builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck(Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue))); builder.AddAttribute(2, "ValueChanged", new System.Action(__value => ParentValue = __value)); builder.CloseComponent(); } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt index c4b16fdb..fe38f2c0 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.ir.txt @@ -4,16 +4,15 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); ComponentExtensionNode - (31:1,0 [40] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent ComponentAttributeExtensionNode - (56:1,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - Value CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( IntermediateToken - (56:1,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue IntermediateToken - - CSharp - ) ComponentAttributeExtensionNode - (56:1,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - ValueChanged diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt index 1d2144ac..ab302bec 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt @@ -2,7 +2,7 @@ Source Location: (85:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) | public int ParentValue { get; set; } = 42; | -Generated Location: (1130:24,12 [50] ) +Generated Location: (1064:23,12 [50] ) | public int ParentValue { get; set; } = 42; | diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs index d70f0e7c..c444fed0 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs @@ -7,17 +7,16 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.OpenComponent(0); - builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue(ParentValue)); - builder.AddAttribute(2, "ValueChanged", Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue)); + builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue)); + builder.AddAttribute(2, "ValueChanged", Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue)); builder.CloseComponent(); } #pragma warning restore 1998 diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt index a8bade26..27e972b7 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.ir.txt @@ -4,20 +4,19 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); ComponentExtensionNode - (31:1,0 [40] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent ComponentAttributeExtensionNode - (56:1,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( IntermediateToken - (56:1,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue IntermediateToken - - CSharp - ) ComponentAttributeExtensionNode - (56:1,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue) + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue) CSharpCode - (85:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) IntermediateToken - (85:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n public int ParentValue { get; set; } = 42;\n diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt index 96042790..791d24c7 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt @@ -2,7 +2,7 @@ Source Location: (85:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) | public int ParentValue { get; set; } = 42; | -Generated Location: (1099:24,12 [50] ) +Generated Location: (1033:23,12 [50] ) | public int ParentValue { get; set; } = 42; | diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs index 2ac3407c..bb98cf18 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs @@ -7,16 +7,15 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.OpenComponent(0); - builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Blazor.Components.RuntimeHelpers.TypeCheck(Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue(ParentValue))); + builder.AddAttribute(1, "Value", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck(Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue))); builder.AddAttribute(2, "ValueChanged", new System.Action(__value => ParentValue = __value)); builder.CloseComponent(); } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt index 89741940..c1dbbf46 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.ir.txt @@ -4,16 +4,15 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); ComponentExtensionNode - (31:1,0 [40] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent ComponentAttributeExtensionNode - (56:1,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Value - Value CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( IntermediateToken - (56:1,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue IntermediateToken - - CSharp - ) ComponentAttributeExtensionNode - (56:1,25 [11] x:\dir\subdir\Test\TestComponent.cshtml) - ValueChanged - ValueChanged diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt index 33f39917..2504e46a 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt @@ -2,7 +2,7 @@ Source Location: (85:2,12 [55] x:\dir\subdir\Test\TestComponent.cshtml) | public string ParentValue { get; set; } = "42"; | -Generated Location: (1130:24,12 [55] ) +Generated Location: (1064:23,12 [55] ) | public string ParentValue { get; set; } = "42"; | diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs index de1a8e73..f12516fd 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.codegen.cs @@ -7,18 +7,17 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.OpenElement(0, "input"); builder.AddAttribute(1, "type", "text"); - builder.AddAttribute(2, "value", Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue(CurrentDate, "MM/dd")); - builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler(__value => CurrentDate = __value, CurrentDate, "MM/dd")); + builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(CurrentDate, "MM/dd")); + builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => CurrentDate = __value, CurrentDate, "MM/dd")); builder.CloseElement(); } #pragma warning restore 1998 diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt index af02651a..6db3eedc 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.ir.txt @@ -4,9 +4,8 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); @@ -16,13 +15,13 @@ Document - IntermediateToken - (44:1,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text HtmlAttribute - (71:1,40 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - " CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( IntermediateToken - (72:1,41 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate IntermediateToken - - CSharp - , IntermediateToken - - CSharp - "MM/dd" IntermediateToken - - CSharp - ) HtmlAttribute - (71:1,40 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - " CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler(__value => CurrentDate = __value, CurrentDate, "MM/dd") + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => CurrentDate = __value, CurrentDate, "MM/dd") CSharpCode - (122:2,12 [77] x:\dir\subdir\Test\TestComponent.cshtml) IntermediateToken - (122:2,12 [77] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt index 25dcf72d..d1cbd5da 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementFallback_WithFormat_WritesAttributes/TestComponent.mappings.txt @@ -2,7 +2,7 @@ Source Location: (122:2,12 [77] x:\dir\subdir\Test\TestComponent.cshtml) | public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1); | -Generated Location: (1154:25,12 [77] ) +Generated Location: (1088:24,12 [77] ) | public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1); | diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs index 27841023..c46a006c 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.codegen.cs @@ -7,18 +7,17 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.OpenElement(0, "input"); builder.AddAttribute(1, "type", "text"); - builder.AddAttribute(2, "value", Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue(ParentValue)); - builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue)); + builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue)); + builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue)); builder.CloseElement(); } #pragma warning restore 1998 diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt index c1d01da1..d2f4a5ac 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.ir.txt @@ -4,9 +4,8 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); @@ -16,11 +15,11 @@ Document - IntermediateToken - (44:1,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text HtmlAttribute - (71:1,40 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - " CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( IntermediateToken - (72:1,41 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue IntermediateToken - - CSharp - ) HtmlAttribute - (71:1,40 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - " CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue) + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue) CSharpCode - (101:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) IntermediateToken - (101:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n public int ParentValue { get; set; } = 42;\n diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt index aa09e1b2..2aff49fe 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementFallback_WritesAttributes/TestComponent.mappings.txt @@ -2,7 +2,7 @@ Source Location: (101:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) | public int ParentValue { get; set; } = 42; | -Generated Location: (1136:25,12 [50] ) +Generated Location: (1070:24,12 [50] ) | public int ParentValue { get; set; } = 42; | diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs index 1f4d0724..29f0c99c 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.codegen.cs @@ -7,17 +7,16 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.OpenElement(0, "div"); - builder.AddAttribute(1, "myvalue", Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue(ParentValue)); - builder.AddAttribute(2, "myevent", Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue)); + builder.AddAttribute(1, "myvalue", Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue)); + builder.AddAttribute(2, "myevent", Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue)); builder.CloseElement(); } #pragma warning restore 1998 diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt index 2fc5e7b9..55cbf4c3 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.ir.txt @@ -4,20 +4,19 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); HtmlElement - (31:1,0 [33] x:\dir\subdir\Test\TestComponent.cshtml) - div HtmlAttribute - (48:1,17 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myvalue=" - " CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( IntermediateToken - (49:1,18 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue IntermediateToken - - CSharp - ) HtmlAttribute - (48:1,17 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myevent=" - " CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue) + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue) CSharpCode - (78:2,12 [55] x:\dir\subdir\Test\TestComponent.cshtml) IntermediateToken - (78:2,12 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n public string ParentValue { get; set; } = "hi";\n diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt index 2179d46f..babd720e 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElementWithSuffix_WritesAttributes/TestComponent.mappings.txt @@ -2,7 +2,7 @@ Source Location: (78:2,12 [55] x:\dir\subdir\Test\TestComponent.cshtml) | public string ParentValue { get; set; } = "hi"; | -Generated Location: (1081:24,12 [55] ) +Generated Location: (1015:23,12 [55] ) | public string ParentValue { get; set; } = "hi"; | diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs index 1f4d0724..29f0c99c 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.codegen.cs @@ -7,17 +7,16 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.OpenElement(0, "div"); - builder.AddAttribute(1, "myvalue", Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue(ParentValue)); - builder.AddAttribute(2, "myevent", Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue)); + builder.AddAttribute(1, "myvalue", Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue)); + builder.AddAttribute(2, "myevent", Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue)); builder.CloseElement(); } #pragma warning restore 1998 diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt index b3c72930..22ff3383 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.ir.txt @@ -4,20 +4,19 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); HtmlElement - (31:1,0 [27] x:\dir\subdir\Test\TestComponent.cshtml) - div HtmlAttribute - (42:1,11 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myvalue=" - " CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( IntermediateToken - (43:1,12 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue IntermediateToken - - CSharp - ) HtmlAttribute - (42:1,11 [12] x:\dir\subdir\Test\TestComponent.cshtml) - myevent=" - " CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue) + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue) CSharpCode - (72:2,12 [55] x:\dir\subdir\Test\TestComponent.cshtml) IntermediateToken - (72:2,12 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n public string ParentValue { get; set; } = "hi";\n diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt index b9e573c5..c8ff9200 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BindToElement_WritesAttributes/TestComponent.mappings.txt @@ -2,7 +2,7 @@ Source Location: (72:2,12 [55] x:\dir\subdir\Test\TestComponent.cshtml) | public string ParentValue { get; set; } = "hi"; | -Generated Location: (1081:24,12 [55] ) +Generated Location: (1015:23,12 [55] ) | public string ParentValue { get; set; } = "hi"; | diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs index 3472503d..0213a467 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs @@ -7,12 +7,11 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); #line 2 "x:\dir\subdir\Test\TestComponent.cshtml" @@ -31,8 +30,8 @@ namespace Test #line default #line hidden builder.OpenComponent(2); - builder.AddAttribute(3, "Header", new Microsoft.AspNetCore.Blazor.RenderFragment(header)); - builder.AddAttribute(4, "ChildContent", (Microsoft.AspNetCore.Blazor.RenderFragment)((builder2) => { + builder.AddAttribute(3, "Header", new Microsoft.AspNetCore.Components.RenderFragment(header)); + builder.AddAttribute(4, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { builder2.AddContent(5, "\n Some Content\n"); } )); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.ir.txt index 7a970ce6..15c209e7 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.ir.txt @@ -4,9 +4,8 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt index cbaabc54..5e6eb01d 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt @@ -1,10 +1,10 @@ Source Location: (33:1,2 [46] x:\dir\subdir\Test\TestComponent.cshtml) | RenderFragment header = (context) => | -Generated Location: (654:18,2 [46] ) +Generated Location: (602:17,2 [46] ) | RenderFragment header = (context) => | Source Location: (118:1,87 [2] x:\dir\subdir\Test\TestComponent.cshtml) |; | -Generated Location: (1075:28,87 [2] ) +Generated Location: (1023:27,87 [2] ) |; | diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs index 180d2f0c..0de09fc2 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs @@ -7,12 +7,11 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); #line 2 "x:\dir\subdir\Test\TestComponent.cshtml" @@ -31,12 +30,12 @@ namespace Test #line default #line hidden builder.OpenComponent(2); - builder.AddAttribute(3, "Header", new Microsoft.AspNetCore.Blazor.RenderFragment(header)); - builder.AddAttribute(4, "ChildContent", (Microsoft.AspNetCore.Blazor.RenderFragment)((builder2) => { + builder.AddAttribute(3, "Header", new Microsoft.AspNetCore.Components.RenderFragment(header)); + builder.AddAttribute(4, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { builder2.AddContent(5, "Some Content"); } )); - builder.AddAttribute(6, "Footer", (Microsoft.AspNetCore.Blazor.RenderFragment)((builder2) => { + builder.AddAttribute(6, "Footer", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { builder2.AddContent(7, "Bye!"); } )); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.ir.txt index 91d66478..dd0662b6 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.ir.txt @@ -4,9 +4,8 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt index cbaabc54..5e6eb01d 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt @@ -1,10 +1,10 @@ Source Location: (33:1,2 [46] x:\dir\subdir\Test\TestComponent.cshtml) | RenderFragment header = (context) => | -Generated Location: (654:18,2 [46] ) +Generated Location: (602:17,2 [46] ) | RenderFragment header = (context) => | Source Location: (118:1,87 [2] x:\dir\subdir\Test\TestComponent.cshtml) |; | -Generated Location: (1075:28,87 [2] ) +Generated Location: (1023:27,87 [2] ) |; | diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs index 9aeb1e9e..0b3d4b01 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.codegen.cs @@ -7,18 +7,17 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.OpenElement(0, "input"); builder.AddAttribute(1, "type", "checkbox"); - builder.AddAttribute(2, "checked", Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue(Enabled)); - builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler(__value => Enabled = __value, Enabled)); + builder.AddAttribute(2, "checked", Microsoft.AspNetCore.Components.BindMethods.GetValue(Enabled)); + builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => Enabled = __value, Enabled)); builder.CloseElement(); } #pragma warning restore 1998 diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt index 711d2b34..2b48165a 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.ir.txt @@ -4,9 +4,8 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); @@ -16,11 +15,11 @@ Document - IntermediateToken - (44:1,13 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Html - checkbox HtmlAttribute - (60:1,29 [8] x:\dir\subdir\Test\TestComponent.cshtml) - checked=" - " CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( IntermediateToken - (61:1,30 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Enabled IntermediateToken - - CSharp - ) HtmlAttribute - (60:1,29 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - " CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler(__value => Enabled = __value, Enabled) + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => Enabled = __value, Enabled) CSharpCode - (86:2,12 [41] x:\dir\subdir\Test\TestComponent.cshtml) IntermediateToken - (86:2,12 [41] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n public bool Enabled { get; set; }\n diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt index ce71d1db..dcc4eef3 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputCheckbox_WritesAttributes/TestComponent.mappings.txt @@ -2,7 +2,7 @@ Source Location: (86:2,12 [41] x:\dir\subdir\Test\TestComponent.cshtml) | public bool Enabled { get; set; } | -Generated Location: (1130:25,12 [41] ) +Generated Location: (1064:24,12 [41] ) | public bool Enabled { get; set; } | diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs index 68d0b0d1..d347475c 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.codegen.cs @@ -7,18 +7,17 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.OpenElement(0, "input"); builder.AddAttribute(1, "type", "text"); - builder.AddAttribute(2, "value", Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue(CurrentDate, Format)); - builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler(__value => CurrentDate = __value, CurrentDate, Format)); + builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(CurrentDate, Format)); + builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => CurrentDate = __value, CurrentDate, Format)); builder.CloseElement(); } #pragma warning restore 1998 diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt index 9430a373..55404595 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.ir.txt @@ -4,9 +4,8 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); @@ -16,13 +15,13 @@ Document - IntermediateToken - (44:1,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text HtmlAttribute - (56:1,25 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - " CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( IntermediateToken - (57:1,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate IntermediateToken - - CSharp - , IntermediateToken - (85:1,54 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Format IntermediateToken - - CSharp - ) HtmlAttribute - (56:1,25 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - " CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler(__value => CurrentDate = __value, CurrentDate, Format) + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => CurrentDate = __value, CurrentDate, Format) CSharpCode - (108:2,12 [135] x:\dir\subdir\Test\TestComponent.cshtml) IntermediateToken - (108:2,12 [135] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n\n public string Format { get; set; } = "MM/dd/yyyy";\n diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt index 267c6a28..40918f65 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormatFromProperty_WritesAttributes/TestComponent.mappings.txt @@ -4,7 +4,7 @@ Source Location: (108:2,12 [135] x:\dir\subdir\Test\TestComponent.cshtml) public string Format { get; set; } = "MM/dd/yyyy"; | -Generated Location: (1152:25,12 [135] ) +Generated Location: (1086:24,12 [135] ) | public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs index bcef6420..415e7664 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.codegen.cs @@ -7,18 +7,17 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.OpenElement(0, "input"); builder.AddAttribute(1, "type", "text"); - builder.AddAttribute(2, "value", Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue(CurrentDate, "MM/dd/yyyy")); - builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler(__value => CurrentDate = __value, CurrentDate, "MM/dd/yyyy")); + builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(CurrentDate, "MM/dd/yyyy")); + builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => CurrentDate = __value, CurrentDate, "MM/dd/yyyy")); builder.CloseElement(); } #pragma warning restore 1998 diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt index 9eac8088..dc862daa 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.ir.txt @@ -4,9 +4,8 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); @@ -16,13 +15,13 @@ Document - IntermediateToken - (44:1,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text HtmlAttribute - (56:1,25 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - " CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( IntermediateToken - (57:1,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - CurrentDate IntermediateToken - - CSharp - , IntermediateToken - - CSharp - "MM/dd/yyyy" IntermediateToken - - CSharp - ) HtmlAttribute - (56:1,25 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - " CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler(__value => CurrentDate = __value, CurrentDate, "MM/dd/yyyy") + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => CurrentDate = __value, CurrentDate, "MM/dd/yyyy") CSharpCode - (111:2,12 [77] x:\dir\subdir\Test\TestComponent.cshtml) IntermediateToken - (111:2,12 [77] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);\n diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt index c71f517d..1096d43f 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WithFormat_WritesAttributes/TestComponent.mappings.txt @@ -2,7 +2,7 @@ Source Location: (111:2,12 [77] x:\dir\subdir\Test\TestComponent.cshtml) | public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1); | -Generated Location: (1164:25,12 [77] ) +Generated Location: (1098:24,12 [77] ) | public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1); | diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs index 27841023..c46a006c 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.codegen.cs @@ -7,18 +7,17 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.OpenElement(0, "input"); builder.AddAttribute(1, "type", "text"); - builder.AddAttribute(2, "value", Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue(ParentValue)); - builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue)); + builder.AddAttribute(2, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue)); + builder.AddAttribute(3, "onchange", Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue)); builder.CloseElement(); } #pragma warning restore 1998 diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt index 45ebca4e..c935b42b 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.ir.txt @@ -4,9 +4,8 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); @@ -16,11 +15,11 @@ Document - IntermediateToken - (44:1,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - text HtmlAttribute - (56:1,25 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - " CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( IntermediateToken - (57:1,26 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue IntermediateToken - - CSharp - ) HtmlAttribute - (56:1,25 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - " CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue) + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue) CSharpCode - (86:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) IntermediateToken - (86:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n public int ParentValue { get; set; } = 42;\n diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt index 9618ed3a..aa078259 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputText_WritesAttributes/TestComponent.mappings.txt @@ -2,7 +2,7 @@ Source Location: (86:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) | public int ParentValue { get; set; } = 42; | -Generated Location: (1136:25,12 [50] ) +Generated Location: (1070:24,12 [50] ) | public int ParentValue { get; set; } = 42; | diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs index 50418e2e..28468ad1 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.codegen.cs @@ -7,17 +7,16 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.OpenElement(0, "input"); - builder.AddAttribute(1, "value", Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue(ParentValue)); - builder.AddAttribute(2, "onchange", Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue)); + builder.AddAttribute(1, "value", Microsoft.AspNetCore.Components.BindMethods.GetValue(ParentValue)); + builder.AddAttribute(2, "onchange", Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue)); builder.CloseElement(); } #pragma warning restore 1998 diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt index bfcc984a..5ffdd8b1 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.ir.txt @@ -4,20 +4,19 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); HtmlElement - (31:1,0 [29] x:\dir\subdir\Test\TestComponent.cshtml) - input HtmlAttribute - (44:1,13 [12] x:\dir\subdir\Test\TestComponent.cshtml) - value=" - " CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( IntermediateToken - (45:1,14 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue IntermediateToken - - CSharp - ) HtmlAttribute - (44:1,13 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onchange=" - " CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue) + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => ParentValue = __value, ParentValue) CSharpCode - (74:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) IntermediateToken - (74:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n public int ParentValue { get; set; } = 42;\n diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt index 3d15b644..f3ac3c42 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/BuiltIn_BindToInputWithoutType_WritesAttributes/TestComponent.mappings.txt @@ -2,7 +2,7 @@ Source Location: (74:2,12 [50] x:\dir\subdir\Test\TestComponent.cshtml) | public int ParentValue { get; set; } = 42; | -Generated Location: (1082:24,12 [50] ) +Generated Location: (1016:23,12 [50] ) | public int ParentValue { get; set; } = 42; | diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs index fd3b3213..847cb43f 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs @@ -7,16 +7,15 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.OpenComponent>(0); - builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Blazor.Components.RuntimeHelpers.TypeCheck("hi")); + builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck("hi")); builder.CloseComponent(); } #pragma warning restore 1998 diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.ir.txt index 6f324682..9fba5ff2 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.ir.txt @@ -4,9 +4,8 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs index eb1f645c..164ee4e0 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs @@ -7,16 +7,15 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.OpenComponent>(0); - builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Blazor.Components.RuntimeHelpers.TypeCheck(Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue(Value))); + builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck(Microsoft.AspNetCore.Components.BindMethods.GetValue(Value))); builder.AddAttribute(2, "ItemChanged", new System.Action(__value => Value = __value)); builder.CloseComponent(); } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt index 20b79b01..a0bade6d 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.ir.txt @@ -4,9 +4,8 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); @@ -15,7 +14,7 @@ Document - IntermediateToken - (50:1,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - string ComponentAttributeExtensionNode - (67:1,36 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( IntermediateToken - (67:1,36 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value IntermediateToken - - CSharp - ) ComponentAttributeExtensionNode - (67:1,36 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - ItemChanged diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt index f8a0e9a0..a8c3e765 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt @@ -2,7 +2,7 @@ Source Location: (88:2,12 [21] x:\dir\subdir\Test\TestComponent.cshtml) | string Value; | -Generated Location: (1112:24,12 [21] ) +Generated Location: (1046:23,12 [21] ) | string Value; | diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs index b22e42ad..faa5f802 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs @@ -7,17 +7,16 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.OpenComponent>(0); - builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue(Value)); - builder.AddAttribute(2, "ItemChanged", Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler(__value => Value = __value, Value)); + builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.BindMethods.GetValue(Value)); + builder.AddAttribute(2, "ItemChanged", Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => Value = __value, Value)); builder.CloseComponent(); } #pragma warning restore 1998 diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt index 7995a949..a9525246 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.ir.txt @@ -4,9 +4,8 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); @@ -15,11 +14,11 @@ Document - IntermediateToken - (50:1,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - string ComponentAttributeExtensionNode - (67:1,36 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( IntermediateToken - (67:1,36 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value IntermediateToken - - CSharp - ) ComponentAttributeExtensionNode - (67:1,36 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler(__value => Value = __value, Value) + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => Value = __value, Value) CSharpCode - (88:2,12 [21] x:\dir\subdir\Test\TestComponent.cshtml) IntermediateToken - (88:2,12 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n string Value;\n diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt index 28f6af13..2cc63bc1 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt @@ -2,7 +2,7 @@ Source Location: (88:2,12 [21] x:\dir\subdir\Test\TestComponent.cshtml) | string Value; | -Generated Location: (1087:24,12 [21] ) +Generated Location: (1021:23,12 [21] ) | string Value; | diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs index 24aa779e..e6f6d19f 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs @@ -7,15 +7,14 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); - __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 18, 2, Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue(Value), 3, Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler(__value => Value = __value, Value)); + __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 18, 2, Microsoft.AspNetCore.Components.BindMethods.GetValue(Value), 3, Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => Value = __value, Value)); } #pragma warning restore 1998 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml" @@ -31,7 +30,7 @@ namespace __Blazor.Test.TestComponent #line hidden internal static class TypeInference { - public static void CreateMyComponent_0(global::Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, System.Object __arg1, int __seq2, System.Object __arg2) + public static void CreateMyComponent_0(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, System.Object __arg1, int __seq2, System.Object __arg2) { builder.OpenComponent>(seq); builder.AddAttribute(__seq0, "Value", __arg0); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt index 8cfd2b7c..7b2b87cd 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.ir.txt @@ -4,9 +4,8 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); @@ -16,12 +15,12 @@ Document - IntermediateToken - (68:1,37 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 18 ComponentAttributeExtensionNode - (54:1,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( IntermediateToken - (54:1,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value IntermediateToken - - CSharp - ) ComponentAttributeExtensionNode - (54:1,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler(__value => Value = __value, Value) + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => Value = __value, Value) CSharpCode - (87:2,12 [21] x:\dir\subdir\Test\TestComponent.cshtml) IntermediateToken - (87:2,12 [21] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n string Value;\n NamespaceDeclaration - - __Blazor.Test.TestComponent diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt index c7d44ac8..38ff236a 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt @@ -2,7 +2,7 @@ Source Location: (87:2,12 [21] x:\dir\subdir\Test\TestComponent.cshtml) | string Value; | -Generated Location: (985:21,12 [21] ) +Generated Location: (919:20,12 [21] ) | string Value; | diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs index 20f30fcf..c2808ab0 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs @@ -7,15 +7,14 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); - __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue(Value), 2, __value => Value = __value); + __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, Microsoft.AspNetCore.Components.BindMethods.GetValue(Value), 2, __value => Value = __value); } #pragma warning restore 1998 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml" @@ -31,7 +30,7 @@ namespace __Blazor.Test.TestComponent #line hidden internal static class TypeInference { - public static void CreateMyComponent_0(global::Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::System.Action __arg1) + public static void CreateMyComponent_0(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::System.Action __arg1) { builder.OpenComponent>(seq); builder.AddAttribute(__seq0, "Item", __arg0); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt index f94e575c..a90c5928 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.ir.txt @@ -4,16 +4,15 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); ComponentExtensionNode - (31:1,0 [30] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - global::Test.MyComponent ComponentAttributeExtensionNode - (54:1,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( IntermediateToken - (54:1,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Value IntermediateToken - - CSharp - ) ComponentAttributeExtensionNode - (54:1,23 [5] x:\dir\subdir\Test\TestComponent.cshtml) - ItemChanged - ItemChanged diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt index fca907e4..fe2d718f 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt @@ -2,7 +2,7 @@ Source Location: (75:2,12 [21] x:\dir\subdir\Test\TestComponent.cshtml) | string Value; | -Generated Location: (903:21,12 [21] ) +Generated Location: (844:20,12 [21] ) | string Value; | diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs index e9a7f0a0..8d7563e2 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs @@ -7,17 +7,16 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.OpenComponent>(0); - builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Blazor.Components.RuntimeHelpers.TypeCheck("hi")); - builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Blazor.RenderFragment)((context) => (builder2) => { + builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck("hi")); + builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((context) => (builder2) => { builder2.AddContent(3, "\n "); builder2.OpenElement(4, "div"); builder2.AddContent(5, context.ToLower()); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.ir.txt index f5f35753..ec6dc1c5 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.ir.txt @@ -4,9 +4,8 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs index 01db5dbd..e9fc0b23 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs @@ -7,12 +7,11 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, "hi", 2, (context) => (builder2) => { @@ -32,7 +31,7 @@ namespace __Blazor.Test.TestComponent #line hidden internal static class TypeInference { - public static void CreateMyComponent_0(global::Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Blazor.RenderFragment __arg1) + public static void CreateMyComponent_0(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment __arg1) { builder.OpenComponent>(seq); builder.AddAttribute(__seq0, "Item", __arg0); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.ir.txt index 2f7909a5..265a73f2 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.ir.txt @@ -4,9 +4,8 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs index 8b0b9496..c50be245 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs @@ -7,16 +7,15 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.OpenComponent>(0); - builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Blazor.Components.RuntimeHelpers.TypeCheck("hi")); + builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck("hi")); builder.AddAttribute(2, "Other", 17); builder.CloseComponent(); } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.ir.txt index bfd81b3a..9910509f 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.ir.txt @@ -4,9 +4,8 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs index 5da257cd..49e4bd2e 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs @@ -7,12 +7,11 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, "hi", 2, 17); @@ -25,7 +24,7 @@ namespace __Blazor.Test.TestComponent #line hidden internal static class TypeInference { - public static void CreateMyComponent_0(global::Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, System.Object __arg1) + public static void CreateMyComponent_0(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, System.Object __arg1) { builder.OpenComponent>(seq); builder.AddAttribute(__seq0, "Item", __arg0); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.ir.txt index ac20b3a5..39aba388 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.ir.txt @@ -4,9 +4,8 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs index d7503d5b..a4e81007 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs @@ -7,12 +7,11 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, "hi"); @@ -25,7 +24,7 @@ namespace __Blazor.Test.TestComponent #line hidden internal static class TypeInference { - public static void CreateMyComponent_0(global::Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0) + public static void CreateMyComponent_0(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0) { builder.OpenComponent>(seq); builder.AddAttribute(__seq0, "Item", __arg0); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.ir.txt index 1e7686cc..1f3f1127 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.ir.txt @@ -4,9 +4,8 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs index 174f6962..7d1d0e91 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs @@ -7,12 +7,11 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, "hi"); @@ -29,19 +28,19 @@ namespace __Blazor.Test.TestComponent #line hidden internal static class TypeInference { - public static void CreateMyComponent_0(global::Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0) + public static void CreateMyComponent_0(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0) { builder.OpenComponent>(seq); builder.AddAttribute(__seq0, "Item", __arg0); builder.CloseComponent(); } - public static void CreateMyComponent_1(global::Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0) + public static void CreateMyComponent_1(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0) { builder.OpenComponent>(seq); builder.AddAttribute(__seq0, "Item", __arg0); builder.CloseComponent(); } - public static void CreateMyComponent_2(global::Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0) + public static void CreateMyComponent_2(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0) { builder.OpenComponent>(seq); builder.AddAttribute(__seq0, "Item", __arg0); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.ir.txt index c531fce7..d8e96e6b 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.ir.txt @@ -4,9 +4,8 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs index e3b8a937..688b77b0 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs @@ -7,23 +7,22 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.OpenComponent>(0); - builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Blazor.Components.RuntimeHelpers.TypeCheck("hi")); - builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Blazor.RenderFragment)((context) => (builder2) => { + builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck("hi")); + builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((context) => (builder2) => { builder2.OpenElement(3, "div"); builder2.AddContent(4, context.ToLower()); builder2.CloseElement(); } )); - builder.AddAttribute(5, "AnotherChildContent", (Microsoft.AspNetCore.Blazor.RenderFragment.Context>)((item) => (builder2) => { + builder.AddAttribute(5, "AnotherChildContent", (Microsoft.AspNetCore.Components.RenderFragment.Context>)((item) => (builder2) => { builder2.AddContent(6, "\n "); builder2.AddContent(7, System.Math.Max(0, item.Item)); builder2.AddContent(8, ";\n"); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.ir.txt index eb31527e..6a69c8b1 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.ir.txt @@ -4,9 +4,8 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs index 2967049d..93d075fc 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs @@ -7,12 +7,11 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, "hi", 2, new List(), 3, (context) => (builder2) => { @@ -35,7 +34,7 @@ namespace __Blazor.Test.TestComponent #line hidden internal static class TypeInference { - public static void CreateMyComponent_0(global::Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem1 __arg0, int __seq1, global::System.Collections.Generic.List __arg1, int __seq2, global::Microsoft.AspNetCore.Blazor.RenderFragment __arg2, int __seq3, global::Microsoft.AspNetCore.Blazor.RenderFragment.Context> __arg3) + public static void CreateMyComponent_0(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem1 __arg0, int __seq1, global::System.Collections.Generic.List __arg1, int __seq2, global::Microsoft.AspNetCore.Components.RenderFragment __arg2, int __seq3, global::Microsoft.AspNetCore.Components.RenderFragment.Context> __arg3) { builder.OpenComponent>(seq); builder.AddAttribute(__seq0, "Item", __arg0); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.ir.txt index 34c4bfbf..0f2f0df4 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.ir.txt @@ -4,9 +4,8 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs index ee16caef..531a8574 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs @@ -7,12 +7,11 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.OpenComponent(0); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_Simple/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_Simple/TestComponent.ir.txt index 1defa126..51b5023e 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_Simple/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_Simple/TestComponent.ir.txt @@ -4,9 +4,8 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs index 55620481..0d97d51a 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs @@ -7,17 +7,16 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.OpenComponent(0); builder.AddAttribute(1, "MyAttr", "abc"); - builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Blazor.RenderFragment)((builder2) => { + builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { builder2.AddContent(3, "Some text"); builder2.AddMarkupContent(4, "Nested text"); } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.ir.txt index 53b69a78..2c493db0 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.ir.txt @@ -4,9 +4,8 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs index a0676fe9..81c9ffde 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs @@ -7,16 +7,15 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.OpenComponent(0); - builder.AddAttribute(1, "ChildContent", (Microsoft.AspNetCore.Blazor.RenderFragment)((builder2) => { + builder.AddAttribute(1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { builder2.AddMarkupContent(2, "hello"); } )); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.ir.txt index 52c0670d..ab646023 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.ir.txt @@ -4,9 +4,8 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs index 1f212fdd..9dada263 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs @@ -7,16 +7,15 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.OpenComponent(0); - builder.AddAttribute(1, "ChildContent", (Microsoft.AspNetCore.Blazor.RenderFragment)((builder2) => { + builder.AddAttribute(1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { builder2.AddContent(2, "hello"); } )); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.ir.txt index eb26477c..06b0cceb 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.ir.txt @@ -4,9 +4,8 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs index 0c0e7f23..9116082d 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs @@ -7,16 +7,15 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.OpenComponent(0); - builder.AddAttribute(1, "OnClick", new System.Action(Increment)); + builder.AddAttribute(1, "OnClick", new System.Action(Increment)); builder.CloseComponent(); } #pragma warning restore 1998 diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.ir.txt index 9eb35b74..f3057c65 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.ir.txt @@ -4,9 +4,8 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt index c7d5aa8b..6eea8437 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt @@ -5,7 +5,7 @@ Source Location: (82:3,12 [100] x:\dir\subdir\Test\TestComponent.cshtml) counter++; } | -Generated Location: (929:23,12 [100] ) +Generated Location: (881:22,12 [100] ) | private int counter; private void Increment(UIEventArgs e) { diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs index d14c503d..42ddaad1 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs @@ -7,16 +7,15 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.OpenComponent(0); - builder.AddAttribute(1, "ChildContent", (Microsoft.AspNetCore.Blazor.RenderFragment)((context) => (builder2) => { + builder.AddAttribute(1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((context) => (builder2) => { builder2.AddContent(2, context); } )); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.ir.txt index eb9f83e6..d10b873f 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.ir.txt @@ -4,9 +4,8 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs index 906e035a..6f9059be 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs @@ -7,16 +7,15 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.OpenComponent(0); - builder.AddAttribute(1, "StringProperty", Microsoft.AspNetCore.Blazor.Components.RuntimeHelpers.TypeCheck(42.ToString())); + builder.AddAttribute(1, "StringProperty", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck(42.ToString())); builder.CloseComponent(); } #pragma warning restore 1998 diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.ir.txt index 5a54d6f7..4f55ddf2 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.ir.txt @@ -4,9 +4,8 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs index 5bbf681f..cac7b047 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs @@ -7,17 +7,16 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.OpenComponent(0); builder.AddAttribute(1, "MyAttr", "abc"); - builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Blazor.RenderFragment)((context) => (builder2) => { + builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((context) => (builder2) => { builder2.AddContent(3, "Some text"); builder2.OpenElement(4, "some-child"); builder2.AddAttribute(5, "a", "1"); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.ir.txt index d5911f9d..fea8c428 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.ir.txt @@ -4,9 +4,8 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs index 476e4d41..b8025302 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs @@ -7,17 +7,16 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.OpenComponent(0); builder.AddAttribute(1, "MyAttr", "abc"); - builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Blazor.RenderFragment)((item) => (builder2) => { + builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((item) => (builder2) => { builder2.AddContent(3, "\n Some text"); builder2.OpenElement(4, "some-child"); builder2.AddAttribute(5, "a", "1"); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.ir.txt index 611158ed..c08d7061 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.ir.txt @@ -4,9 +4,8 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs index 476e4d41..b8025302 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs @@ -7,17 +7,16 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.OpenComponent(0); builder.AddAttribute(1, "MyAttr", "abc"); - builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Blazor.RenderFragment)((item) => (builder2) => { + builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((item) => (builder2) => { builder2.AddContent(3, "\n Some text"); builder2.OpenElement(4, "some-child"); builder2.AddAttribute(5, "a", "1"); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.ir.txt index 4e5e1bd4..f5d06e56 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.ir.txt @@ -4,9 +4,8 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs index d68edeb4..6d455d9e 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs @@ -7,16 +7,15 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.OpenComponent(0); - builder.AddAttribute(1, "OnClick", new System.Action(e => { Increment(); })); + builder.AddAttribute(1, "OnClick", new System.Action(e => { Increment(); })); builder.CloseComponent(); } #pragma warning restore 1998 diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.ir.txt index 0d85b52d..650e237e 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.ir.txt @@ -4,9 +4,8 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt index 44058370..1e331a5d 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt @@ -5,7 +5,7 @@ Source Location: (96:3,12 [87] x:\dir\subdir\Test\TestComponent.cshtml) counter++; } | -Generated Location: (941:23,12 [87] ) +Generated Location: (893:22,12 [87] ) | private int counter; private void Increment() { diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs index 41b63cea..2e994509 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs @@ -7,12 +7,11 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.OpenComponent(0); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.ir.txt index b74005e4..81e15493 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.ir.txt @@ -4,9 +4,8 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs index f88b44d6..d3956e6d 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs @@ -7,14 +7,13 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - [Microsoft.AspNetCore.Blazor.Components.RouteAttribute("/MyPage")] - [Microsoft.AspNetCore.Blazor.Components.RouteAttribute("/AnotherRoute/{id}")] - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + [Microsoft.AspNetCore.Components.RouteAttribute("/MyPage")] + [Microsoft.AspNetCore.Components.RouteAttribute("/AnotherRoute/{id}")] + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.OpenComponent(0); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.ir.txt index be5e5120..5ed15625 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.ir.txt @@ -4,11 +4,10 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components RouteAttributeExtensionNode - - /MyPage RouteAttributeExtensionNode - - /AnotherRoute/{id} - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs index ecb30fed..5fd12339 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs @@ -7,19 +7,18 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.OpenComponent(0); - builder.AddAttribute(1, "IntProperty", Microsoft.AspNetCore.Blazor.Components.RuntimeHelpers.TypeCheck(123)); - builder.AddAttribute(2, "BoolProperty", Microsoft.AspNetCore.Blazor.Components.RuntimeHelpers.TypeCheck(true)); + builder.AddAttribute(1, "IntProperty", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck(123)); + builder.AddAttribute(2, "BoolProperty", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck(true)); builder.AddAttribute(3, "StringProperty", "My string"); - builder.AddAttribute(4, "ObjectProperty", Microsoft.AspNetCore.Blazor.Components.RuntimeHelpers.TypeCheck(new SomeType())); + builder.AddAttribute(4, "ObjectProperty", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck(new SomeType())); builder.CloseComponent(); } #pragma warning restore 1998 diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.ir.txt index c7fe2809..e56cec3e 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.ir.txt @@ -4,9 +4,8 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs index 5ec08178..4bf707b8 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs @@ -7,16 +7,15 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.OpenComponent(0); - builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Blazor.Components.BindMethods.GetEventHandlerValue(OnClick)); + builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue(OnClick)); builder.CloseComponent(); } #pragma warning restore 1998 diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt index b432de29..85be3264 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.ir.txt @@ -4,16 +4,15 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); ComponentExtensionNode - (31:1,0 [37] x:\dir\subdir\Test\TestComponent.cshtml) - DynamicElement - Test.DynamicElement ComponentAttributeExtensionNode - (56:1,25 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick - onclick CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetEventHandlerValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue( IntermediateToken - (57:1,26 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick IntermediateToken - - CSharp - ) CSharpCode - (84:3,12 [62] x:\dir\subdir\Test\TestComponent.cshtml) diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt index 4d992837..9ddaeafa 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt @@ -2,7 +2,7 @@ Source Location: (84:3,12 [62] x:\dir\subdir\Test\TestComponent.cshtml) | private Action OnClick { get; set; } | -Generated Location: (989:23,12 [62] ) +Generated Location: (934:22,12 [62] ) | private Action OnClick { get; set; } | diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs index 6bbff7fb..adcb3573 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs @@ -7,16 +7,15 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.OpenComponent(0); - builder.AddAttribute(1, "Coolness", Microsoft.AspNetCore.Blazor.Components.RuntimeHelpers.TypeCheck("very-cool")); + builder.AddAttribute(1, "Coolness", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck("very-cool")); builder.CloseComponent(); } #pragma warning restore 1998 diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.ir.txt index 0652ded4..511caa57 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.ir.txt @@ -4,9 +4,8 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs index 24fa6212..743a1d25 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs @@ -7,12 +7,11 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.AddMarkupContent(0, "

Item1

\n"); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.ir.txt index 1748cec2..19ae9306 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.ir.txt @@ -4,27 +4,26 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (1:0,1 [36] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (1:0,1 [40] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); HtmlBlock - -

Item1

\n - CSharpCode - (94:5,1 [34] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (94:5,1 [34] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - foreach (var item2 in Items2)\n{\n - HtmlContent - (128:7,0 [4] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (128:7,0 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - - HtmlElement - (132:7,4 [40] x:\dir\subdir\Test\TestComponent.cshtml) - p - HtmlContent - (135:7,7 [6] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (135:7,7 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - CSharpExpression - (142:8,5 [19] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (142:8,5 [19] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ChildContent(item2) - HtmlContent - (161:8,24 [7] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (161:8,24 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Html - ;\n - HtmlContent - (172:9,8 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (172:9,8 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n - CSharpCode - (174:10,0 [3] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (174:10,0 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - }\n - CSharpCode - (189:11,12 [164] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (189:11,12 [164] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n [Parameter] TItem1 Item1 { get; set; }\n [Parameter] List Items2 { get; set; }\n [Parameter] RenderFragment ChildContent { get; set; }\n + CSharpCode - (98:5,1 [34] x:\dir\subdir\Test\TestComponent.cshtml) + IntermediateToken - (98:5,1 [34] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - foreach (var item2 in Items2)\n{\n + HtmlContent - (132:7,0 [4] x:\dir\subdir\Test\TestComponent.cshtml) + IntermediateToken - (132:7,0 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - + HtmlElement - (136:7,4 [40] x:\dir\subdir\Test\TestComponent.cshtml) - p + HtmlContent - (139:7,7 [6] x:\dir\subdir\Test\TestComponent.cshtml) + IntermediateToken - (139:7,7 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n + CSharpExpression - (146:8,5 [19] x:\dir\subdir\Test\TestComponent.cshtml) + IntermediateToken - (146:8,5 [19] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ChildContent(item2) + HtmlContent - (165:8,24 [7] x:\dir\subdir\Test\TestComponent.cshtml) + IntermediateToken - (165:8,24 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Html - ;\n + HtmlContent - (176:9,8 [2] x:\dir\subdir\Test\TestComponent.cshtml) + IntermediateToken - (176:9,8 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n + CSharpCode - (178:10,0 [3] x:\dir\subdir\Test\TestComponent.cshtml) + IntermediateToken - (178:10,0 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - }\n + CSharpCode - (193:11,12 [164] x:\dir\subdir\Test\TestComponent.cshtml) + IntermediateToken - (193:11,12 [164] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n [Parameter] TItem1 Item1 { get; set; }\n [Parameter] List Items2 { get; set; }\n [Parameter] RenderFragment ChildContent { get; set; }\n diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt index be6729fc..ce3eb9c9 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt @@ -1,26 +1,26 @@ -Source Location: (94:5,1 [34] x:\dir\subdir\Test\TestComponent.cshtml) +Source Location: (98:5,1 [34] x:\dir\subdir\Test\TestComponent.cshtml) |foreach (var item2 in Items2) { | -Generated Location: (731:20,1 [34] ) +Generated Location: (679:19,1 [34] ) |foreach (var item2 in Items2) { | -Source Location: (174:10,0 [3] x:\dir\subdir\Test\TestComponent.cshtml) +Source Location: (178:10,0 [3] x:\dir\subdir\Test\TestComponent.cshtml) |} | -Generated Location: (1163:34,0 [3] ) +Generated Location: (1111:33,0 [3] ) |} | -Source Location: (189:11,12 [164] x:\dir\subdir\Test\TestComponent.cshtml) +Source Location: (193:11,12 [164] x:\dir\subdir\Test\TestComponent.cshtml) | [Parameter] TItem1 Item1 { get; set; } [Parameter] List Items2 { get; set; } [Parameter] RenderFragment ChildContent { get; set; } | -Generated Location: (1310:41,12 [164] ) +Generated Location: (1258:40,12 [164] ) | [Parameter] TItem1 Item1 { get; set; } [Parameter] List Items2 { get; set; } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs index 83cfd534..1a8e86ca 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs @@ -7,12 +7,11 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.AddMarkupContent(0, "
\n
"); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Component_WithDocType/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Component_WithDocType/TestComponent.ir.txt index 4fdad553..52917e45 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Component_WithDocType/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Component_WithDocType/TestComponent.ir.txt @@ -4,9 +4,8 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs index e480e463..d3fc981a 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs @@ -7,12 +7,11 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.OpenComponent(0); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt index 985d13d3..c79c0afd 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Component_WithRef/TestComponent.ir.txt @@ -4,9 +4,8 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt index fad95126..ea8d5c68 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt @@ -1,6 +1,6 @@ Source Location: (70:1,39 [10] x:\dir\subdir\Test\TestComponent.cshtml) |myInstance| -Generated Location: (940:22,39 [10] ) +Generated Location: (888:21,39 [10] ) |myInstance| Source Location: (119:3,12 [104] x:\dir\subdir\Test\TestComponent.cshtml) @@ -8,7 +8,7 @@ Source Location: (119:3,12 [104] x:\dir\subdir\Test\TestComponent.cshtml) private Test.MyComponent myInstance; public void Foo() { System.GC.KeepAlive(myInstance); } | -Generated Location: (1194:32,12 [104] ) +Generated Location: (1142:31,12 [104] ) | private Test.MyComponent myInstance; public void Foo() { System.GC.KeepAlive(myInstance); } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs index 644cfa4c..60c7ebc3 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs @@ -7,17 +7,16 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.OpenComponent(0); builder.AddAttribute(1, "SomeProp", "val"); - builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Blazor.RenderFragment)((builder2) => { + builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { builder2.AddContent(3, "\n Some "); builder2.AddMarkupContent(4, "further content\n"); } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt index b3af27df..8407ec83 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.ir.txt @@ -4,9 +4,8 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt index b7b4f8d3..9dbf41a9 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt @@ -1,6 +1,6 @@ Source Location: (49:1,18 [10] x:\dir\subdir\Test\TestComponent.cshtml) |myInstance| -Generated Location: (1131:27,18 [10] ) +Generated Location: (1083:26,18 [10] ) |myInstance| Source Location: (143:5,12 [104] x:\dir\subdir\Test\TestComponent.cshtml) @@ -8,7 +8,7 @@ Source Location: (143:5,12 [104] x:\dir\subdir\Test\TestComponent.cshtml) private Test.MyComponent myInstance; public void Foo() { System.GC.KeepAlive(myInstance); } | -Generated Location: (1385:37,12 [104] ) +Generated Location: (1337:36,12 [104] ) | private Test.MyComponent myInstance; public void Foo() { System.GC.KeepAlive(myInstance); } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs index a1da1779..076c2445 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Element_WithRef/TestComponent.codegen.cs @@ -7,12 +7,11 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.OpenElement(0, "elem"); @@ -32,7 +31,7 @@ namespace Test #pragma warning restore 1998 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - private Microsoft.AspNetCore.Blazor.ElementRef myElem; + private Microsoft.AspNetCore.Components.ElementRef myElem; public void Foo() { System.GC.KeepAlive(myElem); } #line default diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt index 7519b928..3becd394 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Element_WithRef/TestComponent.ir.txt @@ -4,9 +4,8 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); @@ -20,5 +19,5 @@ Document - HtmlAttribute - - attributeafter=" - " HtmlAttributeValue - (60:0,60 [5] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (60:0,60 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - after - CSharpCode - (95:2,12 [118] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (95:2,12 [118] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n private Microsoft.AspNetCore.Blazor.ElementRef myElem;\n public void Foo() { System.GC.KeepAlive(myElem); }\n + CSharpCode - (95:2,12 [122] x:\dir\subdir\Test\TestComponent.cshtml) + IntermediateToken - (95:2,12 [122] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n private Microsoft.AspNetCore.Components.ElementRef myElem;\n public void Foo() { System.GC.KeepAlive(myElem); }\n diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt index 70f81521..71cbebbe 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Element_WithRef/TestComponent.mappings.txt @@ -1,16 +1,16 @@ Source Location: (36:0,36 [6] x:\dir\subdir\Test\TestComponent.cshtml) |myElem| -Generated Location: (931:22,36 [6] ) +Generated Location: (879:21,36 [6] ) |myElem| -Source Location: (95:2,12 [118] x:\dir\subdir\Test\TestComponent.cshtml) +Source Location: (95:2,12 [122] x:\dir\subdir\Test\TestComponent.cshtml) | - private Microsoft.AspNetCore.Blazor.ElementRef myElem; + private Microsoft.AspNetCore.Components.ElementRef myElem; public void Foo() { System.GC.KeepAlive(myElem); } | -Generated Location: (1206:33,12 [118] ) +Generated Location: (1154:32,12 [122] ) | - private Microsoft.AspNetCore.Blazor.ElementRef myElem; + private Microsoft.AspNetCore.Components.ElementRef myElem; public void Foo() { System.GC.KeepAlive(myElem); } | diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Element_WithRef_CSharpReservedWord/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Element_WithRef_CSharpReservedWord/TestComponent.codegen.cs deleted file mode 100644 index da2342d5..00000000 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Element_WithRef_CSharpReservedWord/TestComponent.codegen.cs +++ /dev/null @@ -1,36 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.OpenElement(0, "elem"); - builder.AddElementReferenceCapture(1, (__value) => { -#line 1 "x:\dir\subdir\Test\TestComponent.cshtml" - @class = __value; - -#line default -#line hidden - } - ); - builder.CloseElement(); - } - #pragma warning restore 1998 -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - - private Microsoft.AspNetCore.Blazor.ElementRef @class; - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Element_WithRef_CSharpReservedWord/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Element_WithRef_CSharpReservedWord/TestComponent.ir.txt deleted file mode 100644 index e84d69e8..00000000 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Element_WithRef_CSharpReservedWord/TestComponent.ir.txt +++ /dev/null @@ -1,17 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - - IntermediateToken - - Html - - CSharpCode - (40:2,12 [62] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (40:2,12 [62] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n private Microsoft.AspNetCore.Blazor.ElementRef @class;\n diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Element_WithRef_CSharpReservedWord/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Element_WithRef_CSharpReservedWord/TestComponent.mappings.txt deleted file mode 100644 index 41398570..00000000 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Element_WithRef_CSharpReservedWord/TestComponent.mappings.txt +++ /dev/null @@ -1,14 +0,0 @@ -Source Location: (13:0,13 [6] x:\dir\subdir\Test\TestComponent.cshtml) -|@class| -Generated Location: (685:18,13 [6] ) -|@class| - -Source Location: (40:2,12 [62] x:\dir\subdir\Test\TestComponent.cshtml) -| - private Microsoft.AspNetCore.Blazor.ElementRef @class; -| -Generated Location: (915:28,12 [62] ) -| - private Microsoft.AspNetCore.Blazor.ElementRef @class; -| - diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Element_WithRef_LeadingAt/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Element_WithRef_LeadingAt/TestComponent.codegen.cs deleted file mode 100644 index 3f8cdcf7..00000000 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Element_WithRef_LeadingAt/TestComponent.codegen.cs +++ /dev/null @@ -1,39 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.OpenElement(0, "elem"); - builder.AddAttribute(1, "attributebefore", "before"); - builder.AddAttribute(2, "attributeafter", "after"); - builder.AddElementReferenceCapture(3, (__value) => { -#line 1 "x:\dir\subdir\Test\TestComponent.cshtml" - myElem = __value; - -#line default -#line hidden - } - ); - builder.AddContent(4, "Hello"); - builder.CloseElement(); - } - #pragma warning restore 1998 -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - - private Microsoft.AspNetCore.Blazor.ElementRef myElem; - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Element_WithRef_LeadingAt/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Element_WithRef_LeadingAt/TestComponent.ir.txt deleted file mode 100644 index 6025976c..00000000 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Element_WithRef_LeadingAt/TestComponent.ir.txt +++ /dev/null @@ -1,29 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - - IntermediateToken - - Html - - HtmlContent - (68:0,68 [5] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (68:0,68 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hello - HtmlContent - - IntermediateToken - - Html - - CSharpCode - (96:2,12 [62] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (96:2,12 [62] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n private Microsoft.AspNetCore.Blazor.ElementRef myElem;\n diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Element_WithRef_LeadingAt/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Element_WithRef_LeadingAt/TestComponent.mappings.txt deleted file mode 100644 index d2e91ed9..00000000 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Element_WithRef_LeadingAt/TestComponent.mappings.txt +++ /dev/null @@ -1,14 +0,0 @@ -Source Location: (37:0,37 [6] x:\dir\subdir\Test\TestComponent.cshtml) -|myElem| -Generated Location: (841:20,37 [6] ) -|myElem| - -Source Location: (96:2,12 [62] x:\dir\subdir\Test\TestComponent.cshtml) -| - private Microsoft.AspNetCore.Blazor.ElementRef myElem; -| -Generated Location: (1116:31,12 [62] ) -| - private Microsoft.AspNetCore.Blazor.ElementRef myElem; -| - diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Element_WithRef_NoLeadingAt/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Element_WithRef_NoLeadingAt/TestComponent.codegen.cs deleted file mode 100644 index 6bbcfb72..00000000 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Element_WithRef_NoLeadingAt/TestComponent.codegen.cs +++ /dev/null @@ -1,39 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.OpenElement(0, "elem"); - builder.AddAttribute(1, "attributebefore", "before"); - builder.AddAttribute(2, "attributeafter", "after"); - builder.AddElementReferenceCapture(3, (__value) => { -#line 1 "x:\dir\subdir\Test\TestComponent.cshtml" - myElem = __value; - -#line default -#line hidden - } - ); - builder.AddContent(4, "Hello"); - builder.CloseElement(); - } - #pragma warning restore 1998 -#line 3 "x:\dir\subdir\Test\TestComponent.cshtml" - - private Microsoft.AspNetCore.Blazor.ElementRef myElem; - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Element_WithRef_NoLeadingAt/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Element_WithRef_NoLeadingAt/TestComponent.ir.txt deleted file mode 100644 index 1351d28e..00000000 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Element_WithRef_NoLeadingAt/TestComponent.ir.txt +++ /dev/null @@ -1,29 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - HtmlContent - - IntermediateToken - - Html - - HtmlContent - (67:0,67 [5] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (67:0,67 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hello - HtmlContent - - IntermediateToken - - Html - - CSharpCode - (95:2,12 [62] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (95:2,12 [62] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n private Microsoft.AspNetCore.Blazor.ElementRef myElem;\n diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Element_WithRef_NoLeadingAt/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Element_WithRef_NoLeadingAt/TestComponent.mappings.txt deleted file mode 100644 index 6010c410..00000000 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Element_WithRef_NoLeadingAt/TestComponent.mappings.txt +++ /dev/null @@ -1,14 +0,0 @@ -Source Location: (36:0,36 [6] x:\dir\subdir\Test\TestComponent.cshtml) -|myElem| -Generated Location: (840:20,36 [6] ) -|myElem| - -Source Location: (95:2,12 [62] x:\dir\subdir\Test\TestComponent.cshtml) -| - private Microsoft.AspNetCore.Blazor.ElementRef myElem; -| -Generated Location: (1115:31,12 [62] ) -| - private Microsoft.AspNetCore.Blazor.ElementRef myElem; -| - diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs index 4cb8beb4..daf7ed1d 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.codegen.cs @@ -7,16 +7,15 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.OpenElement(0, "input"); - builder.AddAttribute(1, "onfocus", Microsoft.AspNetCore.Blazor.Components.BindMethods.GetEventHandlerValue("alert(\"Test\");")); + builder.AddAttribute(1, "onfocus", Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue("alert(\"Test\");")); builder.CloseElement(); } #pragma warning restore 1998 diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.ir.txt index 2141e787..3d504c06 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandlerTagHelper_EscapeQuotes/TestComponent.ir.txt @@ -4,15 +4,14 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); HtmlElement - (0:0,0 [34] x:\dir\subdir\Test\TestComponent.cshtml) - input HtmlAttribute - (16:0,16 [14] x:\dir\subdir\Test\TestComponent.cshtml) - onfocus=" - " CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetEventHandlerValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue( IntermediateToken - - CSharp - "alert(\"Test\");" IntermediateToken - - CSharp - ) diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs index b8e2ec90..8d291c9a 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.codegen.cs @@ -7,16 +7,15 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.OpenElement(0, "input"); - builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Blazor.Components.BindMethods.GetEventHandlerValue(OnClick)); + builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue(OnClick)); builder.CloseElement(); } #pragma warning restore 1998 diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt index 0198f3fd..db06c4f0 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.ir.txt @@ -4,16 +4,15 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); HtmlElement - (0:0,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input HtmlAttribute - (16:0,16 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - " CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetEventHandlerValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue( IntermediateToken - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick IntermediateToken - - CSharp - ) CSharpCode - (42:1,12 [44] x:\dir\subdir\Test\TestComponent.cshtml) diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt index 66985d56..35125aed 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_ArbitraryEventName_WithEventArgsMethodGroup/TestComponent.mappings.txt @@ -3,7 +3,7 @@ Source Location: (42:1,12 [44] x:\dir\subdir\Test\TestComponent.cshtml) void OnClick(UIEventArgs e) { } | -Generated Location: (973:23,12 [44] ) +Generated Location: (918:22,12 [44] ) | void OnClick(UIEventArgs e) { } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs index 61f2ee88..0848a804 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.codegen.cs @@ -7,16 +7,15 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.OpenElement(0, "input"); - builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Blazor.Components.BindMethods.GetEventHandlerValue(OnClick)); + builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue(OnClick)); builder.CloseElement(); } #pragma warning restore 1998 diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt index 2e944a34..1d316a8f 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.ir.txt @@ -4,16 +4,15 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); HtmlElement - (0:0,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input HtmlAttribute - (16:0,16 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - " CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetEventHandlerValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue( IntermediateToken - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick IntermediateToken - - CSharp - ) CSharpCode - (42:1,12 [49] x:\dir\subdir\Test\TestComponent.cshtml) diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt index db716b1e..165e27a7 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithDelegate/TestComponent.mappings.txt @@ -3,7 +3,7 @@ Source Location: (42:1,12 [49] x:\dir\subdir\Test\TestComponent.cshtml) void OnClick(UIMouseEventArgs e) { } | -Generated Location: (973:23,12 [49] ) +Generated Location: (918:22,12 [49] ) | void OnClick(UIMouseEventArgs e) { } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs index 633aa0fc..53546b82 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.codegen.cs @@ -7,16 +7,15 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.OpenElement(0, "input"); - builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Blazor.Components.BindMethods.GetEventHandlerValue(x => { })); + builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue(x => { })); builder.CloseElement(); } #pragma warning restore 1998 diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.ir.txt index ffdd649a..6330618e 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsLambdaDelegate/TestComponent.ir.txt @@ -4,15 +4,14 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); HtmlElement - (0:0,0 [31] x:\dir\subdir\Test\TestComponent.cshtml) - input HtmlAttribute - (16:0,16 [11] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - " CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetEventHandlerValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue( IntermediateToken - (18:0,18 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - x => { } IntermediateToken - - CSharp - ) diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs index 61f2ee88..0848a804 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.codegen.cs @@ -7,16 +7,15 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.OpenElement(0, "input"); - builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Blazor.Components.BindMethods.GetEventHandlerValue(OnClick)); + builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue(OnClick)); builder.CloseElement(); } #pragma warning restore 1998 diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt index 2e944a34..1d316a8f 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.ir.txt @@ -4,16 +4,15 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); HtmlElement - (0:0,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input HtmlAttribute - (16:0,16 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - " CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetEventHandlerValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue( IntermediateToken - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick IntermediateToken - - CSharp - ) CSharpCode - (42:1,12 [49] x:\dir\subdir\Test\TestComponent.cshtml) diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt index db716b1e..165e27a7 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithEventArgsMethodGroup/TestComponent.mappings.txt @@ -3,7 +3,7 @@ Source Location: (42:1,12 [49] x:\dir\subdir\Test\TestComponent.cshtml) void OnClick(UIMouseEventArgs e) { } | -Generated Location: (973:23,12 [49] ) +Generated Location: (918:22,12 [49] ) | void OnClick(UIMouseEventArgs e) { } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs index 633aa0fc..53546b82 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.codegen.cs @@ -7,16 +7,15 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.OpenElement(0, "input"); - builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Blazor.Components.BindMethods.GetEventHandlerValue(x => { })); + builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue(x => { })); builder.CloseElement(); } #pragma warning restore 1998 diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt index ffdd649a..6330618e 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithLambdaDelegate/TestComponent.ir.txt @@ -4,15 +4,14 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); HtmlElement - (0:0,0 [31] x:\dir\subdir\Test\TestComponent.cshtml) - input HtmlAttribute - (16:0,16 [11] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - " CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetEventHandlerValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue( IntermediateToken - (18:0,18 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - x => { } IntermediateToken - - CSharp - ) diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs index 43352b22..83bd3959 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.codegen.cs @@ -7,16 +7,15 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.OpenElement(0, "input"); - builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Blazor.Components.BindMethods.GetEventHandlerValue(OnClick)); + builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue(OnClick)); builder.CloseElement(); } #pragma warning restore 1998 diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt index 30f97f9d..cac45e62 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.ir.txt @@ -4,16 +4,15 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); HtmlElement - (0:0,0 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input HtmlAttribute - (16:0,16 [8] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - " CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetEventHandlerValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue( IntermediateToken - (17:0,17 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick IntermediateToken - - CSharp - ) CSharpCode - (42:1,12 [31] x:\dir\subdir\Test\TestComponent.cshtml) diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt index 158115df..c009c34e 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgMethodGroup/TestComponent.mappings.txt @@ -3,7 +3,7 @@ Source Location: (42:1,12 [31] x:\dir\subdir\Test\TestComponent.cshtml) void OnClick() { } | -Generated Location: (973:23,12 [31] ) +Generated Location: (918:22,12 [31] ) | void OnClick() { } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs index 091c368a..160ee3f2 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.codegen.cs @@ -7,16 +7,15 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.OpenElement(0, "input"); - builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Blazor.Components.BindMethods.GetEventHandlerValue(() => { })); + builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue(() => { })); builder.CloseElement(); } #pragma warning restore 1998 diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.ir.txt index f2581c1f..64b75207 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithNoArgsLambdaDelegate/TestComponent.ir.txt @@ -4,15 +4,14 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); HtmlElement - (0:0,0 [32] x:\dir\subdir\Test\TestComponent.cshtml) - input HtmlAttribute - (16:0,16 [12] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - " CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetEventHandlerValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue( IntermediateToken - (18:0,18 [9] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - () => { } IntermediateToken - - CSharp - ) diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs index 3a18e581..b548a046 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.codegen.cs @@ -7,16 +7,15 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.OpenElement(0, "input"); - builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Blazor.Components.BindMethods.GetEventHandlerValue("foo")); + builder.AddAttribute(1, "onclick", Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue("foo")); builder.CloseElement(); } #pragma warning restore 1998 diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.ir.txt index ea7f271a..dfdc050a 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/EventHandler_OnElement_WithString/TestComponent.ir.txt @@ -4,15 +4,14 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); HtmlElement - (0:0,0 [23] x:\dir\subdir\Test\TestComponent.cshtml) - input HtmlAttribute - (16:0,16 [3] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - " CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetEventHandlerValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue( IntermediateToken - - CSharp - "foo" IntermediateToken - - CSharp - ) diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.codegen.cs index 5d73ee84..006b0087 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.codegen.cs @@ -7,16 +7,15 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.OpenComponent>(0); - builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Blazor.Components.RuntimeHelpers.TypeCheck(3)); + builder.AddAttribute(1, "Item", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck(3)); builder.AddComponentReferenceCapture(2, (__value) => { #line 2 "x:\dir\subdir\Test\TestComponent.cshtml" _my = (Test.MyComponent)__value; diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.ir.txt index 0030e2ca..32c963b7 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.ir.txt @@ -4,9 +4,8 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.mappings.txt index e28ff373..527982b0 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/GenericComponent_WithComponentRef/TestComponent.mappings.txt @@ -1,6 +1,6 @@ Source Location: (68:1,37 [3] x:\dir\subdir\Test\TestComponent.cshtml) |_my| -Generated Location: (938:21,37 [3] ) +Generated Location: (879:20,37 [3] ) |_my| Source Location: (91:3,12 [90] x:\dir\subdir\Test\TestComponent.cshtml) @@ -8,7 +8,7 @@ Source Location: (91:3,12 [90] x:\dir\subdir\Test\TestComponent.cshtml) private MyComponent _my; public void Foo() { System.GC.KeepAlive(_my); } | -Generated Location: (1190:31,12 [90] ) +Generated Location: (1131:30,12 [90] ) | private MyComponent _my; public void Foo() { System.GC.KeepAlive(_my); } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.codegen.cs index 9fd36357..c299061c 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.codegen.cs @@ -7,12 +7,11 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); __Blazor.Test.TestComponent.TypeInference.CreateMyComponent_0(builder, 0, 1, 3, 2, (__value) => { @@ -39,7 +38,7 @@ namespace __Blazor.Test.TestComponent #line hidden internal static class TypeInference { - public static void CreateMyComponent_0(global::Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::System.Action> __arg1) + public static void CreateMyComponent_0(global::Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder, int seq, int __seq0, TItem __arg0, int __seq1, global::System.Action> __arg1) { builder.OpenComponent>(seq); builder.AddAttribute(__seq0, "Item", __arg0); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.ir.txt index 597ed9c7..ec12816d 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.ir.txt @@ -4,9 +4,8 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.mappings.txt index d28faa79..5803b437 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference/TestComponent.mappings.txt @@ -1,6 +1,6 @@ Source Location: (58:1,27 [3] x:\dir\subdir\Test\TestComponent.cshtml) |_my| -Generated Location: (790:19,27 [3] ) +Generated Location: (738:18,27 [3] ) |_my| Source Location: (81:3,12 [90] x:\dir\subdir\Test\TestComponent.cshtml) @@ -8,7 +8,7 @@ Source Location: (81:3,12 [90] x:\dir\subdir\Test\TestComponent.cshtml) private MyComponent _my; public void Foo() { System.GC.KeepAlive(_my); } | -Generated Location: (980:28,12 [90] ) +Generated Location: (928:27,12 [90] ) | private MyComponent _my; public void Foo() { System.GC.KeepAlive(_my); } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs index a6f8fc82..7dfa3b30 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs @@ -7,12 +7,11 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.AddContent(0, "My value"); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt index 77ccff6f..7b9697cf 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/LeadingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt @@ -4,9 +4,8 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs index 64d828bb..4df487e6 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs @@ -7,12 +7,11 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.OpenComponent(0); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.ir.txt index a1d8d8b7..6f909048 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.ir.txt @@ -4,9 +4,8 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs index 3d1bc7f1..edf81b6c 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.codegen.cs @@ -7,12 +7,11 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.AddMarkupContent(0, "

Hello

"); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.ir.txt index 79e8e15d..50bb1a4a 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/LeadingWhiteSpace_WithDirective/TestComponent.ir.txt @@ -4,9 +4,8 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs index 84e1c9c5..6032dbfa 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs @@ -7,20 +7,19 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.OpenComponent(0); - builder.AddAttribute(1, "Header", (Microsoft.AspNetCore.Blazor.RenderFragment)((builder2) => { + builder.AddAttribute(1, "Header", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { builder2.AddContent(2, "Hi!"); } )); - builder.AddAttribute(3, "Footer", (Microsoft.AspNetCore.Blazor.RenderFragment)((builder2) => { + builder.AddAttribute(3, "Footer", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { builder2.AddContent(4, "bye!"); } )); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.ir.txt index d7e62756..ad902f45 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.ir.txt @@ -4,9 +4,8 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter/TestComponent.codegen.cs deleted file mode 100644 index 918cb0be..00000000 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter/TestComponent.codegen.cs +++ /dev/null @@ -1,40 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - RenderFragment template = - -#line default -#line hidden - (builder2) => { - builder2.OpenElement(0, "div"); - builder2.AddContent(1, context.Name); - builder2.CloseElement(); - } -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - ; - -#line default -#line hidden - builder.OpenComponent(2); - builder.AddAttribute(3, "PersonTemplate", new Microsoft.AspNetCore.Blazor.RenderFragment(template)); - builder.CloseComponent(); - } - #pragma warning restore 1998 - } -} -#pragma warning restore 1591 diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter/TestComponent.ir.txt deleted file mode 100644 index 123e499a..00000000 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter/TestComponent.ir.txt +++ /dev/null @@ -1,24 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - CSharpCode - (35:1,2 [35] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (35:1,2 [35] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - RenderFragment template = - Template - (71:1,38 [23] x:\dir\subdir\Test\TestComponent.cshtml) - HtmlElement - (71:1,38 [24] x:\dir\subdir\Test\TestComponent.cshtml) - div - CSharpExpression - (77:1,44 [12] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (77:1,44 [12] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context.Name - CSharpCode - (95:1,62 [2] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (95:1,62 [2] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ; - ComponentExtensionNode - (100:2,0 [41] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent - Test.MyComponent - ComponentAttributeExtensionNode - (129:2,29 [9] x:\dir\subdir\Test\TestComponent.cshtml) - PersonTemplate - PersonTemplate - CSharpExpression - (130:2,30 [8] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (130:2,30 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - template diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter/TestComponent.mappings.txt deleted file mode 100644 index fe05054a..00000000 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter/TestComponent.mappings.txt +++ /dev/null @@ -1,10 +0,0 @@ -Source Location: (35:1,2 [35] x:\dir\subdir\Test\TestComponent.cshtml) -| RenderFragment template = | -Generated Location: (654:18,2 [35] ) -| RenderFragment template = | - -Source Location: (95:1,62 [2] x:\dir\subdir\Test\TestComponent.cshtml) -|; | -Generated Location: (1025:28,62 [2] ) -|; | - diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs index f805d532..8068fdf5 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs @@ -7,12 +7,11 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); #line 2 "x:\dir\subdir\Test\TestComponent.cshtml" @@ -34,7 +33,7 @@ namespace Test #line default #line hidden builder.OpenComponent(5); - builder.AddAttribute(6, "Template", new Microsoft.AspNetCore.Blazor.RenderFragment(template)); + builder.AddAttribute(6, "Template", new Microsoft.AspNetCore.Components.RenderFragment(template)); builder.CloseComponent(); } #pragma warning restore 1998 diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.ir.txt index 9fa7ec52..e7d96bc2 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.ir.txt @@ -4,9 +4,8 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt index 23134836..1963f1cf 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt @@ -1,10 +1,10 @@ Source Location: (35:1,2 [54] x:\dir\subdir\Test\TestComponent.cshtml) | RenderFragment template = (context) => | -Generated Location: (654:18,2 [54] ) +Generated Location: (602:17,2 [54] ) | RenderFragment template = (context) => | Source Location: (140:1,107 [2] x:\dir\subdir\Test\TestComponent.cshtml) |; | -Generated Location: (1248:31,107 [2] ) +Generated Location: (1196:30,107 [2] ) |; | diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs index e5002b78..cbf409e5 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs @@ -7,12 +7,11 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); #line 2 "x:\dir\subdir\Test\TestComponent.cshtml" @@ -24,7 +23,7 @@ namespace Test (builder2) => { builder2.OpenElement(0, "div"); builder2.OpenComponent(1); - builder2.AddAttribute(2, "Name", Microsoft.AspNetCore.Blazor.Components.RuntimeHelpers.TypeCheck(person.Name)); + builder2.AddAttribute(2, "Name", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck(person.Name)); builder2.CloseComponent(); builder2.CloseElement(); } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.ir.txt index a69b6bbf..c7f75745 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.ir.txt @@ -4,9 +4,8 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt index d25e4e29..acde1a8a 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt @@ -1,14 +1,14 @@ Source Location: (35:1,2 [45] x:\dir\subdir\Test\TestComponent.cshtml) | RenderFragment p = (person) => | -Generated Location: (654:18,2 [45] ) +Generated Location: (602:17,2 [45] ) | RenderFragment p = (person) => | Source Location: (126:2,89 [3] x:\dir\subdir\Test\TestComponent.cshtml) |; | -Generated Location: (1257:31,89 [3] ) +Generated Location: (1198:30,89 [3] ) |; | @@ -19,7 +19,7 @@ Source Location: (144:4,12 [76] x:\dir\subdir\Test\TestComponent.cshtml) public string Name { get; set; } } | -Generated Location: (1403:38,12 [76] ) +Generated Location: (1344:37,12 [76] ) | class Person { diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs index 0775f607..75cf31b3 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs @@ -7,12 +7,11 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); #line 2 "x:\dir\subdir\Test\TestComponent.cshtml" @@ -24,7 +23,7 @@ namespace Test (builder2) => { builder2.OpenElement(0, "div"); builder2.OpenComponent(1); - builder2.AddAttribute(2, "Name", Microsoft.AspNetCore.Blazor.Components.RuntimeHelpers.TypeCheck(person.Name)); + builder2.AddAttribute(2, "Name", Microsoft.AspNetCore.Components.RuntimeHelpers.TypeCheck(person.Name)); builder2.CloseComponent(); builder2.CloseElement(); } @@ -34,7 +33,7 @@ namespace Test #line default #line hidden builder.OpenComponent(3); - builder.AddAttribute(4, "ChildContent", (Microsoft.AspNetCore.Blazor.RenderFragment)((builder2) => { + builder.AddAttribute(4, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((builder2) => { builder2.AddContent(5, "\n"); builder2.AddContent(6, "hello, world!"); builder2.AddContent(7, "\n"); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.ir.txt index 359c73d6..0ec2d910 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.ir.txt @@ -4,9 +4,8 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt index d9fd8133..c0db477d 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt @@ -1,14 +1,14 @@ Source Location: (35:1,2 [45] x:\dir\subdir\Test\TestComponent.cshtml) | RenderFragment p = (person) => | -Generated Location: (654:18,2 [45] ) +Generated Location: (602:17,2 [45] ) | RenderFragment p = (person) => | Source Location: (126:2,89 [3] x:\dir\subdir\Test\TestComponent.cshtml) |; | -Generated Location: (1257:31,89 [3] ) +Generated Location: (1198:30,89 [3] ) |; | @@ -19,7 +19,7 @@ Source Location: (197:8,12 [76] x:\dir\subdir\Test\TestComponent.cshtml) public string Name { get; set; } } | -Generated Location: (1797:46,12 [76] ) +Generated Location: (1742:45,12 [76] ) | class Person { diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs index 6b858cb8..dcb42787 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs @@ -7,12 +7,11 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); #line 2 "x:\dir\subdir\Test\TestComponent.cshtml" @@ -31,7 +30,7 @@ namespace Test #line default #line hidden builder.OpenComponent(2); - builder.AddAttribute(3, "PersonTemplate", new Microsoft.AspNetCore.Blazor.RenderFragment(template)); + builder.AddAttribute(3, "PersonTemplate", new Microsoft.AspNetCore.Components.RenderFragment(template)); builder.CloseComponent(); } #pragma warning restore 1998 diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.ir.txt index 319b8714..0d9aff44 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.ir.txt @@ -4,9 +4,8 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt index 5f8bf908..ef572070 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt @@ -1,10 +1,10 @@ Source Location: (35:1,2 [47] x:\dir\subdir\Test\TestComponent.cshtml) | RenderFragment template = (person) => | -Generated Location: (654:18,2 [47] ) +Generated Location: (602:17,2 [47] ) | RenderFragment template = (person) => | Source Location: (106:1,73 [2] x:\dir\subdir\Test\TestComponent.cshtml) |; | -Generated Location: (1047:28,73 [2] ) +Generated Location: (995:27,73 [2] ) |; | diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs index cedb1fbd..a0fa8858 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.codegen.cs @@ -7,12 +7,11 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.AddContent(0, RenderPerson((person) => (builder2) => { diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.ir.txt index 477190a5..37914cc7 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.ir.txt @@ -4,9 +4,8 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt index cfd4eca5..998fa7c2 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_Generic_InImplicitExpression/TestComponent.mappings.txt @@ -7,7 +7,7 @@ Source Location: (65:1,12 [138] x:\dir\subdir\Test\TestComponent.cshtml) object RenderPerson(RenderFragment p) => null; | -Generated Location: (966:26,12 [138] ) +Generated Location: (914:25,12 [138] ) | class Person { diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs index e965d130..333bd6f5 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.codegen.cs @@ -7,12 +7,11 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); #line 1 "x:\dir\subdir\Test\TestComponent.cshtml" diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.ir.txt index f5f71d3c..5a22540d 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.ir.txt @@ -4,9 +4,8 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt index 9e5b2787..fa40ec80 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_InCodeBlock/TestComponent.mappings.txt @@ -1,14 +1,14 @@ Source Location: (2:0,2 [45] x:\dir\subdir\Test\TestComponent.cshtml) | RenderFragment p = (person) => | -Generated Location: (654:18,2 [45] ) +Generated Location: (602:17,2 [45] ) | RenderFragment p = (person) => | Source Location: (71:1,67 [3] x:\dir\subdir\Test\TestComponent.cshtml) |; | -Generated Location: (1039:29,67 [3] ) +Generated Location: (987:28,67 [3] ) |; | @@ -19,7 +19,7 @@ Source Location: (89:3,12 [76] x:\dir\subdir\Test\TestComponent.cshtml) public string Name { get; set; } } | -Generated Location: (1185:36,12 [76] ) +Generated Location: (1133:35,12 [76] ) | class Person { diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs index cedb1fbd..a0fa8858 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.codegen.cs @@ -7,12 +7,11 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.AddContent(0, RenderPerson((person) => (builder2) => { diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.ir.txt index 1d656c55..8273aafc 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.ir.txt @@ -4,9 +4,8 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt index f1afdb42..fd453a55 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_InExplicitExpression/TestComponent.mappings.txt @@ -7,7 +7,7 @@ Source Location: (67:1,12 [138] x:\dir\subdir\Test\TestComponent.cshtml) object RenderPerson(RenderFragment p) => null; | -Generated Location: (966:26,12 [138] ) +Generated Location: (914:25,12 [138] ) | class Person { diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_InImplicitExpression/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_InImplicitExpression/TestComponent.codegen.cs deleted file mode 100644 index 72f9bb50..00000000 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_InImplicitExpression/TestComponent.codegen.cs +++ /dev/null @@ -1,39 +0,0 @@ -// -#pragma warning disable 1591 -namespace Test -{ - #line hidden - using System; - using System.Collections.Generic; - using System.Linq; - using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent - { - #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) - { - base.BuildRenderTree(builder); - builder.AddContent(0, RenderPerson((builder2) => { - builder2.OpenElement(1, "div"); - builder2.AddContent(2, context.Name); - builder2.CloseElement(); - } - )); - } - #pragma warning restore 1998 -#line 2 "x:\dir\subdir\Test\TestComponent.cshtml" - - class Person - { - public string Name { get; set; } - } - - object RenderPerson(RenderFragment p) => null; - -#line default -#line hidden - } -} -#pragma warning restore 1591 diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_InImplicitExpression/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_InImplicitExpression/TestComponent.ir.txt deleted file mode 100644 index ecdfd595..00000000 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_InImplicitExpression/TestComponent.ir.txt +++ /dev/null @@ -1,21 +0,0 @@ -Document - - NamespaceDeclaration - - Test - UsingDirective - (3:1,1 [14] ) - System - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic - UsingDirective - (53:3,1 [19] ) - System.Linq - UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - - MethodDeclaration - - protected override - void - BuildRenderTree - CSharpCode - - IntermediateToken - - CSharp - base.BuildRenderTree(builder); - CSharpExpression - (1:0,1 [37] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (1:0,1 [13] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - RenderPerson( - Template - (15:0,15 [23] x:\dir\subdir\Test\TestComponent.cshtml) - HtmlElement - (15:0,15 [24] x:\dir\subdir\Test\TestComponent.cshtml) - div - CSharpExpression - (21:0,21 [12] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (21:0,21 [12] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context.Name - IntermediateToken - (39:0,39 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ) - CSharpCode - (54:1,12 [138] x:\dir\subdir\Test\TestComponent.cshtml) - IntermediateToken - (54:1,12 [138] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n class Person\n {\n public string Name { get; set; }\n }\n\n object RenderPerson(RenderFragment p) => null;\n diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_InImplicitExpression/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_InImplicitExpression/TestComponent.mappings.txt deleted file mode 100644 index 9ea6166b..00000000 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_InImplicitExpression/TestComponent.mappings.txt +++ /dev/null @@ -1,19 +0,0 @@ -Source Location: (54:1,12 [138] x:\dir\subdir\Test\TestComponent.cshtml) -| - class Person - { - public string Name { get; set; } - } - - object RenderPerson(RenderFragment p) => null; -| -Generated Location: (955:26,12 [138] ) -| - class Person - { - public string Name { get; set; } - } - - object RenderPerson(RenderFragment p) => null; -| - diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs index 86b9e4f4..714746db 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs @@ -7,12 +7,11 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); #line 2 "x:\dir\subdir\Test\TestComponent.cshtml" diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.ir.txt index 5c3acc9a..bce4cf0b 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.ir.txt @@ -4,9 +4,8 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt index 3d66fb28..768ce896 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt @@ -1,10 +1,10 @@ Source Location: (35:1,2 [27] x:\dir\subdir\Test\TestComponent.cshtml) | RenderFragment template = | -Generated Location: (654:18,2 [27] ) +Generated Location: (602:17,2 [27] ) | RenderFragment template = | Source Location: (78:1,45 [2] x:\dir\subdir\Test\TestComponent.cshtml) |; | -Generated Location: (920:26,45 [2] ) +Generated Location: (868:25,45 [2] ) |; | diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs index dbd4f736..19de0ad2 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.codegen.cs @@ -7,12 +7,11 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.AddContent(0, RenderPerson((builder2) => { diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.ir.txt index f7ece2bb..0c92c8d3 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.ir.txt @@ -4,9 +4,8 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt index eec66692..75ad368c 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/RazorTemplate_NonGeneric_InImplicitExpression/TestComponent.mappings.txt @@ -2,7 +2,7 @@ Source Location: (43:1,12 [54] x:\dir\subdir\Test\TestComponent.cshtml) | object RenderPerson(RenderFragment p) => null; | -Generated Location: (873:24,12 [54] ) +Generated Location: (821:23,12 [54] ) | object RenderPerson(RenderFragment p) => null; | diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs index 0258577a..de8ea8d3 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs @@ -7,17 +7,16 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.OpenComponent(0); - builder.AddAttribute(1, "v", Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue(y)); - builder.AddAttribute(2, "vChanged", Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler(__value => y = __value, y)); + builder.AddAttribute(1, "v", Microsoft.AspNetCore.Components.BindMethods.GetValue(y)); + builder.AddAttribute(2, "vChanged", Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => y = __value, y)); builder.CloseComponent(); } #pragma warning restore 1998 diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_597/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_597/TestComponent.ir.txt index c65743b4..3d826705 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_597/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_597/TestComponent.ir.txt @@ -4,20 +4,19 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); ComponentExtensionNode - (31:1,0 [22] x:\dir\subdir\Test\TestComponent.cshtml) - Counter - Test.Counter ComponentAttributeExtensionNode - (48:1,17 [1] x:\dir\subdir\Test\TestComponent.cshtml) - v - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( IntermediateToken - (48:1,17 [1] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - y IntermediateToken - - CSharp - ) ComponentAttributeExtensionNode - (48:1,17 [1] x:\dir\subdir\Test\TestComponent.cshtml) - vChanged - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler(__value => y = __value, y) + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => y = __value, y) CSharpCode - (67:2,12 [24] x:\dir\subdir\Test\TestComponent.cshtml) IntermediateToken - (67:2,12 [24] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n string y = null;\n diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt index 874c49d1..727b6af3 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt @@ -2,7 +2,7 @@ Source Location: (67:2,12 [24] x:\dir\subdir\Test\TestComponent.cshtml) | string y = null; | -Generated Location: (1057:24,12 [24] ) +Generated Location: (991:23,12 [24] ) | string y = null; | diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs index a3008b94..8c117e53 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs @@ -7,19 +7,18 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.OpenComponent(0); - builder.AddAttribute(1, "Name", Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue(UserName)); - builder.AddAttribute(2, "NameChanged", Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler(__value => UserName = __value, UserName)); - builder.AddAttribute(3, "IsActive", Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue(UserIsActive)); - builder.AddAttribute(4, "IsActiveChanged", Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler(__value => UserIsActive = __value, UserIsActive)); + builder.AddAttribute(1, "Name", Microsoft.AspNetCore.Components.BindMethods.GetValue(UserName)); + builder.AddAttribute(2, "NameChanged", Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => UserName = __value, UserName)); + builder.AddAttribute(3, "IsActive", Microsoft.AspNetCore.Components.BindMethods.GetValue(UserIsActive)); + builder.AddAttribute(4, "IsActiveChanged", Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => UserIsActive = __value, UserIsActive)); builder.CloseComponent(); } #pragma warning restore 1998 diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_609/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_609/TestComponent.ir.txt index 3d4fedf1..7723e3e5 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_609/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_609/TestComponent.ir.txt @@ -4,28 +4,27 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); ComponentExtensionNode - (31:1,0 [60] x:\dir\subdir\Test\TestComponent.cshtml) - User - Test.User ComponentAttributeExtensionNode - (48:1,17 [9] x:\dir\subdir\Test\TestComponent.cshtml) - Name - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( IntermediateToken - (49:1,18 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - UserName IntermediateToken - - CSharp - ) ComponentAttributeExtensionNode - (48:1,17 [9] x:\dir\subdir\Test\TestComponent.cshtml) - NameChanged - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler(__value => UserName = __value, UserName) + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => UserName = __value, UserName) ComponentAttributeExtensionNode - (74:1,43 [13] x:\dir\subdir\Test\TestComponent.cshtml) - IsActive - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetValue( IntermediateToken - (75:1,44 [12] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - UserIsActive IntermediateToken - - CSharp - ) ComponentAttributeExtensionNode - (74:1,43 [13] x:\dir\subdir\Test\TestComponent.cshtml) - IsActiveChanged - CSharpExpression - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.SetValueHandler(__value => UserIsActive = __value, UserIsActive) + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.SetValueHandler(__value => UserIsActive = __value, UserIsActive) CSharpCode - (107:3,12 [88] x:\dir\subdir\Test\TestComponent.cshtml) IntermediateToken - (107:3,12 [88] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n public string UserName { get; set; }\n public bool UserIsActive { get; set; }\n diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt index 2fcfbd10..77ef4f48 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt @@ -3,7 +3,7 @@ Source Location: (107:3,12 [88] x:\dir\subdir\Test\TestComponent.cshtml) public string UserName { get; set; } public bool UserIsActive { get; set; } | -Generated Location: (1380:26,12 [88] ) +Generated Location: (1300:25,12 [88] ) | public string UserName { get; set; } public bool UserIsActive { get; set; } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs index 21d41c62..2ce16627 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs @@ -7,13 +7,12 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - [Microsoft.AspNetCore.Blazor.Components.RouteAttribute("/")] - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + [Microsoft.AspNetCore.Components.RouteAttribute("/")] + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.AddMarkupContent(0, "

Hello, world!

\n\nWelcome to your new app.\n\n"); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_772/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_772/TestComponent.ir.txt index f9fe77c7..b127a13d 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_772/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_772/TestComponent.ir.txt @@ -4,10 +4,9 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components RouteAttributeExtensionNode - - / - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs index a3c8ecaf..a75a64a1 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs @@ -7,13 +7,12 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - [Microsoft.AspNetCore.Blazor.Components.RouteAttribute("/")] - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + [Microsoft.AspNetCore.Components.RouteAttribute("/")] + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.AddMarkupContent(0, "

Hello, world!

\n\nWelcome to your new app.\n\n"); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_773/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_773/TestComponent.ir.txt index 53347b09..1fb9a888 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_773/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_773/TestComponent.ir.txt @@ -4,10 +4,9 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components RouteAttributeExtensionNode - - / - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs index 8e74e631..1132f451 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_784/TestComponent.codegen.cs @@ -7,16 +7,15 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.OpenElement(0, "p"); - builder.AddAttribute(1, "onmouseover", Microsoft.AspNetCore.Blazor.Components.BindMethods.GetEventHandlerValue(OnComponentHover)); + builder.AddAttribute(1, "onmouseover", Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue(OnComponentHover)); builder.AddAttribute(2, "style", "background:" + " " + (ParentBgColor) + ";"); builder.CloseElement(); } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_784/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_784/TestComponent.ir.txt index a3fc8190..4a5b1e1c 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_784/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_784/TestComponent.ir.txt @@ -4,16 +4,15 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); HtmlElement - (0:0,0 [73] x:\dir\subdir\Test\TestComponent.cshtml) - p HtmlAttribute - (16:0,16 [17] x:\dir\subdir\Test\TestComponent.cshtml) - onmouseover=" - " CSharpExpressionAttributeValue - - - IntermediateToken - - CSharp - Microsoft.AspNetCore.Blazor.Components.BindMethods.GetEventHandlerValue( + IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.BindMethods.GetEventHandlerValue( IntermediateToken - (17:0,17 [16] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnComponentHover IntermediateToken - - CSharp - ) HtmlAttribute - - style=" - " diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt index f0d4f820..c9f709e2 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/Regression_784/TestComponent.mappings.txt @@ -6,7 +6,7 @@ Source Location: (87:1,12 [132] x:\dir\subdir\Test\TestComponent.cshtml) { } | -Generated Location: (1074:24,12 [132] ) +Generated Location: (1019:23,12 [132] ) | public string ParentBgColor { get; set; } = "#FFFFFF"; diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs index 92aaadab..4a3c1c62 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs @@ -7,12 +7,11 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.OpenElement(0, "div"); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.ir.txt index 2632d074..e96a9b84 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.ir.txt @@ -4,9 +4,8 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs index ef4a72a5..9b8920ec 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.codegen.cs @@ -7,12 +7,11 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.AddMarkupContent(0, "

Hello

\n\n"); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt index 09cbbb15..e11585d5 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/TrailingWhiteSpace_WithCSharpExpression/TestComponent.ir.txt @@ -4,9 +4,8 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs index 97bc6b5f..3f04a5e7 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs @@ -7,12 +7,11 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.AddMarkupContent(0, "

Hello

\n\n"); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.ir.txt index 0c1c2c7c..9c3a0c45 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.ir.txt @@ -4,9 +4,8 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.codegen.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.codegen.cs index 4f1afd74..9c401bc7 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.codegen.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.codegen.cs @@ -7,13 +7,12 @@ namespace Test using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Microsoft.AspNetCore.Blazor; - using Microsoft.AspNetCore.Blazor.Components; - [Microsoft.AspNetCore.Blazor.Components.RouteAttribute("/my/url")] - public class TestComponent : Microsoft.AspNetCore.Blazor.Components.BlazorComponent + using Microsoft.AspNetCore.Components; + [Microsoft.AspNetCore.Components.RouteAttribute("/my/url")] + public class TestComponent : Microsoft.AspNetCore.Components.ComponentBase { #pragma warning disable 1998 - protected override void BuildRenderTree(Microsoft.AspNetCore.Blazor.RenderTree.RenderTreeBuilder builder) + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { base.BuildRenderTree(builder); builder.AddMarkupContent(0, "

Hello

"); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.ir.txt b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.ir.txt index 912c6e62..01e9d759 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.ir.txt +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TestFiles/RuntimeCodeGenerationTest/TrailingWhiteSpace_WithDirective/TestComponent.ir.txt @@ -4,10 +4,9 @@ Document - UsingDirective - (18:2,1 [34] ) - System.Collections.Generic UsingDirective - (53:3,1 [19] ) - System.Linq UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks - UsingDirective - (104:5,1 [35] ) - Microsoft.AspNetCore.Blazor - UsingDirective - (140:6,1 [46] ) - Microsoft.AspNetCore.Blazor.Components + UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components RouteAttributeExtensionNode - - /my/url - ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Blazor.Components.BlazorComponent - + ClassDeclaration - - public - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - MethodDeclaration - - protected override - void - BuildRenderTree CSharpCode - IntermediateToken - - CSharp - base.BuildRenderTree(builder); diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/TypingTest.cs b/test/Microsoft.AspNetCore.Components.Build.Test/TypingTest.cs index 97891a4b..72aa448d 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/TypingTest.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/TypingTest.cs @@ -6,7 +6,7 @@ using System.Linq; using Xunit; using Xunit.Sdk; -namespace Microsoft.AspNetCore.Blazor.Build.Test +namespace Microsoft.AspNetCore.Components.Build.Test { // Similar to design time code generation tests, but goes a character at a time. // Don't add many of these since they are slow - instead add features to existing @@ -23,11 +23,11 @@ namespace Microsoft.AspNetCore.Blazor.Build.Test // Arrange AdditionalSyntaxTrees.Add(Parse(@" using System; -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { [Parameter] int Value { get; set; } [Parameter] Action ValueChanged { get; set; } diff --git a/test/Microsoft.AspNetCore.Components.Build.Test/WorkingDirectoryRazorIntegrationTest.cs b/test/Microsoft.AspNetCore.Components.Build.Test/WorkingDirectoryRazorIntegrationTest.cs index f754fb68..f85b5012 100644 --- a/test/Microsoft.AspNetCore.Components.Build.Test/WorkingDirectoryRazorIntegrationTest.cs +++ b/test/Microsoft.AspNetCore.Components.Build.Test/WorkingDirectoryRazorIntegrationTest.cs @@ -5,7 +5,7 @@ using System.IO; using System.Runtime.InteropServices; using Xunit; -namespace Microsoft.AspNetCore.Blazor.Build.Test +namespace Microsoft.AspNetCore.Components.Build.Test { // Integration tests focused on file path handling for class/namespace names public class WorkingDirectoryRazorIntegrationTest : RazorIntegrationTestBase diff --git a/test/Microsoft.AspNetCore.Components.E2ETest/Infrastructure/BasicTestAppTestBase.cs b/test/Microsoft.AspNetCore.Components.E2ETest/Infrastructure/BasicTestAppTestBase.cs index a4d09379..10b7b417 100644 --- a/test/Microsoft.AspNetCore.Components.E2ETest/Infrastructure/BasicTestAppTestBase.cs +++ b/test/Microsoft.AspNetCore.Components.E2ETest/Infrastructure/BasicTestAppTestBase.cs @@ -2,14 +2,14 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using BasicTestApp; -using Microsoft.AspNetCore.Blazor.Components; -using Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure.ServerFixtures; +using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures; using OpenQA.Selenium; using OpenQA.Selenium.Support.UI; using System; using Xunit.Abstractions; -namespace Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure +namespace Microsoft.AspNetCore.Components.E2ETest.Infrastructure { public class BasicTestAppTestBase : ServerTestBase> { diff --git a/test/Microsoft.AspNetCore.Components.E2ETest/Infrastructure/BrowserFixture.cs b/test/Microsoft.AspNetCore.Components.E2ETest/Infrastructure/BrowserFixture.cs index a4dfff7e..24cb287d 100644 --- a/test/Microsoft.AspNetCore.Components.E2ETest/Infrastructure/BrowserFixture.cs +++ b/test/Microsoft.AspNetCore.Components.E2ETest/Infrastructure/BrowserFixture.cs @@ -7,7 +7,7 @@ using OpenQA.Selenium.Remote; using System; using Xunit.Abstractions; -namespace Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure +namespace Microsoft.AspNetCore.Components.E2ETest.Infrastructure { public class BrowserFixture : IDisposable { diff --git a/test/Microsoft.AspNetCore.Components.E2ETest/Infrastructure/BrowserTestBase.cs b/test/Microsoft.AspNetCore.Components.E2ETest/Infrastructure/BrowserTestBase.cs index 855aefcd..cc13ce5b 100644 --- a/test/Microsoft.AspNetCore.Components.E2ETest/Infrastructure/BrowserTestBase.cs +++ b/test/Microsoft.AspNetCore.Components.E2ETest/Infrastructure/BrowserTestBase.cs @@ -6,7 +6,7 @@ using OpenQA.Selenium; using Xunit; using Xunit.Abstractions; -namespace Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure +namespace Microsoft.AspNetCore.Components.E2ETest.Infrastructure { [CaptureSeleniumLogs] public class BrowserTestBase : IClassFixture diff --git a/test/Microsoft.AspNetCore.Components.E2ETest/Infrastructure/CaptureSeleniumLogsAttribute.cs b/test/Microsoft.AspNetCore.Components.E2ETest/Infrastructure/CaptureSeleniumLogsAttribute.cs index 2ea3a34d..00a868ab 100644 --- a/test/Microsoft.AspNetCore.Components.E2ETest/Infrastructure/CaptureSeleniumLogsAttribute.cs +++ b/test/Microsoft.AspNetCore.Components.E2ETest/Infrastructure/CaptureSeleniumLogsAttribute.cs @@ -8,7 +8,7 @@ using System.Reflection; using OpenQA.Selenium; using Xunit.Sdk; -namespace Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure +namespace Microsoft.AspNetCore.Components.E2ETest.Infrastructure { // This has to use BeforeAfterTestAttribute because running the log capture // in the BrowserFixture.Dispose method is too late, and we can't add logging diff --git a/test/Microsoft.AspNetCore.Components.E2ETest/Infrastructure/ServerFixtures/AspNetEnvironment.cs b/test/Microsoft.AspNetCore.Components.E2ETest/Infrastructure/ServerFixtures/AspNetEnvironment.cs index b3c854bf..54a76e30 100644 --- a/test/Microsoft.AspNetCore.Components.E2ETest/Infrastructure/ServerFixtures/AspNetEnvironment.cs +++ b/test/Microsoft.AspNetCore.Components.E2ETest/Infrastructure/ServerFixtures/AspNetEnvironment.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -namespace Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure.ServerFixtures +namespace Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures { public enum AspNetEnvironment { diff --git a/test/Microsoft.AspNetCore.Components.E2ETest/Infrastructure/ServerFixtures/AspNetSiteServerFixture.cs b/test/Microsoft.AspNetCore.Components.E2ETest/Infrastructure/ServerFixtures/AspNetSiteServerFixture.cs index 5dc94b32..0ef7b7ab 100644 --- a/test/Microsoft.AspNetCore.Components.E2ETest/Infrastructure/ServerFixtures/AspNetSiteServerFixture.cs +++ b/test/Microsoft.AspNetCore.Components.E2ETest/Infrastructure/ServerFixtures/AspNetSiteServerFixture.cs @@ -5,7 +5,7 @@ using System; using System.IO; using Microsoft.AspNetCore.Hosting; -namespace Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure.ServerFixtures +namespace Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures { public class AspNetSiteServerFixture : WebHostServerFixture { diff --git a/test/Microsoft.AspNetCore.Components.E2ETest/Infrastructure/ServerFixtures/DevHostServerFixture.cs b/test/Microsoft.AspNetCore.Components.E2ETest/Infrastructure/ServerFixtures/DevHostServerFixture.cs index 08825ecf..1f85e9e8 100644 --- a/test/Microsoft.AspNetCore.Components.E2ETest/Infrastructure/ServerFixtures/DevHostServerFixture.cs +++ b/test/Microsoft.AspNetCore.Components.E2ETest/Infrastructure/ServerFixtures/DevHostServerFixture.cs @@ -5,7 +5,7 @@ using Microsoft.AspNetCore.Hosting; using System.Collections.Generic; using DevHostServerProgram = Microsoft.AspNetCore.Blazor.Cli.Server.Program; -namespace Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure.ServerFixtures +namespace Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures { public class DevHostServerFixture : WebHostServerFixture { diff --git a/test/Microsoft.AspNetCore.Components.E2ETest/Infrastructure/ServerFixtures/ServerFixture.cs b/test/Microsoft.AspNetCore.Components.E2ETest/Infrastructure/ServerFixtures/ServerFixture.cs index 170ebaaa..ba9fef29 100644 --- a/test/Microsoft.AspNetCore.Components.E2ETest/Infrastructure/ServerFixtures/ServerFixture.cs +++ b/test/Microsoft.AspNetCore.Components.E2ETest/Infrastructure/ServerFixtures/ServerFixture.cs @@ -6,7 +6,7 @@ using System.IO; using System.Linq; using System.Threading; -namespace Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure.ServerFixtures +namespace Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures { public abstract class ServerFixture : IDisposable { @@ -27,7 +27,7 @@ namespace Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure.ServerFixtures protected static string FindSolutionDir() { return FindClosestDirectoryContaining( - "Blazor.sln", + "Components.sln", Path.GetDirectoryName(typeof(ServerFixture).Assembly.Location)); } diff --git a/test/Microsoft.AspNetCore.Components.E2ETest/Infrastructure/ServerFixtures/StaticSiteServerFixture.cs b/test/Microsoft.AspNetCore.Components.E2ETest/Infrastructure/ServerFixtures/StaticSiteServerFixture.cs index 6306f893..f1bb9dd1 100644 --- a/test/Microsoft.AspNetCore.Components.E2ETest/Infrastructure/ServerFixtures/StaticSiteServerFixture.cs +++ b/test/Microsoft.AspNetCore.Components.E2ETest/Infrastructure/ServerFixtures/StaticSiteServerFixture.cs @@ -6,7 +6,7 @@ using System.IO; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; -namespace Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure.ServerFixtures +namespace Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures { // Although this is not used for anything meaningful related to Blazor yet, it // will be used later when there's a mechanism for publishing standalone Blazor diff --git a/test/Microsoft.AspNetCore.Components.E2ETest/Infrastructure/ServerFixtures/ToggleExecutionModeServerFixture.cs b/test/Microsoft.AspNetCore.Components.E2ETest/Infrastructure/ServerFixtures/ToggleExecutionModeServerFixture.cs index 7afc3bc2..3a2f9085 100644 --- a/test/Microsoft.AspNetCore.Components.E2ETest/Infrastructure/ServerFixtures/ToggleExecutionModeServerFixture.cs +++ b/test/Microsoft.AspNetCore.Components.E2ETest/Infrastructure/ServerFixtures/ToggleExecutionModeServerFixture.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure.ServerFixtures +namespace Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures { public class ToggleExecutionModeServerFixture : ServerFixture diff --git a/test/Microsoft.AspNetCore.Components.E2ETest/Infrastructure/ServerFixtures/WebHostServerFixture.cs b/test/Microsoft.AspNetCore.Components.E2ETest/Infrastructure/ServerFixtures/WebHostServerFixture.cs index 3268e066..2ff15cbe 100644 --- a/test/Microsoft.AspNetCore.Components.E2ETest/Infrastructure/ServerFixtures/WebHostServerFixture.cs +++ b/test/Microsoft.AspNetCore.Components.E2ETest/Infrastructure/ServerFixtures/WebHostServerFixture.cs @@ -5,7 +5,7 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting.Server.Features; using System.Linq; -namespace Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure.ServerFixtures +namespace Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures { public abstract class WebHostServerFixture : ServerFixture { diff --git a/test/Microsoft.AspNetCore.Components.E2ETest/Infrastructure/ServerTestBase.cs b/test/Microsoft.AspNetCore.Components.E2ETest/Infrastructure/ServerTestBase.cs index 9ce9a380..623f4a31 100644 --- a/test/Microsoft.AspNetCore.Components.E2ETest/Infrastructure/ServerTestBase.cs +++ b/test/Microsoft.AspNetCore.Components.E2ETest/Infrastructure/ServerTestBase.cs @@ -1,12 +1,12 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure.ServerFixtures; +using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures; using System; using Xunit; using Xunit.Abstractions; -namespace Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure +namespace Microsoft.AspNetCore.Components.E2ETest.Infrastructure { public abstract class ServerTestBase : BrowserTestBase, IClassFixture diff --git a/test/Microsoft.AspNetCore.Components.E2ETest/Infrastructure/WaitAssert.cs b/test/Microsoft.AspNetCore.Components.E2ETest/Infrastructure/WaitAssert.cs index 0a98aa14..e1c9b77f 100644 --- a/test/Microsoft.AspNetCore.Components.E2ETest/Infrastructure/WaitAssert.cs +++ b/test/Microsoft.AspNetCore.Components.E2ETest/Infrastructure/WaitAssert.cs @@ -9,7 +9,7 @@ using OpenQA.Selenium; using OpenQA.Selenium.Support.UI; using Xunit; -namespace Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure +namespace Microsoft.AspNetCore.Components.E2ETest.Infrastructure { // XUnit assertions, but hooked into Selenium's polling mechanism diff --git a/test/Microsoft.AspNetCore.Components.E2ETest/Microsoft.AspNetCore.Blazor.E2ETest.csproj b/test/Microsoft.AspNetCore.Components.E2ETest/Microsoft.AspNetCore.Components.E2ETest.csproj similarity index 91% rename from test/Microsoft.AspNetCore.Components.E2ETest/Microsoft.AspNetCore.Blazor.E2ETest.csproj rename to test/Microsoft.AspNetCore.Components.E2ETest/Microsoft.AspNetCore.Components.E2ETest.csproj index 539187a0..22e99985 100644 --- a/test/Microsoft.AspNetCore.Components.E2ETest/Microsoft.AspNetCore.Blazor.E2ETest.csproj +++ b/test/Microsoft.AspNetCore.Components.E2ETest/Microsoft.AspNetCore.Components.E2ETest.csproj @@ -32,10 +32,10 @@ - - + + diff --git a/test/Microsoft.AspNetCore.Components.E2ETest/ServerExecutionTests/ServerExecutionTestExtensions.cs b/test/Microsoft.AspNetCore.Components.E2ETest/ServerExecutionTests/ServerExecutionTestExtensions.cs index db97edf4..e867e03a 100644 --- a/test/Microsoft.AspNetCore.Components.E2ETest/ServerExecutionTests/ServerExecutionTestExtensions.cs +++ b/test/Microsoft.AspNetCore.Components.E2ETest/ServerExecutionTests/ServerExecutionTestExtensions.cs @@ -1,9 +1,9 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure.ServerFixtures; +using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures; -namespace Microsoft.AspNetCore.Blazor.E2ETest.ServerExecutionTests +namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests { internal static class ServerExecutionTestExtensions { diff --git a/test/Microsoft.AspNetCore.Components.E2ETest/ServerExecutionTests/ServerSideAppTest.cs b/test/Microsoft.AspNetCore.Components.E2ETest/ServerExecutionTests/ServerSideAppTest.cs index f60ae91c..433f7c15 100644 --- a/test/Microsoft.AspNetCore.Components.E2ETest/ServerExecutionTests/ServerSideAppTest.cs +++ b/test/Microsoft.AspNetCore.Components.E2ETest/ServerExecutionTests/ServerSideAppTest.cs @@ -1,8 +1,8 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure; -using Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure.ServerFixtures; +using Microsoft.AspNetCore.Components.E2ETest.Infrastructure; +using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures; using OpenQA.Selenium; using OpenQA.Selenium.Support.UI; using System; @@ -10,7 +10,7 @@ using System.Linq; using Xunit; using Xunit.Abstractions; -namespace Microsoft.AspNetCore.Blazor.E2ETest.ServerExecutionTests +namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests { public class ServerSideAppTest : ServerTestBase { @@ -21,7 +21,7 @@ namespace Microsoft.AspNetCore.Blazor.E2ETest.ServerExecutionTests : base(browserFixture, serverFixture, output) { _serverFixture.Environment = AspNetEnvironment.Development; - _serverFixture.BuildWebHostMethod = ServerSideBlazor.Server.Program.BuildWebHost; + _serverFixture.BuildWebHostMethod = ComponentsApp.Server.Program.BuildWebHost; Navigate("/", noReload: false); WaitUntilLoaded(); diff --git a/test/Microsoft.AspNetCore.Components.E2ETest/ServerExecutionTests/TestSubclasses.cs b/test/Microsoft.AspNetCore.Components.E2ETest/ServerExecutionTests/TestSubclasses.cs index 00afaa67..6f79973f 100644 --- a/test/Microsoft.AspNetCore.Components.E2ETest/ServerExecutionTests/TestSubclasses.cs +++ b/test/Microsoft.AspNetCore.Components.E2ETest/ServerExecutionTests/TestSubclasses.cs @@ -2,12 +2,12 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using BasicTestApp; -using Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure; -using Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure.ServerFixtures; -using Microsoft.AspNetCore.Blazor.E2ETest.Tests; +using Microsoft.AspNetCore.Components.E2ETest.Infrastructure; +using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures; +using Microsoft.AspNetCore.Components.E2ETest.Tests; using Xunit.Abstractions; -namespace Microsoft.AspNetCore.Blazor.E2ETest.ServerExecutionTests +namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests { public class ServerComponentRenderingTest : ComponentRenderingTest { diff --git a/test/Microsoft.AspNetCore.Components.E2ETest/Tests/BinaryHttpClientTest.cs b/test/Microsoft.AspNetCore.Components.E2ETest/Tests/BinaryHttpClientTest.cs index 9e630ec9..20dedb36 100644 --- a/test/Microsoft.AspNetCore.Components.E2ETest/Tests/BinaryHttpClientTest.cs +++ b/test/Microsoft.AspNetCore.Components.E2ETest/Tests/BinaryHttpClientTest.cs @@ -2,15 +2,15 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using BasicTestApp.HttpClientTest; -using Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure; -using Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure.ServerFixtures; +using Microsoft.AspNetCore.Components.E2ETest.Infrastructure; +using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures; using OpenQA.Selenium; using OpenQA.Selenium.Support.UI; using System; using Xunit; using Xunit.Abstractions; -namespace Microsoft.AspNetCore.Blazor.E2ETest.Tests +namespace Microsoft.AspNetCore.Components.E2ETest.Tests { public class BinaryHttpClientTest : BasicTestAppTestBase, IClassFixture { diff --git a/test/Microsoft.AspNetCore.Components.E2ETest/Tests/BindTest.cs b/test/Microsoft.AspNetCore.Components.E2ETest/Tests/BindTest.cs index afd949fb..a0d7b658 100644 --- a/test/Microsoft.AspNetCore.Components.E2ETest/Tests/BindTest.cs +++ b/test/Microsoft.AspNetCore.Components.E2ETest/Tests/BindTest.cs @@ -2,14 +2,14 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using BasicTestApp; -using Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure; -using Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure.ServerFixtures; +using Microsoft.AspNetCore.Components.E2ETest.Infrastructure; +using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures; using OpenQA.Selenium; using OpenQA.Selenium.Support.UI; using Xunit; using Xunit.Abstractions; -namespace Microsoft.AspNetCore.Blazor.E2ETest.Tests +namespace Microsoft.AspNetCore.Components.E2ETest.Tests { public class BindTest : BasicTestAppTestBase { diff --git a/test/Microsoft.AspNetCore.Components.E2ETest/Tests/CascadingValueTest.cs b/test/Microsoft.AspNetCore.Components.E2ETest/Tests/CascadingValueTest.cs index 50c45562..d385fb66 100644 --- a/test/Microsoft.AspNetCore.Components.E2ETest/Tests/CascadingValueTest.cs +++ b/test/Microsoft.AspNetCore.Components.E2ETest/Tests/CascadingValueTest.cs @@ -2,13 +2,13 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using BasicTestApp; -using Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure; -using Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure.ServerFixtures; +using Microsoft.AspNetCore.Components.E2ETest.Infrastructure; +using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures; using OpenQA.Selenium; using Xunit; using Xunit.Abstractions; -namespace Microsoft.AspNetCore.Blazor.E2ETest.Tests +namespace Microsoft.AspNetCore.Components.E2ETest.Tests { public class CascadingValueTest : BasicTestAppTestBase { diff --git a/test/Microsoft.AspNetCore.Components.E2ETest/Tests/ComponentRenderingTest.cs b/test/Microsoft.AspNetCore.Components.E2ETest/Tests/ComponentRenderingTest.cs index 4f1beaf8..ac9547b5 100644 --- a/test/Microsoft.AspNetCore.Components.E2ETest/Tests/ComponentRenderingTest.cs +++ b/test/Microsoft.AspNetCore.Components.E2ETest/Tests/ComponentRenderingTest.cs @@ -9,14 +9,14 @@ using System.Numerics; using System.Threading.Tasks; using BasicTestApp; using BasicTestApp.HierarchicalImportsTest.Subdir; -using Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure; -using Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure.ServerFixtures; +using Microsoft.AspNetCore.Components.E2ETest.Infrastructure; +using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures; using OpenQA.Selenium; using OpenQA.Selenium.Support.UI; using Xunit; using Xunit.Abstractions; -namespace Microsoft.AspNetCore.Blazor.E2ETest.Tests +namespace Microsoft.AspNetCore.Components.E2ETest.Tests { public class ComponentRenderingTest : BasicTestAppTestBase { diff --git a/test/Microsoft.AspNetCore.Components.E2ETest/Tests/EventBubblingTest.cs b/test/Microsoft.AspNetCore.Components.E2ETest/Tests/EventBubblingTest.cs index 8c80c48d..b75b8964 100644 --- a/test/Microsoft.AspNetCore.Components.E2ETest/Tests/EventBubblingTest.cs +++ b/test/Microsoft.AspNetCore.Components.E2ETest/Tests/EventBubblingTest.cs @@ -2,14 +2,14 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using BasicTestApp; -using Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure; -using Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure.ServerFixtures; +using Microsoft.AspNetCore.Components.E2ETest.Infrastructure; +using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures; using OpenQA.Selenium; using System; using Xunit; using Xunit.Abstractions; -namespace Microsoft.AspNetCore.Blazor.E2ETest.Tests +namespace Microsoft.AspNetCore.Components.E2ETest.Tests { public class EventBubblingTest : BasicTestAppTestBase { diff --git a/test/Microsoft.AspNetCore.Components.E2ETest/Tests/EventTest.cs b/test/Microsoft.AspNetCore.Components.E2ETest/Tests/EventTest.cs index 2358957d..d3056837 100644 --- a/test/Microsoft.AspNetCore.Components.E2ETest/Tests/EventTest.cs +++ b/test/Microsoft.AspNetCore.Components.E2ETest/Tests/EventTest.cs @@ -2,14 +2,14 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using BasicTestApp; -using Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure; -using Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure.ServerFixtures; +using Microsoft.AspNetCore.Components.E2ETest.Infrastructure; +using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures; using OpenQA.Selenium; using OpenQA.Selenium.Interactions; using Xunit; using Xunit.Abstractions; -namespace Microsoft.AspNetCore.Blazor.E2ETest.Tests +namespace Microsoft.AspNetCore.Components.E2ETest.Tests { public class EventTest : BasicTestAppTestBase { diff --git a/test/Microsoft.AspNetCore.Components.E2ETest/Tests/HostedInAspNetTest.cs b/test/Microsoft.AspNetCore.Components.E2ETest/Tests/HostedInAspNetTest.cs index b9f3a454..08816f43 100644 --- a/test/Microsoft.AspNetCore.Components.E2ETest/Tests/HostedInAspNetTest.cs +++ b/test/Microsoft.AspNetCore.Components.E2ETest/Tests/HostedInAspNetTest.cs @@ -1,15 +1,15 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure; -using Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure.ServerFixtures; +using Microsoft.AspNetCore.Components.E2ETest.Infrastructure; +using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures; using OpenQA.Selenium; using OpenQA.Selenium.Support.UI; using System; using Xunit; using Xunit.Abstractions; -namespace Microsoft.AspNetCore.Blazor.E2ETest.Tests +namespace Microsoft.AspNetCore.Components.E2ETest.Tests { public class HostedInAspNetTest : ServerTestBase { diff --git a/test/Microsoft.AspNetCore.Components.E2ETest/Tests/HttpClientTest.cs b/test/Microsoft.AspNetCore.Components.E2ETest/Tests/HttpClientTest.cs index d114f756..b48d378d 100644 --- a/test/Microsoft.AspNetCore.Components.E2ETest/Tests/HttpClientTest.cs +++ b/test/Microsoft.AspNetCore.Components.E2ETest/Tests/HttpClientTest.cs @@ -2,8 +2,8 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using BasicTestApp.HttpClientTest; -using Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure; -using Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure.ServerFixtures; +using Microsoft.AspNetCore.Components.E2ETest.Infrastructure; +using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures; using OpenQA.Selenium; using OpenQA.Selenium.Support.UI; using System; @@ -12,7 +12,7 @@ using System.Threading.Tasks; using Xunit; using Xunit.Abstractions; -namespace Microsoft.AspNetCore.Blazor.E2ETest.Tests +namespace Microsoft.AspNetCore.Components.E2ETest.Tests { public class HttpClientTest : BasicTestAppTestBase, IClassFixture { diff --git a/test/Microsoft.AspNetCore.Components.E2ETest/Tests/InteropTest.cs b/test/Microsoft.AspNetCore.Components.E2ETest/Tests/InteropTest.cs index 5553da71..e576fa72 100644 --- a/test/Microsoft.AspNetCore.Components.E2ETest/Tests/InteropTest.cs +++ b/test/Microsoft.AspNetCore.Components.E2ETest/Tests/InteropTest.cs @@ -1,14 +1,14 @@ using System; using System.Collections.Generic; using BasicTestApp; -using Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure; -using Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure.ServerFixtures; +using Microsoft.AspNetCore.Components.E2ETest.Infrastructure; +using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures; using OpenQA.Selenium; using OpenQA.Selenium.Support.UI; using Xunit; using Xunit.Abstractions; -namespace Microsoft.AspNetCore.Blazor.E2ETest.Tests +namespace Microsoft.AspNetCore.Components.E2ETest.Tests { public class InteropTest : BasicTestAppTestBase { diff --git a/test/Microsoft.AspNetCore.Components.E2ETest/Tests/MonoSanityTest.cs b/test/Microsoft.AspNetCore.Components.E2ETest/Tests/MonoSanityTest.cs index 8585fc20..cfd8ed5e 100644 --- a/test/Microsoft.AspNetCore.Components.E2ETest/Tests/MonoSanityTest.cs +++ b/test/Microsoft.AspNetCore.Components.E2ETest/Tests/MonoSanityTest.cs @@ -1,15 +1,15 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure; -using Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure.ServerFixtures; +using Microsoft.AspNetCore.Components.E2ETest.Infrastructure; +using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures; using OpenQA.Selenium; using OpenQA.Selenium.Support.UI; using System; using Xunit; using Xunit.Abstractions; -namespace Microsoft.AspNetCore.Blazor.E2ETest.Tests +namespace Microsoft.AspNetCore.Components.E2ETest.Tests { public class MonoSanityTest : ServerTestBase { diff --git a/test/Microsoft.AspNetCore.Components.E2ETest/Tests/PerformanceTest.cs b/test/Microsoft.AspNetCore.Components.E2ETest/Tests/PerformanceTest.cs index 0e04ce68..7c6cdba8 100644 --- a/test/Microsoft.AspNetCore.Components.E2ETest/Tests/PerformanceTest.cs +++ b/test/Microsoft.AspNetCore.Components.E2ETest/Tests/PerformanceTest.cs @@ -1,22 +1,22 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure; -using Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure.ServerFixtures; +using Microsoft.AspNetCore.Components.E2ETest.Infrastructure; +using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures; using OpenQA.Selenium; using System; using System.Linq; using Xunit; using Xunit.Abstractions; -namespace Microsoft.AspNetCore.Blazor.E2ETest.Tests +namespace Microsoft.AspNetCore.Components.E2ETest.Tests { public class PerformanceTest - : ServerTestBase> + : ServerTestBase> { public PerformanceTest( BrowserFixture browserFixture, - DevHostServerFixture serverFixture, + DevHostServerFixture serverFixture, ITestOutputHelper output) : base(browserFixture, serverFixture, output) { diff --git a/test/Microsoft.AspNetCore.Components.E2ETest/Tests/RoutingTest.cs b/test/Microsoft.AspNetCore.Components.E2ETest/Tests/RoutingTest.cs index f5c8cebd..f7d0f69e 100644 --- a/test/Microsoft.AspNetCore.Components.E2ETest/Tests/RoutingTest.cs +++ b/test/Microsoft.AspNetCore.Components.E2ETest/Tests/RoutingTest.cs @@ -6,14 +6,14 @@ using System.Linq; using System.Runtime.InteropServices; using BasicTestApp; using BasicTestApp.RouterTest; -using Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure; -using Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure.ServerFixtures; +using Microsoft.AspNetCore.Components.E2ETest.Infrastructure; +using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures; using OpenQA.Selenium; using OpenQA.Selenium.Interactions; using Xunit; using Xunit.Abstractions; -namespace Microsoft.AspNetCore.Blazor.E2ETest.Tests +namespace Microsoft.AspNetCore.Components.E2ETest.Tests { public class RoutingTest : BasicTestAppTestBase { diff --git a/test/Microsoft.AspNetCore.Components.E2ETest/Tests/StandaloneAppTest.cs b/test/Microsoft.AspNetCore.Components.E2ETest/Tests/StandaloneAppTest.cs index 0119935d..840e6ea4 100644 --- a/test/Microsoft.AspNetCore.Components.E2ETest/Tests/StandaloneAppTest.cs +++ b/test/Microsoft.AspNetCore.Components.E2ETest/Tests/StandaloneAppTest.cs @@ -1,8 +1,8 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure; -using Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure.ServerFixtures; +using Microsoft.AspNetCore.Components.E2ETest.Infrastructure; +using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures; using OpenQA.Selenium; using OpenQA.Selenium.Support.UI; using System; @@ -10,7 +10,7 @@ using System.Linq; using Xunit; using Xunit.Abstractions; -namespace Microsoft.AspNetCore.Blazor.E2ETest.Tests +namespace Microsoft.AspNetCore.Components.E2ETest.Tests { public class StandaloneAppTest : ServerTestBase>, IDisposable diff --git a/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/BaseTagHelperDescriptorProviderTest.cs b/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/BaseTagHelperDescriptorProviderTest.cs index 67ffd4e3..23f5770d 100644 --- a/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/BaseTagHelperDescriptorProviderTest.cs +++ b/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/BaseTagHelperDescriptorProviderTest.cs @@ -8,7 +8,7 @@ using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CSharp; using Microsoft.Extensions.DependencyModel; -namespace Microsoft.AspNetCore.Blazor.Razor +namespace Microsoft.AspNetCore.Components.Razor { public abstract class BaseTagHelperDescriptorProviderTest { diff --git a/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/BindTagHelperDescriptorProviderTest.cs b/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/BindTagHelperDescriptorProviderTest.cs index e0b4274a..2c3c6a9c 100644 --- a/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/BindTagHelperDescriptorProviderTest.cs +++ b/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/BindTagHelperDescriptorProviderTest.cs @@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Razor.Language; using Microsoft.CodeAnalysis.Razor; using Xunit; -namespace Microsoft.AspNetCore.Blazor.Razor +namespace Microsoft.AspNetCore.Components.Razor { public class BindTagHelperDescriptorProviderTest : BaseTagHelperDescriptorProviderTest { @@ -16,7 +16,7 @@ namespace Microsoft.AspNetCore.Blazor.Razor // Arrange var compilation = BaseCompilation.AddSyntaxTrees(Parse(@" using System; -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { @@ -131,7 +131,7 @@ namespace Test // Arrange var compilation = BaseCompilation.AddSyntaxTrees(Parse(@" using System; -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { @@ -172,7 +172,7 @@ namespace Test { // Arrange var compilation = BaseCompilation.AddSyntaxTrees(Parse(@" -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { @@ -305,7 +305,7 @@ namespace Test { // Arrange var compilation = BaseCompilation.AddSyntaxTrees(Parse(@" -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { @@ -359,7 +359,7 @@ namespace Test { // Arrange var compilation = BaseCompilation.AddSyntaxTrees(Parse(@" -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { @@ -414,7 +414,7 @@ namespace Test { // Arrange var compilation = BaseCompilation.AddSyntaxTrees(Parse(@" -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { @@ -481,7 +481,7 @@ namespace Test { // Arrange var compilation = BaseCompilation.AddSyntaxTrees(Parse(@" -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { @@ -587,10 +587,10 @@ namespace Test bind.Documentation); // These are all trivially derived from the assembly/namespace/type name - Assert.Equal("Microsoft.AspNetCore.Blazor", bind.AssemblyName); + Assert.Equal("Microsoft.AspNetCore.Components", bind.AssemblyName); Assert.Equal("Bind", bind.Name); - Assert.Equal("Microsoft.AspNetCore.Blazor.Components.Bind", bind.DisplayName); - Assert.Equal("Microsoft.AspNetCore.Blazor.Components.Bind", bind.GetTypeName()); + Assert.Equal("Microsoft.AspNetCore.Components.Bind", bind.DisplayName); + Assert.Equal("Microsoft.AspNetCore.Components.Bind", bind.GetTypeName()); // The tag matching rule for a bind-Component is always the component name + the attribute name var rule = Assert.Single(bind.TagMatchingRules); @@ -632,7 +632,7 @@ namespace Test Assert.Equal("bind-...", attribute.Name); Assert.Equal("Bind", attribute.GetPropertyName()); Assert.Equal( - "System.Collections.Generic.Dictionary Microsoft.AspNetCore.Blazor.Components.Bind.Bind", + "System.Collections.Generic.Dictionary Microsoft.AspNetCore.Components.Bind.Bind", attribute.DisplayName); // Defined from the property type @@ -664,7 +664,7 @@ namespace Test Assert.Equal("format-...", attribute.Name); Assert.Equal("Format", attribute.GetPropertyName()); Assert.Equal( - "System.Collections.Generic.Dictionary Microsoft.AspNetCore.Blazor.Components.Bind.Format", + "System.Collections.Generic.Dictionary Microsoft.AspNetCore.Components.Bind.Format", attribute.DisplayName); // Defined from the property type diff --git a/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/ComponentDocumentRewritePassTest.cs b/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/ComponentDocumentRewritePassTest.cs index b18af937..b7a2341e 100644 --- a/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/ComponentDocumentRewritePassTest.cs +++ b/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/ComponentDocumentRewritePassTest.cs @@ -9,7 +9,7 @@ using Microsoft.AspNetCore.Razor.Language.Intermediate; using Xunit; -namespace Microsoft.AspNetCore.Blazor.Razor +namespace Microsoft.AspNetCore.Components.Razor { public class ComponentDocumentRewritePassTest { diff --git a/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/ComponentTagHelperDescriptorProviderTest.cs b/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/ComponentTagHelperDescriptorProviderTest.cs index a5a404bc..ce6f25d6 100644 --- a/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/ComponentTagHelperDescriptorProviderTest.cs +++ b/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/ComponentTagHelperDescriptorProviderTest.cs @@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Razor.Language; using Microsoft.CodeAnalysis.Razor; using Xunit; -namespace Microsoft.AspNetCore.Blazor.Razor +namespace Microsoft.AspNetCore.Components.Razor { public class ComponentTagHelperDescriptorProviderTest : BaseTagHelperDescriptorProviderTest { @@ -16,7 +16,7 @@ namespace Microsoft.AspNetCore.Blazor.Razor // Arrange var compilation = BaseCompilation.AddSyntaxTrees(Parse(@" -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { @@ -130,7 +130,7 @@ namespace Test // Arrange var compilation = BaseCompilation.AddSyntaxTrees(Parse(@" -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { @@ -197,11 +197,11 @@ namespace Test // Arrange var compilation = BaseCompilation.AddSyntaxTrees(Parse(@" -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { [Parameter] string MyProperty { get; set; } @@ -238,11 +238,11 @@ namespace Test // Arrange var compilation = BaseCompilation.AddSyntaxTrees(Parse(@" -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { [Parameter] bool MyProperty { get; set; } @@ -284,7 +284,7 @@ namespace Test // Arrange var compilation = BaseCompilation.AddSyntaxTrees(Parse(@" -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { @@ -294,7 +294,7 @@ namespace Test Two } - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { [Parameter] MyEnum MyProperty { get; set; } @@ -336,11 +336,11 @@ namespace Test // Arrange var compilation = BaseCompilation.AddSyntaxTrees(Parse(@" -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { [Parameter] T MyProperty { get; set; } @@ -393,11 +393,11 @@ namespace Test // Arrange var compilation = BaseCompilation.AddSyntaxTrees(Parse(@" -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { [Parameter] T MyProperty1 { get; set; } @@ -473,12 +473,11 @@ namespace Test var compilation = BaseCompilation.AddSyntaxTrees(Parse(@" using System; -using Microsoft.AspNetCore.Blazor; -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { [Parameter] Action OnClick { get; set; } @@ -506,7 +505,7 @@ namespace Test var attribute = Assert.Single(component.BoundAttributes); Assert.Equal("OnClick", attribute.Name); - Assert.Equal("System.Action", attribute.TypeName); + Assert.Equal("System.Action", attribute.TypeName); Assert.False(attribute.HasIndexer); Assert.False(attribute.IsBooleanProperty); @@ -523,11 +522,11 @@ namespace Test var compilation = BaseCompilation.AddSyntaxTrees(Parse(@" using System; -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { [Parameter] Action OnClick { get; set; } @@ -584,12 +583,11 @@ namespace Test // Arrange var compilation = BaseCompilation.AddSyntaxTrees(Parse(@" -using Microsoft.AspNetCore.Blazor; -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { [Parameter] RenderFragment ChildContent2 { get; set; } @@ -617,7 +615,7 @@ namespace Test var attribute = Assert.Single(component.BoundAttributes); Assert.Equal("ChildContent2", attribute.Name); - Assert.Equal("Microsoft.AspNetCore.Blazor.RenderFragment", attribute.TypeName); + Assert.Equal("Microsoft.AspNetCore.Components.RenderFragment", attribute.TypeName); Assert.False(attribute.HasIndexer); Assert.False(attribute.IsBooleanProperty); @@ -641,12 +639,11 @@ namespace Test // Arrange var compilation = BaseCompilation.AddSyntaxTrees(Parse(@" -using Microsoft.AspNetCore.Blazor; -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { [Parameter] RenderFragment ChildContent2 { get; set; } @@ -677,7 +674,7 @@ namespace Test a => { Assert.Equal("ChildContent2", a.Name); - Assert.Equal("Microsoft.AspNetCore.Blazor.RenderFragment", a.TypeName); + Assert.Equal("Microsoft.AspNetCore.Components.RenderFragment", a.TypeName); Assert.False(a.HasIndexer); Assert.False(a.IsBooleanProperty); @@ -713,12 +710,11 @@ namespace Test // Arrange var compilation = BaseCompilation.AddSyntaxTrees(Parse(@" -using Microsoft.AspNetCore.Blazor; -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { [Parameter] RenderFragment ChildContent2 { get; set; } @@ -752,7 +748,7 @@ namespace Test a => { Assert.Equal("ChildContent2", a.Name); - Assert.Equal("Microsoft.AspNetCore.Blazor.RenderFragment", a.TypeName); + Assert.Equal("Microsoft.AspNetCore.Components.RenderFragment", a.TypeName); Assert.False(a.HasIndexer); Assert.False(a.IsBooleanProperty); @@ -788,12 +784,11 @@ namespace Test // Arrange var compilation = BaseCompilation.AddSyntaxTrees(Parse(@" -using Microsoft.AspNetCore.Blazor; -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { [Parameter] RenderFragment ChildContent2 { get; set; } @@ -824,7 +819,7 @@ namespace Test a => { Assert.Equal("ChildContent2", a.Name); - Assert.Equal("Microsoft.AspNetCore.Blazor.RenderFragment", a.TypeName); + Assert.Equal("Microsoft.AspNetCore.Components.RenderFragment", a.TypeName); Assert.False(a.HasIndexer); Assert.False(a.IsBooleanProperty); @@ -870,12 +865,11 @@ namespace Test var compilation = BaseCompilation.AddSyntaxTrees(Parse(@" using System.Collections.Generic; -using Microsoft.AspNetCore.Blazor; -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { [Parameter] RenderFragment> ChildContent2 { get; set; } @@ -906,7 +900,7 @@ namespace Test a => { Assert.Equal("ChildContent2", a.Name); - Assert.Equal("Microsoft.AspNetCore.Blazor.RenderFragment>", a.TypeName); + Assert.Equal("Microsoft.AspNetCore.Components.RenderFragment>", a.TypeName); Assert.False(a.HasIndexer); Assert.False(a.IsBooleanProperty); @@ -952,12 +946,11 @@ namespace Test var compilation = BaseCompilation.AddSyntaxTrees(Parse(@" using System.Collections.Generic; -using Microsoft.AspNetCore.Blazor; -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { [Parameter] RenderFragment> ChildContent2 { get; set; } @@ -988,7 +981,7 @@ namespace Test a => { Assert.Equal("ChildContent2", a.Name); - Assert.Equal("Microsoft.AspNetCore.Blazor.RenderFragment>", a.TypeName); + Assert.Equal("Microsoft.AspNetCore.Components.RenderFragment>", a.TypeName); Assert.False(a.HasIndexer); Assert.False(a.IsBooleanProperty); @@ -1033,12 +1026,11 @@ namespace Test // Arrange var compilation = BaseCompilation.AddSyntaxTrees(Parse(@" -using Microsoft.AspNetCore.Blazor; -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { [Parameter] RenderFragment ChildContent2 { get; set; } @@ -1074,7 +1066,7 @@ namespace Test a => { Assert.Equal("ChildContent2", a.Name); - Assert.Equal("Microsoft.AspNetCore.Blazor.RenderFragment.Context>", a.TypeName); + Assert.Equal("Microsoft.AspNetCore.Components.RenderFragment.Context>", a.TypeName); Assert.False(a.HasIndexer); Assert.False(a.IsBooleanProperty); @@ -1118,12 +1110,11 @@ namespace Test // Arrange var compilation = BaseCompilation.AddSyntaxTrees(Parse(@" -using Microsoft.AspNetCore.Blazor; -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public class MyComponent : BlazorComponent + public class MyComponent : ComponentBase { [Parameter] RenderFragment ChildContent { get; set; } @@ -1160,7 +1151,7 @@ namespace Test a => { Assert.Equal("ChildContent", a.Name); - Assert.Equal("Microsoft.AspNetCore.Blazor.RenderFragment", a.TypeName); + Assert.Equal("Microsoft.AspNetCore.Components.RenderFragment", a.TypeName); Assert.True(a.IsChildContentProperty()); }, a => @@ -1171,13 +1162,13 @@ namespace Test a => { Assert.Equal("Footer", a.Name); - Assert.Equal("Microsoft.AspNetCore.Blazor.RenderFragment", a.TypeName); + Assert.Equal("Microsoft.AspNetCore.Components.RenderFragment", a.TypeName); Assert.True(a.IsChildContentProperty()); }, a => { Assert.Equal("Header", a.Name); - Assert.Equal("Microsoft.AspNetCore.Blazor.RenderFragment", a.TypeName); + Assert.Equal("Microsoft.AspNetCore.Components.RenderFragment", a.TypeName); Assert.True(a.IsChildContentProperty()); }); @@ -1196,11 +1187,11 @@ namespace Test // Arrange var compilation = BaseCompilation.AddSyntaxTrees(Parse(@" -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { - public abstract class MyBase : BlazorComponent + public abstract class MyBase : ComponentBase { [Parameter] protected string Hidden { get; set; } diff --git a/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/EventHandlerTagHelperDescriptorProviderTest.cs b/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/EventHandlerTagHelperDescriptorProviderTest.cs index c257e5ae..8456b6e6 100644 --- a/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/EventHandlerTagHelperDescriptorProviderTest.cs +++ b/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/EventHandlerTagHelperDescriptorProviderTest.cs @@ -7,7 +7,7 @@ using Microsoft.AspNetCore.Razor.Language; using Microsoft.CodeAnalysis.Razor; using Xunit; -namespace Microsoft.AspNetCore.Blazor.Razor +namespace Microsoft.AspNetCore.Components.Razor { public class EventHandlerTagHelperDescriptorProviderTest : BaseTagHelperDescriptorProviderTest { @@ -17,8 +17,7 @@ namespace Microsoft.AspNetCore.Blazor.Razor // Arrange var compilation = BaseCompilation.AddSyntaxTrees(Parse(@" using System; -using Microsoft.AspNetCore.Blazor; -using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Components; namespace Test { @@ -59,7 +58,7 @@ namespace Test Assert.Equal( "Sets the 'onclick' attribute to the provided string or delegate value. " + - "A delegate value should be of type 'System.Action'.", + "A delegate value should be of type 'System.Action'.", item.Documentation); // These are all trivially derived from the assembly/namespace/type name @@ -104,7 +103,7 @@ namespace Test Assert.Equal( "Sets the 'onclick' attribute to the provided string or delegate value. " + - "A delegate value should be of type 'System.Action'.", + "A delegate value should be of type 'System.Action'.", attribute.Documentation); Assert.Equal("onclick", attribute.Name); diff --git a/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/GenericTypeNameRewriterTest.cs b/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/GenericTypeNameRewriterTest.cs index fbb60a25..8dd8874c 100644 --- a/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/GenericTypeNameRewriterTest.cs +++ b/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/GenericTypeNameRewriterTest.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using Microsoft.CodeAnalysis.CSharp; using Xunit; -namespace Microsoft.AspNetCore.Blazor.Razor +namespace Microsoft.AspNetCore.Components.Razor { public class GenericTypeNameRewriterTest { diff --git a/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/GlobalQualifiedTypeNameRewriterTest.cs b/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/GlobalQualifiedTypeNameRewriterTest.cs index 38bad896..f343176b 100644 --- a/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/GlobalQualifiedTypeNameRewriterTest.cs +++ b/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/GlobalQualifiedTypeNameRewriterTest.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using Microsoft.CodeAnalysis.CSharp; using Xunit; -namespace Microsoft.AspNetCore.Blazor.Razor +namespace Microsoft.AspNetCore.Components.Razor { public class GlobalQualifiedTypeNameRewriterTest { diff --git a/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/HtmlBlockPassTest.cs b/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/HtmlBlockPassTest.cs index 402e93ad..17831050 100644 --- a/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/HtmlBlockPassTest.cs +++ b/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/HtmlBlockPassTest.cs @@ -9,7 +9,7 @@ using Microsoft.AspNetCore.Razor.Language.Intermediate; using Xunit; -namespace Microsoft.AspNetCore.Blazor.Razor +namespace Microsoft.AspNetCore.Components.Razor { public class HtmlBlockPassTest { diff --git a/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/Microsoft.AspNetCore.Blazor.Razor.Extensions.Test.csproj b/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/Microsoft.AspNetCore.Components.Razor.Extensions.Test.csproj similarity index 88% rename from test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/Microsoft.AspNetCore.Blazor.Razor.Extensions.Test.csproj rename to test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/Microsoft.AspNetCore.Components.Razor.Extensions.Test.csproj index f8ea9cec..06bbc44d 100644 --- a/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/Microsoft.AspNetCore.Blazor.Razor.Extensions.Test.csproj +++ b/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/Microsoft.AspNetCore.Components.Razor.Extensions.Test.csproj @@ -26,8 +26,8 @@ - - + + diff --git a/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/NodeAssert.cs b/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/NodeAssert.cs index f5b3a7b6..766cb81b 100644 --- a/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/NodeAssert.cs +++ b/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/NodeAssert.cs @@ -5,7 +5,7 @@ using System.Text; using Microsoft.AspNetCore.Razor.Language.Intermediate; using Xunit; -namespace Microsoft.AspNetCore.Blazor.Razor +namespace Microsoft.AspNetCore.Components.Razor { internal static class NodeAssert { diff --git a/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/RefTagHelperDescriptorProviderTest.cs b/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/RefTagHelperDescriptorProviderTest.cs index e149f37f..89b5ffd6 100644 --- a/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/RefTagHelperDescriptorProviderTest.cs +++ b/test/Microsoft.AspNetCore.Components.Razor.Extensions.Test/RefTagHelperDescriptorProviderTest.cs @@ -5,7 +5,7 @@ using Microsoft.AspNetCore.Razor.Language; using System.Linq; using Xunit; -namespace Microsoft.AspNetCore.Blazor.Razor +namespace Microsoft.AspNetCore.Components.Razor { public class RefTagHelperDescriptorProviderTest : BaseTagHelperDescriptorProviderTest { @@ -36,10 +36,10 @@ namespace Microsoft.AspNetCore.Blazor.Razor "Populates the specified field or property with a reference to the element or component.", item.Documentation); - Assert.Equal("Microsoft.AspNetCore.Blazor", item.AssemblyName); + Assert.Equal("Microsoft.AspNetCore.Components", item.AssemblyName); Assert.Equal("Ref", item.Name); - Assert.Equal("Microsoft.AspNetCore.Blazor.Components.Ref", item.DisplayName); - Assert.Equal("Microsoft.AspNetCore.Blazor.Components.Ref", item.GetTypeName()); + Assert.Equal("Microsoft.AspNetCore.Components.Ref", item.DisplayName); + Assert.Equal("Microsoft.AspNetCore.Components.Ref", item.GetTypeName()); // The tag matching rule for a ref is just the attribute name "ref" var rule = Assert.Single(item.TagMatchingRules); @@ -74,7 +74,7 @@ namespace Microsoft.AspNetCore.Blazor.Razor Assert.Equal("ref", attribute.Name); Assert.Equal("Ref", attribute.GetPropertyName()); - Assert.Equal("object Microsoft.AspNetCore.Blazor.Components.Ref.Ref", attribute.DisplayName); + Assert.Equal("object Microsoft.AspNetCore.Components.Ref.Ref", attribute.DisplayName); Assert.Equal("System.Object", attribute.TypeName); Assert.False(attribute.IsStringProperty); Assert.False(attribute.IsBooleanProperty); diff --git a/test/Microsoft.AspNetCore.Components.Server.Test/Circuits/CircuitSynchronizationContextTest.cs b/test/Microsoft.AspNetCore.Components.Server.Test/Circuits/CircuitSynchronizationContextTest.cs index 89b9cad0..db785ac9 100644 --- a/test/Microsoft.AspNetCore.Components.Server.Test/Circuits/CircuitSynchronizationContextTest.cs +++ b/test/Microsoft.AspNetCore.Components.Server.Test/Circuits/CircuitSynchronizationContextTest.cs @@ -6,10 +6,10 @@ using System.Diagnostics; using System.Globalization; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNetCore.Blazor.Server.Circuits; +using Microsoft.AspNetCore.Components.Server.Circuits; using Xunit; -namespace Microsoft.AspNetCore.Blazor.Server +namespace Microsoft.AspNetCore.Components.Server { public class CircuitSynchronizationContextTest { diff --git a/test/Microsoft.AspNetCore.Components.Server.Test/Circuits/MessagePackBufferStreamTest.cs b/test/Microsoft.AspNetCore.Components.Server.Test/Circuits/MessagePackBufferStreamTest.cs index 234ab07e..44ab3abc 100644 --- a/test/Microsoft.AspNetCore.Components.Server.Test/Circuits/MessagePackBufferStreamTest.cs +++ b/test/Microsoft.AspNetCore.Components.Server.Test/Circuits/MessagePackBufferStreamTest.cs @@ -1,11 +1,11 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNetCore.Blazor.Server.Circuits; +using Microsoft.AspNetCore.Components.Server.Circuits; using System; using Xunit; -namespace Microsoft.AspNetCore.Blazor.Server +namespace Microsoft.AspNetCore.Components.Server { public class MessagePackBufferStreamTest { diff --git a/test/Microsoft.AspNetCore.Components.Server.Test/Circuits/RenderBatchWriterTest.cs b/test/Microsoft.AspNetCore.Components.Server.Test/Circuits/RenderBatchWriterTest.cs index 44f35610..c1d4b191 100644 --- a/test/Microsoft.AspNetCore.Components.Server.Test/Circuits/RenderBatchWriterTest.cs +++ b/test/Microsoft.AspNetCore.Components.Server.Test/Circuits/RenderBatchWriterTest.cs @@ -1,10 +1,10 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNetCore.Blazor.Components; -using Microsoft.AspNetCore.Blazor.Rendering; -using Microsoft.AspNetCore.Blazor.RenderTree; -using Microsoft.AspNetCore.Blazor.Server.Circuits; +using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components.Rendering; +using Microsoft.AspNetCore.Components.RenderTree; +using Microsoft.AspNetCore.Components.Server.Circuits; using Microsoft.Extensions.DependencyInjection; using System; using System.Collections.Generic; @@ -13,7 +13,7 @@ using System.Text; using System.Threading.Tasks; using Xunit; -namespace Microsoft.AspNetCore.Blazor.Server +namespace Microsoft.AspNetCore.Components.Server { public class RenderBatchWriterTest { diff --git a/test/Microsoft.AspNetCore.Components.Server.Test/Microsoft.AspnetCore.Blazor.Server.Test.csproj b/test/Microsoft.AspNetCore.Components.Server.Test/Microsoft.AspNetCore.Components.Server.Test.csproj similarity index 88% rename from test/Microsoft.AspNetCore.Components.Server.Test/Microsoft.AspnetCore.Blazor.Server.Test.csproj rename to test/Microsoft.AspNetCore.Components.Server.Test/Microsoft.AspNetCore.Components.Server.Test.csproj index 0d9fda3a..bf545fa9 100644 --- a/test/Microsoft.AspNetCore.Components.Server.Test/Microsoft.AspnetCore.Blazor.Server.Test.csproj +++ b/test/Microsoft.AspNetCore.Components.Server.Test/Microsoft.AspNetCore.Components.Server.Test.csproj @@ -5,7 +5,6 @@ false - @@ -13,7 +12,7 @@ - + diff --git a/test/Microsoft.AspNetCore.Components.Test/CascadingParameterStateTest.cs b/test/Microsoft.AspNetCore.Components.Test/CascadingParameterStateTest.cs index 7b2fb35a..e2b12756 100644 --- a/test/Microsoft.AspNetCore.Components.Test/CascadingParameterStateTest.cs +++ b/test/Microsoft.AspNetCore.Components.Test/CascadingParameterStateTest.cs @@ -1,15 +1,15 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNetCore.Blazor.Components; -using Microsoft.AspNetCore.Blazor.Rendering; -using Microsoft.AspNetCore.Blazor.Test.Helpers; +using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components.Rendering; +using Microsoft.AspNetCore.Components.Test.Helpers; using System; using System.Collections.Generic; using System.Linq; using Xunit; -namespace Microsoft.AspNetCore.Blazor.Test +namespace Microsoft.AspNetCore.Components.Test { public class CascadingParameterStateTest { diff --git a/test/Microsoft.AspNetCore.Components.Test/CascadingParameterTest.cs b/test/Microsoft.AspNetCore.Components.Test/CascadingParameterTest.cs index ab5a3dee..a24821f7 100644 --- a/test/Microsoft.AspNetCore.Components.Test/CascadingParameterTest.cs +++ b/test/Microsoft.AspNetCore.Components.Test/CascadingParameterTest.cs @@ -1,14 +1,14 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNetCore.Blazor.Components; -using Microsoft.AspNetCore.Blazor.RenderTree; -using Microsoft.AspNetCore.Blazor.Test.Helpers; +using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components.RenderTree; +using Microsoft.AspNetCore.Components.Test.Helpers; using System; using System.Linq; using Xunit; -namespace Microsoft.AspNetCore.Blazor.Test +namespace Microsoft.AspNetCore.Components.Test { public class CascadingParameterTest { diff --git a/test/Microsoft.AspNetCore.Components.Test/DependencyInjectionTest.cs b/test/Microsoft.AspNetCore.Components.Test/DependencyInjectionTest.cs index 80a2063a..ab7a9a78 100644 --- a/test/Microsoft.AspNetCore.Components.Test/DependencyInjectionTest.cs +++ b/test/Microsoft.AspNetCore.Components.Test/DependencyInjectionTest.cs @@ -1,12 +1,12 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNetCore.Blazor.Components; -using Microsoft.AspNetCore.Blazor.Test.Helpers; +using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components.Test.Helpers; using System; using Xunit; -namespace Microsoft.AspNetCore.Blazor.Test +namespace Microsoft.AspNetCore.Components.Test { public class DependencyInjectionTest { diff --git a/test/Microsoft.AspNetCore.Components.Test/LayoutTest.cs b/test/Microsoft.AspNetCore.Components.Test/LayoutTest.cs index 06402edf..1a805434 100644 --- a/test/Microsoft.AspNetCore.Components.Test/LayoutTest.cs +++ b/test/Microsoft.AspNetCore.Components.Test/LayoutTest.cs @@ -1,15 +1,15 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNetCore.Blazor.Components; -using Microsoft.AspNetCore.Blazor.Layouts; -using Microsoft.AspNetCore.Blazor.RenderTree; -using Microsoft.AspNetCore.Blazor.Test.Helpers; +using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components.Layouts; +using Microsoft.AspNetCore.Components.RenderTree; +using Microsoft.AspNetCore.Components.Test.Helpers; using System.Collections.Generic; using System.Linq; using Xunit; -namespace Microsoft.AspNetCore.Blazor.Test +namespace Microsoft.AspNetCore.Components.Test { public class LayoutTest { diff --git a/test/Microsoft.AspNetCore.Components.Test/Microsoft.AspNetCore.Blazor.Test.csproj b/test/Microsoft.AspNetCore.Components.Test/Microsoft.AspNetCore.Components.Test.csproj similarity index 89% rename from test/Microsoft.AspNetCore.Components.Test/Microsoft.AspNetCore.Blazor.Test.csproj rename to test/Microsoft.AspNetCore.Components.Test/Microsoft.AspNetCore.Components.Test.csproj index 6d9c8192..8667c9d3 100644 --- a/test/Microsoft.AspNetCore.Components.Test/Microsoft.AspNetCore.Blazor.Test.csproj +++ b/test/Microsoft.AspNetCore.Components.Test/Microsoft.AspNetCore.Components.Test.csproj @@ -14,10 +14,13 @@ - + + + + diff --git a/test/Microsoft.AspNetCore.Components.Test/ParameterCollectionAssignmentExtensionsTest.cs b/test/Microsoft.AspNetCore.Components.Test/ParameterCollectionAssignmentExtensionsTest.cs index b0c46404..cc8d6219 100644 --- a/test/Microsoft.AspNetCore.Components.Test/ParameterCollectionAssignmentExtensionsTest.cs +++ b/test/Microsoft.AspNetCore.Components.Test/ParameterCollectionAssignmentExtensionsTest.cs @@ -4,12 +4,12 @@ using System; using System.Collections; using System.Collections.Generic; -using Microsoft.AspNetCore.Blazor.Components; -using Microsoft.AspNetCore.Blazor.RenderTree; -using Microsoft.AspNetCore.Blazor.Test.Helpers; +using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components.RenderTree; +using Microsoft.AspNetCore.Components.Test.Helpers; using Xunit; -namespace Microsoft.AspNetCore.Blazor.Test +namespace Microsoft.AspNetCore.Components.Test { public class ParameterCollectionAssignmentExtensionsTest { diff --git a/test/Microsoft.AspNetCore.Components.Test/ParameterCollectionTest.cs b/test/Microsoft.AspNetCore.Components.Test/ParameterCollectionTest.cs index 2da9dcf3..55df5d6e 100644 --- a/test/Microsoft.AspNetCore.Components.Test/ParameterCollectionTest.cs +++ b/test/Microsoft.AspNetCore.Components.Test/ParameterCollectionTest.cs @@ -1,14 +1,14 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNetCore.Blazor.Components; -using Microsoft.AspNetCore.Blazor.Rendering; -using Microsoft.AspNetCore.Blazor.RenderTree; +using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components.Rendering; +using Microsoft.AspNetCore.Components.RenderTree; using System; using System.Collections.Generic; using Xunit; -namespace Microsoft.AspNetCore.Blazor.Test +namespace Microsoft.AspNetCore.Components.Test { public class ParameterCollectionTest { diff --git a/test/Microsoft.AspNetCore.Components.Test/RenderTreeBuilderTest.cs b/test/Microsoft.AspNetCore.Components.Test/RenderTreeBuilderTest.cs index 31a4d95a..f5def4fa 100644 --- a/test/Microsoft.AspNetCore.Components.Test/RenderTreeBuilderTest.cs +++ b/test/Microsoft.AspNetCore.Components.Test/RenderTreeBuilderTest.cs @@ -1,16 +1,16 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNetCore.Blazor.Components; -using Microsoft.AspNetCore.Blazor.Rendering; -using Microsoft.AspNetCore.Blazor.RenderTree; -using Microsoft.AspNetCore.Blazor.Test.Helpers; +using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components.Rendering; +using Microsoft.AspNetCore.Components.RenderTree; +using Microsoft.AspNetCore.Components.Test.Helpers; using System; using System.Linq; using System.Threading.Tasks; using Xunit; -namespace Microsoft.AspNetCore.Blazor.Test +namespace Microsoft.AspNetCore.Components.Test { public class RenderTreeBuilderTest { diff --git a/test/Microsoft.AspNetCore.Components.Test/RenderTreeDiffBuilderTest.cs b/test/Microsoft.AspNetCore.Components.Test/RenderTreeDiffBuilderTest.cs index 13dca65d..53dd0930 100644 --- a/test/Microsoft.AspNetCore.Components.Test/RenderTreeDiffBuilderTest.cs +++ b/test/Microsoft.AspNetCore.Components.Test/RenderTreeDiffBuilderTest.cs @@ -1,17 +1,17 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNetCore.Blazor.Components; -using Microsoft.AspNetCore.Blazor.Rendering; -using Microsoft.AspNetCore.Blazor.RenderTree; -using Microsoft.AspNetCore.Blazor.Test.Helpers; +using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components.Rendering; +using Microsoft.AspNetCore.Components.RenderTree; +using Microsoft.AspNetCore.Components.Test.Helpers; using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Xunit; -namespace Microsoft.AspNetCore.Blazor.Test +namespace Microsoft.AspNetCore.Components.Test { public class RenderTreeDiffBuilderTest { diff --git a/test/Microsoft.AspNetCore.Components.Test/RendererTest.cs b/test/Microsoft.AspNetCore.Components.Test/RendererTest.cs index 57eb85d0..6d84c590 100644 --- a/test/Microsoft.AspNetCore.Components.Test/RendererTest.cs +++ b/test/Microsoft.AspNetCore.Components.Test/RendererTest.cs @@ -5,13 +5,13 @@ using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Microsoft.AspNetCore.Blazor.Components; -using Microsoft.AspNetCore.Blazor.Rendering; -using Microsoft.AspNetCore.Blazor.RenderTree; -using Microsoft.AspNetCore.Blazor.Test.Helpers; +using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components.Rendering; +using Microsoft.AspNetCore.Components.RenderTree; +using Microsoft.AspNetCore.Components.Test.Helpers; using Xunit; -namespace Microsoft.AspNetCore.Blazor.Test +namespace Microsoft.AspNetCore.Components.Test { public class RendererTest { diff --git a/test/Microsoft.AspNetCore.Components.Test/Routing/RouteTableTests.cs b/test/Microsoft.AspNetCore.Components.Test/Routing/RouteTableTests.cs index 571abd90..a4144dcf 100644 --- a/test/Microsoft.AspNetCore.Components.Test/Routing/RouteTableTests.cs +++ b/test/Microsoft.AspNetCore.Components.Test/Routing/RouteTableTests.cs @@ -4,10 +4,10 @@ using System; using System.Collections.Generic; using System.Linq; -using Microsoft.AspNetCore.Blazor.Routing; +using Microsoft.AspNetCore.Components.Routing; using Xunit; -namespace Microsoft.AspNetCore.Blazor.Test.Routing +namespace Microsoft.AspNetCore.Components.Test.Routing { public class RouteTableTests { diff --git a/test/Microsoft.AspNetCore.Components.Test/Routing/TemplateParserTests.cs b/test/Microsoft.AspNetCore.Components.Test/Routing/TemplateParserTests.cs index f6c097c0..cd5951bb 100644 --- a/test/Microsoft.AspNetCore.Components.Test/Routing/TemplateParserTests.cs +++ b/test/Microsoft.AspNetCore.Components.Test/Routing/TemplateParserTests.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Linq; using Xunit; -namespace Microsoft.AspNetCore.Blazor.Routing +namespace Microsoft.AspNetCore.Components.Routing { public class TemplateParserTests { @@ -74,7 +74,7 @@ namespace Microsoft.AspNetCore.Blazor.Routing var ex = Assert.Throws( () => TemplateParser.ParseTemplate("{p1}/literal/{p1}")); - var expectedMessage = "Invalid template '{p1}/literal/{p1}'. The parameter 'Microsoft.AspNetCore.Blazor.Routing.TemplateSegment' appears multiple times."; + var expectedMessage = "Invalid template '{p1}/literal/{p1}'. The parameter 'Microsoft.AspNetCore.Components.Routing.TemplateSegment' appears multiple times."; Assert.Equal(expectedMessage, ex.Message); } diff --git a/test/shared/AssertFrame.cs b/test/shared/AssertFrame.cs index 173ef359..8e8c5596 100644 --- a/test/shared/AssertFrame.cs +++ b/test/shared/AssertFrame.cs @@ -2,11 +2,11 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNetCore.Blazor.Components; -using Microsoft.AspNetCore.Blazor.RenderTree; +using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components.RenderTree; using Xunit; -namespace Microsoft.AspNetCore.Blazor.Test.Helpers +namespace Microsoft.AspNetCore.Components.Test.Helpers { internal static class AssertFrame { diff --git a/test/shared/AutoRenderComponent.cs b/test/shared/AutoRenderComponent.cs index 8ab9f568..b28d045a 100644 --- a/test/shared/AutoRenderComponent.cs +++ b/test/shared/AutoRenderComponent.cs @@ -1,10 +1,10 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNetCore.Blazor.Components; -using Microsoft.AspNetCore.Blazor.RenderTree; +using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components.RenderTree; -namespace Microsoft.AspNetCore.Blazor.Test.Helpers +namespace Microsoft.AspNetCore.Components.Test.Helpers { public abstract class AutoRenderComponent : IComponent { diff --git a/test/shared/CapturedBatch.cs b/test/shared/CapturedBatch.cs index c11601da..e416c32b 100644 --- a/test/shared/CapturedBatch.cs +++ b/test/shared/CapturedBatch.cs @@ -3,9 +3,9 @@ using System; using System.Collections.Generic; -using Microsoft.AspNetCore.Blazor.RenderTree; +using Microsoft.AspNetCore.Components.RenderTree; -namespace Microsoft.AspNetCore.Blazor.Test.Helpers +namespace Microsoft.AspNetCore.Components.Test.Helpers { public class CapturedBatch { diff --git a/test/shared/IComponentExtensions.cs b/test/shared/IComponentExtensions.cs index 51349438..1f7d8023 100644 --- a/test/shared/IComponentExtensions.cs +++ b/test/shared/IComponentExtensions.cs @@ -1,11 +1,11 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNetCore.Blazor.Components; -using Microsoft.AspNetCore.Blazor.RenderTree; +using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components.RenderTree; using System.Collections.Generic; -namespace Microsoft.AspNetCore.Blazor.Test.Helpers +namespace Microsoft.AspNetCore.Components.Test.Helpers { public static class IComponentExtensions { diff --git a/test/shared/TestRenderer.cs b/test/shared/TestRenderer.cs index 123ce4a5..732cc151 100644 --- a/test/shared/TestRenderer.cs +++ b/test/shared/TestRenderer.cs @@ -5,10 +5,10 @@ using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Microsoft.AspNetCore.Blazor.Components; -using Microsoft.AspNetCore.Blazor.Rendering; +using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components.Rendering; -namespace Microsoft.AspNetCore.Blazor.Test.Helpers +namespace Microsoft.AspNetCore.Components.Test.Helpers { public class TestRenderer : Renderer { diff --git a/test/shared/TestServiceProvider.cs b/test/shared/TestServiceProvider.cs index 0e862009..d1837b31 100644 --- a/test/shared/TestServiceProvider.cs +++ b/test/shared/TestServiceProvider.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; -namespace Microsoft.AspNetCore.Blazor.Test.Helpers +namespace Microsoft.AspNetCore.Components.Test.Helpers { public class TestServiceProvider : IServiceProvider { diff --git a/test/testapps/BasicTestApp/BasicTestApp.csproj b/test/testapps/BasicTestApp/BasicTestApp.csproj index 8e4f0f44..25c87725 100644 --- a/test/testapps/BasicTestApp/BasicTestApp.csproj +++ b/test/testapps/BasicTestApp/BasicTestApp.csproj @@ -8,11 +8,11 @@ run --project ../../../blazor/src/Microsoft.AspNetCore.Blazor.Cli serve --pathbase /subdir - + - - + + diff --git a/test/testapps/BasicTestApp/HttpClientTest/HttpRequestsComponent.cshtml b/test/testapps/BasicTestApp/HttpClientTest/HttpRequestsComponent.cshtml index 0bf537df..dac6ddb1 100644 --- a/test/testapps/BasicTestApp/HttpClientTest/HttpRequestsComponent.cshtml +++ b/test/testapps/BasicTestApp/HttpClientTest/HttpRequestsComponent.cshtml @@ -1,6 +1,6 @@ @using System.Net @using System.Net.Http -@using Microsoft.AspNetCore.Blazor.Browser.Http +@using Microsoft.AspNetCore.Components.Browser.Http @inject HttpClient Http

HTTP request tester

diff --git a/test/testapps/BasicTestApp/Index.cshtml b/test/testapps/BasicTestApp/Index.cshtml index 6d101e51..ea92c93d 100644 --- a/test/testapps/BasicTestApp/Index.cshtml +++ b/test/testapps/BasicTestApp/Index.cshtml @@ -1,4 +1,4 @@ -@using Microsoft.AspNetCore.Blazor.RenderTree +@using Microsoft.AspNetCore.Components.RenderTree
Select test: