Upgrade to ABP7.1.*

3 years ago · 809cbdaab8
35 changed files with 144 additions and 116 deletions
--- a/common.props
+++ b/common.props
@ -1,11 +1,13 @@
 <Project>
  <PropertyGroup>
    <LangVersion>latest</LangVersion>
-    <Version>0.6.0</Version>
+    <Version>0.7.0</Version>
    <PackageIconUrl>https://raw.githubusercontent.com/realliangshiwei/Lsw.Abp.AntDesignUI/main/icon.png</PackageIconUrl>
    <PackageProjectUrl>https://github.com/realLiangshiwei/Lsw.Abp.AntDesignUI</PackageProjectUrl>
    <PackageLicenseExpression>MIT</PackageLicenseExpression>
    <RepositoryType>git</RepositoryType>
    <RepositoryUrl>https://github.com/realLiangshiwei/Lsw.Abp.AntDesignUI</RepositoryUrl>
+    <ABPPackageVersion>7.1.*</ABPPackageVersion>
+    <MicrosoftPackageVersion>7.0.*</MicrosoftPackageVersion>
  </PropertyGroup>
 </Project>
--- a/modules/AntDesignTheme/Lsw.Abp.AspnetCore.Components.Server.AntDesignTheme/Lsw.Abp.AspnetCore.Components.Server.AntDesignTheme.csproj
+++ b/modules/AntDesignTheme/Lsw.Abp.AspnetCore.Components.Server.AntDesignTheme/Lsw.Abp.AspnetCore.Components.Server.AntDesignTheme.csproj
@ -9,9 +9,9 @@
    </PropertyGroup>

    <ItemGroup>
-        <PackageReference Include="Volo.Abp.AspNetCore.Components.Server" Version="7.0.0" />
-        <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Bundling" Version="7.0.0" />
-        <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Packages" Version="7.0.0" />
+        <PackageReference Include="Volo.Abp.AspNetCore.Components.Server" Version="$(ABPPackageVersion)" />
+        <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Bundling" Version="$(ABPPackageVersion)" />
+        <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Packages" Version="$(ABPPackageVersion)" />
        <PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="2.2.0" />
    </ItemGroup>
    
--- a/modules/AntDesignTheme/Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme/Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme.csproj
+++ b/modules/AntDesignTheme/Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme/Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme.csproj
@ -9,7 +9,7 @@
    </PropertyGroup>
    
    <ItemGroup>
-      <PackageReference Include="Volo.Abp.UI.Navigation" Version="7.0.0" />
+      <PackageReference Include="Volo.Abp.UI.Navigation" Version="$(ABPPackageVersion)" />
    </ItemGroup>
    
    <ItemGroup>
--- a/modules/AntDesignTheme/Lsw.Abp.AspnetCore.Components.WebAssembly.AntDesignTheme/Lsw.Abp.AspnetCore.Components.WebAssembly.AntDesignTheme.csproj
+++ b/modules/AntDesignTheme/Lsw.Abp.AspnetCore.Components.WebAssembly.AntDesignTheme/Lsw.Abp.AspnetCore.Components.WebAssembly.AntDesignTheme.csproj
@ -12,10 +12,10 @@
    </ItemGroup>

    <ItemGroup>
-        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="7.0.0" />
-        <PackageReference Include="Volo.Abp.AspNetCore.Components.WebAssembly" Version="7.0.0" />
-        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.0" />
-        <PackageReference Include="Volo.Abp.Http.Client.IdentityModel.WebAssembly" Version="7.0.0" />
+        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="$(MicrosoftPackageVersion)" />
+        <PackageReference Include="Volo.Abp.AspNetCore.Components.WebAssembly" Version="$(ABPPackageVersion)" />
+        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="$(MicrosoftPackageVersion)" />
+        <PackageReference Include="Volo.Abp.Http.Client.IdentityModel.WebAssembly" Version="$(ABPPackageVersion)" />
    </ItemGroup>

 </Project>
--- a/modules/FeatureManagement/Lsw.Abp.FeatureManagement.Blazor.AntDesignUI/Lsw.Abp.FeatureManagement.Blazor.AntDesignUI.csproj
+++ b/modules/FeatureManagement/Lsw.Abp.FeatureManagement.Blazor.AntDesignUI/Lsw.Abp.FeatureManagement.Blazor.AntDesignUI.csproj
@ -8,9 +8,9 @@
    </PropertyGroup>

    <ItemGroup>
-      <PackageReference Include="Volo.Abp.AutoMapper" Version="7.0.0" />
-      <PackageReference Include="Volo.Abp.Features" Version="7.0.0" />
-      <PackageReference Include="Volo.Abp.FeatureManagement.Application.Contracts" Version="7.0.0" />
+      <PackageReference Include="Volo.Abp.AutoMapper" Version="$(ABPPackageVersion)" />
+      <PackageReference Include="Volo.Abp.Features" Version="$(ABPPackageVersion)" />
+      <PackageReference Include="Volo.Abp.FeatureManagement.Application.Contracts" Version="$(ABPPackageVersion)" />
    </ItemGroup>

    <ItemGroup>
--- a/modules/FeatureManagement/Lsw.Abp.FeatureManagement.Blazor.WebAssembly.AntDesignUI/Lsw.Abp.FeatureManagement.Blazor.WebAssembly.AntDesignUI.csproj
+++ b/modules/FeatureManagement/Lsw.Abp.FeatureManagement.Blazor.WebAssembly.AntDesignUI/Lsw.Abp.FeatureManagement.Blazor.WebAssembly.AntDesignUI.csproj
@ -8,7 +8,7 @@
    </PropertyGroup>

    <ItemGroup>
