diff --git a/common.props b/common.props index 7ae67f3..7c1af11 100644 --- a/common.props +++ b/common.props @@ -1,11 +1,13 @@ latest - 0.6.0 + 0.7.0 https://raw.githubusercontent.com/realliangshiwei/Lsw.Abp.AntDesignUI/main/icon.png https://github.com/realLiangshiwei/Lsw.Abp.AntDesignUI MIT git https://github.com/realLiangshiwei/Lsw.Abp.AntDesignUI + 7.1.* + 7.0.* \ No newline at end of file diff --git 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 index b4bdf9c..afe6561 100644 --- 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 @@ - - - + + + diff --git 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 index 82ccfa0..6b8ac1d 100644 --- 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 @@ - + diff --git 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 index 8e2be9f..82d8014 100644 --- 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 @@ - - - - + + + + diff --git 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 index 1238e83..09dc568 100644 --- 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 @@ - - - + + + diff --git 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 index 9a9599b..8c0db97 100644 --- 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 @@ - + diff --git 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 index 9dc7a47..2b50a01 100644 --- 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 @@ - - + + diff --git 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 index c2d68e5..811ce99 100644 --- 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 @@ - + diff --git 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 index 21d3a9e..17fc45c 100644 --- 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 @@ - - + + diff --git 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 index 0121abb..5c68b41 100644 --- 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 @@ - + diff --git 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 index 1fa5e86..0b8a8ce 100644 --- 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 @@ - - + + diff --git 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 index 1fda938..a37e0ff 100644 --- 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 @@ - + diff --git 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 index be6c7a1..d69e9ae 100644 --- 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 @@ - - + + diff --git 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 index cf64b3c..64a3cb8 100644 --- 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 @@ - + diff --git a/samples/BookStore/NuGet.Config b/samples/BookStore/NuGet.Config index be8a1ec..bdc4519 100644 --- a/samples/BookStore/NuGet.Config +++ b/samples/BookStore/NuGet.Config @@ -1,6 +1,5 @@ - \ No newline at end of file diff --git a/samples/BookStore/common.props b/samples/BookStore/common.props index 6ef9bae..bfbdb95 100644 --- a/samples/BookStore/common.props +++ b/samples/BookStore/common.props @@ -3,7 +3,8 @@ latest 1.0.0 $(NoWarn);CS1591 - app + app + 7.1.* diff --git a/samples/BookStore/src/BookStore.Application.Contracts/BookStore.Application.Contracts.csproj b/samples/BookStore/src/BookStore.Application.Contracts/BookStore.Application.Contracts.csproj index 9d642de..3e0582a 100644 --- 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 @@ - - - - - - - + + + + + + + diff --git a/samples/BookStore/src/BookStore.Application/BookStore.Application.csproj b/samples/BookStore/src/BookStore.Application/BookStore.Application.csproj index 2176793..70bf853 100644 --- a/samples/BookStore/src/BookStore.Application/BookStore.Application.csproj +++ b/samples/BookStore/src/BookStore.Application/BookStore.Application.csproj @@ -13,12 +13,12 @@ - - - - - - + + + + + + diff --git a/samples/BookStore/src/BookStore.Blazor/BookStore.Blazor.csproj b/samples/BookStore/src/BookStore.Blazor/BookStore.Blazor.csproj index 1077995..3337202 100644 --- a/samples/BookStore/src/BookStore.Blazor/BookStore.Blazor.csproj +++ b/samples/BookStore/src/BookStore.Blazor/BookStore.Blazor.csproj @@ -12,11 +12,11 @@ - + - + diff --git a/samples/BookStore/src/BookStore.BlazorServer/BookStore.BlazorServer.csproj b/samples/BookStore/src/BookStore.BlazorServer/BookStore.BlazorServer.csproj index 61365fa..a2cd837 100644 --- a/samples/BookStore/src/BookStore.BlazorServer/BookStore.BlazorServer.csproj +++ b/samples/BookStore/src/BookStore.BlazorServer/BookStore.BlazorServer.csproj @@ -1,5 +1,7 @@  + + net7.0 true @@ -24,12 +26,12 @@ - - - - - - + + + + + + diff --git a/samples/BookStore/src/BookStore.BlazorServer/BookStoreBlazorModule.cs b/samples/BookStore/src/BookStore.BlazorServer/BookStoreBlazorModule.cs index 1b55078..0117330 100644 --- 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, diff --git a/samples/BookStore/src/BookStore.DbMigrator/BookStore.DbMigrator.csproj b/samples/BookStore/src/BookStore.DbMigrator/BookStore.DbMigrator.csproj index 4bbac77..396bbfd 100644 --- a/samples/BookStore/src/BookStore.DbMigrator/BookStore.DbMigrator.csproj +++ b/samples/BookStore/src/BookStore.DbMigrator/BookStore.DbMigrator.csproj @@ -28,7 +28,7 @@ - + diff --git a/samples/BookStore/src/BookStore.Domain.Shared/BookStore.Domain.Shared.csproj b/samples/BookStore/src/BookStore.Domain.Shared/BookStore.Domain.Shared.csproj index 2a7f05f..ce51b12 100644 --- 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 @@ - - - - - - - - + + + + + + + + @@ -25,7 +25,7 @@ - + diff --git a/samples/BookStore/src/BookStore.Domain/BookStore.Domain.csproj b/samples/BookStore/src/BookStore.Domain/BookStore.Domain.csproj index c9dfbda..cc67cfb 100644 --- a/samples/BookStore/src/BookStore.Domain/BookStore.Domain.csproj +++ b/samples/BookStore/src/BookStore.Domain/BookStore.Domain.csproj @@ -12,16 +12,16 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/samples/BookStore/src/BookStore.EntityFrameworkCore/BookStore.EntityFrameworkCore.csproj b/samples/BookStore/src/BookStore.EntityFrameworkCore/BookStore.EntityFrameworkCore.csproj index cbfc4a1..05f42a9 100644 --- a/samples/BookStore/src/BookStore.EntityFrameworkCore/BookStore.EntityFrameworkCore.csproj +++ b/samples/BookStore/src/BookStore.EntityFrameworkCore/BookStore.EntityFrameworkCore.csproj @@ -9,15 +9,15 @@ - - - - - - - - - + + + + + + + + + diff --git a/samples/BookStore/src/BookStore.EntityFrameworkCore/Migrations/20230115092635_Initial.Designer.cs b/samples/BookStore/src/BookStore.EntityFrameworkCore/Migrations/20230402025623_initial.Designer.cs similarity index 99% rename from samples/BookStore/src/BookStore.EntityFrameworkCore/Migrations/20230115092635_Initial.Designer.cs rename to samples/BookStore/src/BookStore.EntityFrameworkCore/Migrations/20230402025623_initial.Designer.cs index fc0646c..0e9aed2 100644 --- a/samples/BookStore/src/BookStore.EntityFrameworkCore/Migrations/20230115092635_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 { /// protected override void BuildTargetModel(ModelBuilder modelBuilder) @@ -552,6 +552,9 @@ namespace BookStore.Migrations .HasColumnType("nvarchar(40)") .HasColumnName("ConcurrencyStamp"); + b.Property("EntityVersion") + .HasColumnType("int"); + b.Property("ExtraProperties") .HasColumnType("nvarchar(max)") .HasColumnName("ExtraProperties"); @@ -736,6 +739,9 @@ namespace BookStore.Migrations .HasDefaultValue(false) .HasColumnName("EmailConfirmed"); + b.Property("EntityVersion") + .HasColumnType("int"); + b.Property("ExtraProperties") .HasColumnType("nvarchar(max)") .HasColumnName("ExtraProperties"); @@ -1013,6 +1019,9 @@ namespace BookStore.Migrations .HasColumnType("nvarchar(128)") .HasColumnName("DisplayName"); + b.Property("EntityVersion") + .HasColumnType("int"); + b.Property("ExtraProperties") .HasColumnType("nvarchar(max)") .HasColumnName("ExtraProperties"); @@ -2077,6 +2086,9 @@ namespace BookStore.Migrations .HasColumnType("datetime2") .HasColumnName("DeletionTime"); + b.Property("EntityVersion") + .HasColumnType("int"); + b.Property("ExtraProperties") .HasColumnType("nvarchar(max)") .HasColumnName("ExtraProperties"); diff --git a/samples/BookStore/src/BookStore.EntityFrameworkCore/Migrations/20230115092635_Initial.cs b/samples/BookStore/src/BookStore.EntityFrameworkCore/Migrations/20230402025623_initial.cs similarity index 99% rename from samples/BookStore/src/BookStore.EntityFrameworkCore/Migrations/20230115092635_Initial.cs rename to samples/BookStore/src/BookStore.EntityFrameworkCore/Migrations/20230402025623_initial.cs index 5d6a9d6..b085ed2 100644 --- a/samples/BookStore/src/BookStore.EntityFrameworkCore/Migrations/20230115092635_Initial.cs +++ b/samples/BookStore/src/BookStore.EntityFrameworkCore/Migrations/20230402025623_initial.cs @@ -6,7 +6,7 @@ using Microsoft.EntityFrameworkCore.Migrations; namespace BookStore.Migrations { /// - public partial class Initial : Migration + public partial class initial : Migration { /// protected override void Up(MigrationBuilder migrationBuilder) @@ -161,6 +161,7 @@ namespace BookStore.Migrations ParentId = table.Column(type: "uniqueidentifier", nullable: true), Code = table.Column(type: "nvarchar(95)", maxLength: 95, nullable: false), DisplayName = table.Column(type: "nvarchar(128)", maxLength: 128, nullable: false), + EntityVersion = table.Column(type: "int", nullable: false), ExtraProperties = table.Column(type: "nvarchar(max)", nullable: true), ConcurrencyStamp = table.Column(type: "nvarchar(40)", maxLength: 40, nullable: true), CreationTime = table.Column(type: "datetime2", nullable: false), @@ -241,6 +242,7 @@ namespace BookStore.Migrations IsDefault = table.Column(type: "bit", nullable: false), IsStatic = table.Column(type: "bit", nullable: false), IsPublic = table.Column(type: "bit", nullable: false), + EntityVersion = table.Column(type: "int", nullable: false), ExtraProperties = table.Column(type: "nvarchar(max)", nullable: true), ConcurrencyStamp = table.Column(type: "nvarchar(40)", maxLength: 40, nullable: true) }, @@ -295,6 +297,7 @@ namespace BookStore.Migrations { Id = table.Column(type: "uniqueidentifier", nullable: false), Name = table.Column(type: "nvarchar(64)", maxLength: 64, nullable: false), + EntityVersion = table.Column(type: "int", nullable: false), ExtraProperties = table.Column(type: "nvarchar(max)", nullable: true), ConcurrencyStamp = table.Column(type: "nvarchar(40)", maxLength: 40, nullable: true), CreationTime = table.Column(type: "datetime2", nullable: false), @@ -333,6 +336,7 @@ namespace BookStore.Migrations LockoutEnd = table.Column(type: "datetimeoffset", nullable: true), LockoutEnabled = table.Column(type: "bit", nullable: false, defaultValue: false), AccessFailedCount = table.Column(type: "int", nullable: false, defaultValue: 0), + EntityVersion = table.Column(type: "int", nullable: false), ExtraProperties = table.Column(type: "nvarchar(max)", nullable: true), ConcurrencyStamp = table.Column(type: "nvarchar(40)", maxLength: 40, nullable: true), CreationTime = table.Column(type: "datetime2", nullable: false), diff --git a/samples/BookStore/src/BookStore.EntityFrameworkCore/Migrations/BookStoreDbContextModelSnapshot.cs b/samples/BookStore/src/BookStore.EntityFrameworkCore/Migrations/BookStoreDbContextModelSnapshot.cs index 87fc126..d18c906 100644 --- 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("EntityVersion") + .HasColumnType("int"); + b.Property("ExtraProperties") .HasColumnType("nvarchar(max)") .HasColumnName("ExtraProperties"); @@ -733,6 +736,9 @@ namespace BookStore.Migrations .HasDefaultValue(false) .HasColumnName("EmailConfirmed"); + b.Property("EntityVersion") + .HasColumnType("int"); + b.Property("ExtraProperties") .HasColumnType("nvarchar(max)") .HasColumnName("ExtraProperties"); @@ -1010,6 +1016,9 @@ namespace BookStore.Migrations .HasColumnType("nvarchar(128)") .HasColumnName("DisplayName"); + b.Property("EntityVersion") + .HasColumnType("int"); + b.Property("ExtraProperties") .HasColumnType("nvarchar(max)") .HasColumnName("ExtraProperties"); @@ -2074,6 +2083,9 @@ namespace BookStore.Migrations .HasColumnType("datetime2") .HasColumnName("DeletionTime"); + b.Property("EntityVersion") + .HasColumnType("int"); + b.Property("ExtraProperties") .HasColumnType("nvarchar(max)") .HasColumnName("ExtraProperties"); diff --git a/samples/BookStore/src/BookStore.HttpApi.Client/BookStore.HttpApi.Client.csproj b/samples/BookStore/src/BookStore.HttpApi.Client/BookStore.HttpApi.Client.csproj index 409c9e5..f2567e6 100644 --- 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 @@ - - - - - - + + + + + + diff --git a/samples/BookStore/src/BookStore.HttpApi.Host/BookStore.HttpApi.Host.csproj b/samples/BookStore/src/BookStore.HttpApi.Host/BookStore.HttpApi.Host.csproj index a4f2c70..e22248a 100644 --- 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 @@ - - - - - - - + + + + + + + diff --git a/samples/BookStore/src/BookStore.HttpApi/BookStore.HttpApi.csproj b/samples/BookStore/src/BookStore.HttpApi/BookStore.HttpApi.csproj index 6348229..03ae839 100644 --- a/samples/BookStore/src/BookStore.HttpApi/BookStore.HttpApi.csproj +++ b/samples/BookStore/src/BookStore.HttpApi/BookStore.HttpApi.csproj @@ -12,12 +12,12 @@ - - - - - - + + + + + + diff --git a/samples/BookStore/test/BookStore.EntityFrameworkCore.Tests/BookStore.EntityFrameworkCore.Tests.csproj b/samples/BookStore/test/BookStore.EntityFrameworkCore.Tests/BookStore.EntityFrameworkCore.Tests.csproj index f253322..4acc759 100644 --- 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 @@ - + diff --git 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 index b4d7a67..f2620dc 100644 --- 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 @@ - - + + diff --git a/samples/BookStore/test/BookStore.TestBase/BookStore.TestBase.csproj b/samples/BookStore/test/BookStore.TestBase/BookStore.TestBase.csproj index 08ec758..1dafd46 100644 --- a/samples/BookStore/test/BookStore.TestBase/BookStore.TestBase.csproj +++ b/samples/BookStore/test/BookStore.TestBase/BookStore.TestBase.csproj @@ -8,9 +8,9 @@ - - - + + + diff --git a/src/Lsw.Abp.AntDesignUI/Lsw.Abp.AntDesignUI.csproj b/src/Lsw.Abp.AntDesignUI/Lsw.Abp.AntDesignUI.csproj index 9ff7b49..0976c74 100644 --- a/src/Lsw.Abp.AntDesignUI/Lsw.Abp.AntDesignUI.csproj +++ b/src/Lsw.Abp.AntDesignUI/Lsw.Abp.AntDesignUI.csproj @@ -1,4 +1,4 @@ - + @@ -9,15 +9,10 @@ - - - - - - - - <_ContentIncludedByDefault Remove="Components\ObjectExtending\ExtensionProperties.razor" /> - <_ContentIncludedByDefault Remove="Components\ObjectExtending\SelectExtensionProperty.razor" /> + + + +