Merge branch 'master' of https://github.com/aspnetboilerplate/module-…

…zero-template
aspnetboilerplate · Feb 24, 2022 · f49ed37 · f49ed37
2 parents 92c0845 + 28ec72f
commit f49ed37
Show file tree

Hide file tree

Showing 19 changed files with 239 additions and 304 deletions.
diff --git a/...bpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.csproj b/...bpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.csproj
@@ -36,21 +36,17 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Abp, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\Abp.7.0.0\lib\netstandard2.0\Abp.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Abp, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Abp.7.1.0\lib\netstandard2.0\Abp.dll</HintPath>
     </Reference>
-    <Reference Include="Abp.AutoMapper, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\Abp.AutoMapper.7.0.0\lib\netstandard2.0\Abp.AutoMapper.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Abp.AutoMapper, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Abp.AutoMapper.7.1.0\lib\netstandard2.0\Abp.AutoMapper.dll</HintPath>
     </Reference>
-    <Reference Include="Abp.Zero, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\Abp.Zero.7.0.0\lib\net461\Abp.Zero.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Abp.Zero, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Abp.Zero.7.1.0\lib\net461\Abp.Zero.dll</HintPath>
     </Reference>
-    <Reference Include="Abp.Zero.Common, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\Abp.Zero.Common.7.0.0\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Abp.Zero.Common, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Abp.Zero.Common.7.1.0\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
     </Reference>
     <Reference Include="AutoMapper, Version=10.0.0.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
       <HintPath>..\packages\AutoMapper.10.1.1\lib\net461\AutoMapper.dll</HintPath>

diff --git a/src/AbpCompanyName.AbpProjectName.Application/packages.config b/src/AbpCompanyName.AbpProjectName.Application/packages.config
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Abp" version="7.0.0" targetFramework="net461" />
-  <package id="Abp.AutoMapper" version="7.0.0" targetFramework="net461" />
-  <package id="Abp.Zero" version="7.0.0" targetFramework="net461" />
-  <package id="Abp.Zero.Common" version="7.0.0" targetFramework="net461" />
+  <package id="Abp" version="7.1.0" targetFramework="net461" />
+  <package id="Abp.AutoMapper" version="7.1.0" targetFramework="net461" />
+  <package id="Abp.Zero" version="7.1.0" targetFramework="net461" />
+  <package id="Abp.Zero.Common" version="7.1.0" targetFramework="net461" />
   <package id="AutoMapper" version="10.1.1" targetFramework="net461" />
   <package id="AutoMapper.Collection" version="7.0.1" targetFramework="net461" />
   <package id="Castle.Core" version="4.4.1" targetFramework="net461" />
@@ -16,13 +16,13 @@
   <package id="Microsoft.AspNet.Identity.Core" version="2.2.3" targetFramework="net461" />
   <package id="Microsoft.Bcl" version="1.1.10" targetFramework="net461" />
   <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Caching.Memory" version="6.0.0" targetFramework="net461" />
-  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="6.0.0" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Options" version="6.0.0" targetFramework="net461" />
   <package id="Microsoft.Bcl.AsyncInterfaces" version="6.0.0" targetFramework="net461" />
   <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net461" />
   <package id="Microsoft.Extensions.Caching.Abstractions" version="6.0.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Caching.Memory" version="6.0.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="6.0.0" targetFramework="net461" />
   <package id="Microsoft.Extensions.Logging.Abstractions" version="6.0.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Options" version="6.0.0" targetFramework="net461" />
   <package id="Microsoft.Extensions.Primitives" version="6.0.0" targetFramework="net461" />
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
   <package id="Nito.AsyncEx" version="5.1.2" targetFramework="net461" />

diff --git a/src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj b/src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj
@@ -36,17 +36,14 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Abp, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\Abp.7.0.0\lib\netstandard2.0\Abp.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Abp, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Abp.7.1.0\lib\netstandard2.0\Abp.dll</HintPath>
     </Reference>
-    <Reference Include="Abp.Zero, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\Abp.Zero.7.0.0\lib\net461\Abp.Zero.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Abp.Zero, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Abp.Zero.7.1.0\lib\net461\Abp.Zero.dll</HintPath>
     </Reference>
-    <Reference Include="Abp.Zero.Common, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\Abp.Zero.Common.7.0.0\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Abp.Zero.Common, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Abp.Zero.Common.7.1.0\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
     </Reference>
     <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
       <HintPath>..\packages\Castle.Core.4.4.1\lib\net45\Castle.Core.dll</HintPath>

diff --git a/src/AbpCompanyName.AbpProjectName.Core/Authorization/Users/UserManager.cs b/src/AbpCompanyName.AbpProjectName.Core/Authorization/Users/UserManager.cs
@@ -25,7 +25,8 @@ public class UserManager : AbpUserManager<Role, User>
             ILocalizationManager localizationManager,
             ISettingManager settingManager,
             IdentityEmailMessageService emailService,
