diff --git a/samples/HelloMvc/Startup.cs b/samples/HelloMvc/Startup.cs index eb17e8a18c..12be6b73e0 100644 --- a/samples/HelloMvc/Startup.cs +++ b/samples/HelloMvc/Startup.cs @@ -18,6 +18,6 @@ namespace HelloMvc app.UseMvc(); app.UseWelcomePage(); - } + } } } \ No newline at end of file diff --git a/samples/HelloMvc/project.json b/samples/HelloMvc/project.json index 36082d31f8..53e199d80b 100644 --- a/samples/HelloMvc/project.json +++ b/samples/HelloMvc/project.json @@ -1,17 +1,28 @@ { + "version": "1.0.0-*", + "webroot": "wwwroot", + "exclude": [ + "wwwroot" + ], + "packExclude": [ + "**.kproj", + "**.user", + "**.vspscc" + ], "dependencies": { "Kestrel": "1.0.0-*", "Microsoft.AspNet.Diagnostics": "1.0.0-*", "Microsoft.AspNet.Hosting": "1.0.0-*", "Microsoft.AspNet.Mvc": "6.0.0-*", + "Microsoft.AspNet.Server.IIS": "1.0.0-*", "Microsoft.AspNet.Server.WebListener": "1.0.0-*" }, "commands": { "web": "Microsoft.AspNet.Hosting --server Microsoft.AspNet.Server.WebListener --server.urls http://localhost:5001", "kestrel": "Microsoft.AspNet.Hosting --server Kestrel --server.urls http://localhost:5004" }, - "frameworks": { - "aspnet50": { }, - "aspnetcore50": { } + "frameworks": { + "aspnet50": { }, + "aspnetcore50": { } } } \ No newline at end of file diff --git a/samples/HelloWeb/image.jpg b/samples/HelloMvc/wwwroot/image.jpg similarity index 100% rename from samples/HelloWeb/image.jpg rename to samples/HelloMvc/wwwroot/image.jpg diff --git a/samples/HelloWeb/Startup.cs b/samples/HelloWeb/Startup.cs index b41f459f03..9ec77bc12c 100644 --- a/samples/HelloWeb/Startup.cs +++ b/samples/HelloWeb/Startup.cs @@ -1,6 +1,6 @@ using Microsoft.AspNet.Builder; -namespace KWebStartup +namespace HelloWeb { public class Startup { diff --git a/samples/HelloWeb/project.json b/samples/HelloWeb/project.json index 583d9546b5..a65c854fd4 100644 --- a/samples/HelloWeb/project.json +++ b/samples/HelloWeb/project.json @@ -1,8 +1,19 @@ { + "version": "1.0.0-*", + "webroot": "wwwroot", + "exclude": [ + "wwwroot" + ], + "packExclude": [ + "**.kproj", + "**.user", + "**.vspscc" + ], "dependencies": { "Kestrel": "1.0.0-*", "Microsoft.AspNet.Diagnostics": "1.0.0-*", "Microsoft.AspNet.Hosting": "1.0.0-*", + "Microsoft.AspNet.Server.IIS": "1.0.0-*", "Microsoft.AspNet.Server.WebListener": "1.0.0-*", "Microsoft.AspNet.StaticFiles": "1.0.0-*" }, @@ -11,7 +22,7 @@ "kestrel": "Microsoft.AspNet.Hosting --server Kestrel --server.urls http://localhost:5004" }, "frameworks": { - "aspnet50": { }, - "aspnetcore50": { } + "aspnet50": { }, + "aspnetcore50": { } } } \ No newline at end of file diff --git a/samples/HelloWeb/wwwroot/image.jpg b/samples/HelloWeb/wwwroot/image.jpg new file mode 100644 index 0000000000..899595259f Binary files /dev/null and b/samples/HelloWeb/wwwroot/image.jpg differ