Skip to content

Commit

Permalink
ccnet#286 Fix PR: Change NUnit v2 to v3
Browse files Browse the repository at this point in the history
- cleanup csproj files
- remove .gitignore files from subfolders
- bump appveyor vm to Visual Studio 2019
- add HTML Help Workshop to Tools so SHBF project can be built on W10
  • Loading branch information
savornicesei committed Jan 26, 2020
1 parent 2b99c07 commit 5d8c162
Show file tree
Hide file tree
Showing 82 changed files with 1,067 additions and 933 deletions.
2 changes: 1 addition & 1 deletion .appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#---------------------------------#
# environment configuration #
#---------------------------------#
image: Visual Studio 2015
image: Visual Studio 2019

init:
- git config --global core.autocrlf true
Expand Down
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,14 @@
[Dd]ist/
[Pp]ublish/
[Rr]eports/
[Bb]uildMetrics/
build.txt
nant-*.log*
docgen/
wiki/
**/CommonAssemblyInfo.cs
/**/CommonAssemblyInfo.cs
/**/Webdashboard/projectcache
/**/Webdashboard/xsl

#ignore NuGet tools
[Tt]ools/EWSoftware.SHFB*
Expand Down Expand Up @@ -374,3 +377,4 @@ _site/
![Tt]ools/Cake/packages.config

