From c15e29ecb30e450c295f08651f4446fc026ea2a2 Mon Sep 17 00:00:00 2001
From: Martin Kemp <martin@martinke.mp>
Date: Tue, 19 May 2015 15:44:32 +0100
Subject: [PATCH 1/7] $PSScriptRoot compatibility

$PSScriptRoot is not available on PS version 2 or below.

So we'll set it ourselves.
---
 vendor/profile.ps1 | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/vendor/profile.ps1 b/vendor/profile.ps1
index fcaa56e..7084efd 100644
--- a/vendor/profile.ps1
+++ b/vendor/profile.ps1
@@ -1,4 +1,9 @@
-# Add Cmder modules directory to the autoload path.
+# Compatibility with PS major versions <= 2
+if(!$PSScriptRoot) {
+    $PSScriptRoot = Split-Path $Script:MyInvocation.MyCommand.Path
+}
+
+# Add Cmder modules directory to the autoload path.
 $CmderModulePath = Join-path $PSScriptRoot "psmodules/"
 
 if( -not $env:PSModulePath.Contains($CmderModulePath) ){

From 29d1378d7afaa7bd8f78bf7cb72e524ef9556fe0 Mon Sep 17 00:00:00 2001
From: Martin Kemp <martin@martinke.mp>
Date: Tue, 19 May 2015 15:47:06 +0100
Subject: [PATCH 2/7] Add git to PATH (while in Cmder)

Add bundled git to PATH if we can't find git on PATH.
---
 vendor/profile.ps1 | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/vendor/profile.ps1 b/vendor/profile.ps1
index 7084efd..58c6997 100644
--- a/vendor/profile.ps1
+++ b/vendor/profile.ps1
@@ -11,7 +11,13 @@ if( -not $env:PSModulePath.Contains($CmderModulePath) ){
 }
 
 try {
+    # Check if git is on PATH, i.e. Git already installed on system
     Get-command -Name "git" -ErrorAction Stop >$null
+} catch {
+    $env:Path += ";$env:CMDER_ROOT\vendor\msysgit\bin"
+}
+
+try {
     Import-Module -Name "posh-git" -ErrorAction Stop >$null
     $gitStatus = $true
 } catch {

From c4873c6e5813e5c253ae32ba68123d2694b422ce Mon Sep 17 00:00:00 2001
From: Martin Kemp <martin@martinke.mp>
Date: Tue, 19 May 2015 15:48:04 +0100
Subject: [PATCH 3/7] Revert "Update to VS2015."

This reverts commit 53efab127ef0eff899910bc638cd2de074d86cfe.
---
 launcher/CmderLauncher.sln     | 4 ++--
 launcher/CmderLauncher.vcxproj | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/launcher/CmderLauncher.sln b/launcher/CmderLauncher.sln
index 74e5bdd..e130cc2 100644
--- a/launcher/CmderLauncher.sln
+++ b/launcher/CmderLauncher.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.22823.1
+# Visual Studio Express 2013 for Windows Desktop
+VisualStudioVersion = 12.0.21005.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CmderLauncher", "CmderLauncher.vcxproj", "{4A8485A5-B7DD-4C44-B7F6-3E2765DD0CD3}"
 EndProject
diff --git a/launcher/CmderLauncher.vcxproj b/launcher/CmderLauncher.vcxproj
index d9390f5..7baf78f 100644
--- a/launcher/CmderLauncher.vcxproj
+++ b/launcher/CmderLauncher.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -14,19 +14,18 @@
     <ProjectGuid>{4A8485A5-B7DD-4C44-B7F6-3E2765DD0CD3}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>CmderLauncher</RootNamespace>
-    <TargetPlatformVersion>8.1</TargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v120_xp</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>

From 271b3ea8762ec547ff3ae4bcd524e4a87f367119 Mon Sep 17 00:00:00 2001
From: Martin Kemp <martin@martinke.mp>
Date: Tue, 19 May 2015 18:37:34 +0100
Subject: [PATCH 4/7] Avoid commiting the wrong dlls

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index e765cea..cd19a9f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,5 +8,6 @@ vendor/*/*
 config/.history
 Thumbs.db
 *.exe
+*.dll
 build/
 Version v*

From 40fd96b135bb06f322058da3a5a087587ea26666 Mon Sep 17 00:00:00 2001
From: Martin Kemp <martin@martinke.mp>
Date: Wed, 20 May 2015 10:55:17 +0100
Subject: [PATCH 5/7] Remove leftover history.

This is not needed and confuses users.
---
 config/ConEmu.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/ConEmu.xml b/config/ConEmu.xml
index 7ffe3ba..5786fba 100644
--- a/config/ConEmu.xml
+++ b/config/ConEmu.xml
@@ -77,7 +77,7 @@
 			<value name="StartFarEditors" type="hex" data="00"/>
 			<value name="StoreTaskbarkTasks" type="hex" data="00"/>
 			<value name="StoreTaskbarCommands" type="hex" data="00"/>
-			<value name="CmdLineHistory" type="multi"><line data=";C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\"/></value>
+			<value name="CmdLineHistory" type="multi"></value>
 			<value name="SingleInstance" type="hex" data="00"/>
 			<value name="ShowHelpTooltips" type="hex" data="01"/>
 			<value name="Multi" type="hex" data="01"/>

From 2a1a736ceb94da50deb817f7d3327290a2ec3b9f Mon Sep 17 00:00:00 2001
From: Bond <bondz@users.noreply.github.com>
Date: Thu, 4 Jun 2015 23:25:09 +0100
Subject: [PATCH 6/7] Remove depreciated Enable-GitColors

The function Enable-GitColors is depreciated in dahlbyk/posh-git@4e778e2480f584e039b47f0db1c020a197ee9e8f and should be removed here as well.
---
 vendor/profile.ps1 | 1 -
 1 file changed, 1 deletion(-)

diff --git a/vendor/profile.ps1 b/vendor/profile.ps1
index 58c6997..dad67b7 100644
--- a/vendor/profile.ps1
+++ b/vendor/profile.ps1
@@ -51,7 +51,6 @@ function global:prompt {
 
 # Load special features come from posh-git
 if ($gitStatus) {
-    Enable-GitColors
     Start-SshAgent -Quiet
 }
 

From 8659b9c6ed183544a00ffc6f3103d2d5b683f01b Mon Sep 17 00:00:00 2001
From: Benjamin Staneck <staneck@gmail.com>
Date: Mon, 3 Aug 2015 18:55:40 +0200
Subject: [PATCH 7/7] update VS to 2015 release version and switch to /MT for
 static linking

---
 launcher/CmderLauncher.sln     |  4 ++--
 launcher/CmderLauncher.vcxproj | 11 +++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/launcher/CmderLauncher.sln b/launcher/CmderLauncher.sln
index e130cc2..9b4bc65 100644
--- a/launcher/CmderLauncher.sln
+++ b/launcher/CmderLauncher.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Express 2013 for Windows Desktop
-VisualStudioVersion = 12.0.21005.1
+# Visual Studio 14
+VisualStudioVersion = 14.0.23107.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CmderLauncher", "CmderLauncher.vcxproj", "{4A8485A5-B7DD-4C44-B7F6-3E2765DD0CD3}"
 EndProject
diff --git a/launcher/CmderLauncher.vcxproj b/launcher/CmderLauncher.vcxproj
index 7baf78f..d9012ba 100644
--- a/launcher/CmderLauncher.vcxproj
+++ b/launcher/CmderLauncher.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -19,13 +19,13 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120_xp</PlatformToolset>
+    <PlatformToolset>v140_xp</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v140_xp</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
@@ -72,6 +72,7 @@
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -84,7 +85,9 @@
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ResourceCompile Include="src\Resource.rc" />
+    <ResourceCompile Include="src\Resource.rc">
+      <FileType>RC</FileType>
+    </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\resource.h" />