tsai
/
abp-vnext-pro
mirror of https://github.com/WangJunZzz/abp-vnext-pro.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

feat: 升级volo.abp 7.3.2

pull/126/head 7.3.2.1
wangjun 3 years ago
parent
662e08b3ff
commit
7f3f8e713b
31 changed files with 741 additions and 711 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 178
      aspnet-core/Directory.Build.Volo.targets
  2. 60
      aspnet-core/Directory.Build.targets
  3. 7
      aspnet-core/Lion.AbpPro.All.sln
  4. 4
      aspnet-core/frameworks/src/Lion.AbpPro.Core/Lion.AbpPro.Core.csproj
  5. 1
      aspnet-core/frameworks/src/Lion.AbpPro.EntityFrameworkCore/Lion.AbpPro.EntityFrameworkCore.csproj
  6. 70
      aspnet-core/frameworks/test/Lion.AbpPro.EntityFrameworkCore.Mysql.Tests/Lion.AbpPro.EntityFrameworkCore.Tests.csproj
  7. 268
      aspnet-core/frameworks/test/Lion.AbpPro.EntityFrameworkCore.Mysql.Tests/Services/BlogAppService.cs
  8. 1
      aspnet-core/modules/BasicManagement/host/Lion.AbpPro.BasicManagement.HttpApi.Host/Lion.AbpPro.BasicManagement.HttpApi.Host.csproj
  9. 6
      aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application/Lion.AbpPro.BasicManagement.Application.csproj
  10. 2
      aspnet-core/modules/FileManagement/host/Lion.AbpPro.FileManagement.HttpApi.Host/Lion.AbpPro.FileManagement.HttpApi.Host.csproj
  11. 1
      aspnet-core/modules/NotificationManagement/host/Lion.AbpPro.NotificationManagement.HttpApi.Host/Lion.AbpPro.NotificationManagement.HttpApi.Host.csproj
  12. 2
      aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/AbpProHttpApiHostModule.Configure.cs
  13. 5
      aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/Extensions/Hangfire/RecurringJobsExtensions.cs
  14. 1
      aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/GlobalUsings.cs
  15. 1
      aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/Lion.AbpPro.HttpApi.Host.csproj
  16. 1
      aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/Startup.cs
  17. 2
      aspnet-core/services/src/Lion.AbpPro.FreeSqlRepository/Lion.AbpPro.FreeSqlRepository.csproj
  18. 6
      aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/GlobalUsings.cs
  19. 100
      aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/Microsoft/AspNetCore/Mvc/Filters/AbpProExceptionFilter.cs
  20. 176
      templates/abp-vnext-pro-nuget-all/aspnet-core/Directory.Build.Volo.targets
  21. 61
      templates/abp-vnext-pro-nuget-all/aspnet-core/Directory.Build.targets
  22. 9
      templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Extensions/Hangfire/RecurringJobsExtensions.cs
  23. 2
      templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs
  24. 2
      templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.FreeSqlRepository/MyCompanyName.MyProjectName.FreeSqlRepository.csproj
  25. 176
      templates/abp-vnext-pro-nuget-module/Directory.Build.Volo.targets
  26. 60
      templates/abp-vnext-pro-nuget-module/Directory.Build.targets
  27. 176
      templates/abp-vnext-pro-nuget-simplify/aspnet-core/Directory.Build.Volo.targets
  28. 61
      templates/abp-vnext-pro-nuget-simplify/aspnet-core/Directory.Build.targets
  29. 9
      templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Extensions/Hangfire/RecurringJobsExtensions.cs
  30. 2
      templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs
  31. 2
      templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.FreeSqlRepository/MyCompanyName.MyProjectName.FreeSqlRepository.csproj

178
aspnet-core/Directory.Build.Volo.targets
View File

@ -1,93 +1,93 @@
<Project> <Project>
<ItemGroup> <ItemGroup>
<PackageReference Update="Volo.Abp.Autofac" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Autofac" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Threading" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Threading" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Json" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Json" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Validation" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Validation" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Ddd.Domain" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Ddd.Domain" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.AutoMapper" Version="7.2.2"/> <PackageReference Update="Volo.Abp.AutoMapper" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.ObjectMapping" Version="7.2.2"/> <PackageReference Update="Volo.Abp.ObjectMapping" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Identity.AspNetCore" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Identity.AspNetCore" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Caching" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Caching" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.BlobStoring.Aliyun" Version="7.2.2"/> <PackageReference Update="Volo.Abp.BlobStoring.Aliyun" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.BackgroundJobs" Version="7.2.2"/> <PackageReference Update="Volo.Abp.BackgroundJobs" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Authorization.Abstractions" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Authorization.Abstractions" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.BackgroundJobs.HangFire" Version="7.2.2"/> <PackageReference Update="Volo.Abp.BackgroundJobs.HangFire" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.AspNetCore.SignalR" Version="7.2.2"/> <PackageReference Update="Volo.Abp.AspNetCore.SignalR" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.TestBase" Version="7.2.2"/> <PackageReference Update="Volo.Abp.TestBase" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.EntityFrameworkCore.MySQL" Version="7.2.2"/> <PackageReference Update="Volo.Abp.EntityFrameworkCore.MySQL" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="7.2.2"/> <PackageReference Update="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="7.2.2"/> <PackageReference Update="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Identity.EntityFrameworkCore" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Identity.EntityFrameworkCore" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.BackgroundJobs.EntityFrameworkCore" Version="7.2.2"/> <PackageReference Update="Volo.Abp.BackgroundJobs.EntityFrameworkCore" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="7.2.2"/> <PackageReference Update="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.TenantManagement.EntityFrameworkCore" Version="7.2.2"/> <PackageReference Update="Volo.Abp.TenantManagement.EntityFrameworkCore" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.FeatureManagement.EntityFrameworkCore" Version="7.2.2"/> <PackageReference Update="Volo.Abp.FeatureManagement.EntityFrameworkCore" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.AspNetCore.Authentication.JwtBearer" Version="7.2.2"/> <PackageReference Update="Volo.Abp.AspNetCore.Authentication.JwtBearer" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.AspNetCore.Mvc.Contracts" Version="7.2.2"/> <PackageReference Update="Volo.Abp.AspNetCore.Mvc.Contracts" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Account.Web" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Account.Web" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Caching.StackExchangeRedis" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Caching.StackExchangeRedis" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy" Version="7.2.2"/> <PackageReference Update="Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.EntityFrameworkCore.PostgreSql" Version="7.2.2"/> <PackageReference Update="Volo.Abp.EntityFrameworkCore.PostgreSql" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.AspNetCore.Serilog" Version="7.2.2"/> <PackageReference Update="Volo.Abp.AspNetCore.Serilog" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Swashbuckle" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Swashbuckle" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Ddd.Application" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Ddd.Application" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Ddd.Application.Contracts" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Ddd.Application.Contracts" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Authorization" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Authorization" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Dapper" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Dapper" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.AspNetCore.Mvc" Version="7.2.2"/> <PackageReference Update="Volo.Abp.AspNetCore.Mvc" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Http.Client" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Http.Client" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.MongoDB" Version="7.2.2"/> <PackageReference Update="Volo.Abp.MongoDB" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.EntityFrameworkCore.Sqlite" Version="7.2.2"/> <PackageReference Update="Volo.Abp.EntityFrameworkCore.Sqlite" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Http.Client.IdentityModel" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Http.Client.IdentityModel" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.AspNetCore.MultiTenancy" Version="7.2.2"/> <PackageReference Update="Volo.Abp.AspNetCore.MultiTenancy" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Account.Application" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Account.Application" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Identity.Application" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Identity.Application" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.PermissionManagement.Application" Version="7.2.2"/> <PackageReference Update="Volo.Abp.PermissionManagement.Application" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.TenantManagement.Application" Version="7.2.2"/> <PackageReference Update="Volo.Abp.TenantManagement.Application" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.FeatureManagement.Application" Version="7.2.2"/> <PackageReference Update="Volo.Abp.FeatureManagement.Application" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.SettingManagement.Application" Version="7.2.2"/> <PackageReference Update="Volo.Abp.SettingManagement.Application" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.ObjectExtending" Version="7.2.2"/> <PackageReference Update="Volo.Abp.ObjectExtending" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Account.Application.Contracts" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Account.Application.Contracts" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Identity.Application.Contracts" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Identity.Application.Contracts" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.PermissionManagement.Application.Contracts" Version="7.2.2"/> <PackageReference Update="Volo.Abp.PermissionManagement.Application.Contracts" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.TenantManagement.Application.Contracts" Version="7.2.2"/> <PackageReference Update="Volo.Abp.TenantManagement.Application.Contracts" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.FeatureManagement.Application.Contracts" Version="7.2.2"/> <PackageReference Update="Volo.Abp.FeatureManagement.Application.Contracts" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.SettingManagement.Application.Contracts" Version="7.2.2"/> <PackageReference Update="Volo.Abp.SettingManagement.Application.Contracts" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Emailing" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Emailing" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.PermissionManagement.Domain.Identity" Version="7.2.2"/> <PackageReference Update="Volo.Abp.PermissionManagement.Domain.Identity" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.BackgroundJobs.Domain" Version="7.2.2"/> <PackageReference Update="Volo.Abp.BackgroundJobs.Domain" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.AuditLogging.Domain" Version="7.2.2"/> <PackageReference Update="Volo.Abp.AuditLogging.Domain" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.TenantManagement.Domain" Version="7.2.2"/> <PackageReference Update="Volo.Abp.TenantManagement.Domain" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.FeatureManagement.Domain" Version="7.2.2"/> <PackageReference Update="Volo.Abp.FeatureManagement.Domain" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.SettingManagement.Domain" Version="7.2.2"/> <PackageReference Update="Volo.Abp.SettingManagement.Domain" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Identity.Domain" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Identity.Domain" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Identity.Domain.Shared" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Identity.Domain.Shared" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.BackgroundJobs.Domain.Shared" Version="7.2.2"/> <PackageReference Update="Volo.Abp.BackgroundJobs.Domain.Shared" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.AuditLogging.Domain.Shared" Version="7.2.2"/> <PackageReference Update="Volo.Abp.AuditLogging.Domain.Shared" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.TenantManagement.Domain.Shared" Version="7.2.2"/> <PackageReference Update="Volo.Abp.TenantManagement.Domain.Shared" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.FeatureManagement.Domain.Shared" Version="7.2.2"/> <PackageReference Update="Volo.Abp.FeatureManagement.Domain.Shared" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.PermissionManagement.Domain.Shared" Version="7.2.2"/> <PackageReference Update="Volo.Abp.PermissionManagement.Domain.Shared" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.SettingManagement.Domain.Shared" Version="7.2.2"/> <PackageReference Update="Volo.Abp.SettingManagement.Domain.Shared" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Account.HttpApi" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Account.HttpApi" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Identity.HttpApi" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Identity.HttpApi" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.PermissionManagement.HttpApi" Version="7.2.2"/> <PackageReference Update="Volo.Abp.PermissionManagement.HttpApi" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.TenantManagement.HttpApi" Version="7.2.2"/> <PackageReference Update="Volo.Abp.TenantManagement.HttpApi" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.FeatureManagement.HttpApi" Version="7.2.2"/> <PackageReference Update="Volo.Abp.FeatureManagement.HttpApi" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.SettingManagement.HttpApi" Version="7.2.2"/> <PackageReference Update="Volo.Abp.SettingManagement.HttpApi" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Account.HttpApi.Client" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Account.HttpApi.Client" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Identity.HttpApi.Client" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Identity.HttpApi.Client" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.PermissionManagement.HttpApi.Client" Version="7.2.2"/> <PackageReference Update="Volo.Abp.PermissionManagement.HttpApi.Client" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.TenantManagement.HttpApi.Client" Version="7.2.2"/> <PackageReference Update="Volo.Abp.TenantManagement.HttpApi.Client" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.FeatureManagement.HttpApi.Client" Version="7.2.2"/> <PackageReference Update="Volo.Abp.FeatureManagement.HttpApi.Client" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.SettingManagement.HttpApi.Client" Version="7.2.2"/> <PackageReference Update="Volo.Abp.SettingManagement.HttpApi.Client" Version="7.3.2"/>
<PackageReference Update="Volo.Abp" Version="7.2.2"/> <PackageReference Update="Volo.Abp" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.AspNetCore" Version="7.2.2"/> <PackageReference Update="Volo.Abp.AspNetCore" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Core" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Core" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.EntityFrameworkCore" Version="7.2.2"/> <PackageReference Update="Volo.Abp.EntityFrameworkCore" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.AspNetCore.TestBase" Version="7.2.2"/> <PackageReference Update="Volo.Abp.AspNetCore.TestBase" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="7.2.2"/> <PackageReference Update="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.EventBus" Version="7.2.2"/> <PackageReference Update="Volo.Abp.EventBus" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Localization" Version="7.2.2" /> <PackageReference Update="Volo.Abp.Localization" Version="7.3.2" />
</ItemGroup> </ItemGroup>
</Project> </Project>

60
aspnet-core/Directory.Build.targets
View File