-        <PackageReference Include="Volo.Abp.FeatureManagement.HttpApi.Client" Version="7.0.0" />
+        <PackageReference Include="Volo.Abp.FeatureManagement.HttpApi.Client" Version="$(ABPPackageVersion)" />
    </ItemGroup>

    <ItemGroup>
--- a/modules/IdentityManagement/Lsw.Abp.IdentityManagement.Blazor.AntDesignUI/Lsw.Abp.IdentityManagement.Blazor.AntDesignUI.csproj
+++ b/modules/IdentityManagement/Lsw.Abp.IdentityManagement.Blazor.AntDesignUI/Lsw.Abp.IdentityManagement.Blazor.AntDesignUI.csproj
@ -8,8 +8,8 @@
    </PropertyGroup>

    <ItemGroup>
-      <PackageReference Include="Volo.Abp.AutoMapper" Version="7.0.0" />
-      <PackageReference Include="Volo.Abp.Identity.Application.Contracts" Version="7.0.0" />
+      <PackageReference Include="Volo.Abp.AutoMapper" Version="$(ABPPackageVersion)" />
+      <PackageReference Include="Volo.Abp.Identity.Application.Contracts" Version="$(ABPPackageVersion)" />
    </ItemGroup>

    <ItemGroup>
--- a/modules/IdentityManagement/Lsw.Abp.IdentityManagement.Blazor.WebAssembly.AntDesignUI/Lsw.Abp.IdentityManagement.Blazor.WebAssembly.AntDesignUI.csproj
+++ b/modules/IdentityManagement/Lsw.Abp.IdentityManagement.Blazor.WebAssembly.AntDesignUI/Lsw.Abp.IdentityManagement.Blazor.WebAssembly.AntDesignUI.csproj
@ -8,7 +8,7 @@
    </PropertyGroup>

    <ItemGroup>
-      <PackageReference Include="Volo.Abp.Identity.HttpApi.Client" Version="7.0.0" />
+      <PackageReference Include="Volo.Abp.Identity.HttpApi.Client" Version="$(ABPPackageVersion)" />
    </ItemGroup>

    <ItemGroup>
--- a/modules/PermissionManagement/Lsw.Abp.PermissionManagement.Blazor.AntDesignUI/Lsw.Abp.PermissionManagement.Blazor.AntDesignUI.csproj
+++ b/modules/PermissionManagement/Lsw.Abp.PermissionManagement.Blazor.AntDesignUI/Lsw.Abp.PermissionManagement.Blazor.AntDesignUI.csproj
@ -8,8 +8,8 @@
    </PropertyGroup>

    <ItemGroup>
-      <PackageReference Include="Volo.Abp.AutoMapper" Version="7.0.0" />
-      <PackageReference Include="Volo.Abp.PermissionManagement.Application.Contracts" Version="7.0.0" />
+      <PackageReference Include="Volo.Abp.AutoMapper" Version="$(ABPPackageVersion)" />
+      <PackageReference Include="Volo.Abp.PermissionManagement.Application.Contracts" Version="$(ABPPackageVersion)" />
    </ItemGroup>

    <ItemGroup>
--- a/modules/PermissionManagement/Lsw.Abp.PermissionManagement.Blazor.WebAssembly.AntDesignUI/Lsw.Abp.PermissionManagement.Blazor.WebAssembly.AntDesignUI.csproj
+++ b/modules/PermissionManagement/Lsw.Abp.PermissionManagement.Blazor.WebAssembly.AntDesignUI/Lsw.Abp.PermissionManagement.Blazor.WebAssembly.AntDesignUI.csproj
@ -8,7 +8,7 @@
    </PropertyGroup>

    <ItemGroup>
-      <PackageReference Include="Volo.Abp.PermissionManagement.HttpApi.Client" Version="7.0.0" />
+      <PackageReference Include="Volo.Abp.PermissionManagement.HttpApi.Client" Version="$(ABPPackageVersion)" />
    </ItemGroup>

    <ItemGroup>
--- a/modules/SettingManagement/Lsw.Abp.SettingManagement.Blazor.AntDesignUI/Lsw.Abp.SettingManagement.Blazor.AntDesignUI.csproj
+++ b/modules/SettingManagement/Lsw.Abp.SettingManagement.Blazor.AntDesignUI/Lsw.Abp.SettingManagement.Blazor.AntDesignUI.csproj
@ -8,8 +8,8 @@
    </PropertyGroup>

    <ItemGroup>
-      <PackageReference Include="Volo.Abp.AutoMapper" Version="7.0.0" />
-      <PackageReference Include="Volo.Abp.SettingManagement.Application.Contracts" Version="7.0.0" />
+      <PackageReference Include="Volo.Abp.AutoMapper" Version="$(ABPPackageVersion)" />
+      <PackageReference Include="Volo.Abp.SettingManagement.Application.Contracts" Version="$(ABPPackageVersion)" />
    </ItemGroup>

    <ItemGroup>
--- a/modules/SettingManagement/Lsw.Abp.SettingManagement.Blazor.WebAssembly.AntDesignUI/Lsw.Abp.SettingManagement.Blazor.WebAssembly.AntDesignUI.csproj
+++ b/modules/SettingManagement/Lsw.Abp.SettingManagement.Blazor.WebAssembly.AntDesignUI/Lsw.Abp.SettingManagement.Blazor.WebAssembly.AntDesignUI.csproj
@ -8,7 +8,7 @@
    </PropertyGroup>
    
    <ItemGroup>
