resolved #414: Upgraded to ABP v4.3

ismcagdas · ismcagdas · commit 92f8bf5367d7 · 2019-02-26T11:11:31.000+03:00
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj b/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj
@@ -18,8 +18,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Abp.AutoMapper" Version="4.2.0" />
-    <PackageReference Include="Abp.ZeroCore.EntityFrameworkCore" Version="4.2.0" />
+    <PackageReference Include="Abp.AutoMapper" Version="4.3.0" />
+    <PackageReference Include="Abp.ZeroCore.EntityFrameworkCore" Version="4.3.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="2.2.0" />
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Migrator/AbpCompanyName.AbpProjectName.Migrator.csproj b/aspnet-core/src/AbpCompanyName.AbpProjectName.Migrator/AbpCompanyName.AbpProjectName.Migrator.csproj
@@ -18,7 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Abp.Castle.Log4Net" Version="4.2.0" />
+    <PackageReference Include="Abp.Castle.Log4Net" Version="4.3.0" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/AbpCompanyName.AbpProjectName.Web.Core.csproj b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/AbpCompanyName.AbpProjectName.Web.Core.csproj
@@ -26,10 +26,10 @@
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.2.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="3.0.0" />
-    <PackageReference Include="Abp.AspNetCore" Version="4.2.0" />
-    <PackageReference Include="Abp.ZeroCore" Version="4.2.0" />
+    <PackageReference Include="Abp.AspNetCore" Version="4.3.0" />
+    <PackageReference Include="Abp.ZeroCore" Version="4.3.0" />
     <PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
-    <PackageReference Include="Abp.AspNetCore.SignalR" Version="4.2.0" />
+    <PackageReference Include="Abp.AspNetCore.SignalR" Version="4.3.0" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/AbpCompanyName.AbpProjectName.Web.Host.csproj b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/AbpCompanyName.AbpProjectName.Web.Host.csproj
@@ -45,7 +45,7 @@
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.2.0" />
     <PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
-    <PackageReference Include="Abp.Castle.Log4Net" Version="4.2.0" />
+    <PackageReference Include="Abp.Castle.Log4Net" Version="4.3.0" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/AbpCompanyName.AbpProjectName.Web.Mvc.csproj b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/AbpCompanyName.AbpProjectName.Web.Mvc.csproj
@@ -47,9 +47,9 @@
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.2.0" />
     <PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
-    <PackageReference Include="Abp.HangFire" Version="4.2.0" />
-    <PackageReference Include="Abp.RedisCache" Version="4.2.0" />
-    <PackageReference Include="Abp.Castle.Log4Net" Version="4.2.0" />
+    <PackageReference Include="Abp.HangFire" Version="4.3.0" />
+    <PackageReference Include="Abp.RedisCache" Version="4.3.0" />
+    <PackageReference Include="Abp.Castle.Log4Net" Version="4.3.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.ViewCompilation" Version="2.2.0" PrivateAssets="All" />
   </ItemGroup>
 
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Controllers/AccountController.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Controllers/AccountController.cs
@@ -16,6 +16,7 @@
 using Abp.Extensions;
 using Abp.MultiTenancy;
 using Abp.Notifications;
+using Abp.Runtime.Session;
 using Abp.Threading;
 using Abp.Timing;
 using Abp.UI;
@@ -114,7 +115,6 @@ public async Task<ActionResult> Logout()
             return RedirectToAction("Login");
         }
 
