wixy
/
Sinet.Universal.Admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

升级Abp8.0

This commit is contained in:
wangyu 2024-01-03 17:11:05 +08:00
parent e3aff227bc
commit 5e088961f5
24 changed files with 2170 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/client/Sinet.Universal.Admin.Blazor/Sinet.Universal.Admin.Blazor.csproj
View File

@ -3,7 +3,7 @@
<Import Project="..\..\..\common.props" /> <Import Project="..\..\..\common.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>net7.0</TargetFramework> <TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<BlazorWebAssemblyLoadAllGlobalizationData>true</BlazorWebAssemblyLoadAllGlobalizationData> <BlazorWebAssemblyLoadAllGlobalizationData>true</BlazorWebAssemblyLoadAllGlobalizationData>
</PropertyGroup> </PropertyGroup>
@ -11,8 +11,8 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Blazorise.Bootstrap5" Version="1.3.1" /> <PackageReference Include="Blazorise.Bootstrap5" Version="1.3.1" />
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.3.1" /> <PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.3.1" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.10" /> <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.10" /> <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@ -20,13 +20,13 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Autofac.WebAssembly" Version="7.4.2" /> <PackageReference Include="Volo.Abp.Autofac.WebAssembly" Version="8.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Identity.Blazor.WebAssembly" Version="7.4.2" /> <PackageReference Include="Volo.Abp.Identity.Blazor.WebAssembly" Version="8.0.0" />
<PackageReference Include="Volo.Abp.TenantManagement.Blazor.WebAssembly" Version="7.4.2" /> <PackageReference Include="Volo.Abp.TenantManagement.Blazor.WebAssembly" Version="8.0.0" />
<PackageReference Include="Volo.Abp.SettingManagement.Blazor.WebAssembly" Version="7.4.2" /> <PackageReference Include="Volo.Abp.SettingManagement.Blazor.WebAssembly" Version="8.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

6
src/client/Sinet.Universal.Admin.Client/Sinet.Universal.Admin.Client.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Razor"> <Project Sdk="Microsoft.NET.Sdk.Razor">
<PropertyGroup> <PropertyGroup>
<OutputType>WinExe</OutputType> <OutputType>WinExe</OutputType>
<TargetFramework>net7.0-windows</TargetFramework> <TargetFramework>net8.0-windows</TargetFramework>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<UseWPF>true</UseWPF> <UseWPF>true</UseWPF>
@ -9,13 +9,13 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Wpf" Version="7.0.101" /> <PackageReference Include="Microsoft.AspNetCore.Components.WebView.Wpf" Version="8.0.01" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" /> <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
<PackageReference Include="Serilog.Extensions.Hosting" Version="7.0.0" /> <PackageReference Include="Serilog.Extensions.Hosting" Version="7.0.0" />
<PackageReference Include="Serilog.Extensions.Logging" Version="7.0.0" /> <PackageReference Include="Serilog.Extensions.Logging" Version="7.0.0" />
<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" /> <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" /> <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
<PackageReference Include="Volo.Abp.Autofac" Version="7.4.2" /> <PackageReference Include="Volo.Abp.Autofac" Version="8.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

10
src/client/Sinet.Universal.Admin.Web/Sinet.Universal.Admin.Web.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web"> <Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net7.0</TargetFramework> <TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup> </PropertyGroup>
@ -9,10 +9,10 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Serilog.AspNetCore" Version="7.0.0" /> <PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" /> <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
<PackageReference Include="Volo.Abp.AspNetCore.Components.Server.BasicTheme" Version="7.4.2" /> <PackageReference Include="Volo.Abp.AspNetCore.Components.Server.BasicTheme" Version="8.0.0" />
<PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="7.4.2" /> <PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="8.0.0" />
<PackageReference Include="Volo.Abp.Autofac" Version="7.4.2" /> <PackageReference Include="Volo.Abp.Autofac" Version="8.0.0" />
<PackageReference Include="Volo.Abp.AutoMapper" Version="7.4.2" /> <PackageReference Include="Volo.Abp.AutoMapper" Version="8.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

16
src/common/Sinet.Universal.Admin.Application.Contracts/Sinet.Universal.Admin.Application.Contracts.csproj
View File

