Skip to content

Commit

Permalink
Adding a new MVC6 project
Browse files Browse the repository at this point in the history
--HG--
branch : feature/MVC 6 Reset
  • Loading branch information
Brendan Enrick authored and Brendan Enrick committed Nov 6, 2014
1 parent 8de7a5f commit 28319c5
Show file tree
Hide file tree
Showing 7 changed files with 221 additions and 6 deletions.
3 changes: 2 additions & 1 deletion .hgignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@ _ReSharper*
*.cache
TestResult.xml
*.trx
*.orig
*.orig
*.sln.ide/*
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>023473c3-8795-420a-b4d4-a1e082c0ed05</ProjectGuid>
<RootNamespace>MvcContrib.Samples.UI.MVC6</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\MvcContrib.Samples.UI\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">..\MvcContrib.Samples.UI\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
</PropertyGroup>
<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
<DevelopmentServerPort>1273</DevelopmentServerPort>
</PropertyGroup>
<Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>
144 changes: 144 additions & 0 deletions src/Samples/MvcContrib.Samples.UI.MVC6/Project_Readme.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,144 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<title>Your ASP.NET application</title>
<style>
body {
background: #fff;
color: #505050;
font: 14px 'Segoe UI', tahoma, arial, helvetica, sans-serif;
margin: 20px;
padding: 0;
}

#header {
background: #efefef;
padding: 0;
}

h1 {
font-size: 48px;
font-weight: normal;
margin: 0;
padding: 0 30px;
line-height: 150px;
}

p {
font-size: 20px;
color: #fff;
background: #969696;
padding: 0 30px;
line-height: 50px;
}

#main {
padding: 5px 30px;
}

.section {
width: 21.7%;
float: left;
margin: 0 0 0 4%;
}

.section h2 {
font-size: 13px;
text-transform: uppercase;
margin: 0;
border-bottom: 1px solid silver;
padding-bottom: 12px;
margin-bottom: 8px;
}

.section.first {
margin-left: 0;
}

.section.first h2 {
font-size: 24px;
text-transform: none;
margin-bottom: 25px;
border: none;
}

.section.first li {
border-top: 1px solid silver;
padding: 8px 0;
}

.section.last {
margin-right: 0;
}

ul {
list-style: none;
padding: 0;
margin: 0;
line-height: 20px;
}

li {
padding: 4px 0;
}

a {
color: #267cb2;
text-decoration: none;
}

a:hover {
text-decoration: underline;
}
</style>
</head>
<body>

<div id="header">
<h1>Your ASP.NET application</h1>
<p>Congratulations! You've created a project</p>
</div>

<div id="main">
<div class="section first">
<h2>This application consists of:</h2>
<ul>
<li>Sample pages showing basic nav between Home, About, and Contact</li>
<li>Theming using <a href="http://go.microsoft.com/fwlink/?LinkID=398939">Bootstrap</a></li>
</ul>
</div>

<div class="section">
<h2>Customize app</h2>
<ul>
<li><a href="http://go.microsoft.com/fwlink/?LinkID=398599">Add Static Files</a></li>
<li><a href="http://go.microsoft.com/fwlink/?LinkID=398600">Add Controller</a></li>
<li><a href="http://go.microsoft.com/fwlink/?LinkID=398601">Add View</a></li>
<li><a href="http://go.microsoft.com/fwlink/?LinkID=398602">Add Data using Entity Framework</a></li>
<li><a href="http://go.microsoft.com/fwlink/?LinkID=398603">Add Authentication using Identity</a></li>
<li><a href="http://go.microsoft.com/fwlink/?LinkID=398604">Add Class library</a></li>
<li><a href="http://go.microsoft.com/fwlink/?LinkID=398605">Add Diagnostics</a></li>
<li><a href="http://go.microsoft.com/fwlink/?LinkID=398606">Add Real Time using SignalR</a></li>
</ul>
</div>

<div class="section">
<h2>Deploy</h2>
<ul>
<li><a href="http://go.microsoft.com/fwlink/?LinkID=398607">Run your app locally</a></li>
<li><a href="http://go.microsoft.com/fwlink/?LinkID=398608">Self Host</a></li>
<li><a href="http://go.microsoft.com/fwlink/?LinkID=398609">Publish to Microsoft Azure Web Sites</a></li>
</ul>
</div>

<div class="section last">
<h2>Get help</h2>
<ul>
<li><a href="http://go.microsoft.com/fwlink/?LinkID=398610">Get help</a></li>
</ul>
</div>
</div>

</body>
</html>
16 changes: 16 additions & 0 deletions src/Samples/MvcContrib.Samples.UI.MVC6/Startup.cs
Original file line number Diff line number Diff line change
@@ -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)
{
}
}
}
19 changes: 19 additions & 0 deletions src/Samples/MvcContrib.Samples.UI.MVC6/project.json
Original file line number Diff line number Diff line change
@@ -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" : { }
}
}
14 changes: 11 additions & 3 deletions src/Samples/MvcContrib.Samples.UI/MvcContrib.Samples.UI.csproj
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
Expand All @@ -15,10 +16,12 @@
<MvcBuildViews>false</MvcBuildViews>
<FileUpgradeFlags>
</FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation />
<OldToolsVersion>4.0</OldToolsVersion>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<TargetFrameworkProfile />
<UseIISExpress>false</UseIISExpress>
<MvcProjectUpgradeChecked>true</MvcProjectUpgradeChecked>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down Expand Up @@ -196,8 +199,13 @@
<ItemGroup>
<WCFMetadata Include="Service References\" />
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
<Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
Expand Down
12 changes: 10 additions & 2 deletions src/Samples/MvcContrib.Samples.UI/MvcContrib.Samples.UI.sln
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.22231.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvcContrib.Samples.UI", "MvcContrib.Samples.UI.csproj", "{B2E419B6-E126-4B68-93CB-39FE0FAED786}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "MvcContrib.Samples.UI.MVC6", "..\MvcContrib.Samples.UI.MVC6\MvcContrib.Samples.UI.MVC6.kproj", "{023473C3-8795-420A-B4D4-A1E082C0ED05}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -13,6 +17,10 @@ Global
{B2E419B6-E126-4B68-93CB-39FE0FAED786}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B2E419B6-E126-4B68-93CB-39FE0FAED786}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B2E419B6-E126-4B68-93CB-39FE0FAED786}.Release|Any CPU.Build.0 = Release|Any CPU
{023473C3-8795-420A-B4D4-A1E082C0ED05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{023473C3-8795-420A-B4D4-A1E082C0ED05}.Debug|Any CPU.Build.0 = Debug|Any CPU
{023473C3-8795-420A-B4D4-A1E082C0ED05}.Release|Any CPU.ActiveCfg = Release|Any CPU
{023473C3-8795-420A-B4D4-A1E082C0ED05}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down

0 comments on commit 28319c5

Please sign in to comment.