Merge branch 'dev'

.gitignore

@@ -183,22 +183,22 @@ UpgradeLog*.htm
 FakesAssemblies/
 
 # Ignore files/folders by Umbraco
-/Source/Website/App_Data/App_Browsers/
-/Source/Website/App_Data/Cache/
-/Source/Website/App_Data/ClientDependency/
-/Source/Website/App_Data/ExamineIndexes/
-/Source/Website/App_Data/Logs/
-/Source/Website/App_Data/[Pp]review/
-/Source/Website/App_Data/TEMP/
-/Source/Website/App_Data/umbraco.config
-/Source/Website/Cached/
+/Source/TeaCommerce.StarterKit.Website/App_Data/App_Browsers/
+/Source/TeaCommerce.StarterKit.Website/App_Data/Cache/
+/Source/TeaCommerce.StarterKit.Website/App_Data/ClientDependency/
+/Source/TeaCommerce.StarterKit.Website/App_Data/ExamineIndexes/
+/Source/TeaCommerce.StarterKit.Website/App_Data/Logs/
+/Source/TeaCommerce.StarterKit.Website/App_Data/[Pp]review/
+/Source/TeaCommerce.StarterKit.Website/App_Data/TEMP/
+/Source/TeaCommerce.StarterKit.Website/App_Data/umbraco.config
+/Source/TeaCommerce.StarterKit.Website/Cached/
 
 # Don't ignore Umbraco packages (VisualStudio.gitignore mistakes this for a NuGet packages folder)
 # Make sure to include details from VisualStudio.gitignore BEFORE this
-!/Source/Website/App_Data/[Pp]ackages/**
-!/Source/Website/[Uu]mbraco/[Dd]eveloper/[Pp]ackages/**
-!/Source/Website/[Bb]in/**
-!**/Source/Website/App_Data/Umbraco.sdf
+!/Source/TeaCommerce.StarterKit.Website/App_Data/[Pp]ackages/**
+!/Source/TeaCommerce.StarterKit.Website/[Uu]mbraco/[Dd]eveloper/[Pp]ackages/**
+!/Source/TeaCommerce.StarterKit.Website/[Bb]in/**
+!**/Source/TeaCommerce.StarterKit.Website/App_Data/Umbraco.sdf
 *.zip
 !/[Aa]rtifacts/*.zip
 # Include these files:

Source/TeaCommerce.StarterKit.Install/Properties/VersionInfo.cs

@@ -12,7 +12,7 @@
 using System.Reflection;
 
 [assembly: AssemblyVersion("4.3.*")]
-[assembly: AssemblyInformationalVersion("4.3.1")]
+[assembly: AssemblyInformationalVersion("4.3.2")]
 
 // Generated by the MSBuild WriteCodeFragment class.
 

Source/TeaCommerce.StarterKit.Install/TeaCommerce.StarterKit.Install.csproj

@@ -1,5 +1,5 @@
 <?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>
@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>TeaCommerce.StarterKit.Install</RootNamespace>
     <AssemblyName>TeaCommerce.StarterKit.Install</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

Source/TeaCommerce.StarterKit.Install/TeaCommerceStarterKitInstall.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Web;
 using System.Web.Hosting;
 using System.Xml;
 using TeaCommerce.Api.Models;

Source/TeaCommerce.StarterKit.Website/App_Data/Models/all.dll.path

@@ -1 +1 @@
-C:\Users\Matt\AppData\Local\Temp\Temporary ASP.NET Files\vs\3ac384a1\809894e4\App_Web_all.generated.cs.8f9494c4.amcxmhno.dll
+C:\Users\Matt\AppData\Local\Temp\Temporary ASP.NET Files\vs\3ac384a1\809894e4\App_Web_all.generated.cs.8f9494c4.shmiejqs.dll