Post-merge clean up and rearrange to use the Resources project, updat…

…e all nuget packages
rubberduck-vba · May 14, 2018 · dff72e1 · dff72e1
1 parent f4afbf8
commit dff72e1
Show file tree

Hide file tree

Showing 62 changed files with 300 additions and 427 deletions.
diff --git a/Rubberduck.API/Properties/AssemblyInfo.cs b/Rubberduck.API/Properties/AssemblyInfo.cs
@@ -1,7 +1,7 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using Rubberduck.SharedResources.COM;
+using Rubberduck.Resources.Registration;
 
 // General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information

diff --git a/Rubberduck.API/Rubberduck.API.csproj b/Rubberduck.API/Rubberduck.API.csproj
@@ -60,9 +60,9 @@
       <Project>{a4a618e1-cbca-435f-9c6c-5181e030adfc}</Project>
       <Name>Rubberduck.Parsing</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Rubberduck.SharedResources\Rubberduck.SharedResources.csproj">
-      <Project>{8039defa-60c9-4511-8160-7969b40b3e4c}</Project>
-      <Name>Rubberduck.SharedResources</Name>
+    <ProjectReference Include="..\Rubberduck.Resources\Rubberduck.Resources.csproj">
+      <Project>{1b84b387-f7c4-4876-9bdf-c644c365359a}</Project>
+      <Name>Rubberduck.Resources</Name>
     </ProjectReference>
     <ProjectReference Include="..\Rubberduck.VBEEditor\Rubberduck.VBEditor.csproj">
       <Project>{8ce35eb3-8852-4ba1-84dd-df3f5d2967b0}</Project>

diff --git a/Rubberduck.API/VBA/APIProvider.cs b/Rubberduck.API/VBA/APIProvider.cs
@@ -1,7 +1,7 @@
 using System.ComponentModel;
 using Rubberduck.API.VBA;
 using System.Runtime.InteropServices;