-      <PackageReference Include="Volo.Abp.SettingManagement.HttpApi.Client" Version="7.0.0" />
+      <PackageReference Include="Volo.Abp.SettingManagement.HttpApi.Client" Version="$(ABPPackageVersion)" />
    </ItemGroup>
    
    <ItemGroup>
--- a/modules/TenantManagement/Lsw.Abp.TenantManagement.Blazor.AntDesignUI/Lsw.Abp.TenantManagement.Blazor.AntDesignUI.csproj
+++ b/modules/TenantManagement/Lsw.Abp.TenantManagement.Blazor.AntDesignUI/Lsw.Abp.TenantManagement.Blazor.AntDesignUI.csproj
@ -8,8 +8,8 @@
    </PropertyGroup>

    <ItemGroup>
-      <PackageReference Include="Volo.Abp.AutoMapper" Version="7.0.0" />
-      <PackageReference Include="Volo.Abp.TenantManagement.Application.Contracts" Version="7.0.0" />
+      <PackageReference Include="Volo.Abp.AutoMapper" Version="$(ABPPackageVersion)" />
+      <PackageReference Include="Volo.Abp.TenantManagement.Application.Contracts" Version="$(ABPPackageVersion)" />
    </ItemGroup>

    <ItemGroup>
--- a/modules/TenantManagement/Lsw.Abp.TenantManagement.Blazor.WebAssembly.AntDesignUI/Lsw.Abp.TenantManagement.Blazor.WebAssembly.AntDesignUI.csproj
+++ b/modules/TenantManagement/Lsw.Abp.TenantManagement.Blazor.WebAssembly.AntDesignUI/Lsw.Abp.TenantManagement.Blazor.WebAssembly.AntDesignUI.csproj
@ -8,7 +8,7 @@
    </PropertyGroup>

    <ItemGroup>
-        <PackageReference Include="Volo.Abp.TenantManagement.HttpApi.Client" Version="7.0.0" />
+        <PackageReference Include="Volo.Abp.TenantManagement.HttpApi.Client" Version="$(ABPPackageVersion)" />
    </ItemGroup>

    <ItemGroup>
--- a/samples/BookStore/NuGet.Config
+++ b/samples/BookStore/NuGet.Config
@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
  <packageSources>
-    <add key="BlazoriseMyGet" value="https://www.myget.org/F/blazorise/api/v3/index.json" />
  </packageSources>
 </configuration>
--- a/samples/BookStore/common.props
+++ b/samples/BookStore/common.props
@ -3,7 +3,8 @@
    <LangVersion>latest</LangVersion>
    <Version>1.0.0</Version>
    <NoWarn>$(NoWarn);CS1591</NoWarn>
-	<AbpProjectType>app</AbpProjectType>
+	  <AbpProjectType>app</AbpProjectType>
+    <ABPPackageVersion>7.1.*</ABPPackageVersion>
  </PropertyGroup>

  <Target Name="NoWarnOnRazorViewImportedTypeConflicts" BeforeTargets="RazorCoreCompile">
--- a/samples/BookStore/src/BookStore.Application.Contracts/BookStore.Application.Contracts.csproj
+++ b/samples/BookStore/src/BookStore.Application.Contracts/BookStore.Application.Contracts.csproj
@ -12,13 +12,13 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Volo.Abp.ObjectExtending" Version="7.0.0" />
-    <PackageReference Include="Volo.Abp.Account.Application.Contracts" Version="7.0.0" />
-    <PackageReference Include="Volo.Abp.Identity.Application.Contracts" Version="7.0.0" />
-    <PackageReference Include="Volo.Abp.PermissionManagement.Application.Contracts" Version="7.0.0" />
-    <PackageReference Include="Volo.Abp.TenantManagement.Application.Contracts" Version="7.0.0" />
-    <PackageReference Include="Volo.Abp.FeatureManagement.Application.Contracts" Version="7.0.0" />
-    <PackageReference Include="Volo.Abp.SettingManagement.Application.Contracts" Version="7.0.0" />
+    <PackageReference Include="Volo.Abp.ObjectExtending" Version="$(ABPPackageVersion)" />
+    <PackageReference Include="Volo.Abp.Account.Application.Contracts" Version="$(ABPPackageVersion)" />
+    <PackageReference Include="Volo.Abp.Identity.Application.Contracts" Version="$(ABPPackageVersion)" />
+    <PackageReference Include="Volo.Abp.PermissionManagement.Application.Contracts" Version="$(ABPPackageVersion)" />
+    <PackageReference Include="Volo.Abp.TenantManagement.Application.Contracts" Version="$(ABPPackageVersion)" />
+    <PackageReference Include="Volo.Abp.FeatureManagement.Application.Contracts" Version="$(ABPPackageVersion)" />
+    <PackageReference Include="Volo.Abp.SettingManagement.Application.Contracts" Version="$(ABPPackageVersion)" />
  </ItemGroup>

 </Project>
