diff --git a/templates/Angular2Spa/.deployment b/templates/Angular2Spa/.deployment deleted file mode 100644 index 4ad366c..0000000 --- a/templates/Angular2Spa/.deployment +++ /dev/null @@ -1,2 +0,0 @@ -[config] -SCM_SCRIPT_GENERATOR_ARGS=--aspNetCore project.json diff --git a/templates/Angular2Spa/Angular2Spa.xproj b/templates/Angular2Spa/Angular2Spa.xproj deleted file mode 100644 index 3f02ad9..0000000 --- a/templates/Angular2Spa/Angular2Spa.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - true - - - - 8f5cb8a9-3086-4b49-a1c2-32a9f89bca11 - Angular2Spa - .\obj - .\bin\ - v4.5.2 - - - 2.0 - - - \ No newline at end of file diff --git a/templates/Angular2Spa/ClientApp/dist/_placeholder.txt b/templates/Angular2Spa/ClientApp/dist/_placeholder.txt deleted file mode 100644 index b22cc15..0000000 --- a/templates/Angular2Spa/ClientApp/dist/_placeholder.txt +++ /dev/null @@ -1,9 +0,0 @@ ------------------------------------------------------------------- -Don't delete this file. Do include it in your source control repo. ------------------------------------------------------------------- - -This file exists as a workaround for https://github.com/dotnet/cli/issues/1396 -('dotnet publish' does not publish any directories that didn't exist or were -empty before the publish script started). - -Hopefully, this can be removed after the move to the new MSBuild. diff --git a/templates/Angular2Spa/global.json b/templates/Angular2Spa/global.json index 5a3dc98..3b968e2 100644 --- a/templates/Angular2Spa/global.json +++ b/templates/Angular2Spa/global.json @@ -1,3 +1,3 @@ { - "sdk": { "version": "1.0.0-preview2-1-003177" } + "sdk": { "version": "sdkVersionInjectedHere" } } diff --git a/templates/Angular2Spa/project.json b/templates/Angular2Spa/project.json deleted file mode 100755 index a406b37..0000000 --- a/templates/Angular2Spa/project.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.1.0", - "type": "platform" - }, - "Microsoft.AspNetCore.Diagnostics": "1.1.0", - "Microsoft.AspNetCore.Mvc": "1.1.0", - "Microsoft.AspNetCore.Razor.Tools": { - "version": "1.0.0-preview2-final", - "type": "build" - }, - "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0", - "Microsoft.AspNetCore.Server.Kestrel": "1.1.0", - "Microsoft.AspNetCore.SpaServices": "1.1.0-*", - "Microsoft.AspNetCore.StaticFiles": "1.1.0", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.0", - "Microsoft.Extensions.Configuration.Json": "1.1.0", - "Microsoft.Extensions.Configuration.CommandLine": "1.1.0", - "Microsoft.Extensions.Logging": "1.1.0", - "Microsoft.Extensions.Logging.Console": "1.1.0", - "Microsoft.Extensions.Logging.Debug": "1.1.0", - "Microsoft.Extensions.Options.ConfigurationExtensions": "1.1.0" - }, - - "tools": { - "Microsoft.AspNetCore.Razor.Tools": "1.0.0-preview2-final", - "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-preview2-final", - "Microsoft.DotNet.Watcher.Tools": "1.0.0-preview2-final" - }, - - "frameworks": { - "netcoreapp1.1": { - "imports": [ - "dotnet5.6", - "portable-net45+win8" - ] - } - }, - - "buildOptions": { - "emitEntryPoint": true, - "preserveCompilationContext": true, - "compile": { - "exclude": ["node_modules"] - } - }, - - "runtimeOptions": { - "configProperties": { - "System.GC.Server": true - } - }, - - "publishOptions": { - "include": [ - "appsettings.json", - "ClientApp/dist", - "Views", - "web.config", - "wwwroot" - ], - "exclude": [ - "wwwroot/dist/*.map" - ] - }, - - "scripts": { - "prepublish": [ - "npm install", - "node node_modules/webpack/bin/webpack.js --config webpack.config.vendor.js --env.prod", - "node node_modules/webpack/bin/webpack.js --env.prod" - ], - "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ] - }, - - "tooling": { - "defaultNamespace": "WebApplicationBasic" - } -} diff --git a/templates/Angular2Spa/template_gitignore b/templates/Angular2Spa/template_gitignore index ded4b28..900f1b7 100644 --- a/templates/Angular2Spa/template_gitignore +++ b/templates/Angular2Spa/template_gitignore @@ -192,9 +192,7 @@ ClientBin/ *.publishsettings orleans.codegen.cs -# Workaround for https://github.com/aspnet/JavaScriptServices/issues/235 -/node_modules/** -!/node_modules/_placeholder.txt +/node_modules /yarn.lock diff --git a/templates/Angular2Spa/wwwroot/dist/_placeholder.txt b/templates/Angular2Spa/wwwroot/dist/_placeholder.txt deleted file mode 100644 index b22cc15..0000000 --- a/templates/Angular2Spa/wwwroot/dist/_placeholder.txt +++ /dev/null @@ -1,9 +0,0 @@ ------------------------------------------------------------------- -Don't delete this file. Do include it in your source control repo. ------------------------------------------------------------------- - -This file exists as a workaround for https://github.com/dotnet/cli/issues/1396 -('dotnet publish' does not publish any directories that didn't exist or were -empty before the publish script started). - -Hopefully, this can be removed after the move to the new MSBuild. diff --git a/templates/AureliaSpa/.deployment b/templates/AureliaSpa/.deployment deleted file mode 100644 index 4ad366c..0000000 --- a/templates/AureliaSpa/.deployment +++ /dev/null @@ -1,2 +0,0 @@ -[config] -SCM_SCRIPT_GENERATOR_ARGS=--aspNetCore project.json diff --git a/templates/AureliaSpa/Aurelia.xproj b/templates/AureliaSpa/Aurelia.xproj deleted file mode 100644 index 6abcd44..0000000 --- a/templates/AureliaSpa/Aurelia.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - true - - - - 33d8dad9-74f9-471d-8bad-55f828faa736 - AureliaSpa - .\obj - .\bin\ - v4.5.2 - - - 2.0 - - - diff --git a/templates/AureliaSpa/global.json b/templates/AureliaSpa/global.json index 5a3dc98..3b968e2 100644 --- a/templates/AureliaSpa/global.json +++ b/templates/AureliaSpa/global.json @@ -1,3 +1,3 @@ { - "sdk": { "version": "1.0.0-preview2-1-003177" } + "sdk": { "version": "sdkVersionInjectedHere" } } diff --git a/templates/AureliaSpa/project.json b/templates/AureliaSpa/project.json deleted file mode 100644 index 32ca9b9..0000000 --- a/templates/AureliaSpa/project.json +++ /dev/null @@ -1,79 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.1.0", - "type": "platform" - }, - "Microsoft.AspNetCore.SpaServices": "1.1.0-*", - "Microsoft.AspNetCore.Diagnostics": "1.1.0", - "Microsoft.AspNetCore.Mvc": "1.1.0", - "Microsoft.AspNetCore.Razor.Tools": { - "version": "1.0.0-preview2-final", - "type": "build" - }, - "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0", - "Microsoft.AspNetCore.Server.Kestrel": "1.1.0", - "Microsoft.AspNetCore.StaticFiles": "1.1.0", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.0", - "Microsoft.Extensions.Configuration.Json": "1.1.0", - "Microsoft.Extensions.Configuration.CommandLine": "1.1.0", - "Microsoft.Extensions.Logging": "1.1.0", - "Microsoft.Extensions.Logging.Console": "1.1.0", - "Microsoft.Extensions.Logging.Debug": "1.1.0", - "Microsoft.Extensions.Options.ConfigurationExtensions": "1.1.0" - }, - - "tools": { - "Microsoft.AspNetCore.Razor.Tools": "1.0.0-preview2-final", - "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-preview2-final", - "Microsoft.DotNet.Watcher.Tools": "1.0.0-preview2-final" - }, - - "frameworks": { - "netcoreapp1.1": { - "imports": [ - "dotnet5.6", - "portable-net45+win8" - ] - } - }, - - "buildOptions": { - "emitEntryPoint": true, - "preserveCompilationContext": true, - "compile": { - "exclude": ["node_modules"] - } - }, - - "runtimeOptions": { - "configProperties": { - "System.GC.Server": true - } - }, - - "publishOptions": { - "include": [ - "appsettings.json", - "Views", - "web.config", - "wwwroot" - ], - "exclude": [ - "wwwroot/dist/*.map" - ] - }, - - "scripts": { - "prepublish": [ - "npm install", - "node node_modules/webpack/bin/webpack.js --config webpack.config.vendor.js --env.prod", - "node node_modules/webpack/bin/webpack.js --env.prod" - ], - "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ] - }, - - "tooling": { - "defaultNamespace": "WebApplicationBasic" - } -} diff --git a/templates/AureliaSpa/template_gitignore b/templates/AureliaSpa/template_gitignore index bc5a6f3..0d5fcb9 100644 --- a/templates/AureliaSpa/template_gitignore +++ b/templates/AureliaSpa/template_gitignore @@ -193,9 +193,7 @@ ClientBin/ *.publishsettings orleans.codegen.cs -# Workaround for https://github.com/aspnet/JavaScriptServices/issues/235 -/node_modules/** -!/node_modules/_placeholder.txt +/node_modules # RIA/Silverlight projects Generated_Code/ diff --git a/templates/AureliaSpa/wwwroot/dist/_placeholder.txt b/templates/AureliaSpa/wwwroot/dist/_placeholder.txt deleted file mode 100644 index b22cc15..0000000 --- a/templates/AureliaSpa/wwwroot/dist/_placeholder.txt +++ /dev/null @@ -1,9 +0,0 @@ ------------------------------------------------------------------- -Don't delete this file. Do include it in your source control repo. ------------------------------------------------------------------- - -This file exists as a workaround for https://github.com/dotnet/cli/issues/1396 -('dotnet publish' does not publish any directories that didn't exist or were -empty before the publish script started). - -Hopefully, this can be removed after the move to the new MSBuild. diff --git a/templates/KnockoutSpa/.deployment b/templates/KnockoutSpa/.deployment deleted file mode 100644 index 4ad366c..0000000 --- a/templates/KnockoutSpa/.deployment +++ /dev/null @@ -1,2 +0,0 @@ -[config] -SCM_SCRIPT_GENERATOR_ARGS=--aspNetCore project.json diff --git a/templates/KnockoutSpa/KnockoutSpa.xproj b/templates/KnockoutSpa/KnockoutSpa.xproj deleted file mode 100644 index 9a6e512..0000000 --- a/templates/KnockoutSpa/KnockoutSpa.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - true - - - - 85231b41-6998-49ae-abd2-5124c83dbef2 - KnockoutSpa - .\obj - .\bin\ - v4.5.2 - - - 2.0 - - - \ No newline at end of file diff --git a/templates/KnockoutSpa/Startup.cs b/templates/KnockoutSpa/Startup.cs index e5d73ed..ab353f0 100755 --- a/templates/KnockoutSpa/Startup.cs +++ b/templates/KnockoutSpa/Startup.cs @@ -41,7 +41,8 @@ namespace WebApplicationBasic if (env.IsDevelopment()) { app.UseDeveloperExceptionPage(); - app.UseWebpackDevMiddleware(new WebpackDevMiddlewareOptions { + app.UseWebpackDevMiddleware(new WebpackDevMiddlewareOptions + { HotModuleReplacement = true }); } diff --git a/templates/KnockoutSpa/global.json b/templates/KnockoutSpa/global.json index 5a3dc98..3b968e2 100644 --- a/templates/KnockoutSpa/global.json +++ b/templates/KnockoutSpa/global.json @@ -1,3 +1,3 @@ { - "sdk": { "version": "1.0.0-preview2-1-003177" } + "sdk": { "version": "sdkVersionInjectedHere" } } diff --git a/templates/KnockoutSpa/project.json b/templates/KnockoutSpa/project.json deleted file mode 100755 index 32ca9b9..0000000 --- a/templates/KnockoutSpa/project.json +++ /dev/null @@ -1,79 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.1.0", - "type": "platform" - }, - "Microsoft.AspNetCore.SpaServices": "1.1.0-*", - "Microsoft.AspNetCore.Diagnostics": "1.1.0", - "Microsoft.AspNetCore.Mvc": "1.1.0", - "Microsoft.AspNetCore.Razor.Tools": { - "version": "1.0.0-preview2-final", - "type": "build" - }, - "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0", - "Microsoft.AspNetCore.Server.Kestrel": "1.1.0", - "Microsoft.AspNetCore.StaticFiles": "1.1.0", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.0", - "Microsoft.Extensions.Configuration.Json": "1.1.0", - "Microsoft.Extensions.Configuration.CommandLine": "1.1.0", - "Microsoft.Extensions.Logging": "1.1.0", - "Microsoft.Extensions.Logging.Console": "1.1.0", - "Microsoft.Extensions.Logging.Debug": "1.1.0", - "Microsoft.Extensions.Options.ConfigurationExtensions": "1.1.0" - }, - - "tools": { - "Microsoft.AspNetCore.Razor.Tools": "1.0.0-preview2-final", - "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-preview2-final", - "Microsoft.DotNet.Watcher.Tools": "1.0.0-preview2-final" - }, - - "frameworks": { - "netcoreapp1.1": { - "imports": [ - "dotnet5.6", - "portable-net45+win8" - ] - } - }, - - "buildOptions": { - "emitEntryPoint": true, - "preserveCompilationContext": true, - "compile": { - "exclude": ["node_modules"] - } - }, - - "runtimeOptions": { - "configProperties": { - "System.GC.Server": true - } - }, - - "publishOptions": { - "include": [ - "appsettings.json", - "Views", - "web.config", - "wwwroot" - ], - "exclude": [ - "wwwroot/dist/*.map" - ] - }, - - "scripts": { - "prepublish": [ - "npm install", - "node node_modules/webpack/bin/webpack.js --config webpack.config.vendor.js --env.prod", - "node node_modules/webpack/bin/webpack.js --env.prod" - ], - "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ] - }, - - "tooling": { - "defaultNamespace": "WebApplicationBasic" - } -} diff --git a/templates/KnockoutSpa/template_gitignore b/templates/KnockoutSpa/template_gitignore index 893db26..a6f8810 100644 --- a/templates/KnockoutSpa/template_gitignore +++ b/templates/KnockoutSpa/template_gitignore @@ -191,9 +191,7 @@ ClientBin/ *.publishsettings orleans.codegen.cs -# Workaround for https://github.com/aspnet/JavaScriptServices/issues/235 -/node_modules/** -!/node_modules/_placeholder.txt +/node_modules # RIA/Silverlight projects Generated_Code/ diff --git a/templates/KnockoutSpa/wwwroot/dist/_placeholder.txt b/templates/KnockoutSpa/wwwroot/dist/_placeholder.txt deleted file mode 100644 index b22cc15..0000000 --- a/templates/KnockoutSpa/wwwroot/dist/_placeholder.txt +++ /dev/null @@ -1,9 +0,0 @@ ------------------------------------------------------------------- -Don't delete this file. Do include it in your source control repo. ------------------------------------------------------------------- - -This file exists as a workaround for https://github.com/dotnet/cli/issues/1396 -('dotnet publish' does not publish any directories that didn't exist or were -empty before the publish script started). - -Hopefully, this can be removed after the move to the new MSBuild. diff --git a/templates/ReactReduxSpa/.babelrc b/templates/ReactReduxSpa/.babelrc index 9f0ce54..7991bdb 100644 --- a/templates/ReactReduxSpa/.babelrc +++ b/templates/ReactReduxSpa/.babelrc @@ -1,3 +1,3 @@ { - "presets": [["es2015", { "modules": false} ], "react"] + "presets": [["es2015", { "modules": false }], "react"] } diff --git a/templates/ReactReduxSpa/.deployment b/templates/ReactReduxSpa/.deployment deleted file mode 100644 index 4ad366c..0000000 --- a/templates/ReactReduxSpa/.deployment +++ /dev/null @@ -1,2 +0,0 @@ -[config] -SCM_SCRIPT_GENERATOR_ARGS=--aspNetCore project.json diff --git a/templates/ReactReduxSpa/ClientApp/dist/_placeholder.txt b/templates/ReactReduxSpa/ClientApp/dist/_placeholder.txt deleted file mode 100644 index b22cc15..0000000 --- a/templates/ReactReduxSpa/ClientApp/dist/_placeholder.txt +++ /dev/null @@ -1,9 +0,0 @@ ------------------------------------------------------------------- -Don't delete this file. Do include it in your source control repo. ------------------------------------------------------------------- - -This file exists as a workaround for https://github.com/dotnet/cli/issues/1396 -('dotnet publish' does not publish any directories that didn't exist or were -empty before the publish script started). - -Hopefully, this can be removed after the move to the new MSBuild. diff --git a/templates/ReactReduxSpa/ReactReduxSpa.xproj b/templates/ReactReduxSpa/ReactReduxSpa.xproj deleted file mode 100644 index f3701ba..0000000 --- a/templates/ReactReduxSpa/ReactReduxSpa.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - true - - - - dbfc6db0-a6d1-4694-a108-1c604b988da3 - ReactReduxSpa - .\obj - .\bin\ - v4.5.2 - - - 2.0 - - - \ No newline at end of file diff --git a/templates/ReactReduxSpa/global.json b/templates/ReactReduxSpa/global.json index 5a3dc98..3b968e2 100644 --- a/templates/ReactReduxSpa/global.json +++ b/templates/ReactReduxSpa/global.json @@ -1,3 +1,3 @@ { - "sdk": { "version": "1.0.0-preview2-1-003177" } + "sdk": { "version": "sdkVersionInjectedHere" } } diff --git a/templates/ReactReduxSpa/project.json b/templates/ReactReduxSpa/project.json deleted file mode 100755 index a406b37..0000000 --- a/templates/ReactReduxSpa/project.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.1.0", - "type": "platform" - }, - "Microsoft.AspNetCore.Diagnostics": "1.1.0", - "Microsoft.AspNetCore.Mvc": "1.1.0", - "Microsoft.AspNetCore.Razor.Tools": { - "version": "1.0.0-preview2-final", - "type": "build" - }, - "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0", - "Microsoft.AspNetCore.Server.Kestrel": "1.1.0", - "Microsoft.AspNetCore.SpaServices": "1.1.0-*", - "Microsoft.AspNetCore.StaticFiles": "1.1.0", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.0", - "Microsoft.Extensions.Configuration.Json": "1.1.0", - "Microsoft.Extensions.Configuration.CommandLine": "1.1.0", - "Microsoft.Extensions.Logging": "1.1.0", - "Microsoft.Extensions.Logging.Console": "1.1.0", - "Microsoft.Extensions.Logging.Debug": "1.1.0", - "Microsoft.Extensions.Options.ConfigurationExtensions": "1.1.0" - }, - - "tools": { - "Microsoft.AspNetCore.Razor.Tools": "1.0.0-preview2-final", - "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-preview2-final", - "Microsoft.DotNet.Watcher.Tools": "1.0.0-preview2-final" - }, - - "frameworks": { - "netcoreapp1.1": { - "imports": [ - "dotnet5.6", - "portable-net45+win8" - ] - } - }, - - "buildOptions": { - "emitEntryPoint": true, - "preserveCompilationContext": true, - "compile": { - "exclude": ["node_modules"] - } - }, - - "runtimeOptions": { - "configProperties": { - "System.GC.Server": true - } - }, - - "publishOptions": { - "include": [ - "appsettings.json", - "ClientApp/dist", - "Views", - "web.config", - "wwwroot" - ], - "exclude": [ - "wwwroot/dist/*.map" - ] - }, - - "scripts": { - "prepublish": [ - "npm install", - "node node_modules/webpack/bin/webpack.js --config webpack.config.vendor.js --env.prod", - "node node_modules/webpack/bin/webpack.js --env.prod" - ], - "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ] - }, - - "tooling": { - "defaultNamespace": "WebApplicationBasic" - } -} diff --git a/templates/ReactReduxSpa/template_gitignore b/templates/ReactReduxSpa/template_gitignore index bc5a6f3..0d5fcb9 100644 --- a/templates/ReactReduxSpa/template_gitignore +++ b/templates/ReactReduxSpa/template_gitignore @@ -193,9 +193,7 @@ ClientBin/ *.publishsettings orleans.codegen.cs -# Workaround for https://github.com/aspnet/JavaScriptServices/issues/235 -/node_modules/** -!/node_modules/_placeholder.txt +/node_modules # RIA/Silverlight projects Generated_Code/ diff --git a/templates/ReactReduxSpa/wwwroot/dist/_placeholder.txt b/templates/ReactReduxSpa/wwwroot/dist/_placeholder.txt deleted file mode 100644 index b22cc15..0000000 --- a/templates/ReactReduxSpa/wwwroot/dist/_placeholder.txt +++ /dev/null @@ -1,9 +0,0 @@ ------------------------------------------------------------------- -Don't delete this file. Do include it in your source control repo. ------------------------------------------------------------------- - -This file exists as a workaround for https://github.com/dotnet/cli/issues/1396 -('dotnet publish' does not publish any directories that didn't exist or were -empty before the publish script started). - -Hopefully, this can be removed after the move to the new MSBuild. diff --git a/templates/ReactSpa/.deployment b/templates/ReactSpa/.deployment deleted file mode 100644 index 4ad366c..0000000 --- a/templates/ReactSpa/.deployment +++ /dev/null @@ -1,2 +0,0 @@ -[config] -SCM_SCRIPT_GENERATOR_ARGS=--aspNetCore project.json diff --git a/templates/ReactSpa/ReactSpa.xproj b/templates/ReactSpa/ReactSpa.xproj deleted file mode 100644 index 4a9c25b..0000000 --- a/templates/ReactSpa/ReactSpa.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - true - - - - e9d1a695-f0e6-46f2-b5e3-72f4af805387 - ReactSpa - .\obj - .\bin\ - v4.5.2 - - - 2.0 - - - \ No newline at end of file diff --git a/templates/ReactSpa/global.json b/templates/ReactSpa/global.json index 5a3dc98..3b968e2 100644 --- a/templates/ReactSpa/global.json +++ b/templates/ReactSpa/global.json @@ -1,3 +1,3 @@ { - "sdk": { "version": "1.0.0-preview2-1-003177" } + "sdk": { "version": "sdkVersionInjectedHere" } } diff --git a/templates/ReactSpa/project.json b/templates/ReactSpa/project.json deleted file mode 100755 index 02ae207..0000000 --- a/templates/ReactSpa/project.json +++ /dev/null @@ -1,79 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.1.0", - "type": "platform" - }, - "Microsoft.AspNetCore.Diagnostics": "1.1.0", - "Microsoft.AspNetCore.Mvc": "1.1.0", - "Microsoft.AspNetCore.Razor.Tools": { - "version": "1.0.0-preview2-final", - "type": "build" - }, - "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0", - "Microsoft.AspNetCore.Server.Kestrel": "1.1.0", - "Microsoft.AspNetCore.SpaServices": "1.1.0-*", - "Microsoft.AspNetCore.StaticFiles": "1.1.0", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.0", - "Microsoft.Extensions.Configuration.Json": "1.1.0", - "Microsoft.Extensions.Configuration.CommandLine": "1.1.0", - "Microsoft.Extensions.Logging": "1.1.0", - "Microsoft.Extensions.Logging.Console": "1.1.0", - "Microsoft.Extensions.Logging.Debug": "1.1.0", - "Microsoft.Extensions.Options.ConfigurationExtensions": "1.1.0" - }, - - "tools": { - "Microsoft.AspNetCore.Razor.Tools": "1.0.0-preview2-final", - "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-preview2-final", - "Microsoft.DotNet.Watcher.Tools": "1.0.0-preview2-final" - }, - - "frameworks": { - "netcoreapp1.1": { - "imports": [ - "dotnet5.6", - "portable-net45+win8" - ] - } - }, - - "buildOptions": { - "emitEntryPoint": true, - "preserveCompilationContext": true, - "compile": { - "exclude": ["node_modules"] - } - }, - - "runtimeOptions": { - "configProperties": { - "System.GC.Server": true - } - }, - - "publishOptions": { - "include": [ - "appsettings.json", - "Views", - "web.config", - "wwwroot" - ], - "exclude": [ - "wwwroot/dist/*.map" - ] - }, - - "scripts": { - "prepublish": [ - "npm install", - "node node_modules/webpack/bin/webpack.js --config webpack.config.vendor.js --env.prod", - "node node_modules/webpack/bin/webpack.js --env.prod" - ], - "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ] - }, - - "tooling": { - "defaultNamespace": "WebApplicationBasic" - } -} diff --git a/templates/ReactSpa/template_gitignore b/templates/ReactSpa/template_gitignore index 893db26..a6f8810 100644 --- a/templates/ReactSpa/template_gitignore +++ b/templates/ReactSpa/template_gitignore @@ -191,9 +191,7 @@ ClientBin/ *.publishsettings orleans.codegen.cs -# Workaround for https://github.com/aspnet/JavaScriptServices/issues/235 -/node_modules/** -!/node_modules/_placeholder.txt +/node_modules # RIA/Silverlight projects Generated_Code/ diff --git a/templates/ReactSpa/wwwroot/dist/_placeholder.txt b/templates/ReactSpa/wwwroot/dist/_placeholder.txt deleted file mode 100644 index b22cc15..0000000 --- a/templates/ReactSpa/wwwroot/dist/_placeholder.txt +++ /dev/null @@ -1,9 +0,0 @@ ------------------------------------------------------------------- -Don't delete this file. Do include it in your source control repo. ------------------------------------------------------------------- - -This file exists as a workaround for https://github.com/dotnet/cli/issues/1396 -('dotnet publish' does not publish any directories that didn't exist or were -empty before the publish script started). - -Hopefully, this can be removed after the move to the new MSBuild. diff --git a/templates/VueSpa/.deployment b/templates/VueSpa/.deployment deleted file mode 100644 index 4ad366c..0000000 --- a/templates/VueSpa/.deployment +++ /dev/null @@ -1,2 +0,0 @@ -[config] -SCM_SCRIPT_GENERATOR_ARGS=--aspNetCore project.json diff --git a/templates/VueSpa/VueSpa.xproj b/templates/VueSpa/VueSpa.xproj deleted file mode 100644 index 724c811..0000000 --- a/templates/VueSpa/VueSpa.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - true - - - - 85231b41-6998-49ae-abd2-5124c83dbef2 - VueSpa - .\obj - .\bin\ - v4.5.2 - - - 2.0 - - - \ No newline at end of file diff --git a/templates/VueSpa/global.json b/templates/VueSpa/global.json index 5a3dc98..3b968e2 100644 --- a/templates/VueSpa/global.json +++ b/templates/VueSpa/global.json @@ -1,3 +1,3 @@ { - "sdk": { "version": "1.0.0-preview2-1-003177" } + "sdk": { "version": "sdkVersionInjectedHere" } } diff --git a/templates/VueSpa/project.json b/templates/VueSpa/project.json deleted file mode 100644 index 32ca9b9..0000000 --- a/templates/VueSpa/project.json +++ /dev/null @@ -1,79 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.1.0", - "type": "platform" - }, - "Microsoft.AspNetCore.SpaServices": "1.1.0-*", - "Microsoft.AspNetCore.Diagnostics": "1.1.0", - "Microsoft.AspNetCore.Mvc": "1.1.0", - "Microsoft.AspNetCore.Razor.Tools": { - "version": "1.0.0-preview2-final", - "type": "build" - }, - "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0", - "Microsoft.AspNetCore.Server.Kestrel": "1.1.0", - "Microsoft.AspNetCore.StaticFiles": "1.1.0", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.0", - "Microsoft.Extensions.Configuration.Json": "1.1.0", - "Microsoft.Extensions.Configuration.CommandLine": "1.1.0", - "Microsoft.Extensions.Logging": "1.1.0", - "Microsoft.Extensions.Logging.Console": "1.1.0", - "Microsoft.Extensions.Logging.Debug": "1.1.0", - "Microsoft.Extensions.Options.ConfigurationExtensions": "1.1.0" - }, - - "tools": { - "Microsoft.AspNetCore.Razor.Tools": "1.0.0-preview2-final", - "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-preview2-final", - "Microsoft.DotNet.Watcher.Tools": "1.0.0-preview2-final" - }, - - "frameworks": { - "netcoreapp1.1": { - "imports": [ - "dotnet5.6", - "portable-net45+win8" - ] - } - }, - - "buildOptions": { - "emitEntryPoint": true, - "preserveCompilationContext": true, - "compile": { - "exclude": ["node_modules"] - } - }, - - "runtimeOptions": { - "configProperties": { - "System.GC.Server": true - } - }, - - "publishOptions": { - "include": [ - "appsettings.json", - "Views", - "web.config", - "wwwroot" - ], - "exclude": [ - "wwwroot/dist/*.map" - ] - }, - - "scripts": { - "prepublish": [ - "npm install", - "node node_modules/webpack/bin/webpack.js --config webpack.config.vendor.js --env.prod", - "node node_modules/webpack/bin/webpack.js --env.prod" - ], - "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ] - }, - - "tooling": { - "defaultNamespace": "WebApplicationBasic" - } -} diff --git a/templates/VueSpa/template_gitignore b/templates/VueSpa/template_gitignore index 893db26..a6f8810 100644 --- a/templates/VueSpa/template_gitignore +++ b/templates/VueSpa/template_gitignore @@ -191,9 +191,7 @@ ClientBin/ *.publishsettings orleans.codegen.cs -# Workaround for https://github.com/aspnet/JavaScriptServices/issues/235 -/node_modules/** -!/node_modules/_placeholder.txt +/node_modules # RIA/Silverlight projects Generated_Code/ diff --git a/templates/WebApplicationBasic/template_gitignore b/templates/WebApplicationBasic/template_gitignore index e12e5da..2e3deee 100644 --- a/templates/WebApplicationBasic/template_gitignore +++ b/templates/WebApplicationBasic/template_gitignore @@ -188,9 +188,7 @@ ClientBin/ *.publishsettings orleans.codegen.cs -# Workaround for https://github.com/aspnet/JavaScriptServices/issues/235 -/node_modules/** -!/node_modules/_placeholder.txt +/node_modules # RIA/Silverlight projects Generated_Code/