diff --git a/samples/1.0.0-beta8/ConsoleApp/project.json b/samples/1.0.0-beta8/ConsoleApp/project.json index 6520838763..e4f2ddc361 100644 --- a/samples/1.0.0-beta8/ConsoleApp/project.json +++ b/samples/1.0.0-beta8/ConsoleApp/project.json @@ -9,7 +9,7 @@ "dnx451": { }, "dnxcore50": { "dependencies": { - "System.Console": "4.0.0-beta-beta8" + "System.Console": "4.0.0-beta-23409" } } } diff --git a/samples/1.0.0-beta8/HelloMvc/Dockerfile b/samples/1.0.0-beta8/HelloMvc/Dockerfile index d8528bbf3b..081a826eac 100644 --- a/samples/1.0.0-beta8/HelloMvc/Dockerfile +++ b/samples/1.0.0-beta8/HelloMvc/Dockerfile @@ -1,9 +1,8 @@ FROM microsoft/aspnet:1.0.0-beta8 -COPY project.json /app/ +COPY . /app./ WORKDIR /app RUN ["dnu", "restore"] -COPY . /app EXPOSE 5004 ENTRYPOINT ["dnx", "-p", "project.json", "kestrel"] diff --git a/samples/1.0.0-beta8/HelloMvc/Properties/launchSettings.json b/samples/1.0.0-beta8/HelloMvc/Properties/launchSettings.json index eccc5ae1c1..d800b7c8bf 100644 --- a/samples/1.0.0-beta8/HelloMvc/Properties/launchSettings.json +++ b/samples/1.0.0-beta8/HelloMvc/Properties/launchSettings.json @@ -7,15 +7,10 @@ "ASPNET_ENV": "Development" } }, - "kestrel": { - "commandName": "kestrel", - "launchBrowser": true, - "launchUrl": "http://localhost:5004" - }, "web": { "commandName": "web", "launchBrowser": true, - "launchUrl": "http://localhost:5001" + "launchUrl": "http://localhost:5004" } } } \ No newline at end of file diff --git a/samples/1.0.0-beta8/HelloMvc/Startup.cs b/samples/1.0.0-beta8/HelloMvc/Startup.cs index 67aa27d7a0..acd3e85b6a 100644 --- a/samples/1.0.0-beta8/HelloMvc/Startup.cs +++ b/samples/1.0.0-beta8/HelloMvc/Startup.cs @@ -15,6 +15,8 @@ namespace HelloMvc { loggerFactory.AddConsole(); + app.UseIISPlatformHandler(); + app.UseDeveloperExceptionPage(); app.UseMvcWithDefaultRoute(); diff --git a/samples/1.0.0-beta8/HelloMvc/project.json b/samples/1.0.0-beta8/HelloMvc/project.json index 099b66ac13..c5f3c683cd 100644 --- a/samples/1.0.0-beta8/HelloMvc/project.json +++ b/samples/1.0.0-beta8/HelloMvc/project.json @@ -11,14 +11,14 @@ ], "dependencies": { "Microsoft.AspNet.Server.Kestrel": "1.0.0-beta8", + "Microsoft.AspNet.IISPlatformHandler": "1.0.0-beta8", "Microsoft.AspNet.Diagnostics": "1.0.0-beta8", "Microsoft.AspNet.Mvc": "6.0.0-beta8", "Microsoft.AspNet.Server.WebListener": "1.0.0-beta8", "Microsoft.Framework.Logging.Console": "1.0.0-beta8" }, "commands": { - "web": "Microsoft.AspNet.Hosting --server Microsoft.AspNet.Server.WebListener --server.urls http://localhost:5001", - "kestrel": "Microsoft.AspNet.Hosting --server Microsoft.AspNet.Server.Kestrel --server.urls http://*:5004" + "web": "Microsoft.AspNet.Server.Kestrel --server.urls http://localhost:5004" }, "frameworks": { "dnx451": { }, diff --git a/samples/1.0.0-beta8/HelloWeb/Dockerfile b/samples/1.0.0-beta8/HelloWeb/Dockerfile index d8528bbf3b..081a826eac 100644 --- a/samples/1.0.0-beta8/HelloWeb/Dockerfile +++ b/samples/1.0.0-beta8/HelloWeb/Dockerfile @@ -1,9 +1,8 @@ FROM microsoft/aspnet:1.0.0-beta8 -COPY project.json /app/ +COPY . /app./ WORKDIR /app RUN ["dnu", "restore"] -COPY . /app EXPOSE 5004 ENTRYPOINT ["dnx", "-p", "project.json", "kestrel"] diff --git a/samples/1.0.0-beta8/HelloWeb/Properties/launchSettings.json b/samples/1.0.0-beta8/HelloWeb/Properties/launchSettings.json index eccc5ae1c1..d800b7c8bf 100644 --- a/samples/1.0.0-beta8/HelloWeb/Properties/launchSettings.json +++ b/samples/1.0.0-beta8/HelloWeb/Properties/launchSettings.json @@ -7,15 +7,10 @@ "ASPNET_ENV": "Development" } }, - "kestrel": { - "commandName": "kestrel", - "launchBrowser": true, - "launchUrl": "http://localhost:5004" - }, "web": { "commandName": "web", "launchBrowser": true, - "launchUrl": "http://localhost:5001" + "launchUrl": "http://localhost:5004" } } } \ No newline at end of file diff --git a/samples/1.0.0-beta8/HelloWeb/Startup.cs b/samples/1.0.0-beta8/HelloWeb/Startup.cs index 76bfac0acb..a432f949fb 100644 --- a/samples/1.0.0-beta8/HelloWeb/Startup.cs +++ b/samples/1.0.0-beta8/HelloWeb/Startup.cs @@ -8,6 +8,7 @@ namespace HelloWeb public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) { loggerFactory.AddConsole(); + app.UseIISPlatformHandler(); app.UseStaticFiles(); app.UseWelcomePage(); } diff --git a/samples/1.0.0-beta8/HelloWeb/project.json b/samples/1.0.0-beta8/HelloWeb/project.json index 603aeb83fd..4133db2834 100644 --- a/samples/1.0.0-beta8/HelloWeb/project.json +++ b/samples/1.0.0-beta8/HelloWeb/project.json @@ -11,14 +11,14 @@ ], "dependencies": { "Microsoft.AspNet.Server.Kestrel": "1.0.0-beta8", + "Microsoft.AspNet.IISPlatformHandler": "1.0.0-beta8", "Microsoft.AspNet.Diagnostics": "1.0.0-beta8", "Microsoft.AspNet.Hosting": "1.0.0-beta8", "Microsoft.AspNet.StaticFiles": "1.0.0-beta8", "Microsoft.Framework.Logging.Console": "1.0.0-beta8" }, "commands": { - "web": "Microsoft.AspNet.Hosting --server Microsoft.AspNet.Server.WebListener --server.urls http://localhost:5001", - "kestrel": "Microsoft.AspNet.Hosting --server Microsoft.AspNet.Server.Kestrel --server.urls http://*:5004" + "web": "Microsoft.AspNet.Server.Kestrel --server.urls http://localhost:5004" }, "frameworks": { "dnx451": { }, diff --git a/samples/1.0.0-rc1/ConsoleApp/ConsoleApp.xproj b/samples/1.0.0-rc1/ConsoleApp/ConsoleApp.xproj new file mode 100644 index 0000000000..a7330acb5e --- /dev/null +++ b/samples/1.0.0-rc1/ConsoleApp/ConsoleApp.xproj @@ -0,0 +1,17 @@ + + + + 14.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + d4f684c8-b6a4-45f0-aca0-0d95632ff946 + ..\..\artifacts\obj\$(MSBuildProjectName) + ..\..\artifacts\bin\$(MSBuildProjectName)\ + + + 2.0 + + + \ No newline at end of file diff --git a/samples/1.0.0-rc1/ConsoleApp/Program.cs b/samples/1.0.0-rc1/ConsoleApp/Program.cs new file mode 100644 index 0000000000..7ee7ee1dc5 --- /dev/null +++ b/samples/1.0.0-rc1/ConsoleApp/Program.cs @@ -0,0 +1,9 @@ +using System; + +public class Program +{ + public static void Main() + { + Console.WriteLine("Hello World"); + } +} diff --git a/samples/1.0.0-rc1/ConsoleApp/project.json b/samples/1.0.0-rc1/ConsoleApp/project.json new file mode 100644 index 0000000000..3fe7770650 --- /dev/null +++ b/samples/1.0.0-rc1/ConsoleApp/project.json @@ -0,0 +1,16 @@ +{ + "dependencies": { + + }, + "commands": { + "ConsoleApp": "ConsoleApp" + }, + "frameworks": { + "dnx451": { }, + "dnxcore50": { + "dependencies": { + "System.Console": "4.0.0-beta-23516" + } + } + } +} diff --git a/samples/1.0.0-rc1/HelloMvc/Controllers/HomeController.cs b/samples/1.0.0-rc1/HelloMvc/Controllers/HomeController.cs new file mode 100644 index 0000000000..b05b713929 --- /dev/null +++ b/samples/1.0.0-rc1/HelloMvc/Controllers/HomeController.cs @@ -0,0 +1,24 @@ +using Microsoft.AspNet.Mvc; +using MvcSample.Web.Models; + +namespace MvcSample.Web +{ + public class HomeController : Controller + { + public IActionResult Index() + { + return View(CreateUser()); + } + + public User CreateUser() + { + User user = new User() + { + Name = "My name", + Address = "My address" + }; + + return user; + } + } +} \ No newline at end of file diff --git a/samples/1.0.0-rc1/HelloMvc/Dockerfile b/samples/1.0.0-rc1/HelloMvc/Dockerfile new file mode 100644 index 0000000000..275775b705 --- /dev/null +++ b/samples/1.0.0-rc1/HelloMvc/Dockerfile @@ -0,0 +1,8 @@ +FROM microsoft/aspnet:1.0.0-rc1-final + +COPY . /app./ +WORKDIR /app +RUN ["dnu", "restore"] + +EXPOSE 5004 +ENTRYPOINT ["dnx", "-p", "project.json", "kestrel"] diff --git a/samples/1.0.0-rc1/HelloMvc/HelloMvc.xproj b/samples/1.0.0-rc1/HelloMvc/HelloMvc.xproj new file mode 100644 index 0000000000..37ce6abf15 --- /dev/null +++ b/samples/1.0.0-rc1/HelloMvc/HelloMvc.xproj @@ -0,0 +1,18 @@ + + + + 14.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + 78627bb3-851e-4c1a-91c0-629fc7c15f8f + ..\..\artifacts\obj\$(MSBuildProjectName) + ..\..\artifacts\bin\$(MSBuildProjectName)\ + + + 2.0 + 26425 + + + \ No newline at end of file diff --git a/samples/1.0.0-rc1/HelloMvc/Models/User.cs b/samples/1.0.0-rc1/HelloMvc/Models/User.cs new file mode 100644 index 0000000000..9869e92d13 --- /dev/null +++ b/samples/1.0.0-rc1/HelloMvc/Models/User.cs @@ -0,0 +1,13 @@ +using System.ComponentModel.DataAnnotations; + +namespace MvcSample.Web.Models +{ + public class User + { + [Required] + [MinLength(4)] + public string Name { get; set; } + public string Address { get; set; } + public int Age { get; set; } + } +} \ No newline at end of file diff --git a/samples/1.0.0-rc1/HelloMvc/NuGet.config b/samples/1.0.0-rc1/HelloMvc/NuGet.config new file mode 100644 index 0000000000..d2e1f206a0 --- /dev/null +++ b/samples/1.0.0-rc1/HelloMvc/NuGet.config @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/samples/1.0.0-rc1/HelloMvc/Properties/launchSettings.json b/samples/1.0.0-rc1/HelloMvc/Properties/launchSettings.json new file mode 100644 index 0000000000..d800b7c8bf --- /dev/null +++ b/samples/1.0.0-rc1/HelloMvc/Properties/launchSettings.json @@ -0,0 +1,16 @@ +{ + "profiles": { + "IIS Express": { + "commandName": "IISExpress", + "launchBrowser": true, + "environmentVariables": { + "ASPNET_ENV": "Development" + } + }, + "web": { + "commandName": "web", + "launchBrowser": true, + "launchUrl": "http://localhost:5004" + } + } +} \ No newline at end of file diff --git a/samples/1.0.0-rc1/HelloMvc/Startup.cs b/samples/1.0.0-rc1/HelloMvc/Startup.cs new file mode 100644 index 0000000000..0dda2be962 --- /dev/null +++ b/samples/1.0.0-rc1/HelloMvc/Startup.cs @@ -0,0 +1,27 @@ +using Microsoft.AspNet.Builder; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; + +namespace HelloMvc +{ + public class Startup + { + public void ConfigureServices(IServiceCollection services) + { + services.AddMvc(); + } + + public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) + { + loggerFactory.AddConsole(); + + app.UseIISPlatformHandler(); + + app.UseDeveloperExceptionPage(); + + app.UseMvcWithDefaultRoute(); + + app.UseWelcomePage(); + } + } +} \ No newline at end of file diff --git a/samples/1.0.0-rc1/HelloMvc/Views/Home/Index.cshtml b/samples/1.0.0-rc1/HelloMvc/Views/Home/Index.cshtml new file mode 100644 index 0000000000..b786e64b5e --- /dev/null +++ b/samples/1.0.0-rc1/HelloMvc/Views/Home/Index.cshtml @@ -0,0 +1,16 @@ +@using MvcSample.Web.Models +@model User +@{ + Layout = "/Views/Shared/_Layout.cshtml"; + ViewBag.Title = "Home Page"; + string helloClass = null; +} + +
+

