From 28319c54fd9db97edaf0e62954289606e96ed79f Mon Sep 17 00:00:00 2001 From: Brendan Enrick Date: Thu, 6 Nov 2014 21:01:38 +0000 Subject: [PATCH] Adding a new MVC6 project --HG-- branch : feature/MVC 6 Reset --- .hgignore | 3 +- .../MvcContrib.Samples.UI.MVC6.kproj | 19 +++ .../Project_Readme.html | 144 ++++++++++++++++++ .../MvcContrib.Samples.UI.MVC6/Startup.cs | 16 ++ .../MvcContrib.Samples.UI.MVC6/project.json | 19 +++ .../MvcContrib.Samples.UI.csproj | 14 +- .../MvcContrib.Samples.UI.sln | 12 +- 7 files changed, 221 insertions(+), 6 deletions(-) create mode 100644 src/Samples/MvcContrib.Samples.UI.MVC6/MvcContrib.Samples.UI.MVC6.kproj create mode 100644 src/Samples/MvcContrib.Samples.UI.MVC6/Project_Readme.html create mode 100644 src/Samples/MvcContrib.Samples.UI.MVC6/Startup.cs create mode 100644 src/Samples/MvcContrib.Samples.UI.MVC6/project.json diff --git a/.hgignore b/.hgignore index c1d23f5..dfab61d 100644 --- a/.hgignore +++ b/.hgignore @@ -12,4 +12,5 @@ _ReSharper* *.cache TestResult.xml *.trx -*.orig \ No newline at end of file +*.orig +*.sln.ide/* diff --git a/src/Samples/MvcContrib.Samples.UI.MVC6/MvcContrib.Samples.UI.MVC6.kproj b/src/Samples/MvcContrib.Samples.UI.MVC6/MvcContrib.Samples.UI.MVC6.kproj new file mode 100644 index 0000000..6755573 --- /dev/null +++ b/src/Samples/MvcContrib.Samples.UI.MVC6/MvcContrib.Samples.UI.MVC6.kproj @@ -0,0 +1,19 @@ + + + + 14.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + 023473c3-8795-420a-b4d4-a1e082c0ed05 + MvcContrib.Samples.UI.MVC6 + ..\MvcContrib.Samples.UI\artifacts\obj\$(MSBuildProjectName) + ..\MvcContrib.Samples.UI\artifacts\bin\$(MSBuildProjectName)\ + + + 2.0 + 1273 + + + \ No newline at end of file diff --git a/src/Samples/MvcContrib.Samples.UI.MVC6/Project_Readme.html b/src/Samples/MvcContrib.Samples.UI.MVC6/Project_Readme.html new file mode 100644 index 0000000..f516423 --- /dev/null +++ b/src/Samples/MvcContrib.Samples.UI.MVC6/Project_Readme.html @@ -0,0 +1,144 @@ + + + + + Your ASP.NET application + + + + + + +
+
+

This application consists of:

+
    +
  • Sample pages showing basic nav between Home, About, and Contact
  • +
  • Theming using Bootstrap
  • +
+
+ + + + + +
+

Get help

+ +
+
+ + + \ No newline at end of file diff --git a/src/Samples/MvcContrib.Samples.UI.MVC6/Startup.cs b/src/Samples/MvcContrib.Samples.UI.MVC6/Startup.cs new file mode 100644 index 0000000..8d63bb2 --- /dev/null +++ b/src/Samples/MvcContrib.Samples.UI.MVC6/Startup.cs @@ -0,0 +1,16 @@ +using Microsoft.AspNet.Builder; +using Microsoft.Framework.DependencyInjection; + +namespace MvcContrib.Samples.UI.MVC6 +{ + public class Startup + { + public void Configure(IApplicationBuilder app) + { + } + + public void ConfigureServices(IServiceCollection services) + { + } + } +} diff --git a/src/Samples/MvcContrib.Samples.UI.MVC6/project.json b/src/Samples/MvcContrib.Samples.UI.MVC6/project.json new file mode 100644 index 0000000..839e955 --- /dev/null +++ b/src/Samples/MvcContrib.Samples.UI.MVC6/project.json @@ -0,0 +1,19 @@ +{ + "webroot": "wwwroot", + "version": "1.0.0-*", + "exclude": [ + "wwwroot" + ], + "packExclude": [ + "**.kproj", + "**.user", + "**.vspscc" + ], + "dependencies": { + "Microsoft.AspNet.Server.IIS": "1.0.0-beta1" + }, + "frameworks" : { + "aspnet50" : { }, + "aspnetcore50" : { } + } +} diff --git a/src/Samples/MvcContrib.Samples.UI/MvcContrib.Samples.UI.csproj b/src/Samples/MvcContrib.Samples.UI/MvcContrib.Samples.UI.csproj index fb6bb13..1814794 100644 --- a/src/Samples/MvcContrib.Samples.UI/MvcContrib.Samples.UI.csproj +++ b/src/Samples/MvcContrib.Samples.UI/MvcContrib.Samples.UI.csproj @@ -1,5 +1,6 @@  + Debug AnyCPU @@ -15,10 +16,12 @@ false - 3.5 - + 4.0 + + false + true true @@ -196,8 +199,13 @@ + + 10.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + - + +