Update all projects for final .NET Core RC2

This commit is contained in:
SteveSandersonMS
2016-05-17 11:56:06 +01:00
parent d1964f087d
commit 352108be35
27 changed files with 281 additions and 401 deletions

View File

@@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<add key="AspNetVNext" value="https://www.myget.org/F/aspnetcidev/api/v2" />
<add key="NuGet" value="https://api.nuget.org/v3/index.json" />
</packageSources>
</configuration>

View File

@@ -29,8 +29,8 @@ namespace MusicStore.Apis
await _storeContext.Artists.LoadAsync(); await _storeContext.Artists.LoadAsync();
var albums = await _storeContext.Albums var albums = await _storeContext.Albums
// .Include(a => a.Genre) .Include(a => a.Genre)
// .Include(a => a.Artist) .Include(a => a.Artist)
.ToPagedListAsync(page, pageSize, sortBy, .ToPagedListAsync(page, pageSize, sortBy,
a => a.Title, // sortExpression a => a.Title, // sortExpression
SortDirection.Ascending, // defaultSortDirection SortDirection.Ascending, // defaultSortDirection
@@ -44,8 +44,8 @@ namespace MusicStore.Apis
public async Task<ActionResult> All() public async Task<ActionResult> All()
{ {
var albums = await _storeContext.Albums var albums = await _storeContext.Albums
//.Include(a => a.Genre) .Include(a => a.Genre)
//.Include(a => a.Artist) .Include(a => a.Artist)
.OrderBy(a => a.Title) .OrderBy(a => a.Title)
.ToListAsync(); .ToListAsync();
@@ -74,17 +74,13 @@ namespace MusicStore.Apis
await _storeContext.Artists.LoadAsync(); await _storeContext.Artists.LoadAsync();
var album = await _storeContext.Albums var album = await _storeContext.Albums
//.Include(a => a.Artist) .Include(a => a.Artist)
//.Include(a => a.Genre) .Include(a => a.Genre)
.Where(a => a.AlbumId == albumId) .Where(a => a.AlbumId == albumId)
.SingleOrDefaultAsync(); .SingleOrDefaultAsync();
var albumResult = Mapper.Map(album, new AlbumResultDto()); 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 // TODO: Add null checking and return 404 in that case
return Json(albumResult); return Json(albumResult);
@@ -147,7 +143,6 @@ namespace MusicStore.Apis
public async Task<ActionResult> DeleteAlbum(int albumId) public async Task<ActionResult> DeleteAlbum(int albumId)
{ {
var album = await _storeContext.Albums.SingleOrDefaultAsync(a => a.AlbumId == albumId); var album = await _storeContext.Albums.SingleOrDefaultAsync(a => a.AlbumId == albumId);
//var album = _storeContext.Albums.SingleOrDefault(a => a.AlbumId == albumId);
if (album != null) if (album != null)
{ {

View File

@@ -86,7 +86,7 @@ namespace MusicStore
{ {
var host = new WebHostBuilder() var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.UseIISPlatformHandlerUrl() .UseIISIntegration()
.UseKestrel() .UseKestrel()
.UseStartup<Startup>() .UseStartup<Startup>()
.Build(); .Build();

View File

@@ -1,18 +1,24 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"compilationOptions": { "buildOptions": {
"emitEntryPoint": true, "emitEntryPoint": true,
"warningsAsErrors": true,
"preserveCompilationContext": true "preserveCompilationContext": true
}, },
"runtimeOptions": {
"gcServer": true
},
"tooling": { "tooling": {
"defaultNamespace": "MusicStore" "defaultNamespace": "MusicStore"
}, },
"dependencies": { "dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-rc2-*",
"type": "platform"
},
"Microsoft.AspNetCore.Diagnostics": "1.0.0-*", "Microsoft.AspNetCore.Diagnostics": "1.0.0-*",
"Microsoft.AspNetCore.Identity.EntityFrameworkCore": "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": "1.0.0-*",
"Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.0-*", "Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
@@ -25,39 +31,26 @@
"Microsoft.AspNetCore.AngularServices": "1.0.0-*", "Microsoft.AspNetCore.AngularServices": "1.0.0-*",
"AutoMapper": "4.1.1" "AutoMapper": "4.1.1"
}, },
"commands": {
"web": "Microsoft.AspNetCore.Server.Kestrel"
},
"frameworks": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {
"imports": [ "imports": [
"dotnet5.6",
"dnxcore50", "dnxcore50",
"portable-net451+win8" "portable-net45+win8"
], ]
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
}
}
} }
}, },
"publishOptions": {
"exclude": [ "exclude": [
"wwwroot",
"node_modules",
"bower_components"
],
"publishExclude": [
"node_modules", "node_modules",
"bower_components", "bower_components",
"**.xproj", "**.xproj",
"**.user", "**.user",
"**.vspscc" "**.vspscc"
],
"scripts": {
"prepublish": [
"npm install",
"gulp"
] ]
},
"scripts": {
"prepublish": [ "npm install" ],
"postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ]
} }
} }

View File

@@ -54,7 +54,7 @@ namespace ES2015Example
{ {
var host = new WebHostBuilder() var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.UseIISPlatformHandlerUrl() .UseIISIntegration()
.UseKestrel() .UseKestrel()
.UseStartup<Startup>() .UseStartup<Startup>()
.Build(); .Build();

View File

@@ -1,17 +1,22 @@
{ {
"webroot": "wwwroot",
"version": "1.0.0-*", "version": "1.0.0-*",
"tooling": { "tooling": {
"defaultNamespace": "ES2015Example" "defaultNamespace": "ES2015Example"
}, },
"compilationOptions": { "buildOptions": {
"emitEntryPoint": true, "emitEntryPoint": true,
"warningsAsErrors": true,
"preserveCompilationContext": true "preserveCompilationContext": true
}, },
"runtimeOptions": {
"gcServer": true
},
"dependencies": { "dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-rc2-3002702",
"type": "platform"
},
"Microsoft.AspNetCore.Diagnostics": "1.0.0-*", "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": "1.0.0-*",
"Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.0-*", "Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
@@ -25,22 +30,12 @@
"frameworks": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {
"imports": [ "imports": [
"dotnet5.6",
"dnxcore50", "dnxcore50",
"portable-net451+win8" "portable-net45+win8"
], ]
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
}
}
} }
}, },
"exclude": [
"wwwroot",
"node_modules",
"bower_components"
],
"publishExclude": [ "publishExclude": [
"node_modules", "node_modules",
"bower_components", "bower_components",
@@ -49,8 +44,7 @@
"**.vspscc" "**.vspscc"
], ],
"scripts": { "scripts": {
"prepublish": [ "prepublish": [ "npm install" ],
"npm install" "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ]
]
} }
} }

