Skip to content

Commit

Permalink
Minor fixes and removal of some XSL transforms
Browse files Browse the repository at this point in the history
Sandcastle Tools
- Moved the processing for MergeDuplicates.xsl and AddXamlSyntaxData.xsl into MRefBuilder and removed the XSL transformations.
- Moved the processing for FixScriptSharp.xsl into the related Script# plug-in and removed the XSL transformation.
- Moved the processing for the Segregate By Namespace tool into the Reflection Data Manager tool and removed the Segregate By Namespace tool.

Sandcastle Help File Builder
- Changed the size to content property of fixed height WPF forms to prevent clipping at certain screen resolutions.  Fixes #830.
- Modified the build to use a unique name for GenerateRefInfo.proj so that the assembly resolution task uses a unique name for its cache during parallel builds of documentation projects.  Fixes #841.
  • Loading branch information
EWSoftware committed Apr 6, 2021
1 parent af3853e commit 6154baf
Show file tree
Hide file tree
Showing 48 changed files with 766 additions and 1,327 deletions.
8 changes: 4 additions & 4 deletions Deployment/InstallerConfiguration.xml
Original file line number Diff line number Diff line change
@@ -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="v2021.3.29.0" />
<sandcastle version="v2021.4.5.0" />

<!-- 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. -->
Expand All @@ -13,16 +13,16 @@
<page type="Sandcastle.Installer.InstallerPages.WelcomePage" />

<page type="Sandcastle.Installer.InstallerPages.WhatsNewPage">
<whatsNew url="https://EWSoftware.github.io/SHFB/html/70b704dc-03c8-4934-b83e-e84d4d7f927a.htm"
description="Sandcastle Help File Builder and Tools v2021.3.29.0 Release Notes" />
<whatsNew url="https://EWSoftware.github.io/SHFB/html/52c2409d-0a0a-4b6e-bd0a-5d2b03d1d332.htm"
description="Sandcastle Help File Builder and Tools v2021.4.5.0 Release Notes" />
</page>

<page type="Sandcastle.Installer.InstallerPages.HelpFileFormatsPage">
<page type="Sandcastle.Installer.InstallerPages.Help1CompilerPage" />
</page>

<page type="Sandcastle.Installer.InstallerPages.SandcastleHelpFileBuilderPage"
shfbVersion="2021.3.29.0" installerName="SandcastleHelpFileBuilder.msi"/>
shfbVersion="2021.4.5.0" installerName="SandcastleHelpFileBuilder.msi"/>

<page type="Sandcastle.Installer.InstallerPages.SHFBVisualStudioPackagePage"
packageGuid="c997d569-ee8e-4947-a46f-9a0717ce39a0">
Expand Down
2 changes: 1 addition & 1 deletion Documentation/SandcastleBuilder/CommonTokens.tokens
Original file line number Diff line number Diff line change
@@ -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">v2021.3.29.0</item>
<item id="SandcastleVersion">v2021.4.5.0</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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ 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="52c2409d-0a0a-4b6e-bd0a-5d2b03d1d332" />
</para>
</listItem>
<listItem>
<para>
<link xlink:href="70b704dc-03c8-4934-b83e-e84d4d7f927a" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<developerConceptualDocument xmlns="http://ddue.schemas.microsoft.com/authoring/2003/5" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Ignore Spelling: tabnapping -->
<introduction>
<autoOutline excludeRelatedTopics="true" lead="Release notes for version vNext." />
<autoOutline excludeRelatedTopics="true" lead="Release notes for version 2019.3.29.0." />
</introduction>

<section address="ReflectionDataSets">
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<?xml version="1.0" encoding="utf-8"?>
<topic id="52c2409d-0a0a-4b6e-bd0a-5d2b03d1d332" revisionNumber="1">
<developerConceptualDocument xmlns="http://ddue.schemas.microsoft.com/authoring/2003/5" xmlns:xlink="http://www.w3.org/1999/xlink">
<introduction>
<para>Release notes for version 2021.4.5.0.</para>
</introduction>

<section>
<title>Changes in This Release</title>
<content>

<list class="bullet">
<listItem>
<para>Changed the Size to Content property of fixed height WPF forms to prevent clipping at certain
screen resolutions.</para>
</listItem>

<listItem>
<para>Modified the build to use a unique name for <localUri>GenerateRefInfo.proj</localUri> so that
the assembly resolution task uses a unique name for its cache during parallel builds of documentation projects.</para>
</listItem>

<listItem>
<para>Moved the processing for <localUri>MergeDuplicates.xsl</localUri> and
<localUri>AddXamlSyntaxData.xsl</localUri> into MRefBuilder and removed the XSL transformations.</para>
</listItem>

