From f5ee6e3e5e840a37859350aaae78e7fd4a4cf983 Mon Sep 17 00:00:00 2001
From: de4dot <de4dot@gmail.com>
Date: Sat, 10 Mar 2012 20:47:42 +0100
Subject: [PATCH] Move dll files to a bin sub dir

---
 AssemblyData/AssemblyData.csproj             |  4 ++--
 AssemblyServer-x64/App.config                | 14 +++++++-------
 AssemblyServer-x64/AssemblyServer-x64.csproj |  4 ++--
 AssemblyServer/App.config                    | 14 +++++++-------
 AssemblyServer/AssemblyServer.csproj         |  4 ++--
 blocks/blocks.csproj                         |  4 ++--
 de4dot-x64/App.config                        | 17 ++++++++++-------
 de4dot-x64/de4dot-x64.csproj                 |  2 ++
 de4dot.code/de4dot.code.csproj               |  8 ++++----
 de4dot.cui/de4dot.cui.csproj                 |  4 ++--
 de4dot/App.config                            | 17 ++++++++++-------
 de4dot/de4dot.csproj                         |  2 ++
 12 files changed, 52 insertions(+), 42 deletions(-)

diff --git a/AssemblyData/AssemblyData.csproj b/AssemblyData/AssemblyData.csproj
index 4608d021..572b1a81 100644
--- a/AssemblyData/AssemblyData.csproj
+++ b/AssemblyData/AssemblyData.csproj
@@ -19,7 +19,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\Debug\</OutputPath>
+    <OutputPath>..\Debug\bin\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\Release\</OutputPath>
+    <OutputPath>..\Release\bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
diff --git a/AssemblyServer-x64/App.config b/AssemblyServer-x64/App.config
index 272ab1c9..04ebe36f 100644
--- a/AssemblyServer-x64/App.config
+++ b/AssemblyServer-x64/App.config
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <configuration>
-  <startup>
-    <supportedRuntime version="v4.0"/>
-    <supportedRuntime version="v2.0.50727"/>
-  </startup>
-  <runtime>
-    <loadFromRemoteSources enabled="true"/>
-  </runtime>
+	<startup>
+		<supportedRuntime version="v4.0"/>
+		<supportedRuntime version="v2.0.50727"/>
+	</startup>
+	<runtime>
+		<loadFromRemoteSources enabled="true"/>
+	</runtime>
 </configuration>
\ No newline at end of file
diff --git a/AssemblyServer-x64/AssemblyServer-x64.csproj b/AssemblyServer-x64/AssemblyServer-x64.csproj
index 88b8d3f9..68b91d4a 100644
--- a/AssemblyServer-x64/AssemblyServer-x64.csproj
+++ b/AssemblyServer-x64/AssemblyServer-x64.csproj
@@ -20,7 +20,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\Debug\</OutputPath>
+    <OutputPath>..\Debug\bin\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -29,7 +29,7 @@
     <PlatformTarget>x64</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\Release\</OutputPath>
+    <OutputPath>..\Release\bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
diff --git a/AssemblyServer/App.config b/AssemblyServer/App.config
index 272ab1c9..04ebe36f 100644
--- a/AssemblyServer/App.config
+++ b/AssemblyServer/App.config
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <configuration>
-  <startup>
-    <supportedRuntime version="v4.0"/>
-    <supportedRuntime version="v2.0.50727"/>
-  </startup>
-  <runtime>
-    <loadFromRemoteSources enabled="true"/>
-  </runtime>
+	<startup>
+		<supportedRuntime version="v4.0"/>
+		<supportedRuntime version="v2.0.50727"/>
+	</startup>
+	<runtime>
+		<loadFromRemoteSources enabled="true"/>
+	</runtime>
 </configuration>