--- a/samples/BookStore/src/BookStore.Application/BookStore.Application.csproj
+++ b/samples/BookStore/src/BookStore.Application/BookStore.Application.csproj
@ -13,12 +13,12 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Volo.Abp.Account.Application" Version="7.0.0" />
-    <PackageReference Include="Volo.Abp.Identity.Application" Version="7.0.0" />
-    <PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="7.0.0" />
-    <PackageReference Include="Volo.Abp.TenantManagement.Application" Version="7.0.0" />
-    <PackageReference Include="Volo.Abp.FeatureManagement.Application" Version="7.0.0" />
-    <PackageReference Include="Volo.Abp.SettingManagement.Application" Version="7.0.0" />
+    <PackageReference Include="Volo.Abp.Account.Application" Version="$(ABPPackageVersion)" />
+    <PackageReference Include="Volo.Abp.Identity.Application" Version="$(ABPPackageVersion)" />
+    <PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="$(ABPPackageVersion)" />
+    <PackageReference Include="Volo.Abp.TenantManagement.Application" Version="$(ABPPackageVersion)" />
+    <PackageReference Include="Volo.Abp.FeatureManagement.Application" Version="$(ABPPackageVersion)" />
+    <PackageReference Include="Volo.Abp.SettingManagement.Application" Version="$(ABPPackageVersion)" />
  </ItemGroup>

 </Project>
--- a/samples/BookStore/src/BookStore.Blazor/BookStore.Blazor.csproj
+++ b/samples/BookStore/src/BookStore.Blazor/BookStore.Blazor.csproj
@ -12,11 +12,11 @@
 <!--    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.5.4" />-->
    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.0" />
    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.0" />
-    <PackageReference Include="Volo.Abp.AutoMapper" Version="7.0.0" />
+    <PackageReference Include="Volo.Abp.AutoMapper" Version="$(ABPPackageVersion)" />
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Volo.Abp.Autofac.WebAssembly" Version="7.0.0" />
+    <PackageReference Include="Volo.Abp.Autofac.WebAssembly" Version="$(ABPPackageVersion)" />
 <!--    <PackageReference Include="Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme" Version="7.0.0" />-->
  </ItemGroup>

--- a/samples/BookStore/src/BookStore.BlazorServer/BookStore.BlazorServer.csproj
+++ b/samples/BookStore/src/BookStore.BlazorServer/BookStore.BlazorServer.csproj
@ -1,5 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">

+    <Import Project="..\..\common.props" />
+    
    <PropertyGroup>
        <TargetFramework>net7.0</TargetFramework>
        <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@ -24,12 +26,12 @@
        <ProjectReference Include="..\..\src\BookStore.Application\BookStore.Application.csproj" />
        <ProjectReference Include="..\..\src\BookStore.HttpApi\BookStore.HttpApi.csproj" />
        <ProjectReference Include="..\..\src\BookStore.EntityFrameworkCore\BookStore.EntityFrameworkCore.csproj" />
-        <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="7.0.0" />
-        <PackageReference Include="Volo.Abp.Autofac" Version="7.0.0" />
-        <PackageReference Include="Volo.Abp.Swashbuckle" Version="7.0.0" />
-        <PackageReference Include="Volo.Abp.AspNetCore.Authentication.JwtBearer" Version="7.0.0" />
-        <PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="7.0.0" />
-        <PackageReference Include="Volo.Abp.Account.Web.IdentityServer" Version="7.0.0" />
+        <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="$(ABPPackageVersion)" />
+        <PackageReference Include="Volo.Abp.Autofac" Version="$(ABPPackageVersion)" />
+        <PackageReference Include="Volo.Abp.Swashbuckle" Version="$(ABPPackageVersion)" />
+        <PackageReference Include="Volo.Abp.AspNetCore.Authentication.JwtBearer" Version="$(ABPPackageVersion)" />
+        <PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="$(ABPPackageVersion)" />
+        <PackageReference Include="Volo.Abp.Account.Web.IdentityServer" Version="$(ABPPackageVersion)" />
    </ItemGroup>

    <ItemGroup>
--- a/samples/BookStore/src/BookStore.BlazorServer/BookStoreBlazorModule.cs
+++ b/samples/BookStore/src/BookStore.BlazorServer/BookStoreBlazorModule.cs
@ -29,6 +29,7 @@ using Volo.Abp.Localization;
 using Volo.Abp.Modularity;
 using Lsw.Abp.SettingManagement.Blazor.AntDesignUI;
 using Lsw.Abp.SettingManagement.Blazor.Server.AntDesignUI;
+using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Bundling;
 using Volo.Abp.Swashbuckle;
 using Volo.Abp.UI.Navigation;
 using Volo.Abp.UI.Navigation.Urls;
@ -104,7 +105,7 @@ public class BookStoreBlazorModule : AbpModule
                    bundle.AddFiles("/global-styles.css");
                }
            );
