Merge pull request #49 from jxnkwlp/feature/package-upgrade

⬆️ update package: abp 7.2.3 and elsa 2.12
jxnkwlp · Jul 29, 2023 · 438df60 · 438df60
2 parents 69be26e + 34f16a0
commit 438df60
Show file tree

Hide file tree

Showing 52 changed files with 2,969 additions and 363 deletions.
diff --git a/...nd.WorkflowApp.Application.Contracts/Passingwind.WorkflowApp.Application.Contracts.csproj b/...nd.WorkflowApp.Application.Contracts/Passingwind.WorkflowApp.Application.Contracts.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <Import Project="..\..\common.props" />
 
@@ -12,11 +12,11 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Volo.Abp.ObjectExtending" Version="7.0.2" />
-        <PackageReference Include="Volo.Abp.Account.Application.Contracts" Version="7.0.2" />
-        <PackageReference Include="Volo.Abp.Identity.Application.Contracts" Version="7.0.2" />
-        <PackageReference Include="Volo.Abp.PermissionManagement.Application.Contracts" Version="7.0.2" />
-        <PackageReference Include="Volo.Abp.SettingManagement.Application.Contracts" Version="7.0.2" />
+        <PackageReference Include="Volo.Abp.ObjectExtending" Version="7.2.3" />
+        <PackageReference Include="Volo.Abp.Account.Application.Contracts" Version="7.2.3" />
+        <PackageReference Include="Volo.Abp.Identity.Application.Contracts" Version="7.2.3" />
+        <PackageReference Include="Volo.Abp.PermissionManagement.Application.Contracts" Version="7.2.3" />
+        <PackageReference Include="Volo.Abp.SettingManagement.Application.Contracts" Version="7.2.3" />
     </ItemGroup>
 
 </Project>
diff --git a/app/src/Passingwind.WorkflowApp.Application/Passingwind.WorkflowApp.Application.csproj b/app/src/Passingwind.WorkflowApp.Application/Passingwind.WorkflowApp.Application.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <Import Project="..\..\common.props" />
 
@@ -14,12 +14,12 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="7.0.3" />
-        <PackageReference Include="Volo.Abp.Account.Application" Version="7.0.2" />
-        <PackageReference Include="Volo.Abp.Identity.Application" Version="7.0.2" />
-        <PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="7.0.2" />
-        <PackageReference Include="Volo.Abp.SettingManagement.Application" Version="7.0.2" />
-        <PackageReference Include="Volo.Abp.AspNetCore.Authentication.OpenIdConnect" Version="7.0.2" />
+        <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="7.0.8" />
+        <PackageReference Include="Volo.Abp.Account.Application" Version="7.2.3" />
+        <PackageReference Include="Volo.Abp.Identity.Application" Version="7.2.3" />
+        <PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="7.2.3" />
+        <PackageReference Include="Volo.Abp.SettingManagement.Application" Version="7.2.3" />
+        <PackageReference Include="Volo.Abp.AspNetCore.Authentication.OpenIdConnect" Version="7.2.3" />
         <FrameworkReference Include="Microsoft.AspNetCore.App" />
     </ItemGroup>
 

diff --git a/app/src/Passingwind.WorkflowApp.DbMigrator/Passingwind.WorkflowApp.DbMigrator.csproj b/app/src/Passingwind.WorkflowApp.DbMigrator/Passingwind.WorkflowApp.DbMigrator.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <Import Project="..\..\common.props" />
 
@@ -16,7 +16,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Volo.Abp.Autofac" Version="7.0.2" />
+        <PackageReference Include="Volo.Abp.Autofac" Version="7.2.3" />
         <ProjectReference Include="..\Passingwind.WorkflowApp.Application.Contracts\Passingwind.WorkflowApp.Application.Contracts.csproj" />
         <ProjectReference Include="..\Passingwind.WorkflowApp.EntityFrameworkCore\Passingwind.WorkflowApp.EntityFrameworkCore.csproj" />
     </ItemGroup>

diff --git a/app/src/Passingwind.WorkflowApp.Domain.Shared/Passingwind.WorkflowApp.Domain.Shared.csproj b/app/src/Passingwind.WorkflowApp.Domain.Shared/Passingwind.WorkflowApp.Domain.Shared.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <Import Project="..\..\common.props" />
 
