Skip to content

Commit 66c392a

Browse files
rstamrstam
committed
CSHARP-1707: Add missing .xml files and copy .NET Core artifacts to the artifacts directory.
1 parent aa52702 commit 66c392a

7 files changed

+64
-40
lines changed

‎build/MongoDB.Bson.nuspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
<file src="artifacts\bin\net45\MongoDB.Bson.dll" target="lib\net45" />
1919
<file src="artifacts\bin\net45\MongoDB.Bson.pdb" target="lib\net45" />
2020
<file src="artifacts\bin\net45\MongoDB.Bson.xml" target="lib\net45" />
21-
<file src="src\MongoDB.Bson.Dotnet\bin\Release\netstandard1.6\MongoDB.Bson.dll" target="lib\netstandard1.6" />
22-
<file src="src\MongoDB.Bson.Dotnet\bin\Release\netstandard1.6\MongoDB.Bson.pdb" target="lib\netstandard1.6" />
23-
<file src="src\MongoDB.Bson.Dotnet\bin\Release\netstandard1.6\MongoDB.Bson.xml" target="lib\netstandard1.6" />
21+
<file src="artifacts\bin\netstandard1.6\MongoDB.Bson.dll" target="lib\netstandard1.6" />
22+
<file src="artifacts\bin\netstandard1.6\MongoDB.Bson.pdb" target="lib\netstandard1.6" />
23+
<file src="artifacts\bin\netstandard1.6\MongoDB.Bson.xml" target="lib\netstandard1.6" />
2424
<file src="License.rtf" target ="" />
2525
<file src="src\MongoDB.Bson\**\*.cs" target="src\MongoDB.Bson" />
2626
<file src="src\MongoDB.Shared\**\*.cs" target="src\MongoDB.Shared" />