-            IUserTokenProviderAccessor userTokenProviderAccessor)
+            IUserTokenProviderAccessor userTokenProviderAccessor,
+            IRepository<UserLogin,long> userLogin)
             : base(
                   userStore,
                   roleManager,
@@ -38,7 +39,8 @@ public class UserManager : AbpUserManager<Role, User>
                   localizationManager,
                   emailService,
                   settingManager,
-                  userTokenProviderAccessor)
+                  userTokenProviderAccessor, 
+                  userLogin)
         {
         }
     }

diff --git a/src/AbpCompanyName.AbpProjectName.Core/packages.config b/src/AbpCompanyName.AbpProjectName.Core/packages.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Abp" version="7.0.0" targetFramework="net461" />
-  <package id="Abp.Zero" version="7.0.0" targetFramework="net461" />
-  <package id="Abp.Zero.Common" version="7.0.0" targetFramework="net461" />
+  <package id="Abp" version="7.1.0" targetFramework="net461" />
+  <package id="Abp.Zero" version="7.1.0" targetFramework="net461" />
+  <package id="Abp.Zero.Common" version="7.1.0" targetFramework="net461" />
   <package id="Castle.Core" version="4.4.1" targetFramework="net461" />
   <package id="Castle.Core.AsyncInterceptor" version="2.0.21-alpha" targetFramework="net461" />
   <package id="Castle.LoggingFacility" version="5.1.1" targetFramework="net461" />
@@ -13,13 +13,13 @@
   <package id="Microsoft.AspNet.Identity.Core" version="2.2.3" targetFramework="net461" />
   <package id="Microsoft.Bcl" version="1.1.10" targetFramework="net461" />
   <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Caching.Memory" version="6.0.0" targetFramework="net461" />
-  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="6.0.0" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Options" version="6.0.0" targetFramework="net461" />
   <package id="Microsoft.Bcl.AsyncInterfaces" version="6.0.0" targetFramework="net461" />
   <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net461" />
   <package id="Microsoft.Extensions.Caching.Abstractions" version="6.0.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Caching.Memory" version="6.0.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="6.0.0" targetFramework="net461" />
   <package id="Microsoft.Extensions.Logging.Abstractions" version="6.0.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Options" version="6.0.0" targetFramework="net461" />
   <package id="Microsoft.Extensions.Primitives" version="6.0.0" targetFramework="net461" />
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
   <package id="Nito.AsyncEx" version="5.1.2" targetFramework="net461" />

diff --git a/...yName.AbpProjectName.EntityFramework/AbpCompanyName.AbpProjectName.EntityFramework.csproj b/...yName.AbpProjectName.EntityFramework/AbpCompanyName.AbpProjectName.EntityFramework.csproj
@@ -37,29 +37,23 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Abp, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\Abp.7.0.0\lib\netstandard2.0\Abp.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Abp, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Abp.7.1.0\lib\netstandard2.0\Abp.dll</HintPath>
     </Reference>
-    <Reference Include="Abp.EntityFramework, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\Abp.EntityFramework.7.0.0\lib\net461\Abp.EntityFramework.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Abp.EntityFramework, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Abp.EntityFramework.7.1.0\lib\net461\Abp.EntityFramework.dll</HintPath>
     </Reference>
-    <Reference Include="Abp.EntityFramework.Common, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\Abp.EntityFramework.Common.7.0.0\lib\netstandard2.0\Abp.EntityFramework.Common.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Abp.EntityFramework.Common, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Abp.EntityFramework.Common.7.1.0\lib\netstandard2.0\Abp.EntityFramework.Common.dll</HintPath>
     </Reference>
-    <Reference Include="Abp.Zero, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\Abp.Zero.7.0.0\lib\net461\Abp.Zero.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Abp.Zero, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Abp.Zero.7.1.0\lib\net461\Abp.Zero.dll</HintPath>
     </Reference>
-    <Reference Include="Abp.Zero.Common, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\Abp.Zero.Common.7.0.0\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Abp.Zero.Common, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Abp.Zero.Common.7.1.0\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
     </Reference>
-    <Reference Include="Abp.Zero.EntityFramework, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\Abp.Zero.EntityFramework.7.0.0\lib\net461\Abp.Zero.EntityFramework.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Abp.Zero.EntityFramework, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Abp.Zero.EntityFramework.7.1.0\lib\net461\Abp.Zero.EntityFramework.dll</HintPath>
     </Reference>
     <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
       <HintPath>..\packages\Castle.Core.4.4.1\lib\net45\Castle.Core.dll</HintPath>

