Revert the changes made - we don't need the assembly at all....

Author: bclothier

Rubberduck.API/API/VBA/ParserState.cs

@@ -3,7 +3,6 @@
 using System.ComponentModel;
 using System.Globalization;
 using System.Linq;
-using System.Reflection;
 using System.Runtime.InteropServices;
 using Rubberduck.Common;
 using Rubberduck.Parsing.PreProcessing;
@@ -58,7 +57,7 @@ public sealed class ParserState : IParserState, IDisposable
 
         public ParserState()
         {
-            UiContextProvider.Initialize(Assembly.GetExecutingAssembly());
+            UiContextProvider.Initialize();
             _dispatcher = new UiDispatcher(UiContextProvider.Instance());
         }
 

Rubberduck.Core/App.cs

@@ -13,7 +13,9 @@
 using Rubberduck.Parsing.Inspections.Resources;
 using Rubberduck.Parsing.UIContext;
 using Rubberduck.UI.Command;
+using Rubberduck.VBEditor.ComManagement;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
+using Rubberduck.VBEditor.Utility;
 using Rubberduck.VersionCheck;
 using Application = System.Windows.Forms.Application;
 
@@ -48,6 +50,8 @@ public App(IVBE vbe,
             _checkVersionCommand = checkVersionCommand;
 
             _configService.SettingsChanged += _configService_SettingsChanged;
+            
+            UiContextProvider.Initialize();
         }
 
         private void _configService_SettingsChanged(object sender, ConfigurationChangedEventArgs e)

Rubberduck.Main/Extension.cs

@@ -19,7 +19,6 @@
 using Rubberduck.VBEditor.ComManagement;
 using Rubberduck.VBEditor.Events;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
-using Rubberduck.VBEditor.Utility;
 using Windows = Rubberduck.VBEditor.SafeComWrappers.VBA.Windows;
 
 namespace Rubberduck
@@ -220,9 +219,7 @@ private void Startup()
                 currentDomain.AssemblyResolve += LoadFromSameFolder;
 
                 _container = new WindsorContainer().Install(new RubberduckIoCInstaller(_ide, _addin, _initialSettings));
-
-                UiContextProvider.Initialize(Assembly.GetExecutingAssembly());
-
+                
                 _app = _container.Resolve<App>();
                 _app.Startup();
 

Rubberduck.VBEEditor/Utility/UiContext.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -10,7 +9,6 @@ public interface IUiContextProvider
         bool IsExecutingInUiContext();
         SynchronizationContext UiContext { get; }
         TaskScheduler UiTaskScheduler { get; }
-        Assembly GetEntryAssembly { get; }
     }
 
     public class UiContextProvider : IUiContextProvider
@@ -19,11 +17,10 @@ public class UiContextProvider : IUiContextProvider
         private static TaskScheduler TaskScheduler { get; set; }
         private static readonly UiContextProvider UiContextInstance = new UiContextProvider();
         private static readonly object Lock = new object();
-        private static Assembly _entryAssembly;
 
         private UiContextProvider() { }
 
-        public static void Initialize(Assembly entryAssembly)
+        public static void Initialize()
         {
             lock (Lock)
             {
@@ -34,15 +31,13 @@ public static void Initialize(Assembly entryAssembly)
 
                 Context = SynchronizationContext.Current;
                 TaskScheduler = TaskScheduler.FromCurrentSynchronizationContext();
-                _entryAssembly = entryAssembly;
             }
         }
 
         public static UiContextProvider Instance() => UiContextInstance;
 
         public SynchronizationContext UiContext => Context;
         public TaskScheduler UiTaskScheduler => TaskScheduler;
-        public Assembly GetEntryAssembly => _entryAssembly;
 
         public bool IsExecutingInUiContext()
         {