fix merge artifacts and build issues

Author: retailcoder

Rubberduck.CodeAnalysis/CodeAnalysisUI.Designer.cs

@@ -1,30 +1,30 @@
-using Extensibility;
-using Rubberduck.UI;
-using System;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Reflection;
-using System.Runtime.InteropServices;
-using System.Windows.Forms;
-using System.Windows.Threading;
-using Castle.Windsor;
+using Castle.Windsor;
+using Extensibility;
 using NLog;
 using Rubberduck.Common.WinAPI;
-using Rubberduck.Root;
 using Rubberduck.Resources;
 using Rubberduck.Resources.Registration;
+using Rubberduck.Root;
 using Rubberduck.Runtime;
 using Rubberduck.Settings;
 using Rubberduck.SettingsProvider;
+using Rubberduck.UI;
 using Rubberduck.VBEditor.ComManagement;
 using Rubberduck.VBEditor.ComManagement.TypeLibs;
 using Rubberduck.VBEditor.Events;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 using Rubberduck.VBEditor.VbeRuntime;
-using System.IO.Abstractions;
 using Rubberduck.VersionCheck;
+using System;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.IO.Abstractions;
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Windows.Forms;
+using System.Windows.Threading;
 
 namespace Rubberduck
 {
@@ -114,7 +114,7 @@ private Assembly LoadFromSameFolder(object sender, ResolveEventArgs args)
 
         public void OnStartupComplete(ref Array custom)
         {
-            InitializeAddIn();            
+            InitializeAddIn();
         }
 
         public void OnBeginShutdown(ref Array custom)
@@ -125,7 +125,7 @@ public void OnBeginShutdown(ref Array custom)
 
         // ReSharper disable InconsistentNaming
         public void OnDisconnection(ext_DisconnectMode RemoveMode, ref Array custom)
-        {            
+        {
             switch (RemoveMode)
             {
                 case ext_DisconnectMode.ext_dm_UserClosed:
@@ -278,7 +278,7 @@ private void ShutdownAddIn()
 
                 using (var windows = _vbe.Windows)
                 {
-                    windows.ReleaseDockableHosts();   
+                    windows.ReleaseDockableHosts();
                 }
 
                 if (_app != null)
@@ -321,10 +321,10 @@ private void ShutdownAddIn()
                 }
                 finally
                 {
-                    _logger.Trace("Unregistering AppDomain handlers....");  
+                    _logger.Trace("Unregistering AppDomain handlers....");
                     currentDomain.AssemblyResolve -= LoadFromSameFolder;
                     currentDomain.UnhandledException -= HandleAppDomainException;
-                    _logger.Trace( "Done. Main Shutdown completed. Toolwindows follow. Quack!");
+                    _logger.Trace("Done. Main Shutdown completed. Toolwindows follow. Quack!");
                     _isInitialized = false;
                 }
             }

Rubberduck.Main/Extension.cs

@@ -39,6 +39,7 @@
     <Reference Include="extensibility">
       <HintPath>$(MSBuildProgramFiles32)\Common Files\microsoft shared\MSEnv\PublicAssemblies\extensibility.dll</HintPath>
       <EmbedInteropTypes>True</EmbedInteropTypes>
+      <Aliases>VBEXT</Aliases>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
@@ -77,6 +78,7 @@
     </PackageReference>
     <PackageReference Include="Microsoft.VisualStudio.Interop" Version="17.0.31723.112" />
     <PackageReference Include="ExpressiveReflection" Version="2.0.1" />
+    <PackageReference Include="Moq" Version="4.8.0" />
     <PackageReference Include="NLog">
       <Version>4.5.10</Version>
     </PackageReference>

Rubberduck.Main/Rubberduck.Main.csproj

@@ -1,17 +1,16 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
-using Path = System.IO.Path;
 using System.Runtime.InteropServices.ComTypes;
-using Rubberduck.UI.AddRemoveReferences;
+using Path = System.IO.Path;
 
 namespace Rubberduck.Parsing.ComReflection.TypeLibReflection
 {
     public class RegisteredLibraryInfo
     {
         private static readonly Dictionary<int, string> NativeLocaleNames = new Dictionary<int, string>
         {
-            { 0, AddRemoveReferencesUI.DefaultLocale }
+            { 0, "en-US" }
         };
 
         public RegisteredLibraryKey UniqueId { get; }
@@ -41,8 +40,8 @@ public string LocaleName
                 }
                 catch
                 {
-                    NativeLocaleNames.Add(LocaleId, AddRemoveReferencesUI.DefaultLocale);
-                    return AddRemoveReferencesUI.DefaultLocale;
+                    NativeLocaleNames.Add(LocaleId, "en-US");
+                    return "en-US";
                 }
             }
         }

Rubberduck.Parsing/ComReflection/TypeLibReflection/RegisteredLibraryInfo.cs

@@ -12,7 +12,7 @@ public static class RubberduckGuid
         private const string TypeLibGuidspace = "E07C84";
         public const string RubberduckTypeLibGuid = TypeLibGuidspace + "1C" + GuidSuffix;
         public const string RubberduckApiTypeLibGuid = TypeLibGuidspace + "1D" + GuidSuffix;
-        
+
         // Addin Guids:
         private const string AddinGuidspace = "69E0F6";
         public const string ExtensionGuid = AddinGuidspace + "97" + GuidSuffix;
@@ -56,7 +56,7 @@ public static class RubberduckGuid
         public const string ParamsFreeFileGuid = UnitTestingGuidspace + "5C" + GuidSuffix;
         public const string ParamsDirGuid = UnitTestingGuidspace + "5E" + GuidSuffix;
         public const string ParamsFileCopyGuid = UnitTestingGuidspace + "5F" + GuidSuffix;
-        public const string IMockProviderGuid = UnitTestingGuidspace + "E2" + GuidSuffix;
+        public const string IMockProviderGuid = UnitTestingGuidspace + "F2" + GuidSuffix;
         public const string MockProviderGuid = UnitTestingGuidspace + "E3" + GuidSuffix;
         public const string IComMockGuid = UnitTestingGuidspace + "E4" + GuidSuffix;
         public const string ComMockGuid = UnitTestingGuidspace + "E5" + GuidSuffix;