-            
+
            //BLAZOR UI
             options.StyleBundles.Configure(
                 BlazorAntDesignThemeBundles.Styles.Global,
--- a/samples/BookStore/src/BookStore.DbMigrator/BookStore.DbMigrator.csproj
+++ b/samples/BookStore/src/BookStore.DbMigrator/BookStore.DbMigrator.csproj
@ -28,7 +28,7 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Volo.Abp.Autofac" Version="7.0.0" />
+    <PackageReference Include="Volo.Abp.Autofac" Version="$(ABPPackageVersion)" />
    <ProjectReference Include="..\BookStore.Application.Contracts\BookStore.Application.Contracts.csproj" />
    <ProjectReference Include="..\BookStore.EntityFrameworkCore\BookStore.EntityFrameworkCore.csproj" />
  </ItemGroup>
--- a/samples/BookStore/src/BookStore.Domain.Shared/BookStore.Domain.Shared.csproj
+++ b/samples/BookStore/src/BookStore.Domain.Shared/BookStore.Domain.Shared.csproj
@ -9,14 +9,14 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Volo.Abp.Identity.Domain.Shared" Version="7.0.0" />
-    <PackageReference Include="Volo.Abp.IdentityServer.Domain.Shared" Version="7.0.0" />
-    <PackageReference Include="Volo.Abp.BackgroundJobs.Domain.Shared" Version="7.0.0" />
-    <PackageReference Include="Volo.Abp.AuditLogging.Domain.Shared" Version="7.0.0" />
-    <PackageReference Include="Volo.Abp.TenantManagement.Domain.Shared" Version="7.0.0" />
-    <PackageReference Include="Volo.Abp.FeatureManagement.Domain.Shared" Version="7.0.0" />
-    <PackageReference Include="Volo.Abp.PermissionManagement.Domain.Shared" Version="7.0.0" />
-    <PackageReference Include="Volo.Abp.SettingManagement.Domain.Shared" Version="7.0.0" />
+    <PackageReference Include="Volo.Abp.Identity.Domain.Shared" Version="$(ABPPackageVersion)" />
+    <PackageReference Include="Volo.Abp.IdentityServer.Domain.Shared" Version="$(ABPPackageVersion)" />
+    <PackageReference Include="Volo.Abp.BackgroundJobs.Domain.Shared" Version="$(ABPPackageVersion)" />
+    <PackageReference Include="Volo.Abp.AuditLogging.Domain.Shared" Version="$(ABPPackageVersion)" />
+    <PackageReference Include="Volo.Abp.TenantManagement.Domain.Shared" Version="$(ABPPackageVersion)" />
+    <PackageReference Include="Volo.Abp.FeatureManagement.Domain.Shared" Version="$(ABPPackageVersion)" />
+    <PackageReference Include="Volo.Abp.PermissionManagement.Domain.Shared" Version="$(ABPPackageVersion)" />
+    <PackageReference Include="Volo.Abp.SettingManagement.Domain.Shared" Version="$(ABPPackageVersion)" />
  </ItemGroup>

  <ItemGroup>
@ -25,7 +25,7 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.*" />
  </ItemGroup>

 </Project>
--- a/samples/BookStore/src/BookStore.Domain/BookStore.Domain.csproj
+++ b/samples/BookStore/src/BookStore.Domain/BookStore.Domain.csproj
@ -12,16 +12,16 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Volo.Abp.Emailing" Version="7.0.0" />
-    <PackageReference Include="Volo.Abp.Identity.Domain" Version="7.0.0" />
-    <PackageReference Include="Volo.Abp.PermissionManagement.Domain.Identity" Version="7.0.0" />
-    <PackageReference Include="Volo.Abp.IdentityServer.Domain" Version="7.0.0" />
-    <PackageReference Include="Volo.Abp.PermissionManagement.Domain.IdentityServer" Version="7.0.0" />
-    <PackageReference Include="Volo.Abp.BackgroundJobs.Domain" Version="7.0.0" />
-    <PackageReference Include="Volo.Abp.AuditLogging.Domain" Version="7.0.0" />
-    <PackageReference Include="Volo.Abp.TenantManagement.Domain" Version="7.0.0" />
-    <PackageReference Include="Volo.Abp.FeatureManagement.Domain" Version="7.0.0" />
-    <PackageReference Include="Volo.Abp.SettingManagement.Domain" Version="7.0.0" />
+    <PackageReference Include="Volo.Abp.Emailing" Version="$(ABPPackageVersion)" />
+    <PackageReference Include="Volo.Abp.Identity.Domain" Version="$(ABPPackageVersion)" />
+    <PackageReference Include="Volo.Abp.PermissionManagement.Domain.Identity" Version="$(ABPPackageVersion)" />
+    <PackageReference Include="Volo.Abp.IdentityServer.Domain" Version="$(ABPPackageVersion)" />
+    <PackageReference Include="Volo.Abp.PermissionManagement.Domain.IdentityServer" Version="$(ABPPackageVersion)" />
+    <PackageReference Include="Volo.Abp.BackgroundJobs.Domain" Version="$(ABPPackageVersion)" />
+    <PackageReference Include="Volo.Abp.AuditLogging.Domain" Version="$(ABPPackageVersion)" />
+    <PackageReference Include="Volo.Abp.TenantManagement.Domain" Version="$(ABPPackageVersion)" />
+    <PackageReference Include="Volo.Abp.FeatureManagement.Domain" Version="$(ABPPackageVersion)" />
+    <PackageReference Include="Volo.Abp.SettingManagement.Domain" Version="$(ABPPackageVersion)" />
  </ItemGroup>

 </Project>
--- a/samples/BookStore/src/BookStore.EntityFrameworkCore/BookStore.EntityFrameworkCore.csproj
+++ b/samples/BookStore/src/BookStore.EntityFrameworkCore/BookStore.EntityFrameworkCore.csproj
@ -9,15 +9,15 @@

  <ItemGroup>
    <ProjectReference Include="..\BookStore.Domain\BookStore.Domain.csproj" />
-    <PackageReference Include="Volo.Abp.EntityFrameworkCore.SqlServer" Version="7.0.0" />
-    <PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="7.0.0" />
-    <PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="7.0.0" />
-    <PackageReference Include="Volo.Abp.Identity.EntityFrameworkCore" Version="7.0.0" />
-    <PackageReference Include="Volo.Abp.IdentityServer.EntityFrameworkCore" Version="7.0.0" />
-    <PackageReference Include="Volo.Abp.BackgroundJobs.EntityFrameworkCore" Version="7.0.0" />
-    <PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="7.0.0" />
-    <PackageReference Include="Volo.Abp.TenantManagement.EntityFrameworkCore" Version="7.0.0" />
-    <PackageReference Include="Volo.Abp.FeatureManagement.EntityFrameworkCore" Version="7.0.0" />
+    <PackageReference Include="Volo.Abp.EntityFrameworkCore.SqlServer" Version="$(ABPPackageVersion)" />
+    <PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="$(ABPPackageVersion)" />
+    <PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="$(ABPPackageVersion)" />
+    <PackageReference Include="Volo.Abp.Identity.EntityFrameworkCore" Version="$(ABPPackageVersion)" />
+    <PackageReference Include="Volo.Abp.IdentityServer.EntityFrameworkCore" Version="$(ABPPackageVersion)" />
+    <PackageReference Include="Volo.Abp.BackgroundJobs.EntityFrameworkCore" Version="$(ABPPackageVersion)" />
+    <PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="$(ABPPackageVersion)" />
+    <PackageReference Include="Volo.Abp.TenantManagement.EntityFrameworkCore" Version="$(ABPPackageVersion)" />
+    <PackageReference Include="Volo.Abp.FeatureManagement.EntityFrameworkCore" Version="$(ABPPackageVersion)" />
  </ItemGroup>

  <ItemGroup>
--- a/samples/BookStore/src/BookStore.EntityFrameworkCore/Migrations/20230402025623_initial.Designer.cs
+++ b/samples/BookStore/src/BookStore.EntityFrameworkCore/Migrations/20230402025623_initial.Designer.cs
@ -13,8 +13,8 @@ using Volo.Abp.EntityFrameworkCore;
 namespace BookStore.Migrations
 {
    [DbContext(typeof(BookStoreDbContext))]
-    [Migration("20230115092635_Initial")]
-    partial class Initial
+    [Migration("20230402025623_initial")]
+    partial class initial
    {
        /// <inheritdoc />
        protected override void BuildTargetModel(ModelBuilder modelBuilder)
@ -552,6 +552,9 @@ namespace BookStore.Migrations
                        .HasColumnType("nvarchar(40)")
                        .HasColumnName("ConcurrencyStamp");

+                    b.Property<int>("EntityVersion")
+                        .HasColumnType("int");
+
                    b.Property<string>("ExtraProperties")
                        .HasColumnType("nvarchar(max)")
                        .HasColumnName("ExtraProperties");
@ -736,6 +739,9 @@ namespace BookStore.Migrations
                        .HasDefaultValue(false)
                        .HasColumnName("EmailConfirmed");

+                    b.Property<int>("EntityVersion")
+                        .HasColumnType("int");
+
                    b.Property<string>("ExtraProperties")
                        .HasColumnType("nvarchar(max)")
                        .HasColumnName("ExtraProperties");
@ -1013,6 +1019,9 @@ namespace BookStore.Migrations
                        .HasColumnType("nvarchar(128)")
                        .HasColumnName("DisplayName");

+                    b.Property<int>("EntityVersion")
+                        .HasColumnType("int");
+
                    b.Property<string>("ExtraProperties")
                        .HasColumnType("nvarchar(max)")
                        .HasColumnName("ExtraProperties");
@ -2077,6 +2086,9 @@ namespace BookStore.Migrations
                        .HasColumnType("datetime2")
                        .HasColumnName("DeletionTime");

+                    b.Property<int>("EntityVersion")
+                        .HasColumnType("int");
+
                    b.Property<string>("ExtraProperties")
                        .HasColumnType("nvarchar(max)")
                        .HasColumnName("ExtraProperties");
--- a/samples/BookStore/src/BookStore.EntityFrameworkCore/Migrations/20230402025623_initial.cs
+++ b/samples/BookStore/src/BookStore.EntityFrameworkCore/Migrations/20230402025623_initial.cs
@ -6,7 +6,7 @@ using Microsoft.EntityFrameworkCore.Migrations;
 namespace BookStore.Migrations
 {
    /// <inheritdoc />
-    public partial class Initial : Migration
+    public partial class initial : Migration
    {
        /// <inheritdoc />
        protected override void Up(MigrationBuilder migrationBuilder)
@ -161,6 +161,7 @@ namespace BookStore.Migrations
                    ParentId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
                    Code = table.Column<string>(type: "nvarchar(95)", maxLength: 95, nullable: false),
                    DisplayName = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
+                    EntityVersion = table.Column<int>(type: "int", nullable: false),
                    ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true),
                    ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: true),
                    CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false),
@ -241,6 +242,7 @@ namespace BookStore.Migrations
                    IsDefault = table.Column<bool>(type: "bit", nullable: false),
                    IsStatic = table.Column<bool>(type: "bit", nullable: false),
                    IsPublic = table.Column<bool>(type: "bit", nullable: false),
+                    EntityVersion = table.Column<int>(type: "int", nullable: false),
                    ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true),
                    ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: true)
                },