@ -22,43 +22,43 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Update="Humanizer.Core.zh-Hans" Version="2.14.1"/> <!-- Ocelot 网关-->
<PackageReference Update="NSubstitute" Version="4.2.2"/>
<PackageReference Update="Shouldly" Version="4.0.3"/>
<PackageReference Update="coverlet.collector" Version="3.1.0"/>
<PackageReference Update="JunitXml.TestLogger" Version="3.0.98"/>
<PackageReference Update="Mongo2Go" Version="3.1.3"/>
<PackageReference Update="NEST" Version="7.15.1"/>
<PackageReference Update="System.ComponentModel.Annotations" Version="6.0.0-preview.4.21253.7"/>
<PackageReference Update="Ocelot" Version="18.0.0"/> <PackageReference Update="Ocelot" Version="18.0.0"/>
<PackageReference Update="Ocelot.Provider.Consul" Version="18.0.0"/> <PackageReference Update="Ocelot.Provider.Consul" Version="18.0.0"/>
<PackageReference Update="Ocelot.Provider.Polly" Version="18.0.0"/> <PackageReference Update="Ocelot.Provider.Polly" Version="18.0.0"/>
<!-- FreeSql-->
<PackageReference Update="FreeSql" Version="3.2.682"/> <PackageReference Update="FreeSql" Version="3.2.682"/>
<PackageReference Update="FreeSql.Provider.MySql" Version="3.2.682"/> <PackageReference Update="FreeSql.Provider.MysqlConnector" Version="3.2.682"/>
<PackageReference Update="FreeSql.Provider.Sqlite" Version="3.2.682"/> <PackageReference Update="FreeSql.Provider.Sqlite" Version="3.2.682"/>
<!-- 单元测试包-->
<PackageReference Update="xunit" Version="2.4.1"/> <PackageReference Update="xunit" Version="2.4.1"/>
<PackageReference Update="xunit.extensibility.execution" Version="2.4.1"/> <PackageReference Update="xunit.extensibility.execution" Version="2.4.1"/>
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.5"/> <PackageReference Update="xunit.runner.visualstudio" Version="2.4.5"/>
<PackageReference Update="NSubstitute" Version="4.2.2"/>
<PackageReference Update="Shouldly" Version="4.0.3"/>
<PackageReference Update="coverlet.collector" Version="3.1.0"/>
<PackageReference Update="JunitXml.TestLogger" Version="3.0.98"/>
<PackageReference Update="AutoFixture.Xunit2" Version="4.17.0"/>
<PackageReference Update="Hangfire.Redis.StackExchange" Version="1.8.5"/> <!-- Hangfire 后台任务-->
<PackageReference Update="Hangfire.Redis.StackExchange" Version="1.9.0"/>
<PackageReference Update="DotNetCore.CAP" Version="7.0.2"/> <!-- CAP 分布式事务-->
<PackageReference Update="DotNetCore.CAP.Dashboard" Version="7.0.2"/> <PackageReference Update="DotNetCore.CAP" Version="7.2.0"/>
<PackageReference Update="DotNetCore.CAP.Mysql" Version="7.0.2"/> <PackageReference Update="DotNetCore.CAP.Dashboard" Version="7.2.0"/>
<PackageReference Update="DotNetCore.CAP.RabbitMQ" Version="7.0.2"/> <PackageReference Update="DotNetCore.CAP.Mysql" Version="7.2.0"/>
<PackageReference Update="DotNetCore.CAP.InMemoryStorage" Version="7.0.2"/> <PackageReference Update="DotNetCore.CAP.RabbitMQ" Version="7.2.0"/>
<PackageReference Update="DotNetCore.CAP.InMemoryStorage" Version="7.2.0"/>
<PackageReference Update="Savorboard.CAP.InMemoryMessageQueue" Version="7.0.0"/> <PackageReference Update="Savorboard.CAP.InMemoryMessageQueue" Version="7.0.0"/>
<!-- Swagger-->
<PackageReference Update="Swashbuckle.AspNetCore.SwaggerUI" Version="6.3.1"/> <PackageReference Update="Swashbuckle.AspNetCore.SwaggerUI" Version="6.3.1"/>
<PackageReference Update="Swashbuckle.AspNetCore" Version="6.3.1"/> <PackageReference Update="Swashbuckle.AspNetCore" Version="6.3.1"/>
<PackageReference Update="Swashbuckle.AspNetCore.Annotations" Version="6.3.1"/> <PackageReference Update="Swashbuckle.AspNetCore.Annotations" Version="6.3.1"/>
<!-- Serilog 日志-->
<PackageReference Update="Serilog" Version="2.11.0"/> <PackageReference Update="Serilog" Version="2.11.0"/>
<PackageReference Update="Serilog.Extensions.Logging" Version="3.1.0"/> <PackageReference Update="Serilog.Extensions.Logging" Version="3.1.0"/>
<PackageReference Update="Serilog.Sinks.Async" Version="1.5.0"/> <PackageReference Update="Serilog.Sinks.Async" Version="1.5.0"/>
@ -69,25 +69,25 @@
<PackageReference Update="Serilog.Settings.Configuration" Version="3.3.0"/> <PackageReference Update="Serilog.Settings.Configuration" Version="3.3.0"/>
<PackageReference Update="Serilog.Sinks.Elasticsearch" Version="8.4.1"/> <PackageReference Update="Serilog.Sinks.Elasticsearch" Version="8.4.1"/>
<!-- Magicodes 导入导出Excel-->
<PackageReference Update="Magicodes.IE.Excel" Version="2.7.0"/> <PackageReference Update="Magicodes.IE.Excel" Version="2.7.0"/>
<PackageReference Update="Magicodes.IE.Excel.AspNetCore" Version="2.7.0"/> <PackageReference Update="Magicodes.IE.Excel.AspNetCore" Version="2.7.0"/>
<!-- MiniProfiler 查看接口耗时,sql耗时-->
<PackageReference Update="MiniProfiler.AspNetCore.Mvc" Version="4.2.22"/> <PackageReference Update="MiniProfiler.AspNetCore.Mvc" Version="4.2.22"/>
<PackageReference Update="MiniProfiler.EntityFrameworkCore" Version="4.2.22"/> <PackageReference Update="MiniProfiler.EntityFrameworkCore" Version="4.2.22"/>
<PackageReference Update="MiniProfiler.Shared" Version="4.2.22"/> <PackageReference Update="MiniProfiler.Shared" Version="4.2.22"/>
<PackageReference Update="AutoFixture.Xunit2" Version="4.17.0"/> <!-- Polly 重试机制-->
<PackageReference Update="prometheus-net.AspNetCore" Version="5.0.2"/>
<PackageReference Update="Aliyun.OSS.SDK.NetCore" Version="2.13.0"/>
<PackageReference Update="Polly" Version="7.2.3"/> <PackageReference Update="Polly" Version="7.2.3"/>
<PackageReference Update="Confluent.Kafka" Version="1.8.2.0"/>
<PackageReference Update="Octokit" Version="2.0.0" />
<!-- Idenity 一下三个包升级到最新版导致鉴权不通过--> <!-- Octokit 邮件-->
<PackageReference Update="Microsoft.IdentityModel.Tokens" Version="6.10.0"/> <PackageReference Update="Octokit" Version="2.0.0"/>
<PackageReference Update="System.IdentityModel.Tokens.Jwt" Version="6.10.0"/>
<PackageReference Update="IdentityModel" Version="5.1.0"/> <!-- Humanizer 中文格式包-->
<PackageReference Update="Humanizer.Core.zh-Hans" Version="2.14.1"/>
<!-- NEST ElasticSearch-->
<PackageReference Update="NEST" Version="7.15.1"/>
</ItemGroup> </ItemGroup>
</Project> </Project>

7
aspnet-core/Lion.AbpPro.All.sln
View File