-using Rubberduck.SharedResources.COM;
+using Rubberduck.Resources.Registration;
 
 namespace Rubberduck.API
 {

diff --git a/Rubberduck.API/VBA/Accessibility.cs b/Rubberduck.API/VBA/Accessibility.cs
@@ -1,5 +1,5 @@
 using System.Runtime.InteropServices;
-using Rubberduck.SharedResources.COM;
+using Rubberduck.Resources.Registration;
 using Source = Rubberduck.Parsing.Symbols;
 
 namespace Rubberduck.API.VBA

diff --git a/Rubberduck.API/VBA/Declaration.cs b/Rubberduck.API/VBA/Declaration.cs
@@ -2,7 +2,7 @@
 using System.ComponentModel;
 using System.Linq;
 using System.Runtime.InteropServices;
-using Rubberduck.SharedResources.COM;
+using Rubberduck.Resources.Registration;
 using RubberduckDeclaration = Rubberduck.Parsing.Symbols.Declaration;
 
 namespace Rubberduck.API.VBA

diff --git a/Rubberduck.API/VBA/DeclarationType.cs b/Rubberduck.API/VBA/DeclarationType.cs
@@ -1,5 +1,5 @@
 using System.Runtime.InteropServices;
-using Rubberduck.SharedResources.COM;
+using Rubberduck.Resources.Registration;
 using Source = Rubberduck.Parsing.Symbols;
 
 namespace Rubberduck.API.VBA
@@ -10,33 +10,34 @@ namespace Rubberduck.API.VBA
     ]
     public enum DeclarationType
     {
-        BracketedExpression = Source.DeclarationType.BracketedExpression,
-        ClassModule = Source.DeclarationType.ClassModule,
-        ComAlias = Source.DeclarationType.ComAlias,
-        Constant = Source.DeclarationType.Constant,
-        Control = Source.DeclarationType.Control,
-        Document = Source.DeclarationType.Document,
-        Enumeration = Source.DeclarationType.Enumeration,
-        EnumerationMember = Source.DeclarationType.EnumerationMember,
-        Event = Source.DeclarationType.Event,
-        Function = Source.DeclarationType.Function,
-        LibraryFunction = Source.DeclarationType.LibraryFunction,
-        LibraryProcedure = Source.DeclarationType.LibraryProcedure,
-        LineLabel = Source.DeclarationType.LineLabel,
-        Member = Source.DeclarationType.Member,
-        Module = Source.DeclarationType.Module,
-        Parameter = Source.DeclarationType.Parameter,
-        ProceduralModule = Source.DeclarationType.ProceduralModule,
-        Procedure = Source.DeclarationType.Procedure,
-        Project = Source.DeclarationType.Project,
-        Property = Source.DeclarationType.Property,
-        PropertyGet = Source.DeclarationType.PropertyGet,
-        PropertyLet = Source.DeclarationType.PropertyLet,
-        PropertySet = Source.DeclarationType.PropertySet,
-        UnresolvedMember = Source.DeclarationType.UnresolvedMember,
-        UserDefinedType = Source.DeclarationType.UserDefinedType,
-        UserDefinedTypeMember = Source.DeclarationType.UserDefinedTypeMember,
-        UserForm = Source.DeclarationType.UserForm,
-        Variable = Source.DeclarationType.Variable
+        //TODO: figure out a cleaner way to handle long/int 
+        BracketedExpression = (int)Source.DeclarationType.BracketedExpression,
+        ClassModule = (int)Source.DeclarationType.ClassModule,
+        ComAlias = (int)Source.DeclarationType.ComAlias,
+        Constant = (int)Source.DeclarationType.Constant,
+        Control = (int)Source.DeclarationType.Control,
+        Document = (int)Source.DeclarationType.Document,
+        Enumeration = (int)Source.DeclarationType.Enumeration,
+        EnumerationMember = (int)Source.DeclarationType.EnumerationMember,
+        Event = (int)Source.DeclarationType.Event,
+        Function = (int)Source.DeclarationType.Function,
+        LibraryFunction = (int)Source.DeclarationType.LibraryFunction,
+        LibraryProcedure = (int)Source.DeclarationType.LibraryProcedure,
+        LineLabel = (int)Source.DeclarationType.LineLabel,
+        Member = (int)Source.DeclarationType.Member,
+        Module = (int)Source.DeclarationType.Module,
+        Parameter = (int)Source.DeclarationType.Parameter,
+        ProceduralModule = (int)Source.DeclarationType.ProceduralModule,
+        Procedure = (int)Source.DeclarationType.Procedure,
+        Project = (int)Source.DeclarationType.Project,
+        Property = (int)Source.DeclarationType.Property,
+        PropertyGet = (int)Source.DeclarationType.PropertyGet,
+        PropertyLet = (int)Source.DeclarationType.PropertyLet,
+        PropertySet = (int)Source.DeclarationType.PropertySet,
+        UnresolvedMember = (int)Source.DeclarationType.UnresolvedMember,
+        UserDefinedType = (int)Source.DeclarationType.UserDefinedType,
+        UserDefinedTypeMember = (int)Source.DeclarationType.UserDefinedTypeMember,
+        UserForm = (int)Source.DeclarationType.UserForm,
+        Variable = (int)Source.DeclarationType.Variable
     }
 }
