Release v1.14.4.0

* Assoretd Nsis improvements
  Currency of Tigran (@geghamyan)
* Impemented/addressed SonarQube suggested changes to the Manaded UI dialogs.
  Currency of @neal83 and Gilles (@GilesBathgate)
* Issue #838: Small suggestion: Show UACWarning only after some delay

Source/Templates/ProjectTemplates/WixSharp Managed Setup - Cusom UI/Dialogs/ExitDialog.cs

@@ -1,7 +1,5 @@
-using System;
 using System.Diagnostics;
 using System.IO;
-using System.Linq;
 using System.Windows.Forms;
 
 using WixSharp;
@@ -85,7 +83,11 @@ void viewLog_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
                 System.IO.File.WriteAllText(logFile, Shell.Log);
                 Process.Start(logFile);
             }
-            catch { }
+            catch
+            {
+                //Catch all, we don't want the installer to crash in an
+                //attempt to view the log.
+            }
         }
     }
 }

Source/Templates/ProjectTemplates/WixSharp Managed Setup - Cusom UI/Dialogs/FeaturesDialog.cs

@@ -1,6 +1,4 @@
-using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using System.Windows.Forms;
 
@@ -36,7 +34,6 @@ public FeaturesDialog()
 
         void FeaturesDialog_Load(object sender, System.EventArgs e)
         {
-            //Debug.Assert(false);
             string drawTextOnlyProp = Runtime.Session.Property("WixSharpUI_TreeNode_TexOnlyDrawing");
 
             bool drawTextOnly = true;
@@ -48,11 +45,9 @@ void FeaturesDialog_Load(object sender, System.EventArgs e)
             }
             else
             {
-                float dpi = this.CreateGraphics().DpiY;
+                float dpi = CreateGraphics().DpiY;
                 if (dpi == 96) // the checkbox custom drawing is only compatible with 96 DPI
                     drawTextOnly = false;
-                else
-                    drawTextOnly = true;
             }
 
             ReadOnlyTreeNode.Behavior.AttachTo(featuresTree, drawTextOnly);
@@ -91,12 +86,12 @@ void ResetLayout()
         /// <summary>
         /// The collection of the features selected by user as the features to be installed.
         /// </summary>
-        public static List<string> UserSelectedItems;
+        public static List<string> UserSelectedItems { get; private set; }
 
         /// <summary>
         /// The initial/default set of selected items (features) before user made any selection(s).
         /// </summary>
-        public static List<string> InitialUserSelectedItems;
+        public static List<string> InitialUserSelectedItems { get; private set; }
 
         void BuildFeaturesHierarchy()
         {
@@ -175,17 +170,17 @@ void back_Click(object sender, System.EventArgs e)
 
         void next_Click(object sender, System.EventArgs e)
         {
-            bool userChangedFeatures = UserSelectedItems?.Join(",") != InitialUserSelectedItems.Join(",");
+            bool userChangedFeatures = UserSelectedItems?.JoinBy(",") != InitialUserSelectedItems.JoinBy(",");
 
             if (userChangedFeatures)
             {
                 string itemsToInstall = features.Where(x => x.IsViewChecked())
                                                 .Select(x => x.Name)
-                                                .Join(",");
+                                                .JoinBy(",");
 
                 string itemsToRemove = features.Where(x => !x.IsViewChecked())
                                                .Select(x => x.Name)
-                                               .Join(",");
+                                               .JoinBy(",");
 
                 if (itemsToRemove.Any())
                     Runtime.Session["REMOVE"] = itemsToRemove;

Source/Templates/ProjectTemplates/WixSharp Managed Setup - Cusom UI/Dialogs/InstallDirDialog.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Drawing;
 using System.Windows.Forms;
 
 using WixSharp;
@@ -93,9 +92,5 @@ void change_Click(object sender, EventArgs e)
                 }
             }
         }
-
-        private void label2_Click(object sender, EventArgs e)
-        {
-        }
     }
 }

Source/Templates/ProjectTemplates/WixSharp Managed Setup - Cusom UI/Dialogs/LicenceDialog.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Diagnostics;
-using System.Drawing;
 using System.IO;
 using System.Windows.Forms;
 
@@ -81,7 +80,11 @@ void print_Click(object sender, EventArgs e)
                 io.File.WriteAllText(file, agreement.Rtf);
                 Process.Start(file);
             }
-            catch { }
+            catch
+            {
+                //Catch all, we don't want the installer to crash in an
+                //attempt to write to a file.
+            }
         }
 
         void copyToolStripMenuItem_Click(object sender, EventArgs e)
@@ -103,7 +106,11 @@ void copyToolStripMenuItem_Click(object sender, EventArgs e)
 
                 Clipboard.SetDataObject(data);
             }