@ -398,6 +398,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lion.AbpPro.ElasticSearch.T
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lion.AbpPro.EntityFrameworkCore.Tests", "frameworks\test\Lion.AbpPro.EntityFrameworkCore.Mysql.Tests\Lion.AbpPro.EntityFrameworkCore.Tests.csproj", "{FFD342DF-87A5-4642-B694-58714C506883}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lion.AbpPro.EntityFrameworkCore.Tests", "frameworks\test\Lion.AbpPro.EntityFrameworkCore.Mysql.Tests\Lion.AbpPro.EntityFrameworkCore.Tests.csproj", "{FFD342DF-87A5-4642-B694-58714C506883}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lion.AbpPro.Starter", "frameworks\src\Lion.AbpPro.Starter\Lion.AbpPro.Starter.csproj", "{187AEDA5-8323-45B4-90F6-A2F5574DEB25}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
@ -948,6 +950,10 @@ Global
{FFD342DF-87A5-4642-B694-58714C506883}.Debug|Any CPU.Build.0 = Debug|Any CPU {FFD342DF-87A5-4642-B694-58714C506883}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FFD342DF-87A5-4642-B694-58714C506883}.Release|Any CPU.ActiveCfg = Release|Any CPU {FFD342DF-87A5-4642-B694-58714C506883}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FFD342DF-87A5-4642-B694-58714C506883}.Release|Any CPU.Build.0 = Release|Any CPU {FFD342DF-87A5-4642-B694-58714C506883}.Release|Any CPU.Build.0 = Release|Any CPU
{187AEDA5-8323-45B4-90F6-A2F5574DEB25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{187AEDA5-8323-45B4-90F6-A2F5574DEB25}.Debug|Any CPU.Build.0 = Debug|Any CPU
{187AEDA5-8323-45B4-90F6-A2F5574DEB25}.Release|Any CPU.ActiveCfg = Release|Any CPU
{187AEDA5-8323-45B4-90F6-A2F5574DEB25}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
@ -1128,6 +1134,7 @@ Global
{4E9F48F8-4EBB-4D47-BC10-35760EE4F645} = {7BE85EBC-99AD-4CDE-957E-4BDD087FC4E3} {4E9F48F8-4EBB-4D47-BC10-35760EE4F645} = {7BE85EBC-99AD-4CDE-957E-4BDD087FC4E3}
{A9824877-9F0C-4E33-BEFC-1DD62A365C75} = {EFC415F8-872F-4C7E-8645-31A51481BCFC} {A9824877-9F0C-4E33-BEFC-1DD62A365C75} = {EFC415F8-872F-4C7E-8645-31A51481BCFC}
{FFD342DF-87A5-4642-B694-58714C506883} = {EFC415F8-872F-4C7E-8645-31A51481BCFC} {FFD342DF-87A5-4642-B694-58714C506883} = {EFC415F8-872F-4C7E-8645-31A51481BCFC}
{187AEDA5-8323-45B4-90F6-A2F5574DEB25} = {7BE85EBC-99AD-4CDE-957E-4BDD087FC4E3}
EndGlobalSection EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {28315BFD-90E7-4E14-A2EA-F3D23AF4126F} SolutionGuid = {28315BFD-90E7-4E14-A2EA-F3D23AF4126F}

4
aspnet-core/frameworks/src/Lion.AbpPro.Core/Lion.AbpPro.Core.csproj
View File

@ -6,10 +6,6 @@
<RootNamespace /> <RootNamespace />
</PropertyGroup> </PropertyGroup>
<ItemGroup>
<PackageReference Include="System.ComponentModel.Annotations" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Lion.AbpPro.Localization\Lion.AbpPro.Localization.csproj" /> <ProjectReference Include="..\Lion.AbpPro.Localization\Lion.AbpPro.Localization.csproj" />
</ItemGroup> </ItemGroup>

1
aspnet-core/frameworks/src/Lion.AbpPro.EntityFrameworkCore/Lion.AbpPro.EntityFrameworkCore.csproj
View File

@ -5,6 +5,7 @@
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<RootNamespace /> <RootNamespace />
<NoWarn>CS8600;CS8601;CS8602;CS8603;CS8604;CS8618;CS8625;EF1001</NoWarn>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

70
aspnet-core/frameworks/test/Lion.AbpPro.EntityFrameworkCore.Mysql.Tests/Lion.AbpPro.EntityFrameworkCore.Tests.csproj
View File

@ -8,9 +8,9 @@
<NoWarn>CS8618;CS0162;CS1584</NoWarn> <NoWarn>CS8618;CS0162;CS1584</NoWarn>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <!-- <ItemGroup>-->
<PackageReference Include="GenFu" Version="1.6.0" /> <!-- <PackageReference Include="GenFu" Version="1.6.0" />-->
</ItemGroup> <!-- </ItemGroup>-->
<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" />
@ -21,59 +21,59 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="7.2.2" /> <PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="7.3.1" />
<PackageReference Include="Volo.Abp.Autofac" Version="7.2.2" /> <PackageReference Include="Volo.Abp.Autofac" Version="7.3.1" />
<PackageReference Include="Volo.Abp.AutoMapper" Version="7.2.2" /> <PackageReference Include="Volo.Abp.AutoMapper" Version="7.3.1" />
<PackageReference Include="Volo.Abp.Swashbuckle" Version="7.2.2" /> <PackageReference Include="Volo.Abp.Swashbuckle" Version="7.3.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="7.2.2" /> <PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="7.3.1" />
<PackageReference Include="Volo.Abp.EntityFrameworkCore.MySQL" Version="7.2.2" /> <PackageReference Include="Volo.Abp.EntityFrameworkCore.MySQL" Version="7.3.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Account.Application" Version="7.2.2" /> <PackageReference Include="Volo.Abp.Account.Application" Version="7.3.1" />
<PackageReference Include="Volo.Abp.Account.HttpApi" Version="7.2.2" /> <PackageReference Include="Volo.Abp.Account.HttpApi" Version="7.3.1" />
<PackageReference Include="Volo.Abp.Account.Web.OpenIddict" Version="7.2.2" /> <PackageReference Include="Volo.Abp.Account.Web.OpenIddict" Version="7.3.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.Identity" Version="7.2.2" /> <PackageReference Include="Volo.Abp.PermissionManagement.Domain.Identity" Version="7.3.1" />
<PackageReference Include="Volo.Abp.Identity.Application" Version="7.2.2" /> <PackageReference Include="Volo.Abp.Identity.Application" Version="7.3.1" />
<PackageReference Include="Volo.Abp.Identity.HttpApi" Version="7.2.2" /> <PackageReference Include="Volo.Abp.Identity.HttpApi" Version="7.3.1" />
<PackageReference Include="Volo.Abp.Identity.EntityFrameworkCore" Version="7.2.2" /> <PackageReference Include="Volo.Abp.Identity.EntityFrameworkCore" Version="7.3.1" />
<PackageReference Include="Volo.Abp.OpenIddict.EntityFrameworkCore" Version="7.2.2" /> <PackageReference Include="Volo.Abp.OpenIddict.EntityFrameworkCore" Version="7.3.1" />
<PackageReference Include="Volo.Abp.Identity.Web" Version="7.2.2" /> <PackageReference Include="Volo.Abp.Identity.Web" Version="7.3.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.OpenIddict" Version="7.2.2" /> <PackageReference Include="Volo.Abp.PermissionManagement.Domain.OpenIddict" Version="7.3.1" />
<PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="7.2.2" /> <PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="7.3.1" />
<PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="7.2.2" /> <PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="7.3.1" />
<PackageReference Include="Volo.Abp.PermissionManagement.HttpApi" Version="7.2.2" /> <PackageReference Include="Volo.Abp.PermissionManagement.HttpApi" Version="7.3.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.TenantManagement.Application" Version="7.2.2" /> <PackageReference Include="Volo.Abp.TenantManagement.Application" Version="7.3.1" />
<PackageReference Include="Volo.Abp.TenantManagement.EntityFrameworkCore" Version="7.2.2" /> <PackageReference Include="Volo.Abp.TenantManagement.EntityFrameworkCore" Version="7.3.1" />
<PackageReference Include="Volo.Abp.TenantManagement.HttpApi" Version="7.2.2" /> <PackageReference Include="Volo.Abp.TenantManagement.HttpApi" Version="7.3.1" />
<PackageReference Include="Volo.Abp.TenantManagement.Web" Version="7.2.2" /> <PackageReference Include="Volo.Abp.TenantManagement.Web" Version="7.3.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.FeatureManagement.Application" Version="7.2.2" /> <PackageReference Include="Volo.Abp.FeatureManagement.Application" Version="7.3.1" />
<PackageReference Include="Volo.Abp.FeatureManagement.EntityFrameworkCore" Version="7.2.2" /> <PackageReference Include="Volo.Abp.FeatureManagement.EntityFrameworkCore" Version="7.3.1" />
<PackageReference Include="Volo.Abp.FeatureManagement.HttpApi" Version="7.2.2" /> <PackageReference Include="Volo.Abp.FeatureManagement.HttpApi" Version="7.3.1" />
<PackageReference Include="Volo.Abp.FeatureManagement.Web" Version="7.2.2" /> <PackageReference Include="Volo.Abp.FeatureManagement.Web" Version="7.3.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.SettingManagement.Application" Version="7.2.2" /> <PackageReference Include="Volo.Abp.SettingManagement.Application" Version="7.3.1" />
<PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="7.2.2" /> <PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="7.3.1" />
<PackageReference Include="Volo.Abp.SettingManagement.HttpApi" Version="7.2.2" /> <PackageReference Include="Volo.Abp.SettingManagement.HttpApi" Version="7.3.1" />
<PackageReference Include="Volo.Abp.SettingManagement.Web" Version="7.2.2" /> <PackageReference Include="Volo.Abp.SettingManagement.Web" Version="7.3.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="7.2.2" /> <PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="7.3.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

268
aspnet-core/frameworks/test/Lion.AbpPro.EntityFrameworkCore.Mysql.Tests/Services/BlogAppService.cs
View File

@ -1,134 +1,134 @@
using System.Diagnostics; // using System.Diagnostics;
using Lion.AbpPro.EntityFrameworkCore.Tests.Blogs; // using Lion.AbpPro.EntityFrameworkCore.Tests.Blogs;
using Lion.AbpPro.EntityFrameworkCore.Tests.Entities.Blogs; // using Lion.AbpPro.EntityFrameworkCore.Tests.Entities.Blogs;
using Microsoft.EntityFrameworkCore; // using Microsoft.EntityFrameworkCore;
using Volo.Abp; // using Volo.Abp;
using Volo.Abp.Application.Services; // using Volo.Abp.Application.Services;
using Volo.Abp.Domain.Repositories; // using Volo.Abp.Domain.Repositories;
using Volo.Abp.Identity; // using Volo.Abp.Identity;
using Volo.Abp.Uow; // using Volo.Abp.Uow;
//
namespace Lion.AbpPro.EntityFrameworkCore.Tests.Services; // namespace Lion.AbpPro.EntityFrameworkCore.Tests.Services;
//
public class BlogAppService : ApplicationService // public class BlogAppService : ApplicationService
{ // {
private readonly IBlogRepository _blogRepository; // private readonly IBlogRepository _blogRepository;
private readonly IRepository<Post, Guid> _postRepository; // private readonly IRepository<Post, Guid> _postRepository;
private readonly IRepository<Comment, Guid> _commentRepository; // private readonly IRepository<Comment, Guid> _commentRepository;
private readonly IdentityRoleManager _identityRoleManager; // private readonly IdentityRoleManager _identityRoleManager;
//
public BlogAppService(IBlogRepository blogRepository, IdentityRoleManager identityRoleManager, IRepository<Post, Guid> postRepository, IRepository<Comment, Guid> commentRepository) // public BlogAppService(IBlogRepository blogRepository, IdentityRoleManager identityRoleManager, IRepository<Post, Guid> postRepository, IRepository<Comment, Guid> commentRepository)
{ // {
_blogRepository = blogRepository; // _blogRepository = blogRepository;
_identityRoleManager = identityRoleManager; // _identityRoleManager = identityRoleManager;
_postRepository = postRepository; // _postRepository = postRepository;
_commentRepository = commentRepository; // _commentRepository = commentRepository;
} // }
//
//
/// <summary> // /// <summary>
/// 批量插入10000条数据 // /// 批量插入10000条数据
/// </summary> // /// </summary>
public async Task CreateAsync(int qty = 10000) // public async Task CreateAsync(int qty = 10000)
{ // {
// mock 数据 // // mock 数据
var list = GenFu.GenFu.ListOf<Blog>(qty); // var list = GenFu.GenFu.ListOf<Blog>(qty);
var stopwatch = new Stopwatch(); // var stopwatch = new Stopwatch();
stopwatch.Start(); // stopwatch.Start();
await _blogRepository.InsertManyAsync(list); // await _blogRepository.InsertManyAsync(list);
stopwatch.Stop(); // stopwatch.Stop();
Logger.LogInformation($"批量插入{list.Count}条,耗时(单位:毫秒):{stopwatch.ElapsedMilliseconds}"); // Logger.LogInformation($"批量插入{list.Count}条,耗时(单位:毫秒):{stopwatch.ElapsedMilliseconds}");
} // }
//
/// <summary> // /// <summary>
/// 批量插入10000条数据 // /// 批量插入10000条数据
/// </summary> // /// </summary>
public async Task CreateAllAsync(int qty = 10000) // public async Task CreateAllAsync(int qty = 10000)
{ // {
// mock 数据 // // mock 数据
var blogs = GenFu.GenFu.ListOf<Blog>(qty); // var blogs = GenFu.GenFu.ListOf<Blog>(qty);
var posts = new List<Post>(); // var posts = new List<Post>();
var comments = new List<Comment>(); // var comments = new List<Comment>();
// blog和post一对多,post和comment一对多 // // blog和post一对多,post和comment一对多
// 有主外键关系,所以循环mock数据 // // 有主外键关系,所以循环mock数据
foreach (var blog in blogs) // foreach (var blog in blogs)
{ // {
posts.Add(new Post(GuidGenerator.Create(), blog.Id, "name")); // posts.Add(new Post(GuidGenerator.Create(), blog.Id, "name"));
} // }
//
//
foreach (var post in posts) // foreach (var post in posts)
{ // {
comments.Add(new Comment(GuidGenerator.Create(), 1, post.Id, "content")); // comments.Add(new Comment(GuidGenerator.Create(), 1, post.Id, "content"));
} // }
//
var stopwatch = new Stopwatch(); // var stopwatch = new Stopwatch();
stopwatch.Start(); // stopwatch.Start();
// 需要执行三次,不会因为ef有定义关系而一次性插入posts和comments // // 需要执行三次,不会因为ef有定义关系而一次性插入posts和comments
await _blogRepository.InsertManyAsync(blogs); // await _blogRepository.InsertManyAsync(blogs);
await _postRepository.InsertManyAsync(posts); // await _postRepository.InsertManyAsync(posts);
await _commentRepository.InsertManyAsync(comments); // await _commentRepository.InsertManyAsync(comments);
stopwatch.Stop(); // stopwatch.Stop();
Logger.LogInformation($"批量插入blogs:{blogs.Count},posts:{posts.Count},comments:{comments.Count}条,耗时(单位:毫秒):{stopwatch.ElapsedMilliseconds}"); // Logger.LogInformation($"批量插入blogs:{blogs.Count},posts:{posts.Count},comments:{comments.Count}条,耗时(单位:毫秒):{stopwatch.ElapsedMilliseconds}");
} // }
//
/// <summary> // /// <summary>
/// 批量插入10000条数据,并且测试事务是否和其它业务逻辑保持一致 // /// 批量插入10000条数据,并且测试事务是否和其它业务逻辑保持一致
/// 测试结果：在一个事务内 // /// 测试结果：在一个事务内
/// </summary> // /// </summary>
public async Task CreateTransactionAsync(int qty = 10) // public async Task CreateTransactionAsync(int qty = 10)
{ // {
var list = GenFu.GenFu.ListOf<Blog>(qty); // var list = GenFu.GenFu.ListOf<Blog>(qty);
var stopwatch = new Stopwatch(); // var stopwatch = new Stopwatch();
stopwatch.Start(); // stopwatch.Start();
await _blogRepository.InsertManyAsync(list); // await _blogRepository.InsertManyAsync(list);
stopwatch.Stop(); // stopwatch.Stop();
Logger.LogInformation($"批量插入{list.Count}条,耗时(单位:毫秒):{stopwatch.ElapsedMilliseconds}"); // Logger.LogInformation($"批量插入{list.Count}条,耗时(单位:毫秒):{stopwatch.ElapsedMilliseconds}");
await _identityRoleManager.CreateAsync(new IdentityRole(GuidGenerator.Create(), GuidGenerator.Create().ToString())); // await _identityRoleManager.CreateAsync(new IdentityRole(GuidGenerator.Create(), GuidGenerator.Create().ToString()));
throw new UserFriendlyException("test"); // throw new UserFriendlyException("test");
} // }
//
/// <summary> // /// <summary>
/// 批量更新 // /// 批量更新
/// <see cref="https://learn.microsoft.com/zh-cn/ef/core/saving/execute-insert-update-delete"/> // /// <see cref="https://learn.microsoft.com/zh-cn/ef/core/saving/execute-insert-update-delete"/>
/// </summary> // /// </summary>
public async Task BatchUpdateAsync(int qty = 10000) // public async Task BatchUpdateAsync(int qty = 10000)
{ // {
using (var uow = UnitOfWorkManager.Begin(new AbpUnitOfWorkOptions(true), true)) // using (var uow = UnitOfWorkManager.Begin(new AbpUnitOfWorkOptions(true), true))
{ // {
var list = GenFu.GenFu.ListOf<Blog>(qty); // var list = GenFu.GenFu.ListOf<Blog>(qty);
await _blogRepository.InsertManyAsync(list); // await _blogRepository.InsertManyAsync(list);
await uow.CompleteAsync(); // await uow.CompleteAsync();
} // }
//
var stopwatch = new Stopwatch(); // var stopwatch = new Stopwatch();
stopwatch.Start(); // stopwatch.Start();
var dbSet = await _blogRepository.GetDbSetAsync(); // var dbSet = await _blogRepository.GetDbSetAsync();
await dbSet.ExecuteUpdateAsync(setters => setters // await dbSet.ExecuteUpdateAsync(setters => setters
.SetProperty(x => x.IsDeleted, x => true) // .SetProperty(x => x.IsDeleted, x => true)
.SetProperty(x => x.Name, x => "test")); // .SetProperty(x => x.Name, x => "test"));
stopwatch.Stop(); // stopwatch.Stop();
Logger.LogInformation($"批量更新{qty}条,耗时(单位:毫秒):{stopwatch.ElapsedMilliseconds}"); // Logger.LogInformation($"批量更新{qty}条,耗时(单位:毫秒):{stopwatch.ElapsedMilliseconds}");
} // }
//
/// <summary> // /// <summary>
/// 批量删除 // /// 批量删除
/// <see cref="https://learn.microsoft.com/zh-cn/ef/core/saving/execute-insert-update-delete"/> // /// <see cref="https://learn.microsoft.com/zh-cn/ef/core/saving/execute-insert-update-delete"/>
/// </summary> // /// </summary>
public async Task BatchDeleteAsync(int qty = 10000) // public async Task BatchDeleteAsync(int qty = 10000)
{ // {
using (var uow = UnitOfWorkManager.Begin(new AbpUnitOfWorkOptions(true), true)) // using (var uow = UnitOfWorkManager.Begin(new AbpUnitOfWorkOptions(true), true))
{ // {
var list = GenFu.GenFu.ListOf<Blog>(qty); // var list = GenFu.GenFu.ListOf<Blog>(qty);
await _blogRepository.InsertManyAsync(list); // await _blogRepository.InsertManyAsync(list);
await uow.CompleteAsync(); // await uow.CompleteAsync();
} // }
//
var stopwatch = new Stopwatch(); // var stopwatch = new Stopwatch();
stopwatch.Start(); // stopwatch.Start();
var dbSet = await _blogRepository.GetDbSetAsync(); // var dbSet = await _blogRepository.GetDbSetAsync();
await dbSet.ExecuteDeleteAsync(); // await dbSet.ExecuteDeleteAsync();
stopwatch.Stop(); // stopwatch.Stop();
Logger.LogInformation($"批量删除{qty}条,耗时(单位:毫秒):{stopwatch.ElapsedMilliseconds}"); // Logger.LogInformation($"批量删除{qty}条,耗时(单位:毫秒):{stopwatch.ElapsedMilliseconds}");
} // }
} // }

1
aspnet-core/modules/BasicManagement/host/Lion.AbpPro.BasicManagement.HttpApi.Host/Lion.AbpPro.BasicManagement.HttpApi.Host.csproj
View File

@ -10,7 +10,6 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Serilog.AspNetCore" /> <PackageReference Include="Serilog.AspNetCore" />
<PackageReference Include="Serilog.Sinks.Async" /> <PackageReference Include="Serilog.Sinks.Async" />
<PackageReference Include="IdentityModel" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" /> <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" /> <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" />

6
aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application/Lion.AbpPro.BasicManagement.Application.csproj
View File

@ -16,9 +16,9 @@
<PackageReference Include="Volo.Abp.TenantManagement.Application" /> <PackageReference Include="Volo.Abp.TenantManagement.Application" />
<PackageReference Include="Volo.Abp.FeatureManagement.Application" /> <PackageReference Include="Volo.Abp.FeatureManagement.Application" />
<PackageReference Include="Volo.Abp.SettingManagement.Application" /> <PackageReference Include="Volo.Abp.SettingManagement.Application" />
<PackageReference Include="Microsoft.IdentityModel.Tokens" /> <!-- <PackageReference Include="Microsoft.IdentityModel.Tokens" />-->
<PackageReference Include="System.IdentityModel.Tokens.Jwt" /> <!-- <PackageReference Include="System.IdentityModel.Tokens.Jwt" />-->
<PackageReference Include="IdentityModel" /> <!-- <PackageReference Include="IdentityModel" />-->
<PackageReference Include="Magicodes.IE.Excel.AspNetCore" /> <PackageReference Include="Magicodes.IE.Excel.AspNetCore" />
<ProjectReference Include="..\Lion.AbpPro.BasicManagement.Application.Contracts\Lion.AbpPro.BasicManagement.Application.Contracts.csproj" /> <ProjectReference Include="..\Lion.AbpPro.BasicManagement.Application.Contracts\Lion.AbpPro.BasicManagement.Application.Contracts.csproj" />
<ProjectReference Include="..\Lion.AbpPro.BasicManagement.Domain\Lion.AbpPro.BasicManagement.Domain.csproj" /> <ProjectReference Include="..\Lion.AbpPro.BasicManagement.Domain\Lion.AbpPro.BasicManagement.Domain.csproj" />

2
aspnet-core/modules/FileManagement/host/Lion.AbpPro.FileManagement.HttpApi.Host/Lion.AbpPro.FileManagement.HttpApi.Host.csproj
View File

@ -17,7 +17,7 @@
<PackageReference Include="Serilog.Sinks.Console" /> <PackageReference Include="Serilog.Sinks.Console" />
<PackageReference Include="Serilog.Sinks.Elasticsearch" /> <PackageReference Include="Serilog.Sinks.Elasticsearch" />
<PackageReference Include="Serilog.Sinks.File" /> <PackageReference Include="Serilog.Sinks.File" />
<PackageReference Include="IdentityModel" /> <!-- <PackageReference Include="IdentityModel" />-->
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" /> <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" /> <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" />

1
aspnet-core/modules/NotificationManagement/host/Lion.AbpPro.NotificationManagement.HttpApi.Host/Lion.AbpPro.NotificationManagement.HttpApi.Host.csproj
View File

@ -18,7 +18,6 @@
<PackageReference Include="Serilog.Sinks.Console" /> <PackageReference Include="Serilog.Sinks.Console" />
<PackageReference Include="Serilog.Sinks.Elasticsearch" /> <PackageReference Include="Serilog.Sinks.Elasticsearch" />
<PackageReference Include="Serilog.Sinks.File" /> <PackageReference Include="Serilog.Sinks.File" />
<PackageReference Include="IdentityModel" Version="5.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" /> <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" /> <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" />

2
aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/AbpProHttpApiHostModule.Configure.cs
View File

@ -112,7 +112,7 @@ public partial class AbpProHttpApiHostModule
Configure<AbpDistributedCacheOptions>( Configure<AbpDistributedCacheOptions>(
options => { options.KeyPrefix = "AbpPro:"; }); options => { options.KeyPrefix = "AbpPro:"; });
var configuration = context.Services.GetConfiguration(); var configuration = context.Services.GetConfiguration();
var redis = ConnectionMultiplexer.Connect(configuration["Redis:Configuration"]); var redis = ConnectionMultiplexer.Connect(configuration.GetValue<string>("Redis:Configuration"));
context.Services context.Services
.AddDataProtection() .AddDataProtection()
.PersistKeysToStackExchangeRedis(redis, "AbpPro-Protection-Keys"); .PersistKeysToStackExchangeRedis(redis, "AbpPro-Protection-Keys");

5
aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/Extensions/Hangfire/RecurringJobsExtensions.cs
View File

@ -6,7 +6,10 @@ namespace Lion.AbpPro.Extensions.Hangfire
{ {
public static void CreateRecurringJob(this ApplicationInitializationContext context) public static void CreateRecurringJob(this ApplicationInitializationContext context)
{ {
RecurringJob.AddOrUpdate<TestJob>("测试Job", t => t.ExecuteAsync(), CronType.Minute(1),TimeZoneInfo.Local); RecurringJob.AddOrUpdate<TestJob>("测试Job", e => e.ExecuteAsync(), CronType.Minute(1), new RecurringJobOptions()
{
TimeZone = TimeZoneInfo.Local
});
} }
} }
} }

1
aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/GlobalUsings.cs
View File

@ -11,6 +11,7 @@ global using Hangfire;
global using Hangfire.Common; global using Hangfire.Common;
global using Hangfire.Dashboard; global using Hangfire.Dashboard;
global using Hangfire.Redis; global using Hangfire.Redis;
global using Hangfire.Redis.StackExchange;
global using Hangfire.States; global using Hangfire.States;
global using Hangfire.Storage; global using Hangfire.Storage;
global using Lion.AbpPro.CAP; global using Lion.AbpPro.CAP;

1
aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/Lion.AbpPro.HttpApi.Host.csproj
View File

@ -9,7 +9,6 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" /> <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" /> <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" />
<PackageReference Include="Volo.Abp.Account.Web" /> <PackageReference Include="Volo.Abp.Account.Web" />

1
aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/Startup.cs
View File

@ -25,6 +25,7 @@ namespace Lion.AbpPro
/// <summary> /// <summary>
/// 程序首次访问接口速度慢，事先预热 /// 程序首次访问接口速度慢，事先预热
/// </summary> /// </summary>
[Obsolete("请使用Lion.AbpPro.Starter模块,实现IAbpProStarterContributor")]
private void ConfigurePreheat() private void ConfigurePreheat()
{ {
var url = _configuration.GetValue<string>("App:SelfUrl"); var url = _configuration.GetValue<string>("App:SelfUrl");

2
aspnet-core/services/src/Lion.AbpPro.FreeSqlRepository/Lion.AbpPro.FreeSqlRepository.csproj
View File

@ -7,7 +7,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="FreeSql" /> <PackageReference Include="FreeSql" />
<PackageReference Include="FreeSql.Provider.MySql" /> <PackageReference Include="FreeSql.Provider.MysqlConnector" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

6
aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/GlobalUsings.cs
View File

@ -9,7 +9,9 @@ global using System.Reflection;
global using System.Text; global using System.Text;
global using System.Text.RegularExpressions; global using System.Text.RegularExpressions;
global using Consul; global using Consul;
global using Lion.AbpPro;
global using Lion.AbpPro.Core; global using Lion.AbpPro.Core;
global using Lion.AbpPro.Localization;
global using Microsoft.AspNetCore.Builder; global using Microsoft.AspNetCore.Builder;
global using Microsoft.AspNetCore.Cors; global using Microsoft.AspNetCore.Cors;
global using Microsoft.AspNetCore.Http; global using Microsoft.AspNetCore.Http;
@ -18,9 +20,11 @@ global using Microsoft.AspNetCore.Mvc;
global using Microsoft.AspNetCore.Mvc.Abstractions; global using Microsoft.AspNetCore.Mvc.Abstractions;
global using Microsoft.AspNetCore.Mvc.ApiExplorer; global using Microsoft.AspNetCore.Mvc.ApiExplorer;
global using Microsoft.AspNetCore.Mvc.Filters; global using Microsoft.AspNetCore.Mvc.Filters;
global using Microsoft.EntityFrameworkCore;
global using Microsoft.Extensions.Configuration; global using Microsoft.Extensions.Configuration;
global using Microsoft.Extensions.DependencyInjection; global using Microsoft.Extensions.DependencyInjection;
global using Microsoft.Extensions.Hosting; global using Microsoft.Extensions.Hosting;
global using Microsoft.Extensions.Localization;
global using Microsoft.Extensions.Logging; global using Microsoft.Extensions.Logging;
global using Microsoft.Extensions.Logging.Abstractions; global using Microsoft.Extensions.Logging.Abstractions;
global using Microsoft.Extensions.Options; global using Microsoft.Extensions.Options;
@ -36,6 +40,7 @@ global using Volo.Abp;
global using Volo.Abp.AspNetCore.ExceptionHandling; global using Volo.Abp.AspNetCore.ExceptionHandling;
global using Volo.Abp.AspNetCore.Mvc; global using Volo.Abp.AspNetCore.Mvc;
global using Volo.Abp.AspNetCore.Mvc.AntiForgery; global using Volo.Abp.AspNetCore.Mvc.AntiForgery;
global using Volo.Abp.AspNetCore.Mvc.ExceptionHandling;
global using Volo.Abp.Authorization; global using Volo.Abp.Authorization;
global using Volo.Abp.Autofac; global using Volo.Abp.Autofac;
global using Volo.Abp.DependencyInjection; global using Volo.Abp.DependencyInjection;
@ -44,6 +49,7 @@ global using Volo.Abp.ExceptionHandling;
global using Volo.Abp.Http; global using Volo.Abp.Http;
global using Volo.Abp.Json; global using Volo.Abp.Json;
global using Volo.Abp.Localization; global using Volo.Abp.Localization;
global using Volo.Abp.Localization.ExceptionHandling;
global using Volo.Abp.Modularity; global using Volo.Abp.Modularity;
global using Volo.Abp.Swashbuckle; global using Volo.Abp.Swashbuckle;
global using Volo.Abp.UI.Navigation.Urls; global using Volo.Abp.UI.Navigation.Urls;

100
aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/Microsoft/AspNetCore/Mvc/Filters/AbpProExceptionFilter.cs
View File

@ -1,40 +1,53 @@
using System.Text;
using Lion.AbpPro;
using Lion.AbpPro.Localization;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Localization;
using Volo.Abp.Localization.ExceptionHandling;
namespace Microsoft.AspNetCore.Mvc.Filters; namespace Microsoft.AspNetCore.Mvc.Filters;
public sealed class AbpProExceptionFilter : IAsyncExceptionFilter, ITransientDependency [Dependency(ReplaceServices = true)]
[ExposeServices(typeof(AbpExceptionFilter))]
public class AbpProExceptionFilter : AbpExceptionFilter
{ {
public async Task OnExceptionAsync(ExceptionContext context) protected override bool ShouldHandleException(ExceptionContext context)
{ {
if (!ShouldHandleException(context)) return IsWrapResult(context) || base.ShouldHandleException(context);
{ }
return;
}
await HandleAndWrapException(context); protected override async Task HandleAndWrapException(ExceptionContext context)
{
LoggerException(context);
if (WrapResultHandler(context)) return;
await DefaultHandlerAsync(context);
} }
private bool ShouldHandleException(ExceptionContext context) private void LoggerException(ExceptionContext context)
{ {
if (context.ActionDescriptor.AsControllerActionDescriptor().ControllerTypeInfo.GetCustomAttributes(typeof(WrapResultAttribute), true).Any()) var exceptionHandlingOptions = context.GetRequiredService<IOptions<AbpExceptionHandlingOptions>>().Value;
var exceptionToErrorInfoConverter = context.GetRequiredService<IExceptionToErrorInfoConverter>();
var remoteServiceErrorInfo = exceptionToErrorInfoConverter.Convert(context.Exception, options =>
{ {
return true; options.SendExceptionsDetailsToClients = exceptionHandlingOptions.SendExceptionsDetailsToClients;
} options.SendStackTraceToClients = exceptionHandlingOptions.SendStackTraceToClients;
});
if (context.ActionDescriptor.GetMethodInfo().GetCustomAttributes(typeof(WrapResultAttribute), true).Any()) var logger = context.GetService<ILogger<AbpExceptionFilter>>(NullLogger<AbpExceptionFilter>.Instance)!;
{ var logLevel = context.Exception.GetLogLevel();
return true; logger.LogException(context.Exception, logLevel);
} }
return false; /// <summary>
/// webapi有WrapResult特性标签处理逻辑
/// </summary>
private bool WrapResultHandler(ExceptionContext context)
{
if (!IsWrapResult(context)) return false;
context.HttpContext.Response.StatusCode = 200;
var result = SimplifyMessage(context);
context.Result = new ObjectResult(result);
return true;
} }
private async Task HandleAndWrapException(ExceptionContext context) /// <summary>
/// 默认异常处理逻辑
/// </summary>
private async Task DefaultHandlerAsync(ExceptionContext context)
{ {
var exceptionHandlingOptions = context.GetRequiredService<IOptions<AbpExceptionHandlingOptions>>().Value; var exceptionHandlingOptions = context.GetRequiredService<IOptions<AbpExceptionHandlingOptions>>().Value;
var exceptionToErrorInfoConverter = context.GetRequiredService<IExceptionToErrorInfoConverter>(); var exceptionToErrorInfoConverter = context.GetRequiredService<IExceptionToErrorInfoConverter>();
@ -44,23 +57,34 @@ public sealed class AbpProExceptionFilter : IAsyncExceptionFilter, ITransientDep
options.SendStackTraceToClients = exceptionHandlingOptions.SendStackTraceToClients; options.SendStackTraceToClients = exceptionHandlingOptions.SendStackTraceToClients;
}); });
var logLevel = context.Exception.GetLogLevel(); if (context.Exception is AbpAuthorizationException)
{
var remoteServiceErrorInfoBuilder = new StringBuilder(); await context.HttpContext.RequestServices.GetRequiredService<IAbpAuthorizationExceptionHandler>()
remoteServiceErrorInfoBuilder.AppendLine($"---------- {nameof(RemoteServiceErrorInfo)} ----------"); .HandleAsync(context.Exception.As<AbpAuthorizationException>(), context.HttpContext);
remoteServiceErrorInfoBuilder.AppendLine(context.GetRequiredService<IJsonSerializer>().Serialize(remoteServiceErrorInfo, indented: true)); }
else
var logger = context.GetService<ILogger<AbpProExceptionFilter>>(NullLogger<AbpProExceptionFilter>.Instance); {
context.HttpContext.Response.Headers.Add(AbpHttpConsts.AbpErrorFormat, "true");
context.HttpContext.Response.StatusCode = (int)context
.GetRequiredService<IHttpExceptionStatusCodeFinder>()
.GetStatusCode(context.HttpContext, context.Exception);
context.Result = new ObjectResult(new RemoteServiceErrorResponse(remoteServiceErrorInfo));
}
}
logger.LogWithLevel(logLevel, remoteServiceErrorInfoBuilder.ToString()); private bool IsWrapResult(ExceptionContext context)
{
if (context.ActionDescriptor.AsControllerActionDescriptor().ControllerTypeInfo.GetCustomAttributes(typeof(WrapResultAttribute), true).Any())
{
return true;
}
logger.LogException(context.Exception, logLevel); if (context.ActionDescriptor.GetMethodInfo().GetCustomAttributes(typeof(WrapResultAttribute), true).Any())
{
return true;
}
await context.GetRequiredService<IExceptionNotifier>().NotifyAsync(new ExceptionNotificationContext(context.Exception)); return false;
context.HttpContext.Response.StatusCode = 200;
var result = SimplifyMessage(context);
context.Result = new ObjectResult(result);
context.Exception = null; //Handled!
} }
private WrapResult<object> SimplifyMessage(ExceptionContext context) private WrapResult<object> SimplifyMessage(ExceptionContext context)

176
templates/abp-vnext-pro-nuget-all/aspnet-core/Directory.Build.Volo.targets
View File

@ -1,93 +1,93 @@
<Project> <Project>
<!-- Volo.Abp官方包--> <!-- Volo.Abp官方包-->
<ItemGroup> <ItemGroup>
<PackageReference Update="Volo.Abp.Autofac" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Autofac" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Json" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Json" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Validation" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Validation" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Ddd.Domain" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Ddd.Domain" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.AutoMapper" Version="7.2.2"/> <PackageReference Update="Volo.Abp.AutoMapper" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.ObjectMapping" Version="7.2.2"/> <PackageReference Update="Volo.Abp.ObjectMapping" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Identity.AspNetCore" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Identity.AspNetCore" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Caching" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Caching" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.BlobStoring.Aliyun" Version="7.2.2"/> <PackageReference Update="Volo.Abp.BlobStoring.Aliyun" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.BackgroundJobs" Version="7.2.2"/> <PackageReference Update="Volo.Abp.BackgroundJobs" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.BackgroundJobs.HangFire" Version="7.2.2"/> <PackageReference Update="Volo.Abp.BackgroundJobs.HangFire" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.AspNetCore.SignalR" Version="7.2.2"/> <PackageReference Update="Volo.Abp.AspNetCore.SignalR" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.TestBase" Version="7.2.2"/> <PackageReference Update="Volo.Abp.TestBase" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.EntityFrameworkCore.MySQL" Version="7.2.2"/> <PackageReference Update="Volo.Abp.EntityFrameworkCore.MySQL" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="7.2.2"/> <PackageReference Update="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="7.2.2"/> <PackageReference Update="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Identity.EntityFrameworkCore" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Identity.EntityFrameworkCore" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.BackgroundJobs.EntityFrameworkCore" Version="7.2.2"/> <PackageReference Update="Volo.Abp.BackgroundJobs.EntityFrameworkCore" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="7.2.2"/> <PackageReference Update="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.TenantManagement.EntityFrameworkCore" Version="7.2.2"/> <PackageReference Update="Volo.Abp.TenantManagement.EntityFrameworkCore" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.FeatureManagement.EntityFrameworkCore" Version="7.2.2"/> <PackageReference Update="Volo.Abp.FeatureManagement.EntityFrameworkCore" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.AspNetCore.Authentication.JwtBearer" Version="7.2.2"/> <PackageReference Update="Volo.Abp.AspNetCore.Authentication.JwtBearer" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.AspNetCore.Mvc.Contracts" Version="7.2.2"/> <PackageReference Update="Volo.Abp.AspNetCore.Mvc.Contracts" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Account.Web" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Account.Web" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Caching.StackExchangeRedis" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Caching.StackExchangeRedis" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy" Version="7.2.2"/> <PackageReference Update="Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.EntityFrameworkCore.PostgreSql" Version="7.2.2"/> <PackageReference Update="Volo.Abp.EntityFrameworkCore.PostgreSql" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.AspNetCore.Serilog" Version="7.2.2"/> <PackageReference Update="Volo.Abp.AspNetCore.Serilog" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Swashbuckle" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Swashbuckle" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Ddd.Application" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Ddd.Application" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Ddd.Application.Contracts" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Ddd.Application.Contracts" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Authorization" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Authorization" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Dapper" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Dapper" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.AspNetCore.Mvc" Version="7.2.2"/> <PackageReference Update="Volo.Abp.AspNetCore.Mvc" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Http.Client" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Http.Client" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.MongoDB" Version="7.2.2"/> <PackageReference Update="Volo.Abp.MongoDB" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.EntityFrameworkCore.Sqlite" Version="7.2.2"/> <PackageReference Update="Volo.Abp.EntityFrameworkCore.Sqlite" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Http.Client.IdentityModel" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Http.Client.IdentityModel" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.AspNetCore.MultiTenancy" Version="7.2.2"/> <PackageReference Update="Volo.Abp.AspNetCore.MultiTenancy" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Account.Application" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Account.Application" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Identity.Application" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Identity.Application" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.PermissionManagement.Application" Version="7.2.2"/> <PackageReference Update="Volo.Abp.PermissionManagement.Application" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.TenantManagement.Application" Version="7.2.2"/> <PackageReference Update="Volo.Abp.TenantManagement.Application" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.FeatureManagement.Application" Version="7.2.2"/> <PackageReference Update="Volo.Abp.FeatureManagement.Application" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.SettingManagement.Application" Version="7.2.2"/> <PackageReference Update="Volo.Abp.SettingManagement.Application" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.ObjectExtending" Version="7.2.2"/> <PackageReference Update="Volo.Abp.ObjectExtending" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Account.Application.Contracts" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Account.Application.Contracts" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Identity.Application.Contracts" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Identity.Application.Contracts" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.PermissionManagement.Application.Contracts" Version="7.2.2"/> <PackageReference Update="Volo.Abp.PermissionManagement.Application.Contracts" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.TenantManagement.Application.Contracts" Version="7.2.2"/> <PackageReference Update="Volo.Abp.TenantManagement.Application.Contracts" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.FeatureManagement.Application.Contracts" Version="7.2.2"/> <PackageReference Update="Volo.Abp.FeatureManagement.Application.Contracts" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.SettingManagement.Application.Contracts" Version="7.2.2"/> <PackageReference Update="Volo.Abp.SettingManagement.Application.Contracts" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Emailing" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Emailing" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.PermissionManagement.Domain.Identity" Version="7.2.2"/> <PackageReference Update="Volo.Abp.PermissionManagement.Domain.Identity" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.BackgroundJobs.Domain" Version="7.2.2"/> <PackageReference Update="Volo.Abp.BackgroundJobs.Domain" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.AuditLogging.Domain" Version="7.2.2"/> <PackageReference Update="Volo.Abp.AuditLogging.Domain" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.TenantManagement.Domain" Version="7.2.2"/> <PackageReference Update="Volo.Abp.TenantManagement.Domain" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.FeatureManagement.Domain" Version="7.2.2"/> <PackageReference Update="Volo.Abp.FeatureManagement.Domain" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.SettingManagement.Domain" Version="7.2.2"/> <PackageReference Update="Volo.Abp.SettingManagement.Domain" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Identity.Domain" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Identity.Domain" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Identity.Domain.Shared" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Identity.Domain.Shared" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.BackgroundJobs.Domain.Shared" Version="7.2.2"/> <PackageReference Update="Volo.Abp.BackgroundJobs.Domain.Shared" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.AuditLogging.Domain.Shared" Version="7.2.2"/> <PackageReference Update="Volo.Abp.AuditLogging.Domain.Shared" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.TenantManagement.Domain.Shared" Version="7.2.2"/> <PackageReference Update="Volo.Abp.TenantManagement.Domain.Shared" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.FeatureManagement.Domain.Shared" Version="7.2.2"/> <PackageReference Update="Volo.Abp.FeatureManagement.Domain.Shared" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.PermissionManagement.Domain.Shared" Version="7.2.2"/> <PackageReference Update="Volo.Abp.PermissionManagement.Domain.Shared" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.SettingManagement.Domain.Shared" Version="7.2.2"/> <PackageReference Update="Volo.Abp.SettingManagement.Domain.Shared" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Account.HttpApi" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Account.HttpApi" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Identity.HttpApi" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Identity.HttpApi" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.PermissionManagement.HttpApi" Version="7.2.2"/> <PackageReference Update="Volo.Abp.PermissionManagement.HttpApi" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.TenantManagement.HttpApi" Version="7.2.2"/> <PackageReference Update="Volo.Abp.TenantManagement.HttpApi" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.FeatureManagement.HttpApi" Version="7.2.2"/> <PackageReference Update="Volo.Abp.FeatureManagement.HttpApi" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.SettingManagement.HttpApi" Version="7.2.2"/> <PackageReference Update="Volo.Abp.SettingManagement.HttpApi" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Account.HttpApi.Client" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Account.HttpApi.Client" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Identity.HttpApi.Client" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Identity.HttpApi.Client" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.PermissionManagement.HttpApi.Client" Version="7.2.2"/> <PackageReference Update="Volo.Abp.PermissionManagement.HttpApi.Client" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.TenantManagement.HttpApi.Client" Version="7.2.2"/> <PackageReference Update="Volo.Abp.TenantManagement.HttpApi.Client" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.FeatureManagement.HttpApi.Client" Version="7.2.2"/> <PackageReference Update="Volo.Abp.FeatureManagement.HttpApi.Client" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.SettingManagement.HttpApi.Client" Version="7.2.2"/> <PackageReference Update="Volo.Abp.SettingManagement.HttpApi.Client" Version="7.3.2"/>
<PackageReference Update="Volo.Abp" Version="7.2.2"/> <PackageReference Update="Volo.Abp" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.AspNetCore" Version="7.2.2"/> <PackageReference Update="Volo.Abp.AspNetCore" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Core" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Core" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.EntityFrameworkCore" Version="7.2.2"/> <PackageReference Update="Volo.Abp.EntityFrameworkCore" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.AspNetCore.TestBase" Version="7.2.2"/> <PackageReference Update="Volo.Abp.AspNetCore.TestBase" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="7.2.2"/> <PackageReference Update="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.EventBus.Kafka" Version="7.2.2"/> <PackageReference Update="Volo.Abp.EventBus.Kafka" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.EventBus" Version="7.2.2"/> <PackageReference Update="Volo.Abp.EventBus" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Kafka" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Kafka" Version="7.3.2"/>
</ItemGroup> </ItemGroup>
</Project> </Project>

61
templates/abp-vnext-pro-nuget-all/aspnet-core/Directory.Build.targets
View File

@ -16,45 +16,44 @@
<PackageIconUrl>https://blog-resouce.oss-cn-shenzhen.aliyuncs.com/images/abp/06.jpg</PackageIconUrl> <PackageIconUrl>https://blog-resouce.oss-cn-shenzhen.aliyuncs.com/images/abp/06.jpg</PackageIconUrl>
</PropertyGroup> </PropertyGroup>
<!-- 基础包-->
<ItemGroup> <ItemGroup>
<PackageReference Update="Humanizer.Core.zh-Hans" Version="2.14.1"/> <!-- Ocelot 网关-->
<PackageReference Update="NSubstitute" Version="4.2.2"/>
<PackageReference Update="Shouldly" Version="4.0.3"/>
<PackageReference Update="coverlet.collector" Version="3.1.0"/>
<PackageReference Update="JunitXml.TestLogger" Version="3.0.98"/>
<PackageReference Update="Mongo2Go" Version="3.1.3"/>
<PackageReference Update="NEST" Version="7.15.1"/>
<PackageReference Update="System.ComponentModel.Annotations" Version="6.0.0-preview.4.21253.7"/>
<PackageReference Update="Ocelot" Version="18.0.0"/> <PackageReference Update="Ocelot" Version="18.0.0"/>
<PackageReference Update="Ocelot.Provider.Consul" Version="18.0.0"/> <PackageReference Update="Ocelot.Provider.Consul" Version="18.0.0"/>
<PackageReference Update="Ocelot.Provider.Polly" Version="18.0.0"/> <PackageReference Update="Ocelot.Provider.Polly" Version="18.0.0"/>
<!-- FreeSql-->
<PackageReference Update="FreeSql" Version="3.2.682"/> <PackageReference Update="FreeSql" Version="3.2.682"/>
<PackageReference Update="FreeSql.Provider.MySql" Version="3.2.682"/> <PackageReference Update="FreeSql.Provider.MysqlConnector" Version="3.2.682"/>
<PackageReference Update="FreeSql.Provider.Sqlite" Version="3.2.682"/> <PackageReference Update="FreeSql.Provider.Sqlite" Version="3.2.682"/>
<!-- 单元测试包-->
<PackageReference Update="xunit" Version="2.4.1"/> <PackageReference Update="xunit" Version="2.4.1"/>
<PackageReference Update="xunit.extensibility.execution" Version="2.4.1"/> <PackageReference Update="xunit.extensibility.execution" Version="2.4.1"/>
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.5"/> <PackageReference Update="xunit.runner.visualstudio" Version="2.4.5"/>
<PackageReference Update="NSubstitute" Version="4.2.2"/>
<PackageReference Update="Shouldly" Version="4.0.3"/>
<PackageReference Update="coverlet.collector" Version="3.1.0"/>
<PackageReference Update="JunitXml.TestLogger" Version="3.0.98"/>
<PackageReference Update="AutoFixture.Xunit2" Version="4.17.0"/>
<PackageReference Update="Hangfire.Redis.StackExchange" Version="1.8.5"/> <!-- Hangfire 后台任务-->
<PackageReference Update="Hangfire.Redis.StackExchange" Version="1.9.0"/>
<PackageReference Update="DotNetCore.CAP" Version="7.0.2"/> <!-- CAP 分布式事务-->
<PackageReference Update="DotNetCore.CAP.Dashboard" Version="7.0.2"/> <PackageReference Update="DotNetCore.CAP" Version="7.2.0"/>
<PackageReference Update="DotNetCore.CAP.Mysql" Version="7.0.2"/> <PackageReference Update="DotNetCore.CAP.Dashboard" Version="7.2.0"/>
<PackageReference Update="DotNetCore.CAP.RabbitMQ" Version="7.0.2"/> <PackageReference Update="DotNetCore.CAP.Mysql" Version="7.2.0"/>
<PackageReference Update="DotNetCore.CAP.InMemoryStorage" Version="7.0.2"/> <PackageReference Update="DotNetCore.CAP.RabbitMQ" Version="7.2.0"/>
<PackageReference Update="DotNetCore.CAP.InMemoryStorage" Version="7.2.0"/>
<PackageReference Update="Savorboard.CAP.InMemoryMessageQueue" Version="7.0.0"/> <PackageReference Update="Savorboard.CAP.InMemoryMessageQueue" Version="7.0.0"/>
<!-- Swagger-->
<PackageReference Update="Swashbuckle.AspNetCore.SwaggerUI" Version="6.3.1"/> <PackageReference Update="Swashbuckle.AspNetCore.SwaggerUI" Version="6.3.1"/>
<PackageReference Update="Swashbuckle.AspNetCore" Version="6.3.1"/> <PackageReference Update="Swashbuckle.AspNetCore" Version="6.3.1"/>
<PackageReference Update="Swashbuckle.AspNetCore.Annotations" Version="6.3.1"/> <PackageReference Update="Swashbuckle.AspNetCore.Annotations" Version="6.3.1"/>
<!-- Serilog 日志-->
<PackageReference Update="Serilog" Version="2.11.0"/> <PackageReference Update="Serilog" Version="2.11.0"/>
<PackageReference Update="Serilog.Extensions.Logging" Version="3.1.0"/> <PackageReference Update="Serilog.Extensions.Logging" Version="3.1.0"/>
<PackageReference Update="Serilog.Sinks.Async" Version="1.5.0"/> <PackageReference Update="Serilog.Sinks.Async" Version="1.5.0"/>
@ -65,27 +64,25 @@
<PackageReference Update="Serilog.Settings.Configuration" Version="3.3.0"/> <PackageReference Update="Serilog.Settings.Configuration" Version="3.3.0"/>
<PackageReference Update="Serilog.Sinks.Elasticsearch" Version="8.4.1"/> <PackageReference Update="Serilog.Sinks.Elasticsearch" Version="8.4.1"/>
<!-- Magicodes 导入导出Excel-->
<PackageReference Update="Magicodes.IE.Excel" Version="2.7.0"/> <PackageReference Update="Magicodes.IE.Excel" Version="2.7.0"/>
<PackageReference Update="Magicodes.IE.Excel.AspNetCore" Version="2.7.0"/> <PackageReference Update="Magicodes.IE.Excel.AspNetCore" Version="2.7.0"/>
<!-- MiniProfiler 查看接口耗时,sql耗时-->
<PackageReference Update="MiniProfiler.AspNetCore.Mvc" Version="4.2.22"/> <PackageReference Update="MiniProfiler.AspNetCore.Mvc" Version="4.2.22"/>
<PackageReference Update="MiniProfiler.EntityFrameworkCore" Version="4.2.22"/> <PackageReference Update="MiniProfiler.EntityFrameworkCore" Version="4.2.22"/>
<PackageReference Update="MiniProfiler.Shared" Version="4.2.22"/> <PackageReference Update="MiniProfiler.Shared" Version="4.2.22"/>
<PackageReference Update="AutoFixture.Xunit2" Version="4.17.0"/> <!-- Polly 重试机制-->
<PackageReference Update="prometheus-net.AspNetCore" Version="5.0.2"/>
<PackageReference Update="Aliyun.OSS.SDK.NetCore" Version="2.13.0"/>
<PackageReference Update="Zack.EFCore.Batch.MySQL.Pomelo_NET6" Version="6.1.3"/>
<PackageReference Update="Zack.EFCore.Batch.Sqlite_NET6" Version="6.1.3"/>
<PackageReference Update="Polly" Version="7.2.3"/> <PackageReference Update="Polly" Version="7.2.3"/>
<PackageReference Update="Confluent.Kafka" Version="1.8.2.0"/>
<!-- Octokit 邮件-->
<PackageReference Update="Octokit" Version="2.0.0"/>
<!-- Idenity 一下三个包升级到最新版导致鉴权不通过--> <!-- Humanizer 中文格式包-->
<PackageReference Update="Microsoft.IdentityModel.Tokens" Version="6.10.0"/> <PackageReference Update="Humanizer.Core.zh-Hans" Version="2.14.1"/>
<PackageReference Update="System.IdentityModel.Tokens.Jwt" Version="6.10.0"/>
<PackageReference Update="IdentityModel" Version="5.1.0"/> <!-- NEST ElasticSearch-->
<PackageReference Update="NEST" Version="7.15.1"/>
</ItemGroup> </ItemGroup>
</Project> </Project>

