Make sure the assembly resolver code always runs

Fixes #461
github · Jul 29, 2016 · 319d4a3 · 319d4a3
1 parent b74a115
commit 319d4a3
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj b/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj
@@ -210,9 +210,7 @@
     </Compile>
     <Compile Include="Base\MenuBase.cs" />
     <Compile Include="Menus\CreateGist.cs" />
-    <Compile Include="..\common\SharedDictionaryManager.cs">
-      <Link>Helpers\SharedDictionaryManager.cs</Link>
-    </Compile>
+    <Compile Include="Helpers\SharedDictionaryManager.cs" />
     <Compile Include="Helpers\ActiveDocumentSnapshot.cs" />
     <Compile Include="Menus\OpenLink.cs" />
     <Compile Include="Menus\LinkMenuBase.cs" />

diff --git a/src/GitHub.VisualStudio/GitHubPackage.cs b/src/GitHub.VisualStudio/GitHubPackage.cs
@@ -53,6 +53,12 @@ public class GitHubPackage : Package
         };
 
         readonly IServiceProvider serviceProvider;
+        static bool resolverInitialized;
+
+        static GitHubPackage()
+        {
+            InitializeAssemblyResolver();
+        }
 
         public GitHubPackage()
         {
@@ -64,10 +70,16 @@ public GitHubPackage(IServiceProvider serviceProvider)
             this.serviceProvider = serviceProvider;
         }
 
-        protected override void Initialize()
+        public static void InitializeAssemblyResolver()
         {
+            if (resolverInitialized)
+                return;
             AppDomain.CurrentDomain.AssemblyResolve += LoadAssemblyFromRunDir;
+            resolverInitialized = true;
+        }
 
+        protected override void Initialize()
+        {
             base.Initialize();
             IncrementLaunchCount();
 

diff --git a/src/common/SharedDictionaryManager.cs → ...Studio/Helpers/SharedDictionaryManager.cs b/src/common/SharedDictionaryManager.cs → ...Studio/Helpers/SharedDictionaryManager.cs
@@ -6,6 +6,11 @@ namespace GitHub.VisualStudio.Helpers
 {
     public class SharedDictionaryManager : ResourceDictionary
     {
+        static SharedDictionaryManager()
+        {
+            GitHubPackage.InitializeAssemblyResolver();
+        }
+
         static readonly Dictionary<Uri, ResourceDictionary> resourceDicts = new Dictionary<Uri, ResourceDictionary>();
 
         Uri sourceUri;