set EmbedInteropTypes to false; Ninject can now correctly resolve the…

… VBE dependency across assemblies :)
rubberduck-vba · Jul 24, 2015 · f61e9ed · f61e9ed
1 parent 67b9549
commit f61e9ed
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/RetailCoder.VBE/Root/RubberduckConventions.cs b/RetailCoder.VBE/Root/RubberduckConventions.cs
@@ -1,9 +1,11 @@
 using System.Linq;
+using System.Reflection;
 using Microsoft.Vbe.Interop;
 using Ninject;
 using Ninject.Extensions.Conventions;
 using Rubberduck.Parsing;
 using Rubberduck.Parsing.VBA;
+using Rubberduck.SourceControl;
 using Rubberduck.VBEditor;
 
 namespace Rubberduck.Root
@@ -19,9 +21,10 @@ public RubberduckConventions(IKernel kernel)
 
         public void Apply(VBE vbe, AddIn addin)
         {
+            _kernel.Bind<App>().ToSelf();
+
             _kernel.Bind<VBE>().ToConstant(vbe);
             _kernel.Bind<AddIn>().ToConstant(addin);
-            _kernel.Bind<App>().ToSelf();
 
             // bind IFoo to Foo across all assemblies:
             _kernel.Bind(t => t.FromThisAssembly().SelectAllClasses().BindDefaultInterface());

diff --git a/RetailCoder.VBE/Rubberduck.csproj b/RetailCoder.VBE/Rubberduck.csproj
@@ -252,7 +252,6 @@
     <Compile Include="Refactorings\ReorderParameters\ReorderParametersPresenter.cs" />
     <Compile Include="Refactorings\ReorderParameters\ReorderParametersPresenterFactory.cs" />
     <Compile Include="Refactorings\ReorderParameters\ReorderParametersRefactoring.cs" />
-    <Compile Include="Root\ActiveCodePaneEditor.cs" />
     <Compile Include="Root\RubberduckConventions.cs" />
     <Compile Include="Settings\DisplayLanguageSetting.cs" />
     <Compile Include="Settings\SourceControlConfiguration.cs" />

diff --git a/Rubberduck.SourceControl/Rubberduck.SourceControl.csproj b/Rubberduck.SourceControl/Rubberduck.SourceControl.csproj
@@ -41,7 +41,7 @@
     </Reference>
     <Reference Include="Microsoft.Vbe.Interop, Version=12.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c">
       <SpecificVersion>False</SpecificVersion>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
       <HintPath>..\libs\Microsoft.Vbe.Interop.dll</HintPath>
     </Reference>
     <Reference Include="System" />

diff --git a/RetailCoder.VBE/Root/ActiveCodePaneEditor.cs → Rubberduck.VBEEditor/ActiveCodePaneEditor.cs b/RetailCoder.VBE/Root/ActiveCodePaneEditor.cs → Rubberduck.VBEEditor/ActiveCodePaneEditor.cs
diff --git a/Rubberduck.VBEEditor/Rubberduck.VBEditor.csproj b/Rubberduck.VBEEditor/Rubberduck.VBEditor.csproj
@@ -52,14 +52,15 @@
     </Reference>
     <Reference Include="Microsoft.Vbe.Interop, Version=12.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c">
       <SpecificVersion>False</SpecificVersion>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
       <HintPath>..\libs\Microsoft.Vbe.Interop.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ActiveCodePaneEditor.cs" />
     <Compile Include="DocumentEventHandlerPrefixes.cs" />
     <Compile Include="Extensions\CodeModuleExtensions.cs" />
     <Compile Include="CodeModuleSelection.cs" />