@ -3,7 +3,7 @@
<Import Project="..\..\..\common.props" /> <Import Project="..\..\..\common.props" />
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>netstandard2.0;netstandard2.1;net7.0</TargetFrameworks> <TargetFrameworks>netstandard2.0;netstandard2.1;net8.0</TargetFrameworks>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<RootNamespace>Sinet.Universal.Admin</RootNamespace> <RootNamespace>Sinet.Universal.Admin</RootNamespace>
</PropertyGroup> </PropertyGroup>
@ -13,13 +13,13 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.ObjectExtending" Version="7.4.2" /> <PackageReference Include="Volo.Abp.ObjectExtending" Version="8.0.0" />
<PackageReference Include="Volo.Abp.Account.Application.Contracts" Version="7.4.2" /> <PackageReference Include="Volo.Abp.Account.Application.Contracts" Version="8.0.0" />
<PackageReference Include="Volo.Abp.Identity.Application.Contracts" Version="7.4.2" /> <PackageReference Include="Volo.Abp.Identity.Application.Contracts" Version="8.0.0" />
<PackageReference Include="Volo.Abp.PermissionManagement.Application.Contracts" Version="7.4.2" /> <PackageReference Include="Volo.Abp.PermissionManagement.Application.Contracts" Version="8.0.0" />
<PackageReference Include="Volo.Abp.TenantManagement.Application.Contracts" Version="7.4.2" /> <PackageReference Include="Volo.Abp.TenantManagement.Application.Contracts" Version="8.0.0" />
<PackageReference Include="Volo.Abp.FeatureManagement.Application.Contracts" Version="7.4.2" /> <PackageReference Include="Volo.Abp.FeatureManagement.Application.Contracts" Version="8.0.0" />
<PackageReference Include="Volo.Abp.SettingManagement.Application.Contracts" Version="7.4.2" /> <PackageReference Include="Volo.Abp.SettingManagement.Application.Contracts" Version="8.0.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>

20
src/common/Sinet.Universal.Admin.Domain.Shared/Sinet.Universal.Admin.Domain.Shared.csproj
View File

@ -3,21 +3,21 @@
<Import Project="..\..\..\common.props" /> <Import Project="..\..\..\common.props" />
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>netstandard2.0;netstandard2.1;net7.0</TargetFrameworks> <TargetFrameworks>netstandard2.0;netstandard2.1;net8.0</TargetFrameworks>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<RootNamespace>Sinet.Universal.Admin</RootNamespace> <RootNamespace>Sinet.Universal.Admin</RootNamespace>
<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest> <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Identity.Domain.Shared" Version="7.4.2" /> <PackageReference Include="Volo.Abp.Identity.Domain.Shared" Version="8.0.0" />
<PackageReference Include="Volo.Abp.BackgroundJobs.Domain.Shared" Version="7.4.2" /> <PackageReference Include="Volo.Abp.BackgroundJobs.Domain.Shared" Version="8.0.0" />
<PackageReference Include="Volo.Abp.AuditLogging.Domain.Shared" Version="7.4.2" /> <PackageReference Include="Volo.Abp.AuditLogging.Domain.Shared" Version="8.0.0" />
<PackageReference Include="Volo.Abp.TenantManagement.Domain.Shared" Version="7.4.2" /> <PackageReference Include="Volo.Abp.TenantManagement.Domain.Shared" Version="8.0.0" />
<PackageReference Include="Volo.Abp.FeatureManagement.Domain.Shared" Version="7.4.2" /> <PackageReference Include="Volo.Abp.FeatureManagement.Domain.Shared" Version="8.0.0" />
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.Shared" Version="7.4.2" /> <PackageReference Include="Volo.Abp.PermissionManagement.Domain.Shared" Version="8.0.0" />
<PackageReference Include="Volo.Abp.SettingManagement.Domain.Shared" Version="7.4.2" /> <PackageReference Include="Volo.Abp.SettingManagement.Domain.Shared" Version="8.0.0" />
<PackageReference Include="Volo.Abp.OpenIddict.Domain.Shared" Version="7.4.2" /> <PackageReference Include="Volo.Abp.OpenIddict.Domain.Shared" Version="8.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@ -26,7 +26,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.10" /> <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>

14
src/common/Sinet.Universal.Admin.HttpApi.Client/Sinet.Universal.Admin.HttpApi.Client.csproj
View File

