Fix unit tests and installer

Author: a.vorobiev

CDP4Composition/Modularity/PluginLoader.cs

@@ -136,9 +136,18 @@ private void LoadPlugins(string path)
 
             this.logger.Info($"Loading plugin files from path {path}: {string.Join("; ", dllCatalog.LoadedFiles.Select(p => new FileInfo(p).Name))}");
 
-            foreach (var composablePartDefinition in dllCatalog.Parts)
+            try
             {
-                this.logger.Info($"Imported part {composablePartDefinition}");
+                // try catch block as unit tests can throw an exception due to not all assemblies being preloaded.
+                // This is expected behavior
+                foreach (var composablePartDefinition in dllCatalog.Parts)
+                {
+                    this.logger.Info($"Imported part {composablePartDefinition}");
+                }
+            }
+            catch (Exception ex)
+            {
+                this.logger.Error($"Parts catalog unavailable due to missing assembly. Error: {ex.Message}");
             }
 
             this.DirectoryCatalogues.Add(dllCatalog);

CDP4IME.Tests/ShellViewModelTestFixture.cs

@@ -145,7 +145,7 @@ public void VerifyThatArgumentNullExceptionIsThrown()
         [Test]
         public void VerifyThatTheCaptionIsCorrect()
         {
-            var title = "COMET IME - Community Edition";
+            var title = "COMET IME  - Community Edition";
             Assert.AreEqual(title, this.viewModel.Title);
         }
 

CDP4IME/ShellViewModel.cs

@@ -150,7 +150,7 @@ public ShellViewModel(IDialogNavigationService dialogNavigationService, DockLayo
 
             this.dialogNavigationService = dialogNavigationService;
             this.DockViewModel = dockViewModel;
-            this.Title = $"COMET IME {Assembly.GetEntryAssembly().GetName().Version} - Community Edition";
+            this.Title = $"COMET IME {Assembly.GetEntryAssembly()?.GetName().Version} - Community Edition";
 
             this.logTarget = new MemoryEventTarget();
             this.logTarget.EventReceived += this.LogEventReceived;
@@ -218,7 +218,7 @@ public ShellViewModel(IDialogNavigationService dialogNavigationService, DockLayo
 
             this.OnClosingCommand = ReactiveCommand.CreateAsyncTask(async x => this.OnClosing(x as CancelEventArgs), RxApp.MainThreadScheduler);
 
-            logger.Info($"Welcome in the COMET IME version {Assembly.GetEntryAssembly().GetName().Version}");
+            logger.Info($"Welcome in the COMET IME version {Assembly.GetEntryAssembly()?.GetName().Version}");
             logger.Info($"IME Shell Initialized");
         }
 

CDP4IMEInstaller/Product.wxs

@@ -2,8 +2,6 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension">
 
   <Product Id="*" Name="COMET-CE" Language="1033" Version="10.0.1.1" Manufacturer="RHEA System S.A." UpgradeCode="83b3da1e-4a38-40f0-b2a6-5f58b32238a4">
-  <Product Id="*" Name="COMET-CE" Language="1033" Version="9.0.2.0" Manufacturer="RHEA System S.A." UpgradeCode="83b3da1e-4a38-40f0-b2a6-5f58b32238a4">
-
     <?include variables.wxi ?>
 
 		<Package InstallPrivileges="elevated"