‎build/MongoDB.Driver-Build.nuspec

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,31 @@
2020
<file src="artifacts\bin\net45\MongoDB.Bson.xml" target="lib\net45" />
2121
<file src="artifacts\bin\net45\MongoDB.Driver.Core.dll" target="lib\net45" />
2222
<file src="artifacts\bin\net45\MongoDB.Driver.Core.pdb" target="lib\net45" />
23+
<file src="artifacts\bin\net45\MongoDB.Driver.Core.xml" target="lib\net45" />
2324
<file src="artifacts\bin\net45\MongoDB.Driver.dll" target="lib\net45" />
2425
<file src="artifacts\bin\net45\MongoDB.Driver.pdb" target="lib\net45" />
25-
<file src="artifacts\bin\net45\MongoDB.Driver.XML" target="lib\net45" />
26+
<file src="artifacts\bin\net45\MongoDB.Driver.xml" target="lib\net45" />
27+
<file src="artifacts\bin\net45\MongoDB.Driver.Legacy.dll" target="lib\net45" />
28+
<file src="artifacts\bin\net45\MongoDB.Driver.Legacy.pdb" target="lib\net45" />
29+
<file src="artifacts\bin\net45\MongoDB.Driver.Legacy.xml" target="lib\net45" />
2630
<file src="artifacts\bin\net45\MongoDB.Driver.GridFS.dll" target="lib\net45" />
2731
<file src="artifacts\bin\net45\MongoDB.Driver.GridFS.pdb" target="lib\net45" />
28-
<file src="artifacts\bin\net45\MongoDB.Driver.GridFS.XML" target="lib\net45" />
29-
<file src="src\MongoDB.Bson.Dotnet\bin\Release\netstandard1.6\MongoDB.Bson.dll" target="lib\netstandard1.6" />
30-
<file src="src\MongoDB.Bson.Dotnet\bin\Release\netstandard1.6\MongoDB.Bson.pdb" target="lib\netstandard1.6" />
31-
<file src="src\MongoDB.Bson.Dotnet\bin\Release\netstandard1.6\MongoDB.Bson.xml" target="lib\netstandard1.6" />
32-
<file src="src\MongoDB.Driver.Core.Dotnet\bin\Release\netstandard1.6\MongoDB.Driver.Core.dll" target="lib\netstandard1.6" />
33-
<file src="src\MongoDB.Driver.Core.Dotnet\bin\Release\netstandard1.6\MongoDB.Driver.Core.pdb" target="lib\netstandard1.6" />
34-
<file src="src\MongoDB.Driver.Dotnet\bin\Release\netstandard1.6\MongoDB.Driver.dll" target="lib\netstandard1.6" />
35-
<file src="src\MongoDB.Driver.Dotnet\bin\Release\netstandard1.6\MongoDB.Driver.pdb" target="lib\netstandard1.6" />
36-
<file src="src\MongoDB.Driver.Dotnet\bin\Release\netstandard1.6\MongoDB.Driver.xml" target="lib\netstandard1.6" />
37-
<file src="src\MongoDB.Driver.GridFS.Dotnet\bin\Release\netstandard1.6\MongoDB.Driver.GridFS.dll" target="lib\netstandard1.6" />
38-
<file src="src\MongoDB.Driver.GridFS.Dotnet\bin\Release\netstandard1.6\MongoDB.Driver.GridFS.pdb" target="lib\netstandard1.6" />
39-
<file src="src\MongoDB.Driver.GridFS.Dotnet\bin\Release\netstandard1.6\MongoDB.Driver.GridFS.xml" target="lib\netstandard1.6" />
32+
<file src="artifacts\bin\net45\MongoDB.Driver.GridFS.xml" target="lib\net45" />
33+
<file src="artifacts\bin\netstandard1.6\MongoDB.Bson.dll" target="lib\netstandard1.6" />
34+
<file src="artifacts\bin\netstandard1.6\MongoDB.Bson.pdb" target="lib\netstandard1.6" />
35+
<file src="artifacts\bin\netstandard1.6\MongoDB.Bson.xml" target="lib\netstandard1.6" />
36+
<file src="artifacts\bin\netstandard1.6\MongoDB.Driver.Core.dll" target="lib\netstandard1.6" />
37+
<file src="artifacts\bin\netstandard1.6\MongoDB.Driver.Core.pdb" target="lib\netstandard1.6" />
38+
<file src="artifacts\bin\netstandard1.6\MongoDB.Driver.Core.xml" target="lib\netstandard1.6" />
39+
<file src="artifacts\bin\netstandard1.6\MongoDB.Driver.dll" target="lib\netstandard1.6" />
40+
<file src="artifacts\bin\netstandard1.6\MongoDB.Driver.pdb" target="lib\netstandard1.6" />
41+
<file src="artifacts\bin\netstandard1.6\MongoDB.Driver.xml" target="lib\netstandard1.6" />
42+
<file src="artifacts\bin\netstandard1.6\MongoDB.Driver.Legacy.dll" target="lib\netstandard1.6" />
43+
<file src="artifacts\bin\netstandard1.6\MongoDB.Driver.Legacy.pdb" target="lib\netstandard1.6" />
44+
<file src="artifacts\bin\netstandard1.6\MongoDB.Driver.Legacy.xml" target="lib\netstandard1.6" />
45+
<file src="artifacts\bin\netstandard1.6\MongoDB.Driver.GridFS.dll" target="lib\netstandard1.6" />
46+
<file src="artifacts\bin\netstandard1.6\MongoDB.Driver.GridFS.pdb" target="lib\netstandard1.6" />
47+
<file src="artifacts\bin\netstandard1.6\MongoDB.Driver.GridFS.xml" target="lib\netstandard1.6" />
4048
<file src="License.rtf" target ="" />
4149
<file src="src\MongoDB.Bson\**\*.cs" target="src\MongoDB.Bson" />
4250
<file src="src\MongoDB.Driver.Core\**\*.cs" target="src\MongoDB.Driver.Core" />

