CSHARP-1139: Use NuGet to manage our dependency on NUnit.

mongodb · Apr 3, 2015 · 8a9c929 · 8a9c929
1 parent 5565df6
commit 8a9c929
Show file tree

Hide file tree

Showing 21 changed files with 52 additions and 23 deletions.
diff --git a/.gitignore b/.gitignore
@@ -53,3 +53,4 @@ src/packages
 # Other
 artifacts
 packages
+Tools/FAKE
diff --git a/Release Notes/Release Notes v2.1.0.md b/Release Notes/Release Notes v2.1.0.md
@@ -0,0 +1,3 @@
+# .NET Driver Version 2.1.0 Release Notes
+
+Placeholder
diff --git a/build.cmd b/build.cmd
@@ -1,5 +1,3 @@
 @echo off
-if not exist packages\FAKE\tools\Fake.exe ( 
-	"tools\nuget\nuget.exe" "install" "FAKE" "-OutputDirectory" "packages" "-ExcludeVersion"
-)
-"packages\FAKE\tools\Fake.exe" build\build.fsx %*
+Tools\NuGet\NuGet.exe install FAKE -OutputDirectory Tools -ExcludeVersion
+Tools\FAKE\tools\Fake.exe build\build.fsx %*
diff --git a/build.sh b/build.sh
@@ -1,5 +1,3 @@
 #!/bin/bash
-
-mono --runtime=v4.0 Tools/NuGet/NuGet.exe install FAKE -OutputDirectory packages -ExcludeVersion
-
-mono --runtime=v4.0 packages/FAKE/tools/FAKE.exe $@ --fsiargs -d:MONO ./build/build.fsx
+mono --runtime=v4.0 Tools/NuGet/NuGet.exe install FAKE -OutputDirectory Tools -ExcludeVersion
+mono --runtime=v4.0 Tools/FAKE/tools/FAKE.exe $@ --fsiargs -d:MONO ./build/build.fsx
diff --git a/build/build.fsx b/build/build.fsx
@@ -1,4 +1,4 @@
-#r @"../packages/FAKE/tools/FakeLib.dll"
+#r @"../Tools/FAKE/tools/FakeLib.dll"
 open System
 open Fake
 open Fake.AssemblyInfoFile

