Merge branch 'master' into release

ili · ili · commit 14c67ddb1376 · 2017-08-30T18:35:06.000+05:00
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>
 

Original file line number	Diff line number	Diff line change
`@@ -2,10 +2,4 @@`
`2`	`2`
`3`	`3`	`namespace IdentitySample.Models.AccountViewModels`
`4`	`4`	`{`
`5`		`- public class ExternalLoginConfirmationViewModel`
`6`		`- {`
`7`		`- [Required]`
`8`		`- [EmailAddress]`
`9`		`- public string Email { get; set; }`
`10`		`- }`
`11`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,13 @@`
`2`	`2`
`3`	`3`	`namespace IdentitySample.Models.AccountViewModels`
`4`	`4`	`{`
	`5`	`+ public class ExternalLoginConfirmationViewModel`
	`6`	`+ {`
	`7`	`+ [Required]`
	`8`	`+ [EmailAddress]`
	`9`	`+ public string Email { get; set; }`
	`10`	`+ }`
	`11`	`+`
`5`	`12`	`public class ForgotPasswordViewModel`
`6`	`13`	`{`
`7`	`14`	`[Required]`