Upgrade to ABP 8.2.0 and AntBlazor 0.19.4

realLiangshiwei · Jul 6, 2024 · cbf1b71 · cbf1b71
1 parent 8550bf3
commit cbf1b71
Show file tree

Hide file tree

Showing 12 changed files with 162 additions and 20 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/common.props b/common.props
@@ -1,13 +1,13 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>0.9.3</Version>
+    <Version>0.9.4</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>8.1.*-*</ABPPackageVersion>
+    <ABPPackageVersion>8.2.*-*</ABPPackageVersion>
     <MicrosoftPackageVersion>8.0.*</MicrosoftPackageVersion>
   </PropertyGroup>
 </Project>
diff --git a/nuget/0 b/nuget/0
@@ -0,0 +1 @@
+0
diff --git a/samples/BookStore/common.props b/samples/BookStore/common.props
@@ -4,7 +4,7 @@
     <Version>1.0.0</Version>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
 	  <AbpProjectType>app</AbpProjectType>
-    <ABPPackageVersion>8.1.*-*</ABPPackageVersion>
+    <ABPPackageVersion>8.2.*-*</ABPPackageVersion>
   </PropertyGroup>
 
   <Target Name="NoWarnOnRazorViewImportedTypeConflicts" BeforeTargets="RazorCoreCompile">

diff --git a/samples/BookStore/src/BookStore.Blazor/BookStore.Blazor.csproj b/samples/BookStore/src/BookStore.Blazor/BookStore.Blazor.csproj
@@ -10,8 +10,8 @@
   <ItemGroup>
 <!--    <PackageReference Include="Blazorise.Bootstrap5" Version="0.9.5.4" />-->
 <!--    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.5.4" />-->
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.4" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.4" />
     <PackageReference Include="Volo.Abp.AutoMapper" Version="$(ABPPackageVersion)" />
   </ItemGroup>
 

diff --git a/samples/BookStore/src/BookStore.BlazorServer/BookStoreBlazorModule.cs b/samples/BookStore/src/BookStore.BlazorServer/BookStoreBlazorModule.cs
@@ -145,17 +145,17 @@ private void ConfigureLocalizationServices()
             options.Languages.Add(new LanguageInfo("hu", "hu", "Magyar"));
             options.Languages.Add(new LanguageInfo("fi", "fi", "Finnish"));
             options.Languages.Add(new LanguageInfo("fr", "fr", "Français"));
-            options.Languages.Add(new LanguageInfo("hi", "hi", "Hindi", "in"));
-            options.Languages.Add(new LanguageInfo("is", "is", "Icelandic", "is"));
-            options.Languages.Add(new LanguageInfo("it", "it", "Italiano", "it"));
+            options.Languages.Add(new LanguageInfo("hi", "hi", "Hindi"));
+            options.Languages.Add(new LanguageInfo("is", "is", "Icelandic"));
+            options.Languages.Add(new LanguageInfo("it", "it", "Italiano"));
             options.Languages.Add(new LanguageInfo("pt-BR", "pt-BR", "Português"));
             options.Languages.Add(new LanguageInfo("ro-RO", "ro-RO", "Română"));
             options.Languages.Add(new LanguageInfo("ru", "ru", "Русский"));
             options.Languages.Add(new LanguageInfo("sk", "sk", "Slovak"));
             options.Languages.Add(new LanguageInfo("tr", "tr", "Türkçe"));
             options.Languages.Add(new LanguageInfo("zh-Hans", "zh-Hans", "简体中文"));
             options.Languages.Add(new LanguageInfo("zh-Hant", "zh-Hant", "繁體中文"));
-            options.Languages.Add(new LanguageInfo("de-DE", "de-DE", "Deutsch", "de"));
+            options.Languages.Add(new LanguageInfo("de-DE", "de-DE", "Deutsch"));
             options.Languages.Add(new LanguageInfo("es", "es", "Español"));
         });
     }

diff --git a/...les/BookStore/src/BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreDbContext.cs b/...les/BookStore/src/BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreDbContext.cs
@@ -46,6 +46,7 @@ public class BookStoreDbContext :
     public DbSet<IdentitySecurityLog> SecurityLogs { get; set; }
     public DbSet<IdentityLinkUser> LinkUsers { get; set; }
     public DbSet<IdentityUserDelegation> UserDelegations { get; set;}
+    public DbSet<IdentitySession> Sessions { get; set; }
 
     // Tenant Management
     public DbSet<Tenant> Tenants { get; set; }

diff --git a/...igrations/20240413031317_init.Designer.cs → ...ations/20240706082705_Initial.Designer.cs b/...igrations/20240413031317_init.Designer.cs → ...ations/20240706082705_Initial.Designer.cs
diff --git a/...orkCore/Migrations/20240413031317_init.cs → ...Core/Migrations/20240706082705_Initial.cs b/...orkCore/Migrations/20240413031317_init.cs → ...Core/Migrations/20240706082705_Initial.cs
@@ -6,7 +6,7 @@
 namespace BookStore.Migrations
 {
     /// <inheritdoc />
-    public partial class init : Migration
+    public partial class Initial : Migration
     {
         /// <inheritdoc />
         protected override void Up(MigrationBuilder migrationBuilder)
@@ -276,6 +276,26 @@ protected override void Up(MigrationBuilder migrationBuilder)
                     table.PrimaryKey("PK_AbpSecurityLogs", x => x.Id);
                 });
 