‎build/MongoDB.Driver.Core.nuspec

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,10 @@
1717
<files>
1818
<file src="artifacts\bin\net45\MongoDB.Driver.Core.dll" target="lib\net45" />
1919
<file src="artifacts\bin\net45\MongoDB.Driver.Core.pdb" target="lib\net45" />
20-
<file src="src\MongoDB.Driver.Core.Dotnet\bin\Release\netstandard1.6\MongoDB.Driver.Core.dll" target="lib\netstandard1.6" />
21-
<file src="src\MongoDB.Driver.Core.Dotnet\bin\Release\netstandard1.6\MongoDB.Driver.Core.pdb" target="lib\netstandard1.6" />
20+
<file src="artifacts\bin\net45\MongoDB.Driver.Core.xml" target="lib\net45" />
21+
<file src="artifacts\bin\netstandard1.6\MongoDB.Driver.Core.dll" target="lib\netstandard1.6" />
22+
<file src="artifacts\bin\netstandard1.6\MongoDB.Driver.Core.pdb" target="lib\netstandard1.6" />
23+
<file src="artifacts\bin\netstandard1.6\MongoDB.Driver.Core.xml" target="lib\netstandard1.6" />
2224
<file src="License.rtf" target ="" />
2325
<file src="src\MongoDB.Driver.Core\**\*.cs" target="src\MongoDB.Driver.Core" />
2426
<file src="src\MongoDB.Shared\**\*.cs" target="src\MongoDB.Shared" />

‎build/MongoDB.Driver.GridFS.nuspec

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
<files>
1818
<file src="artifacts\bin\net45\MongoDB.Driver.GridFS.dll" target="lib\net45" />
1919
<file src="artifacts\bin\net45\MongoDB.Driver.GridFS.pdb" target="lib\net45" />
20-
<file src="artifacts\bin\net45\MongoDB.Driver.GridFS.XML" target="lib\net45" />
21-
<file src="src\MongoDB.Driver.GridFS.Dotnet\bin\Release\netstandard1.6\MongoDB.Driver.GridFS.dll" target="lib\netstandard1.6" />
22-
<file src="src\MongoDB.Driver.GridFS.Dotnet\bin\Release\netstandard1.6\MongoDB.Driver.GridFS.pdb" target="lib\netstandard1.6" />
23-
<file src="src\MongoDB.Driver.GridFS.Dotnet\bin\Release\netstandard1.6\MongoDB.Driver.GridFS.xml" target="lib\netstandard1.6" />
20+
<file src="artifacts\bin\net45\MongoDB.Driver.GridFS.xml" target="lib\net45" />
21+
<file src="artifacts\bin\netstandard1.6\MongoDB.Driver.GridFS.dll" target="lib\netstandard1.6" />
22+
<file src="artifacts\bin\netstandard1.6\MongoDB.Driver.GridFS.pdb" target="lib\netstandard1.6" />
23+
<file src="artifacts\bin\netstandard1.6\MongoDB.Driver.GridFS.xml" target="lib\netstandard1.6" />
2424
<file src="License.rtf" target ="" />
2525
<file src="src\MongoDB.Driver.GridFS\**\*.cs" target="src\MongoDB.Driver.GridFS" />
2626
<file src="src\MongoDB.Shared\**\*.cs" target="src\MongoDB.Shared" />

