Skip to content

Commit f0db06b

Browse files
rstamrstam
committed
CSHARP-1139: Use NuGet to manage our dependency on NUnit.
1 parent 9336b6d commit f0db06b

File tree

20 files changed

+49
-23
lines changed

20 files changed

+49
-23
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,3 +53,4 @@ src/packages
5353
# Other
5454
artifacts
5555
packages
56+
Tools/FAKE

‎build.cmd

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
@echo off
2-
if not exist packages\FAKE\tools\Fake.exe (
3-
"tools\nuget\nuget.exe" "install" "FAKE" "-OutputDirectory" "packages" "-ExcludeVersion"
4-
)
5-
"packages\FAKE\tools\Fake.exe" build\build.fsx %*
2+
Tools\NuGet\NuGet.exe install FAKE -OutputDirectory Tools -ExcludeVersion
3+
Tools\FAKE\tools\Fake.exe build\build.fsx %*

‎build.sh

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
#!/bin/bash
2-
3-
mono --runtime=v4.0 Tools/NuGet/NuGet.exe install FAKE -OutputDirectory packages -ExcludeVersion
4-
5-
mono --runtime=v4.0 packages/FAKE/tools/FAKE.exe $@ --fsiargs -d:MONO ./build/build.fsx
2+
mono --runtime=v4.0 Tools/NuGet/NuGet.exe install FAKE -OutputDirectory Tools -ExcludeVersion
3+
mono --runtime=v4.0 Tools/FAKE/tools/FAKE.exe $@ --fsiargs -d:MONO ./build/build.fsx

‎build/build.fsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#r @"../packages/FAKE/tools/FakeLib.dll"
1+
#r @"../Tools/FAKE/tools/FakeLib.dll"
22
open System
33
open Fake
44
open Fake.AssemblyInfoFile

‎src/.nuget/packages.config

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="NUnit.Runners" version="2.6.4" />
4+
</packages>

‎src/CSharpDriver.sln

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{391D831D-5
4343
EndProject
4444
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MongoDB.Driver.Examples", "MongoDB.Driver.Examples\MongoDB.Driver.Examples.csproj", "{0B7600F4-A343-4007-8977-933DBEFC0CC7}"
4545
EndProject
46+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{6307AC79-F94C-4E20-ABE1-83A6D1E942F6}"
47+
ProjectSection(SolutionItems) = preProject
48+
.nuget\packages.config = .nuget\packages.config
49+
EndProjectSection
50+
EndProject
4651
Global
4752
GlobalSection(SolutionConfigurationPlatforms) = preSolution
4853
Debug|Any CPU = Debug|Any CPU

‎src/MongoDB.Bson.Tests/MongoDB.Bson.Tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@
6666
<SpecificVersion>False</SpecificVersion>
6767
<HintPath>..\packages\NSubstitute.1.8.0.0\lib\net45\NSubstitute.dll</HintPath>
6868
</Reference>
69-
<Reference Include="nunit.framework, Version=2.5.9.10348, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
69+
<Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
7070
<SpecificVersion>False</SpecificVersion>
71-
<HintPath>..\..\Tools\NUnit\nunit.framework.dll</HintPath>
71+
<HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
7272
</Reference>
7373
<Reference Include="System" />
7474
<Reference Include="System.Core" />

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22
<packages>
33
<package id="FluentAssertions" version="3.2.1" targetFramework="net45" />
44
<package id="NSubstitute" version="1.8.0.0" targetFramework="net45" />
5+
<package id="NUnit" version="2.6.4" targetFramework="net45" />
56
</packages>

‎src/MongoDB.Driver.Core.TestHelpers/MongoDB.Driver.Core.TestHelpers.csproj

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,9 @@
3030
<WarningLevel>4</WarningLevel>
3131
</PropertyGroup>
3232
<ItemGroup>
33-
<Reference Include="nunit.framework">
34-
<HintPath>..\..\Tools\NUnit\nunit.framework.dll</HintPath>
33+
<Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
34+
<SpecificVersion>False</SpecificVersion>
35+
<HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
3536
</Reference>
3637
<Reference Include="System" />
3738
<Reference Include="System.Core" />
@@ -56,6 +57,9 @@
5657
<Name>MongoDB.Driver.Core</Name>
5758
</ProjectReference>
5859
</ItemGroup>
60+
<ItemGroup>
61+
<None Include="packages.config" />
62+
</ItemGroup>
5963
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
6064
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
6165
Other similar extension points exist, see Microsoft.Common.targets.

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="NUnit" version="2.6.4" targetFramework="net45" />
4+
</packages>

0 commit comments

Comments
 (0)