Skip to content

Commit e633e15

Browse files
committed
updated to error out on VS preview builds for docfx so the reason for the failure is a bit more obvious than the generic failure from docfx
1 parent adbdb0d commit e633e15

7 files changed

Lines changed: 26 additions & 17 deletions

File tree

Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
<OutputPath Condition="!HasTrailingSlash('$(OutputPath)')">$(OutputPath)\</OutputPath>
6565
</PropertyGroup>
6666
<ItemGroup Condition="'$(NoCommonAnalyzers)'!='true' and '$(IsTestProject)' != 'true' and '$(SourceLinkEnabled)' != 'false'">
67-
<PackageReference Include="SourceLink.Create.CommandLine" Version="2.7.4" PrivateAssets="All" />
67+
<PackageReference Include="SourceLink.Create.CommandLine" Version="2.8.0" PrivateAssets="All" />
6868
</ItemGroup>
6969
<ItemGroup Condition="'$(NoCommonAnalyzers)'!='true'">
7070
<PackageReference Include="Microsoft.AnalyzerPowerPack" Version="1.1.0" PrivateAssets="All" />

SampleArgs/Program.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66
using System.ComponentModel;
77
using Ubiquity.CommandlineParsing;
88

9+
// warning SA1652: Enable XML documentation output
10+
// This is a sample app and not a documented API
11+
#pragma warning disable SA1652
12+
913
namespace SampleArgs
1014
{
1115
public static class Program

Ubiquity.CommandlineParsing.docfx/Ubiquity.CommandlineParsing.docfx.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
43
<TargetFramework>net47</TargetFramework>
54
</PropertyGroup>
@@ -11,15 +10,14 @@
1110

1211
<ItemGroup>
1312
<PackageReference Include="CSemVer.Build.Tasks" Version="1.0.3-beta--ci-BLD.431367438" />
14-
<PackageReference Include="docfx.console" Version="2.29.1" Condition="'$(TargetFramework)'=='net47'" PrivateAssets="All" />
15-
<PackageReference Include="memberpage" Version="2.29.1" Condition="'$(TargetFramework)'=='net47'" PrivateAssets="All" />
13+
<PackageReference Include="docfx.console" Version="2.31.0" Condition="'$(TargetFramework)'=='net47'" PrivateAssets="All" />
14+
<PackageReference Include="memberpage" Version="2.31.0" Condition="'$(TargetFramework)'=='net47'" PrivateAssets="All" />
1615
<PackageReference Include="msdn.4.5.2" Version="0.1.0-alpha-1611021200" Condition="'$(TargetFramework)'=='net47'" PrivateAssets="All" />
1716
</ItemGroup>
1817

19-
2018
<!--
2119
This target dynamically resolves the installed location of the NuGet Packages used and applies
22-
appropriate parameters to the docfx command to use them. Otherwise the docfx.json would need to
20+
appropriate parameters to the DocFx command to use them. Otherwise the docfx.json would need to
2321
have a hard coded path, which doesn't work with multiple users of a version controlled project.
2422
It also removes the need to workaround the hard coded path with relative paths by using a
2523
nuget.config to force package installs to a well known location.
@@ -35,14 +33,16 @@
3533
<MemberPagePath>%(memberpage.ResolvedPath)</MemberPagePath>
3634
<MsdnXRefPath>%(msdn4_5_2.ResolvedPath)</MsdnXRefPath>
3735
<LogLevel>Info</LogLevel>
38-
<LogFile>$(IntermediateOutputPath)Docfx-Metadata.log</LogFile>
36+
<LogFile>$(IntermediateOutputPath)DocFx-Metadata.log</LogFile>
3937
<DocParameters>$(DocParameters) --cleanupCacheHistory</DocParameters>
4038
<DocParameters>$(DocParameters) --lruSize=0</DocParameters>
4139
<DocParameters>$(DocParameters) --globalMetadata="{_buildVersion:\"$(FullBuildNumber)\"}"</DocParameters>
4240
<DocParameters>$(DocParameters) --intermediateFolder="$(IntermediateOutputPath.TrimEnd('\'))"</DocParameters>
4341
<DocParameters>$(DocParameters) --xref="$(MsdnXrefPath)\content\msdn.4.5.2.zip,$(MsdnXrefPath)\content\namespaces.4.5.2.zip"</DocParameters>
4442
<DocTemplate>statictoc,$(MemberPagePath)\content,templates\Ubiquity</DocTemplate>
4543
</PropertyGroup>
44+
<!-- NOTE: MSBuildVersion property is new in 15.6 (as of 15.6.0-pre.4.0 the value is 15.6.76 ) -->
45+
<Error Code="DOCFX:0001" ContinueOnError="false" Condition="$(MSBuildVersion)!=''" Text="As of DOCFX 2.31 docfx cannot generate metadata for CSPROJ files using VS 15.6.*" />
4646
</Target>
4747

4848
<!-- Stub the build target as this project only builds the documentation -->

Ubiquity.CommandlineParsing.docfx/docfx.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"api/**.md",
2828
"api/**.yml",
2929
"articles/**.md",
30-
"articles/**.yml",
30+
"articles/**.yml"
3131
],
3232
"src" : "."
3333
}
@@ -48,7 +48,7 @@
4848
{
4949
"_appTitle" : "Command line parsing",
5050
"_appFooter" : "Copyright (C) 2017, Ubiquity.NET contributors",
51-
"_disableBreadcrumb" : true,
52-
},
51+
"_disableBreadcrumb" : true
52+
}
5353
}
5454
}

Ubiquity.CommandlineParsing.docfx/templates/Ubiquity/readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ Changes:
1515
* Added Collapse region for Inheritance chain (Initially collapsed)
1616
* Added Collapse region for Derived classes list (Initially collapsed)
1717
* Added Collapse region for Implemented interfaces (Initially collapsed)
18-
* Added llvm language from highlightjs.org as it is not part of the docfx.vendor.js by default
18+
* Added llvm language and EBNF from highlightjs.org as those languages are not part of the docfx.vendor.js by default
1919

Ubiquity.CommandlineParsing.docfx/templates/Ubiquity/styles/main.css

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -277,14 +277,18 @@ article {
277277
overflow: visible;
278278
}
279279

280+
.toc .level1 > li {
281+
font-weight: bold;
282+
font-size: 14px;
283+
}
284+
280285
toc .level2 {
281286
font-weight: normal;
282-
font-size: inherit;
287+
font-size: 12px;
283288
}
284289

285-
.toc .level1 > li {
286-
font-weight: bold;
287-
font-size: inherit;
290+
.sidetoggle div {
291+
Width: 300px;
288292
}
289293

290294
/* Overrides for - Ubiquity DocFX Dark theme */

readme.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ target run-times
1111

1212
While the code is functional and even has some tests it isn't maintained or released as
1313
an actual supported project. New ideas in the way things are built including docs and versioning etc... will
14-
appear here first before actual projects. To accomplish the goals some reasonable real code was needed so this
15-
old library originally written to explore the Sprache parse was given a new lease on life as a "test dummy" of sorts.
14+
appear here first before actual projects. To accomplish the goals some reasonable real code was needed. So this
15+
old library, originally written to explore the Sprache parser, was given a new lease on life as a "test dummy"
16+
of sorts.
1617

1718
# OK, But I'm looking for a commandline parser...
1819
May we suggest [this one]( https://github.com/commandlineparser/commandline ) - it's on GitHub and MUCH more full

0 commit comments

Comments
 (0)