From 75b894cb2a949e370791c75a6255fc690ab0e386 Mon Sep 17 00:00:00 2001
From: Alexandre SPIESER <a.spieser@gmail.com>
Date: Wed, 10 Apr 2019 22:07:15 +0100
Subject: [PATCH] ran tests + removed obsolete methods

---
 .../Infrastructure/MongoDbDocumentTestBase.cs |  2 +-
 .../MongoDbTKeyDocumentTestBase.cs            |  2 +-
 IntegrationTests/App.config                   |  2 +-
 .../Infrastructure/MongoDBDocumentTestBase.cs |  2 +-
 .../MongoDbTKeyDocumentTestBase.cs            |  2 +-
 IntegrationTests/IntegrationTests.csproj      | 35 +++++++++++--------
 IntegrationTests/packages.config              | 13 ++++---
 7 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/CoreIntegrationTests/Infrastructure/MongoDbDocumentTestBase.cs b/CoreIntegrationTests/Infrastructure/MongoDbDocumentTestBase.cs
index c70056c..0c333a9 100644
--- a/CoreIntegrationTests/Infrastructure/MongoDbDocumentTestBase.cs
+++ b/CoreIntegrationTests/Infrastructure/MongoDbDocumentTestBase.cs
@@ -235,7 +235,7 @@ namespace CoreIntegrationTests.Infrastructure
             SUT.AddOne<T>(document);
             // Act
             var cursor = SUT.GetCursor<T>(x => x.Id.Equals(document.Id), PartitionKey);
-            var count = cursor.Count();
+            var count = cursor.CountDocuments();
             // Assert
             Assert.True(1 == count, GetTestName());
         }
diff --git a/CoreIntegrationTests/Infrastructure/MongoDbTKeyDocumentTestBase.cs b/CoreIntegrationTests/Infrastructure/MongoDbTKeyDocumentTestBase.cs
index 9d99665..e4f2051 100644
--- a/CoreIntegrationTests/Infrastructure/MongoDbTKeyDocumentTestBase.cs
+++ b/CoreIntegrationTests/Infrastructure/MongoDbTKeyDocumentTestBase.cs
@@ -236,7 +236,7 @@ namespace CoreIntegrationTests.Infrastructure
             SUT.AddOne<T, TKey>(document);
             // Act
             var cursor = SUT.GetCursor<T, TKey>(x => x.Id.Equals(document.Id), PartitionKey);
-            var count = cursor.Count();
+            var count = cursor.CountDocuments();
             // Assert
             Assert.True (1 == count, GetTestName());
         }
diff --git a/IntegrationTests/App.config b/IntegrationTests/App.config
index fb9836a..beb386a 100644
--- a/IntegrationTests/App.config
+++ b/IntegrationTests/App.config
@@ -11,7 +11,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
diff --git a/IntegrationTests/Infrastructure/MongoDBDocumentTestBase.cs b/IntegrationTests/Infrastructure/MongoDBDocumentTestBase.cs
index ebd66e2..ea3dfd6 100644
--- a/IntegrationTests/Infrastructure/MongoDBDocumentTestBase.cs
+++ b/IntegrationTests/Infrastructure/MongoDBDocumentTestBase.cs
@@ -202,7 +202,7 @@ namespace IntegrationTests.Infrastructure
             SUT.AddOne<T>(document);
             // Act
             var cursor = SUT.GetCursor<T>(x => x.Id.Equals(document.Id), PartitionKey);
-            var count = cursor.Count();
+            var count = cursor.CountDocuments();
             // Assert
             Assert.AreEqual(1, count, GetTestName());
         }
diff --git a/IntegrationTests/Infrastructure/MongoDbTKeyDocumentTestBase.cs b/IntegrationTests/Infrastructure/MongoDbTKeyDocumentTestBase.cs
index 3d0cf8c..e6b87d9 100644
--- a/IntegrationTests/Infrastructure/MongoDbTKeyDocumentTestBase.cs
+++ b/IntegrationTests/Infrastructure/MongoDbTKeyDocumentTestBase.cs
@@ -204,7 +204,7 @@ namespace IntegrationTests.Infrastructure
             SUT.AddOne<T, TKey>(document);
             // Act
             var cursor = SUT.GetCursor<T, TKey>(x => x.Id.Equals(document.Id), PartitionKey);
-            var count = cursor.Count();
+            var count = cursor.CountDocuments();
             // Assert
             Assert.AreEqual(1, count, GetTestName());
         }
