From 007637d679439cbcb54db750424f75ae72d88f26 Mon Sep 17 00:00:00 2001 From: rstam Date: Thu, 25 Feb 2016 10:57:15 -0500 Subject: [PATCH] CSHARP-1576: Trying to get build.fsx working with NUnit3. --- build/build.fsx | 18 ++++++++++-------- src/.nuget/packages.config | 4 ---- src/CSharpDriver.sln | 9 ++------- src/MongoDB.Bson.Tests/packages.config | 2 ++ src/MongoDB.Driver.Core.Tests/packages.config | 2 ++ .../packages.config | 2 ++ .../packages.config | 2 ++ .../packages.config | 2 ++ src/MongoDB.Driver.Tests/packages.config | 2 ++ 9 files changed, 24 insertions(+), 19 deletions(-) delete mode 100644 src/.nuget/packages.config diff --git a/build/build.fsx b/build/build.fsx index 5f5da211d5..c00a9990b9 100644 --- a/build/build.fsx +++ b/build/build.fsx @@ -2,6 +2,7 @@ open System open Fake open Fake.AssemblyInfoFile +open Fake.Testing.NUnit3 let config = getBuildParamOrDefault "config" "Release" let baseVersion = getBuildParamOrDefault "baseVersion" "2.3.0" @@ -129,15 +130,16 @@ Target "Test" (fun _ -> framework := "mono-4.0" testsDir - |> NUnit (fun p -> - { p with - OutputFile = testResultsDir @@ getBuildParamOrDefault "testResults" "test-results.xml" - DisableShadowCopy = true - ShowLabels = Environment.GetEnvironmentVariable("MONGO_LOGGING") <> null - Framework = !framework - IncludeCategory = getBuildParamOrDefault "testInclude" "" - ExcludeCategory = getBuildParamOrDefault "testExclude" "" + |> NUnit3 (fun p -> + { p with + OutputDir = testResultsDir @@ getBuildParamOrDefault "testResults" "test-results.xml" + ShadowCopy = false + // ShowLabels = Environment.GetEnvironmentVariable("MONGO_LOGGING") <> null + // Framework = !framework + // IncludeCategory = getBuildParamOrDefault "testInclude" "" + // ExcludeCategory = getBuildParamOrDefault "testExclude" "" TimeOut = TimeSpan.FromMinutes 10.0 + Workers = Some 1 }) ) diff --git a/src/.nuget/packages.config b/src/.nuget/packages.config deleted file mode 100644 index a7df95cf6b..0000000000 --- a/src/.nuget/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/CSharpDriver.sln b/src/CSharpDriver.sln index fe56e145e5..0ffa43dcfe 100644 --- a/src/CSharpDriver.sln +++ b/src/CSharpDriver.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.31101.0 +# Visual Studio 14 +VisualStudioVersion = 14.0.24720.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MongoDB.Bson", "MongoDB.Bson\MongoDB.Bson.csproj", "{0E9A3A2A-49CD-4F6C-847C-DC79B4B65CE6}" EndProject @@ -45,11 +45,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MongoDB.Driver.Examples", " EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MongoDB.Driver.GridFS", "MongoDB.Driver.GridFS\MongoDB.Driver.GridFS.csproj", "{6B5D1EA6-1088-4122-B8C4-B341822C7915}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{6307AC79-F94C-4E20-ABE1-83A6D1E942F6}" - ProjectSection(SolutionItems) = preProject - .nuget\packages.config = .nuget\packages.config - EndProjectSection -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MongoDB.Driver.GridFS.Tests", "MongoDB.Driver.GridFS.Tests\MongoDB.Driver.GridFS.Tests.csproj", "{1537C58E-BECD-4ED2-A900-1AFBB601D2B2}" EndProject Global diff --git a/src/MongoDB.Bson.Tests/packages.config b/src/MongoDB.Bson.Tests/packages.config index c30375d57a..fdee4b5e7c 100644 --- a/src/MongoDB.Bson.Tests/packages.config +++ b/src/MongoDB.Bson.Tests/packages.config @@ -3,4 +3,6 @@ + + \ No newline at end of file diff --git a/src/MongoDB.Driver.Core.Tests/packages.config b/src/MongoDB.Driver.Core.Tests/packages.config index c30375d57a..fdee4b5e7c 100644 --- a/src/MongoDB.Driver.Core.Tests/packages.config +++ b/src/MongoDB.Driver.Core.Tests/packages.config @@ -3,4 +3,6 @@ + + \ No newline at end of file diff --git a/src/MongoDB.Driver.GridFS.Tests/packages.config b/src/MongoDB.Driver.GridFS.Tests/packages.config index c30375d57a..fdee4b5e7c 100644 --- a/src/MongoDB.Driver.GridFS.Tests/packages.config +++ b/src/MongoDB.Driver.GridFS.Tests/packages.config @@ -3,4 +3,6 @@ + + \ No newline at end of file diff --git a/src/MongoDB.Driver.Legacy.Tests/packages.config b/src/MongoDB.Driver.Legacy.Tests/packages.config index 058c3cb9bb..1cd2935434 100644 --- a/src/MongoDB.Driver.Legacy.Tests/packages.config +++ b/src/MongoDB.Driver.Legacy.Tests/packages.config @@ -2,4 +2,6 @@ + + \ No newline at end of file diff --git a/src/MongoDB.Driver.Legacy.VB.Tests/packages.config b/src/MongoDB.Driver.Legacy.VB.Tests/packages.config index b183023e1b..08c457fa7a 100644 --- a/src/MongoDB.Driver.Legacy.VB.Tests/packages.config +++ b/src/MongoDB.Driver.Legacy.VB.Tests/packages.config @@ -1,4 +1,6 @@  + + \ No newline at end of file diff --git a/src/MongoDB.Driver.Tests/packages.config b/src/MongoDB.Driver.Tests/packages.config index c30375d57a..fdee4b5e7c 100644 --- a/src/MongoDB.Driver.Tests/packages.config +++ b/src/MongoDB.Driver.Tests/packages.config @@ -3,4 +3,6 @@ + + \ No newline at end of file