@ -295,6 +297,7 @@ namespace BookStore.Migrations
                {
                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
                    Name = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    EntityVersion = table.Column<int>(type: "int", nullable: false),
                    ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true),
                    ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: true),
                    CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false),
@ -333,6 +336,7 @@ namespace BookStore.Migrations
                    LockoutEnd = table.Column<DateTimeOffset>(type: "datetimeoffset", nullable: true),
                    LockoutEnabled = table.Column<bool>(type: "bit", nullable: false, defaultValue: false),
                    AccessFailedCount = table.Column<int>(type: "int", nullable: false, defaultValue: 0),
+                    EntityVersion = table.Column<int>(type: "int", nullable: false),
                    ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true),
                    ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: true),
                    CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false),
--- a/samples/BookStore/src/BookStore.EntityFrameworkCore/Migrations/BookStoreDbContextModelSnapshot.cs
+++ b/samples/BookStore/src/BookStore.EntityFrameworkCore/Migrations/BookStoreDbContextModelSnapshot.cs
@ -549,6 +549,9 @@ namespace BookStore.Migrations
                        .HasColumnType("nvarchar(40)")
                        .HasColumnName("ConcurrencyStamp");

+                    b.Property<int>("EntityVersion")
+                        .HasColumnType("int");
+
                    b.Property<string>("ExtraProperties")
                        .HasColumnType("nvarchar(max)")
                        .HasColumnName("ExtraProperties");