@@ -9,13 +9,13 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Volo.Abp.Identity.Domain.Shared" Version="7.0.2" />
-        <PackageReference Include="Volo.Abp.BackgroundJobs.Domain.Shared" Version="7.0.2" />
-        <PackageReference Include="Volo.Abp.AuditLogging.Domain.Shared" Version="7.0.2" />
-        <PackageReference Include="Volo.Abp.TenantManagement.Domain.Shared" Version="7.0.2" />
-        <PackageReference Include="Volo.Abp.FeatureManagement.Domain.Shared" Version="7.0.2" />
-        <PackageReference Include="Volo.Abp.PermissionManagement.Domain.Shared" Version="7.0.2" />
-        <PackageReference Include="Volo.Abp.SettingManagement.Domain.Shared" Version="7.0.2" /> 
+        <PackageReference Include="Volo.Abp.Identity.Domain.Shared" Version="7.2.3" />
+        <PackageReference Include="Volo.Abp.BackgroundJobs.Domain.Shared" Version="7.2.3" />
+        <PackageReference Include="Volo.Abp.AuditLogging.Domain.Shared" Version="7.2.3" />
+        <PackageReference Include="Volo.Abp.TenantManagement.Domain.Shared" Version="7.2.3" />
+        <PackageReference Include="Volo.Abp.FeatureManagement.Domain.Shared" Version="7.2.3" />
+        <PackageReference Include="Volo.Abp.PermissionManagement.Domain.Shared" Version="7.2.3" />
+        <PackageReference Include="Volo.Abp.SettingManagement.Domain.Shared" Version="7.2.3" /> 
     </ItemGroup>
 
     <ItemGroup>

diff --git a/app/src/Passingwind.WorkflowApp.Domain/Passingwind.WorkflowApp.Domain.csproj b/app/src/Passingwind.WorkflowApp.Domain/Passingwind.WorkflowApp.Domain.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <Import Project="..\..\common.props" />
 
@@ -13,14 +13,14 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Volo.Abp.Emailing" Version="7.0.2" />
-        <PackageReference Include="Volo.Abp.Identity.Domain" Version="7.0.2" />
-        <PackageReference Include="Volo.Abp.BackgroundJobs.Domain" Version="7.0.2" />
-        <PackageReference Include="Volo.Abp.AuditLogging.Domain" Version="7.0.2" />
-        <PackageReference Include="Volo.Abp.TenantManagement.Domain" Version="7.0.2" />
-        <PackageReference Include="Volo.Abp.FeatureManagement.Domain" Version="7.0.2" />
-        <PackageReference Include="Volo.Abp.SettingManagement.Domain" Version="7.0.2" /> 
-        <PackageReference Include="Volo.Abp.PermissionManagement.Domain.Identity" Version="7.0.2" /> 
+        <PackageReference Include="Volo.Abp.Emailing" Version="7.2.3" />
+        <PackageReference Include="Volo.Abp.Identity.Domain" Version="7.2.3" />
+        <PackageReference Include="Volo.Abp.BackgroundJobs.Domain" Version="7.2.3" />
+        <PackageReference Include="Volo.Abp.AuditLogging.Domain" Version="7.2.3" />
+        <PackageReference Include="Volo.Abp.TenantManagement.Domain" Version="7.2.3" />
+        <PackageReference Include="Volo.Abp.FeatureManagement.Domain" Version="7.2.3" />
+        <PackageReference Include="Volo.Abp.SettingManagement.Domain" Version="7.2.3" /> 
+        <PackageReference Include="Volo.Abp.PermissionManagement.Domain.Identity" Version="7.2.3" /> 
     </ItemGroup>
 
 </Project>
diff --git a/...c/Passingwind.WorkflowApp.EntityFrameworkCore/EntityFrameworkCore/WorkflowAppDbContext.cs b/...c/Passingwind.WorkflowApp.EntityFrameworkCore/EntityFrameworkCore/WorkflowAppDbContext.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
 using Passingwind.Abp.ElsaModule.EntityFrameworkCore;
 using Passingwind.WorkflowApp.ApiKeys;
 using Volo.Abp.AuditLogging.EntityFrameworkCore;
@@ -47,6 +47,7 @@ public class WorkflowAppDbContext :
     public DbSet<OrganizationUnit> OrganizationUnits { get; set; }
     public DbSet<IdentitySecurityLog> SecurityLogs { get; set; }
     public DbSet<IdentityLinkUser> LinkUsers { get; set; }
+    public DbSet<IdentityUserDelegation> UserDelegations { get; set; }
 
     // Tenant Management
     public DbSet<Tenant> Tenants { get; set; }
@@ -55,7 +56,7 @@ public class WorkflowAppDbContext :
     #endregion
 
     public DbSet<ApiKey> ApiKeys { get; set; }
-
+   
     public WorkflowAppDbContext(DbContextOptions<WorkflowAppDbContext> options)
         : base(options)
     {