diff --git a/Rubberduck.API/VBA/Declarations.cs b/Rubberduck.API/VBA/Declarations.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.InteropServices;
-using Rubberduck.SharedResources.COM;
+using Rubberduck.Resources.Registration;
 
 namespace Rubberduck.API.VBA
 {

diff --git a/Rubberduck.API/VBA/IdentifierReference.cs b/Rubberduck.API/VBA/IdentifierReference.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel;
 using System.Runtime.InteropServices;
-using Rubberduck.SharedResources.COM;
+using Rubberduck.Resources.Registration;
 
 namespace Rubberduck.API.VBA
 {

diff --git a/Rubberduck.API/VBA/IdentifierReferences.cs b/Rubberduck.API/VBA/IdentifierReferences.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.InteropServices;
-using Rubberduck.SharedResources.COM;
+using Rubberduck.Resources.Registration;
 
 namespace Rubberduck.API.VBA
 {

diff --git a/Rubberduck.API/VBA/Parser.cs b/Rubberduck.API/VBA/Parser.cs
@@ -4,14 +4,13 @@
 using System.Globalization;
 using System.Linq;
 using System.Runtime.InteropServices;
-using System.Threading;
 using Rubberduck.Common;
-using Rubberduck.SharedResources.COM;
 using Rubberduck.Parsing.PreProcessing;
 using Rubberduck.Parsing.Symbols.DeclarationLoaders;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.UIContext;
+using Rubberduck.Resources.Registration;
 using Rubberduck.VBEditor.ComManagement;
 using Rubberduck.VBEditor.Events;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;

diff --git a/Rubberduck.API/VBA/ParserState.cs b/Rubberduck.API/VBA/ParserState.cs
@@ -1,6 +1,6 @@
 using System.Runtime.InteropServices;
 using Source = Rubberduck.Parsing.VBA;
-using Rubberduck.SharedResources.COM;
+using Rubberduck.Resources.Registration;
 
 namespace Rubberduck.API.VBA
 {

diff --git a/Rubberduck.Core/EasyHook32.dll b/Rubberduck.Core/EasyHook32.dll
diff --git a/Rubberduck.Core/EasyHook32Svc.exe b/Rubberduck.Core/EasyHook32Svc.exe
diff --git a/Rubberduck.Core/EasyHook64.dll b/Rubberduck.Core/EasyHook64.dll
diff --git a/Rubberduck.Core/EasyHook64Svc.exe b/Rubberduck.Core/EasyHook64Svc.exe
diff --git a/Rubberduck.Core/EasyLoad32.dll b/Rubberduck.Core/EasyLoad32.dll
diff --git a/Rubberduck.Core/EasyLoad64.dll b/Rubberduck.Core/EasyLoad64.dll
diff --git a/Rubberduck.Core/Rubberduck.Core.csproj b/Rubberduck.Core/Rubberduck.Core.csproj
@@ -232,19 +232,19 @@
       <HintPath>..\packages\Antlr4.Runtime.4.6.4\lib\net45\Antlr4.Runtime.dll</HintPath>
     </Reference>
     <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <HintPath>..\packages\Castle.Core.4.0.0\lib\net45\Castle.Core.dll</HintPath>
+      <HintPath>..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll</HintPath>
     </Reference>
     <Reference Include="Castle.Windsor, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <HintPath>..\packages\Castle.Windsor.4.0.0\lib\net45\Castle.Windsor.dll</HintPath>
+      <HintPath>..\packages\Castle.Windsor.4.1.0\lib\net45\Castle.Windsor.dll</HintPath>
     </Reference>
-    <Reference Include="EasyHook, Version=2.7.6270.0, Culture=neutral, PublicKeyToken=4b580fca19d0b0c5, processorArchitecture=MSIL">
-      <HintPath>..\packages\EasyHook.2.7.6270\lib\net40\EasyHook.dll</HintPath>
+    <Reference Include="EasyHook, Version=2.7.6684.0, Culture=neutral, PublicKeyToken=4b580fca19d0b0c5, processorArchitecture=MSIL">
+      <HintPath>..\packages\EasyHook.2.7.6684\lib\net40\EasyHook.dll</HintPath>
     </Reference>
     <Reference Include="extensibility, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
-    <Reference Include="HtmlAgilityPack, Version=1.8.1.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
-      <HintPath>..\packages\HtmlAgilityPack.1.8.1\lib\Net45\HtmlAgilityPack.dll</HintPath>
+    <Reference Include="HtmlAgilityPack, Version=1.8.2.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
+      <HintPath>..\packages\HtmlAgilityPack.1.8.2\lib\Net45\HtmlAgilityPack.dll</HintPath>
     </Reference>
     <Reference Include="ICSharpCode.AvalonEdit, Version=5.0.3.0, Culture=neutral, PublicKeyToken=9cc39be672370310, processorArchitecture=MSIL">
       <HintPath>..\packages\AvalonEdit.5.0.4\lib\Net40\ICSharpCode.AvalonEdit.dll</HintPath>
@@ -964,10 +964,6 @@
       <Project>{e85e1253-86d6-45ee-968b-f37348d44132}</Project>
       <Name>Rubberduck.SettingsProvider</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Rubberduck.SharedResources\Rubberduck.SharedResources.csproj">
-      <Project>{8039defa-60c9-4511-8160-7969b40b3e4c}</Project>
-      <Name>Rubberduck.SharedResources</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Rubberduck.SmartIndenter\Rubberduck.SmartIndenter.csproj">
       <Project>{B9C0BF22-4D8A-4BF4-89F9-E789C0063DEB}</Project>
       <Name>Rubberduck.SmartIndenter</Name>

diff --git a/Rubberduck.Core/UI/DockableToolwindowPresenter.cs b/Rubberduck.Core/UI/DockableToolwindowPresenter.cs
@@ -3,7 +3,7 @@
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
 using NLog;
-using Rubberduck.SharedResources.COM;
+using Rubberduck.Resources.Registration;
 using Rubberduck.Settings;
 using Rubberduck.SettingsProvider;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;

diff --git a/Rubberduck.Core/UnitTesting/ProjectTestExtensions.cs b/Rubberduck.Core/UnitTesting/ProjectTestExtensions.cs
@@ -2,7 +2,7 @@
 using System.Runtime.InteropServices;
 using System.Reflection;
 using Microsoft.Win32;
-using Rubberduck.SharedResources.COM;
+using Rubberduck.Resources.Registration;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 
 namespace Rubberduck.UnitTesting

diff --git a/Rubberduck.Core/packages.config b/Rubberduck.Core/packages.config
@@ -2,12 +2,12 @@
 <packages>
   <package id="Antlr4.Runtime" version="4.6.4" targetFramework="net46" />
   <package id="AvalonEdit" version="5.0.4" targetFramework="net46" />
-  <package id="Castle.Core" version="4.1.1" targetFramework="net46" />
-  <package id="Castle.Windsor" version="4.0.0" targetFramework="net46" />
-  <package id="EasyHook" version="2.7.6270" targetFramework="net46" />
-  <package id="HtmlAgilityPack" version="1.4.9.5" targetFramework="net46" />
-  <package id="NLog" version="4.4.12" targetFramework="net46" />
-  <package id="NLog.Schema" version="4.4.12" targetFramework="net46" />
+  <package id="Castle.Core" version="4.2.1" targetFramework="net46" />
+  <package id="Castle.Windsor" version="4.1.0" targetFramework="net46" />
+  <package id="EasyHook" version="2.7.6684" targetFramework="net46" />
+  <package id="HtmlAgilityPack" version="1.8.2" targetFramework="net46" />
+  <package id="NLog" version="4.5.4" targetFramework="net46" />
+  <package id="NLog.Schema" version="4.5.4" targetFramework="net46" />
   <package id="System.ValueTuple" version="4.4.0" targetFramework="net46" />
   <package id="System.Windows.Interactivity.WPF" version="2.0.20525" targetFramework="net46" />
 </packages>
diff --git a/Rubberduck.Inspections/packages.config b/Rubberduck.Inspections/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Antlr4.Runtime" version="4.6.4" targetFramework="net46" />
-  <package id="NLog" version="4.4.12" targetFramework="net46" />
-  <package id="NLog.Schema" version="4.4.12" targetFramework="net46" />
+  <package id="NLog" version="4.5.4" targetFramework="net46" />
+  <package id="NLog.Schema" version="4.5.4" targetFramework="net46" />
   <package id="System.ValueTuple" version="4.4.0" targetFramework="net46" />
 </packages>
diff --git a/Rubberduck.Main/ComClientLibrary/Abstract/UnitTesting/IAssert.cs b/Rubberduck.Main/ComClientLibrary/Abstract/UnitTesting/IAssert.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel;
 using System.Runtime.InteropServices;
-using Rubberduck.SharedResources.COM;
+using Rubberduck.Resources.Registration;
 
 // ReSharper disable InconsistentNaming
 // The parameters on RD's public interfaces are following VBA conventions not C# conventions to stop the

diff --git a/Rubberduck.Main/ComClientLibrary/Abstract/UnitTesting/IFake.cs b/Rubberduck.Main/ComClientLibrary/Abstract/UnitTesting/IFake.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel;
 using System.Runtime.InteropServices;
-using Rubberduck.SharedResources.COM;
+using Rubberduck.Resources.Registration;
 
 // The parameters on RD's public interfaces are following VBA conventions not C# conventions to stop the
 // obnoxious "Can I haz all identifiers with the same casing" behavior of the VBE.

diff --git a/Rubberduck.Main/ComClientLibrary/Abstract/UnitTesting/IFakesProvider.cs b/Rubberduck.Main/ComClientLibrary/Abstract/UnitTesting/IFakesProvider.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel;
 using System.Runtime.InteropServices;
-using Rubberduck.SharedResources.COM;
+using Rubberduck.Resources.Registration;
 
 namespace Rubberduck.UnitTesting
 {

diff --git a/Rubberduck.Main/ComClientLibrary/Abstract/UnitTesting/IStub.cs b/Rubberduck.Main/ComClientLibrary/Abstract/UnitTesting/IStub.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel;
 using System.Runtime.InteropServices;
-using Rubberduck.SharedResources.COM;
+using Rubberduck.Resources.Registration;
 
 // The parameters on RD's public interfaces are following VBA conventions not C# conventions to stop the
 // obnoxious "Can I haz all identifiers with the same casing" behavior of the VBE.

diff --git a/Rubberduck.Main/ComClientLibrary/Abstract/UnitTesting/IVerify.cs b/Rubberduck.Main/ComClientLibrary/Abstract/UnitTesting/IVerify.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel;
 using System.Runtime.InteropServices;
-using Rubberduck.SharedResources.COM;
+using Rubberduck.Resources.Registration;
 
 // The parameters on RD's public interfaces are following VBA conventions not C# conventions to stop the
 // obnoxious "Can I haz all identifiers with the same casing" behavior of the VBE.

diff --git a/Rubberduck.Main/ComClientLibrary/UI/DockableWindowHost.cs b/Rubberduck.Main/ComClientLibrary/UI/DockableWindowHost.cs
@@ -8,7 +8,7 @@
 using Rubberduck.VBEditor.WindowsApi;
 using User32 = Rubberduck.Common.WinAPI.User32;
 using NLog;
-using Rubberduck.SharedResources.COM;
+using Rubberduck.Resources.Registration;
 using Rubberduck.UI.CustomComWrappers;
 
 namespace Rubberduck.UI

diff --git a/Rubberduck.Main/ComClientLibrary/UnitTesting/AssertClass.cs b/Rubberduck.Main/ComClientLibrary/UnitTesting/AssertClass.cs
@@ -5,7 +5,6 @@
 using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using Rubberduck.SharedResources.COM;
 using Rubberduck.Parsing.Grammar;
 using Rubberduck.Resources.Registration;
 using Rubberduck.Resources.UnitTesting;

diff --git a/Rubberduck.Main/ComClientLibrary/UnitTesting/FakesProvider.cs b/Rubberduck.Main/ComClientLibrary/UnitTesting/FakesProvider.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Runtime.InteropServices;
-using Rubberduck.SharedResources.COM;
+using Rubberduck.Resources.Registration;
 using Rubberduck.UnitTesting.Fakes;
 
 namespace Rubberduck.UnitTesting

diff --git a/Rubberduck.Main/ComClientLibrary/UnitTesting/PermissiveAssertClass.cs b/Rubberduck.Main/ComClientLibrary/UnitTesting/PermissiveAssertClass.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Runtime.InteropServices;
-using Rubberduck.SharedResources.COM;
+using Rubberduck.Resources.Registration;
 
 namespace Rubberduck.UnitTesting
 {	

diff --git a/Rubberduck.Main/Extension.cs b/Rubberduck.Main/Extension.cs
@@ -12,9 +12,9 @@
 using System.Windows.Threading;
 using Castle.Windsor;
 using NLog;
-using Rubberduck.SharedResources.COM;
 using Rubberduck.Root;
 using Rubberduck.Resources;
+using Rubberduck.Resources.Registration;
 using Rubberduck.Settings;
 using Rubberduck.SettingsProvider;
 using Rubberduck.VBEditor.ComManagement;

diff --git a/Rubberduck.Main/Properties/AssemblyInfo.cs b/Rubberduck.Main/Properties/AssemblyInfo.cs
@@ -1,7 +1,7 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Runtime.CompilerServices;
-using Rubberduck.SharedResources.COM;
+using Rubberduck.Resources.Registration;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information

diff --git a/Rubberduck.Main/Rubberduck.Main.csproj b/Rubberduck.Main/Rubberduck.Main.csproj
@@ -303,10 +303,10 @@
       <HintPath>..\packages\Antlr4.Runtime.4.6.4\lib\net45\Antlr4.Runtime.dll</HintPath>
     </Reference>
     <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <HintPath>..\packages\Castle.Core.4.0.0\lib\net45\Castle.Core.dll</HintPath>
+      <HintPath>..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll</HintPath>
     </Reference>
     <Reference Include="Castle.Windsor, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <HintPath>..\packages\Castle.Windsor.4.0.0\lib\net45\Castle.Windsor.dll</HintPath>
+      <HintPath>..\packages\Castle.Windsor.4.1.0\lib\net45\Castle.Windsor.dll</HintPath>
     </Reference>
     <Reference Include="EasyHook, Version=2.7.6684.0, Culture=neutral, PublicKeyToken=4b580fca19d0b0c5, processorArchitecture=MSIL">
       <HintPath>..\packages\EasyHook.2.7.6684\lib\net40\EasyHook.dll</HintPath>
@@ -366,10 +366,6 @@
       <Project>{E85E1253-86D6-45EE-968B-F37348D44132}</Project>
       <Name>Rubberduck.SettingsProvider</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Rubberduck.SharedResources\Rubberduck.SharedResources.csproj">
-      <Project>{8039defa-60c9-4511-8160-7969b40b3e4c}</Project>
-      <Name>Rubberduck.SharedResources</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Rubberduck.SmartIndenter\Rubberduck.SmartIndenter.csproj">
       <Project>{B9C0BF22-4D8A-4BF4-89F9-E789C0063DEB}</Project>
       <Name>Rubberduck.SmartIndenter</Name>

diff --git a/Rubberduck.Main/packages.config b/Rubberduck.Main/packages.config
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Antlr4.Runtime" version="4.6.4" targetFramework="net46" />
-  <package id="Castle.Core" version="4.2.0" targetFramework="net46" />
+  <package id="Castle.Core" version="4.2.1" targetFramework="net46" />
   <package id="Castle.Windsor" version="4.1.0" targetFramework="net46" />
-  <package id="EasyHook" version="2.7.6578.1" targetFramework="net46" />
-  <package id="NLog" version="4.4.12" targetFramework="net46" />
-  <package id="NLog.Schema" version="4.4.12" targetFramework="net46" />
+  <package id="EasyHook" version="2.7.6684" targetFramework="net46" />
+  <package id="NLog" version="4.5.4" targetFramework="net46" />
+  <package id="NLog.Schema" version="4.5.4" targetFramework="net46" />
 </packages>
diff --git a/Rubberduck.Parsing/Symbols/DeclarationType.cs b/Rubberduck.Parsing/Symbols/DeclarationType.cs
@@ -42,7 +42,6 @@ public enum DeclarationType : long
         DocObject = 1L << 33 | ClassModule,
         RelatedDocument = 1L << 34,
         ActiveXDesigner = 1L << 35 | ClassModule
-
     }
 
     public interface IIdentifier { IdentifierNode Identifier { get; } }