-
         private async Task<AbpLoginResult<Tenant, User>> GetLoginResultAsync(string usernameOrEmailAddress, string password, string tenancyName)
         {
             var loginResult = await _logInManager.LoginAsync(usernameOrEmailAddress, password, tenancyName);
@@ -195,7 +195,7 @@ public async Task<ActionResult> Register(RegisterViewModel model)
                 if (model.IsExternalLogin)
                 {
                     Debug.Assert(externalLoginInfo != null);
-                    
+
                     if (string.Equals(externalLoginInfo.Principal.FindFirstValue(ClaimTypes.Email), model.EmailAddress, StringComparison.OrdinalIgnoreCase))
                     {
                         user.IsEmailConfirmed = true;
@@ -290,7 +290,7 @@ public ActionResult ExternalLogin(string provider, string returnUrl)
         public virtual async Task<ActionResult> ExternalLoginCallback(string returnUrl, string remoteError = null)
         {
             returnUrl = NormalizeReturnUrl(returnUrl);
-            
+
             if (remoteError != null)
             {
                 Logger.Error("Remote Error in ExternalLoginCallback: " + remoteError);
@@ -436,7 +436,7 @@ private string NormalizeReturnUrl(string returnUrl, Func<string> defaultValueBui
         /// </summary>
         /// <param name="message"></param>
         /// <returns></returns>
-        [AbpMvcAuthorize] 
+        [AbpMvcAuthorize]
         public async Task<ActionResult> TestNotification(string message = "")
         {
             if (message.IsNullOrEmpty())
diff --git a/aspnet-core/test/AbpCompanyName.AbpProjectName.Tests/AbpCompanyName.AbpProjectName.Tests.csproj b/aspnet-core/test/AbpCompanyName.AbpProjectName.Tests/AbpCompanyName.AbpProjectName.Tests.csproj
@@ -27,7 +27,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Abp.TestBase" Version="4.2.0" />
+    <PackageReference Include="Abp.TestBase" Version="4.3.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="2.2.1" />
     <PackageReference Include="Castle.Core" Version="4.3.1" />
   </ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`	`using Abp.Extensions;`
`17`	`17`	`using Abp.MultiTenancy;`
`18`	`18`	`using Abp.Notifications;`
	`19`	`+using Abp.Runtime.Session;`
`19`	`20`	`using Abp.Threading;`
`20`	`21`	`using Abp.Timing;`
`21`	`22`	`using Abp.UI;`
`@@ -114,7 +115,6 @@ public async Task<ActionResult> Logout()`
`114`	`115`	`return RedirectToAction("Login");`
`115`	`116`	`}`
`116`	`117`
`117`		`-`
`118`	`118`	`private async Task<AbpLoginResult<Tenant, User>> GetLoginResultAsync(string usernameOrEmailAddress, string password, string tenancyName)`
`119`	`119`	`{`
`120`	`120`	`var loginResult = await _logInManager.LoginAsync(usernameOrEmailAddress, password, tenancyName);`
`@@ -195,7 +195,7 @@ public async Task<ActionResult> Register(RegisterViewModel model)`
`195`	`195`	`if (model.IsExternalLogin)`
`196`	`196`	`{`
`197`	`197`	`Debug.Assert(externalLoginInfo != null);`
`198`		`-`
	`198`	`+`
`199`	`199`	`if (string.Equals(externalLoginInfo.Principal.FindFirstValue(ClaimTypes.Email), model.EmailAddress, StringComparison.OrdinalIgnoreCase))`
`200`	`200`	`{`
`201`	`201`	`user.IsEmailConfirmed = true;`
`@@ -290,7 +290,7 @@ public ActionResult ExternalLogin(string provider, string returnUrl)`
`290`	`290`	`public virtual async Task<ActionResult> ExternalLoginCallback(string returnUrl, string remoteError = null)`
`291`	`291`	`{`
`292`	`292`	`returnUrl = NormalizeReturnUrl(returnUrl);`
`293`		`-`
	`293`	`+`
`294`	`294`	`if (remoteError != null)`
`295`	`295`	`{`
`296`	`296`	`Logger.Error("Remote Error in ExternalLoginCallback: " + remoteError);`
`@@ -436,7 +436,7 @@ private string NormalizeReturnUrl(string returnUrl, Func<string> defaultValueBui`
`436`	`436`	`/// </summary>`
`437`	`437`	`/// <param name="message"></param>`
`438`	`438`	`/// <returns></returns>`
`439`		`- [AbpMvcAuthorize]`
	`439`	`+ [AbpMvcAuthorize]`
`440`	`440`	`public async Task<ActionResult> TestNotification(string message = "")`
`441`	`441`	`{`
`442`	`442`	`if (message.IsNullOrEmpty())`