\ No newline at end of file
diff --git a/AssemblyServer/AssemblyServer.csproj b/AssemblyServer/AssemblyServer.csproj
index 9cb76191..5a3c0394 100644
--- a/AssemblyServer/AssemblyServer.csproj
+++ b/AssemblyServer/AssemblyServer.csproj
@@ -20,7 +20,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\Debug\</OutputPath>
+    <OutputPath>..\Debug\bin\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -29,7 +29,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\Release\</OutputPath>
+    <OutputPath>..\Release\bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
diff --git a/blocks/blocks.csproj b/blocks/blocks.csproj
index 5a0ee223..06dd36d9 100644
--- a/blocks/blocks.csproj
+++ b/blocks/blocks.csproj
@@ -19,7 +19,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\Debug\</OutputPath>
+    <OutputPath>..\Debug\bin\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -27,7 +27,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\Release\</OutputPath>
+    <OutputPath>..\Release\bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
diff --git a/de4dot-x64/App.config b/de4dot-x64/App.config
index 272ab1c9..9ea4c422 100644
--- a/de4dot-x64/App.config
+++ b/de4dot-x64/App.config
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <configuration>
-  <startup>
-    <supportedRuntime version="v4.0"/>
-    <supportedRuntime version="v2.0.50727"/>
-  </startup>
-  <runtime>
-    <loadFromRemoteSources enabled="true"/>
-  </runtime>
+	<startup>
+		<supportedRuntime version="v4.0"/>
+		<supportedRuntime version="v2.0.50727"/>
+	</startup>
+	<runtime>
+		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+			<probing privatePath="bin"/>
+		</assemblyBinding>
+		<loadFromRemoteSources enabled="true"/>
+	</runtime>
 </configuration>
\ No newline at end of file
diff --git a/de4dot-x64/de4dot-x64.csproj b/de4dot-x64/de4dot-x64.csproj
index 9b8eaba9..5214f324 100644
--- a/de4dot-x64/de4dot-x64.csproj
+++ b/de4dot-x64/de4dot-x64.csproj
@@ -59,4 +59,6 @@
   <Target Name="AfterBuild">
   </Target>
   -->
+  <Target Name="_CopyFilesMarkedCopyLocal">
+  </Target>
 </Project>
\ No newline at end of file
diff --git a/de4dot.code/de4dot.code.csproj b/de4dot.code/de4dot.code.csproj
index 01ff0ef0..f04a37b7 100644
--- a/de4dot.code/de4dot.code.csproj
+++ b/de4dot.code/de4dot.code.csproj
@@ -21,7 +21,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\Debug\</OutputPath>
+    <OutputPath>..\Debug\bin\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -30,7 +30,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\Release\</OutputPath>
+    <OutputPath>..\Release\bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -285,8 +285,8 @@
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>copy "$(SolutionDir)LICENSE*.txt" "$(OutDir)"
-copy "$(SolutionDir)COPYING" "$(OutDir)"</PostBuildEvent>
+    <PostBuildEvent>copy "$(SolutionDir)LICENSE*.txt" "..\$(OutDir).."
+copy "$(SolutionDir)COPYING" "..\$(OutDir).."</PostBuildEvent>
   </PropertyGroup>
   <!-- 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.
diff --git a/de4dot.cui/de4dot.cui.csproj b/de4dot.cui/de4dot.cui.csproj
index b8db6c89..f10e18e5 100644
--- a/de4dot.cui/de4dot.cui.csproj
+++ b/de4dot.cui/de4dot.cui.csproj
@@ -21,7 +21,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\Debug\</OutputPath>
+    <OutputPath>..\Debug\bin\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -30,7 +30,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\Release\</OutputPath>
+    <OutputPath>..\Release\bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
diff --git a/de4dot/App.config b/de4dot/App.config
index 272ab1c9..9ea4c422 100644
--- a/de4dot/App.config
+++ b/de4dot/App.config
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <configuration>
-  <startup>
-    <supportedRuntime version="v4.0"/>
-    <supportedRuntime version="v2.0.50727"/>
-  </startup>
-  <runtime>
-    <loadFromRemoteSources enabled="true"/>
-  </runtime>
+	<startup>
+		<supportedRuntime version="v4.0"/>
+		<supportedRuntime version="v2.0.50727"/>
+	</startup>
+	<runtime>
+		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+			<probing privatePath="bin"/>
+		</assemblyBinding>
+		<loadFromRemoteSources enabled="true"/>
+	</runtime>
 </configuration>
\ No newline at end of file
diff --git a/de4dot/de4dot.csproj b/de4dot/de4dot.csproj
index f28439f3..f809ebcb 100644
--- a/de4dot/de4dot.csproj
+++ b/de4dot/de4dot.csproj
@@ -55,4 +55,6 @@
   <Target Name="AfterBuild">
   </Target>
   -->
+  <Target Name="_CopyFilesMarkedCopyLocal">
+  </Target>
 </Project>
\ No newline at end of file