diff --git a/src/AbpCompanyName.AbpProjectName.EntityFramework/packages.config b/src/AbpCompanyName.AbpProjectName.EntityFramework/packages.config
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Abp" version="7.0.0" targetFramework="net461" />
-  <package id="Abp.EntityFramework" version="7.0.0" targetFramework="net461" />
-  <package id="Abp.EntityFramework.Common" version="7.0.0" targetFramework="net461" />
-  <package id="Abp.Zero" version="7.0.0" targetFramework="net461" />
-  <package id="Abp.Zero.Common" version="7.0.0" targetFramework="net461" />
-  <package id="Abp.Zero.EntityFramework" version="7.0.0" targetFramework="net461" />
+  <package id="Abp" version="7.1.0" targetFramework="net461" />
+  <package id="Abp.EntityFramework" version="7.1.0" targetFramework="net461" />
+  <package id="Abp.EntityFramework.Common" version="7.1.0" targetFramework="net461" />
+  <package id="Abp.Zero" version="7.1.0" targetFramework="net461" />
+  <package id="Abp.Zero.Common" version="7.1.0" targetFramework="net461" />
+  <package id="Abp.Zero.EntityFramework" version="7.1.0" targetFramework="net461" />
   <package id="Castle.Core" version="4.4.1" targetFramework="net461" />
   <package id="Castle.Core.AsyncInterceptor" version="2.0.21-alpha" targetFramework="net461" />
   <package id="Castle.LoggingFacility" version="5.1.1" targetFramework="net461" />
@@ -18,13 +18,13 @@
   <package id="Microsoft.AspNet.Identity.Core" version="2.2.3" targetFramework="net461" />
   <package id="Microsoft.Bcl" version="1.1.10" targetFramework="net461" />
   <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Caching.Memory" version="6.0.0" targetFramework="net461" />
-  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="6.0.0" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Options" version="6.0.0" targetFramework="net461" />
   <package id="Microsoft.Bcl.AsyncInterfaces" version="6.0.0" targetFramework="net461" />
   <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net461" />
   <package id="Microsoft.Extensions.Caching.Abstractions" version="6.0.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Caching.Memory" version="6.0.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="6.0.0" targetFramework="net461" />
   <package id="Microsoft.Extensions.Logging.Abstractions" version="6.0.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Options" version="6.0.0" targetFramework="net461" />
   <package id="Microsoft.Extensions.Primitives" version="6.0.0" targetFramework="net461" />
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
   <package id="Nito.AsyncEx" version="5.1.2" targetFramework="net461" />

diff --git a/src/AbpCompanyName.AbpProjectName.WebApi/AbpCompanyName.AbpProjectName.WebApi.csproj b/src/AbpCompanyName.AbpProjectName.WebApi/AbpCompanyName.AbpProjectName.WebApi.csproj
@@ -36,33 +36,26 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Abp, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\Abp.7.0.0\lib\netstandard2.0\Abp.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Abp, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Abp.7.1.0\lib\netstandard2.0\Abp.dll</HintPath>
     </Reference>
-    <Reference Include="Abp.AutoMapper, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\Abp.AutoMapper.7.0.0\lib\netstandard2.0\Abp.AutoMapper.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Abp.AutoMapper, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Abp.AutoMapper.7.1.0\lib\netstandard2.0\Abp.AutoMapper.dll</HintPath>
     </Reference>
-    <Reference Include="Abp.Web, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\Abp.Web.7.0.0\lib\net461\Abp.Web.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Abp.Web, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Abp.Web.7.1.0\lib\net461\Abp.Web.dll</HintPath>
     </Reference>
-    <Reference Include="Abp.Web.Api, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\Abp.Web.Api.7.0.0\lib\net461\Abp.Web.Api.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Abp.Web.Api, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Abp.Web.Api.7.1.0\lib\net461\Abp.Web.Api.dll</HintPath>
     </Reference>
-    <Reference Include="Abp.Web.Common, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\Abp.Web.Common.7.0.0\lib\netstandard2.0\Abp.Web.Common.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Abp.Web.Common, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Abp.Web.Common.7.1.0\lib\netstandard2.0\Abp.Web.Common.dll</HintPath>
     </Reference>
-    <Reference Include="Abp.Zero, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\Abp.Zero.7.0.0\lib\net461\Abp.Zero.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Abp.Zero, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Abp.Zero.7.1.0\lib\net461\Abp.Zero.dll</HintPath>
     </Reference>
-    <Reference Include="Abp.Zero.Common, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\Abp.Zero.Common.7.0.0\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Abp.Zero.Common, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Abp.Zero.Common.7.1.0\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
     </Reference>
     <Reference Include="AutoMapper, Version=10.0.0.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
       <HintPath>..\packages\AutoMapper.10.1.1\lib\net461\AutoMapper.dll</HintPath>