From dbc5e38d042ff28e1deac6b6e6de797c3066c37b Mon Sep 17 00:00:00 2001 From: Jass Bagga Date: Tue, 13 Mar 2018 09:52:20 -0700 Subject: [PATCH] Match launchSettings variable to sourceName in template.json (#354) Addresses #346 --- build/dependencies.props | 2 +- korebuild-lock.txt | 4 ++-- .../Microsoft.AspNetCore.SpaTemplates.csproj | 6 +++--- .../content/Aurelia-CSharp/.template.config/template.json | 4 ++-- .../Aurelia-CSharp/ClientApp/app/components/app/app.ts | 2 +- .../ClientApp/app/components/navmenu/navmenu.html | 2 +- .../content/Aurelia-CSharp/Controllers/HomeController.cs | 2 +- .../Aurelia-CSharp/Controllers/SampleDataController.cs | 2 +- .../content/Aurelia-CSharp/Program.cs | 2 +- .../content/Aurelia-CSharp/Startup.cs | 2 +- .../content/Aurelia-CSharp/Views/Shared/_Layout.cshtml | 4 ++-- .../content/Aurelia-CSharp/Views/_ViewImports.cshtml | 2 +- .../content/Aurelia-CSharp/npm-shrinkwrap.json | 2 +- .../content/Aurelia-CSharp/package.json | 2 +- .../content/Knockout-CSharp/.template.config/template.json | 4 ++-- .../ClientApp/components/nav-menu/nav-menu.html | 2 +- .../content/Knockout-CSharp/Controllers/HomeController.cs | 2 +- .../Knockout-CSharp/Controllers/SampleDataController.cs | 2 +- .../content/Knockout-CSharp/Program.cs | 2 +- .../content/Knockout-CSharp/Startup.cs | 2 +- .../content/Knockout-CSharp/Views/Shared/_Layout.cshtml | 4 ++-- .../content/Knockout-CSharp/Views/_ViewImports.cshtml | 2 +- .../content/Knockout-CSharp/npm-shrinkwrap.json | 2 +- .../content/Knockout-CSharp/package.json | 2 +- .../content/Vue-CSharp/.template.config/template.json | 4 ++-- .../ClientApp/components/navmenu/navmenu.vue.html | 2 +- .../content/Vue-CSharp/Controllers/HomeController.cs | 2 +- .../content/Vue-CSharp/Controllers/SampleDataController.cs | 2 +- .../content/Vue-CSharp/Program.cs | 2 +- .../content/Vue-CSharp/Startup.cs | 2 +- .../content/Vue-CSharp/Views/Shared/_Layout.cshtml | 4 ++-- .../content/Vue-CSharp/Views/_ViewImports.cshtml | 2 +- .../content/Vue-CSharp/npm-shrinkwrap.json | 2 +- .../content/Vue-CSharp/package.json | 2 +- .../Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj | 6 +++--- .../content/Angular-CSharp/.template.config/template.json | 4 ++-- .../content/Angular-CSharp/ClientApp/.angular-cli.json | 2 +- .../content/Angular-CSharp/ClientApp/package-lock.json | 2 +- .../content/Angular-CSharp/ClientApp/package.json | 2 +- .../ClientApp/src/app/nav-menu/nav-menu.component.html | 2 +- .../content/Angular-CSharp/ClientApp/src/index.html | 2 +- .../Angular-CSharp/Controllers/SampleDataController.cs | 2 +- .../content/Angular-CSharp/Program.cs | 2 +- .../content/Angular-CSharp/Startup.cs | 2 +- .../content/React-CSharp/.template.config/template.json | 4 ++-- .../content/React-CSharp/ClientApp/package-lock.json | 2 +- .../content/React-CSharp/ClientApp/package.json | 2 +- .../content/React-CSharp/ClientApp/public/index.html | 2 +- .../content/React-CSharp/ClientApp/public/manifest.json | 4 ++-- .../React-CSharp/ClientApp/src/components/NavMenu.js | 2 +- .../React-CSharp/Controllers/SampleDataController.cs | 2 +- .../content/React-CSharp/Program.cs | 2 +- .../content/React-CSharp/Startup.cs | 2 +- .../ReactRedux-CSharp/.template.config/template.json | 4 ++-- .../content/ReactRedux-CSharp/ClientApp/package-lock.json | 2 +- .../content/ReactRedux-CSharp/ClientApp/package.json | 2 +- .../content/ReactRedux-CSharp/ClientApp/public/index.html | 2 +- .../ReactRedux-CSharp/ClientApp/public/manifest.json | 4 ++-- .../ReactRedux-CSharp/ClientApp/src/components/NavMenu.js | 2 +- .../ReactRedux-CSharp/Controllers/SampleDataController.cs | 2 +- .../content/ReactRedux-CSharp/Program.cs | 2 +- .../content/ReactRedux-CSharp/Startup.cs | 2 +- 62 files changed, 78 insertions(+), 78 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index c1ebeb91e1..d567778b4c 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,7 +3,7 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.1.0-preview2-15735 + 2.1.0-preview2-15736 2.1.0-preview2-30285 2.1.0-preview2-30285 2.1.0-preview2-30285 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 57f8287db2..14ecc99f57 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.1.0-preview2-15735 -commithash:e1c2a4b79748d853196318c6e2e52151846070bd +version:2.1.0-preview2-15736 +commithash:36ec5cebaad48f278fd9420fe459d7d0640ec80f diff --git a/src/Microsoft.AspNetCore.SpaTemplates/Microsoft.AspNetCore.SpaTemplates.csproj b/src/Microsoft.AspNetCore.SpaTemplates/Microsoft.AspNetCore.SpaTemplates.csproj index 2cfec022ce..bf00fe2b24 100644 --- a/src/Microsoft.AspNetCore.SpaTemplates/Microsoft.AspNetCore.SpaTemplates.csproj +++ b/src/Microsoft.AspNetCore.SpaTemplates/Microsoft.AspNetCore.SpaTemplates.csproj @@ -22,13 +22,13 @@ - + $(GeneratedContentProperties) - + $(GeneratedContentProperties) - + $(GeneratedContentProperties) diff --git a/src/Microsoft.AspNetCore.SpaTemplates/content/Aurelia-CSharp/.template.config/template.json b/src/Microsoft.AspNetCore.SpaTemplates/content/Aurelia-CSharp/.template.config/template.json index 2501dd9a98..47e40a69fd 100644 --- a/src/Microsoft.AspNetCore.SpaTemplates/content/Aurelia-CSharp/.template.config/template.json +++ b/src/Microsoft.AspNetCore.SpaTemplates/content/Aurelia-CSharp/.template.config/template.json @@ -11,11 +11,11 @@ "preferNameDirectory": true, "primaryOutputs": [ { - "path": "AureliaSpa.csproj" + "path": "Company.WebApplication1.csproj" } ], "shortName": "aurelia", - "sourceName": "AureliaSpa", + "sourceName": "Company.WebApplication1", "sources": [ { "source": "./", diff --git a/src/Microsoft.AspNetCore.SpaTemplates/content/Aurelia-CSharp/ClientApp/app/components/app/app.ts b/src/Microsoft.AspNetCore.SpaTemplates/content/Aurelia-CSharp/ClientApp/app/components/app/app.ts index 5d067df64e..ed21dd2bcf 100644 --- a/src/Microsoft.AspNetCore.SpaTemplates/content/Aurelia-CSharp/ClientApp/app/components/app/app.ts +++ b/src/Microsoft.AspNetCore.SpaTemplates/content/Aurelia-CSharp/ClientApp/app/components/app/app.ts @@ -5,7 +5,7 @@ export class App { router: Router; configureRouter(config: RouterConfiguration, router: Router) { - config.title = 'AureliaSpa'; + config.title = 'Company.WebApplication1'; config.map([{ route: [ '', 'home' ], name: 'home', diff --git a/src/Microsoft.AspNetCore.SpaTemplates/content/Aurelia-CSharp/ClientApp/app/components/navmenu/navmenu.html b/src/Microsoft.AspNetCore.SpaTemplates/content/Aurelia-CSharp/ClientApp/app/components/navmenu/navmenu.html index 1661aa6247..15cc54846e 100644 --- a/src/Microsoft.AspNetCore.SpaTemplates/content/Aurelia-CSharp/ClientApp/app/components/navmenu/navmenu.html +++ b/src/Microsoft.AspNetCore.SpaTemplates/content/Aurelia-CSharp/ClientApp/app/components/navmenu/navmenu.html @@ -9,7 +9,7 @@ - AureliaSpa + Company.WebApplication1
diff --git a/src/Microsoft.AspNetCore.SpaTemplates/content/Aurelia-CSharp/Controllers/HomeController.cs b/src/Microsoft.AspNetCore.SpaTemplates/content/Aurelia-CSharp/Controllers/HomeController.cs index e16d8b7b37..aad433c1d3 100644 --- a/src/Microsoft.AspNetCore.SpaTemplates/content/Aurelia-CSharp/Controllers/HomeController.cs +++ b/src/Microsoft.AspNetCore.SpaTemplates/content/Aurelia-CSharp/Controllers/HomeController.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; -namespace AureliaSpa.Controllers +namespace Company.WebApplication1.Controllers { public class HomeController : Controller { diff --git a/src/Microsoft.AspNetCore.SpaTemplates/content/Aurelia-CSharp/Controllers/SampleDataController.cs b/src/Microsoft.AspNetCore.SpaTemplates/content/Aurelia-CSharp/Controllers/SampleDataController.cs index 6705a682bb..ad07507429 100644 --- a/src/Microsoft.AspNetCore.SpaTemplates/content/Aurelia-CSharp/Controllers/SampleDataController.cs +++ b/src/Microsoft.AspNetCore.SpaTemplates/content/Aurelia-CSharp/Controllers/SampleDataController.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; -namespace AureliaSpa.Controllers +namespace Company.WebApplication1.Controllers { [Route("api/[controller]")] public class SampleDataController : Controller diff --git a/src/Microsoft.AspNetCore.SpaTemplates/content/Aurelia-CSharp/Program.cs b/src/Microsoft.AspNetCore.SpaTemplates/content/Aurelia-CSharp/Program.cs index 0b628556fc..1579d650b3 100644 --- a/src/Microsoft.AspNetCore.SpaTemplates/content/Aurelia-CSharp/Program.cs +++ b/src/Microsoft.AspNetCore.SpaTemplates/content/Aurelia-CSharp/Program.cs @@ -8,7 +8,7 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging; -namespace AureliaSpa +namespace Company.WebApplication1 { public class Program { diff --git a/src/Microsoft.AspNetCore.SpaTemplates/content/Aurelia-CSharp/Startup.cs b/src/Microsoft.AspNetCore.SpaTemplates/content/Aurelia-CSharp/Startup.cs index 3d3ae4ec0c..b94f9cd9ab 100644 --- a/src/Microsoft.AspNetCore.SpaTemplates/content/Aurelia-CSharp/Startup.cs +++ b/src/Microsoft.AspNetCore.SpaTemplates/content/Aurelia-CSharp/Startup.cs @@ -10,7 +10,7 @@ using Microsoft.AspNetCore.SpaServices.Webpack; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -namespace AureliaSpa +namespace Company.WebApplication1 { public class Startup { diff --git a/src/Microsoft.AspNetCore.SpaTemplates/content/Aurelia-CSharp/Views/Shared/_Layout.cshtml b/src/Microsoft.AspNetCore.SpaTemplates/content/Aurelia-CSharp/Views/Shared/_Layout.cshtml index 4e0019c4b8..61b0610775 100644 --- a/src/Microsoft.AspNetCore.SpaTemplates/content/Aurelia-CSharp/Views/Shared/_Layout.cshtml +++ b/src/Microsoft.AspNetCore.SpaTemplates/content/Aurelia-CSharp/Views/Shared/_Layout.cshtml @@ -1,9 +1,9 @@ - + - @ViewData["Title"] - AureliaSpa + @ViewData["Title"] - Company.WebApplication1 diff --git a/src/Microsoft.AspNetCore.SpaTemplates/content/Aurelia-CSharp/Views/_ViewImports.cshtml b/src/Microsoft.AspNetCore.SpaTemplates/content/Aurelia-CSharp/Views/_ViewImports.cshtml index 4542402dcf..0f1f5a932a 100644 --- a/src/Microsoft.AspNetCore.SpaTemplates/content/Aurelia-CSharp/Views/_ViewImports.cshtml +++ b/src/Microsoft.AspNetCore.SpaTemplates/content/Aurelia-CSharp/Views/_ViewImports.cshtml @@ -1,3 +1,3 @@ -@using AureliaSpa +@using Company.WebApplication1 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers @addTagHelper *, Microsoft.AspNetCore.SpaServices diff --git a/src/Microsoft.AspNetCore.SpaTemplates/content/Aurelia-CSharp/npm-shrinkwrap.json b/src/Microsoft.AspNetCore.SpaTemplates/content/Aurelia-CSharp/npm-shrinkwrap.json index 0820340839..e6b717894b 100644 --- a/src/Microsoft.AspNetCore.SpaTemplates/content/Aurelia-CSharp/npm-shrinkwrap.json +++ b/src/Microsoft.AspNetCore.SpaTemplates/content/Aurelia-CSharp/npm-shrinkwrap.json @@ -1,5 +1,5 @@ { - "name": "AureliaSpa", + "name": "Company.WebApplication1", "version": "0.0.0", "dependencies": { "@types/webpack-env": { diff --git a/src/Microsoft.AspNetCore.SpaTemplates/content/Aurelia-CSharp/package.json b/src/Microsoft.AspNetCore.SpaTemplates/content/Aurelia-CSharp/package.json index f77a1cc90e..62d190aaa0 100644 --- a/src/Microsoft.AspNetCore.SpaTemplates/content/Aurelia-CSharp/package.json +++ b/src/Microsoft.AspNetCore.SpaTemplates/content/Aurelia-CSharp/package.json @@ -1,5 +1,5 @@ { - "name": "AureliaSpa", + "name": "Company.WebApplication1", "private": true, "version": "0.0.0", "devDependencies": { diff --git a/src/Microsoft.AspNetCore.SpaTemplates/content/Knockout-CSharp/.template.config/template.json b/src/Microsoft.AspNetCore.SpaTemplates/content/Knockout-CSharp/.template.config/template.json index 91dd56cb7b..0a1b1f5595 100644 --- a/src/Microsoft.AspNetCore.SpaTemplates/content/Knockout-CSharp/.template.config/template.json +++ b/src/Microsoft.AspNetCore.SpaTemplates/content/Knockout-CSharp/.template.config/template.json @@ -11,11 +11,11 @@ "preferNameDirectory": true, "primaryOutputs": [ { - "path": "KnockoutSpa.csproj" + "path": "Company.WebApplication1.csproj" } ], "shortName": "knockout", - "sourceName": "KnockoutSpa", + "sourceName": "Company.WebApplication1", "sources": [ { "source": "./", diff --git a/src/Microsoft.AspNetCore.SpaTemplates/content/Knockout-CSharp/ClientApp/components/nav-menu/nav-menu.html b/src/Microsoft.AspNetCore.SpaTemplates/content/Knockout-CSharp/ClientApp/components/nav-menu/nav-menu.html index d2af38d86d..a0abc2007d 100644 --- a/src/Microsoft.AspNetCore.SpaTemplates/content/Knockout-CSharp/ClientApp/components/nav-menu/nav-menu.html +++ b/src/Microsoft.AspNetCore.SpaTemplates/content/Knockout-CSharp/ClientApp/components/nav-menu/nav-menu.html @@ -7,7 +7,7 @@ - KnockoutSpa + Company.WebApplication1
diff --git a/src/Microsoft.AspNetCore.SpaTemplates/content/Knockout-CSharp/Controllers/HomeController.cs b/src/Microsoft.AspNetCore.SpaTemplates/content/Knockout-CSharp/Controllers/HomeController.cs index 593ae37d35..aad433c1d3 100644 --- a/src/Microsoft.AspNetCore.SpaTemplates/content/Knockout-CSharp/Controllers/HomeController.cs +++ b/src/Microsoft.AspNetCore.SpaTemplates/content/Knockout-CSharp/Controllers/HomeController.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; -namespace KnockoutSpa.Controllers +namespace Company.WebApplication1.Controllers { public class HomeController : Controller { diff --git a/src/Microsoft.AspNetCore.SpaTemplates/content/Knockout-CSharp/Controllers/SampleDataController.cs b/src/Microsoft.AspNetCore.SpaTemplates/content/Knockout-CSharp/Controllers/SampleDataController.cs index 0b30849b01..4078df55b6 100644 --- a/src/Microsoft.AspNetCore.SpaTemplates/content/Knockout-CSharp/Controllers/SampleDataController.cs +++ b/src/Microsoft.AspNetCore.SpaTemplates/content/Knockout-CSharp/Controllers/SampleDataController.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; -namespace KnockoutSpa.Controllers +namespace Company.WebApplication1.Controllers { [Route("api/[controller]")] public class SampleDataController : Controller diff --git a/src/Microsoft.AspNetCore.SpaTemplates/content/Knockout-CSharp/Program.cs b/src/Microsoft.AspNetCore.SpaTemplates/content/Knockout-CSharp/Program.cs index 514e143ef6..1579d650b3 100644 --- a/src/Microsoft.AspNetCore.SpaTemplates/content/Knockout-CSharp/Program.cs +++ b/src/Microsoft.AspNetCore.SpaTemplates/content/Knockout-CSharp/Program.cs @@ -8,7 +8,7 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging; -namespace KnockoutSpa +namespace Company.WebApplication1 { public class Program { diff --git a/src/Microsoft.AspNetCore.SpaTemplates/content/Knockout-CSharp/Startup.cs b/src/Microsoft.AspNetCore.SpaTemplates/content/Knockout-CSharp/Startup.cs index 13bfa380f6..b94f9cd9ab 100644 --- a/src/Microsoft.AspNetCore.SpaTemplates/content/Knockout-CSharp/Startup.cs +++ b/src/Microsoft.AspNetCore.SpaTemplates/content/Knockout-CSharp/Startup.cs @@ -10,7 +10,7 @@ using Microsoft.AspNetCore.SpaServices.Webpack; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -namespace KnockoutSpa +namespace Company.WebApplication1 { public class Startup { diff --git a/src/Microsoft.AspNetCore.SpaTemplates/content/Knockout-CSharp/Views/Shared/_Layout.cshtml b/src/Microsoft.AspNetCore.SpaTemplates/content/Knockout-CSharp/Views/Shared/_Layout.cshtml index 448e6d7b43..df1f772f0a 100644 --- a/src/Microsoft.AspNetCore.SpaTemplates/content/Knockout-CSharp/Views/Shared/_Layout.cshtml +++ b/src/Microsoft.AspNetCore.SpaTemplates/content/Knockout-CSharp/Views/Shared/_Layout.cshtml @@ -1,9 +1,9 @@ - + - @ViewData["Title"] - KnockoutSpa + @ViewData["Title"] - Company.WebApplication1 diff --git a/src/Microsoft.AspNetCore.SpaTemplates/content/Knockout-CSharp/Views/_ViewImports.cshtml b/src/Microsoft.AspNetCore.SpaTemplates/content/Knockout-CSharp/Views/_ViewImports.cshtml index b4dea68c79..0f1f5a932a 100644 --- a/src/Microsoft.AspNetCore.SpaTemplates/content/Knockout-CSharp/Views/_ViewImports.cshtml +++ b/src/Microsoft.AspNetCore.SpaTemplates/content/Knockout-CSharp/Views/_ViewImports.cshtml @@ -1,3 +1,3 @@ -@using KnockoutSpa +@using Company.WebApplication1 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers @addTagHelper *, Microsoft.AspNetCore.SpaServices diff --git a/src/Microsoft.AspNetCore.SpaTemplates/content/Knockout-CSharp/npm-shrinkwrap.json b/src/Microsoft.AspNetCore.SpaTemplates/content/Knockout-CSharp/npm-shrinkwrap.json index eb196190fb..4f0898949f 100644 --- a/src/Microsoft.AspNetCore.SpaTemplates/content/Knockout-CSharp/npm-shrinkwrap.json +++ b/src/Microsoft.AspNetCore.SpaTemplates/content/Knockout-CSharp/npm-shrinkwrap.json @@ -1,5 +1,5 @@ { - "name": "KnockoutSpa", + "name": "Company.WebApplication1", "version": "0.0.0", "dependencies": { "@types/core-js": { diff --git a/src/Microsoft.AspNetCore.SpaTemplates/content/Knockout-CSharp/package.json b/src/Microsoft.AspNetCore.SpaTemplates/content/Knockout-CSharp/package.json index 0fa2f90a66..8be044efe8 100644 --- a/src/Microsoft.AspNetCore.SpaTemplates/content/Knockout-CSharp/package.json +++ b/src/Microsoft.AspNetCore.SpaTemplates/content/Knockout-CSharp/package.json @@ -1,5 +1,5 @@ { - "name": "KnockoutSpa", + "name": "Company.WebApplication1", "private": true, "version": "0.0.0", "devDependencies": { diff --git a/src/Microsoft.AspNetCore.SpaTemplates/content/Vue-CSharp/.template.config/template.json b/src/Microsoft.AspNetCore.SpaTemplates/content/Vue-CSharp/.template.config/template.json index 84eb590b38..1db8a4c69a 100644 --- a/src/Microsoft.AspNetCore.SpaTemplates/content/Vue-CSharp/.template.config/template.json +++ b/src/Microsoft.AspNetCore.SpaTemplates/content/Vue-CSharp/.template.config/template.json @@ -11,11 +11,11 @@ "preferNameDirectory": true, "primaryOutputs": [ { - "path": "VueSpa.csproj" + "path": "Company.WebApplication1.csproj" } ], "shortName": "vue", - "sourceName": "VueSpa", + "sourceName": "Company.WebApplication1", "sources": [ { "source": "./", diff --git a/src/Microsoft.AspNetCore.SpaTemplates/content/Vue-CSharp/ClientApp/components/navmenu/navmenu.vue.html b/src/Microsoft.AspNetCore.SpaTemplates/content/Vue-CSharp/ClientApp/components/navmenu/navmenu.vue.html index d4d4060153..b462a8a087 100644 --- a/src/Microsoft.AspNetCore.SpaTemplates/content/Vue-CSharp/ClientApp/components/navmenu/navmenu.vue.html +++ b/src/Microsoft.AspNetCore.SpaTemplates/content/Vue-CSharp/ClientApp/components/navmenu/navmenu.vue.html @@ -8,7 +8,7 @@ - VueSpa + Company.WebApplication1
diff --git a/src/Microsoft.AspNetCore.SpaTemplates/content/Vue-CSharp/Controllers/HomeController.cs b/src/Microsoft.AspNetCore.SpaTemplates/content/Vue-CSharp/Controllers/HomeController.cs index 2850fc2dfa..aad433c1d3 100644 --- a/src/Microsoft.AspNetCore.SpaTemplates/content/Vue-CSharp/Controllers/HomeController.cs +++ b/src/Microsoft.AspNetCore.SpaTemplates/content/Vue-CSharp/Controllers/HomeController.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; -namespace VueSpa.Controllers +namespace Company.WebApplication1.Controllers { public class HomeController : Controller { diff --git a/src/Microsoft.AspNetCore.SpaTemplates/content/Vue-CSharp/Controllers/SampleDataController.cs b/src/Microsoft.AspNetCore.SpaTemplates/content/Vue-CSharp/Controllers/SampleDataController.cs index 0454a16f8b..4078df55b6 100644 --- a/src/Microsoft.AspNetCore.SpaTemplates/content/Vue-CSharp/Controllers/SampleDataController.cs +++ b/src/Microsoft.AspNetCore.SpaTemplates/content/Vue-CSharp/Controllers/SampleDataController.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; -namespace VueSpa.Controllers +namespace Company.WebApplication1.Controllers { [Route("api/[controller]")] public class SampleDataController : Controller diff --git a/src/Microsoft.AspNetCore.SpaTemplates/content/Vue-CSharp/Program.cs b/src/Microsoft.AspNetCore.SpaTemplates/content/Vue-CSharp/Program.cs index 46363bf3b8..1579d650b3 100644 --- a/src/Microsoft.AspNetCore.SpaTemplates/content/Vue-CSharp/Program.cs +++ b/src/Microsoft.AspNetCore.SpaTemplates/content/Vue-CSharp/Program.cs @@ -8,7 +8,7 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging; -namespace VueSpa +namespace Company.WebApplication1 { public class Program { diff --git a/src/Microsoft.AspNetCore.SpaTemplates/content/Vue-CSharp/Startup.cs b/src/Microsoft.AspNetCore.SpaTemplates/content/Vue-CSharp/Startup.cs index 835a5dc701..b94f9cd9ab 100644 --- a/src/Microsoft.AspNetCore.SpaTemplates/content/Vue-CSharp/Startup.cs +++ b/src/Microsoft.AspNetCore.SpaTemplates/content/Vue-CSharp/Startup.cs @@ -10,7 +10,7 @@ using Microsoft.AspNetCore.SpaServices.Webpack; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -namespace VueSpa +namespace Company.WebApplication1 { public class Startup { diff --git a/src/Microsoft.AspNetCore.SpaTemplates/content/Vue-CSharp/Views/Shared/_Layout.cshtml b/src/Microsoft.AspNetCore.SpaTemplates/content/Vue-CSharp/Views/Shared/_Layout.cshtml index b8d9bd38ea..df1f772f0a 100644 --- a/src/Microsoft.AspNetCore.SpaTemplates/content/Vue-CSharp/Views/Shared/_Layout.cshtml +++ b/src/Microsoft.AspNetCore.SpaTemplates/content/Vue-CSharp/Views/Shared/_Layout.cshtml @@ -1,9 +1,9 @@ - + - @ViewData["Title"] - VueSpa + @ViewData["Title"] - Company.WebApplication1 diff --git a/src/Microsoft.AspNetCore.SpaTemplates/content/Vue-CSharp/Views/_ViewImports.cshtml b/src/Microsoft.AspNetCore.SpaTemplates/content/Vue-CSharp/Views/_ViewImports.cshtml index bba39eb1f8..0f1f5a932a 100644 --- a/src/Microsoft.AspNetCore.SpaTemplates/content/Vue-CSharp/Views/_ViewImports.cshtml +++ b/src/Microsoft.AspNetCore.SpaTemplates/content/Vue-CSharp/Views/_ViewImports.cshtml @@ -1,3 +1,3 @@ -@using VueSpa +@using Company.WebApplication1 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers @addTagHelper *, Microsoft.AspNetCore.SpaServices diff --git a/src/Microsoft.AspNetCore.SpaTemplates/content/Vue-CSharp/npm-shrinkwrap.json b/src/Microsoft.AspNetCore.SpaTemplates/content/Vue-CSharp/npm-shrinkwrap.json index c95dc48859..d44427834e 100644 --- a/src/Microsoft.AspNetCore.SpaTemplates/content/Vue-CSharp/npm-shrinkwrap.json +++ b/src/Microsoft.AspNetCore.SpaTemplates/content/Vue-CSharp/npm-shrinkwrap.json @@ -1,5 +1,5 @@ { - "name": "VueSpa", + "name": "Company.WebApplication1", "version": "0.0.0", "dependencies": { "@types/webpack-env": { diff --git a/src/Microsoft.AspNetCore.SpaTemplates/content/Vue-CSharp/package.json b/src/Microsoft.AspNetCore.SpaTemplates/content/Vue-CSharp/package.json index bbf35d8ae8..82814b5192 100644 --- a/src/Microsoft.AspNetCore.SpaTemplates/content/Vue-CSharp/package.json +++ b/src/Microsoft.AspNetCore.SpaTemplates/content/Vue-CSharp/package.json @@ -1,5 +1,5 @@ { - "name": "VueSpa", + "name": "Company.WebApplication1", "private": true, "version": "0.0.0", "devDependencies": { diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj index b5e36c8ba0..ed7ae00d8c 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj @@ -24,13 +24,13 @@ - + $(GeneratedContentProperties) - + $(GeneratedContentProperties) - + $(GeneratedContentProperties) diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/.template.config/template.json b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/.template.config/template.json index 65f91e315b..561e69c38f 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/.template.config/template.json +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/.template.config/template.json @@ -11,11 +11,11 @@ "preferNameDirectory": true, "primaryOutputs": [ { - "path": "AngularSpa.csproj" + "path": "Company.WebApplication1.csproj" } ], "shortName": "angular", - "sourceName": "AngularSpa", + "sourceName": "Company.WebApplication1", "sources": [ { "source": "./", diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/.angular-cli.json b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/.angular-cli.json index 182d207e2e..da6fdbc1b3 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/.angular-cli.json +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/.angular-cli.json @@ -1,7 +1,7 @@ { "$schema": "./node_modules/@angular/cli/lib/config/schema.json", "project": { - "name": "AngularSpa" + "name": "Company.WebApplication1" }, "apps": [ { diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/package-lock.json b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/package-lock.json index b461b264bd..f91b9448c6 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/package-lock.json +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/package-lock.json @@ -1,5 +1,5 @@ { - "name": "AngularSpa", + "name": "Company.WebApplication1", "version": "0.0.0", "lockfileVersion": 1, "requires": true, diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/package.json b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/package.json index 56cac5a968..3a99b1d9f4 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/package.json +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/package.json @@ -1,5 +1,5 @@ { - "name": "AngularSpa", + "name": "Company.WebApplication1", "version": "0.0.0", "license": "MIT", "scripts": { diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/app/nav-menu/nav-menu.component.html b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/app/nav-menu/nav-menu.component.html index b9d005f2bd..e8a1d4080d 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/app/nav-menu/nav-menu.component.html +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/app/nav-menu/nav-menu.component.html @@ -7,7 +7,7 @@ - AngularSpa + Company.WebApplication1
diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/index.html b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/index.html index 6ce7094b2e..1d75b6afd1 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/index.html +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/index.html @@ -2,7 +2,7 @@ - AngularSpa + Company.WebApplication1 diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/Controllers/SampleDataController.cs b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/Controllers/SampleDataController.cs index cedab19f81..4078df55b6 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/Controllers/SampleDataController.cs +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/Controllers/SampleDataController.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; -namespace AngularSpa.Controllers +namespace Company.WebApplication1.Controllers { [Route("api/[controller]")] public class SampleDataController : Controller diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/Program.cs b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/Program.cs index a72656af8a..a7108005ed 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/Program.cs +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/Program.cs @@ -8,7 +8,7 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging; -namespace AngularSpa +namespace Company.WebApplication1 { public class Program { diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/Startup.cs b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/Startup.cs index a54c883632..33af4ea525 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/Startup.cs +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/Startup.cs @@ -5,7 +5,7 @@ using Microsoft.AspNetCore.SpaServices.AngularCli; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -namespace AngularSpa +namespace Company.WebApplication1 { public class Startup { diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/React-CSharp/.template.config/template.json b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/React-CSharp/.template.config/template.json index b728ad8e6c..fd45d7373d 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/React-CSharp/.template.config/template.json +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/React-CSharp/.template.config/template.json @@ -11,11 +11,11 @@ "preferNameDirectory": true, "primaryOutputs": [ { - "path": "ReactSpa.csproj" + "path": "Company.WebApplication1.csproj" } ], "shortName": "react", - "sourceName": "ReactSpa", + "sourceName": "Company.WebApplication1", "sources": [ { "source": "./", diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/React-CSharp/ClientApp/package-lock.json b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/React-CSharp/ClientApp/package-lock.json index b2fcf2604a..d5171611aa 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/React-CSharp/ClientApp/package-lock.json +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/React-CSharp/ClientApp/package-lock.json @@ -1,5 +1,5 @@ { - "name": "ReactSpa", + "name": "Company.WebApplication1", "version": "0.1.0", "lockfileVersion": 1, "requires": true, diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/React-CSharp/ClientApp/package.json b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/React-CSharp/ClientApp/package.json index 64a0403e93..2515ded975 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/React-CSharp/ClientApp/package.json +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/React-CSharp/ClientApp/package.json @@ -1,5 +1,5 @@ { - "name": "ReactSpa", + "name": "Company.WebApplication1", "version": "0.1.0", "private": true, "dependencies": { diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/React-CSharp/ClientApp/public/index.html b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/React-CSharp/ClientApp/public/index.html index 1acc728645..7607dcc74d 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/React-CSharp/ClientApp/public/index.html +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/React-CSharp/ClientApp/public/index.html @@ -20,7 +20,7 @@ work correctly both with client-side routing and a non-root public URL. Learn how to configure a non-root public URL by running `npm run build`. --> - ReactSpa + Company.WebApplication1