View File

@@ -21,11 +21,13 @@ namespace Webpack
{ {
app.UseDeveloperExceptionPage(); app.UseDeveloperExceptionPage();
if (env.IsDevelopment()) { // 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 { app.UseWebpackDevMiddleware(new WebpackDevMiddlewareOptions {
HotModuleReplacement = true HotModuleReplacement = true
}); });
}
app.UseStaticFiles(); app.UseStaticFiles();
loggerFactory.AddConsole(); loggerFactory.AddConsole();
@@ -41,7 +43,7 @@ namespace Webpack
{ {
var host = new WebHostBuilder() var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.UseIISPlatformHandlerUrl() .UseIISIntegration()
.UseKestrel() .UseKestrel()
.UseStartup<Startup>() .UseStartup<Startup>()
.Build(); .Build();

View File

@@ -1,17 +1,22 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"compilationOptions": { "buildOptions": {
"emitEntryPoint": true, "emitEntryPoint": true,
"warningsAsErrors": true,
"preserveCompilationContext": true "preserveCompilationContext": true
}, },
"runtimeOptions": {
"gcServer": true
},
"tooling": { "tooling": {
"defaultNamespace": "Webpack" "defaultNamespace": "Webpack"
}, },
"dependencies": { "dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-rc2-3002702",
"type": "platform"
},
"Microsoft.AspNetCore.Diagnostics": "1.0.0-*", "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": "1.0.0-*",
"Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.0-*", "Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
@@ -22,41 +27,26 @@
"Microsoft.Extensions.Logging.Debug": "1.0.0-*", "Microsoft.Extensions.Logging.Debug": "1.0.0-*",
"Microsoft.AspNetCore.SpaServices": "1.0.0-*" "Microsoft.AspNetCore.SpaServices": "1.0.0-*"
}, },
"commands": {
"web": "Microsoft.AspNetCore.Server.Kestrel"
},
"frameworks": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {
"imports": [ "imports": [
"dotnet5.6",
"dnxcore50", "dnxcore50",
"portable-net451+win8" "portable-net45+win8"
], ]
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
}
}
} }
}, },
"publishOptions": {
"exclude": [ "exclude": [
"wwwroot",
"node_modules",
"bower_components"
],
"publishExclude": [
"node_modules", "node_modules",
"bower_components", "bower_components",
"**.xproj", "**.xproj",
"**.user", "**.user",
"**.vspscc" "**.vspscc"
],
"scripts": {
"prepublish": [
"npm install"
] ]
},
"scripts": {
"prepublish": [ "npm install" ],
"postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ]
} }
} }

