diff --git a/NuGet.Config b/NuGet.Config deleted file mode 100755 index 71aed3a..0000000 --- a/NuGet.Config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/samples/angular/MusicStore/Apis/AlbumsApiController.cs b/samples/angular/MusicStore/Apis/AlbumsApiController.cs index 4bd695d..3b98a1e 100644 --- a/samples/angular/MusicStore/Apis/AlbumsApiController.cs +++ b/samples/angular/MusicStore/Apis/AlbumsApiController.cs @@ -29,8 +29,8 @@ namespace MusicStore.Apis await _storeContext.Artists.LoadAsync(); var albums = await _storeContext.Albums - // .Include(a => a.Genre) - // .Include(a => a.Artist) + .Include(a => a.Genre) + .Include(a => a.Artist) .ToPagedListAsync(page, pageSize, sortBy, a => a.Title, // sortExpression SortDirection.Ascending, // defaultSortDirection @@ -44,8 +44,8 @@ namespace MusicStore.Apis public async Task All() { var albums = await _storeContext.Albums - //.Include(a => a.Genre) - //.Include(a => a.Artist) + .Include(a => a.Genre) + .Include(a => a.Artist) .OrderBy(a => a.Title) .ToListAsync(); @@ -74,17 +74,13 @@ namespace MusicStore.Apis await _storeContext.Artists.LoadAsync(); var album = await _storeContext.Albums - //.Include(a => a.Artist) - //.Include(a => a.Genre) + .Include(a => a.Artist) + .Include(a => a.Genre) .Where(a => a.AlbumId == albumId) .SingleOrDefaultAsync(); var albumResult = Mapper.Map(album, new AlbumResultDto()); - // TODO: Get these from the related entities when EF supports that again, i.e. when .Include() works - //album.Artist.Name = (await _storeContext.Artists.SingleOrDefaultAsync(a => a.ArtistId == album.ArtistId)).Name; - //album.Genre.Name = (await _storeContext.Genres.SingleOrDefaultAsync(g => g.GenreId == album.GenreId)).Name; - // TODO: Add null checking and return 404 in that case return Json(albumResult); @@ -147,7 +143,6 @@ namespace MusicStore.Apis public async Task DeleteAlbum(int albumId) { var album = await _storeContext.Albums.SingleOrDefaultAsync(a => a.AlbumId == albumId); - //var album = _storeContext.Albums.SingleOrDefault(a => a.AlbumId == albumId); if (album != null) { diff --git a/samples/angular/MusicStore/Startup.cs b/samples/angular/MusicStore/Startup.cs index 599442a..ed7e9d6 100755 --- a/samples/angular/MusicStore/Startup.cs +++ b/samples/angular/MusicStore/Startup.cs @@ -86,7 +86,7 @@ namespace MusicStore { var host = new WebHostBuilder() .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIISPlatformHandlerUrl() + .UseIISIntegration() .UseKestrel() .UseStartup() .Build(); diff --git a/samples/angular/MusicStore/project.json b/samples/angular/MusicStore/project.json index 171356f..d907a0f 100755 --- a/samples/angular/MusicStore/project.json +++ b/samples/angular/MusicStore/project.json @@ -1,18 +1,24 @@ { "version": "1.0.0-*", - "compilationOptions": { + "buildOptions": { "emitEntryPoint": true, - "warningsAsErrors": true, "preserveCompilationContext": true }, + "runtimeOptions": { + "gcServer": true + }, "tooling": { "defaultNamespace": "MusicStore" }, - "dependencies": { +"dependencies": { + "Microsoft.NETCore.App": { + "version": "1.0.0-rc2-*", + "type": "platform" + }, "Microsoft.AspNetCore.Diagnostics": "1.0.0-*", "Microsoft.AspNetCore.Identity.EntityFrameworkCore": "1.0.0-*", - "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*", + "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*", "Microsoft.AspNetCore.Mvc": "1.0.0-*", "Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.0-*", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", @@ -25,39 +31,26 @@ "Microsoft.AspNetCore.AngularServices": "1.0.0-*", "AutoMapper": "4.1.1" }, - "commands": { - "web": "Microsoft.AspNetCore.Server.Kestrel" - }, "frameworks": { "netcoreapp1.0": { "imports": [ + "dotnet5.6", "dnxcore50", - "portable-net451+win8" - ], - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.0.0-*", - "type": "platform" - } - } + "portable-net45+win8" + ] } }, - "exclude": [ - "wwwroot", - "node_modules", - "bower_components" - ], - "publishExclude": [ - "node_modules", - "bower_components", - "**.xproj", - "**.user", - "**.vspscc" - ], - "scripts": { - "prepublish": [ - "npm install", - "gulp" + "publishOptions": { + "exclude": [ + "node_modules", + "bower_components", + "**.xproj", + "**.user", + "**.vspscc" ] + }, + "scripts": { + "prepublish": [ "npm install" ], + "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ] } } diff --git a/samples/misc/ES2015Transpilation/Startup.cs b/samples/misc/ES2015Transpilation/Startup.cs index 0769030..2d24aef 100755 --- a/samples/misc/ES2015Transpilation/Startup.cs +++ b/samples/misc/ES2015Transpilation/Startup.cs @@ -54,7 +54,7 @@ namespace ES2015Example { var host = new WebHostBuilder() .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIISPlatformHandlerUrl() + .UseIISIntegration() .UseKestrel() .UseStartup() .Build(); diff --git a/samples/misc/ES2015Transpilation/project.json b/samples/misc/ES2015Transpilation/project.json index 588177c..d92cd67 100755 --- a/samples/misc/ES2015Transpilation/project.json +++ b/samples/misc/ES2015Transpilation/project.json @@ -1,17 +1,22 @@ { - "webroot": "wwwroot", "version": "1.0.0-*", "tooling": { "defaultNamespace": "ES2015Example" }, - "compilationOptions": { + "buildOptions": { "emitEntryPoint": true, - "warningsAsErrors": true, "preserveCompilationContext": true }, + "runtimeOptions": { + "gcServer": true + }, "dependencies": { + "Microsoft.NETCore.App": { + "version": "1.0.0-rc2-3002702", + "type": "platform" + }, "Microsoft.AspNetCore.Diagnostics": "1.0.0-*", - "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*", + "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*", "Microsoft.AspNetCore.Mvc": "1.0.0-*", "Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.0-*", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", @@ -25,22 +30,12 @@ "frameworks": { "netcoreapp1.0": { "imports": [ + "dotnet5.6", "dnxcore50", - "portable-net451+win8" - ], - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.0.0-*", - "type": "platform" - } - } + "portable-net45+win8" + ] } }, - "exclude": [ - "wwwroot", - "node_modules", - "bower_components" - ], "publishExclude": [ "node_modules", "bower_components", @@ -49,8 +44,7 @@ "**.vspscc" ], "scripts": { - "prepublish": [ - "npm install" - ] + "prepublish": [ "npm install" ], + "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ] } } diff --git a/samples/misc/Webpack/Startup.cs b/samples/misc/Webpack/Startup.cs index 4928d4c..a19fcc1 100755 --- a/samples/misc/Webpack/Startup.cs +++ b/samples/misc/Webpack/Startup.cs @@ -21,11 +21,13 @@ namespace Webpack { app.UseDeveloperExceptionPage(); - if (env.IsDevelopment()) { - app.UseWebpackDevMiddleware(new WebpackDevMiddlewareOptions { - HotModuleReplacement = true - }); - } + // For real apps, you should only use Webpack Dev Middleware at development time. For production, + // you'll get better performance and reliability if you precompile the webpack output and simply + // serve the resulting static files. For examples of setting up this automatic switch between + // development-style and production-style webpack usage, see the 'templates' dir in this repo. + app.UseWebpackDevMiddleware(new WebpackDevMiddlewareOptions { + HotModuleReplacement = true + }); app.UseStaticFiles(); loggerFactory.AddConsole(); @@ -41,7 +43,7 @@ namespace Webpack { var host = new WebHostBuilder() .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIISPlatformHandlerUrl() + .UseIISIntegration() .UseKestrel() .UseStartup() .Build(); diff --git a/samples/misc/Webpack/project.json b/samples/misc/Webpack/project.json index 1b8a1a9..04fe253 100755 --- a/samples/misc/Webpack/project.json +++ b/samples/misc/Webpack/project.json @@ -1,17 +1,22 @@ { "version": "1.0.0-*", - "compilationOptions": { + "buildOptions": { "emitEntryPoint": true, - "warningsAsErrors": true, "preserveCompilationContext": true }, + "runtimeOptions": { + "gcServer": true + }, "tooling": { "defaultNamespace": "Webpack" }, - "dependencies": { + "Microsoft.NETCore.App": { + "version": "1.0.0-rc2-3002702", + "type": "platform" + }, "Microsoft.AspNetCore.Diagnostics": "1.0.0-*", - "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*", + "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*", "Microsoft.AspNetCore.Mvc": "1.0.0-*", "Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.0-*", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", @@ -22,41 +27,26 @@ "Microsoft.Extensions.Logging.Debug": "1.0.0-*", "Microsoft.AspNetCore.SpaServices": "1.0.0-*" }, - - "commands": { - "web": "Microsoft.AspNetCore.Server.Kestrel" - }, - "frameworks": { "netcoreapp1.0": { "imports": [ + "dotnet5.6", "dnxcore50", - "portable-net451+win8" - ], - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.0.0-*", - "type": "platform" - } - } + "portable-net45+win8" + ] } }, - - "exclude": [ - "wwwroot", - "node_modules", - "bower_components" - ], - "publishExclude": [ - "node_modules", - "bower_components", - "**.xproj", - "**.user", - "**.vspscc" - ], - "scripts": { - "prepublish": [ - "npm install" + "publishOptions": { + "exclude": [ + "node_modules", + "bower_components", + "**.xproj", + "**.user", + "**.vspscc" ] + }, + "scripts": { + "prepublish": [ "npm install" ], + "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ] } } diff --git a/samples/react/MusicStore/Apis/AlbumsApiController.cs b/samples/react/MusicStore/Apis/AlbumsApiController.cs index 425061c..511f63c 100644 --- a/samples/react/MusicStore/Apis/AlbumsApiController.cs +++ b/samples/react/MusicStore/Apis/AlbumsApiController.cs @@ -29,8 +29,8 @@ namespace MusicStore.Apis await _storeContext.Artists.LoadAsync(); var albums = await _storeContext.Albums - // .Include(a => a.Genre) - // .Include(a => a.Artist) + .Include(a => a.Genre) + .Include(a => a.Artist) .ToPagedListAsync(page, pageSize, sortBy, a => a.Title, // sortExpression SortDirection.Ascending, // defaultSortDirection @@ -44,8 +44,8 @@ namespace MusicStore.Apis public async Task All() { var albums = await _storeContext.Albums - //.Include(a => a.Genre) - //.Include(a => a.Artist) + .Include(a => a.Genre) + .Include(a => a.Artist) .OrderBy(a => a.Title) .ToListAsync(); @@ -74,17 +74,13 @@ namespace MusicStore.Apis await _storeContext.Artists.LoadAsync(); var album = await _storeContext.Albums - //.Include(a => a.Artist) - //.Include(a => a.Genre) + .Include(a => a.Artist) + .Include(a => a.Genre) .Where(a => a.AlbumId == albumId) .SingleOrDefaultAsync(); var albumResult = Mapper.Map(album, new AlbumResultDto()); - // TODO: Get these from the related entities when EF supports that again, i.e. when .Include() works - //album.Artist.Name = (await _storeContext.Artists.SingleOrDefaultAsync(a => a.ArtistId == album.ArtistId)).Name; - //album.Genre.Name = (await _storeContext.Genres.SingleOrDefaultAsync(g => g.GenreId == album.GenreId)).Name; - // TODO: Add null checking and return 404 in that case return Json(albumResult); @@ -147,7 +143,6 @@ namespace MusicStore.Apis public async Task DeleteAlbum(int albumId) { var album = await _storeContext.Albums.SingleOrDefaultAsync(a => a.AlbumId == albumId); - //var album = _storeContext.Albums.SingleOrDefault(a => a.AlbumId == albumId); if (album != null) { diff --git a/samples/react/MusicStore/Startup.cs b/samples/react/MusicStore/Startup.cs index 7d9ba01..57d3ad0 100755 --- a/samples/react/MusicStore/Startup.cs +++ b/samples/react/MusicStore/Startup.cs @@ -96,7 +96,7 @@ namespace MusicStore { var host = new WebHostBuilder() .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIISPlatformHandlerUrl() + .UseIISIntegration() .UseKestrel() .UseStartup() .Build(); diff --git a/samples/react/MusicStore/project.json b/samples/react/MusicStore/project.json index 940213e..d0eaa90 100755 --- a/samples/react/MusicStore/project.json +++ b/samples/react/MusicStore/project.json @@ -1,18 +1,24 @@ { "version": "1.0.0-*", - "compilationOptions": { + "buildOptions": { "emitEntryPoint": true, - "warningsAsErrors": true, "preserveCompilationContext": true }, + "runtimeOptions": { + "gcServer": true + }, "tooling": { "defaultNamespace": "MusicStore" }, - "dependencies": { +"dependencies": { + "Microsoft.NETCore.App": { + "version": "1.0.0-rc2-*", + "type": "platform" + }, "Microsoft.AspNetCore.Diagnostics": "1.0.0-*", "Microsoft.AspNetCore.Identity.EntityFrameworkCore": "1.0.0-*", - "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*", + "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*", "Microsoft.AspNetCore.Mvc": "1.0.0-*", "Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.0-*", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", @@ -25,39 +31,26 @@ "Microsoft.AspNetCore.ReactServices": "1.0.0-*", "AutoMapper": "4.1.1" }, - - "commands": { - "web": "Microsoft.AspNetCore.Server.Kestrel" - }, - "frameworks": { "netcoreapp1.0": { "imports": [ + "dotnet5.6", "dnxcore50", - "portable-net451+win8" - ], - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.0.0-*", - "type": "platform" - } - } + "portable-net45+win8" + ] } }, - - "exclude": [ - "wwwroot", - "node_modules" - ], - "publishExclude": [ - "node_modules", - "**.xproj", - "**.user", - "**.vspscc" - ], - "scripts": { - "prepublish": [ - "npm install" + "publishOptions": { + "exclude": [ + "node_modules", + "bower_components", + "**.xproj", + "**.user", + "**.vspscc" ] + }, + "scripts": { + "prepublish": [ "npm install" ], + "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ] } } diff --git a/samples/react/ReactGrid/Startup.cs b/samples/react/ReactGrid/Startup.cs index de99329..147659b 100755 --- a/samples/react/ReactGrid/Startup.cs +++ b/samples/react/ReactGrid/Startup.cs @@ -54,7 +54,7 @@ namespace ReactGrid { var host = new WebHostBuilder() .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIISPlatformHandlerUrl() + .UseIISIntegration() .UseKestrel() .UseStartup() .Build(); diff --git a/samples/react/ReactGrid/project.json b/samples/react/ReactGrid/project.json index d4a4073..91d5ac8 100755 --- a/samples/react/ReactGrid/project.json +++ b/samples/react/ReactGrid/project.json @@ -1,13 +1,19 @@ { "version": "1.0.0-*", - "compilationOptions": { + "buildOptions": { "emitEntryPoint": true, - "warningsAsErrors": true, "preserveCompilationContext": true }, + "runtimeOptions": { + "gcServer": true + }, "dependencies": { + "Microsoft.NETCore.App": { + "version": "1.0.0-rc2-3002702", + "type": "platform" + }, "Microsoft.AspNetCore.Diagnostics": "1.0.0-*", - "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*", + "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*", "Microsoft.AspNetCore.Mvc": "1.0.0-*", "Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.0-*", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", @@ -18,38 +24,26 @@ "Microsoft.Extensions.Logging.Debug": "1.0.0-*", "Microsoft.AspNetCore.ReactServices": "1.0.0-*" }, - "commands": { - "web": "Microsoft.AspNetCore.Server.Kestrel" - }, "frameworks": { "netcoreapp1.0": { "imports": [ + "dotnet5.6", "dnxcore50", - "portable-net451+win8" - ], - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.0.0-*", - "type": "platform" - } - } + "portable-net45+win8" + ] } }, - - "exclude": [ - "wwwroot", - "node_modules" - ], - "publishExclude": [ - "node_modules", - "**.xproj", - "**.user", - "**.vspscc" - ], - "scripts": { - "prepare": [ - "npm install", - "webpack" + "publishOptions": { + "exclude": [ + "node_modules", + "bower_components", + "**.xproj", + "**.user", + "**.vspscc" ] + }, + "scripts": { + "prepublish": [ "npm install" ], + "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ] } } diff --git a/src/Microsoft.AspNetCore.AngularServices/project.json b/src/Microsoft.AspNetCore.AngularServices/project.json index 8b94c17..40d0515 100644 --- a/src/Microsoft.AspNetCore.AngularServices/project.json +++ b/src/Microsoft.AspNetCore.AngularServices/project.json @@ -5,30 +5,21 @@ "keyFile": "../../tools/Key.snk" }, "authors": [ "Microsoft" ], - "repository": { - "type": "git", - "url": "git://github.com/aspnet/nodeservices" - }, "tooling": { "defaultNamespace": "Microsoft.AspNetCore.AngularServices" }, - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "dnxcore50", - "portable-net451+win8" - ], - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.0.0-*", - "type": "platform" - } - } - } - }, "dependencies": { "Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.0-*", "Microsoft.AspNetCore.NodeServices": "1.0.0-*", "Microsoft.AspNetCore.SpaServices": "1.0.0-*" + }, + "frameworks": { + "netcoreapp1.0": { + "imports": [ + "dotnet5.6", + "dnxcore50", + "portable-net45+win8" + ] + } } } diff --git a/src/Microsoft.AspNetCore.NodeServices/project.json b/src/Microsoft.AspNetCore.NodeServices/project.json index 2281218..597a456 100644 --- a/src/Microsoft.AspNetCore.NodeServices/project.json +++ b/src/Microsoft.AspNetCore.NodeServices/project.json @@ -5,32 +5,28 @@ "keyFile": "../../tools/Key.snk" }, "authors": [ "Microsoft" ], - "repository": { - "type": "git", - "url": "git://github.com/aspnet/nodeservices" - }, "dependencies": { "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-*", "Microsoft.Extensions.PlatformAbstractions": "1.0.0-*", "Microsoft.AspNetCore.Hosting.Abstractions": "1.0.0-*", - "Newtonsoft.Json": "8.0.3" + "Newtonsoft.Json": "8.0.3", + "System.Diagnostics.Process": "4.1.0-*", + "System.Text.RegularExpressions": "4.0.0-*", + "System.Net.Http": "4.0.0-*", + "System.Console": "4.0.0-*" }, "frameworks": { "netcoreapp1.0": { "imports": [ + "dotnet5.6", "dnxcore50", - "portable-net451+win8" - ], - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.0.0-*", - "type": "platform" - }, - "System.Diagnostics.Process": "4.1.0-*" - } + "portable-net45+win8" + ] } }, - "resource": [ - "Content/**/*" - ] + "buildOptions": { + "embed": [ + "Content/**/*" + ] + } } diff --git a/src/Microsoft.AspNetCore.ReactServices/project.json b/src/Microsoft.AspNetCore.ReactServices/project.json index 08f647d..d08cdff 100644 --- a/src/Microsoft.AspNetCore.ReactServices/project.json +++ b/src/Microsoft.AspNetCore.ReactServices/project.json @@ -5,10 +5,6 @@ "keyFile": "../../tools/Key.snk" }, "authors": [ "Microsoft" ], - "repository": { - "type": "git", - "url": "git://github.com/aspnet/nodeservices" - }, "tooling": { "defaultNamespace": "Microsoft.AspNetCore.ReactServices" }, @@ -20,15 +16,10 @@ "frameworks": { "netcoreapp1.0": { "imports": [ + "dotnet5.6", "dnxcore50", - "portable-net451+win8" - ], - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.0.0-*", - "type": "platform" - } - } + "portable-net45+win8" + ] } } } diff --git a/src/Microsoft.AspNetCore.SpaServices/project.json b/src/Microsoft.AspNetCore.SpaServices/project.json index ec7d09d..1132fa3 100644 --- a/src/Microsoft.AspNetCore.SpaServices/project.json +++ b/src/Microsoft.AspNetCore.SpaServices/project.json @@ -1,37 +1,28 @@ { "version": "1.0.0-*", - "description": "Helpers for building single-page applications on ASP.NET Core", + "description": "Helpers for building single-page applications on ASP.NET MVC Core", "compilationOptions": { "keyFile": "../../tools/Key.snk" }, "authors": [ "Microsoft" ], - "tags": [ - "" - ], - "projectUrl": "", - "licenseUrl": "", "dependencies": { "Microsoft.AspNetCore.Mvc": "1.0.0-*", - "Microsoft.AspNetCore.Routing": "1.0.0-*", "Microsoft.AspNetCore.NodeServices": "1.0.0-*" }, "frameworks": { "netcoreapp1.0": { "imports": [ + "dotnet5.6", "dnxcore50", - "portable-net451+win8" - ], - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.0.0-*", - "type": "platform" - } - } + "portable-net45+win8" + ] } }, - "resource": [ - "Content/**/*" - ] + "buildOptions": { + "embed": [ + "Content/**/*" + ] + } } diff --git a/templates/Angular2Spa/Startup.cs b/templates/Angular2Spa/Startup.cs index 899442c..0c5cc48 100755 --- a/templates/Angular2Spa/Startup.cs +++ b/templates/Angular2Spa/Startup.cs @@ -53,7 +53,7 @@ namespace WebApplicationBasic { var host = new WebHostBuilder() .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIISPlatformHandlerUrl() + .UseIISIntegration() .UseKestrel() .UseStartup() .Build(); diff --git a/templates/Angular2Spa/project.json b/templates/Angular2Spa/project.json index b4d7eee..c47a5d8 100755 --- a/templates/Angular2Spa/project.json +++ b/templates/Angular2Spa/project.json @@ -1,17 +1,23 @@ { "version": "1.0.0-*", - "compilationOptions": { + "buildOptions": { "emitEntryPoint": true, - "warningsAsErrors": true, "preserveCompilationContext": true }, + "runtimeOptions": { + "gcServer": true + }, "tooling": { "defaultNamespace": "WebApplicationBasic" }, "dependencies": { + "Microsoft.NETCore.App": { + "version": "1.0.0-rc2-*", + "type": "platform" + }, "Microsoft.AspNetCore.Diagnostics": "1.0.0-*", - "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*", + "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*", "Microsoft.AspNetCore.Mvc": "1.0.0-*", "Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.0-*", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", @@ -22,43 +28,29 @@ "Microsoft.Extensions.Logging.Debug": "1.0.0-*", "Microsoft.AspNetCore.AngularServices": "1.0.0-*" }, - - "commands": { - "web": "Microsoft.AspNetCore.Server.Kestrel" - }, - "frameworks": { "netcoreapp1.0": { "imports": [ + "dotnet5.6", "dnxcore50", - "portable-net451+win8" - ], - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.0.0-*", - "type": "platform" - } - } + "portable-net45+win8" + ] } }, - - "exclude": [ - "wwwroot", - "node_modules" - ], - "publishExclude": [ - "node_modules", - "**.xproj", - "**.user", - "**.vspscc" - ], + "publishOptions": { + "exclude": [ + "node_modules", + "**.xproj", + "**.user", + "**.vspscc" + ] + }, "scripts": { "prepare": [ "npm install", "webpack --config webpack.config.vendor.js" ], - "prepublish": [ - "webpack" - ] + "prepublish": [ "webpack" ], + "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ] } } diff --git a/templates/KnockoutSpa/Startup.cs b/templates/KnockoutSpa/Startup.cs index 899442c..0c5cc48 100755 --- a/templates/KnockoutSpa/Startup.cs +++ b/templates/KnockoutSpa/Startup.cs @@ -53,7 +53,7 @@ namespace WebApplicationBasic { var host = new WebHostBuilder() .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIISPlatformHandlerUrl() + .UseIISIntegration() .UseKestrel() .UseStartup() .Build(); diff --git a/templates/KnockoutSpa/project.json b/templates/KnockoutSpa/project.json index 6d34f18..2619c80 100755 --- a/templates/KnockoutSpa/project.json +++ b/templates/KnockoutSpa/project.json @@ -1,17 +1,23 @@ { "version": "1.0.0-*", - "compilationOptions": { + "buildOptions": { "emitEntryPoint": true, - "warningsAsErrors": true, "preserveCompilationContext": true }, + "runtimeOptions": { + "gcServer": true + }, "tooling": { "defaultNamespace": "WebApplicationBasic" }, "dependencies": { + "Microsoft.NETCore.App": { + "version": "1.0.0-rc2-*", + "type": "platform" + }, "Microsoft.AspNetCore.Diagnostics": "1.0.0-*", - "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*", + "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*", "Microsoft.AspNetCore.Mvc": "1.0.0-*", "Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.0-*", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", @@ -22,43 +28,29 @@ "Microsoft.Extensions.Logging.Debug": "1.0.0-*", "Microsoft.AspNetCore.SpaServices": "1.0.0-*" }, - - "commands": { - "web": "Microsoft.AspNetCore.Server.Kestrel" - }, - "frameworks": { "netcoreapp1.0": { "imports": [ + "dotnet5.6", "dnxcore50", - "portable-net451+win8" - ], - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.0.0-*", - "type": "platform" - } - } + "portable-net45+win8" + ] } }, - - "exclude": [ - "wwwroot", - "node_modules" - ], - "publishExclude": [ - "node_modules", - "**.xproj", - "**.user", - "**.vspscc" - ], + "publishOptions": { + "exclude": [ + "node_modules", + "**.xproj", + "**.user", + "**.vspscc" + ] + }, "scripts": { "prepare": [ "npm install", "webpack --config webpack.config.vendor.js" ], - "prepublish": [ - "webpack" - ] + "prepublish": [ "webpack" ], + "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ] } } diff --git a/templates/ReactReduxSpa/Startup.cs b/templates/ReactReduxSpa/Startup.cs index f2bc5b5..6f4babb 100755 --- a/templates/ReactReduxSpa/Startup.cs +++ b/templates/ReactReduxSpa/Startup.cs @@ -54,7 +54,7 @@ namespace WebApplicationBasic { var host = new WebHostBuilder() .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIISPlatformHandlerUrl() + .UseIISIntegration() .UseKestrel() .UseStartup() .Build(); diff --git a/templates/ReactReduxSpa/project.json b/templates/ReactReduxSpa/project.json index ffe6b8c..1aa6a78 100755 --- a/templates/ReactReduxSpa/project.json +++ b/templates/ReactReduxSpa/project.json @@ -1,17 +1,23 @@ { "version": "1.0.0-*", - "compilationOptions": { + "buildOptions": { "emitEntryPoint": true, - "warningsAsErrors": true, "preserveCompilationContext": true }, + "runtimeOptions": { + "gcServer": true + }, "tooling": { "defaultNamespace": "WebApplicationBasic" }, "dependencies": { + "Microsoft.NETCore.App": { + "version": "1.0.0-rc2-*", + "type": "platform" + }, "Microsoft.AspNetCore.Diagnostics": "1.0.0-*", - "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*", + "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*", "Microsoft.AspNetCore.Mvc": "1.0.0-*", "Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.0-*", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", @@ -22,43 +28,29 @@ "Microsoft.Extensions.Logging.Debug": "1.0.0-*", "Microsoft.AspNetCore.ReactServices": "1.0.0-*" }, - - "commands": { - "web": "Microsoft.AspNetCore.Server.Kestrel" - }, - "frameworks": { "netcoreapp1.0": { "imports": [ + "dotnet5.6", "dnxcore50", - "portable-net451+win8" - ], - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.0.0-*", - "type": "platform" - } - } + "portable-net45+win8" + ] } }, - - "exclude": [ - "wwwroot", - "node_modules" - ], - "publishExclude": [ - "node_modules", - "**.xproj", - "**.user", - "**.vspscc" - ], + "publishOptions": { + "exclude": [ + "node_modules", + "**.xproj", + "**.user", + "**.vspscc" + ] + }, "scripts": { "prepare": [ "npm install", "webpack --config webpack.config.vendor.js" ], - "prepublish": [ - "webpack" - ] + "prepublish": [ "webpack" ], + "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ] } } diff --git a/templates/ReactSpa/Startup.cs b/templates/ReactSpa/Startup.cs index f2bc5b5..6f4babb 100755 --- a/templates/ReactSpa/Startup.cs +++ b/templates/ReactSpa/Startup.cs @@ -54,7 +54,7 @@ namespace WebApplicationBasic { var host = new WebHostBuilder() .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIISPlatformHandlerUrl() + .UseIISIntegration() .UseKestrel() .UseStartup() .Build(); diff --git a/templates/ReactSpa/project.json b/templates/ReactSpa/project.json index ffe6b8c..1aa6a78 100755 --- a/templates/ReactSpa/project.json +++ b/templates/ReactSpa/project.json @@ -1,17 +1,23 @@ { "version": "1.0.0-*", - "compilationOptions": { + "buildOptions": { "emitEntryPoint": true, - "warningsAsErrors": true, "preserveCompilationContext": true }, + "runtimeOptions": { + "gcServer": true + }, "tooling": { "defaultNamespace": "WebApplicationBasic" }, "dependencies": { + "Microsoft.NETCore.App": { + "version": "1.0.0-rc2-*", + "type": "platform" + }, "Microsoft.AspNetCore.Diagnostics": "1.0.0-*", - "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*", + "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*", "Microsoft.AspNetCore.Mvc": "1.0.0-*", "Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.0-*", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", @@ -22,43 +28,29 @@ "Microsoft.Extensions.Logging.Debug": "1.0.0-*", "Microsoft.AspNetCore.ReactServices": "1.0.0-*" }, - - "commands": { - "web": "Microsoft.AspNetCore.Server.Kestrel" - }, - "frameworks": { "netcoreapp1.0": { "imports": [ + "dotnet5.6", "dnxcore50", - "portable-net451+win8" - ], - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.0.0-*", - "type": "platform" - } - } + "portable-net45+win8" + ] } }, - - "exclude": [ - "wwwroot", - "node_modules" - ], - "publishExclude": [ - "node_modules", - "**.xproj", - "**.user", - "**.vspscc" - ], + "publishOptions": { + "exclude": [ + "node_modules", + "**.xproj", + "**.user", + "**.vspscc" + ] + }, "scripts": { "prepare": [ "npm install", "webpack --config webpack.config.vendor.js" ], - "prepublish": [ - "webpack" - ] + "prepublish": [ "webpack" ], + "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ] } } diff --git a/templates/WebApplicationBasic/Startup.cs b/templates/WebApplicationBasic/Startup.cs index 9163881..4ddc86c 100755 --- a/templates/WebApplicationBasic/Startup.cs +++ b/templates/WebApplicationBasic/Startup.cs @@ -38,7 +38,7 @@ namespace WebApplicationBasic { var host = new WebHostBuilder() .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIISPlatformHandlerUrl() + .UseIISIntegration() .UseKestrel() .UseStartup() .Build(); diff --git a/templates/WebApplicationBasic/project.json b/templates/WebApplicationBasic/project.json index 95f3d4b..dac23db 100755 --- a/templates/WebApplicationBasic/project.json +++ b/templates/WebApplicationBasic/project.json @@ -1,17 +1,23 @@ { "version": "1.0.0-*", - "compilationOptions": { + "buildOptions": { "emitEntryPoint": true, - "warningsAsErrors": true, "preserveCompilationContext": true }, + "runtimeOptions": { + "gcServer": true + }, "tooling": { "defaultNamespace": "WebApplicationBasic" }, "dependencies": { + "Microsoft.NETCore.App": { + "version": "1.0.0-rc2-*", + "type": "platform" + }, "Microsoft.AspNetCore.Diagnostics": "1.0.0-*", - "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*", + "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*", "Microsoft.AspNetCore.Mvc": "1.0.0-*", "Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.0-*", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", @@ -21,41 +27,29 @@ "Microsoft.NETCore.Platforms": "1.0.1-*", "Microsoft.Extensions.Logging.Debug": "1.0.0-*" }, - - "commands": { - "web": "Microsoft.AspNetCore.Server.Kestrel" - }, - "frameworks": { "netcoreapp1.0": { "imports": [ + "dotnet5.6", "dnxcore50", - "portable-net451+win8" - ], - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.0.0-*", - "type": "platform" - } - } + "portable-net45+win8" + ] } }, - - "exclude": [ - "wwwroot", - "node_modules" - ], - "publishExclude": [ - "node_modules", - "**.xproj", - "**.user", - "**.vspscc" - ], + "publishOptions": { + "exclude": [ + "node_modules", + "**.xproj", + "**.user", + "**.vspscc" + ] + }, "scripts": { "prepare": [ "npm install", "webpack --config webpack.config.vendor.js", "webpack" - ] + ], + "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ] } }