From ba8a97749355c3caf7b13ef3eb79b6326861710c Mon Sep 17 00:00:00 2001
From: Frank Li <lznuaa@gmail.com>
Date: Sun, 1 Mar 2009 22:47:34 +0800
Subject: [PATCH] Roll back TortoiseShell because it is too risk using MFC.

Signed-off-by: Frank Li <lznuaa@gmail.com>
---
 src/TGitCache/TSVNCache.vcproj         |  20 ++---
 src/TortoiseGit.sln                    | 135 +++++++++++----------------------
 src/TortoiseShell/TortoiseShell.vcproj | 134 +++++++++++++++++---------------
 3 files changed, 126 insertions(+), 163 deletions(-)

diff --git a/src/TGitCache/TSVNCache.vcproj b/src/TGitCache/TSVNCache.vcproj
index 879dd8a..b0a7b04 100644
--- a/src/TGitCache/TSVNCache.vcproj
+++ b/src/TGitCache/TSVNCache.vcproj
@@ -51,7 +51,7 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				SmallerTypeCheck="true"
-				RuntimeLibrary="3"
+				RuntimeLibrary="1"
 				TreatWChar_tAsBuiltInType="true"
 				ForceConformanceInForLoopScope="true"
 				UsePrecompiledHeader="2"
@@ -76,7 +76,7 @@
 				OutputFile="$(OutDir)/TGitCache.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories=""
-				IgnoreDefaultLibraryNames=""
+				IgnoreDefaultLibraryNames="libc"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/TGitCache.pdb"
 				SubSystem="2"
@@ -109,8 +109,8 @@
 		<Configuration
 			Name="Debug|x64"
 			OutputDirectory="..\..\Bin\Debug64\Bin"
-			IntermediateDirectory="..\..\obj\TGitCache\Debug64"
-			ConfigurationType="1"
+			IntermediateDirectory="..\..\obj\TGitCache\Debug64"
+			ConfigurationType="1"
 			UseOfATL="1"
 			CharacterSet="1"
 			>
@@ -138,7 +138,7 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				SmallerTypeCheck="true"
-				RuntimeLibrary="3"
+				RuntimeLibrary="2"
 				TreatWChar_tAsBuiltInType="true"
 				ForceConformanceInForLoopScope="true"
 				UsePrecompiledHeader="2"
@@ -161,7 +161,7 @@
 				AdditionalDependencies="Crypt32.lib"
 				OutputFile="$(OutDir)/TGitCache.exe"
 				LinkIncremental="2"
-				IgnoreDefaultLibraryNames=""
+				IgnoreDefaultLibraryNames="LIBC"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/TSVNCache.pdb"
 				SubSystem="2"
@@ -217,9 +217,10 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/apr/include;../Utils;..\TortoiseShell;..\Git;..\..\ext\gettext\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;UNICODE;_UNICODE"
-				RuntimeLibrary="0"
+				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				TreatWChar_tAsBuiltInType="true"
 				ForceConformanceInForLoopScope="true"
@@ -242,7 +243,6 @@
 				OutputFile="$(OutDir)/TGitCache.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories=""
-				IgnoreDefaultLibraryNames=""
 				DelayLoadDLLs=""
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -302,9 +302,10 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/apr/include;../Utils;..\TortoiseShell;..\Git;..\..\ext\gettext\include"
 				PreprocessorDefinitions="WIN64;NDEBUG;_CONSOLE;UNICODE;_UNICODE"
-				RuntimeLibrary="0"
+				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				TreatWChar_tAsBuiltInType="true"
 				ForceConformanceInForLoopScope="true"
@@ -326,7 +327,6 @@
 				AdditionalDependencies="Crypt32.lib"
 				OutputFile="$(OutDir)/TGitCache.exe"
 				LinkIncremental="1"
-				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
diff --git a/src/TortoiseGit.sln b/src/TortoiseGit.sln
index dafdd0e..595fec3 100644
--- a/src/TortoiseGit.sln
+++ b/src/TortoiseGit.sln
@@ -1,6 +1,6 @@
 
 Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
+# Visual C++ Express 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Git", "Git\Git.vcproj", "{7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TortoiseProc", "TortoiseProc\TortoiseProc.vcproj", "{50797F06-39C5-4802-8E2B-7B7A4EF03214}"
@@ -48,7 +48,6 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TGitCache", "TGitCache\TSVNCache.vcproj", "{A00D2EDC-B4F5-4B41-94BA-13961DE5D296}"
 	ProjectSection(ProjectDependencies) = postProject
 		{13BC1836-2726-45C4-9249-5BA2BBBF8328} = {13BC1836-2726-45C4-9249-5BA2BBBF8328}
