Skip to content

Commit 1468db1

Browse files
SteveSandersonMSSteveSandersonMS
committed
Update KnockoutSpa template to RC2
1 parent 6a2a3d9 commit 1468db1

File tree

5 files changed

+47
-54
lines changed

5 files changed

+47
-54
lines changed

‎templates/KnockoutSpa/Controllers/HomeController.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using System.Collections.Generic;
33
using System.Linq;
44
using System.Threading.Tasks;
5-
using Microsoft.AspNet.Mvc;
5+
using Microsoft.AspNetCore.Mvc;
66

77
namespace WebApplicationBasic.Controllers
88
{

‎templates/KnockoutSpa/Controllers/SampleDataController.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using System.Collections.Generic;
33
using System.Linq;
44
using System.Threading.Tasks;
5-
using Microsoft.AspNet.Mvc;
5+
using Microsoft.AspNetCore.Mvc;
66

77
namespace WebApplicationBasic.Controllers
88
{

‎templates/KnockoutSpa/Startup.cs‎

Lines changed: 21 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
using System;
22
using System.Collections.Generic;
3+
using System.IO;
34
using System.Linq;
45
using System.Threading.Tasks;
5-
using Microsoft.AspNet.Builder;
6-
using Microsoft.AspNet.Hosting;
6+
using Microsoft.AspNetCore.Builder;
7+
using Microsoft.AspNetCore.Hosting;
8+
using Microsoft.AspNetCore.Http;
79
using Microsoft.AspNet.SpaServices.Webpack;
8-
using Microsoft.Extensions.Configuration;
910
using Microsoft.Extensions.DependencyInjection;
1011
using Microsoft.Extensions.Logging;
1112
using Newtonsoft.Json.Serialization;
@@ -14,54 +15,28 @@ namespace WebApplicationBasic
1415
{
1516
public class Startup
1617
{
17-
public Startup(IHostingEnvironment env)
18-
{
19-
// Set up configuration sources.
20-
var builder = new ConfigurationBuilder()
21-
.AddJsonFile("appsettings.json")
22-
.AddEnvironmentVariables();
23-
Configuration = builder.Build();
24-
}
25-
26-
public IConfigurationRoot Configuration { get; set; }
27-
2818
// This method gets called by the runtime. Use this method to add services to the container.
2919
public void ConfigureServices(IServiceCollection services)
3020
{
31-
// Add framework services.
3221
services.AddMvc().AddJsonOptions(options =>
3322
{
3423
options.SerializerSettings.ContractResolver = new CamelCasePropertyNamesContractResolver();
3524
});
3625
}
3726

3827
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
39-
public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory)
28+
public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory, IHostingEnvironment env)
4029
{
41-
loggerFactory.AddConsole(Configuration.GetSection("Logging"));
42-
loggerFactory.AddDebug();
30+
app.UseDeveloperExceptionPage();
4331

44-
if (env.IsDevelopment())
45-
{
46-
app.UseDeveloperExceptionPage();
47-
}
48-
else
49-
{
50-
app.UseExceptionHandler("/Home/Error");
51-
}
52-
53-
app.UseIISPlatformHandler();
54-
55-
if (env.IsDevelopment())
56-
{
57-
app.UseWebpackDevMiddleware(new WebpackDevMiddlewareOptions
58-
{
32+
if (env.IsDevelopment()) {
33+
app.UseWebpackDevMiddleware(new WebpackDevMiddlewareOptions {
5934
HotModuleReplacement = true
6035
});
6136
}
6237

6338
app.UseStaticFiles();
64-
39+
loggerFactory.AddConsole();
6540
app.UseMvc(routes =>
6641
{
6742
routes.MapRoute(
@@ -74,7 +49,17 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
7449
});
7550
}
7651

77-
// Entry point for the application.
78-
public static void Main(string[] args) => Microsoft.AspNet.Hosting.WebApplication.Run<Startup>(args);
52+
public static void Main(string[] args)
53+
{
54+
var host = new WebHostBuilder()
55+
.UseContentRoot(Directory.GetCurrentDirectory())
56+
.UseDefaultHostingConfiguration(args)
57+
.UseIISPlatformHandlerUrl()
58+
.UseKestrel()
59+
.UseStartup<Startup>()
60+
.Build();
61+
62+
host.Run();
63+
}
7964
}
8065
}

‎templates/KnockoutSpa/Views/_ViewImports.cshtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
@using WebApplicationBasic
2-
@addTagHelper "*, Microsoft.AspNet.Mvc.TagHelpers"
2+
@addTagHelper "*, Microsoft.AspNetCore.Mvc.TagHelpers"
33
@addTagHelper "*, Microsoft.AspNet.SpaServices"

‎templates/KnockoutSpa/project.json‎

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
{
22
"version": "1.0.0-*",
33
"compilationOptions": {
4-
"emitEntryPoint": true
4+
"emitEntryPoint": true,
5+
"warningsAsErrors": true,
6+
"preserveCompilationContext": true
57
},
68
"tooling": {
79
"defaultNamespace": "WebApplicationBasic"
810
},
911

1012
"dependencies": {
11-
"Microsoft.AspNet.Diagnostics": "1.0.0-rc1-final",
12-
"Microsoft.AspNet.IISPlatformHandler": "1.0.0-rc1-final",
13-
"Microsoft.AspNet.Mvc": "6.0.0-rc1-final",
14-
"Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-rc1-final",
15-
"Microsoft.AspNet.Server.Kestrel": "1.0.0-rc1-final",
16-
"Microsoft.AspNet.StaticFiles": "1.0.0-rc1-final",
17-
"Microsoft.AspNet.Tooling.Razor": "1.0.0-rc1-final",
18-
"Microsoft.Extensions.Configuration.FileProviderExtensions" : "1.0.0-rc1-final",
19-
"Microsoft.Extensions.Configuration.Json": "1.0.0-rc1-final",
20-
"Microsoft.Extensions.Logging": "1.0.0-rc1-final",
21-
"Microsoft.Extensions.Logging.Console": "1.0.0-rc1-final",
22-
"Microsoft.Extensions.Logging.Debug": "1.0.0-rc1-final",
13+
"Microsoft.AspNetCore.Diagnostics": "1.0.0-*",
14+
"Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*",
15+
"Microsoft.AspNetCore.Mvc": "1.0.0-*",
16+
"Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.0-*",
17+
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
18+
"Microsoft.AspNetCore.StaticFiles": "1.0.0-*",
19+
"Microsoft.Extensions.Configuration.Json": "1.0.0-*",
20+
"Microsoft.Extensions.Logging.Console": "1.0.0-*",
21+
"Microsoft.NETCore.Platforms": "1.0.1-*",
22+
"Microsoft.Extensions.Logging.Debug": "1.0.0-*",
2323
"Microsoft.AspNet.SpaServices": "1.0.0-*"
2424
},
2525

@@ -29,12 +29,20 @@
2929

3030
"frameworks": {
3131
"dnx451": {},
32-
"dnxcore50": {}
32+
"netstandardapp1.5": {
33+
"imports": [
34+
"dnxcore50",
35+
"portable-net451+win8"
36+
],
37+
"dependencies": {
38+
"NETStandard.Library": "1.5.0-*"
39+
}
40+
}
3341
},
3442

3543
"exclude": [
3644
"wwwroot",
37-
"node_modules",
45+
"node_modules"
3846
],
3947
"publishExclude": [
4048
"node_modules",

0 commit comments

Comments
 (0)