Skip to content
This repository has been archived by the owner on Feb 25, 2021. It is now read-only.

Fixup project templates to handle project names with dashes #692

Merged
merged 4 commits into from
May 1, 2018
Merged

Fixup project templates to handle project names with dashes #692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
54c7145
Fixup project templates to handle project names with dashes
danroth27 Apr 27, 2018
88020bf
Sanitize base namespace for generated code
danroth27 Apr 30, 2018
ccd3bd1
Add tests
danroth27 Apr 30, 2018
fe10fb0
Respond to PR feedback
danroth27 Apr 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions Blazor.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
14 changes: 12 additions & 2 deletions src/Microsoft.AspNetCore.Blazor.Razor.Extensions/ComponentDocumentClassifierPass.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ public class ComponentDocumentClassifierPass : DocumentClassifierPassBase, IRazo

private static readonly char[] PathSeparators = new char[] { '/', '\\' };

private static readonly char[] NamespaceSeparators = new char[] { '.' };

/// <summary>
/// The base namespace.
/// </summary>
Expand Down Expand Up @@ -141,9 +143,17 @@ 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]));
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++)
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.AspNetCore.Blazor.Templates/Microsoft.AspNetCore.Blazor.Templates.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<files>
<file
src="content/**/*"
exclude="content/BlazorHosted.CSharp.Client/Properties/launchSettings.json;content/BlazorHosted.CSharp.Server/Properties/launchSettings.json;**/node_modules/**;**/bin/**;**/obj/**;**/*.user;**/.vs/**;**/.vscode/**;content/Directory.Build.*;**/.template.config.src/**"
exclude="content/BlazorHosted-CSharp.Client/Properties/launchSettings.json;content/BlazorHosted-CSharp.Server/Properties/launchSettings.json;**/node_modules/**;**/bin/**;**/obj/**;**/*.user;**/.vs/**;**/.vscode/**;content/Directory.Build.*;**/.template.config.src/**"
target="Content" />
</files>
</package>
0 .../.template.config.src/dotnetcli.host.json → .../.template.config.src/dotnetcli.host.json
View file
Open in desktop
File renamed without changes.
0 ...sted.CSharp/.template.config.src/icon.png → ...sted-CSharp/.template.config.src/icon.png
View file
Open in desktop
File renamed without changes
16 changes: 8 additions & 8 deletions ...CSharp/.template.config.src/template.json → ...CSharp/.template.config.src/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": "./",
Expand Down
0 .../.template.config.src/vs-2017.3.host.json → .../.template.config.src/vs-2017.3.host.json
View file
Open in desktop
File renamed without changes.
0 ...arp/BlazorHosted.CSharp.Client/App.cshtml → ...arp/BlazorHosted-CSharp.Client/App.cshtml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ....Client/BlazorHosted.CSharp.Client.csproj → ....Client/BlazorHosted-CSharp.Client.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\BlazorHosted.CSharp.Shared\BlazorHosted.CSharp.Shared.csproj" />
<ProjectReference Include="..\BlazorHosted-CSharp.Shared\BlazorHosted-CSharp.Shared.csproj" />
</ItemGroup>

</Project>
0 ...Hosted.CSharp.Client/Pages/Counter.cshtml → ...Hosted-CSharp.Client/Pages/Counter.cshtml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...sted.CSharp.Client/Pages/FetchData.cshtml → ...sted-CSharp.Client/Pages/FetchData.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@using BlazorHosted.CSharp.Shared
@using BlazorHosted_CSharp.Shared
@page "/fetchdata"
@inject HttpClient Http

Expand Down
0 ...orHosted.CSharp.Client/Pages/Index.cshtml → ...orHosted-CSharp.Client/Pages/Index.cshtml
View file
Open in desktop
File renamed without changes.
0 ...d.CSharp.Client/Pages/_ViewImports.cshtml → ...d-CSharp.Client/Pages/_ViewImports.cshtml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...arp/BlazorHosted.CSharp.Client/Program.cs → ...arp/BlazorHosted-CSharp.Client/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using Microsoft.Extensions.DependencyInjection;
using System;

