diff --git a/Deployment/InstallerConfiguration.xml b/Deployment/InstallerConfiguration.xml index 41c7ddf6..6fa96f56 100644 --- a/Deployment/InstallerConfiguration.xml +++ b/Deployment/InstallerConfiguration.xml @@ -1,7 +1,7 @@  - + @@ -12,8 +12,8 @@ executing installer. --> - + @@ -22,7 +22,7 @@ + frameworkVersion="4.5" shfbVersion="2016.4.9.0" installerName="SandcastleHelpFileBuilder.msi"/> diff --git a/Documentation/SandcastleBuilder/CommonTokens.tokens b/Documentation/SandcastleBuilder/CommonTokens.tokens index 898e3f43..45327e26 100644 --- a/Documentation/SandcastleBuilder/CommonTokens.tokens +++ b/Documentation/SandcastleBuilder/CommonTokens.tokens @@ -1,7 +1,7 @@  {@BuildDate:MMMM d, yyyy} - v2015.10.10.0 + v2016.4.9.0 Sandcastle Help File Builder https://GitHub.com/EWSoftware/SHFB diff --git a/Documentation/SandcastleBuilder/Content/CompConfig/IntelliSenseComponent.aml b/Documentation/SandcastleBuilder/Content/CompConfig/IntelliSenseComponent.aml index 22c3806f..18fbd77f 100644 --- a/Documentation/SandcastleBuilder/Content/CompConfig/IntelliSenseComponent.aml +++ b/Documentation/SandcastleBuilder/Content/CompConfig/IntelliSenseComponent.aml @@ -28,8 +28,9 @@ missing documentation items as well. Include Namespaces (false by default) Namespaces filename ("Namespaces" if not specified or empty) Directory (current folder if not specified or empty) --> - <output includeNamespaces="false" namespacesFile="Namespaces" - folder="{@OutputFolder}" /> + Bounded cache capacity (0 if not specified) --> + <output includeNamespaces="false" namespacesFile="Namespaces" + folder="{@OutputFolder}" boundedCapacity="100" /> </component> @@ -46,6 +47,13 @@ you should enter only the name and omit any file path and extension. The namesp IntelliSense but can be added to one or more help file builder projects as a common documentation source to share project and namespace summary information between projects. + The IntelliSense Component uses a pipeline to generate and save the XML comments in parallel to +improve performance. The boundedCapacity property controls how many XML comments blocks +can accumulate in the writer task's cache before blocking any further ones from being generated until the cache +empties out. The default is 100 members. Decrease this value to conserve memory or increase it to improve +performance. Set it to zero for an unbounded cache size which gives the best performance at the expense of +memory. The number of members remaining to be written is reported at the end of the build. You can use that +value to determine whether to increase or decrease this property value for each project. diff --git a/Documentation/SandcastleBuilder/Content/CustomBuild.aml b/Documentation/SandcastleBuilder/Content/CustomBuild.aml index 1a0b15d6..5497efd2 100644 --- a/Documentation/SandcastleBuilder/Content/CustomBuild.aml +++ b/Documentation/SandcastleBuilder/Content/CustomBuild.aml @@ -144,14 +144,6 @@ encoded). directive necessary to place the text in the page footers. - - - {@CoreFrameworkPath} - - - This expands to the core assembly path for the selected framework version. - - {@DefaultTopic} and {@WebDefaultTopic} diff --git a/Documentation/SandcastleBuilder/Content/ErrorsAndWarnings/BuildEngine/BE0068.aml b/Documentation/SandcastleBuilder/Content/ErrorsAndWarnings/BuildEngine/BE0068.aml index c28595b7..c9bcde35 100644 --- a/Documentation/SandcastleBuilder/Content/ErrorsAndWarnings/BuildEngine/BE0068.aml +++ b/Documentation/SandcastleBuilder/Content/ErrorsAndWarnings/BuildEngine/BE0068.aml @@ -11,7 +11,7 @@ An attempt was made to use a Visual Studio project as a documentation source that has an incompatible format. C++ projects created with Visual Studio 2008 and earlier do not use an MSBuild-based format and cannot be parsed. Future versions of Visual Studio may introduce new MSBuild elements and attributes -not recognized by the MSBuid engine used by the help file builder to load project files. If a project is +not recognized by the MSBuild engine used by the help file builder to load project files. If a project is encountered that uses these new elements, it may not be loadable. diff --git a/Documentation/SandcastleBuilder/Content/PropertiesWindow/BuildProps.aml b/Documentation/SandcastleBuilder/Content/PropertiesWindow/BuildProps.aml index 5ef1253b..556dd5e1 100644 --- a/Documentation/SandcastleBuilder/Content/PropertiesWindow/BuildProps.aml +++ b/Documentation/SandcastleBuilder/Content/PropertiesWindow/BuildProps.aml @@ -166,6 +166,19 @@ messages before the warning or error to help in diagnosing the issue. +
+ Maximum Save Component writer task cache capacity + + The BuildAssembler Save Component uses a pipeline to generate and save topic content in parallel to +improve performance. This property controls how many topics can accumulate in the writer task's cache before +blocking any further topics from being built until the cache empties out. The default is 100 topics. Decrease +this value to conserve memory or increase it to improve performance. Set it to zero for an unbounded cache size +which gives the best performance at the expense of memory. The number of topics remaining to be written is +reported at the end of the build. You can use that value to determine whether to increase or decrease this +property value for each project. + +
+ diff --git a/Documentation/SandcastleBuilder/Content/VersionHistory/VersionHistory.aml b/Documentation/SandcastleBuilder/Content/VersionHistory/VersionHistory.aml index f36fe9f5..b8427796 100644 --- 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. + + + + + + diff --git a/Documentation/SandcastleBuilder/Content/VersionHistory/v1.8tov1.9.8.0/v1.9.4.0.aml b/Documentation/SandcastleBuilder/Content/VersionHistory/v1.8tov1.9.8.0/v1.9.4.0.aml index ff2ed512..499199bc 100644 --- a/Documentation/SandcastleBuilder/Content/VersionHistory/v1.8tov1.9.8.0/v1.9.4.0.aml +++ b/Documentation/SandcastleBuilder/Content/VersionHistory/v1.8tov1.9.8.0/v1.9.4.0.aml @@ -414,7 +414,7 @@ for assembly binding redirection. Added example configuration info for it to
- BuildAssember Tools + BuildAssembler Tools diff --git a/Documentation/SandcastleBuilder/Content/VersionHistory/v2014.1.26tov2015.5.2/v2014.1.26.0.aml b/Documentation/SandcastleBuilder/Content/VersionHistory/v2014.1.26tov2015.5.2/v2014.1.26.0.aml index 06b0d9d2..6f4e56d1 100644 --- a/Documentation/SandcastleBuilder/Content/VersionHistory/v2014.1.26tov2015.5.2/v2014.1.26.0.aml +++ b/Documentation/SandcastleBuilder/Content/VersionHistory/v2014.1.26tov2015.5.2/v2014.1.26.0.aml @@ -58,7 +58,7 @@ components, this allows for the same dynamic discoverability at runtime and proj Changed the syntax generator IDs to their actual language names so that they are displayed using the language name in the help file builder. This should be transparent to most projects but if you have -BuildAssember configuration files you will need to update the syntax generator IDs in +BuildAssembler configuration files you will need to update the syntax generator IDs in them. diff --git a/Documentation/SandcastleBuilder/Content/VersionHistory/v2016.4.9.0.aml b/Documentation/SandcastleBuilder/Content/VersionHistory/v2016.4.9.0.aml new file mode 100644 index 00000000..e1ed42b5 --- /dev/null +++ b/Documentation/SandcastleBuilder/Content/VersionHistory/v2016.4.9.0.aml @@ -0,0 +1,224 @@ + + + + + + + +
+ Breaking Changes + + If you have created custom build components, syntax generators, plug-ins, or presentation styles, +carefully read the following items as you may need to update your components based on these changes. Most of +these changes were made to facilitate a single BuildAssembler step that generates all conceptual and API topics +rather than as two separate steps. + + + + Removed BuildStep.BuildConceptualTopics and +BuildStep.BuildReferenceTopics and replaced them with a common +BuildStep.BuildTopics step that generates both the conceptual and API topics. + + + + Removed all separate conceptual and API BuildAssembler configuration files and merged the +settings into a common BuildAssembler.config configuration file in all presentation styles. +The Switch Component is used to identify the MAML and API component groups. + + + + Any components that modify the BuildAssembler manifest files need to be aware of the new +type attribute that must appear on each topic element. It +defines whether the topic is a MAML topic or an API topic. + + + + BuildAssembler now creates the root document element of the skeleton +document and adds a type attribute indicating the topic type as defined in the manifest +(MAML or API). + + + + Updated the Clone Component, For Each Component, +If-Then Component, Multi-Format Output Component, +Switch Component, and Syntax Component so that they can +differentiate between topics using a group ID. This is necessary in the combined conceptual/reference topic +builds since each group of components uses the common component event to handle pre-transform and post-transform +tasks. + + + + Updated the presentation style component and all presentation styles by replacing the +ConceptualBuildConfiguration and ReferenceBuildConfiguration +properties with a single BuildAssemblerConfiguration property. + + + + Updated all BuildAssembler configuration files to copy the content of the skeleton document's +root element to the root element of the given topic rather than replacing it entirely. This is necessary to +preserve the topic type attribute added by BuildAssembler. + + + + + +
+ +
+ Sandcastle Tools + + + + Fixed the VB syntax generator so that it correctly handles C++ assignment operators. + + + + Merged changes from tlgkccampbell into MRefBuilder to allow customization of dependency +property and routed event type names. + + + + Made various changes to BuildAssembler and some of the build components to improve their +performance and to support the combined API/MAML topic build. + + + + Added support for the .NET Framework 4.6.1, .NET Micro Framework 4.4, and .NET Portable 5.0 +frameworks. Regenerated the affected reflection data and NuGet packages to include these updates. + + + + Regenerated the Universal Windows (.NETCore 5.0/.NETPortable 5.0) reflection data to include +updated assembly information. + + + + Regenerated all other framework reflection data to remove the unnecessary +AllMembersTopic entries. + + + + +
+ +
+ Sandcastle Help File Builder + + + + Fixed the build task so that it works correctly with MSBuild 14.0. + + + + Fixed a bug/incompatibility between Visual Studio 2015 and the MPF project system that only +occurs when opening the project properties via the context menu. + + + + Fixed the FrameworkVersionShort substitution tag so that it includes +the build number when appropriate. + + + + Modified the build engine so that the help project being built attempts to retrieve the +SolutionPath macro from the help project in order to use it as the default for the +solution macros when extracting the targets from project documentation sources. This allows documentation +source projects that use solution macros in their output path to resolve properly as long as the help project is +built as part of the containing solution. + + + + Merged a fix from qmfrederik to fix the Lightweight Website Style Plug-in problem caused by +empty URL values. + + + + Updated the Entity References tool window so that the root namespace container topic +ID is returned if you search for "R:". + + + + Added a component cache that loads the component information asynchronously and is shared +amongst the property pages that need it to improve UI responsiveness in both Visual Studio and the standalone +GUI. Changing the component path property also triggers a refresh which should remove the need to unload and +reload a project after changing it to see the components in the new location. + + + + The Save Component now uses a pipeline to generate and write the topics in parallel. A Save +Component cache capacity project option was added to allow limiting the number of topics the Save Component will +accumulate while waiting to write them out. + + + + The IntelliSense Component also uses a pipeline to generate and save the XML comments elements +to the various IntelliSense files. A similar cache capacity option was added to the IntelliSense component to +limit the number of members it accumulates while waiting to write them out. + + + + Changed the Lightweight website style plug-in to generate the TOC info files in parallel to +improve performance. + + + + Changed the website full text index generation so that it processes the files in parallel to +improve performance. + + + + Modified the MPF and SHFB project system to allow for excluding the content of the output path +and working folders when doing Show All Files. This is a quick hack to work around the very slow +performance when using Show All Files due to the large number of files in the output and working folders +when website output is produced. The output folder itself is still included but subfolders are not. This would +prevent the inclusion of those subfolders in the project in cases where the project does not produce website +output but chances are most people won't want to include these folders in the project anyway. + + + + Merged changes from Sam Harwell to fix issues in Visual Studio 2015 XML comments completion +with certain elements. + + + + +
+ +
+ Presentation Styles + + + + Fixed the encoding on the German language content files in all presentation styles. + + + + Merged a fix from tylerohlsen into the legacy TOC.js file that added a +dash (-) to the allowed set of characters on the query string to fix direct links with GUIDs. + + + + Updated the presentation styles to correctly show the proper title for the root namespace +container link in see, seealso, and +codeEntityReference link elements. + + + + Removed the IncludeInheritedOverloadTopics parameter from the +ApplyVSDocModel.xsl transformation as it served no useful purpose. + + + + Added Japanese content file translations from bleis-tift to all presentation styles. + + + + +
+ + + + + + + diff --git a/Documentation/SandcastleBuilder/SandcastleBuilder.content b/Documentation/SandcastleBuilder/SandcastleBuilder.content index 9ea0beb7..838efcf7 100644 --- a/Documentation/SandcastleBuilder/SandcastleBuilder.content +++ b/Documentation/SandcastleBuilder/SandcastleBuilder.content @@ -1363,19 +1363,24 @@ - + - + - + + + + + + - + diff --git a/Documentation/SandcastleBuilder/SandcastleBuilder.shfbproj b/Documentation/SandcastleBuilder/SandcastleBuilder.shfbproj index 6b2f9842..0a1dde74 100644 --- a/Documentation/SandcastleBuilder/SandcastleBuilder.shfbproj +++ b/Documentation/SandcastleBuilder/SandcastleBuilder.shfbproj @@ -29,11 +29,11 @@ .NET Framework 4.5 Sandcastle Help File Builder Documentation https://GitHub.com/EWSoftware/SHFB - [v{%40HelpFileVersion}] Copyright \xA9 2006-2015, Eric Woodruff, All rights reserved + [v{%40HelpFileVersion}] Copyright \xA9 2006-2016, Eric Woodruff, All rights reserved Eric%40EWoodruff.us VS2013 Standard - 2015.10.10.0 + 2016.4.9.0 @@ -358,6 +358,7 @@ + diff --git a/Documentation/XMLCommentsGuide/Content/UsageNotes.aml b/Documentation/XMLCommentsGuide/Content/UsageNotes.aml index 7e125cad..95f80b07 100644 --- a/Documentation/XMLCommentsGuide/Content/UsageNotes.aml +++ b/Documentation/XMLCommentsGuide/Content/UsageNotes.aml @@ -59,6 +59,15 @@ public class CustomList<T> : List<T> use an alternate means to specify namespace comments. See the topic for more information. + + + XML comments for enumerations are treated differently. The common convention in presentation +styles is to suppress topics for the individual enumeration members. Instead, they are listed in a table in the +containing enumerated type's topic. Within that table, only the summary for each member is listed as the +description. Any additional comments elements such as seealso or remarks +elements will be ignored. As such, include any additional information that must appear in the help file in the +enumerated type's XML comments or within the member's summary element. +
diff --git a/NuGet/SHFB.NETFramework.nuspec b/NuGet/SHFB.NETFramework.nuspec index e2706129..16e81ea4 100644 --- a/NuGet/SHFB.NETFramework.nuspec +++ b/NuGet/SHFB.NETFramework.nuspec @@ -2,7 +2,7 @@ EWSoftware.SHFB.NETFramework - 4.6 + 4.6.1 Sandcastle Help File Builder .NETFramework Reflection Data Set Eric Woodruff Eric Woodruff @@ -11,7 +11,7 @@ https://raw.githubusercontent.com/EWSoftware/SHFB/master/NuGet/SHFB.png false This package contains the .NETFramework reflection information data set for use with the EWSoftware.SHFB package. - Eric Woodruff (c) 2006-2015 + Eric Woodruff (c) 2006-2016 SHFB sandcastle reflection information data set diff --git a/SHFB/Deploy/Data/.NETFramework/.NETFramework_4.6.1.reflection b/SHFB/Deploy/Data/.NETFramework/.NETFramework_4.6.1.reflection new file mode 100644 index 00000000..c1fa844f --- /dev/null +++ b/SHFB/Deploy/Data/.NETFramework/.NETFramework_4.6.1.reflection @@ -0,0 +1,148 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <CppImplementationDetails> + <CrtImplementationDetails> + + + + \ No newline at end of file diff --git a/SHFB/Deploy/Data/.NETMicroFramework/.NETMicroFramework_4.4.reflection b/SHFB/Deploy/Data/.NETMicroFramework/.NETMicroFramework_4.4.reflection new file mode 100644 index 00000000..ccc68f52 --- /dev/null +++ b/SHFB/Deploy/Data/.NETMicroFramework/.NETMicroFramework_4.4.reflection @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/SHFB/Deploy/Data/UniversalWindows/.NETCore_5.0.reflection b/SHFB/Deploy/Data/UniversalWindows/.NETCore_5.0.reflection index 3cabad26..f21d749a 100644 --- a/SHFB/Deploy/Data/UniversalWindows/.NETCore_5.0.reflection +++ b/SHFB/Deploy/Data/UniversalWindows/.NETCore_5.0.reflection @@ -134,7 +134,9 @@ + + @@ -145,22 +147,29 @@ + + + + + + + @@ -173,14 +182,18 @@ + + + + @@ -199,5 +212,7 @@ windows.foundation Windows.Foundation - - \ No newline at end of file + + + + diff --git a/SHFB/Deploy/Data/UniversalWindows/.NETPortable_5.0.reflection b/SHFB/Deploy/Data/UniversalWindows/.NETPortable_5.0.reflection index 12f0ec6c..f591eb4f 100644 --- a/SHFB/Deploy/Data/UniversalWindows/.NETPortable_5.0.reflection +++ b/SHFB/Deploy/Data/UniversalWindows/.NETPortable_5.0.reflection @@ -135,7 +135,9 @@ + + @@ -146,22 +148,29 @@ + + + + + + + @@ -174,14 +183,18 @@ + + + + @@ -200,5 +213,7 @@ windows.foundation Windows.Foundation - + + + \ No newline at end of file diff --git a/SHFB/Source/BuildAssembler/BuildComponents/IntelliSenseComponent.cs b/SHFB/Source/BuildAssembler/BuildComponents/IntelliSenseComponent.cs index 820f8d86..6dedc23b 100644 --- a/SHFB/Source/BuildAssembler/BuildComponents/IntelliSenseComponent.cs +++ b/SHFB/Source/BuildAssembler/BuildComponents/IntelliSenseComponent.cs @@ -2,7 +2,7 @@ // System : Sandcastle Help File Builder Components // File : IntelliSenseComponent.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 01/22/2016 +// Updated : 04/09/2016 // Note : Copyright 2007-2016, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // @@ -63,8 +63,9 @@ namespace Microsoft.Ddue.Tools.BuildComponent /// Include Namespaces (false by default) /// Namespaces filename ("Namespaces" if not specified or empty) /// Directory (current folder if not specified or empty) --> + /// Bounded cache capacity (0 if not specified --> /// <output includeNamespaces="false" namespacesFile="Namespaces" - /// folder="C:\ProjectDocs\" /> + /// folder="C:\ProjectDocs\" boundedCapacity="100" /> /// </component> /// /// diff --git a/SHFB/Source/SandcastleBuilderPackage/source.extension.vsixmanifest b/SHFB/Source/SandcastleBuilderPackage/source.extension.vsixmanifest index db36bf6c..ae624756 100644 --- a/SHFB/Source/SandcastleBuilderPackage/source.extension.vsixmanifest +++ b/SHFB/Source/SandcastleBuilderPackage/source.extension.vsixmanifest @@ -1,7 +1,7 @@  - + SHFB Visual Studio integration for the Sandcastle Help File Builder. https://github.com/EWSoftware/SHFB diff --git a/SHFB/Source/SandcastleBuilderUtils/BuildEngine/BuildProcess.cs b/SHFB/Source/SandcastleBuilderUtils/BuildEngine/BuildProcess.cs index 8e318650..b5ed44fe 100644 --- a/SHFB/Source/SandcastleBuilderUtils/BuildEngine/BuildProcess.cs +++ b/SHFB/Source/SandcastleBuilderUtils/BuildEngine/BuildProcess.cs @@ -2,7 +2,7 @@ // System : Sandcastle Help File Builder Utilities // File : BuildProcess.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 02/17/2016 +// Updated : 03/25/2016 // Note : Copyright 2006-2016, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // @@ -749,7 +749,8 @@ public void Build() "redirected version on this system. See error number help topic for details.", project.FrameworkVersion)); - this.ReportProgress("Framework reflection data location: {0}", this.FrameworkReflectionDataFolder); + this.ReportProgress("Using framework reflection data for '{0}' located in '{1}'", + this.FrameworkReflectionData.Title, this.FrameworkReflectionDataFolder); if(!Directory.EnumerateFiles(this.FrameworkReflectionDataFolder, "*.xml").Any()) throw new BuilderException("BE0032", "Reflection data files for the selected framework " + diff --git a/SHFB/Source/SandcastleBuilderUtils/BuildEngine/SubstitutionTagReplacement.cs b/SHFB/Source/SandcastleBuilderUtils/BuildEngine/SubstitutionTagReplacement.cs index 75ea8d17..814ce0ac 100644 --- a/SHFB/Source/SandcastleBuilderUtils/BuildEngine/SubstitutionTagReplacement.cs +++ b/SHFB/Source/SandcastleBuilderUtils/BuildEngine/SubstitutionTagReplacement.cs @@ -2,7 +2,7 @@ // System : Sandcastle Help File Builder Utilities // File : SubstitutionTagReplacement.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 01/22/2016 +// Updated : 03/25/2016 // Note : Copyright 2015-2016, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // @@ -569,7 +569,7 @@ private string TargetFrameworkIdentifier() } /// - /// The full framework version + /// The full framework version (Major.Minor[.Build[.Revision]] /// /// The full framework version [SubstitutionTag] @@ -579,13 +579,19 @@ private string FrameworkVersion() } /// - /// The short framework version (Major.Minor) + /// The short framework version (Major.Minor[.Build]) /// - /// The short framework version + /// Typically returns a two digit version number. However, if the build number is between 1 and + /// 10, it will be included as well (i.e. v4.5.2, v4.6.1). [SubstitutionTag] private string FrameworkVersionShort() { - return currentBuild.FrameworkReflectionData.Version.ToString(2); + Version v = currentBuild.FrameworkReflectionData.Version; + + if(v.Build > 0 && v.Build < 10) + return currentBuild.FrameworkReflectionData.Version.ToString(3); + + return v.ToString(2); } /// diff --git a/SHFB/Source/SandcastleBuilderUtils/Properties/AssemblyInfoShared.cs b/SHFB/Source/SandcastleBuilderUtils/Properties/AssemblyInfoShared.cs index d83cbdf2..50d10c05 100644 --- a/SHFB/Source/SandcastleBuilderUtils/Properties/AssemblyInfoShared.cs +++ b/SHFB/Source/SandcastleBuilderUtils/Properties/AssemblyInfoShared.cs @@ -2,8 +2,8 @@ // System : Sandcastle Help File Builder // File : AssemblyInfoShared.cs // Author : Eric Woodruff (Eric@EWoodruff.us) -// Updated : 10/10/2015 -// Note : Copyright 2006-2015, Eric Woodruff, All rights reserved +// Updated : 04/09/2016 +// Note : Copyright 2006-2016, Eric Woodruff, All rights reserved // Compiler: Microsoft Visual C# // // Sandcastle Help File Builder common assembly attributes. @@ -85,20 +85,20 @@ internal static partial class AssemblyInfo // This is used to set the assembly version in the strong name. This should remain unchanged to maintain // binary compatibility with prior releases. It should only be changed if a breaking change is made that // requires assemblies that reference older versions to be recompiled against the newer version. - public const string StrongNameVersion = "2015.10.10.0"; + public const string StrongNameVersion = "2016.4.9.0"; // Common assembly file version // // 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 = "15.10.10.0"; + public const string FileVersion = "16.4.9.0"; // 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 = "2015.10.10.0"; + public const string ProductVersion = "2016.4.9.0"; // Assembly copyright information - public const string Copyright = "Copyright \xA9 2006-2015, Eric Woodruff, All Rights Reserved"; + public const string Copyright = "Copyright \xA9 2006-2016, Eric Woodruff, All Rights Reserved"; } diff --git a/SHFB/Source/SandcastleCore/Properties/AssemblyInfoShared.cs b/SHFB/Source/SandcastleCore/Properties/AssemblyInfoShared.cs index 6daab48a..b1dcf1b4 100644 --- a/SHFB/Source/SandcastleCore/Properties/AssemblyInfoShared.cs +++ b/SHFB/Source/SandcastleCore/Properties/AssemblyInfoShared.cs @@ -1,8 +1,8 @@ //=============================================================================================================== // System : Sandcastle Tools // File : AssemblyInfoShared.cs -// Updated : 10/10/2015 -// Note : Copyright 2006-2015, Microsoft Corporation, All rights reserved +// Updated : 04/09/2016 +// Note : Copyright 2006-2016, Microsoft Corporation, All rights reserved // // Sandcastle tools common assembly attributes. // @@ -67,21 +67,21 @@ internal static partial class AssemblyInfo // This is used to set the assembly version in the strong name. This should remain unchanged to maintain // binary compatibility with prior releases. It should only be changed if a breaking change is made that // requires assemblies that reference older versions to be recompiled against the newer version. - public const string StrongNameVersion = "2015.10.10.0"; + public const string StrongNameVersion = "2016.4.9.0"; // Common assembly file version // // 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 = "15.10.10.0"; + public const string FileVersion = "16.4.9.0"; // 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 = "2015.10.10.0"; + public const string ProductVersion = "2016.4.9.0"; // Assembly copyright information - public const string Copyright = "Copyright \xA9 2006-2015, Microsoft Corporation, All Rights Reserved.\r\n" + - "Portions Copyright \xA9 2006-2015, Eric Woodruff, All Rights Reserved."; + public const string Copyright = "Copyright \xA9 2006-2016, Microsoft Corporation, All Rights Reserved.\r\n" + + "Portions Copyright \xA9 2006-2016, Eric Woodruff, All Rights Reserved."; } diff --git a/SHFB/Source/Setup/DeploymentFiles.wxs b/SHFB/Source/Setup/DeploymentFiles.wxs index 295056a1..a0568326 100644 --- a/SHFB/Source/Setup/DeploymentFiles.wxs +++ b/SHFB/Source/Setup/DeploymentFiles.wxs @@ -879,7 +879,10 @@ - + + + + @@ -2270,25 +2273,10 @@ - - - - - - - - - - - + + - - - - - - - + @@ -2333,7 +2321,13 @@ - + + + + + + + @@ -2342,13 +2336,7 @@ - - - - - - - + @@ -2396,47 +2384,29 @@ - - - - - - - - - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - - - - - - - + + @@ -3959,13 +3929,19 @@ - + + + + - + + + + @@ -4025,7 +4001,10 @@ - + + + + @@ -4070,7 +4049,10 @@ - + + + + @@ -4097,7 +4079,10 @@ - + + + + @@ -4232,7 +4217,19 @@ - + + + + + + + + + + + + + @@ -4406,7 +4403,10 @@ - + + + + @@ -7963,6 +7963,7 @@ + @@ -8426,12 +8427,7 @@ - - - - - - + @@ -8447,11 +8443,11 @@ + + - - @@ -8468,20 +8464,14 @@ - - - - - - - - - - - - - - + + + + + + + + @@ -8987,8 +8977,10 @@ + + @@ -9009,6 +9001,7 @@ + @@ -9024,6 +9017,7 @@ + @@ -9033,6 +9027,7 @@ + @@ -9078,6 +9073,10 @@ + + + + @@ -9136,6 +9135,7 @@ +