View File

@@ -29,8 +29,8 @@ namespace MusicStore.Apis
await _storeContext.Artists.LoadAsync(); await _storeContext.Artists.LoadAsync();
var albums = await _storeContext.Albums var albums = await _storeContext.Albums
// .Include(a => a.Genre) .Include(a => a.Genre)
// .Include(a => a.Artist) .Include(a => a.Artist)
.ToPagedListAsync(page, pageSize, sortBy, .ToPagedListAsync(page, pageSize, sortBy,
a => a.Title, // sortExpression a => a.Title, // sortExpression
SortDirection.Ascending, // defaultSortDirection SortDirection.Ascending, // defaultSortDirection
@@ -44,8 +44,8 @@ namespace MusicStore.Apis
public async Task<ActionResult> All() public async Task<ActionResult> All()
{ {
var albums = await _storeContext.Albums var albums = await _storeContext.Albums
//.Include(a => a.Genre) .Include(a => a.Genre)
//.Include(a => a.Artist) .Include(a => a.Artist)
.OrderBy(a => a.Title) .OrderBy(a => a.Title)
.ToListAsync(); .ToListAsync();
@@ -74,17 +74,13 @@ namespace MusicStore.Apis
await _storeContext.Artists.LoadAsync(); await _storeContext.Artists.LoadAsync();
var album = await _storeContext.Albums var album = await _storeContext.Albums
//.Include(a => a.Artist) .Include(a => a.Artist)
//.Include(a => a.Genre) .Include(a => a.Genre)
.Where(a => a.AlbumId == albumId) .Where(a => a.AlbumId == albumId)
.SingleOrDefaultAsync(); .SingleOrDefaultAsync();
var albumResult = Mapper.Map(album, new AlbumResultDto()); 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 // TODO: Add null checking and return 404 in that case
return Json(albumResult); return Json(albumResult);
@@ -147,7 +143,6 @@ namespace MusicStore.Apis
public async Task<ActionResult> DeleteAlbum(int albumId) public async Task<ActionResult> DeleteAlbum(int albumId)
{ {
var album = await _storeContext.Albums.SingleOrDefaultAsync(a => a.AlbumId == albumId); var album = await _storeContext.Albums.SingleOrDefaultAsync(a => a.AlbumId == albumId);
//var album = _storeContext.Albums.SingleOrDefault(a => a.AlbumId == albumId);
if (album != null) if (album != null)
{ {

View File

@@ -96,7 +96,7 @@ namespace MusicStore
{ {
var host = new WebHostBuilder() var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.UseIISPlatformHandlerUrl() .UseIISIntegration()
.UseKestrel() .UseKestrel()
.UseStartup<Startup>() .UseStartup<Startup>()
.Build(); .Build();

View File

@@ -1,18 +1,24 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"compilationOptions": { "buildOptions": {
"emitEntryPoint": true, "emitEntryPoint": true,
"warningsAsErrors": true,
"preserveCompilationContext": true "preserveCompilationContext": true
}, },
"runtimeOptions": {
"gcServer": true
},
"tooling": { "tooling": {
"defaultNamespace": "MusicStore" "defaultNamespace": "MusicStore"
}, },
"dependencies": { "dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-rc2-*",
"type": "platform"
},
"Microsoft.AspNetCore.Diagnostics": "1.0.0-*", "Microsoft.AspNetCore.Diagnostics": "1.0.0-*",
"Microsoft.AspNetCore.Identity.EntityFrameworkCore": "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": "1.0.0-*",
"Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.0-*", "Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
@@ -25,39 +31,26 @@
"Microsoft.AspNetCore.ReactServices": "1.0.0-*", "Microsoft.AspNetCore.ReactServices": "1.0.0-*",
"AutoMapper": "4.1.1" "AutoMapper": "4.1.1"
}, },
"commands": {
"web": "Microsoft.AspNetCore.Server.Kestrel"
},
"frameworks": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {
"imports": [ "imports": [
"dotnet5.6",
"dnxcore50", "dnxcore50",
"portable-net451+win8" "portable-net45+win8"
], ]
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
}
}
} }
}, },
"publishOptions": {
"exclude": [ "exclude": [
"wwwroot",
"node_modules"
],
"publishExclude": [
"node_modules", "node_modules",
"bower_components",
"**.xproj", "**.xproj",
"**.user", "**.user",
"**.vspscc" "**.vspscc"
],
"scripts": {
"prepublish": [
"npm install"
] ]
},
"scripts": {
"prepublish": [ "npm install" ],
"postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ]
} }
} }

View File

@@ -54,7 +54,7 @@ namespace ReactGrid
{ {
var host = new WebHostBuilder() var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.UseIISPlatformHandlerUrl() .UseIISIntegration()
.UseKestrel() .UseKestrel()
.UseStartup<Startup>() .UseStartup<Startup>()
.Build(); .Build();

View File

@@ -1,13 +1,19 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"compilationOptions": { "buildOptions": {
"emitEntryPoint": true, "emitEntryPoint": true,
"warningsAsErrors": true,
"preserveCompilationContext": true "preserveCompilationContext": true
}, },
"runtimeOptions": {
"gcServer": true
},
"dependencies": { "dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-rc2-3002702",
"type": "platform"
},
"Microsoft.AspNetCore.Diagnostics": "1.0.0-*", "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": "1.0.0-*",
"Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.0-*", "Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
@@ -18,38 +24,26 @@
"Microsoft.Extensions.Logging.Debug": "1.0.0-*", "Microsoft.Extensions.Logging.Debug": "1.0.0-*",
"Microsoft.AspNetCore.ReactServices": "1.0.0-*" "Microsoft.AspNetCore.ReactServices": "1.0.0-*"
}, },
"commands": {
"web": "Microsoft.AspNetCore.Server.Kestrel"
},
"frameworks": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {
"imports": [ "imports": [
"dotnet5.6",
"dnxcore50", "dnxcore50",
"portable-net451+win8" "portable-net45+win8"
], ]
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
}
}
} }
}, },
"publishOptions": {
"exclude": [ "exclude": [
"wwwroot",
"node_modules"
],
"publishExclude": [
"node_modules", "node_modules",
"bower_components",
"**.xproj", "**.xproj",
"**.user", "**.user",
"**.vspscc" "**.vspscc"
],
"scripts": {
"prepare": [
"npm install",
"webpack"
] ]
},
"scripts": {
"prepublish": [ "npm install" ],
"postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ]
} }
} }