@ -3,7 +3,7 @@
<Import Project="..\..\..\common.props" /> <Import Project="..\..\..\common.props" />
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>netstandard2.0;netstandard2.1;net7.0</TargetFrameworks> <TargetFrameworks>netstandard2.0;netstandard2.1;net8.0</TargetFrameworks>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<RootNamespace>Sinet.Universal.Admin</RootNamespace> <RootNamespace>Sinet.Universal.Admin</RootNamespace>
</PropertyGroup> </PropertyGroup>
@ -13,12 +13,12 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Account.HttpApi.Client" Version="7.4.2" /> <PackageReference Include="Volo.Abp.Account.HttpApi.Client" Version="8.0.0" />
<PackageReference Include="Volo.Abp.Identity.HttpApi.Client" Version="7.4.2" /> <PackageReference Include="Volo.Abp.Identity.HttpApi.Client" Version="8.0.0" />
<PackageReference Include="Volo.Abp.PermissionManagement.HttpApi.Client" Version="7.4.2" /> <PackageReference Include="Volo.Abp.PermissionManagement.HttpApi.Client" Version="8.0.0" />
<PackageReference Include="Volo.Abp.TenantManagement.HttpApi.Client" Version="7.4.2" /> <PackageReference Include="Volo.Abp.TenantManagement.HttpApi.Client" Version="8.0.0" />
<PackageReference Include="Volo.Abp.FeatureManagement.HttpApi.Client" Version="7.4.2" /> <PackageReference Include="Volo.Abp.FeatureManagement.HttpApi.Client" Version="8.0.0" />
<PackageReference Include="Volo.Abp.SettingManagement.HttpApi.Client" Version="7.4.2" /> <PackageReference Include="Volo.Abp.SettingManagement.HttpApi.Client" Version="8.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

14
src/common/Sinet.Universal.Admin.HttpApi/Sinet.Universal.Admin.HttpApi.csproj
View File

@ -3,7 +3,7 @@
<Import Project="..\..\..\common.props" /> <Import Project="..\..\..\common.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>net7.0</TargetFramework> <TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<RootNamespace>Sinet.Universal.Admin</RootNamespace> <RootNamespace>Sinet.Universal.Admin</RootNamespace>
</PropertyGroup> </PropertyGroup>
@ -13,12 +13,12 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Account.HttpApi" Version="7.4.2" /> <PackageReference Include="Volo.Abp.Account.HttpApi" Version="8.0.0" />
<PackageReference Include="Volo.Abp.Identity.HttpApi" Version="7.4.2" /> <PackageReference Include="Volo.Abp.Identity.HttpApi" Version="8.0.0" />
<PackageReference Include="Volo.Abp.PermissionManagement.HttpApi" Version="7.4.2" /> <PackageReference Include="Volo.Abp.PermissionManagement.HttpApi" Version="8.0.0" />
<PackageReference Include="Volo.Abp.TenantManagement.HttpApi" Version="7.4.2" /> <PackageReference Include="Volo.Abp.TenantManagement.HttpApi" Version="8.0.0" />
<PackageReference Include="Volo.Abp.FeatureManagement.HttpApi" Version="7.4.2" /> <PackageReference Include="Volo.Abp.FeatureManagement.HttpApi" Version="8.0.0" />
<PackageReference Include="Volo.Abp.SettingManagement.HttpApi" Version="7.4.2" /> <PackageReference Include="Volo.Abp.SettingManagement.HttpApi" Version="8.0.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>

10
src/common/Sinet.Universal.Admin.RCL/Sinet.Universal.Admin.RCL.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Razor"> <Project Sdk="Microsoft.NET.Sdk.Razor">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net7.0</TargetFramework> <TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<StaticWebAssetBasePath>/</StaticWebAssetBasePath> <StaticWebAssetBasePath>/</StaticWebAssetBasePath>
@ -14,11 +14,11 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Masa.Blazor" Version="1.2.2" /> <PackageReference Include="Masa.Blazor" Version="1.2.2" />
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="7.0.13" /> <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="8.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.13" /> <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.0" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.0.3" /> <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.0.3" />
<PackageReference Include="Volo.Abp.AspNetCore.Components" Version="7.4.2" /> <PackageReference Include="Volo.Abp.AspNetCore.Components" Version="8.0.0" />
<PackageReference Include="Volo.Abp.Identity.AspNetCore" Version="7.4.2" /> <PackageReference Include="Volo.Abp.Identity.AspNetCore" Version="8.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

16
src/server/Sinet.Universal.Admin.Application/Sinet.Universal.Admin.Application.csproj
View File

