Update packages

scott-xu · Jul 10, 2018 · 7c9bb45 · 7c9bb45
1 parent 5a58c4a
commit 7c9bb45
Show file tree

Hide file tree

Showing 22 changed files with 264 additions and 347 deletions.
diff --git a/....Testing.FakeItEasy.Ninject.Tests/EntityFramework.Testing.FakeItEasy.Ninject.Tests.csproj b/....Testing.FakeItEasy.Ninject.Tests/EntityFramework.Testing.FakeItEasy.Ninject.Tests.csproj
@@ -1,11 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net45</TargetFramework>
+    <TargetFramework>net452</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="xunit" Version="1.9.2" />
+    <PackageReference Include="xunit" Version="2.3.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/EntityFramework.Testing.FakeItEasy.Tests/EntityFramework.Testing.FakeItEasy.Tests.csproj b/src/EntityFramework.Testing.FakeItEasy.Tests/EntityFramework.Testing.FakeItEasy.Tests.csproj
@@ -1,11 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net45</TargetFramework>
+    <TargetFramework>net452</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="xunit" Version="1.9.2" />
+    <PackageReference Include="xunit" Version="2.3.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/EntityFramework.Testing.FakeItEasy.Tests/ManipulationTests.cs b/src/EntityFramework.Testing.FakeItEasy.Tests/ManipulationTests.cs
@@ -4,9 +4,7 @@
     using System.Data.Entity;
     using System.Data.Entity.Infrastructure;
     using System.Linq;
-#if !NET40
     using System.Threading.Tasks;
-#endif
     using global::FakeItEasy;
     using Xunit;
 
@@ -25,7 +23,7 @@ public void Can_remove_set()
 
             var result = set.ToList();
 
-            Assert.Equal(0, result.Count);
+            Assert.Empty(result);
         }
 
         [Fact]
@@ -57,7 +55,7 @@ public void Can_removeRange_sets()
 
             var result = set.ToList();
 
-            Assert.Equal(1, result.Count);
+            Assert.Single(result);
         }
 
         [Fact]
@@ -89,7 +87,7 @@ public void Can_attach_set()
 
             var result = set.ToList();
 
-            Assert.Equal(1, result.Count);
+            Assert.Single(result);
         }
 
         [Fact]
@@ -105,7 +103,7 @@ public void Can_add_set()
 
             var result = set.ToList();
 
-            Assert.Equal(1, result.Count);
+            Assert.Single(result);
         }
 
         [Fact]
@@ -162,10 +160,9 @@ public void Can_toList_twice()
 
             var result2 = set.ToList();
 
-            Assert.Equal(1, result2.Count);
+            Assert.Single(result2);
         }
 
-#if !NET40
         [Fact]
         public async Task Can_find_set_async()
         {
@@ -185,7 +182,6 @@ public async Task Can_find_set_async()
             Assert.NotNull(result);
             Assert.Equal(1, result.BlogId);
         }
-#endif
 
         [Fact]
         public void Can_specify_asNoTracking()
@@ -197,7 +193,7 @@ public void Can_specify_asNoTracking()
                 .AsNoTracking()
                 .ToList();
 
-            Assert.Equal(1, result.Count);
+            Assert.Single(result);
         }
 
         [Fact]
@@ -211,11 +207,7 @@ public void Can_create_entity()
 
         private DbSet<Blog> GetFakeDbSet()
         {
-#if NET40
-            return A.Fake<DbSet<Blog>>(o => o.Implements(typeof(IQueryable<Blog>)));
-#else
             return A.Fake<DbSet<Blog>>(o => o.Implements(typeof(IQueryable<Blog>)).Implements(typeof(IDbAsyncEnumerable<Blog>)));
-#endif
         }
 
         public class Blog

diff --git a/src/EntityFramework.Testing.FakeItEasy.Tests/QueryTests.cs b/src/EntityFramework.Testing.FakeItEasy.Tests/QueryTests.cs
@@ -15,7 +15,7 @@ public void Can_enumerate_set()
         {
             var data = new List<Blog> { new Blog { }, new Blog { } };
 
-            var set = A.Fake<DbSet<Blog>>(o => o.Implements(typeof(IQueryable<Blog>)))
+            var set = A.Fake<DbSet<Blog>>(o => o.Implements(typeof(IQueryable<Blog>)).Implements(typeof(IDbAsyncEnumerable<Blog>)))
                 .SetupData(data);
 
             var count = 0;
@@ -26,7 +26,7 @@ public void Can_enumerate_set()
 
             Assert.Equal(2, count);
         }
