Skip to content

Commit e335835

Browse files
sharwellsharwell
committed
Merge pull request #310 from sharwell/shfb
Update SHFB and use the new VS2013 presentation style
2 parents 87f7986 + 0231091 commit e335835

2 files changed

Lines changed: 47 additions & 11 deletions

File tree

‎src/Documentation/Documentation.v3.5.shfbproj‎

Lines changed: 31 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
99
<SchemaVersion>2.0</SchemaVersion>
1010
<ProjectGuid>{60b1668c-4331-4e3d-86f6-954ffce0cd36}</ProjectGuid>
11-
<SHFBSchemaVersion>1.9.5.0</SHFBSchemaVersion>
11+
<SHFBSchemaVersion>1.9.9.0</SHFBSchemaVersion>
1212
<!-- AssemblyName, Name, and RootNamespace are not used by SHFB but Visual
1313
Studio adds them anyway -->
1414
<AssemblyName>Documentation</AssemblyName>
@@ -20,7 +20,7 @@
2020
<HtmlHelpName>API Reference Documentation</HtmlHelpName>
2121
<Language>en-US</Language>
2222
<DocumentationSources>
23-
<DocumentationSource sourceFile="..\corelib\corelib.v3.5.csproj" xmlns="" subFolders="true" />
23+
<DocumentationSource sourceFile="..\corelib\corelib.v3.5.csproj" subFolders="True" />
2424
</DocumentationSources>
2525
<BuildAssemblerVerbosity>OnlyWarningsAndErrors</BuildAssemblerVerbosity>
2626
<HelpFileFormat>HtmlHelp1, MSHelpViewer, Website</HelpFileFormat>
@@ -29,10 +29,10 @@
2929
<DisableCodeBlockComponent>False</DisableCodeBlockComponent>
3030
<CppCommentsFixup>False</CppCommentsFixup>
3131
<CleanIntermediates>True</CleanIntermediates>
32-
<SyntaxFilters>CSharp, VisualBasic, CPlusPlus, FSharp</SyntaxFilters>
32+
<SyntaxFilters>Standard</SyntaxFilters>
3333
<SdkLinkTarget>Blank</SdkLinkTarget>
3434
<RootNamespaceContainer>True</RootNamespaceContainer>
35-
<PresentationStyle>VS2010</PresentationStyle>
35+
<PresentationStyle>VS2013</PresentationStyle>
3636
<Preliminary>False</Preliminary>
3737
<NamingMethod>MemberName</NamingMethod>
3838
<HelpTitle>openstack.net API Reference Documentation</HelpTitle>
@@ -57,11 +57,26 @@
5757
<Argument Key="logoAlignment" Value="left" />
5858
</TransformComponentArguments>
5959
<ComponentConfigurations>
60-
<ComponentConfig id="IntelliSense Component" enabled="True" xmlns="">
60+
<ComponentConfig id="IntelliSense Component" enabled="True">
6161
<component id="IntelliSense Component" type="Microsoft.Ddue.Tools.IntelliSenseComponent" assembly="{@SandcastlePath}ProductionTools\BuildComponents.dll">
6262
<output includeNamespaces="false" namespacesFile="Namespaces" folder="{@OutputFolder}\..\..\Api\v3.5" />
6363
</component>
6464
</ComponentConfig>
65+
<ComponentConfig id="Code Block Component" enabled="True">
66+
<component id="Code Block Component" type="SandcastleBuilder.Components.CodeBlockComponent" assembly="{@SHFBFolder}SandcastleBuilder.Components.dll">
67+
<basePath value="{@HtmlEncProjectFolder}" />
68+
<outputPaths>{@HelpFormatOutputPaths}</outputPaths>
69+
<allowMissingSource value="false" />
70+
<removeRegionMarkers value="false" />
71+
<colorizer syntaxFile="{@SHFBFolder}Colorizer\highlight.xml" styleFile="{@SHFBFolder}Colorizer\highlight.xsl" stylesheet="{@SHFBFolder}Colorizer\highlight.css" scriptFile="{@SHFBFolder}Colorizer\highlight.js" language="cs" tabSize="0" numberLines="false" outlining="false" keepSeeTags="false" defaultTitle="true" />
72+
</component>
73+
</ComponentConfig>
74+
<ComponentConfig id="API Token Resolution" enabled="True">
75+
<component id="API Token Resolution" type="Microsoft.Ddue.Tools.SharedContentComponent" assembly="{@SandcastlePath}ProductionTools\BuildComponents.dll">
76+
{@TokenFiles}
77+
<replace elements="/*//token" item="string(.)" />
78+
</component>
79+
</ComponentConfig>
6580
</ComponentConfigurations>
6681
<CatalogName>VisualStudio11</CatalogName>
6782
<TocParentId>-1</TocParentId>
@@ -73,6 +88,17 @@
7388
<MSHelpViewerSdkLinkType>Id</MSHelpViewerSdkLinkType>
7489
<CatalogVersion>100</CatalogVersion>
7590
<CatalogProductId>VS</CatalogProductId>
91+
<ApiFilter />
92+
<HelpAttributes />
93+
<NamespaceSummaries />
94+
<PlugInConfigurations />
95+
<BuildLogFile />
96+
<HtmlHelp1xCompilerPath />
97+
<HtmlHelp2xCompilerPath />
98+
<WorkingPath />
99+
<ComponentPath />
100+
<MaximumGroupParts>3</MaximumGroupParts>
101+
<NamespaceGrouping>False</NamespaceGrouping>
76102
</PropertyGroup>
77103
<!-- There are no properties for these groups. AnyCPU needs to appear in
78104
order for Visual Studio to perform the build. The others are optional