‎build/MongoDB.Driver.nuspec

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
<files>
1818
<file src="artifacts\bin\net45\MongoDB.Driver.dll" target="lib\net45" />
1919
<file src="artifacts\bin\net45\MongoDB.Driver.pdb" target="lib\net45" />
20-
<file src="artifacts\bin\net45\MongoDB.Driver.XML" target="lib\net45" />
21-
<file src="src\MongoDB.Driver.Dotnet\bin\Release\netstandard1.6\MongoDB.Driver.dll" target="lib\netstandard1.6" />
22-
<file src="src\MongoDB.Driver.Dotnet\bin\Release\netstandard1.6\MongoDB.Driver.pdb" target="lib\netstandard1.6" />
23-
<file src="src\MongoDB.Driver.Dotnet\bin\Release\netstandard1.6\MongoDB.Driver.xml" target="lib\netstandard1.6" />
20+
<file src="artifacts\bin\net45\MongoDB.Driver.xml" target="lib\net45" />
21+
<file src="artifacts\bin\netstandard1.6\MongoDB.Driver.dll" target="lib\netstandard1.6" />
22+
<file src="artifacts\bin\netstandard1.6\MongoDB.Driver.pdb" target="lib\netstandard1.6" />
23+
<file src="artifacts\bin\netstandard1.6\MongoDB.Driver.xml" target="lib\netstandard1.6" />
2424
<file src="License.rtf" target ="" />
2525
<file src="src\MongoDB.Driver\**\*.cs" target="src\MongoDB.Driver" />
2626
<file src="src\MongoDB.Shared\**\*.cs" target="src\MongoDB.Shared" />

‎build/build.fsx

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#r @"../Tools/FAKE.Dotnet/tools/Fake.Dotnet.dll"
33

44
open System
5+
open System.IO
56
open Fake
67
open Fake.AssemblyInfoFile
78
open Fake.Dotnet
@@ -40,7 +41,7 @@ let toolsDir = baseDir @@ "tools"
4041
let artifactsDir = baseDir @@ "artifacts"
4142
let binDir = artifactsDir @@ "bin"
4243
let binDirNet45 = binDir @@ "net45"
43-
let binDirNetStandard16 = binDir @@ "netstandard16"
44+
let binDirNetStandard16 = binDir @@ "netstandard1.6"
4445
let testResultsDir = artifactsDir @@ "test_results"
4546
let tempDir = artifactsDir @@ "tmp"
4647

@@ -154,6 +155,14 @@ Target "BuildNetStandard16" (fun _ ->
154155
Configuration = BuildConfiguration.Release
155156
})
156157
project
158+
159+
ensureDirectory binDirNetStandard16
160+
for projectName in [ "MongoDB.Bson"; "MongoDB.Driver.Core"; "MongoDB.Driver"; "MongoDB.Driver.Legacy"; "MongoDB.Driver.GridFS"] do
161+
let projectDirectory = baseDir @@ "src" @@ (projectName + ".Dotnet")
162+
let outputDirectory = projectDirectory @@ "bin" @@ "Release" @@ "netstandard1.6"
163+
for extension in [".dll"; ".pdb"; ".xml"] do
164+
CopyFile binDirNetStandard16 (outputDirectory @@ (projectName + extension))
165+
157166
)
158167