@ -733,6 +736,9 @@ namespace BookStore.Migrations
                        .HasDefaultValue(false)
                        .HasColumnName("EmailConfirmed");

+                    b.Property<int>("EntityVersion")
+                        .HasColumnType("int");
+
                    b.Property<string>("ExtraProperties")
                        .HasColumnType("nvarchar(max)")
                        .HasColumnName("ExtraProperties");
@ -1010,6 +1016,9 @@ namespace BookStore.Migrations
                        .HasColumnType("nvarchar(128)")
                        .HasColumnName("DisplayName");

+                    b.Property<int>("EntityVersion")
+                        .HasColumnType("int");
+
                    b.Property<string>("ExtraProperties")
                        .HasColumnType("nvarchar(max)")
                        .HasColumnName("ExtraProperties");
@ -2074,6 +2083,9 @@ namespace BookStore.Migrations
                        .HasColumnType("datetime2")
                        .HasColumnName("DeletionTime");

+                    b.Property<int>("EntityVersion")
+                        .HasColumnType("int");
+
                    b.Property<string>("ExtraProperties")
                        .HasColumnType("nvarchar(max)")
                        .HasColumnName("ExtraProperties");
--- a/samples/BookStore/src/BookStore.HttpApi.Client/BookStore.HttpApi.Client.csproj
+++ b/samples/BookStore/src/BookStore.HttpApi.Client/BookStore.HttpApi.Client.csproj
@ -12,12 +12,12 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Volo.Abp.Account.HttpApi.Client" Version="7.0.0" />
-    <PackageReference Include="Volo.Abp.Identity.HttpApi.Client" Version="7.0.0" />
-    <PackageReference Include="Volo.Abp.PermissionManagement.HttpApi.Client" Version="7.0.0" />
-    <PackageReference Include="Volo.Abp.TenantManagement.HttpApi.Client" Version="7.0.0" />
-    <PackageReference Include="Volo.Abp.FeatureManagement.HttpApi.Client" Version="7.0.0" />
-    <PackageReference Include="Volo.Abp.SettingManagement.HttpApi.Client" Version="7.0.0" />
+    <PackageReference Include="Volo.Abp.Account.HttpApi.Client" Version="$(ABPPackageVersion)" />
+    <PackageReference Include="Volo.Abp.Identity.HttpApi.Client" Version="$(ABPPackageVersion)" />
+    <PackageReference Include="Volo.Abp.PermissionManagement.HttpApi.Client" Version="$(ABPPackageVersion)" />
+    <PackageReference Include="Volo.Abp.TenantManagement.HttpApi.Client" Version="$(ABPPackageVersion)" />
+    <PackageReference Include="Volo.Abp.FeatureManagement.HttpApi.Client" Version="$(ABPPackageVersion)" />
+    <PackageReference Include="Volo.Abp.SettingManagement.HttpApi.Client" Version="$(ABPPackageVersion)" />
  </ItemGroup>

  <ItemGroup>
--- a/samples/BookStore/src/BookStore.HttpApi.Host/BookStore.HttpApi.Host.csproj
+++ b/samples/BookStore/src/BookStore.HttpApi.Host/BookStore.HttpApi.Host.csproj
@ -12,13 +12,13 @@
  <ItemGroup>
    <PackageReference Include="Serilog.AspNetCore" Version="4.1.0" />
    <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
-    <PackageReference Include="Volo.Abp.AspNetCore.MultiTenancy" Version="7.0.0" />
-    <PackageReference Include="Volo.Abp.Autofac" Version="7.0.0" />
-    <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="7.0.0" />
-    <PackageReference Include="Volo.Abp.AspNetCore.Authentication.JwtBearer" Version="7.0.0" />
-    <PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="7.0.0" />
-    <PackageReference Include="Volo.Abp.Swashbuckle" Version="7.0.0" />
-    <PackageReference Include="Volo.Abp.Account.Web.IdentityServer" Version="7.0.0" />
+    <PackageReference Include="Volo.Abp.AspNetCore.MultiTenancy" Version="$(ABPPackageVersion)" />
+    <PackageReference Include="Volo.Abp.Autofac" Version="$(ABPPackageVersion)" />
+    <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="$(ABPPackageVersion)" />
+    <PackageReference Include="Volo.Abp.AspNetCore.Authentication.JwtBearer" Version="$(ABPPackageVersion)" />
+    <PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="$(ABPPackageVersion)" />
+    <PackageReference Include="Volo.Abp.Swashbuckle" Version="$(ABPPackageVersion)" />
+    <PackageReference Include="Volo.Abp.Account.Web.IdentityServer" Version="$(ABPPackageVersion)" />
  </ItemGroup>

  <ItemGroup>