+            migrationBuilder.CreateTable(
+                name: "AbpSessions",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    SessionId = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
+                    Device = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
+                    DeviceInfo = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    TenantId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    UserId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    ClientId = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
+                    IpAddresses = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: true),
+                    SignedIn = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    LastAccessed = table.Column<DateTime>(type: "datetime2", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_AbpSessions", x => x.Id);
+                });
+
             migrationBuilder.CreateTable(
                 name: "AbpSettingDefinitions",
                 columns: table => new
@@ -1288,6 +1308,21 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 table: "AbpSecurityLogs",
                 columns: new[] { "TenantId", "UserId" });
 
+            migrationBuilder.CreateIndex(
+                name: "IX_AbpSessions_Device",
+                table: "AbpSessions",
+                column: "Device");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_AbpSessions_SessionId",
+                table: "AbpSessions",
+                column: "SessionId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_AbpSessions_TenantId_UserId",
+                table: "AbpSessions",
+                columns: new[] { "TenantId", "UserId" });
+
             migrationBuilder.CreateIndex(
                 name: "IX_AbpSettingDefinitions_Name",
                 table: "AbpSettingDefinitions",
@@ -1433,6 +1468,9 @@ protected override void Down(MigrationBuilder migrationBuilder)
             migrationBuilder.DropTable(
                 name: "AbpSecurityLogs");
 
+            migrationBuilder.DropTable(
+                name: "AbpSessions");
+
             migrationBuilder.DropTable(
                 name: "AbpSettingDefinitions");
 

diff --git a/...BookStore/src/BookStore.EntityFrameworkCore/Migrations/BookStoreDbContextModelSnapshot.cs b/...BookStore/src/BookStore.EntityFrameworkCore/Migrations/BookStoreDbContextModelSnapshot.cs
@@ -19,7 +19,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 #pragma warning disable 612, 618
             modelBuilder
                 .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer)
-                .HasAnnotation("ProductVersion", "8.0.0")
+                .HasAnnotation("ProductVersion", "8.0.4")
                 .HasAnnotation("Relational:MaxIdentifierLength", 128);
 
             SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
@@ -700,6 +700,57 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.ToTable("AbpSecurityLogs", (string)null);
                 });
 
+            modelBuilder.Entity("Volo.Abp.Identity.IdentitySession", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("ClientId")
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
+                    b.Property<string>("Device")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
+                    b.Property<string>("DeviceInfo")
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
+                    b.Property<string>("IpAddresses")
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)");
+
+                    b.Property<DateTime?>("LastAccessed")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("SessionId")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)");
+
+                    b.Property<DateTime>("SignedIn")
+                        .HasColumnType("datetime2");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Device");
+
+                    b.HasIndex("SessionId");
+
+                    b.HasIndex("TenantId", "UserId");
+
+                    b.ToTable("AbpSessions", (string)null);
+                });
+
             modelBuilder.Entity("Volo.Abp.Identity.IdentityUser", b =>
                 {
                     b.Property<Guid>("Id")

diff --git a/samples/BookStore/src/BookStore.HttpApi.Host/BookStoreHttpApiHostModule.cs b/samples/BookStore/src/BookStore.HttpApi.Host/BookStoreHttpApiHostModule.cs
@@ -157,9 +157,9 @@ private void ConfigureLocalization()
             options.Languages.Add(new LanguageInfo("en-GB", "en-GB", "English (UK)"));
             options.Languages.Add(new LanguageInfo("fi", "fi", "Finnish"));
             options.Languages.Add(new LanguageInfo("fr", "fr", "Français"));
-            options.Languages.Add(new LanguageInfo("hi", "hi", "Hindi", "in"));
-            options.Languages.Add(new LanguageInfo("is", "is", "Icelandic", "is"));
-            options.Languages.Add(new LanguageInfo("it", "it", "Italiano", "it"));
+            options.Languages.Add(new LanguageInfo("hi", "hi", "Hindi"));
+            options.Languages.Add(new LanguageInfo("is", "is", "Icelandic"));
+            options.Languages.Add(new LanguageInfo("it", "it", "Italiano"));
             options.Languages.Add(new LanguageInfo("hu", "hu", "Magyar"));
             options.Languages.Add(new LanguageInfo("pt-BR", "pt-BR", "Português"));
             options.Languages.Add(new LanguageInfo("ro-RO", "ro-RO", "Română"));
@@ -168,8 +168,8 @@ private void ConfigureLocalization()
             options.Languages.Add(new LanguageInfo("tr", "tr", "Türkçe"));
             options.Languages.Add(new LanguageInfo("zh-Hans", "zh-Hans", "简体中文"));
             options.Languages.Add(new LanguageInfo("zh-Hant", "zh-Hant", "繁體中文"));
-            options.Languages.Add(new LanguageInfo("de-DE", "de-DE", "Deutsch", "de"));
-            options.Languages.Add(new LanguageInfo("es", "es", "Español", "es"));
+            options.Languages.Add(new LanguageInfo("de-DE", "de-DE", "Deutsch"));
+            options.Languages.Add(new LanguageInfo("es", "es", "Español"));
         });
     }
 

diff --git a/src/Lsw.Abp.AntDesignUI/Lsw.Abp.AntDesignUI.csproj b/src/Lsw.Abp.AntDesignUI/Lsw.Abp.AntDesignUI.csproj
@@ -9,7 +9,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="AntDesign" Version="0.18.3" />
+      <PackageReference Include="AntDesign" Version="0.19.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)" />