thelabelprefix.txt
project/CommonAssemblyInfo.cs
44 changes: 14 additions & 30 deletions CCNet.shfbproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{5db725cb-0d8a-4905-8a45-68160d465572}</ProjectGuid>
<SHFBSchemaVersion>1.8.0.0</SHFBSchemaVersion>
<SHFBSchemaVersion>2017.9.26.0</SHFBSchemaVersion>
<!-- AssemblyName, Name, and RootNamespace are not used by SHFB but Visual
Studio adds them anyway -->
<AssemblyName>Documentation</AssemblyName>
Expand All @@ -16,46 +16,30 @@
<!-- SHFB properties -->
<OutputPath>Help\bin\</OutputPath>
<HtmlHelpName>CruiseControlNET</HtmlHelpName>
<HelpFileFormat>HtmlHelp1x</HelpFileFormat>
<HelpFileFormat>HtmlHelp1</HelpFileFormat>
<ProjectSummary>Documentation for CruiseControl.NET.</ProjectSummary>
<HelpTitle>CruiseControl.NET Common Communications Client</HelpTitle>
<Preliminary>True</Preliminary>
<PresentationStyle>Prototype</PresentationStyle>
<PresentationStyle>VS2013</PresentationStyle>
<MissingTags>Summary, Parameter, Returns, AutoDocumentCtors, Namespace, TypeParameter</MissingTags>
<HtmlHelp1xCompilerPath>Tools\HTML Help Workshop\</HtmlHelp1xCompilerPath>
<SandcastlePath>Tools\Sandcastle\</SandcastlePath>
<DocumentationSources>
<DocumentationSource sourceFile="build\remote\ThoughtWorks.CruiseControl.Communications.dll" />
<DocumentationSource sourceFile="build\remote\ThoughtWorks.CruiseControl.Communications.xml" />
<DocumentationSource sourceFile="Build\Remote\ThoughtWorks.CruiseControl.Remote.dll" />
<DocumentationSource sourceFile="Build\Remote\ThoughtWorks.CruiseControl.Remote.xml" />
<DocumentationSource sourceFile="Build\Remote\ThoughtWorks.CruiseControl.Remote.Extensions.dll" />
<DocumentationSource sourceFile="Build\Remote\ThoughtWorks.CruiseControl.Remote.Extensions.xml" />
</DocumentationSources>
<HelpFileVersion>1.5.0.0</HelpFileVersion>
<ComponentConfigurations>
<ComponentConfig id="Post-transform Component" enabled="True" xmlns="">
<component id="Post-transform Component" type="SandcastleBuilder.Components.PostTransformComponent" assembly="{@SHFBFolder}SandcastleBuilder.Components.dll">
<!-- Code colorizer files (required).
Attributes:
Stylesheet file (required)
Script file (required)
"Copy" image file (required) -->
<colorizer stylesheet="{@SHFBFolder}Colorizer\highlight.css" scriptFile="{@SHFBFolder}Colorizer\highlight.js" copyImage="{@SHFBFolder}Colorizer\CopyCode.gif" />
<!-- Base output path for the files (required). This should match
the parent folder of the output path of the HTML files (see
SaveComponent). -->
<outputPath value="Output\" />
<!-- Logo image file (optional). Filename is required. The height,
width, altText, placement, and alignment attributes are
optional. -->
<logoFile filename="{@ProjectFolder}Help\CCNet-Icon.png" height="0" width="0" altText="" placement="left" alignment="left" />
</component>
</ComponentConfig>
<ComponentConfig id="Code Block Component" enabled="True" xmlns="">
<ComponentConfig id="Code Block Component" enabled="True">
<component id="Code Block Component" type="SandcastleBuilder.Components.CodeBlockComponent" assembly="{@SHFBFolder}SandcastleBuilder.Components.dll">
<basePath value="{@ProjectFolder}" />
<languageFilter value="true" />
<allowMissingSource value="false" />
<removeRegionMarkers value="false" />
<colorizer syntaxFile="{@SHFBFolder}Colorizer\highlight.xml" styleFile="{@SHFBFolder}Colorizer\highlight.xsl" copyImageUrl="../icons/CopyCode.gif" language="cs" tabSize="3" numberLines="false" outlining="true" keepSeeTags="false" defaultTitle="true" />
</component>
<basePath value="{@ProjectFolder}" />
<outputPaths>{@HelpFormatOutputPaths}</outputPaths>
<allowMissingSource value="false" />
<removeRegionMarkers value="false" />
<colorizer syntaxFile="{@SHFBFolder}PresentationStyles\Colorizer\highlight.xml" styleFile="{@SHFBFolder}PresentationStyles\Colorizer\highlight.xsl" stylesheet="{@SHFBFolder}PresentationStyles\Colorizer\highlight.css" scriptFile="{@SHFBFolder}PresentationStyles\Colorizer\highlight.js" disabled="{@DisableCodeBlockComponent}" language="cs" tabSize="3" numberLines="false" outlining="true" keepSeeTags="false" defaultTitle="true" />
</component>
</ComponentConfig>
</ComponentConfigurations>
<PlugInConfigurations>
Expand Down
Binary file added Tools/HTML Help Workshop/HHCtrl.cab
Binary file not shown.
Binary file added Tools/HTML Help Workshop/advpack.dll
Binary file not shown.
Binary file added Tools/HTML Help Workshop/api.chm
Binary file not shown.
Binary file added Tools/HTML Help Workshop/cntimage.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Tools/HTML Help Workshop/cnvcnt.dll
Binary file not shown.
Binary file added Tools/HTML Help Workshop/cnvtoc.dll
Binary file not shown.
Binary file added Tools/HTML Help Workshop/dl.cl
Binary file not shown.
Binary file added Tools/HTML Help Workshop/e.cl
Binary file not shown.
Binary file added Tools/HTML Help Workshop/el.cl
Binary file not shown.
Binary file added Tools/HTML Help Workshop/flash.exe
Binary file not shown.
Binary file added Tools/HTML Help Workshop/flash256.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Tools/HTML Help Workshop/gencnv.dll
Binary file not shown.
Binary file added Tools/HTML Help Workshop/h.cl
Binary file not shown.
Binary file added Tools/HTML Help Workshop/hha.dll
Binary file not shown.
Binary file added Tools/HTML Help Workshop/hhaxref.chm
Binary file not shown.
Binary file added Tools/HTML Help Workshop/hhc.exe
Binary file not shown.
Binary file added Tools/HTML Help Workshop/hhcout.dll
Binary file not shown.
Binary file added Tools/HTML Help Workshop/hhkout.dll
Binary file not shown.
Binary file added Tools/HTML Help Workshop/hhupd.exe
Binary file not shown.
Binary file added Tools/HTML Help Workshop/hhw.exe
Binary file not shown.
Binary file added Tools/HTML Help Workshop/hhw.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Tools/HTML Help Workshop/htmlhelp.chm
Binary file not shown.
Loading

0 comments on commit 5d8c162

Please sign in to comment.