From 54c71454538a6bd2ed2f9cbed49b4ef076621003 Mon Sep 17 00:00:00 2001 From: Daniel Roth Date: Thu, 26 Apr 2018 17:32:57 -0700 Subject: [PATCH 1/4] Fixup project templates to handle project names with dashes --- Blazor.sln | 14 +++++++------- ...Microsoft.AspNetCore.Blazor.Templates.nuspec | 2 +- .../.template.config.src/dotnetcli.host.json | 0 .../.template.config.src/icon.png | Bin .../.template.config.src/template.json | 16 ++++++++-------- .../.template.config.src/vs-2017.3.host.json | 0 .../BlazorHosted-CSharp.Client}/App.cshtml | 0 .../BlazorHosted-CSharp.Client.csproj} | 2 +- .../Pages/Counter.cshtml | 0 .../Pages/FetchData.cshtml | 2 +- .../Pages/Index.cshtml | 0 .../Pages/_ViewImports.cshtml | 0 .../BlazorHosted-CSharp.Client}/Program.cs | 2 +- .../Shared/MainLayout.cshtml | 0 .../Shared/NavMenu.cshtml | 2 +- .../Shared/SurveyPrompt.cshtml | 0 .../_ViewImports.cshtml | 4 ++-- .../wwwroot/css/bootstrap/bootstrap.min.css | 0 .../wwwroot/css/bootstrap/bootstrap.min.css.map | 0 .../wwwroot/css/open-iconic/FONT-LICENSE | 0 .../wwwroot/css/open-iconic/ICON-LICENSE | 0 .../wwwroot/css/open-iconic/README.md | 0 .../font/css/open-iconic-bootstrap.min.css | 0 .../css/open-iconic/font/fonts/open-iconic.eot | Bin .../css/open-iconic/font/fonts/open-iconic.otf | Bin .../css/open-iconic/font/fonts/open-iconic.svg | 0 .../css/open-iconic/font/fonts/open-iconic.ttf | Bin .../css/open-iconic/font/fonts/open-iconic.woff | Bin .../wwwroot/css/site.css | 0 .../wwwroot/index.html | 2 +- .../BlazorHosted-CSharp.Server.csproj} | 4 ++-- .../Controllers/SampleDataController.cs | 4 ++-- .../BlazorHosted-CSharp.Server}/Program.cs | 2 +- .../BlazorHosted-CSharp.Server}/Startup.cs | 2 +- .../BlazorHosted-CSharp.Shared.csproj} | 0 .../WeatherForecast.cs | 2 +- .../BlazorHosted-CSharp.sln} | 6 +++--- .../global.json | 0 .../.template.config.src/dotnetcli.host.json | 0 .../.template.config.src/icon.png | Bin .../.template.config.src/template.json | 4 ++-- .../BlazorLibrary-CSharp.csproj} | 0 .../Component1.cshtml | 2 +- .../ExampleJsInterop.cs | 4 ++-- .../content/background.png | Bin .../content/exampleJsInterop.js | 2 +- .../content/styles.css | 0 .../.template.config.src/dotnetcli.host.json | 0 .../.template.config.src/icon.png | Bin .../.template.config.src/template.json | 4 ++-- .../.template.config.src/vs-2017.3.host.json | 0 .../App.cshtml | 0 .../BlazorStandalone-CSharp.csproj} | 0 .../Pages/Counter.cshtml | 0 .../Pages/FetchData.cshtml | 0 .../Pages/Index.cshtml | 0 .../Pages/_ViewImports.cshtml | 0 .../Program.cs | 2 +- .../Properties/launchSettings.json | 2 +- .../Shared/MainLayout.cshtml | 0 .../Shared/NavMenu.cshtml | 2 +- .../Shared/SurveyPrompt.cshtml | 0 .../_ViewImports.cshtml | 4 ++-- .../global.json | 0 .../wwwroot/css/bootstrap/bootstrap.min.css | 0 .../wwwroot/css/bootstrap/bootstrap.min.css.map | 0 .../wwwroot/css/open-iconic/FONT-LICENSE | 0 .../wwwroot/css/open-iconic/ICON-LICENSE | 0 .../wwwroot/css/open-iconic/README.md | 0 .../font/css/open-iconic-bootstrap.min.css | 0 .../css/open-iconic/font/fonts/open-iconic.eot | Bin .../css/open-iconic/font/fonts/open-iconic.otf | Bin .../css/open-iconic/font/fonts/open-iconic.svg | 0 .../css/open-iconic/font/fonts/open-iconic.ttf | Bin .../css/open-iconic/font/fonts/open-iconic.woff | Bin .../wwwroot/css/site.css | 0 .../wwwroot/index.html | 2 +- .../wwwroot/sample-data/weather.json | 0 78 files changed, 47 insertions(+), 47 deletions(-) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorHosted.CSharp => BlazorHosted-CSharp}/.template.config.src/dotnetcli.host.json (100%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorHosted.CSharp => BlazorHosted-CSharp}/.template.config.src/icon.png (100%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorHosted.CSharp => BlazorHosted-CSharp}/.template.config.src/template.json (88%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorHosted.CSharp => BlazorHosted-CSharp}/.template.config.src/vs-2017.3.host.json (100%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorHosted.CSharp/BlazorHosted.CSharp.Client => BlazorHosted-CSharp/BlazorHosted-CSharp.Client}/App.cshtml (100%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorHosted.CSharp/BlazorHosted.CSharp.Client/BlazorHosted.CSharp.Client.csproj => BlazorHosted-CSharp/BlazorHosted-CSharp.Client/BlazorHosted-CSharp.Client.csproj} (88%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorHosted.CSharp/BlazorHosted.CSharp.Client => BlazorHosted-CSharp/BlazorHosted-CSharp.Client}/Pages/Counter.cshtml (100%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorHosted.CSharp/BlazorHosted.CSharp.Client => BlazorHosted-CSharp/BlazorHosted-CSharp.Client}/Pages/FetchData.cshtml (96%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorHosted.CSharp/BlazorHosted.CSharp.Client => BlazorHosted-CSharp/BlazorHosted-CSharp.Client}/Pages/Index.cshtml (100%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorHosted.CSharp/BlazorHosted.CSharp.Client => BlazorHosted-CSharp/BlazorHosted-CSharp.Client}/Pages/_ViewImports.cshtml (100%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorHosted.CSharp/BlazorHosted.CSharp.Client => BlazorHosted-CSharp/BlazorHosted-CSharp.Client}/Program.cs (93%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorHosted.CSharp/BlazorHosted.CSharp.Client => BlazorHosted-CSharp/BlazorHosted-CSharp.Client}/Shared/MainLayout.cshtml (100%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorHosted.CSharp/BlazorHosted.CSharp.Client => BlazorHosted-CSharp/BlazorHosted-CSharp.Client}/Shared/NavMenu.cshtml (94%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorHosted.CSharp/BlazorHosted.CSharp.Client => BlazorHosted-CSharp/BlazorHosted-CSharp.Client}/Shared/SurveyPrompt.cshtml (100%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorHosted.CSharp/BlazorHosted.CSharp.Client => BlazorHosted-CSharp/BlazorHosted-CSharp.Client}/_ViewImports.cshtml (72%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorHosted.CSharp/BlazorHosted.CSharp.Client => BlazorHosted-CSharp/BlazorHosted-CSharp.Client}/wwwroot/css/bootstrap/bootstrap.min.css (100%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorHosted.CSharp/BlazorHosted.CSharp.Client => BlazorHosted-CSharp/BlazorHosted-CSharp.Client}/wwwroot/css/bootstrap/bootstrap.min.css.map (100%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorHosted.CSharp/BlazorHosted.CSharp.Client => BlazorHosted-CSharp/BlazorHosted-CSharp.Client}/wwwroot/css/open-iconic/FONT-LICENSE (100%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorHosted.CSharp/BlazorHosted.CSharp.Client => BlazorHosted-CSharp/BlazorHosted-CSharp.Client}/wwwroot/css/open-iconic/ICON-LICENSE (100%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorHosted.CSharp/BlazorHosted.CSharp.Client => BlazorHosted-CSharp/BlazorHosted-CSharp.Client}/wwwroot/css/open-iconic/README.md (100%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorHosted.CSharp/BlazorHosted.CSharp.Client => BlazorHosted-CSharp/BlazorHosted-CSharp.Client}/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css (100%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorHosted.CSharp/BlazorHosted.CSharp.Client => BlazorHosted-CSharp/BlazorHosted-CSharp.Client}/wwwroot/css/open-iconic/font/fonts/open-iconic.eot (100%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorHosted.CSharp/BlazorHosted.CSharp.Client => BlazorHosted-CSharp/BlazorHosted-CSharp.Client}/wwwroot/css/open-iconic/font/fonts/open-iconic.otf (100%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorHosted.CSharp/BlazorHosted.CSharp.Client => BlazorHosted-CSharp/BlazorHosted-CSharp.Client}/wwwroot/css/open-iconic/font/fonts/open-iconic.svg (100%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorHosted.CSharp/BlazorHosted.CSharp.Client => BlazorHosted-CSharp/BlazorHosted-CSharp.Client}/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf (100%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorHosted.CSharp/BlazorHosted.CSharp.Client => BlazorHosted-CSharp/BlazorHosted-CSharp.Client}/wwwroot/css/open-iconic/font/fonts/open-iconic.woff (100%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorHosted.CSharp/BlazorHosted.CSharp.Client => BlazorHosted-CSharp/BlazorHosted-CSharp.Client}/wwwroot/css/site.css (100%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorHosted.CSharp/BlazorHosted.CSharp.Client => BlazorHosted-CSharp/BlazorHosted-CSharp.Client}/wwwroot/index.html (90%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorHosted.CSharp/BlazorHosted.CSharp.Server/BlazorHosted.CSharp.Server.csproj => BlazorHosted-CSharp/BlazorHosted-CSharp.Server/BlazorHosted-CSharp.Server.csproj} (83%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorHosted.CSharp/BlazorHosted.CSharp.Server => BlazorHosted-CSharp/BlazorHosted-CSharp.Server}/Controllers/SampleDataController.cs (90%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorHosted.CSharp/BlazorHosted.CSharp.Server => BlazorHosted-CSharp/BlazorHosted-CSharp.Server}/Program.cs (95%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorHosted.CSharp/BlazorHosted.CSharp.Server => BlazorHosted-CSharp/BlazorHosted-CSharp.Server}/Startup.cs (98%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorHosted.CSharp/BlazorHosted.CSharp.Shared/BlazorHosted.CSharp.Shared.csproj => BlazorHosted-CSharp/BlazorHosted-CSharp.Shared/BlazorHosted-CSharp.Shared.csproj} (100%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorHosted.CSharp/BlazorHosted.CSharp.Shared => BlazorHosted-CSharp/BlazorHosted-CSharp.Shared}/WeatherForecast.cs (89%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorHosted.CSharp/BlazorHosted.CSharp.sln => BlazorHosted-CSharp/BlazorHosted-CSharp.sln} (95%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorHosted.CSharp => BlazorHosted-CSharp}/global.json (100%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorLibrary.CSharp => BlazorLibrary-CSharp}/.template.config.src/dotnetcli.host.json (100%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorLibrary.CSharp => BlazorLibrary-CSharp}/.template.config.src/icon.png (100%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorLibrary.CSharp => BlazorLibrary-CSharp}/.template.config.src/template.json (96%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorLibrary.CSharp/BlazorLibrary.CSharp.csproj => BlazorLibrary-CSharp/BlazorLibrary-CSharp.csproj} (100%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorLibrary.CSharp => BlazorLibrary-CSharp}/Component1.cshtml (78%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorLibrary.CSharp => BlazorLibrary-CSharp}/ExampleJsInterop.cs (74%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorLibrary.CSharp => BlazorLibrary-CSharp}/content/background.png (100%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorLibrary.CSharp => BlazorLibrary-CSharp}/content/exampleJsInterop.js (75%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorLibrary.CSharp => BlazorLibrary-CSharp}/content/styles.css (100%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorStandalone.CSharp => BlazorStandalone-CSharp}/.template.config.src/dotnetcli.host.json (100%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorStandalone.CSharp => BlazorStandalone-CSharp}/.template.config.src/icon.png (100%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorStandalone.CSharp => BlazorStandalone-CSharp}/.template.config.src/template.json (96%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorStandalone.CSharp => BlazorStandalone-CSharp}/.template.config.src/vs-2017.3.host.json (100%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorStandalone.CSharp => BlazorStandalone-CSharp}/App.cshtml (100%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorStandalone.CSharp/BlazorStandalone.CSharp.csproj => BlazorStandalone-CSharp/BlazorStandalone-CSharp.csproj} (100%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorStandalone.CSharp => BlazorStandalone-CSharp}/Pages/Counter.cshtml (100%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorStandalone.CSharp => BlazorStandalone-CSharp}/Pages/FetchData.cshtml (100%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorStandalone.CSharp => BlazorStandalone-CSharp}/Pages/Index.cshtml (100%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorStandalone.CSharp => BlazorStandalone-CSharp}/Pages/_ViewImports.cshtml (100%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorStandalone.CSharp => BlazorStandalone-CSharp}/Program.cs (93%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorStandalone.CSharp => BlazorStandalone-CSharp}/Properties/launchSettings.json (87%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorStandalone.CSharp => BlazorStandalone-CSharp}/Shared/MainLayout.cshtml (100%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorStandalone.CSharp => BlazorStandalone-CSharp}/Shared/NavMenu.cshtml (94%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorStandalone.CSharp => BlazorStandalone-CSharp}/Shared/SurveyPrompt.cshtml (100%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorStandalone.CSharp => BlazorStandalone-CSharp}/_ViewImports.cshtml (73%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorStandalone.CSharp => BlazorStandalone-CSharp}/global.json (100%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorStandalone.CSharp => BlazorStandalone-CSharp}/wwwroot/css/bootstrap/bootstrap.min.css (100%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorStandalone.CSharp => BlazorStandalone-CSharp}/wwwroot/css/bootstrap/bootstrap.min.css.map (100%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorStandalone.CSharp => BlazorStandalone-CSharp}/wwwroot/css/open-iconic/FONT-LICENSE (100%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorStandalone.CSharp => BlazorStandalone-CSharp}/wwwroot/css/open-iconic/ICON-LICENSE (100%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorStandalone.CSharp => BlazorStandalone-CSharp}/wwwroot/css/open-iconic/README.md (100%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorStandalone.CSharp => BlazorStandalone-CSharp}/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css (100%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorStandalone.CSharp => BlazorStandalone-CSharp}/wwwroot/css/open-iconic/font/fonts/open-iconic.eot (100%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorStandalone.CSharp => BlazorStandalone-CSharp}/wwwroot/css/open-iconic/font/fonts/open-iconic.otf (100%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorStandalone.CSharp => BlazorStandalone-CSharp}/wwwroot/css/open-iconic/font/fonts/open-iconic.svg (100%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorStandalone.CSharp => BlazorStandalone-CSharp}/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf (100%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorStandalone.CSharp => BlazorStandalone-CSharp}/wwwroot/css/open-iconic/font/fonts/open-iconic.woff (100%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorStandalone.CSharp => BlazorStandalone-CSharp}/wwwroot/css/site.css (100%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorStandalone.CSharp => BlazorStandalone-CSharp}/wwwroot/index.html (89%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorStandalone.CSharp => BlazorStandalone-CSharp}/wwwroot/sample-data/weather.json (100%) diff --git a/Blazor.sln b/Blazor.sln index ec82a23aa..f9581e909 100644 --- a/Blazor.sln +++ b/Blazor.sln @@ -66,18 +66,18 @@ 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", "src\Microsoft.AspNetCore.Blazor.Templates\content\BlazorStandalone.CSharp\BlazorStandalone.CSharp.csproj", "{A092FA91-856B-4ACA-B1C2-10BDBA366185}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorStandalone-CSharp", "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}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BlazorHosted-CSharp", "BlazorHosted-CSharp", "{73DA1DFD-79F0-4BA2-B0B6-4F3A21D2C3F8}" ProjectSection(SolutionItems) = preProject - src\Microsoft.AspNetCore.Blazor.Templates\content\BlazorHosted.CSharp\global.json = src\Microsoft.AspNetCore.Blazor.Templates\content\BlazorHosted.CSharp\global.json + src\Microsoft.AspNetCore.Blazor.Templates\content\BlazorHosted-CSharp\global.json = src\Microsoft.AspNetCore.Blazor.Templates\content\BlazorHosted-CSharp\global.json EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorHosted.CSharp.Client", "src\Microsoft.AspNetCore.Blazor.Templates\content\BlazorHosted.CSharp\BlazorHosted.CSharp.Client\BlazorHosted.CSharp.Client.csproj", "{7549444A-9C81-44DE-AD0D-2C55501EAAC7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorHosted-CSharp.Client", "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", "src\Microsoft.AspNetCore.Blazor.Templates\content\BlazorHosted.CSharp\BlazorHosted.CSharp.Server\BlazorHosted.CSharp.Server.csproj", "{78ED9932-0912-4F36-8F82-33DE850E7A33}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorHosted-CSharp.Server", "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", "src\Microsoft.AspNetCore.Blazor.Templates\content\BlazorHosted.CSharp\BlazorHosted.CSharp.Shared\BlazorHosted.CSharp.Shared.csproj", "{F3E02B21-1127-431A-B832-0E53CB72097B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorHosted-CSharp.Shared", "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.Blazor.Razor.Extensions.Test\Microsoft.AspNetCore.Blazor.Razor.Extensions.Test.csproj", "{FF25111E-5A3E-48A3-96D8-08A2C5A2A91C}" EndProject @@ -93,7 +93,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarks", "benchmarks", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Blazor.Performance", "benchmarks\Microsoft.AspNetCore.Blazor.Performance\Microsoft.AspNetCore.Blazor.Performance.csproj", "{50F6820F-D058-4E68-9E15-801F893F514E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorLibrary.CSharp", "src\Microsoft.AspNetCore.Blazor.Templates\content\BlazorLibrary.CSharp\BlazorLibrary.CSharp.csproj", "{3A457B14-D91B-4FFF-A81A-8F350BDB911F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorLibrary-CSharp", "src\Microsoft.AspNetCore.Blazor.Templates\content\BlazorLibrary-CSharp\BlazorLibrary-CSharp.csproj", "{3A457B14-D91B-4FFF-A81A-8F350BDB911F}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/Microsoft.AspNetCore.Blazor.Templates.nuspec b/src/Microsoft.AspNetCore.Blazor.Templates/Microsoft.AspNetCore.Blazor.Templates.nuspec index 0936c02b4..37a4f5014 100644 --- a/src/Microsoft.AspNetCore.Blazor.Templates/Microsoft.AspNetCore.Blazor.Templates.nuspec +++ b/src/Microsoft.AspNetCore.Blazor.Templates/Microsoft.AspNetCore.Blazor.Templates.nuspec @@ -19,7 +19,7 @@ diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/.template.config.src/dotnetcli.host.json b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/.template.config.src/dotnetcli.host.json similarity index 100% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/.template.config.src/dotnetcli.host.json rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/.template.config.src/dotnetcli.host.json diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/.template.config.src/icon.png b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/.template.config.src/icon.png similarity index 100% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/.template.config.src/icon.png rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/.template.config.src/icon.png diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/.template.config.src/template.json b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/.template.config.src/template.json similarity index 88% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/.template.config.src/template.json rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/.template.config.src/template.json index 992a79e2a..f980b46d0 100644 --- a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/.template.config.src/template.json +++ b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/.template.config.src/template.json @@ -18,35 +18,35 @@ "primaryOutputs": [ { "condition": "(HostIdentifier == \"dotnetcli\" || HostIdentifier == \"dotnetcli-preview\")", - "path": "BlazorHosted.CSharp.sln" + "path": "BlazorHosted-CSharp.sln" }, { "condition": "(OS == \"Windows_NT\" && HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", - "path": "BlazorHosted.CSharp.Server\\BlazorHosted.CSharp.Server.csproj" + "path": "BlazorHosted-CSharp.Server\\BlazorHosted-CSharp.Server.csproj" }, { "condition": "(OS != \"Windows_NT\" && HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", - "path": "BlazorHosted.CSharp.Server/BlazorHosted.CSharp.Server.csproj" + "path": "BlazorHosted-CSharp.Server/BlazorHosted-CSharp.Server.csproj" }, { "condition": "(OS == \"Windows_NT\" && HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", - "path": "BlazorHosted.CSharp.Client\\BlazorHosted.CSharp.Client.csproj" + "path": "BlazorHosted-CSharp.Client\\BlazorHosted-CSharp.Client.csproj" }, { "condition": "(OS != \"Windows_NT\" && HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", - "path": "BlazorHosted.CSharp.Client/BlazorHosted.CSharp.Client.csproj" + "path": "BlazorHosted-CSharp.Client/BlazorHosted-CSharp.Client.csproj" }, { "condition": "(OS == \"Windows_NT\" && HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", - "path": "BlazorHosted.CSharp.Shared\\BlazorHosted.CSharp.Shared.csproj" + "path": "BlazorHosted-CSharp.Shared\\BlazorHosted-CSharp.Shared.csproj" }, { "condition": "(OS != \"Windows_NT\" && HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")", - "path": "BlazorHosted.CSharp.Shared/BlazorHosted.CSharp.Shared.csproj" + "path": "BlazorHosted-CSharp.Shared/BlazorHosted-CSharp.Shared.csproj" } ], "shortName": "blazorhosted", - "sourceName": "BlazorHosted.CSharp", + "sourceName": "BlazorHosted-CSharp", "sources": [ { "source": "./", diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/.template.config.src/vs-2017.3.host.json b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/.template.config.src/vs-2017.3.host.json similarity index 100% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/.template.config.src/vs-2017.3.host.json rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/.template.config.src/vs-2017.3.host.json diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/App.cshtml b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/App.cshtml similarity index 100% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/App.cshtml rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/App.cshtml diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/BlazorHosted.CSharp.Client.csproj b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/BlazorHosted-CSharp.Client.csproj similarity index 88% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/BlazorHosted.CSharp.Client.csproj rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/BlazorHosted-CSharp.Client.csproj index a93516e05..ff0f4e61a 100644 --- a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/BlazorHosted.CSharp.Client.csproj +++ b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/BlazorHosted-CSharp.Client.csproj @@ -17,7 +17,7 @@ - + diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/Pages/Counter.cshtml b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Pages/Counter.cshtml similarity index 100% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/Pages/Counter.cshtml rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Pages/Counter.cshtml diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/Pages/FetchData.cshtml b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Pages/FetchData.cshtml similarity index 96% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/Pages/FetchData.cshtml rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Pages/FetchData.cshtml index 8f3dc8adf..17fb839fd 100644 --- a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/Pages/FetchData.cshtml +++ b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Pages/FetchData.cshtml @@ -1,4 +1,4 @@ -@using BlazorHosted.CSharp.Shared +@using BlazorHosted_CSharp.Shared @page "/fetchdata" @inject HttpClient Http diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/Pages/Index.cshtml b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Pages/Index.cshtml similarity index 100% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/Pages/Index.cshtml rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Pages/Index.cshtml diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/Pages/_ViewImports.cshtml b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Pages/_ViewImports.cshtml similarity index 100% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/Pages/_ViewImports.cshtml rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Pages/_ViewImports.cshtml diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/Program.cs b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Program.cs similarity index 93% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/Program.cs rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Program.cs index 45df353c3..8c06d7534 100644 --- a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/Program.cs +++ b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Program.cs @@ -3,7 +3,7 @@ using Microsoft.Extensions.DependencyInjection; using System; -namespace BlazorHosted.CSharp.Client +namespace BlazorHosted_CSharp.Client { public class Program { diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/Shared/MainLayout.cshtml b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Shared/MainLayout.cshtml similarity index 100% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/Shared/MainLayout.cshtml rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Shared/MainLayout.cshtml diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/Shared/NavMenu.cshtml b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Shared/NavMenu.cshtml similarity index 94% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/Shared/NavMenu.cshtml rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Shared/NavMenu.cshtml index 0aa6d02a5..084215c61 100644 --- a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/Shared/NavMenu.cshtml +++ b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Shared/NavMenu.cshtml @@ -1,5 +1,5 @@ 
- BlazorHosted.CSharp + BlazorHosted-CSharp diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/Shared/SurveyPrompt.cshtml b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Shared/SurveyPrompt.cshtml similarity index 100% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/Shared/SurveyPrompt.cshtml rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Shared/SurveyPrompt.cshtml diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/_ViewImports.cshtml b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/_ViewImports.cshtml similarity index 72% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/_ViewImports.cshtml rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/_ViewImports.cshtml index e50904ca7..d62e1b903 100644 --- a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/_ViewImports.cshtml +++ b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/_ViewImports.cshtml @@ -3,5 +3,5 @@ @using Microsoft.AspNetCore.Blazor.Components @using Microsoft.AspNetCore.Blazor.Layouts @using Microsoft.AspNetCore.Blazor.Routing -@using BlazorHosted.CSharp.Client -@using BlazorHosted.CSharp.Client.Shared +@using BlazorHosted_CSharp.Client +@using BlazorHosted_CSharp.Client.Shared diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/wwwroot/css/bootstrap/bootstrap.min.css b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/wwwroot/css/bootstrap/bootstrap.min.css similarity index 100% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/wwwroot/css/bootstrap/bootstrap.min.css rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/wwwroot/css/bootstrap/bootstrap.min.css diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/wwwroot/css/bootstrap/bootstrap.min.css.map b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/wwwroot/css/bootstrap/bootstrap.min.css.map similarity index 100% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/wwwroot/css/bootstrap/bootstrap.min.css.map rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/wwwroot/css/bootstrap/bootstrap.min.css.map diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/wwwroot/css/open-iconic/FONT-LICENSE b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/wwwroot/css/open-iconic/FONT-LICENSE similarity index 100% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/wwwroot/css/open-iconic/FONT-LICENSE rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/wwwroot/css/open-iconic/FONT-LICENSE diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/wwwroot/css/open-iconic/ICON-LICENSE b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/wwwroot/css/open-iconic/ICON-LICENSE similarity index 100% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/wwwroot/css/open-iconic/ICON-LICENSE rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/wwwroot/css/open-iconic/ICON-LICENSE diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/wwwroot/css/open-iconic/README.md b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/wwwroot/css/open-iconic/README.md similarity index 100% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/wwwroot/css/open-iconic/README.md rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/wwwroot/css/open-iconic/README.md diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css similarity index 100% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/wwwroot/css/open-iconic/font/fonts/open-iconic.eot b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/wwwroot/css/open-iconic/font/fonts/open-iconic.eot similarity index 100% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/wwwroot/css/open-iconic/font/fonts/open-iconic.eot rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/wwwroot/css/open-iconic/font/fonts/open-iconic.eot diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/wwwroot/css/open-iconic/font/fonts/open-iconic.otf b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/wwwroot/css/open-iconic/font/fonts/open-iconic.otf similarity index 100% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/wwwroot/css/open-iconic/font/fonts/open-iconic.otf rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/wwwroot/css/open-iconic/font/fonts/open-iconic.otf diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/wwwroot/css/open-iconic/font/fonts/open-iconic.svg b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/wwwroot/css/open-iconic/font/fonts/open-iconic.svg similarity index 100% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/wwwroot/css/open-iconic/font/fonts/open-iconic.svg rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/wwwroot/css/open-iconic/font/fonts/open-iconic.svg diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf similarity index 100% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/wwwroot/css/open-iconic/font/fonts/open-iconic.woff b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/wwwroot/css/open-iconic/font/fonts/open-iconic.woff similarity index 100% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/wwwroot/css/open-iconic/font/fonts/open-iconic.woff rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/wwwroot/css/open-iconic/font/fonts/open-iconic.woff diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/wwwroot/css/site.css b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/wwwroot/css/site.css similarity index 100% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/wwwroot/css/site.css rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/wwwroot/css/site.css diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/wwwroot/index.html b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/wwwroot/index.html similarity index 90% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/wwwroot/index.html rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/wwwroot/index.html index 8863a20cf..2f52d8478 100644 --- a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/wwwroot/index.html +++ b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/wwwroot/index.html @@ -3,7 +3,7 @@ - BlazorHosted.CSharp + BlazorHosted-CSharp diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Server/BlazorHosted.CSharp.Server.csproj b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Server/BlazorHosted-CSharp.Server.csproj similarity index 83% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Server/BlazorHosted.CSharp.Server.csproj rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Server/BlazorHosted-CSharp.Server.csproj index d30bddb6e..139d80ebd 100644 --- a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Server/BlazorHosted.CSharp.Server.csproj +++ b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Server/BlazorHosted-CSharp.Server.csproj @@ -20,8 +20,8 @@ - - + + diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Server/Controllers/SampleDataController.cs b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Server/Controllers/SampleDataController.cs similarity index 90% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Server/Controllers/SampleDataController.cs rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Server/Controllers/SampleDataController.cs index 31a8d6b86..2a7d8a515 100644 --- a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Server/Controllers/SampleDataController.cs +++ b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Server/Controllers/SampleDataController.cs @@ -1,11 +1,11 @@ -using BlazorHosted.CSharp.Shared; +using BlazorHosted_CSharp.Shared; using Microsoft.AspNetCore.Mvc; using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace BlazorHosted.CSharp.Server.Controllers +namespace BlazorHosted_CSharp.Server.Controllers { [Route("api/[controller]")] public class SampleDataController : Controller diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Server/Program.cs b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Server/Program.cs similarity index 95% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Server/Program.cs rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Server/Program.cs index a793ae573..9868c1ece 100644 --- a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Server/Program.cs +++ b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Server/Program.cs @@ -5,7 +5,7 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; -namespace BlazorHosted.CSharp.Server +namespace BlazorHosted_CSharp.Server { public class Program { diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Server/Startup.cs b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Server/Startup.cs similarity index 98% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Server/Startup.cs rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Server/Startup.cs index e8ece5fa8..959a06825 100644 --- a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Server/Startup.cs +++ b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Server/Startup.cs @@ -10,7 +10,7 @@ using System.Linq; using System.Net.Mime; -namespace BlazorHosted.CSharp.Server +namespace BlazorHosted_CSharp.Server { public class Startup { diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Shared/BlazorHosted.CSharp.Shared.csproj b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Shared/BlazorHosted-CSharp.Shared.csproj similarity index 100% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Shared/BlazorHosted.CSharp.Shared.csproj rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Shared/BlazorHosted-CSharp.Shared.csproj diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Shared/WeatherForecast.cs b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Shared/WeatherForecast.cs similarity index 89% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Shared/WeatherForecast.cs rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Shared/WeatherForecast.cs index 7e1f74e4c..da152b204 100644 --- a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Shared/WeatherForecast.cs +++ b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Shared/WeatherForecast.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace BlazorHosted.CSharp.Shared +namespace BlazorHosted_CSharp.Shared { public class WeatherForecast { diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.sln b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.sln similarity index 95% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.sln rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.sln index ed4f1084f..9879df849 100644 --- a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.sln +++ b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.sln @@ -2,11 +2,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.27130.2027 MinimumVisualStudioVersion = 15.0.26124.0 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorHosted.CSharp.Server", "BlazorHosted.CSharp.Server\BlazorHosted.CSharp.Server.csproj", "{650B3CE7-2E93-4CC4-9F46-466686815EAA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorHosted-CSharp.Server", "BlazorHosted-CSharp.Server\BlazorHosted-CSharp.Server.csproj", "{650B3CE7-2E93-4CC4-9F46-466686815EAA}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorHosted.CSharp.Client", "BlazorHosted.CSharp.Client\BlazorHosted.CSharp.Client.csproj", "{5990939C-7E7B-4CFA-86FF-44CA5756498A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorHosted-CSharp.Client", "BlazorHosted-CSharp.Client\BlazorHosted-CSharp.Client.csproj", "{5990939C-7E7B-4CFA-86FF-44CA5756498A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorHosted.CSharp.Shared", "BlazorHosted.CSharp.Shared\BlazorHosted.CSharp.Shared.csproj", "{0AFFA7FD-4E37-4636-AB91-3753E746DB98}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorHosted-CSharp.Shared", "BlazorHosted-CSharp.Shared\BlazorHosted-CSharp.Shared.csproj", "{0AFFA7FD-4E37-4636-AB91-3753E746DB98}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/global.json b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/global.json similarity index 100% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/global.json rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/global.json diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary.CSharp/.template.config.src/dotnetcli.host.json b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary-CSharp/.template.config.src/dotnetcli.host.json similarity index 100% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary.CSharp/.template.config.src/dotnetcli.host.json rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary-CSharp/.template.config.src/dotnetcli.host.json diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary.CSharp/.template.config.src/icon.png b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary-CSharp/.template.config.src/icon.png similarity index 100% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary.CSharp/.template.config.src/icon.png rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary-CSharp/.template.config.src/icon.png diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary.CSharp/.template.config.src/template.json b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary-CSharp/.template.config.src/template.json similarity index 96% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary.CSharp/.template.config.src/template.json rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary-CSharp/.template.config.src/template.json index a2cf1faa2..b9f6fd370 100644 --- a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary.CSharp/.template.config.src/template.json +++ b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary-CSharp/.template.config.src/template.json @@ -11,11 +11,11 @@ "preferNameDirectory": true, "primaryOutputs": [ { - "path": "BlazorLibrary.CSharp.csproj" + "path": "BlazorLibrary-CSharp.csproj" } ], "shortName": "blazorlib", - "sourceName": "BlazorLibrary.CSharp", + "sourceName": "BlazorLibrary-CSharp", "sources": [ { "source": "./", diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary.CSharp/BlazorLibrary.CSharp.csproj b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary-CSharp/BlazorLibrary-CSharp.csproj similarity index 100% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary.CSharp/BlazorLibrary.CSharp.csproj rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary-CSharp/BlazorLibrary-CSharp.csproj diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary.CSharp/Component1.cshtml b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary-CSharp/Component1.cshtml similarity index 78% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary.CSharp/Component1.cshtml rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary-CSharp/Component1.cshtml index 4a3c5843c..cf5e99f37 100644 --- a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary.CSharp/Component1.cshtml +++ b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary-CSharp/Component1.cshtml @@ -1,3 +1,3 @@ 
- This Blazor component is defined in the BlazorLibrary.CSharp package. + This Blazor component is defined in the BlazorLibrary-CSharp package.
diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary.CSharp/ExampleJsInterop.cs b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary-CSharp/ExampleJsInterop.cs similarity index 74% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary.CSharp/ExampleJsInterop.cs rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary-CSharp/ExampleJsInterop.cs index 56b8415db..a1095d897 100644 --- a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary.CSharp/ExampleJsInterop.cs +++ b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary-CSharp/ExampleJsInterop.cs @@ -1,14 +1,14 @@ using System; using Microsoft.AspNetCore.Blazor.Browser.Interop; -namespace BlazorLibrary.CSharp +namespace BlazorLibrary_CSharp { public class ExampleJsInterop { public static string Prompt(string message) { return RegisteredFunction.Invoke( - "BlazorLibrary.CSharp.ExampleJsInterop.Prompt", + "BlazorLibrary-CSharp.ExampleJsInterop.Prompt", message); } } diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary.CSharp/content/background.png b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary-CSharp/content/background.png similarity index 100% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary.CSharp/content/background.png rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary-CSharp/content/background.png diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary.CSharp/content/exampleJsInterop.js b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary-CSharp/content/exampleJsInterop.js similarity index 75% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary.CSharp/content/exampleJsInterop.js rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary-CSharp/content/exampleJsInterop.js index 3939d8154..e765c02db 100644 --- a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary.CSharp/content/exampleJsInterop.js +++ b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary-CSharp/content/exampleJsInterop.js @@ -1,6 +1,6 @@ // This file is to show how a library package may provide JavaScript interop features // wrapped in a .NET API -Blazor.registerFunction('BlazorLibrary.CSharp.ExampleJsInterop.Prompt', function (message) { +Blazor.registerFunction('BlazorLibrary-CSharp.ExampleJsInterop.Prompt', function (message) { return prompt(message, 'Type anything here'); }); diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary.CSharp/content/styles.css b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary-CSharp/content/styles.css similarity index 100% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary.CSharp/content/styles.css rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary-CSharp/content/styles.css diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/.template.config.src/dotnetcli.host.json b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/.template.config.src/dotnetcli.host.json similarity index 100% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/.template.config.src/dotnetcli.host.json rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/.template.config.src/dotnetcli.host.json diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/.template.config.src/icon.png b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/.template.config.src/icon.png similarity index 100% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/.template.config.src/icon.png rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/.template.config.src/icon.png diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/.template.config.src/template.json b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/.template.config.src/template.json similarity index 96% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/.template.config.src/template.json rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/.template.config.src/template.json index f96067277..a58f55749 100644 --- a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/.template.config.src/template.json +++ b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/.template.config.src/template.json @@ -11,11 +11,11 @@ "preferNameDirectory": true, "primaryOutputs": [ { - "path": "BlazorStandalone.CSharp.csproj" + "path": "BlazorStandalone-CSharp.csproj" } ], "shortName": "blazor", - "sourceName": "BlazorStandalone.CSharp", + "sourceName": "BlazorStandalone-CSharp", "sources": [ { "source": "./", diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/.template.config.src/vs-2017.3.host.json b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/.template.config.src/vs-2017.3.host.json similarity index 100% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/.template.config.src/vs-2017.3.host.json rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/.template.config.src/vs-2017.3.host.json diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/App.cshtml b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/App.cshtml similarity index 100% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/App.cshtml rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/App.cshtml diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/BlazorStandalone.CSharp.csproj b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/BlazorStandalone-CSharp.csproj similarity index 100% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/BlazorStandalone.CSharp.csproj rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/BlazorStandalone-CSharp.csproj diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/Pages/Counter.cshtml b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/Pages/Counter.cshtml similarity index 100% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/Pages/Counter.cshtml rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/Pages/Counter.cshtml diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/Pages/FetchData.cshtml b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/Pages/FetchData.cshtml similarity index 100% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/Pages/FetchData.cshtml rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/Pages/FetchData.cshtml diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/Pages/Index.cshtml b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/Pages/Index.cshtml similarity index 100% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/Pages/Index.cshtml rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/Pages/Index.cshtml diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/Pages/_ViewImports.cshtml b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/Pages/_ViewImports.cshtml similarity index 100% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/Pages/_ViewImports.cshtml rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/Pages/_ViewImports.cshtml diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/Program.cs b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/Program.cs similarity index 93% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/Program.cs rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/Program.cs index 2481e6a7a..637636f59 100644 --- a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/Program.cs +++ b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/Program.cs @@ -3,7 +3,7 @@ using Microsoft.Extensions.DependencyInjection; using System; -namespace BlazorStandalone.CSharp +namespace BlazorStandalone_CSharp { public class Program { diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/Properties/launchSettings.json b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/Properties/launchSettings.json similarity index 87% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/Properties/launchSettings.json rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/Properties/launchSettings.json index 950b98ed9..673a00aa4 100644 --- a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/Properties/launchSettings.json +++ b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/Properties/launchSettings.json @@ -1,6 +1,6 @@ { "profiles": { - "BlazorStandalone.CSharp": { + "BlazorStandalone-CSharp": { "commandName": "Project", "launchBrowser": true, "environmentVariables": { diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/Shared/MainLayout.cshtml b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/Shared/MainLayout.cshtml similarity index 100% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/Shared/MainLayout.cshtml rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/Shared/MainLayout.cshtml diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/Shared/NavMenu.cshtml b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/Shared/NavMenu.cshtml similarity index 94% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/Shared/NavMenu.cshtml rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/Shared/NavMenu.cshtml index 529c248c7..bdaed8334 100644 --- a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/Shared/NavMenu.cshtml +++ b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/Shared/NavMenu.cshtml @@ -1,5 +1,5 @@ 
- BlazorStandalone.CSharp + BlazorStandalone-CSharp diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/Shared/SurveyPrompt.cshtml b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/Shared/SurveyPrompt.cshtml similarity index 100% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/Shared/SurveyPrompt.cshtml rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/Shared/SurveyPrompt.cshtml diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/_ViewImports.cshtml b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/_ViewImports.cshtml similarity index 73% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/_ViewImports.cshtml rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/_ViewImports.cshtml index be0bcdbf6..be56987d6 100644 --- a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/_ViewImports.cshtml +++ b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/_ViewImports.cshtml @@ -3,5 +3,5 @@ @using Microsoft.AspNetCore.Blazor.Components @using Microsoft.AspNetCore.Blazor.Layouts @using Microsoft.AspNetCore.Blazor.Routing -@using BlazorStandalone.CSharp -@using BlazorStandalone.CSharp.Shared +@using BlazorStandalone_CSharp +@using BlazorStandalone_CSharp.Shared diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/global.json b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/global.json similarity index 100% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/global.json rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/global.json diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/wwwroot/css/bootstrap/bootstrap.min.css b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/wwwroot/css/bootstrap/bootstrap.min.css similarity index 100% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/wwwroot/css/bootstrap/bootstrap.min.css rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/wwwroot/css/bootstrap/bootstrap.min.css diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/wwwroot/css/bootstrap/bootstrap.min.css.map b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/wwwroot/css/bootstrap/bootstrap.min.css.map similarity index 100% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/wwwroot/css/bootstrap/bootstrap.min.css.map rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/wwwroot/css/bootstrap/bootstrap.min.css.map diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/wwwroot/css/open-iconic/FONT-LICENSE b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/wwwroot/css/open-iconic/FONT-LICENSE similarity index 100% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/wwwroot/css/open-iconic/FONT-LICENSE rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/wwwroot/css/open-iconic/FONT-LICENSE diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/wwwroot/css/open-iconic/ICON-LICENSE b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/wwwroot/css/open-iconic/ICON-LICENSE similarity index 100% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/wwwroot/css/open-iconic/ICON-LICENSE rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/wwwroot/css/open-iconic/ICON-LICENSE diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/wwwroot/css/open-iconic/README.md b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/wwwroot/css/open-iconic/README.md similarity index 100% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/wwwroot/css/open-iconic/README.md rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/wwwroot/css/open-iconic/README.md diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css similarity index 100% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/wwwroot/css/open-iconic/font/fonts/open-iconic.eot b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/wwwroot/css/open-iconic/font/fonts/open-iconic.eot similarity index 100% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/wwwroot/css/open-iconic/font/fonts/open-iconic.eot rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/wwwroot/css/open-iconic/font/fonts/open-iconic.eot diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/wwwroot/css/open-iconic/font/fonts/open-iconic.otf b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/wwwroot/css/open-iconic/font/fonts/open-iconic.otf similarity index 100% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/wwwroot/css/open-iconic/font/fonts/open-iconic.otf rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/wwwroot/css/open-iconic/font/fonts/open-iconic.otf diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/wwwroot/css/open-iconic/font/fonts/open-iconic.svg b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/wwwroot/css/open-iconic/font/fonts/open-iconic.svg similarity index 100% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/wwwroot/css/open-iconic/font/fonts/open-iconic.svg rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/wwwroot/css/open-iconic/font/fonts/open-iconic.svg diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf similarity index 100% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/wwwroot/css/open-iconic/font/fonts/open-iconic.woff b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/wwwroot/css/open-iconic/font/fonts/open-iconic.woff similarity index 100% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/wwwroot/css/open-iconic/font/fonts/open-iconic.woff rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/wwwroot/css/open-iconic/font/fonts/open-iconic.woff diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/wwwroot/css/site.css b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/wwwroot/css/site.css similarity index 100% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/wwwroot/css/site.css rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/wwwroot/css/site.css diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/wwwroot/index.html b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/wwwroot/index.html similarity index 89% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/wwwroot/index.html rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/wwwroot/index.html index c3f82b5f9..a4f5dc8d0 100644 --- a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/wwwroot/index.html +++ b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/wwwroot/index.html @@ -3,7 +3,7 @@ - BlazorStandalone.CSharp + BlazorStandalone-CSharp diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/wwwroot/sample-data/weather.json b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/wwwroot/sample-data/weather.json similarity index 100% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/wwwroot/sample-data/weather.json rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/wwwroot/sample-data/weather.json From 88020bfce840c8b7eb9e6de024f58d3df8e0b578 Mon Sep 17 00:00:00 2001 From: Daniel Roth Date: Mon, 30 Apr 2018 06:20:03 -0700 Subject: [PATCH 2/4] Sanitize base namespace for generated code --- .../ComponentDocumentClassifierPass.cs | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/Microsoft.AspNetCore.Blazor.Razor.Extensions/ComponentDocumentClassifierPass.cs b/src/Microsoft.AspNetCore.Blazor.Razor.Extensions/ComponentDocumentClassifierPass.cs index 294a16fc4..922dfa1f5 100644 --- a/src/Microsoft.AspNetCore.Blazor.Razor.Extensions/ComponentDocumentClassifierPass.cs +++ b/src/Microsoft.AspNetCore.Blazor.Razor.Extensions/ComponentDocumentClassifierPass.cs @@ -25,6 +25,8 @@ public class ComponentDocumentClassifierPass : DocumentClassifierPassBase, IRazo private static readonly char[] PathSeparators = new char[] { '/', '\\' }; + private static readonly char[] NamespaceSeparators = new char[] { '.' }; + /// /// The base namespace. /// @@ -141,9 +143,20 @@ private bool TryComputeNamespaceAndClass(string filePath, string relativePath, o } var builder = new StringBuilder(); - builder.Append(baseNamespace); // Don't sanitize, we expect it to contain dots. - var segments = relativePath.Split(PathSeparators, StringSplitOptions.RemoveEmptyEntries); + // Sanitize the base namespace, but leave the dots. + var segments = baseNamespace.Split(NamespaceSeparators, StringSplitOptions.RemoveEmptyEntries); + builder.Append(CSharpIdentifier.SanitizeClassName(segments[0])); + if (segments.Length > 1) + { + for (var i = 1; i < segments.Length; i++) + { + builder.Append('.'); + builder.Append(CSharpIdentifier.SanitizeClassName(segments[i])); + } + } + + segments = relativePath.Split(PathSeparators, StringSplitOptions.RemoveEmptyEntries); // Skip the last segment because it's the FileName. for (var i = 0; i < segments.Length - 1; i++) From ccd3bd1b85f2c638e904afc6aaa99aff822b05e8 Mon Sep 17 00:00:00 2001 From: Daniel Roth Date: Mon, 30 Apr 2018 10:17:39 -0700 Subject: [PATCH 3/4] Add tests --- .../WorkingDirectoryRazorIntegrationTest.cs | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 test/Microsoft.AspNetCore.Blazor.Build.Test/WorkingDirectoryRazorIntegrationTest.cs diff --git a/test/Microsoft.AspNetCore.Blazor.Build.Test/WorkingDirectoryRazorIntegrationTest.cs b/test/Microsoft.AspNetCore.Blazor.Build.Test/WorkingDirectoryRazorIntegrationTest.cs new file mode 100644 index 000000000..f754fb684 --- /dev/null +++ b/test/Microsoft.AspNetCore.Blazor.Build.Test/WorkingDirectoryRazorIntegrationTest.cs @@ -0,0 +1,41 @@ +// 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.IO; +using System.Runtime.InteropServices; +using Xunit; + +namespace Microsoft.AspNetCore.Blazor.Build.Test +{ + // Integration tests focused on file path handling for class/namespace names + public class WorkingDirectoryRazorIntegrationTest : RazorIntegrationTestBase + { + public WorkingDirectoryRazorIntegrationTest() + { + WorkingDirectory = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? ArbitraryWindowsPath : ArbitraryMacLinuxPath; + WorkingDirectory += "-Dir"; + } + + internal override string WorkingDirectory { get; } + + [Theory] + [InlineData("ItemAtRoot.cs", "Test_Dir", "ItemAtRoot")] + [InlineData("Dir1\\MyFile.cs", "Test_Dir.Dir1", "MyFile")] + [InlineData("Dir1\\Dir2\\MyFile.cs", "Test_Dir.Dir1.Dir2", "MyFile")] + public void CreatesClassWithCorrectNameAndNamespace(string relativePath, string expectedNamespace, string expectedClassName) + { + // Arrange + relativePath = relativePath.Replace('\\', Path.DirectorySeparatorChar); + + // Act + var result = CompileToAssembly(relativePath, ""); + + // Assert + Assert.Empty(result.Diagnostics); + + var type = Assert.Single(result.Assembly.GetTypes()); + Assert.Equal(expectedNamespace, type.Namespace); + Assert.Equal(expectedClassName, type.Name); + } + } +} From fe10fb08250423a7c75b375c87102ae096ab17b5 Mon Sep 17 00:00:00 2001 From: Daniel Roth Date: Mon, 30 Apr 2018 14:51:01 -0700 Subject: [PATCH 4/4] Respond to PR feedback --- .../ComponentDocumentClassifierPass.cs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/Microsoft.AspNetCore.Blazor.Razor.Extensions/ComponentDocumentClassifierPass.cs b/src/Microsoft.AspNetCore.Blazor.Razor.Extensions/ComponentDocumentClassifierPass.cs index 922dfa1f5..9d363b914 100644 --- a/src/Microsoft.AspNetCore.Blazor.Razor.Extensions/ComponentDocumentClassifierPass.cs +++ b/src/Microsoft.AspNetCore.Blazor.Razor.Extensions/ComponentDocumentClassifierPass.cs @@ -147,13 +147,10 @@ private bool TryComputeNamespaceAndClass(string filePath, string relativePath, o // Sanitize the base namespace, but leave the dots. var segments = baseNamespace.Split(NamespaceSeparators, StringSplitOptions.RemoveEmptyEntries); builder.Append(CSharpIdentifier.SanitizeClassName(segments[0])); - if (segments.Length > 1) + for (var i = 1; i < segments.Length; i++) { - for (var i = 1; i < segments.Length; i++) - { - builder.Append('.'); - builder.Append(CSharpIdentifier.SanitizeClassName(segments[i])); - } + builder.Append('.'); + builder.Append(CSharpIdentifier.SanitizeClassName(segments[i])); } segments = relativePath.Split(PathSeparators, StringSplitOptions.RemoveEmptyEntries);