diff --git a/samples/1.0.0-beta8/ConsoleApp/ConsoleApp.xproj b/samples/1.0.0-beta8/ConsoleApp/ConsoleApp.xproj new file mode 100644 index 000000000000..a7330acb5e2d --- /dev/null +++ b/samples/1.0.0-beta8/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-beta8/ConsoleApp/Program.cs b/samples/1.0.0-beta8/ConsoleApp/Program.cs new file mode 100644 index 000000000000..7ee7ee1dc5e9 --- /dev/null +++ b/samples/1.0.0-beta8/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-beta8/ConsoleApp/project.json b/samples/1.0.0-beta8/ConsoleApp/project.json new file mode 100644 index 000000000000..652083876397 --- /dev/null +++ b/samples/1.0.0-beta8/ConsoleApp/project.json @@ -0,0 +1,16 @@ +{ + "dependencies": { + + }, + "commands": { + "ConsoleApp": "ConsoleApp" + }, + "frameworks": { + "dnx451": { }, + "dnxcore50": { + "dependencies": { + "System.Console": "4.0.0-beta-beta8" + } + } + } +} diff --git a/samples/1.0.0-beta8/HelloMvc/Controllers/HomeController.cs b/samples/1.0.0-beta8/HelloMvc/Controllers/HomeController.cs new file mode 100644 index 000000000000..b05b7139290e --- /dev/null +++ b/samples/1.0.0-beta8/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-beta8/HelloMvc/Dockerfile b/samples/1.0.0-beta8/HelloMvc/Dockerfile new file mode 100644 index 000000000000..d8528bbf3b07 --- /dev/null +++ b/samples/1.0.0-beta8/HelloMvc/Dockerfile @@ -0,0 +1,9 @@ +FROM microsoft/aspnet:1.0.0-beta8 + +COPY project.json /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/HelloMvc.xproj b/samples/1.0.0-beta8/HelloMvc/HelloMvc.xproj new file mode 100644 index 000000000000..37ce6abf1523 --- /dev/null +++ b/samples/1.0.0-beta8/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-beta8/HelloMvc/Models/User.cs b/samples/1.0.0-beta8/HelloMvc/Models/User.cs new file mode 100644 index 000000000000..9869e92d13af --- /dev/null +++ b/samples/1.0.0-beta8/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-beta8/HelloMvc/Properties/launchSettings.json b/samples/1.0.0-beta8/HelloMvc/Properties/launchSettings.json new file mode 100644 index 000000000000..eccc5ae1c125 --- /dev/null +++ b/samples/1.0.0-beta8/HelloMvc/Properties/launchSettings.json @@ -0,0 +1,21 @@ +{ + "profiles": { + "IIS Express": { + "commandName": "IISExpress", + "launchBrowser": true, + "environmentVariables": { + "ASPNET_ENV": "Development" + } + }, + "kestrel": { + "commandName": "kestrel", + "launchBrowser": true, + "launchUrl": "http://localhost:5004" + }, + "web": { + "commandName": "web", + "launchBrowser": true, + "launchUrl": "http://localhost:5001" + } + } +} \ 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 new file mode 100644 index 000000000000..67aa27d7a0f9 --- /dev/null +++ b/samples/1.0.0-beta8/HelloMvc/Startup.cs @@ -0,0 +1,25 @@ +using Microsoft.AspNet.Builder; +using Microsoft.Framework.DependencyInjection; +using Microsoft.Framework.Logging; + +namespace HelloMvc +{ + public class Startup + { + public void ConfigureServices(IServiceCollection services) + { + services.AddMvc(); + } + + public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) + { + loggerFactory.AddConsole(); + + app.UseDeveloperExceptionPage(); + + app.UseMvcWithDefaultRoute(); + + app.UseWelcomePage(); + } + } +} \ No newline at end of file diff --git a/samples/1.0.0-beta8/HelloMvc/Views/Home/Index.cshtml b/samples/1.0.0-beta8/HelloMvc/Views/Home/Index.cshtml new file mode 100644 index 000000000000..b786e64b5e81 --- /dev/null +++ b/samples/1.0.0-beta8/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-beta8/HelloMvc/Views/Shared/_Layout.cshtml b/samples/1.0.0-beta8/HelloMvc/Views/Shared/_Layout.cshtml new file mode 100644 index 000000000000..3377694bed23 --- /dev/null +++ b/samples/1.0.0-beta8/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-beta8/HelloMvc/project.json b/samples/1.0.0-beta8/HelloMvc/project.json new file mode 100644 index 000000000000..099b66ac137c --- /dev/null +++ b/samples/1.0.0-beta8/HelloMvc/project.json @@ -0,0 +1,27 @@ +{ + "version": "1.0.0-beta8", + "webroot": "wwwroot", + "exclude": [ + "wwwroot" + ], + "packExclude": [ + "**.kproj", + "**.user", + "**.vspscc" + ], + "dependencies": { + "Microsoft.AspNet.Server.Kestrel": "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" + }, + "frameworks": { + "dnx451": { }, + "dnxcore50": { } + } +} diff --git a/samples/1.0.0-beta8/HelloMvc/wwwroot/image.jpg b/samples/1.0.0-beta8/HelloMvc/wwwroot/image.jpg new file mode 100644 index 000000000000..899595259f33 Binary files /dev/null and b/samples/1.0.0-beta8/HelloMvc/wwwroot/image.jpg differ diff --git a/samples/1.0.0-beta8/HelloWeb/Dockerfile b/samples/1.0.0-beta8/HelloWeb/Dockerfile new file mode 100644 index 000000000000..d8528bbf3b07 --- /dev/null +++ b/samples/1.0.0-beta8/HelloWeb/Dockerfile @@ -0,0 +1,9 @@ +FROM microsoft/aspnet:1.0.0-beta8 + +COPY project.json /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/HelloWeb.xproj b/samples/1.0.0-beta8/HelloWeb/HelloWeb.xproj new file mode 100644 index 000000000000..130b1d14d341 --- /dev/null +++ b/samples/1.0.0-beta8/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-beta8/HelloWeb/NuGet.Config b/samples/1.0.0-beta8/HelloWeb/NuGet.Config new file mode 100644 index 000000000000..13cc8540001a --- /dev/null +++ b/samples/1.0.0-beta8/HelloWeb/NuGet.Config @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/samples/1.0.0-beta8/HelloWeb/Properties/launchSettings.json b/samples/1.0.0-beta8/HelloWeb/Properties/launchSettings.json new file mode 100644 index 000000000000..eccc5ae1c125 --- /dev/null +++ b/samples/1.0.0-beta8/HelloWeb/Properties/launchSettings.json @@ -0,0 +1,21 @@ +{ + "profiles": { + "IIS Express": { + "commandName": "IISExpress", + "launchBrowser": true, + "environmentVariables": { + "ASPNET_ENV": "Development" + } + }, + "kestrel": { + "commandName": "kestrel", + "launchBrowser": true, + "launchUrl": "http://localhost:5004" + }, + "web": { + "commandName": "web", + "launchBrowser": true, + "launchUrl": "http://localhost:5001" + } + } +} \ 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 new file mode 100644 index 000000000000..76bfac0acb0f --- /dev/null +++ b/samples/1.0.0-beta8/HelloWeb/Startup.cs @@ -0,0 +1,15 @@ +using Microsoft.AspNet.Builder; +using Microsoft.Framework.Logging; + +namespace HelloWeb +{ + public class Startup + { + public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) + { + loggerFactory.AddConsole(); + app.UseStaticFiles(); + app.UseWelcomePage(); + } + } +} \ No newline at end of file diff --git a/samples/1.0.0-beta8/HelloWeb/project.json b/samples/1.0.0-beta8/HelloWeb/project.json new file mode 100644 index 000000000000..603aeb83fd76 --- /dev/null +++ b/samples/1.0.0-beta8/HelloWeb/project.json @@ -0,0 +1,27 @@ +{ + "version": "1.0.0-beta8", + "webroot": "wwwroot", + "exclude": [ + "wwwroot" + ], + "packExclude": [ + "**.kproj", + "**.user", + "**.vspscc" + ], + "dependencies": { + "Microsoft.AspNet.Server.Kestrel": "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" + }, + "frameworks": { + "dnx451": { }, + "dnxcore50": { } + } +} diff --git a/samples/1.0.0-beta8/HelloWeb/wwwroot/image.jpg b/samples/1.0.0-beta8/HelloWeb/wwwroot/image.jpg new file mode 100644 index 000000000000..899595259f33 Binary files /dev/null and b/samples/1.0.0-beta8/HelloWeb/wwwroot/image.jpg differ diff --git a/samples/1.0.0-beta8/NuGet.Config b/samples/1.0.0-beta8/NuGet.Config new file mode 100644 index 000000000000..b63c69bf861c --- /dev/null +++ b/samples/1.0.0-beta8/NuGet.Config @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/samples/latest/HelloMvc/project.json b/samples/latest/HelloMvc/project.json index d2147864dd78..6b0d4b956e70 100644 --- a/samples/latest/HelloMvc/project.json +++ b/samples/latest/HelloMvc/project.json @@ -19,7 +19,7 @@ }, "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://localhost:5004" + "kestrel": "Microsoft.AspNet.Hosting --server Microsoft.AspNet.Server.Kestrel --server.urls http://*:5004" }, "frameworks": { "dnx451": { }, diff --git a/samples/latest/HelloWeb/project.json b/samples/latest/HelloWeb/project.json index be97a952b510..e0ecfcfd7f13 100644 --- a/samples/latest/HelloWeb/project.json +++ b/samples/latest/HelloWeb/project.json @@ -20,7 +20,7 @@ }, "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://localhost:5004" + "kestrel": "Microsoft.AspNet.Hosting --server Microsoft.AspNet.Server.Kestrel --server.urls http://*:5004" }, "frameworks": { "dnx451": { },