namespace BlazorHosted.CSharp.Client
namespace BlazorHosted_CSharp.Client
{
public class Program
{
Expand Down
0 ...ed.CSharp.Client/Shared/MainLayout.cshtml → ...ed-CSharp.Client/Shared/MainLayout.cshtml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...osted.CSharp.Client/Shared/NavMenu.cshtml → ...osted-CSharp.Client/Shared/NavMenu.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="top-row pl-4 navbar navbar-dark">
<a class="navbar-brand" href="/">BlazorHosted.CSharp</a>
<a class="navbar-brand" href="/">BlazorHosted-CSharp</a>
<button class="navbar-toggler" onclick=@ToggleNavMenu>
<span class="navbar-toggler-icon"></span>
</button>
Expand Down
0 ....CSharp.Client/Shared/SurveyPrompt.cshtml → ...-CSharp.Client/Shared/SurveyPrompt.cshtml
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...rHosted.CSharp.Client/_ViewImports.cshtml → ...rHosted-CSharp.Client/_ViewImports.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
0 ...t/wwwroot/css/bootstrap/bootstrap.min.css → ...t/wwwroot/css/bootstrap/bootstrap.min.css
View file
Open in desktop
File renamed without changes.
0 ...wroot/css/bootstrap/bootstrap.min.css.map → ...wroot/css/bootstrap/bootstrap.min.css.map
View file
Open in desktop
File renamed without changes.
0 ...ient/wwwroot/css/open-iconic/FONT-LICENSE → ...ient/wwwroot/css/open-iconic/FONT-LICENSE
View file
Open in desktop
File renamed without changes.
0 ...ient/wwwroot/css/open-iconic/ICON-LICENSE → ...ient/wwwroot/css/open-iconic/ICON-LICENSE
View file
Open in desktop
File renamed without changes.
0 ....Client/wwwroot/css/open-iconic/README.md → ....Client/wwwroot/css/open-iconic/README.md
View file
Open in desktop
File renamed without changes.
0 ...ic/font/css/open-iconic-bootstrap.min.css → ...ic/font/css/open-iconic-bootstrap.min.css
View file
Open in desktop
File renamed without changes.
0 ...ss/open-iconic/font/fonts/open-iconic.eot → ...ss/open-iconic/font/fonts/open-iconic.eot
View file
Open in desktop
File renamed without changes.
0 ...ss/open-iconic/font/fonts/open-iconic.otf → ...ss/open-iconic/font/fonts/open-iconic.otf
View file
Open in desktop
File renamed without changes.
0 ...ss/open-iconic/font/fonts/open-iconic.svg → ...ss/open-iconic/font/fonts/open-iconic.svg
View file
Open in desktop
File renamed without changes
0 ...ss/open-iconic/font/fonts/open-iconic.ttf → ...ss/open-iconic/font/fonts/open-iconic.ttf
View file
Open in desktop
File renamed without changes.
0 ...s/open-iconic/font/fonts/open-iconic.woff → ...s/open-iconic/font/fonts/open-iconic.woff
View file
Open in desktop
File renamed without changes.
0 ...Hosted.CSharp.Client/wwwroot/css/site.css → ...Hosted-CSharp.Client/wwwroot/css/site.css
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...orHosted.CSharp.Client/wwwroot/index.html → ...orHosted-CSharp.Client/wwwroot/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width">
<title>BlazorHosted.CSharp</title>
<title>BlazorHosted-CSharp</title>
<base href="/" />
<link href="css/bootstrap/bootstrap.min.css" rel="stylesheet" />
<link href="css/site.css" rel="stylesheet" />
Expand Down
4 changes: 2 additions & 2 deletions ....Server/BlazorHosted.CSharp.Server.csproj → ....Server/BlazorHosted-CSharp.Server.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\BlazorHosted.CSharp.Client\BlazorHosted.CSharp.Client.csproj" />
<ProjectReference Include="..\BlazorHosted.CSharp.Shared\BlazorHosted.CSharp.Shared.csproj" />
<ProjectReference Include="..\BlazorHosted-CSharp.Client\BlazorHosted-CSharp.Client.csproj" />
<ProjectReference Include="..\BlazorHosted-CSharp.Shared\BlazorHosted-CSharp.Shared.csproj" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions ...erver/Controllers/SampleDataController.cs → ...erver/Controllers/SampleDataController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...arp/BlazorHosted.CSharp.Server/Program.cs → ...arp/BlazorHosted-CSharp.Server/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration;

namespace BlazorHosted.CSharp.Server
namespace BlazorHosted_CSharp.Server
{
public class Program
{
Expand Down
2 changes: 1 addition & 1 deletion ...arp/BlazorHosted.CSharp.Server/Startup.cs → ...arp/BlazorHosted-CSharp.Server/Startup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
using System.Linq;
using System.Net.Mime;

namespace BlazorHosted.CSharp.Server
namespace BlazorHosted_CSharp.Server
{
public class Startup
{
Expand Down
0 ....Shared/BlazorHosted.CSharp.Shared.csproj → ....Shared/BlazorHosted-CSharp.Shared.csproj
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...orHosted.CSharp.Shared/WeatherForecast.cs → ...orHosted-CSharp.Shared/WeatherForecast.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Text;

namespace BlazorHosted.CSharp.Shared
namespace BlazorHosted_CSharp.Shared
{
public class WeatherForecast
{
Expand Down
6 changes: 3 additions & 3 deletions ...azorHosted.CSharp/BlazorHosted.CSharp.sln → ...azorHosted-CSharp/BlazorHosted-CSharp.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0 ...s/content/BlazorHosted.CSharp/global.json → ...s/content/BlazorHosted-CSharp/global.json
View file
Open in desktop
File renamed without changes.
0 .../.template.config.src/dotnetcli.host.json → .../.template.config.src/dotnetcli.host.json
View file
Open in desktop
File renamed without changes.
0 ...rary.CSharp/.template.config.src/icon.png → ...rary-CSharp/.template.config.src/icon.png
View file
Open in desktop
File renamed without changes
4 changes: 2 additions & 2 deletions ...CSharp/.template.config.src/template.json → ...CSharp/.template.config.src/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": "./",
Expand Down
0 ...ibrary.CSharp/BlazorLibrary.CSharp.csproj → ...ibrary-CSharp/BlazorLibrary-CSharp.csproj
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...nt/BlazorLibrary.CSharp/Component1.cshtml → ...nt/BlazorLibrary-CSharp/Component1.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<div class="my-component">
This Blazor component is defined in the <strong>BlazorLibrary.CSharp</strong> package.
This Blazor component is defined in the <strong>BlazorLibrary-CSharp</strong> package.
</div>
4 changes: 2 additions & 2 deletions .../BlazorLibrary.CSharp/ExampleJsInterop.cs → .../BlazorLibrary-CSharp/ExampleJsInterop.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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<string>(
"BlazorLibrary.CSharp.ExampleJsInterop.Prompt",
"BlazorLibrary-CSharp.ExampleJsInterop.Prompt",
message);
}
}
Expand Down
0 ...azorLibrary.CSharp/content/background.png → ...azorLibrary-CSharp/content/background.png
View file
Open in desktop
File renamed without changes
2 changes: 1 addition & 1 deletion ...ibrary.CSharp/content/exampleJsInterop.js → ...ibrary-CSharp/content/exampleJsInterop.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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');
});
0 ...t/BlazorLibrary.CSharp/content/styles.css → ...t/BlazorLibrary-CSharp/content/styles.css
View file
Open in desktop
File renamed without changes.
0 .../.template.config.src/dotnetcli.host.json → .../.template.config.src/dotnetcli.host.json
View file
Open in desktop
File renamed without changes.
0 ...lone.CSharp/.template.config.src/icon.png → ...lone-CSharp/.template.config.src/icon.png
View file
Open in desktop
File renamed without changes
4 changes: 2 additions & 2 deletions ...CSharp/.template.config.src/template.json → ...CSharp/.template.config.src/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": "./",
Expand Down
0 .../.template.config.src/vs-2017.3.host.json → .../.template.config.src/vs-2017.3.host.json
View file
Open in desktop
File renamed without changes.
0 ...ontent/BlazorStandalone.CSharp/App.cshtml → ...ontent/BlazorStandalone-CSharp/App.cshtml
View file
Open in desktop
File renamed without changes.
0 ...one.CSharp/BlazorStandalone.CSharp.csproj → ...one-CSharp/BlazorStandalone-CSharp.csproj
View file
Open in desktop
File renamed without changes.
0 ...zorStandalone.CSharp/Pages/Counter.cshtml → ...zorStandalone-CSharp/Pages/Counter.cshtml
View file
Open in desktop
File renamed without changes.
0 ...rStandalone.CSharp/Pages/FetchData.cshtml → ...rStandalone-CSharp/Pages/FetchData.cshtml
View file
Open in desktop
File renamed without changes.
0 ...lazorStandalone.CSharp/Pages/Index.cshtml → ...lazorStandalone-CSharp/Pages/Index.cshtml
View file
Open in desktop
File renamed without changes.
0 ...andalone.CSharp/Pages/_ViewImports.cshtml → ...andalone-CSharp/Pages/_ViewImports.cshtml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ontent/BlazorStandalone.CSharp/Program.cs → ...ontent/BlazorStandalone-CSharp/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using Microsoft.Extensions.DependencyInjection;
using System;

namespace BlazorStandalone.CSharp
namespace BlazorStandalone_CSharp
{
public class Program
{
Expand Down
2 changes: 1 addition & 1 deletion ...one.CSharp/Properties/launchSettings.json → ...one-CSharp/Properties/launchSettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"profiles": {
"BlazorStandalone.CSharp": {
"BlazorStandalone-CSharp": {
"commandName": "Project",
"launchBrowser": true,
"environmentVariables": {
Expand Down
0 ...tandalone.CSharp/Shared/MainLayout.cshtml → ...tandalone-CSharp/Shared/MainLayout.cshtml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...orStandalone.CSharp/Shared/NavMenu.cshtml → ...orStandalone-CSharp/Shared/NavMenu.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="top-row pl-4 navbar navbar-dark">
<a class="navbar-brand" href="/">BlazorStandalone.CSharp</a>
<a class="navbar-brand" href="/">BlazorStandalone-CSharp</a>
<button class="navbar-toggler" onclick=@ToggleNavMenu>
<span class="navbar-toggler-icon"></span>
</button>
Expand Down
0 ...ndalone.CSharp/Shared/SurveyPrompt.cshtml → ...ndalone-CSharp/Shared/SurveyPrompt.cshtml
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...azorStandalone.CSharp/_ViewImports.cshtml → ...azorStandalone-CSharp/_ViewImports.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
0 ...ntent/BlazorStandalone.CSharp/global.json → ...ntent/BlazorStandalone-CSharp/global.json
View file
Open in desktop
File renamed without changes.
0 ...p/wwwroot/css/bootstrap/bootstrap.min.css → ...p/wwwroot/css/bootstrap/bootstrap.min.css
View file
Open in desktop
File renamed without changes.
0 ...wroot/css/bootstrap/bootstrap.min.css.map → ...wroot/css/bootstrap/bootstrap.min.css.map
View file
Open in desktop
File renamed without changes.
0 ...harp/wwwroot/css/open-iconic/FONT-LICENSE → ...harp/wwwroot/css/open-iconic/FONT-LICENSE
View file
Open in desktop
File renamed without changes.
0 ...harp/wwwroot/css/open-iconic/ICON-LICENSE → ...harp/wwwroot/css/open-iconic/ICON-LICENSE
View file
Open in desktop
File renamed without changes.
0 ....CSharp/wwwroot/css/open-iconic/README.md → ...-CSharp/wwwroot/css/open-iconic/README.md
View file
Open in desktop
File renamed without changes.
0 ...ic/font/css/open-iconic-bootstrap.min.css → ...ic/font/css/open-iconic-bootstrap.min.css
View file
Open in desktop
File renamed without changes.
0 ...ss/open-iconic/font/fonts/open-iconic.eot → ...ss/open-iconic/font/fonts/open-iconic.eot
View file
Open in desktop
File renamed without changes.
0 ...ss/open-iconic/font/fonts/open-iconic.otf → ...ss/open-iconic/font/fonts/open-iconic.otf
View file
Open in desktop
File renamed without changes.
0 ...ss/open-iconic/font/fonts/open-iconic.svg → ...ss/open-iconic/font/fonts/open-iconic.svg
View file
Open in desktop
File renamed without changes
0 ...ss/open-iconic/font/fonts/open-iconic.ttf → ...ss/open-iconic/font/fonts/open-iconic.ttf
View file
Open in desktop
File renamed without changes.
0 ...s/open-iconic/font/fonts/open-iconic.woff → ...s/open-iconic/font/fonts/open-iconic.woff
View file
Open in desktop
File renamed without changes.
0 ...zorStandalone.CSharp/wwwroot/css/site.css → ...zorStandalone-CSharp/wwwroot/css/site.css
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...lazorStandalone.CSharp/wwwroot/index.html → ...lazorStandalone-CSharp/wwwroot/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width">
<title>BlazorStandalone.CSharp</title>
<title>BlazorStandalone-CSharp</title>
<base href="/" />
<link href="css/bootstrap/bootstrap.min.css" rel="stylesheet" />
<link href="css/site.css" rel="stylesheet" />
Expand Down
0 ...e.CSharp/wwwroot/sample-data/weather.json → ...e-CSharp/wwwroot/sample-data/weather.json
View file
Open in desktop
File renamed without changes.
41 changes: 41 additions & 0 deletions test/Microsoft.AspNetCore.Blazor.Build.Test/WorkingDirectoryRazorIntegrationTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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);
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice!

}
}