Merge branch 'release/1.0.0-rc2'

wilcommerce · Feb 25, 2018 · 2ac64fc · 2ac64fc
2 parents 34b5332 + e788354
commit 2ac64fc
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 13 deletions.
diff --git a/Wilcommerce.Core.Data.EFCore.Test/Fixtures/CommonContextFixture.cs b/Wilcommerce.Core.Data.EFCore.Test/Fixtures/CommonContextFixture.cs
@@ -1,4 +1,6 @@
-using Microsoft.EntityFrameworkCore;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
+using Moq;
 using System;
 using Wilcommerce.Core.Common.Domain.Models;
 
@@ -27,7 +29,7 @@ public void Dispose()
 
         protected virtual void PrepareData()
         {
-            var administrator = User.CreateAsAdministrator("Administrator", "admin@wilcommerce.com", "123");
+            var administrator = User.CreateAsAdministrator("Administrator", "admin@wilcommerce.com", "123", new Mock<IPasswordHasher<User>>().Object);
             Context.Users.Add(administrator);
 
             var settings = GeneralSettings.Create("Wilcommerce", "it-IT", "EUR", "info@wilcommerce.com");

diff --git a/Wilcommerce.Core.Data.EFCore.Test/Repository/RepositoryTest.cs b/Wilcommerce.Core.Data.EFCore.Test/Repository/RepositoryTest.cs
@@ -1,4 +1,6 @@
-using System.Linq;
+using Microsoft.AspNetCore.Identity;
+using Moq;
+using System.Linq;
 using Wilcommerce.Core.Common.Domain.Models;
 using Wilcommerce.Core.Data.EFCore.ReadModels;
 using Wilcommerce.Core.Data.EFCore.Test.Fixtures;
@@ -26,7 +28,7 @@ public void Add_New_User_Should_Increment_Users_Number()
         {
             int usersCount = _database.Users.Count();
 
-            var user = User.CreateAsAdministrator("Administrator2", "admin2@wilcommerce.com", "456");
+            var user = User.CreateAsAdministrator("Administrator2", "admin2@wilcommerce.com", "456", new Mock<IPasswordHasher<User>>().Object);
             _repository.Add(user);
             _repository.SaveChanges();
 

diff --git a/Wilcommerce.Core.Data.EFCore.Test/Wilcommerce.Core.Data.EFCore.Test.csproj b/Wilcommerce.Core.Data.EFCore.Test/Wilcommerce.Core.Data.EFCore.Test.csproj
@@ -7,8 +7,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="2.0.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.0" />
+    <PackageReference Include="Moq" Version="4.8.2" />
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
   </ItemGroup>

diff --git a/src/Wilcommerce.Core.Data.EFCore/Wilcommerce.Core.Data.EFCore.csproj b/src/Wilcommerce.Core.Data.EFCore/Wilcommerce.Core.Data.EFCore.csproj
@@ -14,8 +14,8 @@
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <Version>1.0.0-rc1</Version>
-    <PackageReleaseNotes>Upgrade to .NET Standard 2.0 &amp; .NET Core 2.0</PackageReleaseNotes>
+    <Version>1.0.0-rc2</Version>
+    <PackageReleaseNotes></PackageReleaseNotes>
     <Authors>Alberto Mori</Authors>
   </PropertyGroup>
 
@@ -28,12 +28,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="2.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="2.0.1" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Design" Version="2.0.0-preview1-final" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.0.0" />
-    <PackageReference Include="Wilcommerce.Core.Common" Version="1.0.0-rc1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.0.1" />
+    <PackageReference Include="Wilcommerce.Core.Common" Version="1.0.0-rc2" />
   </ItemGroup>
 
 </Project>