diff --git a/.gitignore b/.gitignore index 06f27ae6cdbd..40e0db6460d0 100644 --- a/.gitignore +++ b/.gitignore @@ -196,5 +196,7 @@ FakesAssemblies/ # Visual Studio 6 workspace options file *.opt + samples/MigratingFromMvc5/NewMvc6Project/src/NewMvc6Project/wwwroot/lib/ samples/AngularSample/src/AngularSample/wwwroot/lib +project.lock.json diff --git a/docs/fundamentals/diagnostics/sample/src/DiagDemo/Properties/launchSettings.json b/docs/fundamentals/diagnostics/sample/src/DiagDemo/Properties/launchSettings.json index 75bd5fe4c1aa..df23b09209ac 100644 --- a/docs/fundamentals/diagnostics/sample/src/DiagDemo/Properties/launchSettings.json +++ b/docs/fundamentals/diagnostics/sample/src/DiagDemo/Properties/launchSettings.json @@ -9,12 +9,16 @@ }, "kestrel": { "commandName": "kestrel", + "launchBrowser": true, + "launchUrl": "http://localhost:12333", "environmentVariables": { "ASPNET_ENV": "Development" } }, "web": { "commandName": "web", + "launchBrowser": true, + "launchUrl": "http://localhost:12334", "environmentVariables": { "ASPNET_ENV": "Development" } diff --git a/docs/fundamentals/diagnostics/sample/src/DiagDemo/project.json b/docs/fundamentals/diagnostics/sample/src/DiagDemo/project.json index bb4331fd8763..6e84e0bbb78d 100644 --- a/docs/fundamentals/diagnostics/sample/src/DiagDemo/project.json +++ b/docs/fundamentals/diagnostics/sample/src/DiagDemo/project.json @@ -10,13 +10,13 @@ }, "commands": { - "web": "Microsoft.AspNet.Hosting --server Microsoft.AspNet.Server.WebListener --server.urls http://localhost:5000", - "kestrel": "Microsoft.AspNet.Hosting --server Kestrel --server.urls http://localhost:12344" + "web": "Microsoft.AspNet.Hosting --server Microsoft.AspNet.Server.WebListener --server.urls http://localhost:12334", + "kestrel": "Microsoft.AspNet.Hosting --server Kestrel --server.urls http://localhost:12333" }, "frameworks": { - "dnx451": { }/*, - "dnxcore50": { }*/ + "dnx451": { }, + "dnxcore50": { } }, "publishExclude": [