diff --git a/src/.nuget/packages.config b/src/.nuget/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NUnit.Runners" version="2.6.4" />
+</packages>
diff --git a/src/CSharpDriver.sln b/src/CSharpDriver.sln
@@ -43,6 +43,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{391D831D-5
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MongoDB.Driver.Examples", "MongoDB.Driver.Examples\MongoDB.Driver.Examples.csproj", "{0B7600F4-A343-4007-8977-933DBEFC0CC7}"
 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
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

diff --git a/src/MongoDB.Bson.Tests/MongoDB.Bson.Tests.csproj b/src/MongoDB.Bson.Tests/MongoDB.Bson.Tests.csproj
@@ -66,9 +66,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\NSubstitute.1.8.0.0\lib\net45\NSubstitute.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.framework, Version=2.5.9.10348, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+    <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\Tools\NUnit\nunit.framework.dll</HintPath>
+      <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/src/MongoDB.Bson.Tests/packages.config b/src/MongoDB.Bson.Tests/packages.config
@@ -2,4 +2,5 @@
 <packages>
   <package id="FluentAssertions" version="3.2.1" targetFramework="net45" />
   <package id="NSubstitute" version="1.8.0.0" targetFramework="net45" />
+  <package id="NUnit" version="2.6.4" targetFramework="net45" />
 </packages>
diff --git a/src/MongoDB.Driver.Core.TestHelpers/MongoDB.Driver.Core.TestHelpers.csproj b/src/MongoDB.Driver.Core.TestHelpers/MongoDB.Driver.Core.TestHelpers.csproj
@@ -30,8 +30,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="nunit.framework">
-      <HintPath>..\..\Tools\NUnit\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -56,6 +57,9 @@
       <Name>MongoDB.Driver.Core</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/src/MongoDB.Driver.Core.TestHelpers/packages.config b/src/MongoDB.Driver.Core.TestHelpers/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NUnit" version="2.6.4" targetFramework="net45" />
+</packages>
diff --git a/src/MongoDB.Driver.Core.Tests/MongoDB.Driver.Core.Tests.csproj b/src/MongoDB.Driver.Core.Tests/MongoDB.Driver.Core.Tests.csproj
@@ -41,9 +41,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\NSubstitute.1.8.0.0\lib\net45\NSubstitute.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.framework, Version=2.6.2.12296, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+    <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\Tools\NUnit\nunit.framework.dll</HintPath>
+      <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/src/MongoDB.Driver.Core.Tests/packages.config b/src/MongoDB.Driver.Core.Tests/packages.config
@@ -2,4 +2,5 @@
 <packages>
   <package id="FluentAssertions" version="3.2.1" targetFramework="net45" />
   <package id="NSubstitute" version="1.8.0.0" targetFramework="net45" />
+  <package id="NUnit" version="2.6.4" targetFramework="net45" />
 </packages>
diff --git a/src/MongoDB.Driver.Examples/MongoDB.Driver.Examples.csproj b/src/MongoDB.Driver.Examples/MongoDB.Driver.Examples.csproj
@@ -38,8 +38,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\FluentAssertions.3.2.1\lib\net45\FluentAssertions.Core.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.framework">
-      <HintPath>..\..\Tools\NUnit\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/src/MongoDB.Driver.Examples/packages.config b/src/MongoDB.Driver.Examples/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="FluentAssertions" version="3.2.1" targetFramework="net45" />
+  <package id="NUnit" version="2.6.4" targetFramework="net45" />
 </packages>
diff --git a/src/MongoDB.Driver.Legacy.Tests/MongoDB.Driver.Legacy.Tests.csproj b/src/MongoDB.Driver.Legacy.Tests/MongoDB.Driver.Legacy.Tests.csproj
@@ -36,8 +36,9 @@
     <Reference Include="FluentAssertions.Core">
       <HintPath>..\packages\FluentAssertions.3.2.1\lib\net45\FluentAssertions.Core.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.framework">
-      <HintPath>..\..\Tools\NUnit\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/src/MongoDB.Driver.Legacy.Tests/packages.config b/src/MongoDB.Driver.Legacy.Tests/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="FluentAssertions" version="3.2.1" targetFramework="net45" />
+  <package id="NUnit" version="2.6.4" targetFramework="net45" />
 </packages>
diff --git a/src/MongoDB.Driver.Legacy.VB.Tests/MongoDB.Driver.Legacy.VB.Tests.vbproj b/src/MongoDB.Driver.Legacy.VB.Tests/MongoDB.Driver.Legacy.VB.Tests.vbproj
@@ -47,9 +47,9 @@
     <OptionInfer>On</OptionInfer>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="nunit.framework, Version=2.5.9.10348, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+    <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\Tools\NUnit\nunit.framework.dll</HintPath>
+      <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -108,6 +108,7 @@
       <CustomToolNamespace>My</CustomToolNamespace>
       <LastGenOutput>Settings.Designer.vb</LastGenOutput>
     </None>
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\MongoDB.Bson\MongoDB.Bson.csproj">

diff --git a/src/MongoDB.Driver.Legacy.VB.Tests/packages.config b/src/MongoDB.Driver.Legacy.VB.Tests/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NUnit" version="2.6.4" targetFramework="net45" />
+</packages>
diff --git a/src/MongoDB.Driver.Tests/MongoDB.Driver.Tests.csproj b/src/MongoDB.Driver.Tests/MongoDB.Driver.Tests.csproj
@@ -75,9 +75,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\NSubstitute.1.8.0.0\lib\net45\NSubstitute.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.framework, Version=2.5.9.10348, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+    <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\Tools\NUnit\nunit.framework.dll</HintPath>
+      <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.configuration" />

diff --git a/src/MongoDB.Driver.Tests/packages.config b/src/MongoDB.Driver.Tests/packages.config
@@ -2,4 +2,5 @@
 <packages>
   <package id="FluentAssertions" version="3.2.1" targetFramework="net45" />
   <package id="NSubstitute" version="1.8.0.0" targetFramework="net45" />
+  <package id="NUnit" version="2.6.4" targetFramework="net45" />
 </packages>