View File

@@ -5,30 +5,21 @@
"keyFile": "../../tools/Key.snk" "keyFile": "../../tools/Key.snk"
}, },
"authors": [ "Microsoft" ], "authors": [ "Microsoft" ],
"repository": {
"type": "git",
"url": "git://github.com/aspnet/nodeservices"
},
"tooling": { "tooling": {
"defaultNamespace": "Microsoft.AspNetCore.AngularServices" "defaultNamespace": "Microsoft.AspNetCore.AngularServices"
}, },
"frameworks": {
"netcoreapp1.0": {
"imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
}
}
}
},
"dependencies": { "dependencies": {
"Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.0-*", "Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.0-*",
"Microsoft.AspNetCore.NodeServices": "1.0.0-*", "Microsoft.AspNetCore.NodeServices": "1.0.0-*",
"Microsoft.AspNetCore.SpaServices": "1.0.0-*" "Microsoft.AspNetCore.SpaServices": "1.0.0-*"
},
"frameworks": {
"netcoreapp1.0": {
"imports": [
"dotnet5.6",
"dnxcore50",
"portable-net45+win8"
]
}
} }
} }

View File

@@ -5,32 +5,28 @@
"keyFile": "../../tools/Key.snk" "keyFile": "../../tools/Key.snk"
}, },
"authors": [ "Microsoft" ], "authors": [ "Microsoft" ],
"repository": {
"type": "git",
"url": "git://github.com/aspnet/nodeservices"
},
"dependencies": { "dependencies": {
"Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-*", "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-*",
"Microsoft.Extensions.PlatformAbstractions": "1.0.0-*", "Microsoft.Extensions.PlatformAbstractions": "1.0.0-*",
"Microsoft.AspNetCore.Hosting.Abstractions": "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": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {
"imports": [ "imports": [
"dotnet5.6",
"dnxcore50", "dnxcore50",
"portable-net451+win8" "portable-net45+win8"
], ]
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
},
"System.Diagnostics.Process": "4.1.0-*"
}
} }
}, },
"resource": [ "buildOptions": {
"embed": [
"Content/**/*" "Content/**/*"
] ]
} }
}