@ -3,7 +3,7 @@
<Import Project="..\..\..\common.props" /> <Import Project="..\..\..\common.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>net7.0</TargetFramework> <TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<RootNamespace>Sinet.Universal.Admin</RootNamespace> <RootNamespace>Sinet.Universal.Admin</RootNamespace>
</PropertyGroup> </PropertyGroup>
@ -14,13 +14,13 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Account.Application" Version="7.4.2" /> <PackageReference Include="Volo.Abp.Account.Application" Version="8.0.0" />
<PackageReference Include="Volo.Abp.Identity.Application" Version="7.4.2" /> <PackageReference Include="Volo.Abp.Identity.Application" Version="8.0.0" />
<PackageReference Include="Volo.Abp.Identity.AspNetCore" Version="7.4.2" /> <PackageReference Include="Volo.Abp.Identity.AspNetCore" Version="8.0.0" />
<PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="7.4.2" /> <PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="8.0.0" />
<PackageReference Include="Volo.Abp.TenantManagement.Application" Version="7.4.2" /> <PackageReference Include="Volo.Abp.TenantManagement.Application" Version="8.0.0" />
<PackageReference Include="Volo.Abp.FeatureManagement.Application" Version="7.4.2" /> <PackageReference Include="Volo.Abp.FeatureManagement.Application" Version="8.0.0" />
<PackageReference Include="Volo.Abp.SettingManagement.Application" Version="7.4.2" /> <PackageReference Include="Volo.Abp.SettingManagement.Application" Version="8.0.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>

8
src/server/Sinet.Universal.Admin.DbMigrator/Sinet.Universal.Admin.DbMigrator.csproj
View File

@ -4,7 +4,7 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework> <TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
</PropertyGroup> </PropertyGroup>
@ -22,6 +22,10 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" /> <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" /> <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" /> <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
@ -30,7 +34,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Autofac" Version="7.4.2" /> <PackageReference Include="Volo.Abp.Autofac" Version="8.0.0" />
<ProjectReference Include="..\..\common\Sinet.Universal.Admin.Application.Contracts\Sinet.Universal.Admin.Application.Contracts.csproj" /> <ProjectReference Include="..\..\common\Sinet.Universal.Admin.Application.Contracts\Sinet.Universal.Admin.Application.Contracts.csproj" />
<ProjectReference Include="..\Sinet.Universal.Admin.EntityFrameworkCore\Sinet.Universal.Admin.EntityFrameworkCore.csproj" /> <ProjectReference Include="..\Sinet.Universal.Admin.EntityFrameworkCore\Sinet.Universal.Admin.EntityFrameworkCore.csproj" />
</ItemGroup> </ItemGroup>

2
src/server/Sinet.Universal.Admin.Domain/OpenIddict/OpenIddictDataSeedContributor.cs
View File

@ -220,7 +220,7 @@ public class OpenIddictDataSeedContributor : IDataSeedContributor, ITransientDep
var application = new AbpApplicationDescriptor { var application = new AbpApplicationDescriptor {
ClientId = name, ClientId = name,
Type = type, ClientType = type,
ClientSecret = secret, ClientSecret = secret,
ConsentType = consentType, ConsentType = consentType,
DisplayName = displayName, DisplayName = displayName,

22
src/server/Sinet.Universal.Admin.Domain/Sinet.Universal.Admin.Domain.csproj
View File

@ -3,7 +3,7 @@
<Import Project="..\..\..\common.props" /> <Import Project="..\..\..\common.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>net7.0</TargetFramework> <TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<RootNamespace>Sinet.Universal.Admin</RootNamespace> <RootNamespace>Sinet.Universal.Admin</RootNamespace>
</PropertyGroup> </PropertyGroup>
@ -13,16 +13,16 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Emailing" Version="7.4.2" /> <PackageReference Include="Volo.Abp.Emailing" Version="8.0.0" />
<PackageReference Include="Volo.Abp.Identity.Domain" Version="7.4.2" /> <PackageReference Include="Volo.Abp.Identity.Domain" Version="8.0.0" />
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.Identity" Version="7.4.2" /> <PackageReference Include="Volo.Abp.PermissionManagement.Domain.Identity" Version="8.0.0" />
<PackageReference Include="Volo.Abp.BackgroundJobs.Domain" Version="7.4.2" /> <PackageReference Include="Volo.Abp.BackgroundJobs.Domain" Version="8.0.0" />
<PackageReference Include="Volo.Abp.AuditLogging.Domain" Version="7.4.2" /> <PackageReference Include="Volo.Abp.AuditLogging.Domain" Version="8.0.0" />
<PackageReference Include="Volo.Abp.TenantManagement.Domain" Version="7.4.2" /> <PackageReference Include="Volo.Abp.TenantManagement.Domain" Version="8.0.0" />
<PackageReference Include="Volo.Abp.FeatureManagement.Domain" Version="7.4.2" /> <PackageReference Include="Volo.Abp.FeatureManagement.Domain" Version="8.0.0" />
<PackageReference Include="Volo.Abp.SettingManagement.Domain" Version="7.4.2" /> <PackageReference Include="Volo.Abp.SettingManagement.Domain" Version="8.0.0" />
<PackageReference Include="Volo.Abp.OpenIddict.Domain" Version="7.4.2" /> <PackageReference Include="Volo.Abp.OpenIddict.Domain" Version="8.0.0" />
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.OpenIddict" Version="7.4.2" /> <PackageReference Include="Volo.Abp.PermissionManagement.Domain.OpenIddict" Version="8.0.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
src/server/Sinet.Universal.Admin.EntityFrameworkCore/Migrations/20231107094243_Initial.Designer.cs generated
View File

@ -21,7 +21,7 @@ namespace Sinet.Universal.Admin.Migrations
#pragma warning disable 612, 618 #pragma warning disable 612, 618
modelBuilder modelBuilder
.HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.MySql) .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.MySql)
.HasAnnotation("ProductVersion", "7.0.10") .HasAnnotation("ProductVersion", "8.0.0")
.HasAnnotation("Relational:MaxIdentifierLength", 64); .HasAnnotation("Relational:MaxIdentifierLength", 64);
modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLog", b => modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLog", b =>