-#if !NET40
+
         [Fact]
         public async Task Can_enumerate_set_async()
         {
@@ -40,21 +40,20 @@ public async Task Can_enumerate_set_async()
 
             Assert.Equal(2, count);
         }
-#endif
+
         [Fact]
         public void Can_use_linq_materializer_directly_on_set()
         {
             var data = new List<Blog> { new Blog(), new Blog() };
 
-            var set = A.Fake<DbSet<Blog>>(o => o.Implements(typeof(IQueryable<Blog>)))
+            var set = A.Fake<DbSet<Blog>>(o => o.Implements(typeof(IQueryable<Blog>)).Implements(typeof(IDbAsyncEnumerable<Blog>)))
                 .SetupData(data);
 
             var result = set.ToList();
 
             Assert.Equal(2, result.Count);
         }
 
-#if !NET40
         [Fact]
         public async Task Can_use_linq_materializer_directly_on_set_async()
         {
@@ -67,7 +66,6 @@ public async Task Can_use_linq_materializer_directly_on_set_async()
 
             Assert.Equal(2, result.Count);
         }
-#endif
 
         [Fact]
         public void Can_use_linq_opeartors()
@@ -79,7 +77,7 @@ public void Can_use_linq_opeartors()
                 new Blog { BlogId = 3}
             };
 
-            var set = A.Fake<DbSet<Blog>>(o => o.Implements(typeof(IQueryable<Blog>)))
+            var set = A.Fake<DbSet<Blog>>(o => o.Implements(typeof(IQueryable<Blog>)).Implements(typeof(IDbAsyncEnumerable<Blog>)))
                 .SetupData(data);
 
             var result = set
@@ -92,7 +90,6 @@ public void Can_use_linq_opeartors()
             Assert.Equal(2, result[1].BlogId);
         }
 
-#if !NET40
         [Fact]
         public async Task Can_use_linq_opeartors_async()
         {
@@ -116,14 +113,12 @@ public async Task Can_use_linq_opeartors_async()
             Assert.Equal(2, result[1].BlogId);
         }
 
