From 90aeee42e4f5d6db95ef9148c54994f7ec7b557d Mon Sep 17 00:00:00 2001
From: Philippe Miossec <pmiossec@gmail.com>
Date: Sat, 15 Aug 2015 23:57:10 +0200
Subject: [PATCH] Copy GitTfs.Vs20xx in subfolders

and load assemblies from there...
---
 GitTfs.Vs2010/GitTfs.Vs2010.csproj  |  3 ++-
 GitTfs.Vs2012/GitTfs.Vs2012.csproj  |  3 ++-
 GitTfs.Vs2013/GitTfs.Vs2013.csproj  |  3 ++-
 GitTfs.Vs2015/GitTfs.Vs2015.csproj  |  3 ++-
 GitTfs/Core/TfsInterop/TfsPlugin.cs | 15 +++++++++++++++
 appveyor.yml                        |  2 +-
 6 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/GitTfs.Vs2010/GitTfs.Vs2010.csproj b/GitTfs.Vs2010/GitTfs.Vs2010.csproj
index af1ba7a1..ae69c072 100644
--- a/GitTfs.Vs2010/GitTfs.Vs2010.csproj
+++ b/GitTfs.Vs2010/GitTfs.Vs2010.csproj
@@ -144,7 +144,8 @@
   </Target>
   -->
   <PropertyGroup>
-    <PostBuildEvent>xcopy /y "$(TargetDir)*.dll" "$(SolutionDir)GitTfs\$(OutDir)"</PostBuildEvent>
+    <PostBuildEvent>mkdir "$(SolutionDir)GitTfs\$(OutDir)\$(ProjectName)"
+xcopy /y "$(TargetDir)*.dll" "$(SolutionDir)GitTfs\$(OutDir)\$(ProjectName)"</PostBuildEvent>
   </PropertyGroup>
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
 </Project>
\ No newline at end of file
diff --git a/GitTfs.Vs2012/GitTfs.Vs2012.csproj b/GitTfs.Vs2012/GitTfs.Vs2012.csproj
index 035ba2ef..2748f38b 100644
--- a/GitTfs.Vs2012/GitTfs.Vs2012.csproj
+++ b/GitTfs.Vs2012/GitTfs.Vs2012.csproj
@@ -94,7 +94,8 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>xcopy /y "$(TargetDir)*.dll" "$(SolutionDir)GitTfs\$(OutDir)"</PostBuildEvent>
+    <PostBuildEvent>mkdir "$(SolutionDir)GitTfs\$(OutDir)\$(ProjectName)"
+xcopy /y "$(TargetDir)*.dll" "$(SolutionDir)GitTfs\$(OutDir)\$(ProjectName)"</PostBuildEvent>
   </PropertyGroup>
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/GitTfs.Vs2013/GitTfs.Vs2013.csproj b/GitTfs.Vs2013/GitTfs.Vs2013.csproj
index a362889c..7eeb5900 100644
--- a/GitTfs.Vs2013/GitTfs.Vs2013.csproj
+++ b/GitTfs.Vs2013/GitTfs.Vs2013.csproj
@@ -96,7 +96,8 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>xcopy /y "$(TargetDir)*.dll" "$(SolutionDir)GitTfs\$(OutDir)"</PostBuildEvent>
+    <PostBuildEvent>mkdir "$(SolutionDir)GitTfs\$(OutDir)\$(ProjectName)"
+xcopy /y "$(TargetDir)*.dll" "$(SolutionDir)GitTfs\$(OutDir)\$(ProjectName)"</PostBuildEvent>
   </PropertyGroup>
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/GitTfs.Vs2015/GitTfs.Vs2015.csproj b/GitTfs.Vs2015/GitTfs.Vs2015.csproj
index 55c7256e..219ba665 100644
--- a/GitTfs.Vs2015/GitTfs.Vs2015.csproj
+++ b/GitTfs.Vs2015/GitTfs.Vs2015.csproj
@@ -282,7 +282,8 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>xcopy /y "$(TargetDir)*.dll" "$(SolutionDir)GitTfs\$(OutDir)"</PostBuildEvent>
+    <PostBuildEvent>mkdir "$(SolutionDir)GitTfs\$(OutDir)\$(ProjectName)"
+xcopy /y "$(TargetDir)*.dll" "$(SolutionDir)GitTfs\$(OutDir)\$(ProjectName)"</PostBuildEvent>
   </PropertyGroup>
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
   <Import Project="..\packages\Microsoft.TeamFoundationServer.ExtendedClient.14.83.1\build\Microsoft.TeamFoundationServer.ExtendedClient.targets" Condition="Exists('..\packages\Microsoft.TeamFoundationServer.ExtendedClient.14.83.1\build\Microsoft.TeamFoundationServer.ExtendedClient.targets')" />