ASP.NET

+

ASP.NET is a free web framework for building great Web sites and Web applications using HTML, CSS and JavaScript.

+

Learn more »

+
+
+

Hello @Model.Name!

+
diff --git a/samples/1.0.0-rc1/HelloMvc/Views/Shared/_Layout.cshtml b/samples/1.0.0-rc1/HelloMvc/Views/Shared/_Layout.cshtml new file mode 100644 index 0000000000..3377694bed --- /dev/null +++ b/samples/1.0.0-rc1/HelloMvc/Views/Shared/_Layout.cshtml @@ -0,0 +1,40 @@ + + + + + + @ViewBag.Title - My ASP.NET Application + + + +
+
+
+ +
+
+ +
+
+
+
+ @RenderBody() +
+
+ @if (@Model != null) + { + @Model.Address + } +
+ +
+ + diff --git a/samples/1.0.0-rc1/HelloMvc/project.json b/samples/1.0.0-rc1/HelloMvc/project.json new file mode 100644 index 0000000000..f8f1af14b1 --- /dev/null +++ b/samples/1.0.0-rc1/HelloMvc/project.json @@ -0,0 +1,26 @@ +{ + "version": "1.0.0-*", + "webroot": "wwwroot", + "exclude": [ + "wwwroot" + ], + "packExclude": [ + "**.kproj", + "**.user", + "**.vspscc" + ], + "dependencies": { + "Microsoft.AspNet.Server.Kestrel": "1.0.0-rc1-final", + "Microsoft.AspNet.IISPlatformHandler": "1.0.0-rc1-final", + "Microsoft.AspNet.Diagnostics": "1.0.0-rc1-final", + "Microsoft.AspNet.Mvc": "6.0.0-rc1-final", + "Microsoft.Framework.Logging.Console": "1.0.0-rc1-final" + }, + "commands": { + "web": "Microsoft.AspNet.Server.Kestrel --server.urls http://localhost:5004" + }, + "frameworks": { + "dnx451": { }, + "dnxcore50": { } + } +} diff --git a/samples/1.0.0-rc1/HelloMvc/wwwroot/image.jpg b/samples/1.0.0-rc1/HelloMvc/wwwroot/image.jpg new file mode 100644 index 0000000000..899595259f Binary files /dev/null and b/samples/1.0.0-rc1/HelloMvc/wwwroot/image.jpg differ diff --git a/samples/1.0.0-rc1/HelloWeb/Dockerfile b/samples/1.0.0-rc1/HelloWeb/Dockerfile new file mode 100644 index 0000000000..275775b705 --- /dev/null +++ b/samples/1.0.0-rc1/HelloWeb/Dockerfile @@ -0,0 +1,8 @@ +FROM microsoft/aspnet:1.0.0-rc1-final + +COPY . /app./ +WORKDIR /app +RUN ["dnu", "restore"] + +EXPOSE 5004 +ENTRYPOINT ["dnx", "-p", "project.json", "kestrel"] diff --git a/samples/1.0.0-rc1/HelloWeb/HelloWeb.xproj b/samples/1.0.0-rc1/HelloWeb/HelloWeb.xproj new file mode 100644 index 0000000000..130b1d14d3 --- /dev/null +++ b/samples/1.0.0-rc1/HelloWeb/HelloWeb.xproj @@ -0,0 +1,18 @@ + + + + 14.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + 8d4b2ab5-c2d2-4ee0-b751-f4126c7d0539 + ..\..\artifacts\obj\$(MSBuildProjectName) + ..\..\artifacts\bin\$(MSBuildProjectName)\ + + + 2.0 + 26235 + + + \ No newline at end of file diff --git a/samples/1.0.0-rc1/HelloWeb/NuGet.config b/samples/1.0.0-rc1/HelloWeb/NuGet.config new file mode 100644 index 0000000000..d2e1f206a0 --- /dev/null +++ b/samples/1.0.0-rc1/HelloWeb/NuGet.config @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/samples/1.0.0-rc1/HelloWeb/Properties/launchSettings.json b/samples/1.0.0-rc1/HelloWeb/Properties/launchSettings.json new file mode 100644 index 0000000000..d800b7c8bf --- /dev/null +++ b/samples/1.0.0-rc1/HelloWeb/Properties/launchSettings.json @@ -0,0 +1,16 @@ +{ + "profiles": { + "IIS Express": { + "commandName": "IISExpress", + "launchBrowser": true, + "environmentVariables": { + "ASPNET_ENV": "Development" + } + }, + "web": { + "commandName": "web", + "launchBrowser": true, + "launchUrl": "http://localhost:5004" + } + } +} \ No newline at end of file diff --git a/samples/1.0.0-rc1/HelloWeb/Startup.cs b/samples/1.0.0-rc1/HelloWeb/Startup.cs new file mode 100644 index 0000000000..a10e96cf90 --- /dev/null +++ b/samples/1.0.0-rc1/HelloWeb/Startup.cs @@ -0,0 +1,16 @@ +using Microsoft.AspNet.Builder; +using Microsoft.Extensions.Logging; + +namespace HelloWeb +{ + public class Startup + { + public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) + { + loggerFactory.AddConsole(); + app.UseIISPlatformHandler(); + app.UseStaticFiles(); + app.UseWelcomePage(); + } + } +} \ No newline at end of file diff --git a/samples/1.0.0-rc1/HelloWeb/project.json b/samples/1.0.0-rc1/HelloWeb/project.json new file mode 100644 index 0000000000..8b49efb761 --- /dev/null +++ b/samples/1.0.0-rc1/HelloWeb/project.json @@ -0,0 +1,27 @@ +{ + "version": "1.0.0-*", + "webroot": "wwwroot", + "exclude": [ + "wwwroot" + ], + "packExclude": [ + "**.kproj", + "**.user", + "**.vspscc" + ], + "dependencies": { + "Microsoft.AspNet.Server.Kestrel": "1.0.0-rc1-final", + "Microsoft.AspNet.IISPlatformHandler": "1.0.0-rc1-final", + "Microsoft.AspNet.Diagnostics": "1.0.0-rc1-final", + "Microsoft.AspNet.Hosting": "1.0.0-rc1-final", + "Microsoft.AspNet.StaticFiles": "1.0.0-rc1-final", + "Microsoft.Extensions.Logging.Console": "1.0.0-rc1-final" + }, + "commands": { + "web": "Microsoft.AspNet.Server.Kestrel --server.urls http://localhost:5004" + }, + "frameworks": { + "dnx451": { }, + "dnxcore50": { } + } +} diff --git a/samples/1.0.0-rc1/HelloWeb/wwwroot/image.jpg b/samples/1.0.0-rc1/HelloWeb/wwwroot/image.jpg new file mode 100644 index 0000000000..899595259f Binary files /dev/null and b/samples/1.0.0-rc1/HelloWeb/wwwroot/image.jpg differ diff --git a/samples/1.0.0-rc1/NuGet.Config b/samples/1.0.0-rc1/NuGet.Config new file mode 100644 index 0000000000..d2e1f206a0 --- /dev/null +++ b/samples/1.0.0-rc1/NuGet.Config @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/samples/latest/HelloMvc/Properties/launchSettings.json b/samples/latest/HelloMvc/Properties/launchSettings.json index eccc5ae1c1..d800b7c8bf 100644 --- a/samples/latest/HelloMvc/Properties/launchSettings.json +++ b/samples/latest/HelloMvc/Properties/launchSettings.json @@ -7,15 +7,10 @@ "ASPNET_ENV": "Development" } }, - "kestrel": { - "commandName": "kestrel", - "launchBrowser": true, - "launchUrl": "http://localhost:5004" - }, "web": { "commandName": "web", "launchBrowser": true, - "launchUrl": "http://localhost:5001" + "launchUrl": "http://localhost:5004" } } } \ No newline at end of file diff --git a/samples/latest/HelloMvc/Startup.cs b/samples/latest/HelloMvc/Startup.cs index 67aa27d7a0..0dda2be962 100644 --- a/samples/latest/HelloMvc/Startup.cs +++ b/samples/latest/HelloMvc/Startup.cs @@ -1,6 +1,6 @@ using Microsoft.AspNet.Builder; -using Microsoft.Framework.DependencyInjection; -using Microsoft.Framework.Logging; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; namespace HelloMvc { @@ -15,6 +15,8 @@ namespace HelloMvc { loggerFactory.AddConsole(); + app.UseIISPlatformHandler(); + app.UseDeveloperExceptionPage(); app.UseMvcWithDefaultRoute(); diff --git a/samples/latest/HelloMvc/project.json b/samples/latest/HelloMvc/project.json index 6b0d4b956e..9ff5bb9799 100644 --- a/samples/latest/HelloMvc/project.json +++ b/samples/latest/HelloMvc/project.json @@ -11,15 +11,13 @@ ], "dependencies": { "Microsoft.AspNet.Server.Kestrel": "1.0.0-*", + "Microsoft.AspNet.IISPlatformHandler": "1.0.0-*", "Microsoft.AspNet.Diagnostics": "1.0.0-*", "Microsoft.AspNet.Mvc": "6.0.0-*", - "Microsoft.AspNet.Server.IIS": "1.0.0-*", - "Microsoft.AspNet.Server.WebListener": "1.0.0-*", "Microsoft.Framework.Logging.Console": "1.0.0-*" }, "commands": { - "web": "Microsoft.AspNet.Hosting --server Microsoft.AspNet.Server.WebListener --server.urls http://localhost:5001", - "kestrel": "Microsoft.AspNet.Hosting --server Microsoft.AspNet.Server.Kestrel --server.urls http://*:5004" + "web": "Microsoft.AspNet.Server.Kestrel --server.urls http://localhost:5004" }, "frameworks": { "dnx451": { }, diff --git a/samples/latest/HelloWeb/Properties/launchSettings.json b/samples/latest/HelloWeb/Properties/launchSettings.json index eccc5ae1c1..d800b7c8bf 100644 --- a/samples/latest/HelloWeb/Properties/launchSettings.json +++ b/samples/latest/HelloWeb/Properties/launchSettings.json @@ -7,15 +7,10 @@ "ASPNET_ENV": "Development" } }, - "kestrel": { - "commandName": "kestrel", - "launchBrowser": true, - "launchUrl": "http://localhost:5004" - }, "web": { "commandName": "web", "launchBrowser": true, - "launchUrl": "http://localhost:5001" + "launchUrl": "http://localhost:5004" } } } \ No newline at end of file diff --git a/samples/latest/HelloWeb/Startup.cs b/samples/latest/HelloWeb/Startup.cs index 76bfac0acb..a10e96cf90 100644 --- a/samples/latest/HelloWeb/Startup.cs +++ b/samples/latest/HelloWeb/Startup.cs @@ -1,5 +1,5 @@ using Microsoft.AspNet.Builder; -using Microsoft.Framework.Logging; +using Microsoft.Extensions.Logging; namespace HelloWeb { @@ -8,6 +8,7 @@ namespace HelloWeb public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) { loggerFactory.AddConsole(); + app.UseIISPlatformHandler(); app.UseStaticFiles(); app.UseWelcomePage(); } diff --git a/samples/latest/HelloWeb/project.json b/samples/latest/HelloWeb/project.json index e0ecfcfd7f..5547c1cac0 100644 --- a/samples/latest/HelloWeb/project.json +++ b/samples/latest/HelloWeb/project.json @@ -11,16 +11,14 @@ ], "dependencies": { "Microsoft.AspNet.Server.Kestrel": "1.0.0-*", + "Microsoft.AspNet.IISPlatformHandler": "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-*", - "Microsoft.Framework.Logging.Console": "1.0.0-*" + "Microsoft.Extensions.Logging.Console": "1.0.0-*" }, "commands": { - "web": "Microsoft.AspNet.Hosting --server Microsoft.AspNet.Server.WebListener --server.urls http://localhost:5001", - "kestrel": "Microsoft.AspNet.Hosting --server Microsoft.AspNet.Server.Kestrel --server.urls http://*:5004" + "web": "Microsoft.AspNet.Server.Kestrel --server.urls http://localhost:5004" }, "frameworks": { "dnx451": { },