<listItem>
<para>Moved the processing for <localUri>FixScriptSharp.xsl</localUri> into the related Script#
plug-in and removed the XSL transformation.</para>
</listItem>

<listItem>
<para>Moved the processing for the Segregate By Namespace tool into the Reflection Data Manager tool
and removed the Segregate By Namespace tool.</para>
</listItem>
</list>

</content>
</section>

<relatedTopics>
<link xlink:href="078cc1c7-7995-431e-bf9c-8813becbe8df" />
</relatedTopics>

</developerConceptualDocument>
</topic>
7 changes: 6 additions & 1 deletion Documentation/SandcastleBuilder/SandcastleBuilder.content
Original file line number Diff line number Diff line change
Expand Up @@ -1393,7 +1393,12 @@
<HelpKeyword index="K" term="History" />
<HelpKeyword index="K" term="Version History" />
</HelpKeywords>
<Topic id="70b704dc-03c8-4934-b83e-e84d4d7f927a" visible="True" isSelected="true" title="Version 2021.3.29.0">
<Topic id="52c2409d-0a0a-4b6e-bd0a-5d2b03d1d332" visible="True" isSelected="true" title="Version 2021.4.5.0">
<HelpKeywords>
<HelpKeyword index="K" term="versions, 2021.4.5.0" />
</HelpKeywords>
</Topic>
<Topic id="70b704dc-03c8-4934-b83e-e84d4d7f927a" visible="True" title="Version 2021.3.29.0">
<HelpKeywords>
<HelpKeyword index="K" term="versions, 2021.3.29.0" />
</HelpKeywords>
Expand Down
4 changes: 2 additions & 2 deletions Documentation/SandcastleBuilder/SandcastleBuilder.shfbproj
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<FeedbackEMailAddress>Eric%40EWoodruff.us</FeedbackEMailAddress>
<PresentationStyle>VS2013</PresentationStyle>
<SyntaxFilters>Standard</SyntaxFilters>
<HelpFileVersion>2021.3.29.0</HelpFileVersion>
<HelpFileVersion>2021.4.5.0</HelpFileVersion>
<ComponentConfigurations>
</ComponentConfigurations>
<DocumentationSources>
Expand All @@ -45,7 +45,6 @@
<DocumentationSource sourceFile="..\..\SHFB\Source\SandcastleBuilderWPF\SandcastleBuilderWPF.csproj" />
<DocumentationSource sourceFile="..\..\SHFB\Source\SandcastleComponents\SandcastleComponents.csproj" />
<DocumentationSource sourceFile="..\..\SHFB\Source\SandcastleHtmlExtract\SandcastleHtmlExtract.csproj" />
<DocumentationSource sourceFile="..\..\SHFB\Source\SegregateByNamespace\SegregateByNamespace.csproj" />
<DocumentationSource sourceFile="..\..\SHFB\Source\AddNamespaceGroups\AddNamespaceGroups.csproj" />
<DocumentationSource sourceFile="..\..\SHFB\Source\XslTransform\XslTransform.csproj" />
<DocumentationSource sourceFile="..\..\SHFB\Source\SandcastleCore\Sandcastle.Core.csproj" />
Expand Down Expand Up @@ -408,6 +407,7 @@
<None Include="Content\VersionHistory\v2014.1.26tov2015.5.2\v2015.5.2.0.aml" />
<None Include="Content\VersionHistory\v2020.3.6.0.aml" />
<None Include="Content\VersionHistory\v2021.3.29.0.aml" />
<None Include="Content\VersionHistory\v2021.4.5.0.aml" />
<None Include="Content\VisualStudio\GoToDefinition.aml" />
<None Include="Content\VisualStudio\ItemFileTemplates.aml" />
<None Include="Content\VisualStudio\FeatureComparison.aml" />
Expand Down
2 changes: 1 addition & 1 deletion NuGet/SHFB.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>EWSoftware.SHFB</id>
<version>2021.3.29.0</version>
<version>2021.4.5.0</version>
<title>Sandcastle Help File Builder</title>
<authors>Eric Woodruff</authors>
<owners>Eric Woodruff</owners>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:xctk="clr-namespace:Xceed.Wpf.Toolkit;assembly=DotNetProjects.Wpf.Extended.Toolkit"
mc:Ignorable="d" Width="600" Height="235" ResizeMode="NoResize" ShowInTaskbar="False"
mc:Ignorable="d" Width="600" SizeToContent="Height" ResizeMode="NoResize" ShowInTaskbar="False"
Title="Configure IntelliSense Component"
WindowStartupLocation="CenterScreen" Background="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"
FocusManager.FocusedElement="{Binding ElementName=chkIncludeNamespaces}">
Expand Down
Loading

0 comments on commit 6154baf

Please sign in to comment.