View File

@@ -5,10 +5,6 @@
"keyFile": "../../tools/Key.snk" "keyFile": "../../tools/Key.snk"
}, },
"authors": [ "Microsoft" ], "authors": [ "Microsoft" ],
"repository": {
"type": "git",
"url": "git://github.com/aspnet/nodeservices"
},
"tooling": { "tooling": {
"defaultNamespace": "Microsoft.AspNetCore.ReactServices" "defaultNamespace": "Microsoft.AspNetCore.ReactServices"
}, },
@@ -20,15 +16,10 @@
"frameworks": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {
"imports": [ "imports": [
"dotnet5.6",
"dnxcore50", "dnxcore50",
"portable-net451+win8" "portable-net45+win8"
], ]
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
}
}
} }
} }
} }

View File

@@ -1,37 +1,28 @@
{ {
"version": "1.0.0-*", "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": { "compilationOptions": {
"keyFile": "../../tools/Key.snk" "keyFile": "../../tools/Key.snk"
}, },
"authors": [ "authors": [
"Microsoft" "Microsoft"
], ],
"tags": [
""
],
"projectUrl": "",
"licenseUrl": "",
"dependencies": { "dependencies": {
"Microsoft.AspNetCore.Mvc": "1.0.0-*", "Microsoft.AspNetCore.Mvc": "1.0.0-*",
"Microsoft.AspNetCore.Routing": "1.0.0-*",
"Microsoft.AspNetCore.NodeServices": "1.0.0-*" "Microsoft.AspNetCore.NodeServices": "1.0.0-*"
}, },
"frameworks": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {
"imports": [ "imports": [
"dotnet5.6",
"dnxcore50", "dnxcore50",
"portable-net451+win8" "portable-net45+win8"
], ]
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
}
}
} }
}, },
"resource": [ "buildOptions": {
"embed": [
"Content/**/*" "Content/**/*"
] ]
} }
}