1945
src/server/Sinet.Universal.Admin.EntityFrameworkCore/Migrations/20240103075156_Update_To_Apb_8.0.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

94
src/server/Sinet.Universal.Admin.EntityFrameworkCore/Migrations/20240103075156_Update_To_Apb_8.0.cs Normal file
View File

@ -0,0 +1,94 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace Sinet.Universal.Admin.Migrations
{
/// <inheritdoc />
public partial class Update_To_Apb_80 : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.RenameColumn(
name: "Type",
table: "OpenIddictApplications",
newName: "ClientType");
migrationBuilder.AddColumn<string>(
name: "ApplicationType",
table: "OpenIddictApplications",
type: "varchar(50)",
maxLength: 50,
nullable: true)
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AddColumn<string>(
name: "JsonWebKeySet",
table: "OpenIddictApplications",
type: "longtext",
nullable: true)
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AddColumn<string>(
name: "Settings",
table: "OpenIddictApplications",
type: "longtext",
nullable: true)
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AlterColumn<string>(
name: "EntityId",
table: "AbpEntityChanges",
type: "varchar(128)",
maxLength: 128,
nullable: true,
oldClrType: typeof(string),
oldType: "varchar(128)",
oldMaxLength: 128)
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "ApplicationType",
table: "OpenIddictApplications");
migrationBuilder.DropColumn(
name: "JsonWebKeySet",
table: "OpenIddictApplications");
migrationBuilder.DropColumn(
name: "Settings",
table: "OpenIddictApplications");
migrationBuilder.RenameColumn(
name: "ClientType",
table: "OpenIddictApplications",
newName: "Type");
migrationBuilder.UpdateData(
table: "AbpEntityChanges",
keyColumn: "EntityId",
keyValue: null,
column: "EntityId",
value: "");
migrationBuilder.AlterColumn<string>(
name: "EntityId",
table: "AbpEntityChanges",
type: "varchar(128)",
maxLength: 128,
nullable: false,
oldClrType: typeof(string),
oldType: "varchar(128)",
oldMaxLength: 128,
oldNullable: true)
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
}
}
}

19
src/server/Sinet.Universal.Admin.EntityFrameworkCore/Migrations/AdminDbContextModelSnapshot.cs
View File

