Merge branch 'master' into release

linq2db · Aug 30, 2017 · 14c67dd · 14c67dd
2 parents 135812d + 7037cfa
commit 14c67dd
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 12 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -9,7 +9,7 @@ cache:
 - '%USERPROFILE%\.nuget\packages -> **\project.json'
 
 environment:
-  nugetVersion: 1.2.0
+  nugetVersion: 1.2.1
 
 version: $(nugetVersion).{build}
 

diff --git a/samples/IdentitySample.Mvc/IdentitySample.Mvc.csproj b/samples/IdentitySample.Mvc/IdentitySample.Mvc.csproj
@@ -16,10 +16,6 @@
     <Compile Remove=".\Data\Migrations\*.cs" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Compile Include="Models\AccountViewModels\ExternalLoginConfirmationViewModel.cs" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\src\LinqToDB.Identity\LinqToDB.Identity.csproj" />
   </ItemGroup>

diff --git a/samples/IdentitySample.Mvc/Models/AccountViewModels/ExternalLoginConfirmationViewModel.cs b/samples/IdentitySample.Mvc/Models/AccountViewModels/ExternalLoginConfirmationViewModel.cs
@@ -2,10 +2,4 @@
 
 namespace IdentitySample.Models.AccountViewModels
 {
-	public class ExternalLoginConfirmationViewModel
-	{
-		[Required]
-		[EmailAddress]
-		public string Email { get; set; }
-	}
 }
diff --git a/samples/IdentitySample.Mvc/Models/AccountViewModels/ForgotPasswordViewModel.cs b/samples/IdentitySample.Mvc/Models/AccountViewModels/ForgotPasswordViewModel.cs
@@ -2,6 +2,13 @@
 
 namespace IdentitySample.Models.AccountViewModels
 {
+	public class ExternalLoginConfirmationViewModel
+	{
+		[Required]
+		[EmailAddress]
+		public string Email { get; set; }
+	}
+
 	public class ForgotPasswordViewModel
 	{
 		[Required]

diff --git a/src/LinqToDB.Identity/LinqToDB.Identity.csproj b/src/LinqToDB.Identity/LinqToDB.Identity.csproj
@@ -32,7 +32,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Identity" Version="1.1.2" />
-    <PackageReference Include="linq2db.core" Version="1.8.3" />
+    <PackageReference Include="linq2db.core" Version="1.9.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="1.1.1" />
   </ItemGroup>