View File

@@ -53,7 +53,7 @@ namespace WebApplicationBasic
{ {
var host = new WebHostBuilder() var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.UseIISPlatformHandlerUrl() .UseIISIntegration()
.UseKestrel() .UseKestrel()
.UseStartup<Startup>() .UseStartup<Startup>()
.Build(); .Build();

View File

@@ -1,17 +1,23 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"compilationOptions": { "buildOptions": {
"emitEntryPoint": true, "emitEntryPoint": true,
"warningsAsErrors": true,
"preserveCompilationContext": true "preserveCompilationContext": true
}, },
"runtimeOptions": {
"gcServer": true
},
"tooling": { "tooling": {
"defaultNamespace": "WebApplicationBasic" "defaultNamespace": "WebApplicationBasic"
}, },
"dependencies": { "dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-rc2-*",
"type": "platform"
},
"Microsoft.AspNetCore.Diagnostics": "1.0.0-*", "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": "1.0.0-*",
"Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.0-*", "Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
@@ -22,43 +28,29 @@
"Microsoft.Extensions.Logging.Debug": "1.0.0-*", "Microsoft.Extensions.Logging.Debug": "1.0.0-*",
"Microsoft.AspNetCore.AngularServices": "1.0.0-*" "Microsoft.AspNetCore.AngularServices": "1.0.0-*"
}, },
"commands": {
"web": "Microsoft.AspNetCore.Server.Kestrel"
},
"frameworks": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {
"imports": [ "imports": [
"dotnet5.6",
"dnxcore50", "dnxcore50",
"portable-net451+win8" "portable-net45+win8"
], ]
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
}
}
} }
}, },
"publishOptions": {
"exclude": [ "exclude": [
"wwwroot",
"node_modules"
],
"publishExclude": [
"node_modules", "node_modules",
"**.xproj", "**.xproj",
"**.user", "**.user",
"**.vspscc" "**.vspscc"
], ]
},
"scripts": { "scripts": {
"prepare": [ "prepare": [
"npm install", "npm install",
"webpack --config webpack.config.vendor.js" "webpack --config webpack.config.vendor.js"
], ],
"prepublish": [ "prepublish": [ "webpack" ],
"webpack" "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ]
]
} }
} }

View File