@ -18,7 +18,7 @@ namespace Sinet.Universal.Admin.Migrations
#pragma warning disable 612, 618 #pragma warning disable 612, 618
modelBuilder modelBuilder
.HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.MySql) .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.MySql)
.HasAnnotation("ProductVersion", "7.0.10") .HasAnnotation("ProductVersion", "8.0.0")
.HasAnnotation("Relational:MaxIdentifierLength", 64); .HasAnnotation("Relational:MaxIdentifierLength", 64);
modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLog", b => modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLog", b =>
@ -212,7 +212,6 @@ namespace Sinet.Universal.Admin.Migrations
.HasColumnName("ChangeType"); .HasColumnName("ChangeType");
b.Property<string>("EntityId") b.Property<string>("EntityId")
.IsRequired()
.HasMaxLength(128) .HasMaxLength(128)
.HasColumnType("varchar(128)") .HasColumnType("varchar(128)")
.HasColumnName("EntityId"); .HasColumnName("EntityId");
@ -1127,6 +1126,10 @@ namespace Sinet.Universal.Admin.Migrations
.ValueGeneratedOnAdd() .ValueGeneratedOnAdd()
.HasColumnType("char(36)"); .HasColumnType("char(36)");
b.Property<string>("ApplicationType")
.HasMaxLength(50)
.HasColumnType("varchar(50)");
b.Property<string>("ClientId") b.Property<string>("ClientId")
.HasMaxLength(100) .HasMaxLength(100)
.HasColumnType("varchar(100)"); .HasColumnType("varchar(100)");
@ -1134,6 +1137,10 @@ namespace Sinet.Universal.Admin.Migrations
b.Property<string>("ClientSecret") b.Property<string>("ClientSecret")
.HasColumnType("longtext"); .HasColumnType("longtext");
b.Property<string>("ClientType")
.HasMaxLength(50)
.HasColumnType("varchar(50)");
b.Property<string>("ClientUri") b.Property<string>("ClientUri")
.HasColumnType("longtext"); .HasColumnType("longtext");
@ -1181,6 +1188,9 @@ namespace Sinet.Universal.Admin.Migrations
.HasDefaultValue(false) .HasDefaultValue(false)
.HasColumnName("IsDeleted"); .HasColumnName("IsDeleted");
b.Property<string>("JsonWebKeySet")
.HasColumnType("longtext");
b.Property<DateTime?>("LastModificationTime") b.Property<DateTime?>("LastModificationTime")
.HasColumnType("datetime(6)") .HasColumnType("datetime(6)")
.HasColumnName("LastModificationTime"); .HasColumnName("LastModificationTime");
@ -1207,9 +1217,8 @@ namespace Sinet.Universal.Admin.Migrations
b.Property<string>("Requirements") b.Property<string>("Requirements")
.HasColumnType("longtext"); .HasColumnType("longtext");
b.Property<string>("Type") b.Property<string>("Settings")
.HasMaxLength(50) .HasColumnType("longtext");
.HasColumnType("varchar(50)");
b.HasKey("Id"); b.HasKey("Id");

20
src/server/Sinet.Universal.Admin.EntityFrameworkCore/Sinet.Universal.Admin.EntityFrameworkCore.csproj
View File

@ -3,22 +3,22 @@
<Import Project="..\..\..\common.props" /> <Import Project="..\..\..\common.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>net7.0</TargetFramework> <TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<RootNamespace>Sinet.Universal.Admin</RootNamespace> <RootNamespace>Sinet.Universal.Admin</RootNamespace>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Sinet.Universal.Admin.Domain\Sinet.Universal.Admin.Domain.csproj" /> <ProjectReference Include="..\Sinet.Universal.Admin.Domain\Sinet.Universal.Admin.Domain.csproj" />
<PackageReference Include="Volo.Abp.EntityFrameworkCore.MySQL" Version="7.4.2" /> <PackageReference Include="Volo.Abp.EntityFrameworkCore.MySQL" Version="8.0.0" />
<PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="7.4.2" /> <PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="8.0.0" />
<PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="7.4.2" /> <PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="8.0.0" />
<PackageReference Include="Volo.Abp.Identity.EntityFrameworkCore" Version="7.4.2" /> <PackageReference Include="Volo.Abp.Identity.EntityFrameworkCore" Version="8.0.0" />
<PackageReference Include="Volo.Abp.BackgroundJobs.EntityFrameworkCore" Version="7.4.2" /> <PackageReference Include="Volo.Abp.BackgroundJobs.EntityFrameworkCore" Version="8.0.0" />
<PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="7.4.2" /> <PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="8.0.0" />
<PackageReference Include="Volo.Abp.TenantManagement.EntityFrameworkCore" Version="7.4.2" /> <PackageReference Include="Volo.Abp.TenantManagement.EntityFrameworkCore" Version="8.0.0" />
<PackageReference Include="Volo.Abp.FeatureManagement.EntityFrameworkCore" Version="7.4.2" /> <PackageReference Include="Volo.Abp.FeatureManagement.EntityFrameworkCore" Version="8.0.0" />
<PackageReference Include="Volo.Abp.OpenIddict.EntityFrameworkCore" Version="7.4.2" /> <PackageReference Include="Volo.Abp.OpenIddict.EntityFrameworkCore" Version="8.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

