Merge pull request #3844 from Vogel612/whoopsie-cleanup

retailcoder · web-flow · commit 443a039b2948 · 2018-03-15T16:56:14.000-04:00
Emergency fix for Code Explorer commands.
diff --git a/Rubberduck.Main/Root/RubberduckIoCInstaller.cs b/Rubberduck.Main/Root/RubberduckIoCInstaller.cs
@@ -520,7 +520,8 @@ private Type[] ToolsMenuItems()
 
         private static void RegisterCodeExplorerViewModelWithCodeExplorerCommands(IWindsorContainer container)
         {
-            var codeExplorerCommands = Assembly.GetExecutingAssembly().GetTypes()
+            // Assumption: All Commands are defined in the same assembly as CommandBase
+            var codeExplorerCommands = Assembly.GetAssembly(typeof(CommandBase)).GetTypes()
                 .Where(type => type.IsClass && type.Namespace != null &&
                                type.CustomAttributes.Any(a => a.AttributeType == typeof(CodeExplorerCommandAttribute)));
             container.Register(Component.For<CodeExplorerViewModel>()

Original file line number	Diff line number	Diff line change
`@@ -520,7 +520,8 @@ private Type[] ToolsMenuItems()`
`520`	`520`
`521`	`521`	`private static void RegisterCodeExplorerViewModelWithCodeExplorerCommands(IWindsorContainer container)`
`522`	`522`	`{`
`523`		`- var codeExplorerCommands = Assembly.GetExecutingAssembly().GetTypes()`
	`523`	`+ // Assumption: All Commands are defined in the same assembly as CommandBase`
	`524`	`+ var codeExplorerCommands = Assembly.GetAssembly(typeof(CommandBase)).GetTypes()`
`524`	`525`	`.Where(type => type.IsClass && type.Namespace != null &&`
`525`	`526`	`type.CustomAttributes.Any(a => a.AttributeType == typeof(CodeExplorerCommandAttribute)));`
`526`	`527`	`container.Register(Component.For<CodeExplorerViewModel>()`