Yeas! Fixed documentation generation

fsprojects · Apr 16, 2018 · 772a14c · 772a14c
1 parent 4a45ef6
commit 772a14c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/FSharp.Json.sln b/FSharp.Json.sln
@@ -12,8 +12,6 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "project", "project", "{C6675B8D-87AC-4C55-92B7-8C02DDAA38E0}"
 	ProjectSection(SolutionItems) = preProject
 		build.fsx = build.fsx
-		paket.dependencies = paket.dependencies
-		paket.lock = paket.lock
 		README.md = README.md
 		RELEASE_NOTES.md = RELEASE_NOTES.md
 	EndProjectSection

diff --git a/docsrc/tools/generate.fsx b/docsrc/tools/generate.fsx
@@ -9,7 +9,7 @@
 // for binaries output to root bin folder please add the filename only to the 
 // referenceBinaries list below in order to generate documentation for the binaries.
 // (This is the original behaviour of ProjectScaffold prior to multi project support)
-let referenceBinaries = []
+let referenceBinaries = ["../../src/FSharp.Json/bin/Debug/net452/FSharp.Json.dll"]
 // Web site location for the generated documentation
 let website = "/FSharp.Json"
 
@@ -75,8 +75,7 @@ let copyFiles () =
 
 let binaries =
     let manuallyAdded = 
-        referenceBinaries 
-        |> List.map (fun b -> bin @@ b)
+        referenceBinaries
 
     let conventionBased = 
         directoryInfo bin 

diff --git a/src/FSharp.Json/FSharp.Json.fsproj b/src/FSharp.Json/FSharp.Json.fsproj
@@ -14,6 +14,14 @@
     <PackageReleaseNotes>Added .NET Core support</PackageReleaseNotes>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net452|AnyCPU'">
+    <DocumentationFile>bin\Release\net452\FSharp.Json.XML</DocumentationFile>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net452|AnyCPU'">
+    <DocumentationFile>bin\Debug\net452\FSharp.Json.XML</DocumentationFile>
+  </PropertyGroup>
+
   <ItemGroup>
     <Compile Include="TextConversions.fs" />
     <Compile Include="JsonValue.fs" />