diff --git a/GitTfs/Core/TfsInterop/TfsPlugin.cs b/GitTfs/Core/TfsInterop/TfsPlugin.cs
index d2fbe9e9..a6e1b3e3 100644
--- a/GitTfs/Core/TfsInterop/TfsPlugin.cs
+++ b/GitTfs/Core/TfsInterop/TfsPlugin.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Reflection;
 using StructureMap;
 using StructureMap.Graph;
+using System.IO;
 
 namespace Sep.Git.Tfs.Core.TfsInterop
 {
@@ -29,9 +30,13 @@ namespace Sep.Git.Tfs.Core.TfsInterop
         class PluginLoader
         {
             private List<Exception> _failures = new List<Exception>();
+            private static string VsPluginAssemblyFolder { get; set; }
 
             public TfsPlugin Try(string assembly, string pluginType)
             {
+                VsPluginAssemblyFolder = assembly;
+                AppDomain currentDomain = AppDomain.CurrentDomain;
+                currentDomain.AssemblyResolve += LoadFromSameFolder;
                 try
                 {
                     var plugin = (TfsPlugin)Activator.CreateInstance(Assembly.Load(assembly).GetType(pluginType));
@@ -44,9 +49,19 @@ namespace Sep.Git.Tfs.Core.TfsInterop
                 {
                     _failures.Add(e);
                 }
+                currentDomain.AssemblyResolve -= LoadFromSameFolder;
                 return null;
             }
 
+            static Assembly LoadFromSameFolder(object sender, ResolveEventArgs args)
+            {
+                string folderPath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+                string assemblyPath = Path.Combine(folderPath, VsPluginAssemblyFolder, new AssemblyName(args.Name).Name + ".dll");
+                if (File.Exists(assemblyPath) == false) return null;
+                Assembly assembly = Assembly.LoadFrom(assemblyPath);
+                return assembly;
+            }
+
             public TfsPlugin Fail()
             {
                 throw new PluginLoaderException(_failures);
diff --git a/appveyor.yml b/appveyor.yml
index 5b7913f1..090e76b3 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -19,7 +19,7 @@ after_build:
         $libgit2Binaries=Get-ChildItem ".\packages\" -Filter "NativeBinaries" -Recurse | Select-Object -First 1 | % { $_.FullName }
         Copy-Item $libgit2Binaries "$Env:APPVEYOR_BUILD_FOLDER\GitTfs\bin\$env:Config" -Recurse
       }
-      Get-ChildItem .\packages -Recurse -Filter Microsoft.WITDataStore*.dll | Copy-Item -Destination "$Env:APPVEYOR_BUILD_FOLDER\GitTfs\bin\Debug\"
+      Get-ChildItem .\packages -Recurse -Filter Microsoft.WITDataStore*.dll | Copy-Item -Destination "$Env:APPVEYOR_BUILD_FOLDER\GitTfs\bin\$env:Config\GitTfs.Vs2015\"
       $zipFile= "git-tfs_$Env:APPVEYOR_REPO_COMMIT.zip"
       7z a $zipFile "$Env:APPVEYOR_BUILD_FOLDER\GitTfs\bin\$env:Config\*" -xr!"*.pdb"
 test: