Upgrade to ABP 5.0.1.

Redesign the demo to make admin can do anything. Refactor UnusedBlobCleaner. Change version to 2.0.0.
EasyAbp · Dec 28, 2021 · 5179be6 · 5179be6
1 parent 905a1ee
commit 5179be6
Show file tree

Hide file tree

Showing 181 changed files with 113,010 additions and 73,907 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
 
-    <AbpVersion>4.4.0</AbpVersion>
-    <EasyAbpAbpTagHelperPlusModuleVersion>0.7.1</EasyAbpAbpTagHelperPlusModuleVersion>
+    <AbpVersion>5.0.1</AbpVersion>
+    <EasyAbpAbpTagHelperPlusModuleVersion>0.8.1</EasyAbpAbpTagHelperPlusModuleVersion>
 
   </PropertyGroup>
 </Project>
diff --git a/README.md b/README.md
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -18,7 +18,7 @@ steps:
 - task: UseDotNet@2
   inputs:
     packageType: 'sdk'
-    version: '5.x'
+    version: '6.x'
 - task: CmdLine@2
   displayName: 'install dotnet-ef'
   inputs:

diff --git a/common.props b/common.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>1.6.0</Version>
+    <Version>2.0.0</Version>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>EasyAbp Team</Authors>
@@ -20,7 +20,7 @@
 
   <ItemGroup>
     <PackageReference Include="ConfigureAwait.Fody" Version="3.3.1" PrivateAssets="All" />
-    <PackageReference Include="Fody" Version="6.2.0">
+    <PackageReference Include="Fody" Version="6.5.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

