Skip to content

Commit 007637d

Browse files
rstamrstam
committed
CSHARP-1576: Trying to get build.fsx working with NUnit3.
1 parent 3a9b0a3 commit 007637d

File tree

9 files changed

+24
-19
lines changed

9 files changed

+24
-19
lines changed

‎build/build.fsx‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
open System
33
open Fake
44
open Fake.AssemblyInfoFile
5+
open Fake.Testing.NUnit3
56

67
let config = getBuildParamOrDefault "config" "Release"
78
let baseVersion = getBuildParamOrDefault "baseVersion" "2.3.0"
@@ -129,15 +130,16 @@ Target "Test" (fun _ ->
129130
framework := "mono-4.0"
130131

131132
testsDir
132-
|> NUnit (fun p ->
133-
{ p with
134-
OutputFile = testResultsDir @@ getBuildParamOrDefault "testResults" "test-results.xml"
135-
DisableShadowCopy = true
136-
ShowLabels = Environment.GetEnvironmentVariable("MONGO_LOGGING") <> null
137-
Framework = !framework
138-
IncludeCategory = getBuildParamOrDefault "testInclude" ""
139-
ExcludeCategory = getBuildParamOrDefault "testExclude" ""
133+
|> NUnit3 (fun p ->
134+
{ p with
135+
OutputDir = testResultsDir @@ getBuildParamOrDefault "testResults" "test-results.xml"
136+
ShadowCopy = false
137+
// ShowLabels = Environment.GetEnvironmentVariable("MONGO_LOGGING") <> null
138+
// Framework = !framework
139+
// IncludeCategory = getBuildParamOrDefault "testInclude" ""
140+
// ExcludeCategory = getBuildParamOrDefault "testExclude" ""
140141
TimeOut = TimeSpan.FromMinutes 10.0
142+
Workers = Some 1
141143
})
142144
)
143145

‎src/.nuget/packages.config‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎src/CSharpDriver.sln‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 2013
4-
VisualStudioVersion = 12.0.31101.0
3+
# Visual Studio 14
4+
VisualStudioVersion = 14.0.24720.0
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MongoDB.Bson", "MongoDB.Bson\MongoDB.Bson.csproj", "{0E9A3A2A-49CD-4F6C-847C-DC79B4B65CE6}"
77
EndProject
@@ -45,11 +45,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MongoDB.Driver.Examples", "
4545
EndProject
4646
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MongoDB.Driver.GridFS", "MongoDB.Driver.GridFS\MongoDB.Driver.GridFS.csproj", "{6B5D1EA6-1088-4122-B8C4-B341822C7915}"
4747
EndProject
48-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{6307AC79-F94C-4E20-ABE1-83A6D1E942F6}"
49-
ProjectSection(SolutionItems) = preProject
50-
.nuget\packages.config = .nuget\packages.config
51-
EndProjectSection
52-
EndProject
5348
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MongoDB.Driver.GridFS.Tests", "MongoDB.Driver.GridFS.Tests\MongoDB.Driver.GridFS.Tests.csproj", "{1537C58E-BECD-4ED2-A900-1AFBB601D2B2}"
5449
EndProject
5550
Global

‎src/MongoDB.Bson.Tests/packages.config‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,6 @@
33
<package id="FluentAssertions" version="3.5.0" targetFramework="net45" />
44
<package id="NSubstitute" version="1.8.2.0" targetFramework="net45" />
55
<package id="NUnit" version="3.0.1" targetFramework="net45" />
6+
<package id="NUnit.Console" version="3.0.1" targetFramework="net45" />
7+
<package id="NUnit.Runners" version="3.0.1" targetFramework="net45" />
68
</packages>

‎src/MongoDB.Driver.Core.Tests/packages.config‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,6 @@
33
<package id="FluentAssertions" version="3.5.0" targetFramework="net45" />
44
<package id="NSubstitute" version="1.8.2.0" targetFramework="net45" />
55
<package id="NUnit" version="3.0.1" targetFramework="net45" />
6+
<package id="NUnit.Console" version="3.0.1" targetFramework="net45" />
7+
<package id="NUnit.Runners" version="3.0.1" targetFramework="net45" />
68
</packages>

‎src/MongoDB.Driver.GridFS.Tests/packages.config‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,6 @@
33
<package id="FluentAssertions" version="3.5.0" targetFramework="net45" />
44
<package id="NSubstitute" version="1.8.2.0" targetFramework="net45" />
55
<package id="NUnit" version="3.0.1" targetFramework="net45" />
6+
<package id="NUnit.Console" version="3.0.1" targetFramework="net45" />
7+
<package id="NUnit.Runners" version="3.0.1" targetFramework="net45" />
68
</packages>

‎src/MongoDB.Driver.Legacy.Tests/packages.config‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,6 @@
22
<packages>
33
<package id="FluentAssertions" version="3.5.0" targetFramework="net45" />
44
<package id="NUnit" version="3.0.1" targetFramework="net45" />
5+
<package id="NUnit.Console" version="3.0.1" targetFramework="net45" />
6+
<package id="NUnit.Runners" version="3.0.1" targetFramework="net45" />
57
</packages>

‎src/MongoDB.Driver.Legacy.VB.Tests/packages.config‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="NUnit" version="3.0.1" targetFramework="net45" />
4+
<package id="NUnit.Console" version="3.0.1" targetFramework="net45" />
5+
<package id="NUnit.Runners" version="3.0.1" targetFramework="net45" />
46
</packages>

‎src/MongoDB.Driver.Tests/packages.config‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,6 @@
33
<package id="FluentAssertions" version="3.5.0" targetFramework="net45" />
44
<package id="NSubstitute" version="1.8.2.0" targetFramework="net45" />
55
<package id="NUnit" version="3.0.1" targetFramework="net45" />
6+
<package id="NUnit.Console" version="3.0.1" targetFramework="net45" />
7+
<package id="NUnit.Runners" version="3.0.1" targetFramework="net45" />
68
</packages>

0 commit comments

Comments
 (0)