Skip to content

Commit afc49aa

Browse files
committed
Build doc against json.net v8
1 parent c22128a commit afc49aa

File tree

4 files changed

+27
-19
lines changed

4 files changed

+27
-19
lines changed

src/Documentation/AdditionalReferenceDocumentation.shfbproj

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,13 @@
2727
<Argument Key="maxVersionParts" Value="" xmlns="" />
2828
</TransformComponentArguments>
2929
<DocumentationSources>
30-
<DocumentationSource sourceFile="..\packages\Newtonsoft.Json.6.0.4\lib\net40\Newtonsoft.Json.dll" />
31-
<DocumentationSource sourceFile="..\packages\Newtonsoft.Json.6.0.4\lib\net40\Newtonsoft.Json.xml" />
30+
<DocumentationSource sourceFile="..\packages\Newtonsoft.Json.8.0.3\lib\net40\Newtonsoft.Json.dll" />
31+
<DocumentationSource sourceFile="..\packages\Newtonsoft.Json.8.0.3\lib\net40\Newtonsoft.Json.xml" />
3232
<DocumentationSource sourceFile="..\packages\SimpleRESTServices.1.3.0.1\lib\net40\SimpleRESTServices.dll" />
3333
<DocumentationSource sourceFile="..\packages\SimpleRESTServices.1.3.0.1\lib\net40\SimpleRESTServices.xml" />
3434
</DocumentationSources>
35+
<PlugInConfigurations>
36+
</PlugInConfigurations>
3537
</PropertyGroup>
3638
<!-- There are no properties for these groups. AnyCPU needs to appear in order for Visual Studio to perform
3739
the build. The others are optional common platform types that may appear. -->
@@ -56,4 +58,4 @@
5658
</ItemGroup>
5759
<!-- Import the SHFB build targets -->
5860
<Import Project="$(SHFBROOT)\SandcastleHelpFileBuilder.targets" />
59-
</Project>
61+
</Project>

src/Documentation/Documentation.v4.0.shfbproj

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -99,14 +99,8 @@
9999
</versions>
100100
</configuration>
101101
</PlugInConfig>
102-
<PlugInConfig id="Additional Reference Links" enabled="True">
103-
<configuration>
104-
<targets>
105-
<target htmlSdkLinkType="None" help2SdkLinkType="Index" helpViewerSdkLinkType="Id" websiteSdkLinkType="None" helpFileProject="AdditionalReferenceDocumentation.shfbproj" />
106-
</targets>
107-
</configuration>
108-
</PlugInConfig>
109-
</PlugInConfigurations>
102+
<PlugInConfig id="Additional Reference Links" enabled="True"><configuration><targets><target htmlSdkLinkType="None" help2SdkLinkType="Index" helpViewerSdkLinkType="Id" websiteSdkLinkType="None" helpFileProject="AdditionalReferenceDocumentation.shfbproj" /></targets></configuration></PlugInConfig>
103+
<PlugInConfig id="Assembly Binding Redirection" enabled="True"><configuration useGAC="false"><assemblyBinding><dependentAssembly><assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" /><bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" /></dependentAssembly></assemblyBinding><ignoreIfUnresolved /></configuration></PlugInConfig></PlugInConfigurations>
110104
<ApiFilter>
111105
<Filter entryType="Namespace" fullName="Flurl.Extensions" isExposed="False" />
112106
<Filter entryType="Namespace" fullName="Flurl.Http" isExposed="False" />
@@ -129,11 +123,12 @@
129123
<HelpAttributes />
130124
<NamespaceSummaries>
131125
<NamespaceSummaryItem name="Flurl.Http" isDocumented="False" />
132-
<NamespaceSummaryItem name="OpenStack.Compute.v2_1.Serialization" isDocumented="False" />
133-
<NamespaceSummaryItem name="OpenStack.Compute.v2_2.Serialization" isDocumented="False" />
134-
<NamespaceSummaryItem name="OpenStack.Compute.v2_6.Serialization" isDocumented="False" />
135-
<NamespaceSummaryItem name="OpenStack.Serialization" isDocumented="False" />
136-
<NamespaceSummaryItem name="OpenStack.Synchronous" isDocumented="True" /></NamespaceSummaries>
126+
<NamespaceSummaryItem name="OpenStack.Compute.v2_1.Serialization" isDocumented="False" />
127+
<NamespaceSummaryItem name="OpenStack.Compute.v2_2.Serialization" isDocumented="False" />
128+
<NamespaceSummaryItem name="OpenStack.Compute.v2_6.Serialization" isDocumented="False" />
129+
<NamespaceSummaryItem name="OpenStack.Serialization" isDocumented="False" />
130+
<NamespaceSummaryItem name="OpenStack.Synchronous" isDocumented="True" />
131+
</NamespaceSummaries>
137132
<BuildLogFile />
138133
<HtmlHelp1xCompilerPath />
139134
<HtmlHelp2xCompilerPath />
@@ -190,4 +185,4 @@
190185
</ItemGroup>
191186
<!-- Import the SHFB build targets -->
192187
<Import Project="$(SHFBROOT)\SandcastleHelpFileBuilder.targets" />
193-
</Project>
188+
</Project>

src/Documentation/History/Current/Documentation.Current.shfbproj

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,17 @@
7272
<HelpAttributes />
7373
<NamespaceSummaries />
7474
<PlugInConfigurations>
75+
<PlugInConfig id="Assembly Binding Redirection" enabled="True">
76+
<configuration useGAC="false">
77+
<assemblyBinding>
78+
<dependentAssembly>
79+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
80+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
81+
</dependentAssembly>
82+
</assemblyBinding>
83+
<ignoreIfUnresolved />
84+
</configuration>
85+
</PlugInConfig>
7586
</PlugInConfigurations>
7687
<BuildLogFile />
7788
<HtmlHelp1xCompilerPath />
@@ -94,4 +105,4 @@
94105
</PropertyGroup>
95106
<!-- Import the SHFB build targets -->
96107
<Import Project="$(SHFBROOT)\SandcastleHelpFileBuilder.targets" />
97-
</Project>
108+
</Project>

src/Documentation/History/Current/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
<package id="Flurl.Http.Signed" version="0.6.2.2015062601" targetFramework="net45" />
55
<package id="Flurl.Signed" version="1.0.8" targetFramework="net45" />
66
<package id="Marvin.JsonPatch.Signed" version="0.7.0" targetFramework="net45" />
7-
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
7+
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
88
<package id="SimpleRESTServices" version="1.3.0.1" targetFramework="net40" />
99
</packages>

0 commit comments

Comments
 (0)