Skip to content

Commit 4b46cd0

Browse files
authored
Merge pull request #60 from NN---/fix/57
Fix documentation build
2 parents 694e965 + 6aa8ee0 commit 4b46cd0

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

CodeJamDoc.sln

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ VisualStudioVersion = 14.0.25123.0
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeJam.Main", "Main\src\CodeJam.Main.csproj", "{2F2046CC-FB47-4318-B335-5A82B04B6C40}"
77
EndProject
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CodeJam.Blocks", "Blocks\src\CodeJam.Blocks.csproj", "{0DFF0859-2400-4487-83AD-0ED10203D6D9}"
9+
EndProject
810
Project("{7CF6DF6D-3B04-46F8-A40B-537D21BCA0B4}") = "CodeJamDoc", "CodeJamDoc.shfbproj", "{383368D3-567C-4BF6-96D4-7A292DA5D486}"
911
EndProject
1012
Global
@@ -17,6 +19,10 @@ Global
1719
{2F2046CC-FB47-4318-B335-5A82B04B6C40}.Debug|Any CPU.Build.0 = Debug|Any CPU
1820
{2F2046CC-FB47-4318-B335-5A82B04B6C40}.Release|Any CPU.ActiveCfg = Release|Any CPU
1921
{2F2046CC-FB47-4318-B335-5A82B04B6C40}.Release|Any CPU.Build.0 = Release|Any CPU
22+
{0DFF0859-2400-4487-83AD-0ED10203D6D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
23+
{0DFF0859-2400-4487-83AD-0ED10203D6D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
24+
{0DFF0859-2400-4487-83AD-0ED10203D6D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
25+
{0DFF0859-2400-4487-83AD-0ED10203D6D9}.Release|Any CPU.Build.0 = Release|Any CPU
2026
{383368D3-567C-4BF6-96D4-7A292DA5D486}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
2127
{383368D3-567C-4BF6-96D4-7A292DA5D486}.Debug|Any CPU.Build.0 = Debug|Any CPU
2228
{383368D3-567C-4BF6-96D4-7A292DA5D486}.Release|Any CPU.ActiveCfg = Release|Any CPU

PerfTests/CodeJam.PerfTests.shfbproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
88
<SchemaVersion>2.0</SchemaVersion>
99
<ProjectGuid>{0c2b28b1-e46a-4ef6-b0cc-f007f289190e}</ProjectGuid>
10-
<SHFBSchemaVersion>2015.6.5.0</SHFBSchemaVersion>
10+
<SHFBSchemaVersion>2017.9.26.0</SHFBSchemaVersion>
1111
<!-- AssemblyName, Name, and RootNamespace are not used by SHFB but Visual Studio adds them anyway -->
1212
<AssemblyName>Documentation</AssemblyName>
1313
<RootNamespace>Documentation</RootNamespace>

appveyor.doc.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@ image: Visual Studio 2017
33
configuration: Debug
44
clone_folder: c:\projects\codejam
55
environment:
6-
SHFBROOT: C:\EWSoftware.SHFB.2015.10.10.0\tools\
6+
SHFBROOT: C:\EWSoftware.SHFB.2018.7.8.1\tools\
77
install:
88
- cmd: >-
9-
nuget install EWSoftware.SHFB -o c:\ -Version 2015.10.10
9+
nuget install EWSoftware.SHFB -o c:\ -Version 2018.7.8.1
1010
1111
nuget install EWSoftware.SHFB.NETFramework -o c:\projects\codejam
12+
13+
xcopy /E /S C:\EWSoftware.SHFB.2018.7.8.1 C:\EWSoftware.SHFB.2015.10.10.0\
1214
before_build:
1315
- cmd: nuget restore CodeJam.sln
1416
build:

0 commit comments

Comments
 (0)