-		{7CA5B1EB-8CC9-40A6-96D8-83649C1A870B} = {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CrashRpt", "crashrpt\CrashRpt.vcproj", "{13BC1836-2726-45C4-9249-5BA2BBBF8328}"
@@ -91,128 +90,100 @@ Global
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.debug_static|Win32.ActiveCfg = Debug|Win32
 		{7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.debug_static|Win32.Build.0 = Debug|Win32
-		{7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.debug_static|x64.ActiveCfg = Debug|x64
-		{7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.debug_static|x64.Build.0 = Debug|x64
+		{7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.debug_static|x64.ActiveCfg = Debug|Win32
 		{7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Debug|Win32.ActiveCfg = Debug|Win32
 		{7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Debug|Win32.Build.0 = Debug|Win32
-		{7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Debug|x64.ActiveCfg = Debug|x64
-		{7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Debug|x64.Build.0 = Debug|x64
+		{7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Debug|x64.ActiveCfg = Debug|Win32
 		{7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.release_static|Win32.ActiveCfg = Release|Win32
 		{7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.release_static|Win32.Build.0 = Release|Win32
-		{7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.release_static|x64.ActiveCfg = Release|x64
-		{7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.release_static|x64.Build.0 = Release|x64
+		{7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.release_static|x64.ActiveCfg = Release|Win32
 		{7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Release|Win32.ActiveCfg = Release|Win32
 		{7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Release|Win32.Build.0 = Release|Win32
-		{7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Release|x64.ActiveCfg = Release|x64
-		{7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Release|x64.Build.0 = Release|x64
+		{7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Release|x64.ActiveCfg = Release|Win32
 		{50797F06-39C5-4802-8E2B-7B7A4EF03214}.debug_static|Win32.ActiveCfg = Debug|Win32
 		{50797F06-39C5-4802-8E2B-7B7A4EF03214}.debug_static|Win32.Build.0 = Debug|Win32
 		{50797F06-39C5-4802-8E2B-7B7A4EF03214}.debug_static|x64.ActiveCfg = Debug|Win32
 		{50797F06-39C5-4802-8E2B-7B7A4EF03214}.Debug|Win32.ActiveCfg = Debug|Win32
 		{50797F06-39C5-4802-8E2B-7B7A4EF03214}.Debug|Win32.Build.0 = Debug|Win32
-		{50797F06-39C5-4802-8E2B-7B7A4EF03214}.Debug|x64.ActiveCfg = Debug|x64
-		{50797F06-39C5-4802-8E2B-7B7A4EF03214}.Debug|x64.Build.0 = Debug|x64
+		{50797F06-39C5-4802-8E2B-7B7A4EF03214}.Debug|x64.ActiveCfg = Debug|Win32
 		{50797F06-39C5-4802-8E2B-7B7A4EF03214}.release_static|Win32.ActiveCfg = Release|Win32
 		{50797F06-39C5-4802-8E2B-7B7A4EF03214}.release_static|Win32.Build.0 = Release|Win32
 		{50797F06-39C5-4802-8E2B-7B7A4EF03214}.release_static|x64.ActiveCfg = Release|Win32
 		{50797F06-39C5-4802-8E2B-7B7A4EF03214}.Release|Win32.ActiveCfg = Release|Win32
 		{50797F06-39C5-4802-8E2B-7B7A4EF03214}.Release|Win32.Build.0 = Release|Win32
-		{50797F06-39C5-4802-8E2B-7B7A4EF03214}.Release|x64.ActiveCfg = Release|x64
-		{50797F06-39C5-4802-8E2B-7B7A4EF03214}.Release|x64.Build.0 = Release|x64
+		{50797F06-39C5-4802-8E2B-7B7A4EF03214}.Release|x64.ActiveCfg = Release|Win32
 		{BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.debug_static|Win32.ActiveCfg = Debug|Win32
 		{BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.debug_static|Win32.Build.0 = Debug|Win32
-		{BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.debug_static|x64.ActiveCfg = Debug|x64
-		{BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.debug_static|x64.Build.0 = Debug|x64
+		{BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.debug_static|x64.ActiveCfg = Debug|Win32
 		{BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Debug|Win32.ActiveCfg = Debug|Win32
 		{BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Debug|Win32.Build.0 = Debug|Win32
-		{BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Debug|x64.ActiveCfg = Debug|x64
-		{BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Debug|x64.Build.0 = Debug|x64
+		{BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Debug|x64.ActiveCfg = Debug|Win32
 		{BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.release_static|Win32.ActiveCfg = Release|Win32
 		{BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.release_static|Win32.Build.0 = Release|Win32
-		{BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.release_static|x64.ActiveCfg = Release|x64
-		{BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.release_static|x64.Build.0 = Release|x64
+		{BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.release_static|x64.ActiveCfg = Release|Win32
 		{BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Release|Win32.ActiveCfg = Release|Win32
 		{BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Release|Win32.Build.0 = Release|Win32
-		{BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Release|x64.ActiveCfg = Release|x64
-		{BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Release|x64.Build.0 = Release|x64
+		{BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Release|x64.ActiveCfg = Release|Win32
 		{E873DD32-5A31-4DE1-8341-A56A2A5489EA}.debug_static|Win32.ActiveCfg = Debug|Win32
 		{E873DD32-5A31-4DE1-8341-A56A2A5489EA}.debug_static|Win32.Build.0 = Debug|Win32
-		{E873DD32-5A31-4DE1-8341-A56A2A5489EA}.debug_static|x64.ActiveCfg = Debug|x64
-		{E873DD32-5A31-4DE1-8341-A56A2A5489EA}.debug_static|x64.Build.0 = Debug|x64
+		{E873DD32-5A31-4DE1-8341-A56A2A5489EA}.debug_static|x64.ActiveCfg = Debug|Win32
 		{E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Debug|Win32.ActiveCfg = Debug|Win32
 		{E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Debug|Win32.Build.0 = Debug|Win32
-		{E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Debug|x64.ActiveCfg = Debug|x64
-		{E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Debug|x64.Build.0 = Debug|x64
+		{E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Debug|x64.ActiveCfg = Debug|Win32
 		{E873DD32-5A31-4DE1-8341-A56A2A5489EA}.release_static|Win32.ActiveCfg = Release|Win32
 		{E873DD32-5A31-4DE1-8341-A56A2A5489EA}.release_static|Win32.Build.0 = Release|Win32
-		{E873DD32-5A31-4DE1-8341-A56A2A5489EA}.release_static|x64.ActiveCfg = Release|x64
-		{E873DD32-5A31-4DE1-8341-A56A2A5489EA}.release_static|x64.Build.0 = Release|x64
+		{E873DD32-5A31-4DE1-8341-A56A2A5489EA}.release_static|x64.ActiveCfg = Release|Win32
 		{E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Release|Win32.ActiveCfg = Release|Win32
 		{E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Release|Win32.Build.0 = Release|Win32
-		{E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Release|x64.ActiveCfg = Release|x64
-		{E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Release|x64.Build.0 = Release|x64
+		{E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Release|x64.ActiveCfg = Release|Win32
 		{A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.debug_static|Win32.ActiveCfg = Debug|Win32
 		{A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.debug_static|Win32.Build.0 = Debug|Win32
 		{A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.debug_static|x64.ActiveCfg = Debug|Win32
 		{A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Debug|Win32.ActiveCfg = Debug|Win32
 		{A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Debug|Win32.Build.0 = Debug|Win32
-		{A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Debug|x64.ActiveCfg = Debug|x64
-		{A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Debug|x64.Build.0 = Debug|x64
+		{A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Debug|x64.ActiveCfg = Debug|Win32
 		{A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.release_static|Win32.ActiveCfg = Release|Win32
 		{A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.release_static|Win32.Build.0 = Release|Win32
 		{A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.release_static|x64.ActiveCfg = Release|Win32
 		{A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Release|Win32.ActiveCfg = Release|Win32
 		{A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Release|Win32.Build.0 = Release|Win32
-		{A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Release|x64.ActiveCfg = Release|x64
-		{A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Release|x64.Build.0 = Release|x64
+		{A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Release|x64.ActiveCfg = Release|Win32
 		{12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.debug_static|Win32.ActiveCfg = Debug|Win32
 		{12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.debug_static|Win32.Build.0 = Debug|Win32
-		{12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.debug_static|x64.ActiveCfg = Debug|x64
-		{12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.debug_static|x64.Build.0 = Debug|x64
+		{12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.debug_static|x64.ActiveCfg = Debug|Win32
 		{12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Debug|Win32.ActiveCfg = Debug|Win32
 		{12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Debug|Win32.Build.0 = Debug|Win32
-		{12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Debug|x64.ActiveCfg = Debug|x64
-		{12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Debug|x64.Build.0 = Debug|x64
+		{12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Debug|x64.ActiveCfg = Debug|Win32
 		{12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.release_static|Win32.ActiveCfg = Release|Win32
 		{12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.release_static|Win32.Build.0 = Release|Win32
-		{12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.release_static|x64.ActiveCfg = Release|x64
-		{12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.release_static|x64.Build.0 = Release|x64
+		{12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.release_static|x64.ActiveCfg = Release|Win32
 		{12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Release|Win32.ActiveCfg = Release|Win32
 		{12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Release|Win32.Build.0 = Release|Win32
-		{12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Release|x64.ActiveCfg = Release|x64
-		{12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Release|x64.Build.0 = Release|x64
+		{12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Release|x64.ActiveCfg = Release|Win32
 		{4BE529FB-C2F2-49F7-A897-054B955564CF}.debug_static|Win32.ActiveCfg = Debug|Win32
 		{4BE529FB-C2F2-49F7-A897-054B955564CF}.debug_static|Win32.Build.0 = Debug|Win32
-		{4BE529FB-C2F2-49F7-A897-054B955564CF}.debug_static|x64.ActiveCfg = Debug|x64
-		{4BE529FB-C2F2-49F7-A897-054B955564CF}.debug_static|x64.Build.0 = Debug|x64
+		{4BE529FB-C2F2-49F7-A897-054B955564CF}.debug_static|x64.ActiveCfg = Debug|Win32
 		{4BE529FB-C2F2-49F7-A897-054B955564CF}.Debug|Win32.ActiveCfg = Debug|Win32
 		{4BE529FB-C2F2-49F7-A897-054B955564CF}.Debug|Win32.Build.0 = Debug|Win32
-		{4BE529FB-C2F2-49F7-A897-054B955564CF}.Debug|x64.ActiveCfg = Debug|x64
-		{4BE529FB-C2F2-49F7-A897-054B955564CF}.Debug|x64.Build.0 = Debug|x64
+		{4BE529FB-C2F2-49F7-A897-054B955564CF}.Debug|x64.ActiveCfg = Debug|Win32
 		{4BE529FB-C2F2-49F7-A897-054B955564CF}.release_static|Win32.ActiveCfg = Release|Win32
 		{4BE529FB-C2F2-49F7-A897-054B955564CF}.release_static|Win32.Build.0 = Release|Win32
-		{4BE529FB-C2F2-49F7-A897-054B955564CF}.release_static|x64.ActiveCfg = Release|x64
-		{4BE529FB-C2F2-49F7-A897-054B955564CF}.release_static|x64.Build.0 = Release|x64
+		{4BE529FB-C2F2-49F7-A897-054B955564CF}.release_static|x64.ActiveCfg = Release|Win32
 		{4BE529FB-C2F2-49F7-A897-054B955564CF}.Release|Win32.ActiveCfg = Release|Win32
 		{4BE529FB-C2F2-49F7-A897-054B955564CF}.Release|Win32.Build.0 = Release|Win32
-		{4BE529FB-C2F2-49F7-A897-054B955564CF}.Release|x64.ActiveCfg = Release|x64
-		{4BE529FB-C2F2-49F7-A897-054B955564CF}.Release|x64.Build.0 = Release|x64
+		{4BE529FB-C2F2-49F7-A897-054B955564CF}.Release|x64.ActiveCfg = Release|Win32
 		{A5498556-CE09-4095-8335-08FC8370552D}.debug_static|Win32.ActiveCfg = Debug|Win32
 		{A5498556-CE09-4095-8335-08FC8370552D}.debug_static|Win32.Build.0 = Debug|Win32
-		{A5498556-CE09-4095-8335-08FC8370552D}.debug_static|x64.ActiveCfg = Debug|x64
-		{A5498556-CE09-4095-8335-08FC8370552D}.debug_static|x64.Build.0 = Debug|x64
+		{A5498556-CE09-4095-8335-08FC8370552D}.debug_static|x64.ActiveCfg = Debug|Win32
 		{A5498556-CE09-4095-8335-08FC8370552D}.Debug|Win32.ActiveCfg = Debug|Win32
 		{A5498556-CE09-4095-8335-08FC8370552D}.Debug|Win32.Build.0 = Debug|Win32
-		{A5498556-CE09-4095-8335-08FC8370552D}.Debug|x64.ActiveCfg = Debug|x64
-		{A5498556-CE09-4095-8335-08FC8370552D}.Debug|x64.Build.0 = Debug|x64
+		{A5498556-CE09-4095-8335-08FC8370552D}.Debug|x64.ActiveCfg = Debug|Win32
 		{A5498556-CE09-4095-8335-08FC8370552D}.release_static|Win32.ActiveCfg = Release|Win32
 		{A5498556-CE09-4095-8335-08FC8370552D}.release_static|Win32.Build.0 = Release|Win32
-		{A5498556-CE09-4095-8335-08FC8370552D}.release_static|x64.ActiveCfg = Release|x64
-		{A5498556-CE09-4095-8335-08FC8370552D}.release_static|x64.Build.0 = Release|x64
+		{A5498556-CE09-4095-8335-08FC8370552D}.release_static|x64.ActiveCfg = Release|Win32
 		{A5498556-CE09-4095-8335-08FC8370552D}.Release|Win32.ActiveCfg = Release|Win32
 		{A5498556-CE09-4095-8335-08FC8370552D}.Release|Win32.Build.0 = Release|Win32
-		{A5498556-CE09-4095-8335-08FC8370552D}.Release|x64.ActiveCfg = Release|x64
-		{A5498556-CE09-4095-8335-08FC8370552D}.Release|x64.Build.0 = Release|x64
+		{A5498556-CE09-4095-8335-08FC8370552D}.Release|x64.ActiveCfg = Release|Win32
 		{150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.debug_static|Win32.ActiveCfg = Debug|x86
 		{150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.debug_static|x64.ActiveCfg = Debug|x64
 		{150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.debug_static|x64.Build.0 = Debug|x64
@@ -229,52 +200,40 @@ Global
 		{150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.Release|x64.Build.0 = Release|x64
 		{A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.debug_static|Win32.ActiveCfg = Debug|Win32
 		{A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.debug_static|Win32.Build.0 = Debug|Win32
-		{A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.debug_static|x64.ActiveCfg = Debug|x64
-		{A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.debug_static|x64.Build.0 = Debug|x64
+		{A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.debug_static|x64.ActiveCfg = Debug|Win32
 		{A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Debug|Win32.ActiveCfg = Debug|Win32
 		{A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Debug|Win32.Build.0 = Debug|Win32
-		{A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Debug|x64.ActiveCfg = Debug|x64
-		{A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Debug|x64.Build.0 = Debug|x64
+		{A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Debug|x64.ActiveCfg = Debug|Win32
 		{A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.release_static|Win32.ActiveCfg = Release|Win32
 		{A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.release_static|Win32.Build.0 = Release|Win32
-		{A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.release_static|x64.ActiveCfg = Release|x64
-		{A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.release_static|x64.Build.0 = Release|x64
+		{A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.release_static|x64.ActiveCfg = Release|Win32
 		{A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Release|Win32.ActiveCfg = Release|Win32
 		{A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Release|Win32.Build.0 = Release|Win32
-		{A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Release|x64.ActiveCfg = Release|x64
-		{A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Release|x64.Build.0 = Release|x64
+		{A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Release|x64.ActiveCfg = Release|Win32
 		{13BC1836-2726-45C4-9249-5BA2BBBF8328}.debug_static|Win32.ActiveCfg = Release|Win32
 		{13BC1836-2726-45C4-9249-5BA2BBBF8328}.debug_static|Win32.Build.0 = Release|Win32
-		{13BC1836-2726-45C4-9249-5BA2BBBF8328}.debug_static|x64.ActiveCfg = Release|x64
-		{13BC1836-2726-45C4-9249-5BA2BBBF8328}.debug_static|x64.Build.0 = Release|x64
+		{13BC1836-2726-45C4-9249-5BA2BBBF8328}.debug_static|x64.ActiveCfg = Release|Win32
 		{13BC1836-2726-45C4-9249-5BA2BBBF8328}.Debug|Win32.ActiveCfg = Release|Win32
 		{13BC1836-2726-45C4-9249-5BA2BBBF8328}.Debug|Win32.Build.0 = Release|Win32
-		{13BC1836-2726-45C4-9249-5BA2BBBF8328}.Debug|x64.ActiveCfg = Release|x64
-		{13BC1836-2726-45C4-9249-5BA2BBBF8328}.Debug|x64.Build.0 = Release|x64
+		{13BC1836-2726-45C4-9249-5BA2BBBF8328}.Debug|x64.ActiveCfg = Release|Win32
 		{13BC1836-2726-45C4-9249-5BA2BBBF8328}.release_static|Win32.ActiveCfg = Release|Win32
 		{13BC1836-2726-45C4-9249-5BA2BBBF8328}.release_static|Win32.Build.0 = Release|Win32
-		{13BC1836-2726-45C4-9249-5BA2BBBF8328}.release_static|x64.ActiveCfg = Release|x64
-		{13BC1836-2726-45C4-9249-5BA2BBBF8328}.release_static|x64.Build.0 = Release|x64
+		{13BC1836-2726-45C4-9249-5BA2BBBF8328}.release_static|x64.ActiveCfg = Release|Win32
 		{13BC1836-2726-45C4-9249-5BA2BBBF8328}.Release|Win32.ActiveCfg = Release|Win32
 		{13BC1836-2726-45C4-9249-5BA2BBBF8328}.Release|Win32.Build.0 = Release|Win32
-		{13BC1836-2726-45C4-9249-5BA2BBBF8328}.Release|x64.ActiveCfg = Release|x64
-		{13BC1836-2726-45C4-9249-5BA2BBBF8328}.Release|x64.Build.0 = Release|x64
+		{13BC1836-2726-45C4-9249-5BA2BBBF8328}.Release|x64.ActiveCfg = Release|Win32
 		{D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.debug_static|Win32.ActiveCfg = Debug|Win32
 		{D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.debug_static|Win32.Build.0 = Debug|Win32
-		{D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.debug_static|x64.ActiveCfg = Debug|x64
-		{D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.debug_static|x64.Build.0 = Debug|x64
+		{D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.debug_static|x64.ActiveCfg = Debug|Win32
 		{D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.Debug|Win32.ActiveCfg = Debug|Win32
 		{D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.Debug|Win32.Build.0 = Debug|Win32
-		{D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.Debug|x64.ActiveCfg = Debug|x64
-		{D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.Debug|x64.Build.0 = Debug|x64
+		{D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.Debug|x64.ActiveCfg = Debug|Win32
 		{D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.release_static|Win32.ActiveCfg = Release|Win32
 		{D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.release_static|Win32.Build.0 = Release|Win32
-		{D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.release_static|x64.ActiveCfg = Release|x64
-		{D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.release_static|x64.Build.0 = Release|x64
+		{D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.release_static|x64.ActiveCfg = Release|Win32
 		{D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.Release|Win32.ActiveCfg = Release|Win32
 		{D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.Release|Win32.Build.0 = Release|Win32
-		{D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.Release|x64.ActiveCfg = Release|x64
-		{D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.Release|x64.Build.0 = Release|x64
+		{D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.Release|x64.ActiveCfg = Release|Win32
 		{454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.debug_static|Win32.ActiveCfg = Release|Win32
 		{454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.debug_static|Win32.Build.0 = Release|Win32
 		{454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.debug_static|x64.ActiveCfg = Release|x64
@@ -296,29 +255,25 @@ Global
 		{62507C2F-9290-4342-910F-BFC44DF99B01}.debug_static|x64.ActiveCfg = Debug|Win32
 		{62507C2F-9290-4342-910F-BFC44DF99B01}.Debug|Win32.ActiveCfg = Debug|Win32
 		{62507C2F-9290-4342-910F-BFC44DF99B01}.Debug|Win32.Build.0 = Debug|Win32
-		{62507C2F-9290-4342-910F-BFC44DF99B01}.Debug|x64.ActiveCfg = Debug|x64
-		{62507C2F-9290-4342-910F-BFC44DF99B01}.Debug|x64.Build.0 = Debug|x64
+		{62507C2F-9290-4342-910F-BFC44DF99B01}.Debug|x64.ActiveCfg = Debug|Win32
 		{62507C2F-9290-4342-910F-BFC44DF99B01}.release_static|Win32.ActiveCfg = Release|Win32
 		{62507C2F-9290-4342-910F-BFC44DF99B01}.release_static|Win32.Build.0 = Release|Win32
 		{62507C2F-9290-4342-910F-BFC44DF99B01}.release_static|x64.ActiveCfg = Release|Win32
 		{62507C2F-9290-4342-910F-BFC44DF99B01}.Release|Win32.ActiveCfg = Release|Win32
 		{62507C2F-9290-4342-910F-BFC44DF99B01}.Release|Win32.Build.0 = Release|Win32
-		{62507C2F-9290-4342-910F-BFC44DF99B01}.Release|x64.ActiveCfg = Release|x64
-		{62507C2F-9290-4342-910F-BFC44DF99B01}.Release|x64.Build.0 = Release|x64
+		{62507C2F-9290-4342-910F-BFC44DF99B01}.Release|x64.ActiveCfg = Release|Win32
 		{2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.debug_static|Win32.ActiveCfg = Debug|Win32
 		{2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.debug_static|Win32.Build.0 = Debug|Win32
 		{2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.debug_static|x64.ActiveCfg = Debug|Win32
 		{2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Debug|Win32.ActiveCfg = Debug|Win32
 		{2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Debug|Win32.Build.0 = Debug|Win32
-		{2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Debug|x64.ActiveCfg = Debug|x64
-		{2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Debug|x64.Build.0 = Debug|x64
+		{2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Debug|x64.ActiveCfg = Debug|Win32
 		{2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.release_static|Win32.ActiveCfg = Release|Win32
 		{2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.release_static|Win32.Build.0 = Release|Win32
 		{2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.release_static|x64.ActiveCfg = Release|Win32
 		{2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Release|Win32.ActiveCfg = Release|Win32
 		{2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Release|Win32.Build.0 = Release|Win32
-		{2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Release|x64.ActiveCfg = Release|x64
-		{2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Release|x64.Build.0 = Release|x64
+		{2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Release|x64.ActiveCfg = Release|Win32
 		{72EFB681-1397-4193-BBF9-CA05AC52B75D}.debug_static|Win32.ActiveCfg = debug_static|Win32
 		{72EFB681-1397-4193-BBF9-CA05AC52B75D}.debug_static|Win32.Build.0 = debug_static|Win32
 		{72EFB681-1397-4193-BBF9-CA05AC52B75D}.debug_static|x64.ActiveCfg = debug_static|Win32
diff --git a/src/TortoiseShell/TortoiseShell.vcproj b/src/TortoiseShell/TortoiseShell.vcproj
index f013e00..1b54c51 100644
--- a/src/TortoiseShell/TortoiseShell.vcproj
+++ b/src/TortoiseShell/TortoiseShell.vcproj
@@ -23,8 +23,8 @@
 			OutputDirectory="..\..\bin\$(ConfigurationName)\bin"
 			IntermediateDirectory="..\..\obj\TortoiseShell\$(ConfigurationName)\"
 			ConfigurationType="2"
-			UseOfMFC="2"
-			UseOfATL="0"
+			UseOfMFC="0"
+			UseOfATL="1"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="1"
 			>
@@ -90,7 +90,7 @@
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=""
 				IgnoreAllDefaultLibraries="false"
-				IgnoreDefaultLibraryNames=""
+				IgnoreDefaultLibraryNames="LIBC"
 				ModuleDefinitionFile=".\ShellExt.def"
 				DelayLoadDLLs="gdiplus.dll"
 				GenerateDebugInformation="true"
@@ -127,14 +127,15 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="..\..\bin\Debug64\bin"
-			IntermediateDirectory="..\..\obj\TortoiseShell\Debug64"
+			Name="Release|Win32"
+			OutputDirectory="..\..\bin\$(ConfigurationName)\bin"
+			IntermediateDirectory="..\..\obj\TortoiseShell\$(ConfigurationName)\"
 			ConfigurationType="2"
-			UseOfMFC="2"
-			UseOfATL="0"
+			UseOfMFC="0"
+			UseOfATL="1"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="1"
+			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -150,38 +151,39 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
-				TargetEnvironment="3"
-				TypeLibraryName=".\Debug/TortoiseShell.tlb"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Release/TortoiseShell.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
-				InlineFunctionExpansion="0"
+				InlineFunctionExpansion="1"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
 				AdditionalIncludeDirectories="&quot;../Git&quot;;&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/apr/include;../Utils;..\TortoiseShell;..\SVN;&quot;..\..\ext\libintl\libintl3-win32\inc&quot;;..\Utils\MiscUI"
-				PreprocessorDefinitions="WIN64;_DEBUG;_WINDOWS;_USRDLL;SVN_DEBUG"
-				BasicRuntimeChecks="1"
-				RuntimeLibrary="3"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_TORTOISESHELL"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="false"
 				ForceConformanceInForLoopScope="true"
-				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
-				AssemblerListingLocation="..\..\obj\TortoiseShell\Debug64/"
-				ObjectFile="..\..\obj\TortoiseShell\Debug64/"
-				ProgramDataBaseFileName="..\..\obj\TortoiseShell\Debug64/"
+				AssemblerListingLocation="..\..\obj\TortoiseShell\Release/"
+				ObjectFile="..\..\obj\TortoiseShell\Release/"
+				ProgramDataBaseFileName="..\..\obj\TortoiseShell\Release/"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
 				CompileAs="0"
-				DisableSpecificWarnings="4996,4018"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;TSVNSHELL"
+				PreprocessorDefinitions="NDEBUG;TSVNSHELL"
 				Culture="1033"
 			/>
 			<Tool
@@ -190,21 +192,26 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
+				AdditionalOptions="/MACHINE:I386"
 				AdditionalDependencies="Crypt32.lib gdiplus.lib shfolder.lib shell32.lib comctl32.lib ws2_32.lib rpcrt4.lib shlwapi.lib wininet.lib version.lib"
-				OutputFile="$(OutDir)/TortoiseSVN.dll"
-				LinkIncremental="0"
+				OutputFile="$(OutDir)/TortoiseGit.dll"
+				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				IgnoreAllDefaultLibraries="false"
-				IgnoreDefaultLibraryNames=""
+				AdditionalLibraryDirectories=""
+				IgnoreDefaultLibraryNames="libcd, libc, shell32"
 				ModuleDefinitionFile=".\ShellExt.def"
 				DelayLoadDLLs="gdiplus.dll"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/TortoiseSVN.pdb"
+				ProgramDatabaseFile="$(OutDir)/TortoiseShell.pdb"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				OptimizeForWindows98="0"
 				BaseAddress="0x5960000"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
-				ImportLibrary="..\..\obj\TortoiseShell\Debug64/TortoiseSVN.lib"
-				TargetMachine="17"
+				ImportLibrary="..\..\obj\TortoiseShell\Release/TortoiseSVN.lib"
+				TargetMachine="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -229,15 +236,14 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\..\bin\$(ConfigurationName)\bin"
-			IntermediateDirectory="..\..\obj\TortoiseShell\$(ConfigurationName)\"
+			Name="Debug|x64"
+			OutputDirectory="..\..\bin\Debug64\bin"
+			IntermediateDirectory="..\..\obj\TortoiseShell\Debug64"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			UseOfATL="1"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="1"
-			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -253,35 +259,38 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Release/TortoiseShell.tlb"
+				TargetEnvironment="3"
+				TypeLibraryName=".\Debug/TortoiseShell.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				Optimization="0"
+				InlineFunctionExpansion="0"
 				AdditionalIncludeDirectories="&quot;../Git&quot;;&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/apr/include;../Utils;..\TortoiseShell;..\SVN;&quot;..\..\ext\libintl\libintl3-win32\inc&quot;;..\Utils\MiscUI"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_TORTOISESHELL"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
+				PreprocessorDefinitions="WIN64;_DEBUG;_WINDOWS;_USRDLL;SVN_DEBUG"
+				BasicRuntimeChecks="1"
+				RuntimeLibrary="3"
 				ForceConformanceInForLoopScope="true"
+				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
-				AssemblerListingLocation="..\..\obj\TortoiseShell\Release/"
-				ObjectFile="..\..\obj\TortoiseShell\Release/"
-				ProgramDataBaseFileName="..\..\obj\TortoiseShell\Release/"
+				AssemblerListingLocation="..\..\obj\TortoiseShell\Debug64/"
+				ObjectFile="..\..\obj\TortoiseShell\Debug64/"
+				ProgramDataBaseFileName="..\..\obj\TortoiseShell\Debug64/"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
 				CompileAs="0"
+				DisableSpecificWarnings="4996,4018"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;TSVNSHELL"
+				PreprocessorDefinitions="_DEBUG;TSVNSHELL"
 				Culture="1033"
 			/>
 			<Tool
@@ -290,26 +299,21 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
-				AdditionalOptions="/MACHINE:I386"
 				AdditionalDependencies="Crypt32.lib gdiplus.lib shfolder.lib shell32.lib comctl32.lib ws2_32.lib rpcrt4.lib shlwapi.lib wininet.lib version.lib"
-				OutputFile="$(OutDir)/TortoiseGit.dll"
-				LinkIncremental="1"
+				OutputFile="$(OutDir)/TortoiseSVN.dll"
+				LinkIncremental="0"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=""
-				IgnoreDefaultLibraryNames=""
+				IgnoreAllDefaultLibraries="false"
+				IgnoreDefaultLibraryNames="LIBC"
 				ModuleDefinitionFile=".\ShellExt.def"
 				DelayLoadDLLs="gdiplus.dll"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/TortoiseShell.pdb"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="0"
+				ProgramDatabaseFile="$(OutDir)/TortoiseSVN.pdb"
 				BaseAddress="0x5960000"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
-				ImportLibrary="..\..\obj\TortoiseShell\Release/TortoiseSVN.lib"
-				TargetMachine="1"
+				ImportLibrary="..\..\obj\TortoiseShell\Debug64/TortoiseSVN.lib"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -339,7 +343,7 @@
 			IntermediateDirectory="..\..\obj\TortoiseShell\Release64"
 			ConfigurationType="2"
 			UseOfMFC="0"
-			UseOfATL="0"
+			UseOfATL="1"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="1"
 			WholeProgramOptimization="1"
@@ -366,10 +370,14 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				InlineFunctionExpansion="1"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
 				AdditionalIncludeDirectories="&quot;../Git&quot;;&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/apr/include;../Utils;..\TortoiseShell;..\SVN;&quot;..\..\ext\libintl\libintl3-win32\inc&quot;;..\Utils\MiscUI"
 				PreprocessorDefinitions="WIN64;NDEBUG;_WINDOWS;_USRDLL"
 				StringPooling="true"
-				RuntimeLibrary="0"
+				RuntimeLibrary="2"
 				BufferSecurityCheck="false"
 				EnableFunctionLevelLinking="false"
 				ForceConformanceInForLoopScope="true"
@@ -399,7 +407,7 @@
 				OutputFile="$(OutDir)/TortoiseGit.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				IgnoreDefaultLibraryNames=""
+				IgnoreDefaultLibraryNames="libcd, libc, shell32"
 				ModuleDefinitionFile=".\ShellExt.def"
 				DelayLoadDLLs="gdiplus.dll"
 				GenerateDebugInformation="true"
@@ -532,7 +540,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -540,7 +548,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-- 
2.11.0