12
src/server/Sinet.Universal.Admin.HttpApi.Host/Sinet.Universal.Admin.HttpApi.Host.csproj
View File

@ -3,7 +3,7 @@
<Import Project="..\..\..\common.props" /> <Import Project="..\..\..\common.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>net7.0</TargetFramework> <TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<RootNamespace>Sinet.Universal.Admin</RootNamespace> <RootNamespace>Sinet.Universal.Admin</RootNamespace>
<PreserveCompilationReferences>true</PreserveCompilationReferences> <PreserveCompilationReferences>true</PreserveCompilationReferences>
@ -13,11 +13,11 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Serilog.AspNetCore" Version="5.0.0" /> <PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" /> <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
<PackageReference Include="Volo.Abp.AspNetCore.MultiTenancy" Version="7.4.2" /> <PackageReference Include="Volo.Abp.AspNetCore.MultiTenancy" Version="8.0.0" />
<PackageReference Include="Volo.Abp.Autofac" Version="7.4.2" /> <PackageReference Include="Volo.Abp.Autofac" Version="8.0.0" />
<PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="7.4.2" /> <PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="8.0.0" />
<PackageReference Include="Volo.Abp.Swashbuckle" Version="7.4.2" /> <PackageReference Include="Volo.Abp.Swashbuckle" Version="8.0.0" />
<PackageReference Include="Volo.Abp.Account.Web.OpenIddict" Version="7.4.2" /> <PackageReference Include="Volo.Abp.Account.Web.OpenIddict" Version="8.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

20
src/server/Sinet.Universal.Admin.Server.Host/Sinet.Universal.Admin.Server.Host.csproj
View File

@ -3,7 +3,7 @@
<Import Project="..\..\..\common.props" /> <Import Project="..\..\..\common.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>net7.0</TargetFramework> <TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType> <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
@ -21,8 +21,8 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="7.4.2" /> <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="8.0.0" />
<PackageReference Include="Volo.Abp.AspNetCore.Components.Server.BasicTheme" Version="7.4.2" /> <PackageReference Include="Volo.Abp.AspNetCore.Components.Server.BasicTheme" Version="8.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@ -30,13 +30,13 @@
<ProjectReference Include="..\..\common\Sinet.Universal.Admin.RCL\Sinet.Universal.Admin.RCL.csproj" /> <ProjectReference Include="..\..\common\Sinet.Universal.Admin.RCL\Sinet.Universal.Admin.RCL.csproj" />
<ProjectReference Include="..\Sinet.Universal.Admin.Application\Sinet.Universal.Admin.Application.csproj" /> <ProjectReference Include="..\Sinet.Universal.Admin.Application\Sinet.Universal.Admin.Application.csproj" />
<ProjectReference Include="..\Sinet.Universal.Admin.EntityFrameworkCore\Sinet.Universal.Admin.EntityFrameworkCore.csproj" /> <ProjectReference Include="..\Sinet.Universal.Admin.EntityFrameworkCore\Sinet.Universal.Admin.EntityFrameworkCore.csproj" />
<PackageReference Include="Volo.Abp.Autofac" Version="7.4.2" /> <PackageReference Include="Volo.Abp.Autofac" Version="8.0.0" />
<PackageReference Include="Volo.Abp.Swashbuckle" Version="7.4.2" /> <PackageReference Include="Volo.Abp.Swashbuckle" Version="8.0.0" />
<PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="7.4.2" /> <PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="8.0.0" />
<PackageReference Include="Volo.Abp.Account.Web.OpenIddict" Version="7.4.2" /> <PackageReference Include="Volo.Abp.Account.Web.OpenIddict" Version="8.0.0" />
<PackageReference Include="Volo.Abp.Identity.Blazor.Server" Version="7.4.2" /> <PackageReference Include="Volo.Abp.Identity.Blazor.Server" Version="8.0.0" />
<PackageReference Include="Volo.Abp.TenantManagement.Blazor.Server" Version="7.4.2" /> <PackageReference Include="Volo.Abp.TenantManagement.Blazor.Server" Version="8.0.0" />
<PackageReference Include="Volo.Abp.SettingManagement.Blazor.Server" Version="7.4.2" /> <PackageReference Include="Volo.Abp.SettingManagement.Blazor.Server" Version="8.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
test/Sinet.Universal.Admin.Application.Tests/Sinet.Universal.Admin.Application.Tests.csproj
View File

