Updated for release

EWSoftware · Jan 8, 2018 · efb3d06 · efb3d06
1 parent d95f457
commit efb3d06
Show file tree

Hide file tree

Showing 10 changed files with 59 additions and 12 deletions.
diff --git a/Deployment/InstallerConfiguration.xml b/Deployment/InstallerConfiguration.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <configuration>
 	<!-- This indicates the version of Sandcastle with which this installer is associated.-->
-	<sandcastle version="v2017.12.30.0" />
+	<sandcastle version="v2017.12.30.2" />
 
 	<!-- Define the installer pages.  Third-party build tool and component providers can add new pages that
 			 they have created to install their own products as well. -->
@@ -12,8 +12,8 @@
 				 executing installer. -->
 		<page type="Sandcastle.Installer.InstallerPages.WelcomePage" />
 		<page type="Sandcastle.Installer.InstallerPages.WhatsNewPage">
-			<whatsNew url="http://EWSoftware.github.io/SHFB/html/8479cf1a-4f4f-4f0b-89f7-85a04cd78d16.htm"
-				description="Sandcastle Help File Builder and Tools v2017.12.30.0 Release Notes" />
+			<whatsNew url="http://EWSoftware.github.io/SHFB/html/3ca9bf44-db1d-45f7-833c-a046d724da1e.htm"
+				description="Sandcastle Help File Builder and Tools v2017.12.30.2 Release Notes" />
 		</page>
 		<page type="Sandcastle.Installer.InstallerPages.RequiredFrameworkPage" />
 		<page type="Sandcastle.Installer.InstallerPages.HelpFileFormatsPage">
@@ -22,7 +22,7 @@
 
 		<!-- Sandcastle Help File Builder and Tools installer pages -->
 		<page type="Sandcastle.Installer.InstallerPages.SandcastleHelpFileBuilderPage"
-			frameworkVersion="4.5" shfbVersion="2017.12.30.0" installerName="SandcastleHelpFileBuilder.msi"/>
+			frameworkVersion="4.5" shfbVersion="2017.12.30.2" installerName="SandcastleHelpFileBuilder.msi"/>
 		<page type="Sandcastle.Installer.InstallerPages.SHFBVisualStudioPackagePage"
 			frameworkVersion="4.5" packageGuid="c997d569-ee8e-4947-a46f-9a0717ce39a0">
 			<!-- These paths can be adjusted if you installed Visual Studio in a non-standard location.  They must

diff --git a/Documentation/SandcastleBuilder/CommonTokens.tokens b/Documentation/SandcastleBuilder/CommonTokens.tokens
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <content xml:space="preserve" xmlns:ddue="http://ddue.schemas.microsoft.com/authoring/2003/5" xmlns:xlink="http://www.w3.org/1999/xlink">
   <item id="BuildDate">{@BuildDate:MMMM d, yyyy}</item>
-  <item id="SandcastleVersion">v2017.12.30.0</item>
+  <item id="SandcastleVersion">v2017.12.30.2</item>
   <item id="SHFB"><ddue:externalLink xmlns:ddue="http://ddue.schemas.microsoft.com/authoring/2003/5">
     <ddue:linkText>Sandcastle Help File Builder</ddue:linkText>
     <ddue:linkUri>https://github.com/EWSoftware/SHFB</ddue:linkUri>

diff --git a/Documentation/SandcastleBuilder/Content/VersionHistory/VersionHistory.aml b/Documentation/SandcastleBuilder/Content/VersionHistory/VersionHistory.aml
@@ -16,6 +16,12 @@ review the release notes from all releases after it to the latest to find change
 your project such as modifications to build component and plug-in configurations.</para>
 
 				<list class="bullet">
+					<listItem>
+						<para>
+							<link xlink:href="3ca9bf44-db1d-45f7-833c-a046d724da1e" />
+						</para>
+					</listItem>
+
 					<listItem>
 						<para>
 							<link xlink:href="8479cf1a-4f4f-4f0b-89f7-85a04cd78d16" />

diff --git a/Documentation/SandcastleBuilder/Content/VersionHistory/v2017.12.30.2.aml b/Documentation/SandcastleBuilder/Content/VersionHistory/v2017.12.30.2.aml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<topic id="3ca9bf44-db1d-45f7-833c-a046d724da1e" revisionNumber="1">
+	<developerConceptualDocument xmlns="http://ddue.schemas.microsoft.com/authoring/2003/5" xmlns:xlink="http://www.w3.org/1999/xlink">
+		<introduction>
+				<para>This is a minor update to correct the two issues noted below.  See the
+<link xlink:href="8479cf1a-4f4f-4f0b-89f7-85a04cd78d16" /> release notes for important information on some
+breaking changes.</para>
+		</introduction>
+
+		<section>
+			<title>Changes in This Release</title>
+			<content>
+
+				<list class="bullet">
+					<listItem>
+						<para>Modified the names and handling of the relationship files in the Open XML presentation style to
+work around an issue with the latest version of NuGet which adds a duplicate entry to its content types file for
+the <localUri>.rels</localUri> file type which can break third-party tools that parse the package.</para>
+					</listItem>
+
+					<listItem>
+						<para>Merged changes to fix a couple of issues with the update to the Lightweight Website Style TOC
+plug-in to construct TOC URLs relative to the root.</para>
+					</listItem>
+				</list>
+
+			</content>
+		</section>
+
+		<relatedTopics>
+
+		</relatedTopics>
+
+	</developerConceptualDocument>
+</topic>
diff --git a/Documentation/SandcastleBuilder/SandcastleBuilder.content b/Documentation/SandcastleBuilder/SandcastleBuilder.content
@@ -1377,11 +1377,16 @@
       <HelpKeyword index="K" term="support, donate" />
     </HelpKeywords>
   </Topic>