diff --git a/docs/README.md b/docs/README.md
@@ -3,6 +3,7 @@
 [![ABP version](https://img.shields.io/badge/dynamic/xml?style=flat-square&color=yellow&label=abp&query=%2F%2FProject%2FPropertyGroup%2FAbpVersion&url=https%3A%2F%2Fraw.githubusercontent.com%2FEasyAbp%2FFileManagement%2Fmaster%2FDirectory.Build.props)](https://abp.io)
 [![NuGet](https://img.shields.io/nuget/v/EasyAbp.FileManagement.Domain.Shared.svg?style=flat-square)](https://www.nuget.org/packages/EasyAbp.FileManagement.Domain.Shared)
 [![NuGet Download](https://img.shields.io/nuget/dt/EasyAbp.FileManagement.Domain.Shared.svg?style=flat-square)](https://www.nuget.org/packages/EasyAbp.FileManagement.Domain.Shared)
+[![Discord online](https://badgen.net/discord/online-members/S6QaezrCRq?label=Discord)](https://discord.gg/S6QaezrCRq)
 [![GitHub stars](https://img.shields.io/github/stars/EasyAbp/FileManagement?style=social)](https://www.github.com/EasyAbp/FileManagement)
 
 An abp application module that allows users to upload and manage their own files based on the ABP BLOB storing.

diff --git a/host/EasyAbp.FileManagement.Blazor.Host/EasyAbp.FileManagement.Blazor.Host.csproj b/host/EasyAbp.FileManagement.Blazor.Host/EasyAbp.FileManagement.Blazor.Host.csproj
@@ -3,15 +3,15 @@
   <Import Project="..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <BlazorWebAssemblyLoadAllGlobalizationData>true</BlazorWebAssemblyLoadAllGlobalizationData>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Blazorise.Bootstrap" Version="0.9.4.1" />
-    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.4.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.*" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="5.0.*" />
+    <PackageReference Include="Blazorise.Bootstrap5" Version="0.9.5" />
+    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.5" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.*" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.*" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/host/EasyAbp.FileManagement.Blazor.Host/FileManagementBlazorHostModule.cs b/host/EasyAbp.FileManagement.Blazor.Host/FileManagementBlazorHostModule.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Net.Http;
-using Blazorise.Bootstrap;
+using Blazorise.Bootstrap5;
 using Blazorise.Icons.FontAwesome;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 using Microsoft.Extensions.Configuration;
@@ -64,7 +64,7 @@ private void ConfigureMenu(ServiceConfigurationContext context)
         private void ConfigureBlazorise(ServiceConfigurationContext context)
         {
             context.Services
-                .AddBootstrapProviders()
+                .AddBootstrap5Providers()
                 .AddFontAwesomeIcons();
         }
 

diff --git a/...asyAbp.FileManagement.Blazor.Server.Host/EasyAbp.FileManagement.Blazor.Server.Host.csproj b/...asyAbp.FileManagement.Blazor.Server.Host/EasyAbp.FileManagement.Blazor.Server.Host.csproj
@@ -3,21 +3,20 @@
     <Import Project="..\..\common.props" />
 
     <PropertyGroup>
-        <TargetFramework>net5.0</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
         <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
         <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
-        <PreserveCompilationContext>true</PreserveCompilationContext>
         <MvcRazorExcludeRefAssembliesFromPublish>false</MvcRazorExcludeRefAssembliesFromPublish>
         <PreserveCompilationReferences>true</PreserveCompilationReferences>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Blazorise.Bootstrap" Version="0.9.4.1" />
-        <PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.4.1" />
+        <PackageReference Include="Blazorise.Bootstrap5" Version="0.9.5" />
+        <PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.5" />
         <PackageReference Include="Serilog.AspNetCore" Version="4.1.0" />
-        <PackageReference Include="Serilog.Sinks.Async" Version="1.4.0" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.*" />
+        <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.*" />
     </ItemGroup>
 
     <ItemGroup>
@@ -45,6 +44,7 @@
         <PackageReference Include="Volo.Abp.SettingManagement.Application" Version="$(AbpVersion)" />
         <PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="$(AbpVersion)" />
         <PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="$(AbpVersion)" />
+        <PackageReference Include="Volo.Abp.BackgroundJobs" Version="$(AbpVersion)" />
         <ProjectReference Include="..\..\src\EasyAbp.FileManagement.Blazor.Server\EasyAbp.FileManagement.Blazor.Server.csproj" />
         <ProjectReference Include="..\..\src\EasyAbp.FileManagement.EntityFrameworkCore\EasyAbp.FileManagement.EntityFrameworkCore.csproj" />
         <ProjectReference Include="..\..\src\EasyAbp.FileManagement.HttpApi\EasyAbp.FileManagement.HttpApi.csproj" />

diff --git a/host/EasyAbp.FileManagement.Blazor.Server.Host/FileManagementBlazorHostModule.cs b/host/EasyAbp.FileManagement.Blazor.Server.Host/FileManagementBlazorHostModule.cs
@@ -1,7 +1,7 @@
 using System;
 using System.IO;
 using System.Net.Http;
-using Blazorise.Bootstrap;
+using Blazorise.Bootstrap5;
 using Blazorise.Icons.FontAwesome;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
@@ -25,6 +25,7 @@
 using Volo.Abp.AspNetCore.Serilog;
 using Volo.Abp.AuditLogging.EntityFrameworkCore;
 using Volo.Abp.Autofac;
+using Volo.Abp.BackgroundJobs;
 using Volo.Abp.Data;
 using Volo.Abp.EntityFrameworkCore;
 using Volo.Abp.FeatureManagement;
@@ -76,6 +77,7 @@ namespace EasyAbp.FileManagement.Blazor.Server.Host
         typeof(AbpSettingManagementBlazorServerModule),
         typeof(AbpSettingManagementApplicationModule),
         typeof(AbpSettingManagementEntityFrameworkCoreModule),
+        typeof(AbpBackgroundJobsModule),
         typeof(FileManagementBlazorServerModule)
     )]
     public class FileManagementBlazorHostModule: AbpModule
@@ -185,7 +187,7 @@ public override void ConfigureServices(ServiceConfigurationContext context)
             });
 
             context.Services
-                .AddBootstrapProviders()
+                .AddBootstrap5Providers()
                 .AddFontAwesomeIcons();
 
             Configure<AbpNavigationOptions>(options =>