Skip to content

Commit

Permalink
Fixed path issue for Help Viewer output
Browse files Browse the repository at this point in the history 
Fixes #884
  • Loading branch information
@EWSoftware
EWSoftware committed Jan 14, 2022
1 parent 6a709b2 commit c0d3ca6
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 42 deletions.
10 changes: 5 additions & 5 deletions SHFB/Source/SandcastleBuilderUtils/ConceptualContent/TopicCollection.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// System : Sandcastle Help File Builder Utilities
// File : TopicCollection.cs
// Author : Eric Woodruff ([email protected])
// Updated : 04/14/2021
// Note : Copyright 2008-2021, Eric Woodruff, All rights reserved
// Updated : 01/13/2022
// Note : Copyright 2008-2022, Eric Woodruff, All rights reserved
//
// This file contains a collection class used to hold the conceptual content topics for a project.
//
Expand Down Expand Up @@ -409,9 +409,9 @@ public void GenerateConceptualTopics(string folder, BuildProcess builder, IEnume
{
enc = Encoding.Default;

// When reading the file, use the default encoding but
// detect the encoding if byte order marks are present.
templateText = Utility.ReadWithEncoding(builder.TemplateFolder + "PlaceHolderNode.aml",
// When reading the file, use the default encoding but detect the encoding if byte order
// marks are present.
templateText = Utility.ReadWithEncoding(Path.Combine(builder.TemplateFolder, "PlaceHolderNode.aml"),
ref enc);

templateText = templateText.Replace("{@GUID}", t.Id);
Expand Down
44 changes: 7 additions & 37 deletions TestCaseProject/Doc/TestCaseProject.shfbproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,42 +53,13 @@
<colorizer syntaxFile="{@CoreComponentsFolder}Colorizer\highlight.xml" styleFile="{@CoreComponentsFolder}Colorizer\highlight.xsl" stylesheet="{@CoreComponentsFolder}Colorizer\highlight.css" scriptFile="{@CoreComponentsFolder}Colorizer\highlight.js" disabled="{@DisableCodeBlockComponent}" language="cs" tabSize="0" numberLines="false" outlining="true" keepSeeTags="false" defaultTitle="true" />
</component>
</ComponentConfig>
<ComponentConfig id="API Token Resolution" enabled="True">
<component id="API Token Resolution">{@TokenFiles}
<replace elements="/*//token" item="string(.)" /></component>
</ComponentConfig>
<ComponentConfig id="IntelliSense Component" enabled="True">
<component id="IntelliSense Component">
<output includeNamespaces="true" namespacesFile="NamespacesTest" folder="{@OutputFolder}" boundedCapacity="0" />
</component>
</ComponentConfig>
<ComponentConfig id="Syntax Component" enabled="False">
<component id="Syntax Component">
<syntax input="/document/reference" output="/document/syntax" renderReferenceLinks="true" />
<generators>
<ComponentConfig id="API Token Resolution" enabled="True"><component id="API Token Resolution">{@TokenFiles}
<replace elements="/*//token" item="string(.)" /></component></ComponentConfig>
<ComponentConfig id="IntelliSense Component" enabled="True"><component id="IntelliSense Component"><output includeNamespaces="true" namespacesFile="NamespacesTest" folder="{@OutputFolder}" boundedCapacity="0" /></component></ComponentConfig>
<ComponentConfig id="Syntax Component" enabled="False"><component id="Syntax Component"><syntax input="/document/reference" output="/document/syntax" renderReferenceLinks="true" /><generators>
{@SyntaxFilters}
</generators>
<containerElement name="codeSnippetGroup" addNoExampleTabs="true" includeOnSingleSnippets="true" groupingEnabled="{@CodeSnippetGrouping}" />
<configurations>
<generator id="Visual Basic">
<includeLineContinuation value="true" />
</generator>
<generator id="Visual Basic Usage">
<includeLineContinuation value="false" />
</generator>
<generator id="Managed C++" />
<generator id="C#" />
<generator id="F#" />
<generator id="J#" />
<generator id="JScript" />
<generator id="JavaScript" />
<generator id="XAML Usage" />
<generator id="ASP.NET" />
<generator id="X#" />
</configurations>
</component>
</ComponentConfig>
</ComponentConfigurations>
</generators><containerElement name="codeSnippetGroup" addNoExampleTabs="true" includeOnSingleSnippets="true" groupingEnabled="{@CodeSnippetGrouping}" /><configurations><generator id="Visual Basic"><includeLineContinuation value="true" /></generator><generator id="Visual Basic Usage"><includeLineContinuation value="false" /></generator><generator id="Managed C++" /><generator id="C#" /><generator id="F#" /><generator id="J#" /><generator id="JScript" /><generator id="JavaScript" /><generator id="XAML Usage" /><generator id="ASP.NET" /><generator id="X#" /></configurations></component></ComponentConfig>
<ComponentConfig id="RawDocumentDumpComponent" enabled="True"><component id="RawDocumentDumpComponent"><dumpPath value="{@WorkingFolder}\RawDocs" /></component></ComponentConfig></ComponentConfigurations>
<DocumentationSources>
<DocumentationSource sourceFile="..\TestDoc.csproj" />
</DocumentationSources>
Expand Down Expand Up @@ -179,8 +150,7 @@
<NamespaceGrouping>True</NamespaceGrouping>
<CatalogName>
</CatalogName>
<ComponentPath>
</ComponentPath>
<ComponentPath>..\..\..\..\DotNet\RawDocumentDumpComponent\bin\Debug\netstandard2.0\</ComponentPath>
<WebsiteSdkLinkType>Msdn</WebsiteSdkLinkType>
<HtmlSdkLinkType>Msdn</HtmlSdkLinkType>
<IncludeFavorites>False</IncludeFavorites>
Expand Down

0 comments on commit c0d3ca6

Please sign in to comment.