-  <Topic id="078cc1c7-7995-431e-bf9c-8813becbe8df" visible="True" isSelected="true" title="Version History">
+  <Topic id="078cc1c7-7995-431e-bf9c-8813becbe8df" visible="True" isExpanded="true" title="Version History">
     <HelpKeywords>
       <HelpKeyword index="K" term="History" />
       <HelpKeyword index="K" term="Version History" />
     </HelpKeywords>
+    <Topic id="3ca9bf44-db1d-45f7-833c-a046d724da1e" visible="True" isSelected="true" title="Version 2017.12.30.2">
+      <HelpKeywords>
+        <HelpKeyword index="K" term="versions, 2017.12.30.2" />
+      </HelpKeywords>
+    </Topic>
     <Topic id="8479cf1a-4f4f-4f0b-89f7-85a04cd78d16" visible="True" title="Version 2017.12.30.0">
       <HelpKeywords>
         <HelpKeyword index="K" term="versions, 2017.12.30.0" />

diff --git a/Documentation/SandcastleBuilder/SandcastleBuilder.shfbproj b/Documentation/SandcastleBuilder/SandcastleBuilder.shfbproj
@@ -389,6 +389,7 @@
     <None Include="Content\VersionHistory\v2016.5.28.aml" />
     <None Include="Content\VersionHistory\v2016.9.17.0.aml" />
     <None Include="Content\VersionHistory\v2017.12.30.0.aml" />
+    <None Include="Content\VersionHistory\v2017.12.30.2.aml" />
     <None Include="Content\VersionHistory\v2017.5.15.0.aml" />
     <None Include="Content\VersionHistory\v2017.1.28.0.aml" />
     <None Include="Content\VisualStudio\GoToDefinition.aml" />

diff --git a/NuGet/SHFB.nuspec b/NuGet/SHFB.nuspec
@@ -6,7 +6,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
 	<metadata>
 		<id>EWSoftware.SHFB</id>
-		<version>2017.12.30.1</version>
+		<version>2017.12.30.2</version>
 		<title>Sandcastle Help File Builder</title>
 		<authors>Eric Woodruff</authors>
 		<owners>Eric Woodruff</owners>

diff --git a/SHFB/Source/SandcastleBuilderPackage/source.extension.vsixmanifest b/SHFB/Source/SandcastleBuilderPackage/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?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="c997d569-ee8e-4947-a46f-9a0717ce39a0" Version="2017.12.30.0" Language="en-US" Publisher="EWSoftware" />
+		<Identity Id="c997d569-ee8e-4947-a46f-9a0717ce39a0" Version="2017.12.30.2" Language="en-US" Publisher="EWSoftware" />
 		<DisplayName>SHFB</DisplayName>
 		<Description xml:space="preserve">Visual Studio integration for the Sandcastle Help File Builder.</Description>
 		<MoreInfo>https://ewsoftware.github.io/SHFB/html/bd1ddb51-1c4f-434f-bb1a-ce2135d3a909.htm</MoreInfo>

diff --git a/SHFB/Source/SandcastleBuilderUtils/Properties/AssemblyInfoShared.cs b/SHFB/Source/SandcastleBuilderUtils/Properties/AssemblyInfoShared.cs
@@ -91,13 +91,13 @@ internal static partial class AssemblyInfo
     //
     // This is used to set the assembly file version.  This will change with each new release.  MSIs only
     // support a Major value between 0 and 255 so we drop the century from the year on this one.
-    public const string FileVersion = "17.12.30.0";
+    public const string FileVersion = "17.12.30.2";
 
     // Common product version
     //
     // This may contain additional text to indicate Alpha or Beta states.  The version number will always match
     // the file version above but includes the century on the year.
-    public const string ProductVersion = "2017.12.30.0";
+    public const string ProductVersion = "2017.12.30.2";
 
     // Assembly copyright information
     public const string Copyright = "Copyright \xA9 2006-2017, Eric Woodruff, All Rights Reserved";

diff --git a/SHFB/Source/SandcastleCore/Properties/AssemblyInfoShared.cs b/SHFB/Source/SandcastleCore/Properties/AssemblyInfoShared.cs
@@ -73,13 +73,13 @@ internal static partial class AssemblyInfo
     //
     // This is used to set the assembly file version.  This will change with each new release.  MSIs only
     // support a Major value between 0 and 255 so we drop the century from the year on this one.
-    public const string FileVersion = "17.12.30.0";
+    public const string FileVersion = "17.12.30.2";
 
     // Common product version
     //
     // This may contain additional text to indicate Alpha or Beta states.  The version number will always match
     // the file version above but includes the century on the year.
-    public const string ProductVersion = "2017.12.30.0";
+    public const string ProductVersion = "2017.12.30.2";
 
     // Assembly copyright information
     public const string Copyright = "Copyright \xA9 2006-2017, Microsoft Corporation, All Rights Reserved.\r\n" +