Skip to content

Commit

Permalink
upgraded to VS 2013
Browse files Browse the repository at this point in the history
  • Loading branch information
amirrajan committed Apr 13, 2014
1 parent 4df7545 commit 295471d
Show file tree
Hide file tree
Showing 129 changed files with 36,707 additions and 27,937 deletions.
1 change: 1 addition & 0 deletions Rakefile.rb
Expand Up @@ -35,6 +35,7 @@
@web_deploy = WebDeploy.new
@sh = CommandShell.new
@sln = SlnBuilder.new
@sln.msbuild_path = "C:\\Program Files (x86)\\MSBuild\\12.0\\bin\\amd64\\msbuild.exe"
@file_sync = FileSync.new
@file_sync.source = @mvc_project_directory
@file_sync.destination = @website_deploy_directory
Expand Down
4 changes: 2 additions & 2 deletions __NAME__.Tests/Properties/AssemblyInfo.cs
Expand Up @@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("__NAME__.Tests")]
[assembly: AssemblyCopyright("Copyright © 2012")]
[assembly: AssemblyCopyright("Copyright © 2014")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
[assembly: InternalsVisibleTo("__NAME__")]
Expand All @@ -21,7 +21,7 @@
[assembly: ComVisible(false)]

// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("6e1af646-829f-444f-91a4-dd887457641d")]
[assembly: Guid("5b4ea693-935a-4c95-ad3f-b4b04311315f")]

// Version information for an assembly consists of the following four values:
//
Expand Down
17 changes: 4 additions & 13 deletions __NAME__.Tests/__NAME__.Tests.csproj
@@ -1,16 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="12.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>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{F0A3AA85-7157-4D28-A4C7-5146A115987B}</ProjectGuid>
<ProjectGuid>{F38EE38C-5C9B-485F-9A0C-D1A882BEFDC9}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>__NAME__.Tests</RootNamespace>
<AssemblyName>__NAME__.Tests</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
Expand All @@ -36,8 +35,6 @@
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Web" />
<Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
Expand All @@ -52,12 +49,6 @@
<None Include="App.config" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\__NAME__\__NAME__.csproj">
<Project>{BD2C6A9C-EDB3-4D29-9C89-FD314229C18E}</Project>
<Name>__NAME__</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- 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.
Expand Down
Binary file not shown.
Empty file.
2 changes: 1 addition & 1 deletion __NAME__.Tests/packages.config
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="nspec" version="0.9.67" targetFramework="net40" />
<package id="nspec" version="0.9.67" targetFramework="net45" />
</packages>
26 changes: 14 additions & 12 deletions __NAME__.sln
@@ -1,24 +1,26 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "__NAME__", "__NAME__\__NAME__.csproj", "{BD2C6A9C-EDB3-4D29-9C89-FD314229C18E}"
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.21005.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "__NAME__", "__NAME__\__NAME__.csproj", "{FC5554A2-EFC3-4189-8605-DC0AE14D88A7}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "__NAME__.Tests", "__NAME__.Tests\__NAME__.Tests.csproj", "{F0A3AA85-7157-4D28-A4C7-5146A115987B}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "__NAME__.Tests", "__NAME__.Tests\__NAME__.Tests.csproj", "{F38EE38C-5C9B-485F-9A0C-D1A882BEFDC9}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{BD2C6A9C-EDB3-4D29-9C89-FD314229C18E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BD2C6A9C-EDB3-4D29-9C89-FD314229C18E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BD2C6A9C-EDB3-4D29-9C89-FD314229C18E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BD2C6A9C-EDB3-4D29-9C89-FD314229C18E}.Release|Any CPU.Build.0 = Release|Any CPU
{F0A3AA85-7157-4D28-A4C7-5146A115987B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F0A3AA85-7157-4D28-A4C7-5146A115987B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F0A3AA85-7157-4D28-A4C7-5146A115987B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F0A3AA85-7157-4D28-A4C7-5146A115987B}.Release|Any CPU.Build.0 = Release|Any CPU
{FC5554A2-EFC3-4189-8605-DC0AE14D88A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FC5554A2-EFC3-4189-8605-DC0AE14D88A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FC5554A2-EFC3-4189-8605-DC0AE14D88A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FC5554A2-EFC3-4189-8605-DC0AE14D88A7}.Release|Any CPU.Build.0 = Release|Any CPU
{F38EE38C-5C9B-485F-9A0C-D1A882BEFDC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F38EE38C-5C9B-485F-9A0C-D1A882BEFDC9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F38EE38C-5C9B-485F-9A0C-D1A882BEFDC9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F38EE38C-5C9B-485F-9A0C-D1A882BEFDC9}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
Binary file removed __NAME__.suo
Binary file not shown.
Binary file added __NAME__.v12.suo
Binary file not shown.
1 change: 1 addition & 0 deletions __NAME__/Controllers/BaseController.cs
Expand Up @@ -4,6 +4,7 @@
using System.Web;
using System.Web.Mvc;
using Oak;
using Massive;

namespace __NAME__.Controllers
{
Expand Down
6 changes: 2 additions & 4 deletions __NAME__/Controllers/HomeController.cs
Expand Up @@ -3,8 +3,6 @@
using System.Linq;
using System.Web;
using System.Web.Mvc;
using Oak;
using Massive;

namespace __NAME__.Controllers
{
Expand All @@ -14,5 +12,5 @@ public ActionResult Index()
{
return View();
}
}
}
}
}
2 changes: 1 addition & 1 deletion __NAME__/Oak/BootStrap.cs
@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
Expand Down
4 changes: 2 additions & 2 deletions __NAME__/Properties/AssemblyInfo.cs
Expand Up @@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("__NAME__")]
[assembly: AssemblyCopyright("Copyright © 2012")]
[assembly: AssemblyCopyright("Copyright © 2014")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
[assembly: InternalsVisibleTo("__NAME__.Tests")]
Expand All @@ -21,7 +21,7 @@
[assembly: ComVisible(false)]

// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("01c20d60-c0e7-4bca-83af-dbb7c6177873")]
[assembly: Guid("a8acf1dd-4f4c-44a4-a647-53e585abb5e7")]

// Version information for an assembly consists of the following four values:
//
Expand Down
15 changes: 0 additions & 15 deletions __NAME__/Views/Shared/Error.cshtml

This file was deleted.

71 changes: 35 additions & 36 deletions __NAME__/Views/Shared/_Layout.cshtml
@@ -1,41 +1,40 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="">
<meta name="author" content="">
<title>__NAME__</title>
<link href="@Url.Content("~/Content/css/bootstrap.min.css")" rel="stylesheet" type="text/css" />
<!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
<script src="@Url.Content("~/Scripts/jquery-1.8.2.js")" type="text/javascript"></script>
<script src="@Url.Content("~/Scripts/bootstrap.min.js")" type="text/javascript"></script>
<script src="@Url.Content("~/Scripts/underscore.js")" type="text/javascript"></script>
</head>

<body>
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>@ViewBag.Title - My ASP.NET Application</title>
<link href="~/Content/Site.css" rel="stylesheet" type="text/css" />
<link href="~/Content/bootstrap.min.css" rel="stylesheet" type="text/css" />
<script src="~/Scripts/modernizr-2.6.2.js"></script>
</head>
<body>
<div class="navbar navbar-inverse navbar-fixed-top">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="/">__NAME__</a>
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
@Html.ActionLink("Application name", "Index", "Home", null, new { @class = "navbar-brand" })
</div>
<div class="navbar-collapse collapse">
<ul class="nav navbar-nav">
</ul>
</div>
</div>
<div class="collapse navbar-collapse">
<ul class="nav navbar-nav">
<li><a href="/">item 1</a>
<li><a href="/docs">item 2</a>
</ul>
</div><!--/.nav-collapse -->
</div>
</div>
<div id="content" class="container">
@RenderBody()
</div>
</body>
</html>

<div class="container body-content">
@RenderBody()
<hr />
<footer>
<p>&copy; @DateTime.Now.Year - My ASP.NET Application</p>
</footer>
</div>

<script src="~/Scripts/jquery-1.10.2.min.js"></script>
<script src="~/Scripts/bootstrap.min.js"></script>
</body>
</html>
58 changes: 0 additions & 58 deletions __NAME__/Views/Web.config

This file was deleted.

4 changes: 2 additions & 2 deletions __NAME__/Web.Debug.config
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="utf-8"?>

<!-- For more information on using web.config transformation visit http://go.microsoft.com/fwlink/?LinkId=125889 -->

<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
<!--
In the example below, the "SetAttributes" transform will change the value of
"connectionString" to use "ReleaseSQLServer" only when the "Match" locator
finds an atrribute "name" that has a value of "MyDB".
finds an attribute "name" that has a value of "MyDB".
<connectionStrings>
<add name="MyDB"
Expand Down
4 changes: 2 additions & 2 deletions __NAME__/Web.Release.config
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="utf-8"?>

<!-- For more information on using web.config transformation visit http://go.microsoft.com/fwlink/?LinkId=125889 -->

<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
<!--
In the example below, the "SetAttributes" transform will change the value of
"connectionString" to use "ReleaseSQLServer" only when the "Match" locator
finds an atrribute "name" that has a value of "MyDB".
finds an attribute "name" that has a value of "MyDB".
<connectionStrings>
<add name="MyDB"
Expand Down

0 comments on commit 295471d

Please sign in to comment.