@ -3,7 +3,7 @@
<Import Project="..\..\common.props" /> <Import Project="..\..\common.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>net7.0</TargetFramework> <TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<RootNamespace>Sinet.Universal.Admin</RootNamespace> <RootNamespace>Sinet.Universal.Admin</RootNamespace>
</PropertyGroup> </PropertyGroup>

2
test/Sinet.Universal.Admin.Domain.Tests/Sinet.Universal.Admin.Domain.Tests.csproj
View File

@ -3,7 +3,7 @@
<Import Project="..\..\common.props" /> <Import Project="..\..\common.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>net7.0</TargetFramework> <TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<RootNamespace>Sinet.Universal.Admin</RootNamespace> <RootNamespace>Sinet.Universal.Admin</RootNamespace>
</PropertyGroup> </PropertyGroup>

4
test/Sinet.Universal.Admin.EntityFrameworkCore.Tests/Sinet.Universal.Admin.EntityFrameworkCore.Tests.csproj
View File

@ -3,7 +3,7 @@
<Import Project="..\..\common.props" /> <Import Project="..\..\common.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>net7.0</TargetFramework> <TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<RootNamespace>Sinet.Universal.Admin</RootNamespace> <RootNamespace>Sinet.Universal.Admin</RootNamespace>
</PropertyGroup> </PropertyGroup>
@ -11,7 +11,7 @@
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\src\server\Sinet.Universal.Admin.EntityFrameworkCore\Sinet.Universal.Admin.EntityFrameworkCore.csproj" /> <ProjectReference Include="..\..\src\server\Sinet.Universal.Admin.EntityFrameworkCore\Sinet.Universal.Admin.EntityFrameworkCore.csproj" />
<ProjectReference Include="..\Sinet.Universal.Admin.TestBase\Sinet.Universal.Admin.TestBase.csproj" /> <ProjectReference Include="..\Sinet.Universal.Admin.TestBase\Sinet.Universal.Admin.TestBase.csproj" />
<PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="7.4.2" /> <PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="8.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

8
test/Sinet.Universal.Admin.HttpApi.Client.ConsoleTestApp/Sinet.Universal.Admin.HttpApi.Client.ConsoleTestApp.csproj
View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework> <TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
</PropertyGroup> </PropertyGroup>
@ -20,14 +20,14 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Http.Client.IdentityModel" Version="7.4.2" /> <PackageReference Include="Volo.Abp.Http.Client.IdentityModel" Version="8.0.0" />
<PackageReference Include="Volo.Abp.Autofac" Version="7.4.2" /> <PackageReference Include="Volo.Abp.Autofac" Version="8.0.0" />
<ProjectReference Include="..\..\src\common\Sinet.Universal.Admin.HttpApi.Client\Sinet.Universal.Admin.HttpApi.Client.csproj" /> <ProjectReference Include="..\..\src\common\Sinet.Universal.Admin.HttpApi.Client\Sinet.Universal.Admin.HttpApi.Client.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.0" /> <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.10" /> <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>

8
test/Sinet.Universal.Admin.TestBase/Sinet.Universal.Admin.TestBase.csproj
View File

@ -3,15 +3,15 @@
<Import Project="..\..\common.props" /> <Import Project="..\..\common.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>net7.0</TargetFramework> <TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<RootNamespace>Sinet.Universal.Admin</RootNamespace> <RootNamespace>Sinet.Universal.Admin</RootNamespace>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.TestBase" Version="7.4.2" /> <PackageReference Include="Volo.Abp.TestBase" Version="8.0.0" />
<PackageReference Include="Volo.Abp.Autofac" Version="7.4.2" /> <PackageReference Include="Volo.Abp.Autofac" Version="8.0.0" />
<PackageReference Include="Volo.Abp.Authorization" Version="7.4.2" /> <PackageReference Include="Volo.Abp.Authorization" Version="8.0.0" />
<ProjectReference Include="..\..\src\server\Sinet.Universal.Admin.Domain\Sinet.Universal.Admin.Domain.csproj" /> <ProjectReference Include="..\..\src\server\Sinet.Universal.Admin.Domain\Sinet.Universal.Admin.Domain.csproj" />
</ItemGroup> </ItemGroup>