Skip to content

Commit

Permalink
Minor fix
Browse files Browse the repository at this point in the history
Removed path from GenerateRefInfo.proj before running.  Fixes #844.
  • Loading branch information
EWSoftware committed Apr 9, 2021
1 parent 6154baf commit 84082c3
Show file tree
Hide file tree
Showing 10 changed files with 20 additions and 18 deletions.
6 changes: 3 additions & 3 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.4.5.0" />
<sandcastle version="v2021.4.9.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 @@ -14,15 +14,15 @@

<page type="Sandcastle.Installer.InstallerPages.WhatsNewPage">
<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" />
description="Sandcastle Help File Builder and Tools v2021.4.9.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.4.5.0" installerName="SandcastleHelpFileBuilder.msi"/>
shfbVersion="2021.4.9.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.4.5.0</item>
<item id="SandcastleVersion">v2021.4.9.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 @@ -2,7 +2,7 @@
<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>
<para>Release notes for version 2021.4.9.0.</para>
</introduction>

<section>
Expand Down
4 changes: 2 additions & 2 deletions Documentation/SandcastleBuilder/SandcastleBuilder.content
Original file line number Diff line number Diff line change
Expand Up @@ -1393,9 +1393,9 @@
<HelpKeyword index="K" term="History" />
<HelpKeyword index="K" term="Version History" />
</HelpKeywords>
<Topic id="52c2409d-0a0a-4b6e-bd0a-5d2b03d1d332" visible="True" isSelected="true" title="Version 2021.4.5.0">
<Topic id="52c2409d-0a0a-4b6e-bd0a-5d2b03d1d332" visible="True" isSelected="true" title="Version 2021.4.9.0">
<HelpKeywords>
<HelpKeyword index="K" term="versions, 2021.4.5.0" />
<HelpKeyword index="K" term="versions, 2021.4.9.0" />
</HelpKeywords>
</Topic>
<Topic id="70b704dc-03c8-4934-b83e-e84d4d7f927a" visible="True" title="Version 2021.3.29.0">
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.4.5.0</HelpFileVersion>
<HelpFileVersion>2021.4.9.0</HelpFileVersion>
<ComponentConfigurations>
</ComponentConfigurations>
<DocumentationSources>
Expand Down Expand Up @@ -407,7 +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\VersionHistory\v2021.4.9.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.4.5.0</version>
<version>2021.4.9.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
@@ -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="2021.4.5.0" Language="en-US" Publisher="EWSoftware" />
<Identity Id="c997d569-ee8e-4947-a46f-9a0717ce39a0" Version="2021.4.9.0" 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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// System : Sandcastle Help File Builder Utilities
// File : BuildProcess.cs
// Author : Eric Woodruff ([email protected])
// Updated : 04/03/2021
// Updated : 04/09/2021
// Note : Copyright 2006-2021, Eric Woodruff, All rights reserved
//
// This file contains the thread class that handles all aspects of the build process.
Expand Down Expand Up @@ -969,6 +969,8 @@ public void Build()

this.ExecutePlugIns(ExecutionBehaviors.Before);

scriptFile = Path.GetFileName(scriptFile);

// Silverlight build targets are only available for 32-bit builds regardless of the framework
// version and require the 32-bit version of MSBuild in order to load the target file correctly.
if(project.FrameworkVersion.StartsWith("Silverlight", StringComparison.OrdinalIgnoreCase))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// System : Sandcastle Help File Builder
// File : AssemblyInfoShared.cs
// Author : Eric Woodruff ([email protected])
// Updated : 04/05/2021
// Updated : 04/09/2021
// Note : Copyright 2006-2021, Eric Woodruff, All rights reserved
//
// Sandcastle Help File Builder common assembly attributes.
Expand Down Expand Up @@ -90,13 +90,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 = "21.4.5.0";
public const string FileVersion = "21.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 = "2021.4.5.0";
public const string ProductVersion = "2021.4.9.0";

// Assembly copyright information
public const string Copyright = "Copyright \xA9 2006-2021, Eric Woodruff, All Rights Reserved";
Expand Down
6 changes: 3 additions & 3 deletions SHFB/Source/SandcastleCore/Properties/AssemblyInfoShared.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//===============================================================================================================
// System : Sandcastle Tools
// File : AssemblyInfoShared.cs
// Updated : 04/05/2021
// Updated : 04/09/2021
// Note : Copyright 2006-2021, Microsoft Corporation, All rights reserved
//
// Sandcastle tools common assembly attributes.
Expand Down Expand Up @@ -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 = "21.4.5.0";
public const string FileVersion = "21.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 = "2021.4.5.0";
public const string ProductVersion = "2021.4.9.0";

// Assembly copyright information
public const string Copyright = "Copyright \xA9 2006-2021, Microsoft Corporation, All Rights Reserved.\r\n" +
Expand Down

0 comments on commit 84082c3

Please sign in to comment.