Minor fixes for release

- Fixed dynamic properties topic. - Fixed installer so that it runs the VSIX uninstalls first and then the installs to prevent later versions of the package uninstalling older packages that are installed first.
EWSoftware · Jan 28, 2017 · 5fd011d · 5fd011d
1 parent f2a265d
commit 5fd011d
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 17 deletions.
diff --git a/Documentation/SandcastleBuilder/Content/GettingStarted/DynamicProperties.aml b/Documentation/SandcastleBuilder/Content/GettingStarted/DynamicProperties.aml
@@ -22,8 +22,7 @@ properties.  When built, those properties will be replaced with their values at
 example, you could enter the value "Version {@HelpFileVersion}, Git Commit ID: {@GitCommitId}" in the
 <legacyBold>Additional footer text</legacyBold> property to show the version number and Git commit ID in the
 footer of each page.</para>
-			</content>
-
+
 <code language="xml" title=" ">
 	&lt;PropertyGroup&gt;
 		&lt;!-- Add the custom target so that it runs before the help file is built--&gt;
@@ -70,11 +69,12 @@ footer of each page.</para>
 		&lt;/PropertyGroup&gt;
 	&lt;/Target&gt;
 </code>		
+			</content>
 		</section>
 
 		<relatedTopics>
 			<link xlink:href="b772e00e-1705-4062-adb6-774826ce6700" />
-			<link xlink:href="8ffc0d37-0215-4609-b6f8-dba53a6c5063" />		
+			<link xlink:href="8ffc0d37-0215-4609-b6f8-dba53a6c5063" />
 		</relatedTopics>
 	</developerConceptualDocument>
 </topic>
diff --git a/SHFB/Source/SandcastleInstaller/InstallerPages/SHFBVisualStudioPackagePage.xaml.cs b/SHFB/Source/SandcastleInstaller/InstallerPages/SHFBVisualStudioPackagePage.xaml.cs
@@ -2,7 +2,7 @@
 // System  : Sandcastle Guided Installation - Sandcastle Help File Builder
 // File    : SHFBVisualStudioPackagePage.cs
 // Author  : Eric Woodruff
-// Updated : 12/26/2016
+// Updated : 01/28/2017
 // Compiler: Microsoft Visual C#
 //
 // This file contains a page used to help the user install the Sandcastle Help File Builder Visual Studio package
@@ -385,8 +385,9 @@ private async void btnInstallPackage_Click(object sender, EventArgs e)
             {
                 await Task.Run(() =>
                 {
+                    // Do the uninstall first.  Packages for later versions will still see the package in
+                    // older versions of Visual Studio and uninstall it if not.
                     foreach(var package in vsixPackages.Where(p => !String.IsNullOrEmpty(p.VsixInstallerPath)))
-                    {
                         if(package.InstalledLocations.Count != 0)
                         {
                             // Try uninstalling any prior version before installing the latest release.
@@ -417,7 +418,9 @@ await Task.Run(() =>
                                     Directory.Delete(packagePath, true);
                         }
 
-                        // Now install the latest release
+                    // Now install the latest release
+                    foreach(var package in vsixPackages.Where(p => !String.IsNullOrEmpty(p.VsixInstallerPath)))
+                    {
                         exitCode = Utility.RunInstaller(package.VsixInstallerPath, "\"" + Path.Combine(
                             Utility.InstallResourcesPath, package.PackageName) + "\"");
 

diff --git a/SHFB/Source/SandcastleInstaller/Properties/AssemblyInfo.cs b/SHFB/Source/SandcastleInstaller/Properties/AssemblyInfo.cs
@@ -2,21 +2,21 @@
 // System  : Sandcastle Guided Installation
 // File    : AssemblyInfo.cs
 // Author  : Eric Woodruff  ([email protected])
-// Updated : 12/28/2013
+// Updated : 01/28/2017
 // Compiler: Microsoft Visual C#
 //
 // Sandcastle Guided Installation application attributes.
 //
 // This code is published under the Microsoft Public License (Ms-PL).  A copy of the license should be
-// distributed with the code.  It can also be found at the project website: https://GitHub.com/EWSoftware/SHFB.  This
+// distributed with the code and can be found at the project website: https://GitHub.com/EWSoftware/SHFB.  This
 // notice and all copyright notices must remain intact in all applications, documentation, and source files.
 //
-// Version     Date     Who  Comments
+//    Date     Who  Comments
 // ==============================================================================================================
-// 1.0.0.0  02/05/2011  EFW  Created the code
-// 1.1.0.0  03/05/2012  EFW  Converted to use WPF
-// 1.1.0.1  10/06/2012  EFW  Merged SHFB installer pages into the main project
-// -------  12/28/2013  EFW  Updated for use with the combined SHFB/Sandcastle tool set
+// 02/05/2011  EFW  Created the code
+// 03/05/2012  EFW  Converted to use WPF
+// 10/06/2012  EFW  Merged SHFB installer pages into the main project
+// 12/28/2013  EFW  Updated for use with the combined SHFB/Sandcastle tool set
 //===============================================================================================================
 
 using System;
@@ -25,7 +25,7 @@
 using System.Runtime.InteropServices;
 
 // Resources contained within the assembly are English
-[assembly: NeutralResourcesLanguageAttribute("en")]
+[assembly: NeutralResourcesLanguage("en")]
 
 //
 // General Information about an assembly is controlled through the following set of attributes. Change these
@@ -37,7 +37,7 @@
     "tools needed to create a working setup to build help files with the Sandcastle Help File Builder and Tools.")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Eric Woodruff")]
-[assembly: AssemblyCopyright("Copyright \xA9 2011-2013, Eric Woodruff, All Rights Reserved")]
+[assembly: AssemblyCopyright("Copyright \xA9 2011-2017, Eric Woodruff, All Rights Reserved")]
 [assembly: AssemblyTrademark("Eric Woodruff, All Rights Reserved")]
 [assembly: AssemblyCulture("")]
 
@@ -55,4 +55,4 @@
 // This versioning scheme allows build component and plug-in developers to use the same major, minor, and build
 // numbers as the Sandcastle Help File Builder to indicate with which version their components are compatible.
 //
-[assembly: AssemblyVersion("2013.12.28.0")]  // NOTE: Update app.manifest with this version number when it changes
+[assembly: AssemblyVersion("2017.1.28.0")]  // NOTE: Update app.manifest with this version number when it changes
diff --git a/SHFB/Source/SandcastleInstaller/app.manifest b/SHFB/Source/SandcastleInstaller/app.manifest
@@ -5,7 +5,7 @@
 	xmlns:asmv2="urn:schemas-microsoft-com:asm.v2"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
-	<assemblyIdentity version="2013.12.28.0" name="SandcastleInstaller" />
+	<assemblyIdentity version="2017.1.28.0" name="SandcastleInstaller" />
 
 	<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
 		<security>