@@ -53,7 +53,7 @@ namespace WebApplicationBasic
{ {
var host = new WebHostBuilder() var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.UseIISPlatformHandlerUrl() .UseIISIntegration()
.UseKestrel() .UseKestrel()
.UseStartup<Startup>() .UseStartup<Startup>()
.Build(); .Build();

View File

@@ -1,17 +1,23 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"compilationOptions": { "buildOptions": {
"emitEntryPoint": true, "emitEntryPoint": true,
"warningsAsErrors": true,
"preserveCompilationContext": true "preserveCompilationContext": true
}, },
"runtimeOptions": {
"gcServer": true
},
"tooling": { "tooling": {
"defaultNamespace": "WebApplicationBasic" "defaultNamespace": "WebApplicationBasic"
}, },
"dependencies": { "dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-rc2-*",
"type": "platform"
},
"Microsoft.AspNetCore.Diagnostics": "1.0.0-*", "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": "1.0.0-*",
"Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.0-*", "Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
@@ -22,43 +28,29 @@
"Microsoft.Extensions.Logging.Debug": "1.0.0-*", "Microsoft.Extensions.Logging.Debug": "1.0.0-*",
"Microsoft.AspNetCore.SpaServices": "1.0.0-*" "Microsoft.AspNetCore.SpaServices": "1.0.0-*"
}, },
"commands": {
"web": "Microsoft.AspNetCore.Server.Kestrel"
},
"frameworks": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {
"imports": [ "imports": [
"dotnet5.6",
"dnxcore50", "dnxcore50",
"portable-net451+win8" "portable-net45+win8"
], ]
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
}
}
} }
}, },
"publishOptions": {
"exclude": [ "exclude": [
"wwwroot",
"node_modules"
],
"publishExclude": [
"node_modules", "node_modules",
"**.xproj", "**.xproj",
"**.user", "**.user",
"**.vspscc" "**.vspscc"
], ]
},
"scripts": { "scripts": {
"prepare": [ "prepare": [
"npm install", "npm install",
"webpack --config webpack.config.vendor.js" "webpack --config webpack.config.vendor.js"
], ],
"prepublish": [ "prepublish": [ "webpack" ],
"webpack" "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ]
]
} }
} }

View File

@@ -54,7 +54,7 @@ namespace WebApplicationBasic
{ {
var host = new WebHostBuilder() var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.UseIISPlatformHandlerUrl() .UseIISIntegration()
.UseKestrel() .UseKestrel()
.UseStartup<Startup>() .UseStartup<Startup>()
.Build(); .Build();

View File

@@ -1,17 +1,23 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"compilationOptions": { "buildOptions": {
"emitEntryPoint": true, "emitEntryPoint": true,
"warningsAsErrors": true,
"preserveCompilationContext": true "preserveCompilationContext": true
}, },
"runtimeOptions": {
"gcServer": true
},
"tooling": { "tooling": {
"defaultNamespace": "WebApplicationBasic" "defaultNamespace": "WebApplicationBasic"
}, },
"dependencies": { "dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-rc2-*",
"type": "platform"
},
"Microsoft.AspNetCore.Diagnostics": "1.0.0-*", "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": "1.0.0-*",
"Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.0-*", "Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
@@ -22,43 +28,29 @@
"Microsoft.Extensions.Logging.Debug": "1.0.0-*", "Microsoft.Extensions.Logging.Debug": "1.0.0-*",
"Microsoft.AspNetCore.ReactServices": "1.0.0-*" "Microsoft.AspNetCore.ReactServices": "1.0.0-*"
}, },
"commands": {
"web": "Microsoft.AspNetCore.Server.Kestrel"
},
"frameworks": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {
"imports": [ "imports": [
"dotnet5.6",
"dnxcore50", "dnxcore50",
"portable-net451+win8" "portable-net45+win8"
], ]
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
}
}
} }
}, },
"publishOptions": {
"exclude": [ "exclude": [
"wwwroot",
"node_modules"
],
"publishExclude": [
"node_modules", "node_modules",
"**.xproj", "**.xproj",
"**.user", "**.user",
"**.vspscc" "**.vspscc"
], ]
},
"scripts": { "scripts": {
"prepare": [ "prepare": [
"npm install", "npm install",
"webpack --config webpack.config.vendor.js" "webpack --config webpack.config.vendor.js"
], ],
"prepublish": [ "prepublish": [ "webpack" ],
"webpack" "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ]
]
} }
} }

View File

