Updated plugin assembly search and load to resolve assembly binding issue at runtime.

Author: marksjac

AWSDeploymentAssistant/AWSDeploymentAssistant.csproj

@@ -115,7 +115,6 @@
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
       <DependentUpon>Settings.settings</DependentUpon>
     </Compile>
-    <Compile Include="PluginUtil.cs" />
     <Compile Include="Request.cs" />
   </ItemGroup>
   <ItemGroup>

AWSDeploymentAssistant/App.config

@@ -38,7 +38,7 @@ or implied. See the License for the specific language governing permissions and
   </startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <probing privatePath="plugins" />
+      <probing privatePath="bin;bin\plugins" />
     </assemblyBinding>
   </runtime>
   <applicationSettings>

AWSDeploymentAssistant/Pipeline.cs

@@ -144,9 +144,9 @@ private void PopulateRequestWorkingDirectory()
 
         private void RunPlugins()
         {
-            DirectoryInfo taskDirectory = new DirectoryInfo(Program.TaskPluginFolderPath);
+            DirectoryInfo pluginDirectory = new DirectoryInfo(Program.TaskPluginFolderPath);
 
-            var assemblyFiles = taskDirectory.GetFiles("*.dll", SearchOption.AllDirectories);
+            var assemblyFiles = pluginDirectory.GetFiles("*.dll", SearchOption.AllDirectories);
 
             Program.Logger.InfoFormat("Found [{0}] plugin assemblies.", assemblyFiles.Count());
 

AWSDeploymentAssistant/PluginUtil.cs

@@ -14,11 +14,14 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
+using System.Linq;
 
 namespace AWSDeploymentAssistant
 {
     public class Program
     {
+        private static List<Assembly> _AssemblyCache;
+
         public const string LogFolderPath = "C:\\temp\\AWS Development Tools\\EC2 Deployment Assistant\\logs";
         public const string TempFolderPath = "C:\\temp\\AWS Development Tools\\EC2 Deployment Assistant\\temp";
 
@@ -32,6 +35,8 @@ public class Program
 
         static Program()
         {
+            Program._AssemblyCache = new List<Assembly>();
+
             log4net.GlobalContext.Properties["LogPath"] = Program.LogFolderPath;
             Program.Logger = LogManager.GetLogger(Settings.Default.DefaultLoggerName);
 
@@ -58,6 +63,8 @@ private static void Main(string[] args)
 
             try
             {
+                AppDomain.CurrentDomain.AssemblyResolve += Program.CurrentDomain_AssemblyResolve;
+
                 if (Directory.Exists(Program.TempFolderPath) == false)
                 {
                     Directory.CreateDirectory(Program.TempFolderPath);
@@ -243,5 +250,37 @@ public static AWSCredentials GetAWSCredentials(string profileName)
         {
             return Amazon.Util.ProfileManager.GetAWSCredentials(profileName);
         }
+
+        private static Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEventArgs args)
+        {
+            if (Program._AssemblyCache.Count == 0)
+            {
+                Assembly executingAssembly = Assembly.GetExecutingAssembly();
+
+                FileInfo executingFile = new FileInfo(executingAssembly.Location);
+
+                DirectoryInfo applicationPath = executingFile.Directory;
+
+                var assemblyFiles = applicationPath.GetFiles("*.dll", SearchOption.AllDirectories);
+
+                foreach (FileInfo assemblyFile in assemblyFiles)
+                {
+                    Assembly assembly = Assembly.LoadFile(assemblyFile.FullName);
+
+                    if (Program._AssemblyCache.Contains(assembly) == false)
+                    {
+                        Program._AssemblyCache.Add(assembly);
+                    }
+                }
+            }
+
+            string searchTarget = args.Name.Substring(0, args.Name.IndexOf(","));
+
+            Assembly result = (from a in Program._AssemblyCache
+                               where string.Equals(a.FullName.Substring(0, a.FullName.IndexOf(",")), searchTarget, StringComparison.Ordinal)
+                               select a).SingleOrDefault();
+
+            return result;
+        }
     }
 }

AWSDeploymentAssistant/Program.cs

@@ -61,7 +61,7 @@
     <Reference Include="System.Xml" />
     <Reference Include="YamlDotNet, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\YamlDotNet.4.0.0\lib\net35\YamlDotNet.dll</HintPath>
-      <Private>True</Private>
+      <Private>False</Private>
     </Reference>
   </ItemGroup>
   <ItemGroup>