diff --git a/IntegrationTests/IntegrationTests.csproj b/IntegrationTests/IntegrationTests.csproj
index c5b56bc..9a6c6b3 100644
--- a/IntegrationTests/IntegrationTests.csproj
+++ b/IntegrationTests/IntegrationTests.csproj
@@ -30,33 +30,32 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="DnsClient, Version=1.0.7.0, Culture=neutral, PublicKeyToken=4574bb5573c51424, processorArchitecture=MSIL">
-      <HintPath>..\packages\MongoDbGenericRepository.1.3.8\lib\net45\DnsClient.dll</HintPath>
+    <Reference Include="DnsClient, Version=1.2.0.0, Culture=neutral, PublicKeyToken=4574bb5573c51424, processorArchitecture=MSIL">
+      <HintPath>..\packages\DnsClient.1.2.0\lib\net45\DnsClient.dll</HintPath>
     </Reference>
-    <Reference Include="MongoDB.Bson, Version=2.7.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MongoDbGenericRepository.1.3.8\lib\net45\MongoDB.Bson.dll</HintPath>
+    <Reference Include="MongoDB.Bson, Version=2.8.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MongoDB.Bson.2.8.0\lib\net452\MongoDB.Bson.dll</HintPath>
     </Reference>
-    <Reference Include="MongoDB.Driver, Version=2.7.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MongoDbGenericRepository.1.3.8\lib\net45\MongoDB.Driver.dll</HintPath>
+    <Reference Include="MongoDB.Driver, Version=2.8.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MongoDB.Driver.2.8.0\lib\net452\MongoDB.Driver.dll</HintPath>
     </Reference>
-    <Reference Include="MongoDB.Driver.Core, Version=2.7.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MongoDbGenericRepository.1.3.8\lib\net45\MongoDB.Driver.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="MongoDbGenericRepository, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MongoDbGenericRepository.1.3.8\lib\net45\MongoDbGenericRepository.dll</HintPath>
+    <Reference Include="MongoDB.Driver.Core, Version=2.8.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MongoDB.Driver.Core.2.8.0\lib\net452\MongoDB.Driver.Core.dll</HintPath>
     </Reference>
     <Reference Include="nunit.framework, Version=3.9.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
       <HintPath>..\packages\NUnit.3.9.0\lib\net45\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
-    <Reference Include="System.Buffers, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\MongoDbGenericRepository.1.3.8\lib\net45\System.Buffers.dll</HintPath>
+    <Reference Include="System.Buffers, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Buffers.4.4.0\lib\netstandard2.0\System.Buffers.dll</HintPath>
     </Reference>
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\MongoDbGenericRepository.1.3.8\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
+    <Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -86,5 +85,11 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\MongoDbGenericRepository\MongoDbGenericRepository.csproj">
+      <Project>{efc776c4-2af3-440c-be80-3fbe335817a5}</Project>
+      <Name>MongoDbGenericRepository</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/IntegrationTests/packages.config b/IntegrationTests/packages.config
index 94c72ae..1d92b40 100644
--- a/IntegrationTests/packages.config
+++ b/IntegrationTests/packages.config
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="DnsClient" version="1.0.7" targetFramework="net461" />
-  <package id="MongoDB.Bson" version="2.7.0" targetFramework="net461" />
-  <package id="MongoDB.Driver" version="2.7.0" targetFramework="net461" />
-  <package id="MongoDB.Driver.Core" version="2.7.0" targetFramework="net461" />
-  <package id="MongoDbGenericRepository" version="1.3.8" targetFramework="net461" />
+  <package id="DnsClient" version="1.2.0" targetFramework="net461" />
+  <package id="MongoDB.Bson" version="2.8.0" targetFramework="net461" />
+  <package id="MongoDB.Driver" version="2.8.0" targetFramework="net461" />
+  <package id="MongoDB.Driver.Core" version="2.8.0" targetFramework="net461" />
   <package id="NUnit" version="3.9.0" targetFramework="net461" />
   <package id="NUnit.ConsoleRunner" version="3.7.0" targetFramework="net461" />
-  <package id="System.Buffers" version="4.3.0" targetFramework="net461" />
-  <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.0.0" targetFramework="net461" />
+  <package id="System.Buffers" version="4.4.0" targetFramework="net461" />
+  <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net461" />
 </packages>
\ No newline at end of file