-            catch { }
+            catch
+            {
+                //Catch all, we don't want the installer to crash in an
+                //attempt at setting data on the clipboard.
+            }
         }
     }
 }

Source/Templates/ProjectTemplates/WixSharp Managed Setup - Cusom UI/Dialogs/MaintenanceTypeDialog.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Diagnostics;
 using System.Linq;
 
 using WixSharp;
@@ -27,8 +26,7 @@ Type ProgressDialog
             get
             {
                 return Shell.Dialogs
-                            .Where(d => d.GetInterfaces().Contains(typeof(IProgressDialog)))
-                            .FirstOrDefault();
+                    .FirstOrDefault(d => d.GetInterfaces().Contains(typeof(IProgressDialog)));
             }
         }
 

Source/Templates/ProjectTemplates/WixSharp Managed Setup - Cusom UI/Dialogs/ProgressDialog.cs

@@ -1,9 +1,6 @@
 using System;
-using System.Diagnostics;
 using System.Drawing;
 using System.Security.Principal;
-using System.Threading;
-using System.Windows.Forms;
 using Microsoft.Deployment.WindowsInstaller;
 using WixSharp.CommonTasks;
 
@@ -24,16 +21,26 @@ public ProgressDialog()
         {
             InitializeComponent();
             dialogText.MakeTransparentOn(banner);
+
+            showWaitPromptTimer = new System.Windows.Forms.Timer() { Interval = 4000 };
+            showWaitPromptTimer.Tick += (s, e) =>
+            {
+                this.waitPrompt.Visible = true;
+                showWaitPromptTimer.Stop();
+            };
         }
 
+        System.Windows.Forms.Timer showWaitPromptTimer;
+
         void ProgressDialog_Load(object sender, EventArgs e)
         {
             banner.Image = Runtime.Session.GetResourceBitmap("WixUI_Bmp_Banner");
 
             if (!WindowsIdentity.GetCurrent().IsAdmin() && Uac.IsEnabled())
             {
                 this.waitPrompt.Text = Runtime.Session.Property("UAC_WARNING");
-                this.waitPrompt.Visible = true;
+
+                showWaitPromptTimer.Start();
             }
 
             ResetLayout();
@@ -103,6 +110,7 @@ public override MessageResult ProcessMessage(InstallMessage messageType, Record
                 case InstallMessage.InstallStart:
                 case InstallMessage.InstallEnd:
                     {
+                        showWaitPromptTimer.Stop();
                         waitPrompt.Visible = false;
                     }
                     break;
@@ -156,9 +164,13 @@ messageRecord[2] unconditionally contains the string to display
                             }
 
                             if (message.IsNotEmpty())
-                                currentAction.Text = currentActionLabel.Text + " " + message;
+                                currentAction.Text = "{0} {1}".FormatWith(currentActionLabel.Text, message);
+                        }
+                        catch
+                        {
+                            //Catch all, we don't want the installer to crash in an
+                            //attempt to process message.
                         }
-                        catch { }
                     }
                     break;
             }
@@ -201,4 +213,4 @@ void cancel_Click(object sender, EventArgs e)
                 Shell.Cancel();
         }
     }
-}
+}

Source/Templates/ProjectTemplates/WixSharp Managed Setup - Cusom UI/Dialogs/SetupTypeDialog.cs

@@ -26,8 +26,7 @@ Type ProgressDialog
             get
             {
                 return Shell.Dialogs
-                            .Where(d => d.GetInterfaces().Contains(typeof(IProgressDialog)))
-                            .FirstOrDefault();
+                    .FirstOrDefault(d => d.GetInterfaces().Contains(typeof(IProgressDialog)));
             }
         }
 