‎src/Documentation/Documentation.v4.0.shfbproj‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
99
<SchemaVersion>2.0</SchemaVersion>
1010
<ProjectGuid>{ea57bd15-3742-45b8-bde2-263f7236bafd}</ProjectGuid>
11-
<SHFBSchemaVersion>1.9.5.0</SHFBSchemaVersion>
11+
<SHFBSchemaVersion>1.9.9.0</SHFBSchemaVersion>
1212
<!-- AssemblyName, Name, and RootNamespace are not used by SHFB but Visual
1313
Studio adds them anyway -->
1414
<AssemblyName>Documentation</AssemblyName>
@@ -20,7 +20,7 @@
2020
<HtmlHelpName>API Reference Documentation</HtmlHelpName>
2121
<Language>en-US</Language>
2222
<DocumentationSources>
23-
<DocumentationSource sourceFile="..\corelib\corelib.v4.0.csproj" xmlns="" subFolders="true" />
23+
<DocumentationSource sourceFile="..\corelib\corelib.v4.0.csproj" subFolders="True" />
2424
</DocumentationSources>
2525
<BuildAssemblerVerbosity>OnlyWarningsAndErrors</BuildAssemblerVerbosity>
2626
<HelpFileFormat>HtmlHelp1, MSHelpViewer, Website</HelpFileFormat>
@@ -29,10 +29,10 @@
2929
<DisableCodeBlockComponent>False</DisableCodeBlockComponent>
3030
<CppCommentsFixup>False</CppCommentsFixup>
3131
<CleanIntermediates>True</CleanIntermediates>
32-
<SyntaxFilters>CSharp, VisualBasic, CPlusPlus, FSharp</SyntaxFilters>
32+
<SyntaxFilters>Standard</SyntaxFilters>
3333
<SdkLinkTarget>Blank</SdkLinkTarget>
3434
<RootNamespaceContainer>True</RootNamespaceContainer>
35-
<PresentationStyle>VS2010</PresentationStyle>
35+
<PresentationStyle>VS2013</PresentationStyle>
3636
<Preliminary>False</Preliminary>
3737
<NamingMethod>MemberName</NamingMethod>
3838
<HelpTitle>openstack.net API Reference Documentation</HelpTitle>
@@ -57,7 +57,7 @@
5757
<Argument Key="logoAlignment" Value="left" />
5858
</TransformComponentArguments>
5959
<ComponentConfigurations>
60-
<ComponentConfig id="IntelliSense Component" enabled="True" xmlns="">
60+
<ComponentConfig id="IntelliSense Component" enabled="True">
6161
<component id="IntelliSense Component" type="Microsoft.Ddue.Tools.IntelliSenseComponent" assembly="{@SandcastlePath}ProductionTools\BuildComponents.dll">
6262
<output includeNamespaces="false" namespacesFile="Namespaces" folder="{@OutputFolder}\..\..\Api\v4.0" />
6363
</component>
@@ -74,7 +74,7 @@
7474
<CatalogVersion>100</CatalogVersion>
7575
<CatalogProductId>VS</CatalogProductId>
7676
<PlugInConfigurations>
77-
<PlugInConfig id="Version Builder" enabled="True" xmlns="">
77+
<PlugInConfig id="Version Builder" enabled="True">
7878
<configuration>
7979
<currentProject label=".NET Framework" version="4.0" ripOldApis="False" />
8080
<versions>
@@ -83,6 +83,16 @@
8383
</configuration>
8484
</PlugInConfig>
8585
</PlugInConfigurations>
86+
<ApiFilter />
87+
<HelpAttributes />
88+
<NamespaceSummaries />
89+
<BuildLogFile />
90+
<HtmlHelp1xCompilerPath />
91+
<HtmlHelp2xCompilerPath />
92+
<WorkingPath />
93+
<ComponentPath />
94+
<MaximumGroupParts>3</MaximumGroupParts>
95+
<NamespaceGrouping>False</NamespaceGrouping>
8696
</PropertyGroup>
8797
<!-- There are no properties for these groups. AnyCPU needs to appear in
8898
order for Visual Studio to perform the build. The others are optional

0 commit comments

Comments
 (0)