159168
Target "TestNet45" (fun _ ->
@@ -278,16 +287,21 @@ Target "Zip" (fun _ ->
278287
]
279288

280289
let netStandard16Files = [
281-
srcDir @@ "MongoDB.Bson.Dotnet" @@ "bin" @@ "Release" @@ "netstandard1.6" @@ "MongoDB.Bson.dll"
282-
srcDir @@ "MongoDB.Bson.Dotnet" @@ "bin" @@ "Release" @@ "netstandard1.6" @@ "MongoDB.Bson.pdb"
283-
srcDir @@ "MongoDB.Driver.Core.Dotnet" @@ "bin" @@ "Release" @@ "netstandard1.6" @@ "MongoDB.Driver.Core.dll"
284-
srcDir @@ "MongoDB.Driver.Core.Dotnet" @@ "bin" @@ "Release" @@ "netstandard1.6" @@ "MongoDB.Driver.Core.pdb"
285-
srcDir @@ "MongoDB.Driver.Dotnet" @@ "bin" @@ "Release" @@ "netstandard1.6" @@ "MongoDB.Driver.dll"
286-
srcDir @@ "MongoDB.Driver.Dotnet" @@ "bin" @@ "Release" @@ "netstandard1.6" @@ "MongoDB.Driver.pdb"
287-
srcDir @@ "MongoDB.Driver.Legacy.Dotnet" @@ "bin" @@ "Release" @@ "netstandard1.6" @@ "MongoDB.Driver.Legacy.dll"
288-
srcDir @@ "MongoDB.Driver.Legacy.Dotnet" @@ "bin" @@ "Release" @@ "netstandard1.6" @@ "MongoDB.Driver.Legacy.pdb"
289-
srcDir @@ "MongoDB.Driver.GridFS.Dotnet" @@ "bin" @@ "Release" @@ "netstandard1.6" @@ "MongoDB.Driver.GridFS.dll"
290-
srcDir @@ "MongoDB.Driver.GridFS.Dotnet" @@ "bin" @@ "Release" @@ "netstandard1.6" @@ "MongoDB.Driver.GridFS.pdb"
290+
binDirNetStandard16 @@ "MongoDB.Bson.dll"
291+
binDirNetStandard16 @@ "MongoDB.Bson.pdb"
292+
binDirNetStandard16 @@ "MongoDB.Bson.xml"
293+
binDirNetStandard16 @@ "MongoDB.Driver.Core.dll"
294+
binDirNetStandard16 @@ "MongoDB.Driver.Core.pdb"
295+
binDirNetStandard16 @@ "MongoDB.Driver.Core.xml"
296+
binDirNetStandard16 @@ "MongoDB.Driver.dll"
297+
binDirNetStandard16 @@ "MongoDB.Driver.pdb"
298+
binDirNetStandard16 @@ "MongoDB.Driver.xml"
299+
binDirNetStandard16 @@ "MongoDB.Driver.GridFS.dll"
300+
binDirNetStandard16 @@ "MongoDB.Driver.GridFS.pdb"
301+
binDirNetStandard16 @@ "MongoDB.Driver.GridFS.xml"
302+
binDirNetStandard16 @@ "MongoDB.Driver.Legacy.dll"
303+
binDirNetStandard16 @@ "MongoDB.Driver.Legacy.pdb"
304+
binDirNetStandard16 @@ "MongoDB.Driver.Legacy.xml"
291305
]
292306

293307
CopyFiles zipStagingDirectory sharedFiles

‎build/mongocsharpdriver.nuspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
<file src="artifacts\bin\net45\MongoDB.Driver.Legacy.dll" target="lib\net45" />
2020
<file src="artifacts\bin\net45\MongoDB.Driver.Legacy.pdb" target="lib\net45" />
2121
<file src="artifacts\bin\net45\MongoDB.Driver.Legacy.xml" target="lib\net45" />
22-
<file src="src\MongoDB.Driver.Legacy.Dotnet\bin\Release\netstandard1.6\MongoDB.Driver.Legacy.dll" target="lib\netstandard1.6" />
23-
<file src="src\MongoDB.Driver.Legacy.Dotnet\bin\Release\netstandard1.6\MongoDB.Driver.Legacy.pdb" target="lib\netstandard1.6" />
24-
<file src="src\MongoDB.Driver.Legacy.Dotnet\bin\Release\netstandard1.6\MongoDB.Driver.Legacy.xml" target="lib\netstandard1.6" />
22+
<file src="artifacts\bin\netstandard1.6\MongoDB.Driver.Legacy.dll" target="lib\netstandard1.6" />
23+
<file src="artifacts\bin\netstandard1.6\MongoDB.Driver.Legacy.pdb" target="lib\netstandard1.6" />
24+
<file src="artifacts\bin\netstandard1.6\MongoDB.Driver.Legacy.xml" target="lib\netstandard1.6" />
2525
<file src="License.rtf" target ="" />
2626
<file src="src\MongoDB.Driver.Legacy\**\*.cs" target="src\MongoDB.Driver.Legacy" />
2727
<file src="src\MongoDB.Shared\**\*.cs" target="src\MongoDB.Shared" />

0 commit comments

Comments
 (0)