9
templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Extensions/Hangfire/RecurringJobsExtensions.cs
View File

@ -1,14 +1,15 @@
using MyCompanyName.MyProjectName.Jobs; using MyCompanyName.MyProjectName.Jobs;
namespace MyCompanyName.MyProjectName.Extensions namespace MyCompanyName.MyProjectName.Extensions.Hangfire
{ {
public static class RecurringJobsExtensions public static class RecurringJobsExtensions
{ {
public static void CreateRecurringJob(this ApplicationInitializationContext context) public static void CreateRecurringJob(this ApplicationInitializationContext context)
{ {
using var scope = context.ServiceProvider.CreateScope(); RecurringJob.AddOrUpdate<TestJob>("测试Job", e => e.ExecuteAsync(), CronType.Minute(1), new RecurringJobOptions()
var testJob = scope.ServiceProvider.GetService<TestJob>(); {
RecurringJob.AddOrUpdate("测试Job", () => testJob.ExecuteAsync(), CronType.Minute(1), TimeZoneInfo.Local); TimeZone = TimeZoneInfo.Local
});
} }
} }
} }

2
templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs
View File

@ -69,7 +69,7 @@ namespace MyCompanyName.MyProjectName
private void ConfigurationSignalR(ServiceConfigurationContext context) private void ConfigurationSignalR(ServiceConfigurationContext context)
{ {
var redisConnection = context.Services.GetConfiguration()["Redis:Configuration"]; var redisConnection = context.Services.GetConfiguration().GetValue<string>("Redis:Configuration");
if (redisConnection.IsNullOrWhiteSpace()) if (redisConnection.IsNullOrWhiteSpace())
{ {

2
templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.FreeSqlRepository/MyCompanyName.MyProjectName.FreeSqlRepository.csproj
View File

@ -7,7 +7,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="FreeSql"/> <PackageReference Include="FreeSql"/>
<PackageReference Include="FreeSql.Provider.MySql"/> <PackageReference Include="FreeSql.Provider.MysqlConnector"/>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

176
templates/abp-vnext-pro-nuget-module/Directory.Build.Volo.targets
View File

@ -1,92 +1,92 @@
<Project> <Project>
<ItemGroup> <ItemGroup>
<PackageReference Update="Volo.Abp.Autofac" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Autofac" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Json" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Json" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Validation" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Validation" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Ddd.Domain" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Ddd.Domain" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.AutoMapper" Version="7.2.2"/> <PackageReference Update="Volo.Abp.AutoMapper" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.ObjectMapping" Version="7.2.2"/> <PackageReference Update="Volo.Abp.ObjectMapping" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Identity.AspNetCore" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Identity.AspNetCore" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Caching" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Caching" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.BlobStoring.Aliyun" Version="7.2.2"/> <PackageReference Update="Volo.Abp.BlobStoring.Aliyun" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.BackgroundJobs" Version="7.2.2"/> <PackageReference Update="Volo.Abp.BackgroundJobs" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.BackgroundJobs.HangFire" Version="7.2.2"/> <PackageReference Update="Volo.Abp.BackgroundJobs.HangFire" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.AspNetCore.SignalR" Version="7.2.2"/> <PackageReference Update="Volo.Abp.AspNetCore.SignalR" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.TestBase" Version="7.2.2"/> <PackageReference Update="Volo.Abp.TestBase" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.EntityFrameworkCore.MySQL" Version="7.2.2"/> <PackageReference Update="Volo.Abp.EntityFrameworkCore.MySQL" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="7.2.2"/> <PackageReference Update="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="7.2.2"/> <PackageReference Update="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Identity.EntityFrameworkCore" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Identity.EntityFrameworkCore" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.BackgroundJobs.EntityFrameworkCore" Version="7.2.2"/> <PackageReference Update="Volo.Abp.BackgroundJobs.EntityFrameworkCore" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="7.2.2"/> <PackageReference Update="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.TenantManagement.EntityFrameworkCore" Version="7.2.2"/> <PackageReference Update="Volo.Abp.TenantManagement.EntityFrameworkCore" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.FeatureManagement.EntityFrameworkCore" Version="7.2.2"/> <PackageReference Update="Volo.Abp.FeatureManagement.EntityFrameworkCore" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.AspNetCore.Authentication.JwtBearer" Version="7.2.2"/> <PackageReference Update="Volo.Abp.AspNetCore.Authentication.JwtBearer" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.AspNetCore.Mvc.Contracts" Version="7.2.2"/> <PackageReference Update="Volo.Abp.AspNetCore.Mvc.Contracts" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Account.Web" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Account.Web" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Caching.StackExchangeRedis" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Caching.StackExchangeRedis" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy" Version="7.2.2"/> <PackageReference Update="Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.EntityFrameworkCore.PostgreSql" Version="7.2.2"/> <PackageReference Update="Volo.Abp.EntityFrameworkCore.PostgreSql" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.AspNetCore.Serilog" Version="7.2.2"/> <PackageReference Update="Volo.Abp.AspNetCore.Serilog" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Swashbuckle" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Swashbuckle" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Ddd.Application" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Ddd.Application" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Ddd.Application.Contracts" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Ddd.Application.Contracts" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Authorization" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Authorization" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Dapper" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Dapper" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.AspNetCore.Mvc" Version="7.2.2"/> <PackageReference Update="Volo.Abp.AspNetCore.Mvc" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Http.Client" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Http.Client" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.MongoDB" Version="7.2.2"/> <PackageReference Update="Volo.Abp.MongoDB" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.EntityFrameworkCore.Sqlite" Version="7.2.2"/> <PackageReference Update="Volo.Abp.EntityFrameworkCore.Sqlite" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Http.Client.IdentityModel" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Http.Client.IdentityModel" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.AspNetCore.MultiTenancy" Version="7.2.2"/> <PackageReference Update="Volo.Abp.AspNetCore.MultiTenancy" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Account.Application" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Account.Application" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Identity.Application" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Identity.Application" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.PermissionManagement.Application" Version="7.2.2"/> <PackageReference Update="Volo.Abp.PermissionManagement.Application" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.TenantManagement.Application" Version="7.2.2"/> <PackageReference Update="Volo.Abp.TenantManagement.Application" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.FeatureManagement.Application" Version="7.2.2"/> <PackageReference Update="Volo.Abp.FeatureManagement.Application" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.SettingManagement.Application" Version="7.2.2"/> <PackageReference Update="Volo.Abp.SettingManagement.Application" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.ObjectExtending" Version="7.2.2"/> <PackageReference Update="Volo.Abp.ObjectExtending" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Account.Application.Contracts" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Account.Application.Contracts" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Identity.Application.Contracts" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Identity.Application.Contracts" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.PermissionManagement.Application.Contracts" Version="7.2.2"/> <PackageReference Update="Volo.Abp.PermissionManagement.Application.Contracts" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.TenantManagement.Application.Contracts" Version="7.2.2"/> <PackageReference Update="Volo.Abp.TenantManagement.Application.Contracts" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.FeatureManagement.Application.Contracts" Version="7.2.2"/> <PackageReference Update="Volo.Abp.FeatureManagement.Application.Contracts" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.SettingManagement.Application.Contracts" Version="7.2.2"/> <PackageReference Update="Volo.Abp.SettingManagement.Application.Contracts" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Emailing" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Emailing" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.PermissionManagement.Domain.Identity" Version="7.2.2"/> <PackageReference Update="Volo.Abp.PermissionManagement.Domain.Identity" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.BackgroundJobs.Domain" Version="7.2.2"/> <PackageReference Update="Volo.Abp.BackgroundJobs.Domain" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.AuditLogging.Domain" Version="7.2.2"/> <PackageReference Update="Volo.Abp.AuditLogging.Domain" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.TenantManagement.Domain" Version="7.2.2"/> <PackageReference Update="Volo.Abp.TenantManagement.Domain" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.FeatureManagement.Domain" Version="7.2.2"/> <PackageReference Update="Volo.Abp.FeatureManagement.Domain" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.SettingManagement.Domain" Version="7.2.2"/> <PackageReference Update="Volo.Abp.SettingManagement.Domain" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Identity.Domain" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Identity.Domain" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Identity.Domain.Shared" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Identity.Domain.Shared" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.BackgroundJobs.Domain.Shared" Version="7.2.2"/> <PackageReference Update="Volo.Abp.BackgroundJobs.Domain.Shared" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.AuditLogging.Domain.Shared" Version="7.2.2"/> <PackageReference Update="Volo.Abp.AuditLogging.Domain.Shared" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.TenantManagement.Domain.Shared" Version="7.2.2"/> <PackageReference Update="Volo.Abp.TenantManagement.Domain.Shared" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.FeatureManagement.Domain.Shared" Version="7.2.2"/> <PackageReference Update="Volo.Abp.FeatureManagement.Domain.Shared" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.PermissionManagement.Domain.Shared" Version="7.2.2"/> <PackageReference Update="Volo.Abp.PermissionManagement.Domain.Shared" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.SettingManagement.Domain.Shared" Version="7.2.2"/> <PackageReference Update="Volo.Abp.SettingManagement.Domain.Shared" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Account.HttpApi" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Account.HttpApi" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Identity.HttpApi" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Identity.HttpApi" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.PermissionManagement.HttpApi" Version="7.2.2"/> <PackageReference Update="Volo.Abp.PermissionManagement.HttpApi" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.TenantManagement.HttpApi" Version="7.2.2"/> <PackageReference Update="Volo.Abp.TenantManagement.HttpApi" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.FeatureManagement.HttpApi" Version="7.2.2"/> <PackageReference Update="Volo.Abp.FeatureManagement.HttpApi" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.SettingManagement.HttpApi" Version="7.2.2"/> <PackageReference Update="Volo.Abp.SettingManagement.HttpApi" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Account.HttpApi.Client" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Account.HttpApi.Client" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Identity.HttpApi.Client" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Identity.HttpApi.Client" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.PermissionManagement.HttpApi.Client" Version="7.2.2"/> <PackageReference Update="Volo.Abp.PermissionManagement.HttpApi.Client" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.TenantManagement.HttpApi.Client" Version="7.2.2"/> <PackageReference Update="Volo.Abp.TenantManagement.HttpApi.Client" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.FeatureManagement.HttpApi.Client" Version="7.2.2"/> <PackageReference Update="Volo.Abp.FeatureManagement.HttpApi.Client" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.SettingManagement.HttpApi.Client" Version="7.2.2"/> <PackageReference Update="Volo.Abp.SettingManagement.HttpApi.Client" Version="7.3.2"/>
<PackageReference Update="Volo.Abp" Version="7.2.2"/> <PackageReference Update="Volo.Abp" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.AspNetCore" Version="7.2.2"/> <PackageReference Update="Volo.Abp.AspNetCore" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Core" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Core" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.EntityFrameworkCore" Version="7.2.2"/> <PackageReference Update="Volo.Abp.EntityFrameworkCore" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.AspNetCore.TestBase" Version="7.2.2"/> <PackageReference Update="Volo.Abp.AspNetCore.TestBase" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="7.2.2"/> <PackageReference Update="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.EventBus.Kafka" Version="7.2.2"/> <PackageReference Update="Volo.Abp.EventBus.Kafka" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.EventBus" Version="7.2.2"/> <PackageReference Update="Volo.Abp.EventBus" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Kafka" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Kafka" Version="7.3.2"/>
</ItemGroup> </ItemGroup>
</Project> </Project>

60
templates/abp-vnext-pro-nuget-module/Directory.Build.targets
View File

@ -16,43 +16,43 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Update="Humanizer.Core.zh-Hans" Version="2.14.1"/> <!-- Ocelot 网关-->
<PackageReference Update="NSubstitute" Version="4.2.2"/>
<PackageReference Update="Shouldly" Version="4.0.3"/>
<PackageReference Update="coverlet.collector" Version="3.1.0"/>
<PackageReference Update="JunitXml.TestLogger" Version="3.0.98"/>
<PackageReference Update="Mongo2Go" Version="3.1.3"/>
<PackageReference Update="NEST" Version="7.15.1"/>
<PackageReference Update="System.ComponentModel.Annotations" Version="6.0.0-preview.4.21253.7"/>
<PackageReference Update="Ocelot" Version="18.0.0"/> <PackageReference Update="Ocelot" Version="18.0.0"/>
<PackageReference Update="Ocelot.Provider.Consul" Version="18.0.0"/> <PackageReference Update="Ocelot.Provider.Consul" Version="18.0.0"/>
<PackageReference Update="Ocelot.Provider.Polly" Version="18.0.0"/> <PackageReference Update="Ocelot.Provider.Polly" Version="18.0.0"/>
<!-- FreeSql-->
<PackageReference Update="FreeSql" Version="3.2.682"/> <PackageReference Update="FreeSql" Version="3.2.682"/>
<PackageReference Update="FreeSql.Provider.MySql" Version="3.2.682"/> <PackageReference Update="FreeSql.Provider.MysqlConnector" Version="3.2.682"/>
<PackageReference Update="FreeSql.Provider.Sqlite" Version="3.2.682"/> <PackageReference Update="FreeSql.Provider.Sqlite" Version="3.2.682"/>
<!-- 单元测试包-->
<PackageReference Update="xunit" Version="2.4.1"/> <PackageReference Update="xunit" Version="2.4.1"/>
<PackageReference Update="xunit.extensibility.execution" Version="2.4.1"/> <PackageReference Update="xunit.extensibility.execution" Version="2.4.1"/>
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.5"/> <PackageReference Update="xunit.runner.visualstudio" Version="2.4.5"/>
<PackageReference Update="NSubstitute" Version="4.2.2"/>
<PackageReference Update="Shouldly" Version="4.0.3"/>
<PackageReference Update="coverlet.collector" Version="3.1.0"/>
<PackageReference Update="JunitXml.TestLogger" Version="3.0.98"/>
<PackageReference Update="AutoFixture.Xunit2" Version="4.17.0"/>
<PackageReference Update="Hangfire.Redis.StackExchange" Version="1.8.5"/> <!-- Hangfire 后台任务-->
<PackageReference Update="Hangfire.Redis.StackExchange" Version="1.9.0"/>
<PackageReference Update="DotNetCore.CAP" Version="7.0.2"/> <!-- CAP 分布式事务-->
<PackageReference Update="DotNetCore.CAP.Dashboard" Version="7.0.2"/> <PackageReference Update="DotNetCore.CAP" Version="7.2.0"/>
<PackageReference Update="DotNetCore.CAP.Mysql" Version="7.0.2"/> <PackageReference Update="DotNetCore.CAP.Dashboard" Version="7.2.0"/>
<PackageReference Update="DotNetCore.CAP.RabbitMQ" Version="7.0.2"/> <PackageReference Update="DotNetCore.CAP.Mysql" Version="7.2.0"/>
<PackageReference Update="DotNetCore.CAP.InMemoryStorage" Version="7.0.2"/> <PackageReference Update="DotNetCore.CAP.RabbitMQ" Version="7.2.0"/>
<PackageReference Update="DotNetCore.CAP.InMemoryStorage" Version="7.2.0"/>
<PackageReference Update="Savorboard.CAP.InMemoryMessageQueue" Version="7.0.0"/> <PackageReference Update="Savorboard.CAP.InMemoryMessageQueue" Version="7.0.0"/>
<!-- Swagger-->
<PackageReference Update="Swashbuckle.AspNetCore.SwaggerUI" Version="6.3.1"/> <PackageReference Update="Swashbuckle.AspNetCore.SwaggerUI" Version="6.3.1"/>
<PackageReference Update="Swashbuckle.AspNetCore" Version="6.3.1"/> <PackageReference Update="Swashbuckle.AspNetCore" Version="6.3.1"/>
<PackageReference Update="Swashbuckle.AspNetCore.Annotations" Version="6.3.1"/> <PackageReference Update="Swashbuckle.AspNetCore.Annotations" Version="6.3.1"/>
<!-- Serilog 日志-->
<PackageReference Update="Serilog" Version="2.11.0"/> <PackageReference Update="Serilog" Version="2.11.0"/>
<PackageReference Update="Serilog.Extensions.Logging" Version="3.1.0"/> <PackageReference Update="Serilog.Extensions.Logging" Version="3.1.0"/>
<PackageReference Update="Serilog.Sinks.Async" Version="1.5.0"/> <PackageReference Update="Serilog.Sinks.Async" Version="1.5.0"/>
@ -63,27 +63,25 @@
<PackageReference Update="Serilog.Settings.Configuration" Version="3.3.0"/> <PackageReference Update="Serilog.Settings.Configuration" Version="3.3.0"/>
<PackageReference Update="Serilog.Sinks.Elasticsearch" Version="8.4.1"/> <PackageReference Update="Serilog.Sinks.Elasticsearch" Version="8.4.1"/>
<!-- Magicodes 导入导出Excel-->
<PackageReference Update="Magicodes.IE.Excel" Version="2.7.0"/> <PackageReference Update="Magicodes.IE.Excel" Version="2.7.0"/>
<PackageReference Update="Magicodes.IE.Excel.AspNetCore" Version="2.7.0"/> <PackageReference Update="Magicodes.IE.Excel.AspNetCore" Version="2.7.0"/>
<!-- MiniProfiler 查看接口耗时,sql耗时-->
<PackageReference Update="MiniProfiler.AspNetCore.Mvc" Version="4.2.22"/> <PackageReference Update="MiniProfiler.AspNetCore.Mvc" Version="4.2.22"/>
<PackageReference Update="MiniProfiler.EntityFrameworkCore" Version="4.2.22"/> <PackageReference Update="MiniProfiler.EntityFrameworkCore" Version="4.2.22"/>
<PackageReference Update="MiniProfiler.Shared" Version="4.2.22"/> <PackageReference Update="MiniProfiler.Shared" Version="4.2.22"/>
<PackageReference Update="AutoFixture.Xunit2" Version="4.17.0"/> <!-- Polly 重试机制-->
<PackageReference Update="prometheus-net.AspNetCore" Version="5.0.2"/>
<PackageReference Update="Aliyun.OSS.SDK.NetCore" Version="2.13.0"/>
<PackageReference Update="Zack.EFCore.Batch.MySQL.Pomelo_NET6" Version="6.1.3"/>
<PackageReference Update="Zack.EFCore.Batch.Sqlite_NET6" Version="6.1.3"/>
<PackageReference Update="Polly" Version="7.2.3"/> <PackageReference Update="Polly" Version="7.2.3"/>
<PackageReference Update="Confluent.Kafka" Version="1.8.2.0"/>
<!-- Octokit 邮件-->
<PackageReference Update="Octokit" Version="2.0.0"/>
<!-- Idenity 一下三个包升级到最新版导致鉴权不通过--> <!-- Humanizer 中文格式包-->
<PackageReference Update="Microsoft.IdentityModel.Tokens" Version="6.10.0"/> <PackageReference Update="Humanizer.Core.zh-Hans" Version="2.14.1"/>
<PackageReference Update="System.IdentityModel.Tokens.Jwt" Version="6.10.0"/>
<PackageReference Update="IdentityModel" Version="5.1.0"/> <!-- NEST ElasticSearch-->
<PackageReference Update="NEST" Version="7.15.1"/>
</ItemGroup> </ItemGroup>
</Project> </Project>

176
templates/abp-vnext-pro-nuget-simplify/aspnet-core/Directory.Build.Volo.targets
View File

@ -1,93 +1,93 @@
<Project> <Project>
<!-- Volo.Abp官方包--> <!-- Volo.Abp官方包-->
<ItemGroup> <ItemGroup>
<PackageReference Update="Volo.Abp.Autofac" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Autofac" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Json" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Json" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Validation" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Validation" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Ddd.Domain" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Ddd.Domain" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.AutoMapper" Version="7.2.2"/> <PackageReference Update="Volo.Abp.AutoMapper" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.ObjectMapping" Version="7.2.2"/> <PackageReference Update="Volo.Abp.ObjectMapping" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Identity.AspNetCore" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Identity.AspNetCore" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Caching" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Caching" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.BlobStoring.Aliyun" Version="7.2.2"/> <PackageReference Update="Volo.Abp.BlobStoring.Aliyun" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.BackgroundJobs" Version="7.2.2"/> <PackageReference Update="Volo.Abp.BackgroundJobs" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.BackgroundJobs.HangFire" Version="7.2.2"/> <PackageReference Update="Volo.Abp.BackgroundJobs.HangFire" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.AspNetCore.SignalR" Version="7.2.2"/> <PackageReference Update="Volo.Abp.AspNetCore.SignalR" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.TestBase" Version="7.2.2"/> <PackageReference Update="Volo.Abp.TestBase" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.EntityFrameworkCore.MySQL" Version="7.2.2"/> <PackageReference Update="Volo.Abp.EntityFrameworkCore.MySQL" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="7.2.2"/> <PackageReference Update="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="7.2.2"/> <PackageReference Update="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Identity.EntityFrameworkCore" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Identity.EntityFrameworkCore" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.BackgroundJobs.EntityFrameworkCore" Version="7.2.2"/> <PackageReference Update="Volo.Abp.BackgroundJobs.EntityFrameworkCore" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="7.2.2"/> <PackageReference Update="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.TenantManagement.EntityFrameworkCore" Version="7.2.2"/> <PackageReference Update="Volo.Abp.TenantManagement.EntityFrameworkCore" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.FeatureManagement.EntityFrameworkCore" Version="7.2.2"/> <PackageReference Update="Volo.Abp.FeatureManagement.EntityFrameworkCore" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.AspNetCore.Authentication.JwtBearer" Version="7.2.2"/> <PackageReference Update="Volo.Abp.AspNetCore.Authentication.JwtBearer" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.AspNetCore.Mvc.Contracts" Version="7.2.2"/> <PackageReference Update="Volo.Abp.AspNetCore.Mvc.Contracts" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Account.Web" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Account.Web" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Caching.StackExchangeRedis" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Caching.StackExchangeRedis" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy" Version="7.2.2"/> <PackageReference Update="Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.EntityFrameworkCore.PostgreSql" Version="7.2.2"/> <PackageReference Update="Volo.Abp.EntityFrameworkCore.PostgreSql" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.AspNetCore.Serilog" Version="7.2.2"/> <PackageReference Update="Volo.Abp.AspNetCore.Serilog" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Swashbuckle" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Swashbuckle" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Ddd.Application" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Ddd.Application" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Ddd.Application.Contracts" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Ddd.Application.Contracts" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Authorization" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Authorization" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Dapper" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Dapper" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.AspNetCore.Mvc" Version="7.2.2"/> <PackageReference Update="Volo.Abp.AspNetCore.Mvc" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Http.Client" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Http.Client" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.MongoDB" Version="7.2.2"/> <PackageReference Update="Volo.Abp.MongoDB" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.EntityFrameworkCore.Sqlite" Version="7.2.2"/> <PackageReference Update="Volo.Abp.EntityFrameworkCore.Sqlite" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Http.Client.IdentityModel" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Http.Client.IdentityModel" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.AspNetCore.MultiTenancy" Version="7.2.2"/> <PackageReference Update="Volo.Abp.AspNetCore.MultiTenancy" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Account.Application" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Account.Application" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Identity.Application" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Identity.Application" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.PermissionManagement.Application" Version="7.2.2"/> <PackageReference Update="Volo.Abp.PermissionManagement.Application" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.TenantManagement.Application" Version="7.2.2"/> <PackageReference Update="Volo.Abp.TenantManagement.Application" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.FeatureManagement.Application" Version="7.2.2"/> <PackageReference Update="Volo.Abp.FeatureManagement.Application" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.SettingManagement.Application" Version="7.2.2"/> <PackageReference Update="Volo.Abp.SettingManagement.Application" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.ObjectExtending" Version="7.2.2"/> <PackageReference Update="Volo.Abp.ObjectExtending" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Account.Application.Contracts" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Account.Application.Contracts" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Identity.Application.Contracts" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Identity.Application.Contracts" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.PermissionManagement.Application.Contracts" Version="7.2.2"/> <PackageReference Update="Volo.Abp.PermissionManagement.Application.Contracts" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.TenantManagement.Application.Contracts" Version="7.2.2"/> <PackageReference Update="Volo.Abp.TenantManagement.Application.Contracts" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.FeatureManagement.Application.Contracts" Version="7.2.2"/> <PackageReference Update="Volo.Abp.FeatureManagement.Application.Contracts" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.SettingManagement.Application.Contracts" Version="7.2.2"/> <PackageReference Update="Volo.Abp.SettingManagement.Application.Contracts" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Emailing" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Emailing" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.PermissionManagement.Domain.Identity" Version="7.2.2"/> <PackageReference Update="Volo.Abp.PermissionManagement.Domain.Identity" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.BackgroundJobs.Domain" Version="7.2.2"/> <PackageReference Update="Volo.Abp.BackgroundJobs.Domain" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.AuditLogging.Domain" Version="7.2.2"/> <PackageReference Update="Volo.Abp.AuditLogging.Domain" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.TenantManagement.Domain" Version="7.2.2"/> <PackageReference Update="Volo.Abp.TenantManagement.Domain" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.FeatureManagement.Domain" Version="7.2.2"/> <PackageReference Update="Volo.Abp.FeatureManagement.Domain" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.SettingManagement.Domain" Version="7.2.2"/> <PackageReference Update="Volo.Abp.SettingManagement.Domain" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Identity.Domain" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Identity.Domain" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Identity.Domain.Shared" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Identity.Domain.Shared" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.BackgroundJobs.Domain.Shared" Version="7.2.2"/> <PackageReference Update="Volo.Abp.BackgroundJobs.Domain.Shared" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.AuditLogging.Domain.Shared" Version="7.2.2"/> <PackageReference Update="Volo.Abp.AuditLogging.Domain.Shared" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.TenantManagement.Domain.Shared" Version="7.2.2"/> <PackageReference Update="Volo.Abp.TenantManagement.Domain.Shared" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.FeatureManagement.Domain.Shared" Version="7.2.2"/> <PackageReference Update="Volo.Abp.FeatureManagement.Domain.Shared" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.PermissionManagement.Domain.Shared" Version="7.2.2"/> <PackageReference Update="Volo.Abp.PermissionManagement.Domain.Shared" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.SettingManagement.Domain.Shared" Version="7.2.2"/> <PackageReference Update="Volo.Abp.SettingManagement.Domain.Shared" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Account.HttpApi" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Account.HttpApi" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Identity.HttpApi" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Identity.HttpApi" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.PermissionManagement.HttpApi" Version="7.2.2"/> <PackageReference Update="Volo.Abp.PermissionManagement.HttpApi" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.TenantManagement.HttpApi" Version="7.2.2"/> <PackageReference Update="Volo.Abp.TenantManagement.HttpApi" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.FeatureManagement.HttpApi" Version="7.2.2"/> <PackageReference Update="Volo.Abp.FeatureManagement.HttpApi" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.SettingManagement.HttpApi" Version="7.2.2"/> <PackageReference Update="Volo.Abp.SettingManagement.HttpApi" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Account.HttpApi.Client" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Account.HttpApi.Client" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Identity.HttpApi.Client" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Identity.HttpApi.Client" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.PermissionManagement.HttpApi.Client" Version="7.2.2"/> <PackageReference Update="Volo.Abp.PermissionManagement.HttpApi.Client" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.TenantManagement.HttpApi.Client" Version="7.2.2"/> <PackageReference Update="Volo.Abp.TenantManagement.HttpApi.Client" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.FeatureManagement.HttpApi.Client" Version="7.2.2"/> <PackageReference Update="Volo.Abp.FeatureManagement.HttpApi.Client" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.SettingManagement.HttpApi.Client" Version="7.2.2"/> <PackageReference Update="Volo.Abp.SettingManagement.HttpApi.Client" Version="7.3.2"/>
<PackageReference Update="Volo.Abp" Version="7.2.2"/> <PackageReference Update="Volo.Abp" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.AspNetCore" Version="7.2.2"/> <PackageReference Update="Volo.Abp.AspNetCore" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Core" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Core" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.EntityFrameworkCore" Version="7.2.2"/> <PackageReference Update="Volo.Abp.EntityFrameworkCore" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.AspNetCore.TestBase" Version="7.2.2"/> <PackageReference Update="Volo.Abp.AspNetCore.TestBase" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="7.2.2"/> <PackageReference Update="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.EventBus.Kafka" Version="7.2.2"/> <PackageReference Update="Volo.Abp.EventBus.Kafka" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.EventBus" Version="7.2.2"/> <PackageReference Update="Volo.Abp.EventBus" Version="7.3.2"/>
<PackageReference Update="Volo.Abp.Kafka" Version="7.2.2"/> <PackageReference Update="Volo.Abp.Kafka" Version="7.3.2"/>
</ItemGroup> </ItemGroup>
</Project> </Project>

61
templates/abp-vnext-pro-nuget-simplify/aspnet-core/Directory.Build.targets
View File

@ -13,45 +13,44 @@
<GenerateDocumentationFile>true</GenerateDocumentationFile> <GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup> </PropertyGroup>
<!-- 基础包-->
<ItemGroup> <ItemGroup>
<PackageReference Update="Humanizer.Core.zh-Hans" Version="2.14.1"/> <!-- Ocelot 网关-->
<PackageReference Update="NSubstitute" Version="4.2.2"/>
<PackageReference Update="Shouldly" Version="4.0.3"/>
<PackageReference Update="coverlet.collector" Version="3.1.0"/>
<PackageReference Update="JunitXml.TestLogger" Version="3.0.98"/>
<PackageReference Update="Mongo2Go" Version="3.1.3"/>
<PackageReference Update="NEST" Version="7.15.1"/>
<PackageReference Update="System.ComponentModel.Annotations" Version="6.0.0-preview.4.21253.7"/>
<PackageReference Update="Ocelot" Version="18.0.0"/> <PackageReference Update="Ocelot" Version="18.0.0"/>
<PackageReference Update="Ocelot.Provider.Consul" Version="18.0.0"/> <PackageReference Update="Ocelot.Provider.Consul" Version="18.0.0"/>
<PackageReference Update="Ocelot.Provider.Polly" Version="18.0.0"/> <PackageReference Update="Ocelot.Provider.Polly" Version="18.0.0"/>
<!-- FreeSql-->
<PackageReference Update="FreeSql" Version="3.2.682"/> <PackageReference Update="FreeSql" Version="3.2.682"/>
<PackageReference Update="FreeSql.Provider.MySql" Version="3.2.682"/> <PackageReference Update="FreeSql.Provider.MysqlConnector" Version="3.2.682"/>
<PackageReference Update="FreeSql.Provider.Sqlite" Version="3.2.682"/> <PackageReference Update="FreeSql.Provider.Sqlite" Version="3.2.682"/>
<!-- 单元测试包-->
<PackageReference Update="xunit" Version="2.4.1"/> <PackageReference Update="xunit" Version="2.4.1"/>
<PackageReference Update="xunit.extensibility.execution" Version="2.4.1"/> <PackageReference Update="xunit.extensibility.execution" Version="2.4.1"/>
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.5"/> <PackageReference Update="xunit.runner.visualstudio" Version="2.4.5"/>
<PackageReference Update="NSubstitute" Version="4.2.2"/>
<PackageReference Update="Shouldly" Version="4.0.3"/>
<PackageReference Update="coverlet.collector" Version="3.1.0"/>
<PackageReference Update="JunitXml.TestLogger" Version="3.0.98"/>
<PackageReference Update="AutoFixture.Xunit2" Version="4.17.0"/>
<PackageReference Update="Hangfire.Redis.StackExchange" Version="1.8.5"/> <!-- Hangfire 后台任务-->
<PackageReference Update="Hangfire.Redis.StackExchange" Version="1.9.0"/>
<PackageReference Update="DotNetCore.CAP" Version="7.0.2"/> <!-- CAP 分布式事务-->
<PackageReference Update="DotNetCore.CAP.Dashboard" Version="7.0.2"/> <PackageReference Update="DotNetCore.CAP" Version="7.2.0"/>
<PackageReference Update="DotNetCore.CAP.Mysql" Version="7.0.2"/> <PackageReference Update="DotNetCore.CAP.Dashboard" Version="7.2.0"/>
<PackageReference Update="DotNetCore.CAP.RabbitMQ" Version="7.0.2"/> <PackageReference Update="DotNetCore.CAP.Mysql" Version="7.2.0"/>
<PackageReference Update="DotNetCore.CAP.InMemoryStorage" Version="7.0.2"/> <PackageReference Update="DotNetCore.CAP.RabbitMQ" Version="7.2.0"/>
<PackageReference Update="DotNetCore.CAP.InMemoryStorage" Version="7.2.0"/>
<PackageReference Update="Savorboard.CAP.InMemoryMessageQueue" Version="7.0.0"/> <PackageReference Update="Savorboard.CAP.InMemoryMessageQueue" Version="7.0.0"/>
<!-- Swagger-->
<PackageReference Update="Swashbuckle.AspNetCore.SwaggerUI" Version="6.3.1"/> <PackageReference Update="Swashbuckle.AspNetCore.SwaggerUI" Version="6.3.1"/>
<PackageReference Update="Swashbuckle.AspNetCore" Version="6.3.1"/> <PackageReference Update="Swashbuckle.AspNetCore" Version="6.3.1"/>
<PackageReference Update="Swashbuckle.AspNetCore.Annotations" Version="6.3.1"/> <PackageReference Update="Swashbuckle.AspNetCore.Annotations" Version="6.3.1"/>
<!-- Serilog 日志-->
<PackageReference Update="Serilog" Version="2.11.0"/> <PackageReference Update="Serilog" Version="2.11.0"/>
<PackageReference Update="Serilog.Extensions.Logging" Version="3.1.0"/> <PackageReference Update="Serilog.Extensions.Logging" Version="3.1.0"/>
<PackageReference Update="Serilog.Sinks.Async" Version="1.5.0"/> <PackageReference Update="Serilog.Sinks.Async" Version="1.5.0"/>
@ -62,27 +61,25 @@
<PackageReference Update="Serilog.Settings.Configuration" Version="3.3.0"/> <PackageReference Update="Serilog.Settings.Configuration" Version="3.3.0"/>
<PackageReference Update="Serilog.Sinks.Elasticsearch" Version="8.4.1"/> <PackageReference Update="Serilog.Sinks.Elasticsearch" Version="8.4.1"/>
<!-- Magicodes 导入导出Excel-->
<PackageReference Update="Magicodes.IE.Excel" Version="2.7.0"/> <PackageReference Update="Magicodes.IE.Excel" Version="2.7.0"/>
<PackageReference Update="Magicodes.IE.Excel.AspNetCore" Version="2.7.0"/> <PackageReference Update="Magicodes.IE.Excel.AspNetCore" Version="2.7.0"/>
<!-- MiniProfiler 查看接口耗时,sql耗时-->
<PackageReference Update="MiniProfiler.AspNetCore.Mvc" Version="4.2.22"/> <PackageReference Update="MiniProfiler.AspNetCore.Mvc" Version="4.2.22"/>
<PackageReference Update="MiniProfiler.EntityFrameworkCore" Version="4.2.22"/> <PackageReference Update="MiniProfiler.EntityFrameworkCore" Version="4.2.22"/>
<PackageReference Update="MiniProfiler.Shared" Version="4.2.22"/> <PackageReference Update="MiniProfiler.Shared" Version="4.2.22"/>
<PackageReference Update="AutoFixture.Xunit2" Version="4.17.0"/> <!-- Polly 重试机制-->
<PackageReference Update="prometheus-net.AspNetCore" Version="5.0.2"/>
<PackageReference Update="Aliyun.OSS.SDK.NetCore" Version="2.13.0"/>
<PackageReference Update="Zack.EFCore.Batch.MySQL.Pomelo_NET6" Version="6.1.3"/>
<PackageReference Update="Zack.EFCore.Batch.Sqlite_NET6" Version="6.1.3"/>
<PackageReference Update="Polly" Version="7.2.3"/> <PackageReference Update="Polly" Version="7.2.3"/>
<PackageReference Update="Confluent.Kafka" Version="1.8.2.0"/>
<!-- Octokit 邮件-->
<PackageReference Update="Octokit" Version="2.0.0"/>
<!-- Idenity 一下三个包升级到最新版导致鉴权不通过--> <!-- Humanizer 中文格式包-->
<PackageReference Update="Microsoft.IdentityModel.Tokens" Version="6.10.0"/> <PackageReference Update="Humanizer.Core.zh-Hans" Version="2.14.1"/>
<PackageReference Update="System.IdentityModel.Tokens.Jwt" Version="6.10.0"/>
<PackageReference Update="IdentityModel" Version="5.1.0"/> <!-- NEST ElasticSearch-->
<PackageReference Update="NEST" Version="7.15.1"/>
</ItemGroup> </ItemGroup>
</Project> </Project>

9
templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Extensions/Hangfire/RecurringJobsExtensions.cs
View File

@ -1,14 +1,15 @@
using MyCompanyName.MyProjectName.Jobs; using MyCompanyName.MyProjectName.Jobs;
namespace MyCompanyName.MyProjectName.Extensions namespace MyCompanyName.MyProjectName.Extensions.Hangfire
{ {
public static class RecurringJobsExtensions public static class RecurringJobsExtensions
{ {
public static void CreateRecurringJob(this ApplicationInitializationContext context) public static void CreateRecurringJob(this ApplicationInitializationContext context)
{ {
using var scope = context.ServiceProvider.CreateScope(); RecurringJob.AddOrUpdate<TestJob>("测试Job", e => e.ExecuteAsync(), CronType.Minute(1), new RecurringJobOptions()
var testJob = scope.ServiceProvider.GetService<TestJob>(); {
RecurringJob.AddOrUpdate("测试Job", () => testJob.ExecuteAsync(), CronType.Minute(1), TimeZoneInfo.Local); TimeZone = TimeZoneInfo.Local
});
} }
} }
} }

2
templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs
View File

@ -62,7 +62,7 @@ public class MyProjectNameHttpApiHostModule : AbpModule
} }
private void ConfigurationSignalR(ServiceConfigurationContext context) private void ConfigurationSignalR(ServiceConfigurationContext context)
{ {
var redisConnection = context.Services.GetConfiguration()["Redis:Configuration"]; var redisConnection = context.Services.GetConfiguration().GetValue<string>("Redis:Configuration");
if (redisConnection.IsNullOrWhiteSpace()) if (redisConnection.IsNullOrWhiteSpace())
{ {

2
templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.FreeSqlRepository/MyCompanyName.MyProjectName.FreeSqlRepository.csproj
View File

@ -7,7 +7,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="FreeSql"/> <PackageReference Include="FreeSql"/>
<PackageReference Include="FreeSql.Provider.MySql"/> <PackageReference Include="FreeSql.Provider.MysqlConnector"/>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

Write Preview
Loading…
Cancel
Save