From 0291686b2056954c9aa7ea31ade261f43b3bd797 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 23 Aug 2017 14:58:49 -0700 Subject: [PATCH] Reorganize templates into dir structure matching 'dotnet new' templates --- .gitignore | 10 ++--- .../.template.config/dotnetcli.host.json | 0 .../aurelia}/.template.config/icon.png | Bin .../aurelia}/.template.config/template.json | 0 .../.template.config/vs-2017.3.host.json | 0 .../Content/aurelia}/AureliaSpa.csproj | 0 .../ClientApp/app/components/app/app.css | 0 .../ClientApp/app/components/app/app.html | 0 .../ClientApp/app/components/app/app.ts | 0 .../app/components/counter/counter.html | 0 .../app/components/counter/counter.ts | 0 .../app/components/fetchdata/fetchdata.html | 0 .../app/components/fetchdata/fetchdata.ts | 0 .../ClientApp/app/components/home/home.html | 0 .../ClientApp/app/components/home/home.ts | 0 .../app/components/navmenu/navmenu.css | 0 .../app/components/navmenu/navmenu.html | 0 .../Content/aurelia}/ClientApp/boot.ts | 0 .../aurelia}/Controllers/HomeController.cs | 0 .../Controllers/SampleDataController.cs | 0 .../Content/aurelia}/Program.cs | 0 .../Content/aurelia}/Startup.cs | 0 .../Content/aurelia}/Views/Home/Index.cshtml | 0 .../aurelia}/Views/Shared/Error.cshtml | 0 .../aurelia}/Views/Shared/_Layout.cshtml | 0 .../aurelia}/Views/_ViewImports.cshtml | 0 .../Content/aurelia}/Views/_ViewStart.cshtml | 0 .../aurelia}/appsettings.Development.json | 0 .../Content/aurelia}/appsettings.json | 0 .../Content/aurelia}/npm-shrinkwrap.json | 0 .../Content/aurelia}/package.json | 0 .../Content/aurelia}/template_gitignore | 0 .../Content/aurelia}/tsconfig.json | 0 .../Content/aurelia}/webpack.config.js | 0 .../Content/aurelia}/webpack.config.vendor.js | 0 .../Content/aurelia}/wwwroot/favicon.ico | Bin .../.template.config/dotnetcli.host.json | 0 .../knockout}/.template.config/icon.png | Bin .../knockout}/.template.config/template.json | 0 .../.template.config/vs-2017.3.host.json | 0 .../Content/knockout}/ClientApp/boot.ts | 0 .../components/app-root/app-root.html | 0 .../ClientApp/components/app-root/app-root.ts | 0 .../counter-example/counter-example.html | 0 .../counter-example/counter-example.ts | 0 .../components/fetch-data/fetch-data.html | 0 .../components/fetch-data/fetch-data.ts | 0 .../components/home-page/home-page.html | 0 .../components/home-page/home-page.ts | 0 .../components/nav-menu/nav-menu.html | 0 .../ClientApp/components/nav-menu/nav-menu.ts | 0 .../Content/knockout}/ClientApp/css/site.css | 0 .../Content/knockout}/ClientApp/router.ts | 0 .../ClientApp/webpack-component-loader.ts | 0 .../knockout}/Controllers/HomeController.cs | 0 .../Controllers/SampleDataController.cs | 0 .../Content/knockout}/KnockoutSpa.csproj | 0 .../Content/knockout}/Program.cs | 0 .../Content/knockout}/Startup.cs | 0 .../Content/knockout}/Views/Home/Index.cshtml | 0 .../knockout}/Views/Shared/Error.cshtml | 0 .../knockout}/Views/Shared/_Layout.cshtml | 0 .../knockout}/Views/_ViewImports.cshtml | 0 .../Content/knockout}/Views/_ViewStart.cshtml | 0 .../knockout}/appsettings.Development.json | 0 .../Content/knockout}/appsettings.json | 0 .../Content/knockout}/npm-shrinkwrap.json | 0 .../Content/knockout}/package.json | 0 .../Content/knockout}/template_gitignore | 0 .../Content/knockout}/tsconfig.json | 0 .../Content/knockout}/webpack.config.js | 0 .../knockout}/webpack.config.vendor.js | 0 .../Content/knockout}/wwwroot/favicon.ico | Bin .../vue}/.template.config/dotnetcli.host.json | 0 .../Content/vue}/.template.config/icon.png | Bin .../vue}/.template.config/template.json | 0 .../vue}/.template.config/vs-2017.3.host.json | 0 .../Content/vue}/ClientApp/boot.ts | 0 .../vue}/ClientApp/components/app/app.ts | 0 .../ClientApp/components/app/app.vue.html | 0 .../ClientApp/components/counter/counter.ts | 0 .../components/counter/counter.vue.html | 0 .../components/fetchdata/fetchdata.ts | 0 .../components/fetchdata/fetchdata.vue.html | 0 .../ClientApp/components/home/home.vue.html | 0 .../ClientApp/components/navmenu/navmenu.css | 0 .../components/navmenu/navmenu.vue.html | 0 .../Content/vue}/ClientApp/css/site.css | 0 .../vue}/Controllers/HomeController.cs | 0 .../vue}/Controllers/SampleDataController.cs | 0 .../Content/vue}/Program.cs | 0 .../Content/vue}/Startup.cs | 0 .../Content/vue}/Views/Home/Index.cshtml | 0 .../Content/vue}/Views/Shared/Error.cshtml | 0 .../Content/vue}/Views/Shared/_Layout.cshtml | 0 .../Content/vue}/Views/_ViewImports.cshtml | 0 .../Content/vue}/Views/_ViewStart.cshtml | 0 .../Content/vue}/VueSpa.csproj | 0 .../Content/vue}/appsettings.Development.json | 0 .../Content/vue}/appsettings.json | 0 .../Content/vue}/npm-shrinkwrap.json | 0 .../Content/vue}/package.json | 0 .../Content/vue}/template_gitignore | 0 .../Content/vue}/tsconfig.json | 0 .../Content/vue}/webpack.config.js | 0 .../Content/vue}/webpack.config.vendor.js | 0 .../Content/vue}/wwwroot/favicon.ico | Bin .../Microsoft.AspNetCore.SpaTemplates.nuspec | 0 .../.template.config/dotnetcli.host.json | 0 .../angular}/.template.config/icon.png | Bin .../angular}/.template.config/template.json | 0 .../.template.config/vs-2017.3.host.json | 0 .../Content/angular}/AngularSpa.csproj | 0 .../ClientApp/app/app.module.browser.ts | 0 .../ClientApp/app/app.module.server.ts | 0 .../ClientApp/app/app.module.shared.ts | 0 .../app/components/app/app.component.css | 0 .../app/components/app/app.component.html | 0 .../app/components/app/app.component.ts | 0 .../components/counter/counter.component.html | 0 .../counter/counter.component.spec.ts | 0 .../components/counter/counter.component.ts | 0 .../fetchdata/fetchdata.component.html | 0 .../fetchdata/fetchdata.component.ts | 0 .../app/components/home/home.component.html | 0 .../app/components/home/home.component.ts | 0 .../components/navmenu/navmenu.component.css | 0 .../components/navmenu/navmenu.component.html | 0 .../components/navmenu/navmenu.component.ts | 0 .../angular}/ClientApp/boot.browser.ts | 0 .../Content/angular}/ClientApp/boot.server.ts | 0 .../angular}/ClientApp/test/boot-tests.ts | 0 .../angular}/ClientApp/test/karma.conf.js | 0 .../angular}/Controllers/HomeController.cs | 0 .../Controllers/SampleDataController.cs | 0 .../Content/angular}/Program.cs | 0 .../Content/angular}/Startup.cs | 0 .../Content/angular}/Views/Home/Index.cshtml | 0 .../angular}/Views/Shared/Error.cshtml | 0 .../angular}/Views/Shared/_Layout.cshtml | 0 .../angular}/Views/_ViewImports.cshtml | 0 .../Content/angular}/Views/_ViewStart.cshtml | 0 .../angular}/appsettings.Development.json | 0 .../Content/angular}/appsettings.json | 0 .../Content/angular}/npm-shrinkwrap.json | 0 .../Content/angular}/package.json | 0 .../Content/angular}/template_gitignore | 0 .../Content/angular}/tsconfig.json | 0 .../Content/angular}/webpack.config.js | 0 .../Content/angular}/webpack.config.vendor.js | 0 .../Content/angular}/wwwroot/favicon.ico | Bin .../.template.config/dotnetcli.host.json | 0 .../Content/react}/.template.config/icon.png | Bin .../react}/.template.config/template.json | 0 .../.template.config/vs-2017.3.host.json | 0 .../Content/react}/ClientApp/boot.tsx | 0 .../react}/ClientApp/components/Counter.tsx | 0 .../react}/ClientApp/components/FetchData.tsx | 0 .../react}/ClientApp/components/Home.tsx | 0 .../react}/ClientApp/components/Layout.tsx | 0 .../react}/ClientApp/components/NavMenu.tsx | 0 .../Content/react}/ClientApp/css/site.css | 0 .../Content/react}/ClientApp/routes.tsx | 0 .../react}/Controllers/HomeController.cs | 0 .../Controllers/SampleDataController.cs | 0 .../Content/react}/Program.cs | 0 .../Content/react}/ReactSpa.csproj | 0 .../Content/react}/Startup.cs | 0 .../Content/react}/Views/Home/Index.cshtml | 0 .../Content/react}/Views/Shared/Error.cshtml | 0 .../react}/Views/Shared/_Layout.cshtml | 0 .../Content/react}/Views/_ViewImports.cshtml | 0 .../Content/react}/Views/_ViewStart.cshtml | 0 .../react}/appsettings.Development.json | 0 .../Content/react}/appsettings.json | 0 .../Content/react}/npm-shrinkwrap.json | 0 .../Content/react}/package.json | 0 .../Content/react}/template_gitignore | 0 .../Content/react}/tsconfig.json | 0 .../Content/react}/webpack.config.js | 0 .../Content/react}/webpack.config.vendor.js | 0 .../Content/react}/wwwroot/favicon.ico | Bin .../.template.config/dotnetcli.host.json | 0 .../Content/redux}/.template.config/icon.png | Bin .../redux}/.template.config/template.json | 0 .../.template.config/vs-2017.3.host.json | 0 .../Content/redux}/ClientApp/boot-client.tsx | 0 .../Content/redux}/ClientApp/boot-server.tsx | 0 .../redux}/ClientApp/components/Counter.tsx | 0 .../redux}/ClientApp/components/FetchData.tsx | 0 .../redux}/ClientApp/components/Home.tsx | 0 .../redux}/ClientApp/components/Layout.tsx | 0 .../redux}/ClientApp/components/NavMenu.tsx | 0 .../redux}/ClientApp/configureStore.ts | 0 .../Content/redux}/ClientApp/css/site.css | 0 .../Content/redux}/ClientApp/routes.tsx | 0 .../Content/redux}/ClientApp/store/Counter.ts | 0 .../ClientApp/store/WeatherForecasts.ts | 0 .../Content/redux}/ClientApp/store/index.ts | 0 .../redux}/Controllers/HomeController.cs | 0 .../Controllers/SampleDataController.cs | 0 .../Content/redux}/Program.cs | 0 .../Content/redux}/ReactReduxSpa.csproj | 0 .../Content/redux}/Startup.cs | 0 .../Content/redux}/Views/Home/Index.cshtml | 0 .../Content/redux}/Views/Shared/Error.cshtml | 0 .../redux}/Views/Shared/_Layout.cshtml | 0 .../Content/redux}/Views/_ViewImports.cshtml | 0 .../Content/redux}/Views/_ViewStart.cshtml | 0 .../redux}/appsettings.Development.json | 0 .../Content/redux}/appsettings.json | 0 .../Content/redux}/npm-shrinkwrap.json | 0 .../Content/redux}/package.json | 0 .../Content/redux}/template_gitignore | 0 .../Content/redux}/tsconfig.json | 0 .../Content/redux}/webpack.config.js | 0 .../Content/redux}/webpack.config.vendor.js | 0 .../Content/redux}/wwwroot/favicon.ico | Bin ...oft.DotNet.Web.Spa.ProjectTemplates.nuspec | 0 templates/package-builder/src/build/build.ts | 36 ++++++------------ 220 files changed, 16 insertions(+), 30 deletions(-) rename templates/{AngularSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/.template.config/dotnetcli.host.json (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/.template.config/icon.png (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/.template.config/template.json (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/.template.config/vs-2017.3.host.json (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/AureliaSpa.csproj (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/ClientApp/app/components/app/app.css (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/ClientApp/app/components/app/app.html (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/ClientApp/app/components/app/app.ts (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/ClientApp/app/components/counter/counter.html (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/ClientApp/app/components/counter/counter.ts (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/ClientApp/app/components/fetchdata/fetchdata.html (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/ClientApp/app/components/fetchdata/fetchdata.ts (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/ClientApp/app/components/home/home.html (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/ClientApp/app/components/home/home.ts (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/ClientApp/app/components/navmenu/navmenu.css (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/ClientApp/app/components/navmenu/navmenu.html (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/ClientApp/boot.ts (100%) rename templates/{AngularSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/Controllers/HomeController.cs (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/Controllers/SampleDataController.cs (100%) rename templates/{AngularSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/Program.cs (100%) rename templates/{AngularSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/Startup.cs (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/Views/Home/Index.cshtml (100%) rename templates/{AngularSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/Views/Shared/Error.cshtml (100%) rename templates/{AngularSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/Views/Shared/_Layout.cshtml (100%) rename templates/{AngularSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/Views/_ViewImports.cshtml (100%) rename templates/{AngularSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/Views/_ViewStart.cshtml (100%) rename templates/{AngularSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/appsettings.Development.json (100%) rename templates/{AngularSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/appsettings.json (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/npm-shrinkwrap.json (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/package.json (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/template_gitignore (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/tsconfig.json (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/webpack.config.js (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/webpack.config.vendor.js (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/aurelia}/wwwroot/favicon.ico (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/.template.config/dotnetcli.host.json (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/.template.config/icon.png (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/.template.config/template.json (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/.template.config/vs-2017.3.host.json (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/ClientApp/boot.ts (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/ClientApp/components/app-root/app-root.html (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/ClientApp/components/app-root/app-root.ts (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/ClientApp/components/counter-example/counter-example.html (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/ClientApp/components/counter-example/counter-example.ts (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/ClientApp/components/fetch-data/fetch-data.html (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/ClientApp/components/fetch-data/fetch-data.ts (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/ClientApp/components/home-page/home-page.html (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/ClientApp/components/home-page/home-page.ts (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/ClientApp/components/nav-menu/nav-menu.html (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/ClientApp/components/nav-menu/nav-menu.ts (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/ClientApp/css/site.css (100%) mode change 100755 => 100644 rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/ClientApp/router.ts (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/ClientApp/webpack-component-loader.ts (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/Controllers/HomeController.cs (100%) rename templates/{AngularSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/Controllers/SampleDataController.cs (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/KnockoutSpa.csproj (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/Program.cs (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/Startup.cs (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/Views/Home/Index.cshtml (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/Views/Shared/Error.cshtml (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/Views/Shared/_Layout.cshtml (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/Views/_ViewImports.cshtml (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/Views/_ViewStart.cshtml (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/appsettings.Development.json (100%) rename templates/{AureliaSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/appsettings.json (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/npm-shrinkwrap.json (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/package.json (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/template_gitignore (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/tsconfig.json (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/webpack.config.js (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/webpack.config.vendor.js (100%) rename templates/{AngularSpa => Microsoft.AspNetCore.SpaTemplates/Content/knockout}/wwwroot/favicon.ico (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/.template.config/dotnetcli.host.json (100%) rename templates/{VueSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/.template.config/icon.png (100%) rename templates/{VueSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/.template.config/template.json (100%) rename templates/{VueSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/.template.config/vs-2017.3.host.json (100%) rename templates/{VueSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/ClientApp/boot.ts (100%) rename templates/{VueSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/ClientApp/components/app/app.ts (100%) rename templates/{VueSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/ClientApp/components/app/app.vue.html (100%) rename templates/{VueSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/ClientApp/components/counter/counter.ts (100%) rename templates/{VueSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/ClientApp/components/counter/counter.vue.html (100%) rename templates/{VueSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/ClientApp/components/fetchdata/fetchdata.ts (100%) rename templates/{VueSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/ClientApp/components/fetchdata/fetchdata.vue.html (100%) rename templates/{VueSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/ClientApp/components/home/home.vue.html (100%) rename templates/{VueSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/ClientApp/components/navmenu/navmenu.css (100%) rename templates/{VueSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/ClientApp/components/navmenu/navmenu.vue.html (100%) rename templates/{VueSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/ClientApp/css/site.css (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/Controllers/HomeController.cs (100%) mode change 100755 => 100644 rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/Controllers/SampleDataController.cs (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/Program.cs (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/Startup.cs (100%) mode change 100755 => 100644 rename templates/{VueSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/Views/Home/Index.cshtml (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/Views/Shared/Error.cshtml (100%) mode change 100755 => 100644 rename templates/{ReactSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/Views/Shared/_Layout.cshtml (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/Views/_ViewImports.cshtml (100%) mode change 100755 => 100644 rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/Views/_ViewStart.cshtml (100%) mode change 100755 => 100644 rename templates/{VueSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/VueSpa.csproj (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/appsettings.Development.json (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/appsettings.json (100%) mode change 100755 => 100644 rename templates/{VueSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/npm-shrinkwrap.json (100%) rename templates/{VueSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/package.json (100%) rename templates/{VueSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/template_gitignore (100%) rename templates/{VueSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/tsconfig.json (100%) rename templates/{VueSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/webpack.config.js (100%) rename templates/{VueSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/webpack.config.vendor.js (100%) rename templates/{KnockoutSpa => Microsoft.AspNetCore.SpaTemplates/Content/vue}/wwwroot/favicon.ico (100%) mode change 100755 => 100644 rename templates/{package-builder/src/dotnetnew => Microsoft.AspNetCore.SpaTemplates}/Microsoft.AspNetCore.SpaTemplates.nuspec (100%) rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/.template.config/dotnetcli.host.json (100%) rename templates/{AngularSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/.template.config/icon.png (100%) rename templates/{AngularSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/.template.config/template.json (100%) rename templates/{AngularSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/.template.config/vs-2017.3.host.json (100%) rename templates/{AngularSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/AngularSpa.csproj (100%) rename templates/{AngularSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/ClientApp/app/app.module.browser.ts (100%) rename templates/{AngularSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/ClientApp/app/app.module.server.ts (100%) rename templates/{AngularSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/ClientApp/app/app.module.shared.ts (100%) rename templates/{AngularSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/ClientApp/app/components/app/app.component.css (100%) rename templates/{AngularSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/ClientApp/app/components/app/app.component.html (100%) rename templates/{AngularSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/ClientApp/app/components/app/app.component.ts (100%) rename templates/{AngularSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/ClientApp/app/components/counter/counter.component.html (100%) rename templates/{AngularSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/ClientApp/app/components/counter/counter.component.spec.ts (100%) rename templates/{AngularSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/ClientApp/app/components/counter/counter.component.ts (100%) rename templates/{AngularSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/ClientApp/app/components/fetchdata/fetchdata.component.html (100%) rename templates/{AngularSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/ClientApp/app/components/fetchdata/fetchdata.component.ts (100%) rename templates/{AngularSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/ClientApp/app/components/home/home.component.html (100%) rename templates/{AngularSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/ClientApp/app/components/home/home.component.ts (100%) rename templates/{AngularSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/ClientApp/app/components/navmenu/navmenu.component.css (100%) rename templates/{AngularSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/ClientApp/app/components/navmenu/navmenu.component.html (100%) rename templates/{AngularSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/ClientApp/app/components/navmenu/navmenu.component.ts (100%) rename templates/{AngularSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/ClientApp/boot.browser.ts (100%) rename templates/{AngularSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/ClientApp/boot.server.ts (100%) rename templates/{AngularSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/ClientApp/test/boot-tests.ts (100%) rename templates/{AngularSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/ClientApp/test/karma.conf.js (100%) rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/Controllers/HomeController.cs (100%) mode change 100755 => 100644 rename templates/{ReactSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/Controllers/SampleDataController.cs (100%) rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/Program.cs (100%) rename templates/{VueSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/Startup.cs (100%) rename templates/{AngularSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/Views/Home/Index.cshtml (100%) rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/Views/Shared/Error.cshtml (100%) mode change 100755 => 100644 rename templates/{AureliaSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/Views/Shared/_Layout.cshtml (100%) rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/Views/_ViewImports.cshtml (100%) mode change 100755 => 100644 rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/Views/_ViewStart.cshtml (100%) mode change 100755 => 100644 rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/appsettings.Development.json (100%) rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/appsettings.json (100%) mode change 100755 => 100644 rename templates/{AngularSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/npm-shrinkwrap.json (100%) rename templates/{AngularSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/package.json (100%) rename templates/{AngularSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/template_gitignore (100%) rename templates/{AngularSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/tsconfig.json (100%) rename templates/{AngularSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/webpack.config.js (100%) rename templates/{AngularSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/webpack.config.vendor.js (100%) rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular}/wwwroot/favicon.ico (100%) mode change 100755 => 100644 rename templates/{ReactSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react}/.template.config/dotnetcli.host.json (100%) rename templates/{ReactSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react}/.template.config/icon.png (100%) rename templates/{ReactSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react}/.template.config/template.json (100%) rename templates/{ReactSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react}/.template.config/vs-2017.3.host.json (100%) rename templates/{ReactSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react}/ClientApp/boot.tsx (100%) rename templates/{ReactSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react}/ClientApp/components/Counter.tsx (100%) rename templates/{ReactSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react}/ClientApp/components/FetchData.tsx (100%) rename templates/{ReactSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react}/ClientApp/components/Home.tsx (100%) rename templates/{ReactSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react}/ClientApp/components/Layout.tsx (100%) rename templates/{ReactSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react}/ClientApp/components/NavMenu.tsx (100%) rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react}/ClientApp/css/site.css (100%) mode change 100755 => 100644 rename templates/{ReactSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react}/ClientApp/routes.tsx (100%) rename templates/{ReactSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react}/Controllers/HomeController.cs (100%) mode change 100755 => 100644 rename templates/{VueSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react}/Controllers/SampleDataController.cs (100%) rename templates/{ReactSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react}/Program.cs (100%) rename templates/{ReactSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react}/ReactSpa.csproj (100%) rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react}/Startup.cs (100%) mode change 100755 => 100644 rename templates/{ReactSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react}/Views/Home/Index.cshtml (100%) rename templates/{ReactSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react}/Views/Shared/Error.cshtml (100%) mode change 100755 => 100644 rename templates/{VueSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react}/Views/Shared/_Layout.cshtml (100%) rename templates/{ReactSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react}/Views/_ViewImports.cshtml (100%) mode change 100755 => 100644 rename templates/{ReactSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react}/Views/_ViewStart.cshtml (100%) mode change 100755 => 100644 rename templates/{ReactSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react}/appsettings.Development.json (100%) rename templates/{ReactSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react}/appsettings.json (100%) mode change 100755 => 100644 rename templates/{ReactSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react}/npm-shrinkwrap.json (100%) rename templates/{ReactSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react}/package.json (100%) rename templates/{ReactSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react}/template_gitignore (100%) rename templates/{ReactSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react}/tsconfig.json (100%) rename templates/{ReactSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react}/webpack.config.js (100%) rename templates/{ReactSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react}/webpack.config.vendor.js (100%) rename templates/{ReactSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react}/wwwroot/favicon.ico (100%) mode change 100755 => 100644 rename templates/{VueSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/.template.config/dotnetcli.host.json (100%) rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/.template.config/icon.png (100%) rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/.template.config/template.json (100%) rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/.template.config/vs-2017.3.host.json (100%) rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/ClientApp/boot-client.tsx (100%) rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/ClientApp/boot-server.tsx (100%) rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/ClientApp/components/Counter.tsx (100%) rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/ClientApp/components/FetchData.tsx (100%) rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/ClientApp/components/Home.tsx (100%) rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/ClientApp/components/Layout.tsx (100%) rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/ClientApp/components/NavMenu.tsx (100%) rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/ClientApp/configureStore.ts (100%) rename templates/{ReactSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/ClientApp/css/site.css (100%) mode change 100755 => 100644 rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/ClientApp/routes.tsx (100%) rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/ClientApp/store/Counter.ts (100%) rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/ClientApp/store/WeatherForecasts.ts (100%) rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/ClientApp/store/index.ts (100%) rename templates/{VueSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/Controllers/HomeController.cs (100%) rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/Controllers/SampleDataController.cs (100%) rename templates/{VueSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/Program.cs (100%) rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/ReactReduxSpa.csproj (100%) rename templates/{ReactSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/Startup.cs (100%) mode change 100755 => 100644 rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/Views/Home/Index.cshtml (100%) rename templates/{VueSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/Views/Shared/Error.cshtml (100%) rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/Views/Shared/_Layout.cshtml (100%) rename templates/{VueSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/Views/_ViewImports.cshtml (100%) rename templates/{VueSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/Views/_ViewStart.cshtml (100%) rename templates/{VueSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/appsettings.Development.json (100%) rename templates/{VueSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/appsettings.json (100%) rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/npm-shrinkwrap.json (100%) rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/package.json (100%) rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/template_gitignore (100%) rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/tsconfig.json (100%) rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/webpack.config.js (100%) rename templates/{ReactReduxSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/webpack.config.vendor.js (100%) rename templates/{VueSpa => Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux}/wwwroot/favicon.ico (100%) rename templates/{package-builder/src/dotnetnew => Microsoft.DotNet.Web.Spa.ProjectTemplates}/Microsoft.DotNet.Web.Spa.ProjectTemplates.nuspec (100%) diff --git a/.gitignore b/.gitignore index 1a704fb..8abcfa1 100644 --- a/.gitignore +++ b/.gitignore @@ -33,12 +33,12 @@ npm-debug.log # files with that name (https://github.com/npm/npm/issues/1862). So, each template instead has a template_gitignore # file which gets renamed after the files are copied. And so any files that need to be excluded in the source # repo have to be excluded here. -/templates/*/node_modules/ -/templates/*/wwwroot/dist/ -/templates/*/ClientApp/dist/ -/templates/*/yarn.lock +/templates/*/*/*/node_modules/ +/templates/*/*/*/wwwroot/dist/ +/templates/*/*/*/ClientApp/dist/ +/templates/*/*/*/yarn.lock .vscode/ -/templates/*/Properties/launchSettings.json +/templates/*/*/*/Properties/launchSettings.json global.json korebuild-lock.txt diff --git a/templates/AngularSpa/.template.config/dotnetcli.host.json b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/.template.config/dotnetcli.host.json similarity index 100% rename from templates/AngularSpa/.template.config/dotnetcli.host.json rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/.template.config/dotnetcli.host.json diff --git a/templates/AureliaSpa/.template.config/icon.png b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/.template.config/icon.png similarity index 100% rename from templates/AureliaSpa/.template.config/icon.png rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/.template.config/icon.png diff --git a/templates/AureliaSpa/.template.config/template.json b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/.template.config/template.json similarity index 100% rename from templates/AureliaSpa/.template.config/template.json rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/.template.config/template.json diff --git a/templates/AureliaSpa/.template.config/vs-2017.3.host.json b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/.template.config/vs-2017.3.host.json similarity index 100% rename from templates/AureliaSpa/.template.config/vs-2017.3.host.json rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/.template.config/vs-2017.3.host.json diff --git a/templates/AureliaSpa/AureliaSpa.csproj b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/AureliaSpa.csproj similarity index 100% rename from templates/AureliaSpa/AureliaSpa.csproj rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/AureliaSpa.csproj diff --git a/templates/AureliaSpa/ClientApp/app/components/app/app.css b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/app/app.css similarity index 100% rename from templates/AureliaSpa/ClientApp/app/components/app/app.css rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/app/app.css diff --git a/templates/AureliaSpa/ClientApp/app/components/app/app.html b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/app/app.html similarity index 100% rename from templates/AureliaSpa/ClientApp/app/components/app/app.html rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/app/app.html diff --git a/templates/AureliaSpa/ClientApp/app/components/app/app.ts b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/app/app.ts similarity index 100% rename from templates/AureliaSpa/ClientApp/app/components/app/app.ts rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/app/app.ts diff --git a/templates/AureliaSpa/ClientApp/app/components/counter/counter.html b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/counter/counter.html similarity index 100% rename from templates/AureliaSpa/ClientApp/app/components/counter/counter.html rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/counter/counter.html diff --git a/templates/AureliaSpa/ClientApp/app/components/counter/counter.ts b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/counter/counter.ts similarity index 100% rename from templates/AureliaSpa/ClientApp/app/components/counter/counter.ts rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/counter/counter.ts diff --git a/templates/AureliaSpa/ClientApp/app/components/fetchdata/fetchdata.html b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/fetchdata/fetchdata.html similarity index 100% rename from templates/AureliaSpa/ClientApp/app/components/fetchdata/fetchdata.html rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/fetchdata/fetchdata.html diff --git a/templates/AureliaSpa/ClientApp/app/components/fetchdata/fetchdata.ts b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/fetchdata/fetchdata.ts similarity index 100% rename from templates/AureliaSpa/ClientApp/app/components/fetchdata/fetchdata.ts rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/fetchdata/fetchdata.ts diff --git a/templates/AureliaSpa/ClientApp/app/components/home/home.html b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/home/home.html similarity index 100% rename from templates/AureliaSpa/ClientApp/app/components/home/home.html rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/home/home.html diff --git a/templates/AureliaSpa/ClientApp/app/components/home/home.ts b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/home/home.ts similarity index 100% rename from templates/AureliaSpa/ClientApp/app/components/home/home.ts rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/home/home.ts diff --git a/templates/AureliaSpa/ClientApp/app/components/navmenu/navmenu.css b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/navmenu/navmenu.css similarity index 100% rename from templates/AureliaSpa/ClientApp/app/components/navmenu/navmenu.css rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/navmenu/navmenu.css diff --git a/templates/AureliaSpa/ClientApp/app/components/navmenu/navmenu.html b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/navmenu/navmenu.html similarity index 100% rename from templates/AureliaSpa/ClientApp/app/components/navmenu/navmenu.html rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/app/components/navmenu/navmenu.html diff --git a/templates/AureliaSpa/ClientApp/boot.ts b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/boot.ts similarity index 100% rename from templates/AureliaSpa/ClientApp/boot.ts rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/ClientApp/boot.ts diff --git a/templates/AngularSpa/Controllers/HomeController.cs b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Controllers/HomeController.cs similarity index 100% rename from templates/AngularSpa/Controllers/HomeController.cs rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Controllers/HomeController.cs diff --git a/templates/AureliaSpa/Controllers/SampleDataController.cs b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Controllers/SampleDataController.cs similarity index 100% rename from templates/AureliaSpa/Controllers/SampleDataController.cs rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Controllers/SampleDataController.cs diff --git a/templates/AngularSpa/Program.cs b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Program.cs similarity index 100% rename from templates/AngularSpa/Program.cs rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Program.cs diff --git a/templates/AngularSpa/Startup.cs b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Startup.cs similarity index 100% rename from templates/AngularSpa/Startup.cs rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Startup.cs diff --git a/templates/AureliaSpa/Views/Home/Index.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Views/Home/Index.cshtml similarity index 100% rename from templates/AureliaSpa/Views/Home/Index.cshtml rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Views/Home/Index.cshtml diff --git a/templates/AngularSpa/Views/Shared/Error.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Views/Shared/Error.cshtml similarity index 100% rename from templates/AngularSpa/Views/Shared/Error.cshtml rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Views/Shared/Error.cshtml diff --git a/templates/AngularSpa/Views/Shared/_Layout.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Views/Shared/_Layout.cshtml similarity index 100% rename from templates/AngularSpa/Views/Shared/_Layout.cshtml rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Views/Shared/_Layout.cshtml diff --git a/templates/AngularSpa/Views/_ViewImports.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Views/_ViewImports.cshtml similarity index 100% rename from templates/AngularSpa/Views/_ViewImports.cshtml rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Views/_ViewImports.cshtml diff --git a/templates/AngularSpa/Views/_ViewStart.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Views/_ViewStart.cshtml similarity index 100% rename from templates/AngularSpa/Views/_ViewStart.cshtml rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/Views/_ViewStart.cshtml diff --git a/templates/AngularSpa/appsettings.Development.json b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/appsettings.Development.json similarity index 100% rename from templates/AngularSpa/appsettings.Development.json rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/appsettings.Development.json diff --git a/templates/AngularSpa/appsettings.json b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/appsettings.json similarity index 100% rename from templates/AngularSpa/appsettings.json rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/appsettings.json diff --git a/templates/AureliaSpa/npm-shrinkwrap.json b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/npm-shrinkwrap.json similarity index 100% rename from templates/AureliaSpa/npm-shrinkwrap.json rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/npm-shrinkwrap.json diff --git a/templates/AureliaSpa/package.json b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/package.json similarity index 100% rename from templates/AureliaSpa/package.json rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/package.json diff --git a/templates/AureliaSpa/template_gitignore b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/template_gitignore similarity index 100% rename from templates/AureliaSpa/template_gitignore rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/template_gitignore diff --git a/templates/AureliaSpa/tsconfig.json b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/tsconfig.json similarity index 100% rename from templates/AureliaSpa/tsconfig.json rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/tsconfig.json diff --git a/templates/AureliaSpa/webpack.config.js b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/webpack.config.js similarity index 100% rename from templates/AureliaSpa/webpack.config.js rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/webpack.config.js diff --git a/templates/AureliaSpa/webpack.config.vendor.js b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/webpack.config.vendor.js similarity index 100% rename from templates/AureliaSpa/webpack.config.vendor.js rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/webpack.config.vendor.js diff --git a/templates/AureliaSpa/wwwroot/favicon.ico b/templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/wwwroot/favicon.ico similarity index 100% rename from templates/AureliaSpa/wwwroot/favicon.ico rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/aurelia/wwwroot/favicon.ico diff --git a/templates/AureliaSpa/.template.config/dotnetcli.host.json b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/.template.config/dotnetcli.host.json similarity index 100% rename from templates/AureliaSpa/.template.config/dotnetcli.host.json rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/.template.config/dotnetcli.host.json diff --git a/templates/KnockoutSpa/.template.config/icon.png b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/.template.config/icon.png similarity index 100% rename from templates/KnockoutSpa/.template.config/icon.png rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/.template.config/icon.png diff --git a/templates/KnockoutSpa/.template.config/template.json b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/.template.config/template.json similarity index 100% rename from templates/KnockoutSpa/.template.config/template.json rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/.template.config/template.json diff --git a/templates/KnockoutSpa/.template.config/vs-2017.3.host.json b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/.template.config/vs-2017.3.host.json similarity index 100% rename from templates/KnockoutSpa/.template.config/vs-2017.3.host.json rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/.template.config/vs-2017.3.host.json diff --git a/templates/KnockoutSpa/ClientApp/boot.ts b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/boot.ts similarity index 100% rename from templates/KnockoutSpa/ClientApp/boot.ts rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/boot.ts diff --git a/templates/KnockoutSpa/ClientApp/components/app-root/app-root.html b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/app-root/app-root.html similarity index 100% rename from templates/KnockoutSpa/ClientApp/components/app-root/app-root.html rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/app-root/app-root.html diff --git a/templates/KnockoutSpa/ClientApp/components/app-root/app-root.ts b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/app-root/app-root.ts similarity index 100% rename from templates/KnockoutSpa/ClientApp/components/app-root/app-root.ts rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/app-root/app-root.ts diff --git a/templates/KnockoutSpa/ClientApp/components/counter-example/counter-example.html b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/counter-example/counter-example.html similarity index 100% rename from templates/KnockoutSpa/ClientApp/components/counter-example/counter-example.html rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/counter-example/counter-example.html diff --git a/templates/KnockoutSpa/ClientApp/components/counter-example/counter-example.ts b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/counter-example/counter-example.ts similarity index 100% rename from templates/KnockoutSpa/ClientApp/components/counter-example/counter-example.ts rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/counter-example/counter-example.ts diff --git a/templates/KnockoutSpa/ClientApp/components/fetch-data/fetch-data.html b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/fetch-data/fetch-data.html similarity index 100% rename from templates/KnockoutSpa/ClientApp/components/fetch-data/fetch-data.html rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/fetch-data/fetch-data.html diff --git a/templates/KnockoutSpa/ClientApp/components/fetch-data/fetch-data.ts b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/fetch-data/fetch-data.ts similarity index 100% rename from templates/KnockoutSpa/ClientApp/components/fetch-data/fetch-data.ts rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/fetch-data/fetch-data.ts diff --git a/templates/KnockoutSpa/ClientApp/components/home-page/home-page.html b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/home-page/home-page.html similarity index 100% rename from templates/KnockoutSpa/ClientApp/components/home-page/home-page.html rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/home-page/home-page.html diff --git a/templates/KnockoutSpa/ClientApp/components/home-page/home-page.ts b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/home-page/home-page.ts similarity index 100% rename from templates/KnockoutSpa/ClientApp/components/home-page/home-page.ts rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/home-page/home-page.ts diff --git a/templates/KnockoutSpa/ClientApp/components/nav-menu/nav-menu.html b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/nav-menu/nav-menu.html similarity index 100% rename from templates/KnockoutSpa/ClientApp/components/nav-menu/nav-menu.html rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/nav-menu/nav-menu.html diff --git a/templates/KnockoutSpa/ClientApp/components/nav-menu/nav-menu.ts b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/nav-menu/nav-menu.ts similarity index 100% rename from templates/KnockoutSpa/ClientApp/components/nav-menu/nav-menu.ts rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/components/nav-menu/nav-menu.ts diff --git a/templates/KnockoutSpa/ClientApp/css/site.css b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/css/site.css old mode 100755 new mode 100644 similarity index 100% rename from templates/KnockoutSpa/ClientApp/css/site.css rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/css/site.css diff --git a/templates/KnockoutSpa/ClientApp/router.ts b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/router.ts similarity index 100% rename from templates/KnockoutSpa/ClientApp/router.ts rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/router.ts diff --git a/templates/KnockoutSpa/ClientApp/webpack-component-loader.ts b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/webpack-component-loader.ts similarity index 100% rename from templates/KnockoutSpa/ClientApp/webpack-component-loader.ts rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/ClientApp/webpack-component-loader.ts diff --git a/templates/AureliaSpa/Controllers/HomeController.cs b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Controllers/HomeController.cs similarity index 100% rename from templates/AureliaSpa/Controllers/HomeController.cs rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Controllers/HomeController.cs diff --git a/templates/AngularSpa/Controllers/SampleDataController.cs b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Controllers/SampleDataController.cs similarity index 100% rename from templates/AngularSpa/Controllers/SampleDataController.cs rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Controllers/SampleDataController.cs diff --git a/templates/KnockoutSpa/KnockoutSpa.csproj b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/KnockoutSpa.csproj similarity index 100% rename from templates/KnockoutSpa/KnockoutSpa.csproj rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/KnockoutSpa.csproj diff --git a/templates/AureliaSpa/Program.cs b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Program.cs similarity index 100% rename from templates/AureliaSpa/Program.cs rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Program.cs diff --git a/templates/AureliaSpa/Startup.cs b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Startup.cs similarity index 100% rename from templates/AureliaSpa/Startup.cs rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Startup.cs diff --git a/templates/KnockoutSpa/Views/Home/Index.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Views/Home/Index.cshtml similarity index 100% rename from templates/KnockoutSpa/Views/Home/Index.cshtml rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Views/Home/Index.cshtml diff --git a/templates/AureliaSpa/Views/Shared/Error.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Views/Shared/Error.cshtml similarity index 100% rename from templates/AureliaSpa/Views/Shared/Error.cshtml rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Views/Shared/Error.cshtml diff --git a/templates/KnockoutSpa/Views/Shared/_Layout.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Views/Shared/_Layout.cshtml similarity index 100% rename from templates/KnockoutSpa/Views/Shared/_Layout.cshtml rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Views/Shared/_Layout.cshtml diff --git a/templates/AureliaSpa/Views/_ViewImports.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Views/_ViewImports.cshtml similarity index 100% rename from templates/AureliaSpa/Views/_ViewImports.cshtml rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Views/_ViewImports.cshtml diff --git a/templates/AureliaSpa/Views/_ViewStart.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Views/_ViewStart.cshtml similarity index 100% rename from templates/AureliaSpa/Views/_ViewStart.cshtml rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/Views/_ViewStart.cshtml diff --git a/templates/AureliaSpa/appsettings.Development.json b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/appsettings.Development.json similarity index 100% rename from templates/AureliaSpa/appsettings.Development.json rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/appsettings.Development.json diff --git a/templates/AureliaSpa/appsettings.json b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/appsettings.json similarity index 100% rename from templates/AureliaSpa/appsettings.json rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/appsettings.json diff --git a/templates/KnockoutSpa/npm-shrinkwrap.json b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/npm-shrinkwrap.json similarity index 100% rename from templates/KnockoutSpa/npm-shrinkwrap.json rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/npm-shrinkwrap.json diff --git a/templates/KnockoutSpa/package.json b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/package.json similarity index 100% rename from templates/KnockoutSpa/package.json rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/package.json diff --git a/templates/KnockoutSpa/template_gitignore b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/template_gitignore similarity index 100% rename from templates/KnockoutSpa/template_gitignore rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/template_gitignore diff --git a/templates/KnockoutSpa/tsconfig.json b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/tsconfig.json similarity index 100% rename from templates/KnockoutSpa/tsconfig.json rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/tsconfig.json diff --git a/templates/KnockoutSpa/webpack.config.js b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/webpack.config.js similarity index 100% rename from templates/KnockoutSpa/webpack.config.js rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/webpack.config.js diff --git a/templates/KnockoutSpa/webpack.config.vendor.js b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/webpack.config.vendor.js similarity index 100% rename from templates/KnockoutSpa/webpack.config.vendor.js rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/webpack.config.vendor.js diff --git a/templates/AngularSpa/wwwroot/favicon.ico b/templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/wwwroot/favicon.ico similarity index 100% rename from templates/AngularSpa/wwwroot/favicon.ico rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/knockout/wwwroot/favicon.ico diff --git a/templates/KnockoutSpa/.template.config/dotnetcli.host.json b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/.template.config/dotnetcli.host.json similarity index 100% rename from templates/KnockoutSpa/.template.config/dotnetcli.host.json rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/.template.config/dotnetcli.host.json diff --git a/templates/VueSpa/.template.config/icon.png b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/.template.config/icon.png similarity index 100% rename from templates/VueSpa/.template.config/icon.png rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/.template.config/icon.png diff --git a/templates/VueSpa/.template.config/template.json b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/.template.config/template.json similarity index 100% rename from templates/VueSpa/.template.config/template.json rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/.template.config/template.json diff --git a/templates/VueSpa/.template.config/vs-2017.3.host.json b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/.template.config/vs-2017.3.host.json similarity index 100% rename from templates/VueSpa/.template.config/vs-2017.3.host.json rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/.template.config/vs-2017.3.host.json diff --git a/templates/VueSpa/ClientApp/boot.ts b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/boot.ts similarity index 100% rename from templates/VueSpa/ClientApp/boot.ts rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/boot.ts diff --git a/templates/VueSpa/ClientApp/components/app/app.ts b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/app/app.ts similarity index 100% rename from templates/VueSpa/ClientApp/components/app/app.ts rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/app/app.ts diff --git a/templates/VueSpa/ClientApp/components/app/app.vue.html b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/app/app.vue.html similarity index 100% rename from templates/VueSpa/ClientApp/components/app/app.vue.html rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/app/app.vue.html diff --git a/templates/VueSpa/ClientApp/components/counter/counter.ts b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/counter/counter.ts similarity index 100% rename from templates/VueSpa/ClientApp/components/counter/counter.ts rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/counter/counter.ts diff --git a/templates/VueSpa/ClientApp/components/counter/counter.vue.html b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/counter/counter.vue.html similarity index 100% rename from templates/VueSpa/ClientApp/components/counter/counter.vue.html rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/counter/counter.vue.html diff --git a/templates/VueSpa/ClientApp/components/fetchdata/fetchdata.ts b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/fetchdata/fetchdata.ts similarity index 100% rename from templates/VueSpa/ClientApp/components/fetchdata/fetchdata.ts rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/fetchdata/fetchdata.ts diff --git a/templates/VueSpa/ClientApp/components/fetchdata/fetchdata.vue.html b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/fetchdata/fetchdata.vue.html similarity index 100% rename from templates/VueSpa/ClientApp/components/fetchdata/fetchdata.vue.html rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/fetchdata/fetchdata.vue.html diff --git a/templates/VueSpa/ClientApp/components/home/home.vue.html b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/home/home.vue.html similarity index 100% rename from templates/VueSpa/ClientApp/components/home/home.vue.html rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/home/home.vue.html diff --git a/templates/VueSpa/ClientApp/components/navmenu/navmenu.css b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/navmenu/navmenu.css similarity index 100% rename from templates/VueSpa/ClientApp/components/navmenu/navmenu.css rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/navmenu/navmenu.css diff --git a/templates/VueSpa/ClientApp/components/navmenu/navmenu.vue.html b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/navmenu/navmenu.vue.html similarity index 100% rename from templates/VueSpa/ClientApp/components/navmenu/navmenu.vue.html rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/components/navmenu/navmenu.vue.html diff --git a/templates/VueSpa/ClientApp/css/site.css b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/css/site.css similarity index 100% rename from templates/VueSpa/ClientApp/css/site.css rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/ClientApp/css/site.css diff --git a/templates/KnockoutSpa/Controllers/HomeController.cs b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Controllers/HomeController.cs old mode 100755 new mode 100644 similarity index 100% rename from templates/KnockoutSpa/Controllers/HomeController.cs rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Controllers/HomeController.cs diff --git a/templates/KnockoutSpa/Controllers/SampleDataController.cs b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Controllers/SampleDataController.cs similarity index 100% rename from templates/KnockoutSpa/Controllers/SampleDataController.cs rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Controllers/SampleDataController.cs diff --git a/templates/KnockoutSpa/Program.cs b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Program.cs similarity index 100% rename from templates/KnockoutSpa/Program.cs rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Program.cs diff --git a/templates/KnockoutSpa/Startup.cs b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Startup.cs old mode 100755 new mode 100644 similarity index 100% rename from templates/KnockoutSpa/Startup.cs rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Startup.cs diff --git a/templates/VueSpa/Views/Home/Index.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Views/Home/Index.cshtml similarity index 100% rename from templates/VueSpa/Views/Home/Index.cshtml rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Views/Home/Index.cshtml diff --git a/templates/KnockoutSpa/Views/Shared/Error.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Views/Shared/Error.cshtml old mode 100755 new mode 100644 similarity index 100% rename from templates/KnockoutSpa/Views/Shared/Error.cshtml rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Views/Shared/Error.cshtml diff --git a/templates/ReactSpa/Views/Shared/_Layout.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Views/Shared/_Layout.cshtml similarity index 100% rename from templates/ReactSpa/Views/Shared/_Layout.cshtml rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Views/Shared/_Layout.cshtml diff --git a/templates/KnockoutSpa/Views/_ViewImports.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Views/_ViewImports.cshtml old mode 100755 new mode 100644 similarity index 100% rename from templates/KnockoutSpa/Views/_ViewImports.cshtml rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Views/_ViewImports.cshtml diff --git a/templates/KnockoutSpa/Views/_ViewStart.cshtml b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Views/_ViewStart.cshtml old mode 100755 new mode 100644 similarity index 100% rename from templates/KnockoutSpa/Views/_ViewStart.cshtml rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/Views/_ViewStart.cshtml diff --git a/templates/VueSpa/VueSpa.csproj b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/VueSpa.csproj similarity index 100% rename from templates/VueSpa/VueSpa.csproj rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/VueSpa.csproj diff --git a/templates/KnockoutSpa/appsettings.Development.json b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/appsettings.Development.json similarity index 100% rename from templates/KnockoutSpa/appsettings.Development.json rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/appsettings.Development.json diff --git a/templates/KnockoutSpa/appsettings.json b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/appsettings.json old mode 100755 new mode 100644 similarity index 100% rename from templates/KnockoutSpa/appsettings.json rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/appsettings.json diff --git a/templates/VueSpa/npm-shrinkwrap.json b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/npm-shrinkwrap.json similarity index 100% rename from templates/VueSpa/npm-shrinkwrap.json rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/npm-shrinkwrap.json diff --git a/templates/VueSpa/package.json b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/package.json similarity index 100% rename from templates/VueSpa/package.json rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/package.json diff --git a/templates/VueSpa/template_gitignore b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/template_gitignore similarity index 100% rename from templates/VueSpa/template_gitignore rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/template_gitignore diff --git a/templates/VueSpa/tsconfig.json b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/tsconfig.json similarity index 100% rename from templates/VueSpa/tsconfig.json rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/tsconfig.json diff --git a/templates/VueSpa/webpack.config.js b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/webpack.config.js similarity index 100% rename from templates/VueSpa/webpack.config.js rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/webpack.config.js diff --git a/templates/VueSpa/webpack.config.vendor.js b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/webpack.config.vendor.js similarity index 100% rename from templates/VueSpa/webpack.config.vendor.js rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/webpack.config.vendor.js diff --git a/templates/KnockoutSpa/wwwroot/favicon.ico b/templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/wwwroot/favicon.ico old mode 100755 new mode 100644 similarity index 100% rename from templates/KnockoutSpa/wwwroot/favicon.ico rename to templates/Microsoft.AspNetCore.SpaTemplates/Content/vue/wwwroot/favicon.ico diff --git a/templates/package-builder/src/dotnetnew/Microsoft.AspNetCore.SpaTemplates.nuspec b/templates/Microsoft.AspNetCore.SpaTemplates/Microsoft.AspNetCore.SpaTemplates.nuspec similarity index 100% rename from templates/package-builder/src/dotnetnew/Microsoft.AspNetCore.SpaTemplates.nuspec rename to templates/Microsoft.AspNetCore.SpaTemplates/Microsoft.AspNetCore.SpaTemplates.nuspec diff --git a/templates/ReactReduxSpa/.template.config/dotnetcli.host.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/.template.config/dotnetcli.host.json similarity index 100% rename from templates/ReactReduxSpa/.template.config/dotnetcli.host.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/.template.config/dotnetcli.host.json diff --git a/templates/AngularSpa/.template.config/icon.png b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/.template.config/icon.png similarity index 100% rename from templates/AngularSpa/.template.config/icon.png rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/.template.config/icon.png diff --git a/templates/AngularSpa/.template.config/template.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/.template.config/template.json similarity index 100% rename from templates/AngularSpa/.template.config/template.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/.template.config/template.json diff --git a/templates/AngularSpa/.template.config/vs-2017.3.host.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/.template.config/vs-2017.3.host.json similarity index 100% rename from templates/AngularSpa/.template.config/vs-2017.3.host.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/.template.config/vs-2017.3.host.json diff --git a/templates/AngularSpa/AngularSpa.csproj b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/AngularSpa.csproj similarity index 100% rename from templates/AngularSpa/AngularSpa.csproj rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/AngularSpa.csproj diff --git a/templates/AngularSpa/ClientApp/app/app.module.browser.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/app.module.browser.ts similarity index 100% rename from templates/AngularSpa/ClientApp/app/app.module.browser.ts rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/app.module.browser.ts diff --git a/templates/AngularSpa/ClientApp/app/app.module.server.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/app.module.server.ts similarity index 100% rename from templates/AngularSpa/ClientApp/app/app.module.server.ts rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/app.module.server.ts diff --git a/templates/AngularSpa/ClientApp/app/app.module.shared.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/app.module.shared.ts similarity index 100% rename from templates/AngularSpa/ClientApp/app/app.module.shared.ts rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/app.module.shared.ts diff --git a/templates/AngularSpa/ClientApp/app/components/app/app.component.css b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/app/app.component.css similarity index 100% rename from templates/AngularSpa/ClientApp/app/components/app/app.component.css rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/app/app.component.css diff --git a/templates/AngularSpa/ClientApp/app/components/app/app.component.html b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/app/app.component.html similarity index 100% rename from templates/AngularSpa/ClientApp/app/components/app/app.component.html rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/app/app.component.html diff --git a/templates/AngularSpa/ClientApp/app/components/app/app.component.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/app/app.component.ts similarity index 100% rename from templates/AngularSpa/ClientApp/app/components/app/app.component.ts rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/app/app.component.ts diff --git a/templates/AngularSpa/ClientApp/app/components/counter/counter.component.html b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/counter/counter.component.html similarity index 100% rename from templates/AngularSpa/ClientApp/app/components/counter/counter.component.html rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/counter/counter.component.html diff --git a/templates/AngularSpa/ClientApp/app/components/counter/counter.component.spec.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/counter/counter.component.spec.ts similarity index 100% rename from templates/AngularSpa/ClientApp/app/components/counter/counter.component.spec.ts rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/counter/counter.component.spec.ts diff --git a/templates/AngularSpa/ClientApp/app/components/counter/counter.component.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/counter/counter.component.ts similarity index 100% rename from templates/AngularSpa/ClientApp/app/components/counter/counter.component.ts rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/counter/counter.component.ts diff --git a/templates/AngularSpa/ClientApp/app/components/fetchdata/fetchdata.component.html b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/fetchdata/fetchdata.component.html similarity index 100% rename from templates/AngularSpa/ClientApp/app/components/fetchdata/fetchdata.component.html rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/fetchdata/fetchdata.component.html diff --git a/templates/AngularSpa/ClientApp/app/components/fetchdata/fetchdata.component.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/fetchdata/fetchdata.component.ts similarity index 100% rename from templates/AngularSpa/ClientApp/app/components/fetchdata/fetchdata.component.ts rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/fetchdata/fetchdata.component.ts diff --git a/templates/AngularSpa/ClientApp/app/components/home/home.component.html b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/home/home.component.html similarity index 100% rename from templates/AngularSpa/ClientApp/app/components/home/home.component.html rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/home/home.component.html diff --git a/templates/AngularSpa/ClientApp/app/components/home/home.component.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/home/home.component.ts similarity index 100% rename from templates/AngularSpa/ClientApp/app/components/home/home.component.ts rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/home/home.component.ts diff --git a/templates/AngularSpa/ClientApp/app/components/navmenu/navmenu.component.css b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/navmenu/navmenu.component.css similarity index 100% rename from templates/AngularSpa/ClientApp/app/components/navmenu/navmenu.component.css rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/navmenu/navmenu.component.css diff --git a/templates/AngularSpa/ClientApp/app/components/navmenu/navmenu.component.html b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/navmenu/navmenu.component.html similarity index 100% rename from templates/AngularSpa/ClientApp/app/components/navmenu/navmenu.component.html rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/navmenu/navmenu.component.html diff --git a/templates/AngularSpa/ClientApp/app/components/navmenu/navmenu.component.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/navmenu/navmenu.component.ts similarity index 100% rename from templates/AngularSpa/ClientApp/app/components/navmenu/navmenu.component.ts rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/app/components/navmenu/navmenu.component.ts diff --git a/templates/AngularSpa/ClientApp/boot.browser.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/boot.browser.ts similarity index 100% rename from templates/AngularSpa/ClientApp/boot.browser.ts rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/boot.browser.ts diff --git a/templates/AngularSpa/ClientApp/boot.server.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/boot.server.ts similarity index 100% rename from templates/AngularSpa/ClientApp/boot.server.ts rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/boot.server.ts diff --git a/templates/AngularSpa/ClientApp/test/boot-tests.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/test/boot-tests.ts similarity index 100% rename from templates/AngularSpa/ClientApp/test/boot-tests.ts rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/test/boot-tests.ts diff --git a/templates/AngularSpa/ClientApp/test/karma.conf.js b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/test/karma.conf.js similarity index 100% rename from templates/AngularSpa/ClientApp/test/karma.conf.js rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/ClientApp/test/karma.conf.js diff --git a/templates/ReactReduxSpa/Controllers/HomeController.cs b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Controllers/HomeController.cs old mode 100755 new mode 100644 similarity index 100% rename from templates/ReactReduxSpa/Controllers/HomeController.cs rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Controllers/HomeController.cs diff --git a/templates/ReactSpa/Controllers/SampleDataController.cs b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Controllers/SampleDataController.cs similarity index 100% rename from templates/ReactSpa/Controllers/SampleDataController.cs rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Controllers/SampleDataController.cs diff --git a/templates/ReactReduxSpa/Program.cs b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Program.cs similarity index 100% rename from templates/ReactReduxSpa/Program.cs rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Program.cs diff --git a/templates/VueSpa/Startup.cs b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Startup.cs similarity index 100% rename from templates/VueSpa/Startup.cs rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Startup.cs diff --git a/templates/AngularSpa/Views/Home/Index.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Views/Home/Index.cshtml similarity index 100% rename from templates/AngularSpa/Views/Home/Index.cshtml rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Views/Home/Index.cshtml diff --git a/templates/ReactReduxSpa/Views/Shared/Error.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Views/Shared/Error.cshtml old mode 100755 new mode 100644 similarity index 100% rename from templates/ReactReduxSpa/Views/Shared/Error.cshtml rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Views/Shared/Error.cshtml diff --git a/templates/AureliaSpa/Views/Shared/_Layout.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Views/Shared/_Layout.cshtml similarity index 100% rename from templates/AureliaSpa/Views/Shared/_Layout.cshtml rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Views/Shared/_Layout.cshtml diff --git a/templates/ReactReduxSpa/Views/_ViewImports.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Views/_ViewImports.cshtml old mode 100755 new mode 100644 similarity index 100% rename from templates/ReactReduxSpa/Views/_ViewImports.cshtml rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Views/_ViewImports.cshtml diff --git a/templates/ReactReduxSpa/Views/_ViewStart.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Views/_ViewStart.cshtml old mode 100755 new mode 100644 similarity index 100% rename from templates/ReactReduxSpa/Views/_ViewStart.cshtml rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/Views/_ViewStart.cshtml diff --git a/templates/ReactReduxSpa/appsettings.Development.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/appsettings.Development.json similarity index 100% rename from templates/ReactReduxSpa/appsettings.Development.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/appsettings.Development.json diff --git a/templates/ReactReduxSpa/appsettings.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/appsettings.json old mode 100755 new mode 100644 similarity index 100% rename from templates/ReactReduxSpa/appsettings.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/appsettings.json diff --git a/templates/AngularSpa/npm-shrinkwrap.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/npm-shrinkwrap.json similarity index 100% rename from templates/AngularSpa/npm-shrinkwrap.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/npm-shrinkwrap.json diff --git a/templates/AngularSpa/package.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/package.json similarity index 100% rename from templates/AngularSpa/package.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/package.json diff --git a/templates/AngularSpa/template_gitignore b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/template_gitignore similarity index 100% rename from templates/AngularSpa/template_gitignore rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/template_gitignore diff --git a/templates/AngularSpa/tsconfig.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/tsconfig.json similarity index 100% rename from templates/AngularSpa/tsconfig.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/tsconfig.json diff --git a/templates/AngularSpa/webpack.config.js b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/webpack.config.js similarity index 100% rename from templates/AngularSpa/webpack.config.js rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/webpack.config.js diff --git a/templates/AngularSpa/webpack.config.vendor.js b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/webpack.config.vendor.js similarity index 100% rename from templates/AngularSpa/webpack.config.vendor.js rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/webpack.config.vendor.js diff --git a/templates/ReactReduxSpa/wwwroot/favicon.ico b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/wwwroot/favicon.ico old mode 100755 new mode 100644 similarity index 100% rename from templates/ReactReduxSpa/wwwroot/favicon.ico rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/angular/wwwroot/favicon.ico diff --git a/templates/ReactSpa/.template.config/dotnetcli.host.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/.template.config/dotnetcli.host.json similarity index 100% rename from templates/ReactSpa/.template.config/dotnetcli.host.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/.template.config/dotnetcli.host.json diff --git a/templates/ReactSpa/.template.config/icon.png b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/.template.config/icon.png similarity index 100% rename from templates/ReactSpa/.template.config/icon.png rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/.template.config/icon.png diff --git a/templates/ReactSpa/.template.config/template.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/.template.config/template.json similarity index 100% rename from templates/ReactSpa/.template.config/template.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/.template.config/template.json diff --git a/templates/ReactSpa/.template.config/vs-2017.3.host.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/.template.config/vs-2017.3.host.json similarity index 100% rename from templates/ReactSpa/.template.config/vs-2017.3.host.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/.template.config/vs-2017.3.host.json diff --git a/templates/ReactSpa/ClientApp/boot.tsx b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/boot.tsx similarity index 100% rename from templates/ReactSpa/ClientApp/boot.tsx rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/boot.tsx diff --git a/templates/ReactSpa/ClientApp/components/Counter.tsx b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/components/Counter.tsx similarity index 100% rename from templates/ReactSpa/ClientApp/components/Counter.tsx rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/components/Counter.tsx diff --git a/templates/ReactSpa/ClientApp/components/FetchData.tsx b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/components/FetchData.tsx similarity index 100% rename from templates/ReactSpa/ClientApp/components/FetchData.tsx rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/components/FetchData.tsx diff --git a/templates/ReactSpa/ClientApp/components/Home.tsx b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/components/Home.tsx similarity index 100% rename from templates/ReactSpa/ClientApp/components/Home.tsx rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/components/Home.tsx diff --git a/templates/ReactSpa/ClientApp/components/Layout.tsx b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/components/Layout.tsx similarity index 100% rename from templates/ReactSpa/ClientApp/components/Layout.tsx rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/components/Layout.tsx diff --git a/templates/ReactSpa/ClientApp/components/NavMenu.tsx b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/components/NavMenu.tsx similarity index 100% rename from templates/ReactSpa/ClientApp/components/NavMenu.tsx rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/components/NavMenu.tsx diff --git a/templates/ReactReduxSpa/ClientApp/css/site.css b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/css/site.css old mode 100755 new mode 100644 similarity index 100% rename from templates/ReactReduxSpa/ClientApp/css/site.css rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/css/site.css diff --git a/templates/ReactSpa/ClientApp/routes.tsx b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/routes.tsx similarity index 100% rename from templates/ReactSpa/ClientApp/routes.tsx rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ClientApp/routes.tsx diff --git a/templates/ReactSpa/Controllers/HomeController.cs b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Controllers/HomeController.cs old mode 100755 new mode 100644 similarity index 100% rename from templates/ReactSpa/Controllers/HomeController.cs rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Controllers/HomeController.cs diff --git a/templates/VueSpa/Controllers/SampleDataController.cs b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Controllers/SampleDataController.cs similarity index 100% rename from templates/VueSpa/Controllers/SampleDataController.cs rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Controllers/SampleDataController.cs diff --git a/templates/ReactSpa/Program.cs b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Program.cs similarity index 100% rename from templates/ReactSpa/Program.cs rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Program.cs diff --git a/templates/ReactSpa/ReactSpa.csproj b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ReactSpa.csproj similarity index 100% rename from templates/ReactSpa/ReactSpa.csproj rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/ReactSpa.csproj diff --git a/templates/ReactReduxSpa/Startup.cs b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Startup.cs old mode 100755 new mode 100644 similarity index 100% rename from templates/ReactReduxSpa/Startup.cs rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Startup.cs diff --git a/templates/ReactSpa/Views/Home/Index.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Views/Home/Index.cshtml similarity index 100% rename from templates/ReactSpa/Views/Home/Index.cshtml rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Views/Home/Index.cshtml diff --git a/templates/ReactSpa/Views/Shared/Error.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Views/Shared/Error.cshtml old mode 100755 new mode 100644 similarity index 100% rename from templates/ReactSpa/Views/Shared/Error.cshtml rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Views/Shared/Error.cshtml diff --git a/templates/VueSpa/Views/Shared/_Layout.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Views/Shared/_Layout.cshtml similarity index 100% rename from templates/VueSpa/Views/Shared/_Layout.cshtml rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Views/Shared/_Layout.cshtml diff --git a/templates/ReactSpa/Views/_ViewImports.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Views/_ViewImports.cshtml old mode 100755 new mode 100644 similarity index 100% rename from templates/ReactSpa/Views/_ViewImports.cshtml rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Views/_ViewImports.cshtml diff --git a/templates/ReactSpa/Views/_ViewStart.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Views/_ViewStart.cshtml old mode 100755 new mode 100644 similarity index 100% rename from templates/ReactSpa/Views/_ViewStart.cshtml rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/Views/_ViewStart.cshtml diff --git a/templates/ReactSpa/appsettings.Development.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/appsettings.Development.json similarity index 100% rename from templates/ReactSpa/appsettings.Development.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/appsettings.Development.json diff --git a/templates/ReactSpa/appsettings.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/appsettings.json old mode 100755 new mode 100644 similarity index 100% rename from templates/ReactSpa/appsettings.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/appsettings.json diff --git a/templates/ReactSpa/npm-shrinkwrap.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/npm-shrinkwrap.json similarity index 100% rename from templates/ReactSpa/npm-shrinkwrap.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/npm-shrinkwrap.json diff --git a/templates/ReactSpa/package.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/package.json similarity index 100% rename from templates/ReactSpa/package.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/package.json diff --git a/templates/ReactSpa/template_gitignore b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/template_gitignore similarity index 100% rename from templates/ReactSpa/template_gitignore rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/template_gitignore diff --git a/templates/ReactSpa/tsconfig.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/tsconfig.json similarity index 100% rename from templates/ReactSpa/tsconfig.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/tsconfig.json diff --git a/templates/ReactSpa/webpack.config.js b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/webpack.config.js similarity index 100% rename from templates/ReactSpa/webpack.config.js rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/webpack.config.js diff --git a/templates/ReactSpa/webpack.config.vendor.js b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/webpack.config.vendor.js similarity index 100% rename from templates/ReactSpa/webpack.config.vendor.js rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/webpack.config.vendor.js diff --git a/templates/ReactSpa/wwwroot/favicon.ico b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/wwwroot/favicon.ico old mode 100755 new mode 100644 similarity index 100% rename from templates/ReactSpa/wwwroot/favicon.ico rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/react/wwwroot/favicon.ico diff --git a/templates/VueSpa/.template.config/dotnetcli.host.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/.template.config/dotnetcli.host.json similarity index 100% rename from templates/VueSpa/.template.config/dotnetcli.host.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/.template.config/dotnetcli.host.json diff --git a/templates/ReactReduxSpa/.template.config/icon.png b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/.template.config/icon.png similarity index 100% rename from templates/ReactReduxSpa/.template.config/icon.png rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/.template.config/icon.png diff --git a/templates/ReactReduxSpa/.template.config/template.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/.template.config/template.json similarity index 100% rename from templates/ReactReduxSpa/.template.config/template.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/.template.config/template.json diff --git a/templates/ReactReduxSpa/.template.config/vs-2017.3.host.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/.template.config/vs-2017.3.host.json similarity index 100% rename from templates/ReactReduxSpa/.template.config/vs-2017.3.host.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/.template.config/vs-2017.3.host.json diff --git a/templates/ReactReduxSpa/ClientApp/boot-client.tsx b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/boot-client.tsx similarity index 100% rename from templates/ReactReduxSpa/ClientApp/boot-client.tsx rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/boot-client.tsx diff --git a/templates/ReactReduxSpa/ClientApp/boot-server.tsx b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/boot-server.tsx similarity index 100% rename from templates/ReactReduxSpa/ClientApp/boot-server.tsx rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/boot-server.tsx diff --git a/templates/ReactReduxSpa/ClientApp/components/Counter.tsx b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/components/Counter.tsx similarity index 100% rename from templates/ReactReduxSpa/ClientApp/components/Counter.tsx rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/components/Counter.tsx diff --git a/templates/ReactReduxSpa/ClientApp/components/FetchData.tsx b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/components/FetchData.tsx similarity index 100% rename from templates/ReactReduxSpa/ClientApp/components/FetchData.tsx rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/components/FetchData.tsx diff --git a/templates/ReactReduxSpa/ClientApp/components/Home.tsx b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/components/Home.tsx similarity index 100% rename from templates/ReactReduxSpa/ClientApp/components/Home.tsx rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/components/Home.tsx diff --git a/templates/ReactReduxSpa/ClientApp/components/Layout.tsx b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/components/Layout.tsx similarity index 100% rename from templates/ReactReduxSpa/ClientApp/components/Layout.tsx rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/components/Layout.tsx diff --git a/templates/ReactReduxSpa/ClientApp/components/NavMenu.tsx b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/components/NavMenu.tsx similarity index 100% rename from templates/ReactReduxSpa/ClientApp/components/NavMenu.tsx rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/components/NavMenu.tsx diff --git a/templates/ReactReduxSpa/ClientApp/configureStore.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/configureStore.ts similarity index 100% rename from templates/ReactReduxSpa/ClientApp/configureStore.ts rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/configureStore.ts diff --git a/templates/ReactSpa/ClientApp/css/site.css b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/css/site.css old mode 100755 new mode 100644 similarity index 100% rename from templates/ReactSpa/ClientApp/css/site.css rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/css/site.css diff --git a/templates/ReactReduxSpa/ClientApp/routes.tsx b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/routes.tsx similarity index 100% rename from templates/ReactReduxSpa/ClientApp/routes.tsx rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/routes.tsx diff --git a/templates/ReactReduxSpa/ClientApp/store/Counter.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/store/Counter.ts similarity index 100% rename from templates/ReactReduxSpa/ClientApp/store/Counter.ts rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/store/Counter.ts diff --git a/templates/ReactReduxSpa/ClientApp/store/WeatherForecasts.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/store/WeatherForecasts.ts similarity index 100% rename from templates/ReactReduxSpa/ClientApp/store/WeatherForecasts.ts rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/store/WeatherForecasts.ts diff --git a/templates/ReactReduxSpa/ClientApp/store/index.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/store/index.ts similarity index 100% rename from templates/ReactReduxSpa/ClientApp/store/index.ts rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ClientApp/store/index.ts diff --git a/templates/VueSpa/Controllers/HomeController.cs b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Controllers/HomeController.cs similarity index 100% rename from templates/VueSpa/Controllers/HomeController.cs rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Controllers/HomeController.cs diff --git a/templates/ReactReduxSpa/Controllers/SampleDataController.cs b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Controllers/SampleDataController.cs similarity index 100% rename from templates/ReactReduxSpa/Controllers/SampleDataController.cs rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Controllers/SampleDataController.cs diff --git a/templates/VueSpa/Program.cs b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Program.cs similarity index 100% rename from templates/VueSpa/Program.cs rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Program.cs diff --git a/templates/ReactReduxSpa/ReactReduxSpa.csproj b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ReactReduxSpa.csproj similarity index 100% rename from templates/ReactReduxSpa/ReactReduxSpa.csproj rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/ReactReduxSpa.csproj diff --git a/templates/ReactSpa/Startup.cs b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Startup.cs old mode 100755 new mode 100644 similarity index 100% rename from templates/ReactSpa/Startup.cs rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Startup.cs diff --git a/templates/ReactReduxSpa/Views/Home/Index.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Views/Home/Index.cshtml similarity index 100% rename from templates/ReactReduxSpa/Views/Home/Index.cshtml rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Views/Home/Index.cshtml diff --git a/templates/VueSpa/Views/Shared/Error.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Views/Shared/Error.cshtml similarity index 100% rename from templates/VueSpa/Views/Shared/Error.cshtml rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Views/Shared/Error.cshtml diff --git a/templates/ReactReduxSpa/Views/Shared/_Layout.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Views/Shared/_Layout.cshtml similarity index 100% rename from templates/ReactReduxSpa/Views/Shared/_Layout.cshtml rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Views/Shared/_Layout.cshtml diff --git a/templates/VueSpa/Views/_ViewImports.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Views/_ViewImports.cshtml similarity index 100% rename from templates/VueSpa/Views/_ViewImports.cshtml rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Views/_ViewImports.cshtml diff --git a/templates/VueSpa/Views/_ViewStart.cshtml b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Views/_ViewStart.cshtml similarity index 100% rename from templates/VueSpa/Views/_ViewStart.cshtml rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/Views/_ViewStart.cshtml diff --git a/templates/VueSpa/appsettings.Development.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/appsettings.Development.json similarity index 100% rename from templates/VueSpa/appsettings.Development.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/appsettings.Development.json diff --git a/templates/VueSpa/appsettings.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/appsettings.json similarity index 100% rename from templates/VueSpa/appsettings.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/appsettings.json diff --git a/templates/ReactReduxSpa/npm-shrinkwrap.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/npm-shrinkwrap.json similarity index 100% rename from templates/ReactReduxSpa/npm-shrinkwrap.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/npm-shrinkwrap.json diff --git a/templates/ReactReduxSpa/package.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/package.json similarity index 100% rename from templates/ReactReduxSpa/package.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/package.json diff --git a/templates/ReactReduxSpa/template_gitignore b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/template_gitignore similarity index 100% rename from templates/ReactReduxSpa/template_gitignore rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/template_gitignore diff --git a/templates/ReactReduxSpa/tsconfig.json b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/tsconfig.json similarity index 100% rename from templates/ReactReduxSpa/tsconfig.json rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/tsconfig.json diff --git a/templates/ReactReduxSpa/webpack.config.js b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/webpack.config.js similarity index 100% rename from templates/ReactReduxSpa/webpack.config.js rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/webpack.config.js diff --git a/templates/ReactReduxSpa/webpack.config.vendor.js b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/webpack.config.vendor.js similarity index 100% rename from templates/ReactReduxSpa/webpack.config.vendor.js rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/webpack.config.vendor.js diff --git a/templates/VueSpa/wwwroot/favicon.ico b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/wwwroot/favicon.ico similarity index 100% rename from templates/VueSpa/wwwroot/favicon.ico rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Content/redux/wwwroot/favicon.ico diff --git a/templates/package-builder/src/dotnetnew/Microsoft.DotNet.Web.Spa.ProjectTemplates.nuspec b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.nuspec similarity index 100% rename from templates/package-builder/src/dotnetnew/Microsoft.DotNet.Web.Spa.ProjectTemplates.nuspec rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.nuspec diff --git a/templates/package-builder/src/build/build.ts b/templates/package-builder/src/build/build.ts index d234bfc..3abc13d 100644 --- a/templates/package-builder/src/build/build.ts +++ b/templates/package-builder/src/build/build.ts @@ -11,24 +11,10 @@ import * as targz from 'tar.gz'; const isWindows = /^win/.test(process.platform); const textFileExtensions = ['.gitignore', 'template_gitignore', '.config', '.cs', '.cshtml', '.csproj', '.html', '.js', '.json', '.jsx', '.md', '.nuspec', '.ts', '.tsx']; -const dotNetPackages = { - builtIn: 'Microsoft.DotNet.Web.Spa.ProjectTemplates', - extra: 'Microsoft.AspNetCore.SpaTemplates' -}; - -interface TemplateConfig { - dir: string; - dotNetPackageId: string; -} - -const templates: { [key: string]: TemplateConfig } = { - 'angular': { dotNetPackageId: dotNetPackages.builtIn, dir: '../../templates/AngularSpa/' }, - 'aurelia': { dotNetPackageId: dotNetPackages.extra, dir: '../../templates/AureliaSpa/' }, - 'knockout': { dotNetPackageId: dotNetPackages.extra, dir: '../../templates/KnockoutSpa/' }, - 'react-redux': { dotNetPackageId: dotNetPackages.builtIn, dir: '../../templates/ReactReduxSpa/' }, - 'react': { dotNetPackageId: dotNetPackages.builtIn, dir: '../../templates/ReactSpa/' }, - 'vue': { dotNetPackageId: dotNetPackages.extra, dir: '../../templates/VueSpa/' } -}; +const dotNetPackages = [ + 'Microsoft.DotNet.Web.Spa.ProjectTemplates', + 'Microsoft.AspNetCore.SpaTemplates' +]; function isTextFile(filename: string): boolean { return textFileExtensions.indexOf(path.extname(filename).toLowerCase()) >= 0 @@ -117,18 +103,18 @@ function buildDotNetNewNuGetPackage(packageId: string) { { from: /\btemplate_gitignore$/, to: '.gitignore' } ]; const contentReplacements = []; - _.forEach(templates, (templateConfig, templateName) => { - // Only include templates matching the output package ID - if (templateConfig.dotNetPackageId !== packageId) { - return; - } + const packageSourceRootDir = path.join('../', packageId); + const templatesInPackage = fs.readdirSync(path.join(packageSourceRootDir, 'Content')); + + _.forEach(templatesInPackage, templateName => { + const templateSourceDir = path.join(packageSourceRootDir, 'Content', templateName); const templateOutputDir = path.join(outputRoot, 'Content', templateName); - writeTemplate(templateConfig.dir, templateOutputDir, contentReplacements, filenameReplacements); + writeTemplate(templateSourceDir, templateOutputDir, contentReplacements, filenameReplacements); }); // Create the .nuspec file - const nuspecContentTemplate = fs.readFileSync(`./src/dotnetnew/${ packageId }.nuspec`); + const nuspecContentTemplate = fs.readFileSync(path.join(packageSourceRootDir, `${ packageId }.nuspec`)); writeFileEnsuringDirExists(outputRoot, `${ packageId }.nuspec`, applyContentReplacements(nuspecContentTemplate, [