@@ -54,7 +54,7 @@ namespace WebApplicationBasic
{ {
var host = new WebHostBuilder() var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.UseIISPlatformHandlerUrl() .UseIISIntegration()
.UseKestrel() .UseKestrel()
.UseStartup<Startup>() .UseStartup<Startup>()
.Build(); .Build();

View File

@@ -1,17 +1,23 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"compilationOptions": { "buildOptions": {
"emitEntryPoint": true, "emitEntryPoint": true,
"warningsAsErrors": true,
"preserveCompilationContext": true "preserveCompilationContext": true
}, },
"runtimeOptions": {
"gcServer": true
},
"tooling": { "tooling": {
"defaultNamespace": "WebApplicationBasic" "defaultNamespace": "WebApplicationBasic"
}, },
"dependencies": { "dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-rc2-*",
"type": "platform"
},
"Microsoft.AspNetCore.Diagnostics": "1.0.0-*", "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": "1.0.0-*",
"Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.0-*", "Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
@@ -22,43 +28,29 @@
"Microsoft.Extensions.Logging.Debug": "1.0.0-*", "Microsoft.Extensions.Logging.Debug": "1.0.0-*",
"Microsoft.AspNetCore.ReactServices": "1.0.0-*" "Microsoft.AspNetCore.ReactServices": "1.0.0-*"
}, },
"commands": {
"web": "Microsoft.AspNetCore.Server.Kestrel"
},
"frameworks": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {
"imports": [ "imports": [
"dotnet5.6",
"dnxcore50", "dnxcore50",
"portable-net451+win8" "portable-net45+win8"
], ]
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
}
}
} }
}, },
"publishOptions": {
"exclude": [ "exclude": [
"wwwroot",
"node_modules"
],
"publishExclude": [
"node_modules", "node_modules",
"**.xproj", "**.xproj",
"**.user", "**.user",
"**.vspscc" "**.vspscc"
], ]
},
"scripts": { "scripts": {
"prepare": [ "prepare": [
"npm install", "npm install",
"webpack --config webpack.config.vendor.js" "webpack --config webpack.config.vendor.js"
], ],
"prepublish": [ "prepublish": [ "webpack" ],
"webpack" "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ]
]
} }
} }

View File

@@ -38,7 +38,7 @@ namespace WebApplicationBasic
{ {
var host = new WebHostBuilder() var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.UseIISPlatformHandlerUrl() .UseIISIntegration()
.UseKestrel() .UseKestrel()
.UseStartup<Startup>() .UseStartup<Startup>()
.Build(); .Build();

View File

@@ -1,17 +1,23 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"compilationOptions": { "buildOptions": {
"emitEntryPoint": true, "emitEntryPoint": true,
"warningsAsErrors": true,
"preserveCompilationContext": true "preserveCompilationContext": true
}, },
"runtimeOptions": {
"gcServer": true
},
"tooling": { "tooling": {
"defaultNamespace": "WebApplicationBasic" "defaultNamespace": "WebApplicationBasic"
}, },
"dependencies": { "dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-rc2-*",
"type": "platform"
},
"Microsoft.AspNetCore.Diagnostics": "1.0.0-*", "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": "1.0.0-*",
"Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.0-*", "Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
@@ -21,41 +27,29 @@
"Microsoft.NETCore.Platforms": "1.0.1-*", "Microsoft.NETCore.Platforms": "1.0.1-*",
"Microsoft.Extensions.Logging.Debug": "1.0.0-*" "Microsoft.Extensions.Logging.Debug": "1.0.0-*"
}, },
"commands": {
"web": "Microsoft.AspNetCore.Server.Kestrel"
},
"frameworks": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {
"imports": [ "imports": [
"dotnet5.6",
"dnxcore50", "dnxcore50",
"portable-net451+win8" "portable-net45+win8"
], ]
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
}
}
} }
}, },
"publishOptions": {
"exclude": [ "exclude": [
"wwwroot",
"node_modules"
],
"publishExclude": [
"node_modules", "node_modules",
"**.xproj", "**.xproj",
"**.user", "**.user",
"**.vspscc" "**.vspscc"
], ]
},
"scripts": { "scripts": {
"prepare": [ "prepare": [
"npm install", "npm install",
"webpack --config webpack.config.vendor.js", "webpack --config webpack.config.vendor.js",
"webpack" "webpack"
] ],
"postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ]
} }
} }