@@ -48,7 +47,7 @@ void custom_Click(object sender, System.EventArgs e)
         void complete_Click(object sender, System.EventArgs e)
         {
             string[] names = Runtime.Session.Features.Select(x => x.Name).ToArray();
-            Runtime.Session["ADDLOCAL"] = names.Join(",");
+            Runtime.Session["ADDLOCAL"] = names.JoinBy(",");
 
             int index = Shell.Dialogs.IndexOf(ProgressDialog);
             if (index != -1)

Source/Templates/ProjectTemplates/WixSharp Managed Setup - Cusom UI/Dialogs/WelcomeDialog.cs

@@ -1,6 +1,4 @@
 using System;
-using System.Diagnostics;
-using System.Windows.Forms;
 
 using WixSharp;
 using WixSharp.UI.Forms;

Source/Templates/WixSharpVSIX/WixSharpVSIX/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.9.2.0")]
-[assembly: AssemblyFileVersion("1.9.2.0")]
+[assembly: AssemblyVersion("1.14.4.0")]
+[assembly: AssemblyFileVersion("1.14.4.0")]

Source/Templates/WixSharpVSIX/WixSharpVSIX/ReleaseNotes.txt

@@ -1,3 +1,8 @@
+v1.14.4.0
+* Impemented/addressed SonarQube suggested changes to the Manaded UI dialogs.  
+* Issue #838: Small suggestion: Show UACWarning only after some delay
+* Assoretd Nsis improvements
+
 v1.9.1.0
 * Issue #784: WixSharp Managed Setup - Custom UI - FeaturesDialog does not propagate user selection
 

Source/Templates/WixSharpVSIX/WixSharpVSIX/source.extension.vsixmanifest

@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
-    <Metadata>
-        <Identity Id="WixSharp Visual Studio project templetes" Version="1.9.2" Language="en-US" Publisher="Oleg Shilo" />
-        <DisplayName>WixSharp Project Templates</DisplayName>
-        <Description xml:space="preserve">A WixSharp project templates for WiX/MSI setup (C#).
+  <Metadata>
+    <Identity Id="WixSharp Visual Studio project templetes" Version="1.14.4" Language="en-US" Publisher="Oleg Shilo" />
+    <DisplayName>WixSharp Project Templates</DisplayName>
+    <Description xml:space="preserve">A WixSharp project templates for WiX/MSI setup (C#).
 Compatibility: Wix# v1.6.4.0 and higher</Description>
-        <ReleaseNotes>ReleaseNotes.txt</ReleaseNotes>
-        <Icon>wixsharp.ico</Icon>
-        <PreviewImage>wixsharp_logo.png</PreviewImage>
-        <Tags>WixSharp Wix# WiX MSI C# setup</Tags>
-    </Metadata>
-    <Installation>
-        <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[12.0,)" />
-    </Installation>
-    <Dependencies>
-        <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
-    </Dependencies>
+    <ReleaseNotes>ReleaseNotes.txt</ReleaseNotes>
+    <Icon>wixsharp.ico</Icon>
+    <PreviewImage>wixsharp_logo.png</PreviewImage>
+    <Tags>WixSharp Wix# WiX MSI C# setup</Tags>
+  </Metadata>
+  <Installation>
+    <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[12.0,)" />
+  </Installation>
+  <Dependencies>
+    <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
+  </Dependencies>
 
-    <Assets>
-        <Asset Type="Microsoft.VisualStudio.ItemTemplate" d:Source="File" Path="ItemTemplates" d:TargetPath="ItemTemplates\WixSharp UI Dialog.zip" />
-        <Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="File" Path="ProjectTemplates" d:TargetPath="ProjectTemplates\WixSharp\WixSharp Managed Setup.zip" />
-        <Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="File" Path="ProjectTemplates" d:TargetPath="ProjectTemplates\WixSharp\WixSharp Managed Setup - Custom Dialog.zip" />
-        <Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="File" Path="ProjectTemplates" d:TargetPath="ProjectTemplates\WixSharp\WixSharp Managed Setup - Cusom UI.zip" />
-        <Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="File" Path="ProjectTemplates" d:TargetPath="ProjectTemplates\WixSharp\WixSharp Setup.zip" />
-        <Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="File" Path="ProjectTemplates" d:TargetPath="ProjectTemplates\WixSharp\WixSharp Setup - Bootstrapper.zip" />
-    </Assets>
-    <Prerequisites>
-        <Prerequisite Id="Microsoft.Net.Component.4.6.TargetingPack" Version="[15.0,)" DisplayName=".NET Framework 4.6 targeting pack" />
-    </Prerequisites>
+  <Assets>
+    <Asset Type="Microsoft.VisualStudio.ItemTemplate" d:Source="File" Path="ItemTemplates" d:TargetPath="ItemTemplates\WixSharp UI Dialog.zip" />
+    <Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="File" Path="ProjectTemplates" d:TargetPath="ProjectTemplates\WixSharp\WixSharp Managed Setup.zip" />
+    <Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="File" Path="ProjectTemplates" d:TargetPath="ProjectTemplates\WixSharp\WixSharp Managed Setup - Custom Dialog.zip" />
+    <Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="File" Path="ProjectTemplates" d:TargetPath="ProjectTemplates\WixSharp\WixSharp Managed Setup - Cusom UI.zip" />
+    <Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="File" Path="ProjectTemplates" d:TargetPath="ProjectTemplates\WixSharp\WixSharp Setup.zip" />
+    <Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="File" Path="ProjectTemplates" d:TargetPath="ProjectTemplates\WixSharp\WixSharp Setup - Bootstrapper.zip" />
+  </Assets>
+  <Prerequisites>
+    <Prerequisite Id="Microsoft.Net.Component.4.6.TargetingPack" Version="[15.0,)" DisplayName=".NET Framework 4.6 targeting pack" />
+  </Prerequisites>
 </PackageManifest>