From e727cf241986a3c23fa5977f63a683a523178e4d Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 11 Apr 2018 14:13:42 +0100 Subject: [PATCH] Rename "blazor content" project to "blazor library". Fixes #539 --- Blazor.sln | 2 +- .../BlazorContent.CSharp/Component1.cshtml | 3 --- .../.template.config/dotnetcli.host.json | 0 .../.template.config/icon.png | Bin .../.template.config/template.json | 14 +++++++------- .../BlazorLibrary.CSharp.csproj} | 0 .../BlazorLibrary.CSharp/Component1.cshtml | 3 +++ .../ExampleJsInterop.cs | 4 ++-- .../content/background.png | Bin .../content/exampleJsInterop.js | 4 ++-- .../content/styles.css | 2 +- 11 files changed, 16 insertions(+), 16 deletions(-) delete mode 100644 src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorContent.CSharp/Component1.cshtml rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorContent.CSharp => BlazorLibrary.CSharp}/.template.config/dotnetcli.host.json (100%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorContent.CSharp => BlazorLibrary.CSharp}/.template.config/icon.png (100%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorContent.CSharp => BlazorLibrary.CSharp}/.template.config/template.json (83%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorContent.CSharp/BlazorContent.CSharp.csproj => BlazorLibrary.CSharp/BlazorLibrary.CSharp.csproj} (100%) create mode 100644 src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary.CSharp/Component1.cshtml rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorContent.CSharp => BlazorLibrary.CSharp}/ExampleJsInterop.cs (74%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorContent.CSharp => BlazorLibrary.CSharp}/content/background.png (100%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorContent.CSharp => BlazorLibrary.CSharp}/content/exampleJsInterop.js (51%) rename src/Microsoft.AspNetCore.Blazor.Templates/content/{BlazorContent.CSharp => BlazorLibrary.CSharp}/content/styles.css (84%) diff --git a/Blazor.sln b/Blazor.sln index 916d1d76c1..ec82a23aac 100644 --- a/Blazor.sln +++ b/Blazor.sln @@ -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("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlazorContent.CSharp", "src\Microsoft.AspNetCore.Blazor.Templates\content\BlazorContent.CSharp\BlazorContent.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/content/BlazorContent.CSharp/Component1.cshtml b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorContent.CSharp/Component1.cshtml deleted file mode 100644 index e8cb655c24..0000000000 --- a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorContent.CSharp/Component1.cshtml +++ /dev/null @@ -1,3 +0,0 @@ -
- This Blazor component is defined in the BlazorContent.CSharp package. -
diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorContent.CSharp/.template.config/dotnetcli.host.json b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary.CSharp/.template.config/dotnetcli.host.json similarity index 100% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorContent.CSharp/.template.config/dotnetcli.host.json rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary.CSharp/.template.config/dotnetcli.host.json diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorContent.CSharp/.template.config/icon.png b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary.CSharp/.template.config/icon.png similarity index 100% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorContent.CSharp/.template.config/icon.png rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary.CSharp/.template.config/icon.png diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorContent.CSharp/.template.config/template.json b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary.CSharp/.template.config/template.json similarity index 83% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorContent.CSharp/.template.config/template.json rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary.CSharp/.template.config/template.json index 45e3bf57b7..ddb3db03bd 100644 --- a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorContent.CSharp/.template.config/template.json +++ b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary.CSharp/.template.config/template.json @@ -3,19 +3,19 @@ "classifications": [ "Web", "Blazor", - "Content" + "Library" ], - "groupIdentity": "Microsoft.Web.Blazor.Content", - "identity": "Microsoft.Web.Blazor.Content.CSharp", - "name": "Blazor (content)", + "groupIdentity": "Microsoft.Web.Blazor.Library", + "identity": "Microsoft.Web.Blazor.Library.CSharp", + "name": "Blazor Library", "preferNameDirectory": true, "primaryOutputs": [ { - "path": "BlazorContent.CSharp.csproj" + "path": "BlazorLibrary.CSharp.csproj" } ], - "shortName": "blazorcontent", - "sourceName": "BlazorContent.CSharp", + "shortName": "blazorlib", + "sourceName": "BlazorLibrary.CSharp", "sources": [ { "source": "./", diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorContent.CSharp/BlazorContent.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/BlazorContent.CSharp/BlazorContent.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 new file mode 100644 index 0000000000..4a3c5843c7 --- /dev/null +++ b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary.CSharp/Component1.cshtml @@ -0,0 +1,3 @@ +
+ This Blazor component is defined in the BlazorLibrary.CSharp package. +
diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorContent.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/BlazorContent.CSharp/ExampleJsInterop.cs rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary.CSharp/ExampleJsInterop.cs index f51e06453a..56b8415db3 100644 --- a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorContent.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 BlazorContent.CSharp +namespace BlazorLibrary.CSharp { public class ExampleJsInterop { public static string Prompt(string message) { return RegisteredFunction.Invoke( - "BlazorContent.CSharp.ExampleJsInterop.Prompt", + "BlazorLibrary.CSharp.ExampleJsInterop.Prompt", message); } } diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorContent.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/BlazorContent.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/BlazorContent.CSharp/content/exampleJsInterop.js b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary.CSharp/content/exampleJsInterop.js similarity index 51% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorContent.CSharp/content/exampleJsInterop.js rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary.CSharp/content/exampleJsInterop.js index 2398cacd8d..3939d8154b 100644 --- a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorContent.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 content package may provide JavaScript interop features +// This file is to show how a library package may provide JavaScript interop features // wrapped in a .NET API -Blazor.registerFunction('BlazorContent.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/BlazorContent.CSharp/content/styles.css b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary.CSharp/content/styles.css similarity index 84% rename from src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorContent.CSharp/content/styles.css rename to src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary.CSharp/content/styles.css index d968f70925..ebd14018bd 100644 --- a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorContent.CSharp/content/styles.css +++ b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary.CSharp/content/styles.css @@ -1,6 +1,6 @@ /* This file is to show how CSS and other static resources (such as images) can be - used from a content project/package. + used from a library project/package. */ .my-component {