--- a/samples/BookStore/src/BookStore.HttpApi/BookStore.HttpApi.csproj
+++ b/samples/BookStore/src/BookStore.HttpApi/BookStore.HttpApi.csproj
@ -12,12 +12,12 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Volo.Abp.Account.HttpApi" Version="7.0.0" />
-    <PackageReference Include="Volo.Abp.Identity.HttpApi" Version="7.0.0" />
-    <PackageReference Include="Volo.Abp.PermissionManagement.HttpApi" Version="7.0.0" />
-    <PackageReference Include="Volo.Abp.TenantManagement.HttpApi" Version="7.0.0" />
-    <PackageReference Include="Volo.Abp.FeatureManagement.HttpApi" Version="7.0.0" />
-    <PackageReference Include="Volo.Abp.SettingManagement.HttpApi" Version="7.0.0" />
+    <PackageReference Include="Volo.Abp.Account.HttpApi" Version="$(ABPPackageVersion)" />
+    <PackageReference Include="Volo.Abp.Identity.HttpApi" Version="$(ABPPackageVersion)" />
+    <PackageReference Include="Volo.Abp.PermissionManagement.HttpApi" Version="$(ABPPackageVersion)" />
+    <PackageReference Include="Volo.Abp.TenantManagement.HttpApi" Version="$(ABPPackageVersion)" />
+    <PackageReference Include="Volo.Abp.FeatureManagement.HttpApi" Version="$(ABPPackageVersion)" />
+    <PackageReference Include="Volo.Abp.SettingManagement.HttpApi" Version="$(ABPPackageVersion)" />
  </ItemGroup>

 </Project>
--- a/samples/BookStore/test/BookStore.EntityFrameworkCore.Tests/BookStore.EntityFrameworkCore.Tests.csproj
+++ b/samples/BookStore/test/BookStore.EntityFrameworkCore.Tests/BookStore.EntityFrameworkCore.Tests.csproj
@ -10,7 +10,7 @@
  <ItemGroup>
    <ProjectReference Include="..\..\src\BookStore.EntityFrameworkCore\BookStore.EntityFrameworkCore.csproj" />
    <ProjectReference Include="..\BookStore.TestBase\BookStore.TestBase.csproj" />
-    <PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="7.0.0" />
+    <PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="$(ABPPackageVersion)" />
  </ItemGroup>

  <ItemGroup>
--- a/samples/BookStore/test/BookStore.HttpApi.Client.ConsoleTestApp/BookStore.HttpApi.Client.ConsoleTestApp.csproj
+++ b/samples/BookStore/test/BookStore.HttpApi.Client.ConsoleTestApp/BookStore.HttpApi.Client.ConsoleTestApp.csproj
@ -19,8 +19,8 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Volo.Abp.Http.Client.IdentityModel" Version="7.0.0" />
-    <PackageReference Include="Volo.Abp.Autofac" Version="7.0.0" />
+    <PackageReference Include="Volo.Abp.Http.Client.IdentityModel" Version="7.1.*" />
+    <PackageReference Include="Volo.Abp.Autofac" Version="7.1.*" />
    <ProjectReference Include="..\..\src\BookStore.HttpApi.Client\BookStore.HttpApi.Client.csproj" />
  </ItemGroup>

--- a/samples/BookStore/test/BookStore.TestBase/BookStore.TestBase.csproj
+++ b/samples/BookStore/test/BookStore.TestBase/BookStore.TestBase.csproj
@ -8,9 +8,9 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Volo.Abp.TestBase" Version="7.0.0" />
-    <PackageReference Include="Volo.Abp.Autofac" Version="7.0.0" />
-    <PackageReference Include="Volo.Abp.Authorization" Version="7.0.0" />
+    <PackageReference Include="Volo.Abp.TestBase" Version="$(ABPPackageVersion)" />
+    <PackageReference Include="Volo.Abp.Autofac" Version="$(ABPPackageVersion)" />
+    <PackageReference Include="Volo.Abp.Authorization" Version="$(ABPPackageVersion)" />
    <ProjectReference Include="..\..\src\BookStore.Domain\BookStore.Domain.csproj" />
  </ItemGroup>

--- a/src/Lsw.Abp.AntDesignUI/Lsw.Abp.AntDesignUI.csproj
+++ b/src/Lsw.Abp.AntDesignUI/Lsw.Abp.AntDesignUI.csproj
@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Razor">
+<Project Sdk="Microsoft.NET.Sdk.Razor">


    <Import Project="..\..\common.props" />
@ -9,15 +9,10 @@
    </PropertyGroup>
    
    <ItemGroup>
-      <PackageReference Include="AntDesign" Version="0.13.3" />
-      <PackageReference Include="Volo.Abp.AspNetCore.Components.Web" Version="7.0.0" />
-      <PackageReference Include="Volo.Abp.Authorization" Version="7.0.0" />
-      <PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="7.0.0" />
-    </ItemGroup>
-    
-    <ItemGroup>
-      <_ContentIncludedByDefault Remove="Components\ObjectExtending\ExtensionProperties.razor" />
-      <_ContentIncludedByDefault Remove="Components\ObjectExtending\SelectExtensionProperty.razor" />
+      <PackageReference Include="AntDesign" Version="0.14.4" />
+      <PackageReference Include="Volo.Abp.AspNetCore.Components.Web" Version="$(ABPPackageVersion)" />
+      <PackageReference Include="Volo.Abp.Authorization" Version="$(ABPPackageVersion)" />
+      <PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="$(ABPPackageVersion)" />
    </ItemGroup>

 </Project>