-#endif
-
         [Fact]
         public void Can_use_include_directly_on_set()
         {
             var data = new List<Blog> { new Blog(), new Blog() };
 
-            var set = A.Fake<DbSet<Blog>>(o => o.Implements(typeof(IQueryable<Blog>)))
+            var set = A.Fake<DbSet<Blog>>(o => o.Implements(typeof(IQueryable<Blog>)).Implements(typeof(IDbAsyncEnumerable<Blog>)))
                 .SetupData(data);
 
             var result = set
@@ -138,7 +133,7 @@ public void Can_use_include_after_linq_operator()
         {
             var data = new List<Blog> { new Blog(), new Blog() };
 
-            var set = A.Fake<DbSet<Blog>>(o => o.Implements(typeof(IQueryable<Blog>)))
+            var set = A.Fake<DbSet<Blog>>(o => o.Implements(typeof(IQueryable<Blog>)).Implements(typeof(IDbAsyncEnumerable<Blog>)))
                 .SetupData(data);
 
             var result = set

diff --git a/src/EntityFramework.Testing.FakeItEasy/FakeItEasyDbSetExtensions.cs b/src/EntityFramework.Testing.FakeItEasy/FakeItEasyDbSetExtensions.cs
@@ -11,10 +11,8 @@ namespace FakeItEasy
     using System.Data.Entity;
     using System.Data.Entity.Infrastructure;
     using System.Linq;
-#if !NET40
     using System.Threading;
     using System.Threading.Tasks;
-#endif
     using EntityFramework.Testing;
 
     /// <summary>
@@ -43,17 +41,14 @@ public static DbSet<TEntity> SetupData<TEntity>(this DbSet<TEntity> dbSet, IColl
             A.CallTo(() => ((IQueryable<TEntity>)dbSet).ElementType).ReturnsLazily(info => query.ElementType);
             A.CallTo(() => ((IQueryable<TEntity>)dbSet).GetEnumerator()).ReturnsLazily(info => query.GetEnumerator());
 
-#if !NET40
             A.CallTo(() => ((IDbAsyncEnumerable<TEntity>)dbSet).GetAsyncEnumerator()).ReturnsLazily(info => query.GetAsyncEnumerator());
-#endif
+
             A.CallTo(() => dbSet.AsNoTracking()).Returns(dbSet);
             A.CallTo(() => dbSet.Include(A<string>._)).Returns(dbSet);
             A.CallTo(() => dbSet.Find(A<object[]>._)).ReturnsLazily<TEntity, object[]>(objs => find(objs));
 
-#if !NET40
             A.CallTo(() => dbSet.FindAsync(A<object[]>._)).ReturnsLazily<Task<TEntity>, object[]>(objs => Task.Run(() => find(objs)));
             A.CallTo(() => dbSet.FindAsync(A<CancellationToken>._, A<object[]>._)).ReturnsLazily<Task<TEntity>, CancellationToken, object[]>((token, objs) => Task.Run(() => find(objs), token));
-#endif
 
             A.CallTo(() => dbSet.Create()).ReturnsLazily(() => Activator.CreateInstance<TEntity>());
 

diff --git a/...ntityFramework.Testing.Moq.Ninject.Tests/EntityFramework.Testing.Moq.Ninject.Tests.csproj b/...ntityFramework.Testing.Moq.Ninject.Tests/EntityFramework.Testing.Moq.Ninject.Tests.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net45</TargetFramework>
+    <TargetFramework>net452</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Ninject.MockingKernel.Moq" Version="3.3.0" />
-    <PackageReference Include="xunit" Version="1.9.2" />
+    <PackageReference Include="xunit" Version="2.3.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/EntityFramework.Testing.Moq.Ninject/EntityFramework.Testing.Moq.Ninject.csproj b/src/EntityFramework.Testing.Moq.Ninject/EntityFramework.Testing.Moq.Ninject.csproj
@@ -28,6 +28,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Ninject.MockingKernel.Moq" Version="3.3.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.0-beta004">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>

diff --git a/src/EntityFramework.Testing.Moq.Tests/EntityFramework.Testing.Moq.Tests.csproj b/src/EntityFramework.Testing.Moq.Tests/EntityFramework.Testing.Moq.Tests.csproj
@@ -1,11 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net45</TargetFramework>
+    <TargetFramework>net452</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="xunit" Version="1.9.2" />
+    <PackageReference Include="xunit" Version="2.3.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/EntityFramework.Testing.Moq.Tests/ManipulationTests.cs b/src/EntityFramework.Testing.Moq.Tests/ManipulationTests.cs
@@ -3,9 +3,7 @@
     using System.Collections.Generic;
     using System.Data.Entity;
     using System.Linq;
-#if !NET40
     using System.Threading.Tasks;
-#endif
     using global::Moq;
     using Xunit;
 
@@ -24,7 +22,7 @@ public void Can_remove_set()
 
             var result = set.Object.ToList();
 
-            Assert.Equal(0, result.Count);
+            Assert.Empty(result);
         }
 
         [Fact]
@@ -57,7 +55,7 @@ public void Can_removeRange_sets()
 
             var result = set.Object.ToList();
 
-            Assert.Equal(1, result.Count);
+            Assert.Single(result);
         }
 
         [Fact]
@@ -90,7 +88,7 @@ public void Can_add_set()
 
             var result = set.Object.ToList();
 
-            Assert.Equal(1, result.Count);
+            Assert.Single(result);
         }
 
         [Fact]
@@ -106,7 +104,7 @@ public void Can_attach_set()
 
             var result = set.Object.ToList();
 
-            Assert.Equal(1, result.Count);
+            Assert.Single(result);
         }
 
         [Fact]
@@ -165,10 +163,9 @@ public void Can_toList_twice()
 
             var result2 = set.Object.ToList();
 
-            Assert.Equal(1, result2.Count);
+            Assert.Single(result2);
         }
 
-#if !NET40
         [Fact]
         public async Task Can_find_set_async()
         {
@@ -188,7 +185,6 @@ public async Task Can_find_set_async()
             Assert.NotNull(result);
             Assert.Equal(1, result.BlogId);
         }
-#endif
 
         [Fact]
         public void Can_specify_asNoTracking()
@@ -200,7 +196,7 @@ public void Can_specify_asNoTracking()
                 .AsNoTracking()
                 .ToList();
 
-            Assert.Equal(1, result.Count);
+            Assert.Single(result);
         }
 
         [Fact]