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: 升级abp9.0 

feat: 升级abp9.0
main-cli
WangJunZzz 1 year ago
committed by GitHub
parent
586db445d9 f41823a784
commit
6c0ca38e64
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
173 changed files with 3104 additions and 1074 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. 33
      aspnet-core/Directory.Build.Microsoft.targets
  2. 180
      aspnet-core/Directory.Build.Volo.targets
  3. 32
      aspnet-core/Directory.Build.targets
  4. 4
      aspnet-core/Dockerfile
  5. 131
      aspnet-core/Lion.AbpPro.All.sln
  6. 1
      aspnet-core/Lion.AbpPro.sln
  7. 2
      aspnet-core/frameworks/src/Lion.AbpPro.CAP.EntityFrameworkCore/Lion.AbpPro.CAP.EntityFrameworkCore.csproj
  8. 2
      aspnet-core/frameworks/src/Lion.AbpPro.CAP/Lion.AbpPro.CAP.csproj
  9. 2
      aspnet-core/frameworks/src/Lion.AbpPro.Cli.Core/Lion.AbpPro.Cli.Core.csproj
  10. 2
      aspnet-core/frameworks/src/Lion.AbpPro.Cli/Lion.AbpPro.Cli.csproj
  11. 2
      aspnet-core/frameworks/src/Lion.AbpPro.Core/Lion.AbpPro.Core.csproj
  12. 2
      aspnet-core/frameworks/src/Lion.AbpPro.ElasticSearch/Lion.AbpPro.ElasticSearch.csproj
  13. 2
      aspnet-core/frameworks/src/Lion.AbpPro.EntityFrameworkCore.Mysql/Lion.AbpPro.EntityFrameworkCore.Mysql.csproj
  14. 2
      aspnet-core/frameworks/src/Lion.AbpPro.EntityFrameworkCore/Lion.AbpPro.EntityFrameworkCore.csproj
  15. 44
      aspnet-core/frameworks/src/Lion.AbpPro.EntityFrameworkCore/Lion/AbpPro/EntityFrameworkCore/BatchUtils.cs
  16. 2
      aspnet-core/frameworks/src/Lion.AbpPro.HttpClient/Lion.AbpPro.HttpClient.csproj
  17. 2
      aspnet-core/frameworks/src/Lion.AbpPro.Localization/Lion.AbpPro.Localization.csproj
  18. 2
      aspnet-core/frameworks/src/Lion.AbpPro.Starter/Lion.AbpPro.Starter.csproj
  19. 2
      aspnet-core/frameworks/test/Lion.AbpPro.Core.Cli.Tests/Lion.AbpPro.Core.Cli.Tests.csproj
  20. 2
      aspnet-core/frameworks/test/Lion.AbpPro.Core.Tests/Lion.AbpPro.Core.Tests.csproj
  21. 44
      aspnet-core/frameworks/test/Lion.AbpPro.Core.Tests/System/ExceptionExtensionsTests.cs
  22. 2
      aspnet-core/frameworks/test/Lion.AbpPro.ElasticSearch.Tests/Lion.AbpPro.ElasticSearch.Tests.csproj
  23. 2
      aspnet-core/frameworks/test/Lion.AbpPro.EntityFrameworkCore.Mysql.Tests/Lion.AbpPro.EntityFrameworkCore.Tests.csproj
  24. 2
      aspnet-core/frameworks/test/Lion.AbpPro.Localization.Tests/Lion.AbpPro.Localization.Tests.csproj
  25. 6
      aspnet-core/gateways/Lion.AbpPro.WebGateway/Dockerfile
  26. 2
      aspnet-core/gateways/Lion.AbpPro.WebGateway/Lion.AbpPro.WebGateway.csproj
  27. 15
      aspnet-core/gateways/Lion.AbpPro.WebGateway/Program.cs
  28. 15
      aspnet-core/gateways/Lion.AbpPro.WebGateway/Startup.cs
  29. 7
      aspnet-core/global.json
  30. 2
      aspnet-core/modules/BasicManagement/host/Lion.AbpPro.BasicManagement.HttpApi.Host/Lion.AbpPro.BasicManagement.HttpApi.Host.csproj
  31. 66
      aspnet-core/modules/BasicManagement/host/Lion.AbpPro.BasicManagement.HttpApi.Host/Program.cs
  32. 15
      aspnet-core/modules/BasicManagement/host/Lion.AbpPro.BasicManagement.HttpApi.Host/SerilogToEsExtensions.cs
  33. 15
      aspnet-core/modules/BasicManagement/host/Lion.AbpPro.BasicManagement.HttpApi.Host/Startup.cs
  34. 2
      aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application.Contracts/Lion.AbpPro.BasicManagement.Application.Contracts.csproj
  35. 2
      aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application/Lion.AbpPro.BasicManagement.Application.csproj
  36. 2
      aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Domain.Shared/Lion.AbpPro.BasicManagement.Domain.Shared.csproj
  37. 2
      aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Domain/Lion.AbpPro.BasicManagement.Domain.csproj
  38. 2
      aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.EntityFrameworkCore/Lion.AbpPro.BasicManagement.EntityFrameworkCore.csproj
  39. 2
      aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.HttpApi.Client/Lion.AbpPro.BasicManagement.HttpApi.Client.csproj
  40. 2
      aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.HttpApi/Lion.AbpPro.BasicManagement.HttpApi.csproj
  41. 2
      aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.Application.Tests/Lion.AbpPro.BasicManagement.Application.Tests.csproj
  42. 2
      aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.Domain.Tests/Lion.AbpPro.BasicManagement.Domain.Tests.csproj
  43. 2
      aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.EntityFrameworkCore.Tests/Lion.AbpPro.BasicManagement.EntityFrameworkCore.Tests.csproj
  44. 2
      aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.TestBase/Lion.AbpPro.BasicManagement.TestBase.csproj
  45. 3
      aspnet-core/modules/DataDictionaryManagement/host/Lion.AbpPro.DataDictionaryManagement.HttpApi.Host/Lion.AbpPro.DataDictionaryManagement.HttpApi.Host.csproj
  46. 83
      aspnet-core/modules/DataDictionaryManagement/host/Lion.AbpPro.DataDictionaryManagement.HttpApi.Host/Program.cs
  47. 15
      aspnet-core/modules/DataDictionaryManagement/host/Lion.AbpPro.DataDictionaryManagement.HttpApi.Host/Startup.cs
  48. 2
      aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Application.Contracts/Lion.AbpPro.DataDictionaryManagement.Application.Contracts.csproj
  49. 2
      aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Application/Lion.AbpPro.DataDictionaryManagement.Application.csproj
  50. 2
      aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Domain.Shared/Lion.AbpPro.DataDictionaryManagement.Domain.Shared.csproj
  51. 2
      aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Domain/Lion.AbpPro.DataDictionaryManagement.Domain.csproj
  52. 2
      aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.EntityFrameworkCore/Lion.AbpPro.DataDictionaryManagement.EntityFrameworkCore.csproj
  53. 2
      aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.HttpApi.Client/Lion.AbpPro.DataDictionaryManagement.HttpApi.Client.csproj
  54. 2
      aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.HttpApi/Lion.AbpPro.DataDictionaryManagement.HttpApi.csproj
  55. 2
      aspnet-core/modules/DataDictionaryManagement/test/Lion.AbpPro.DataDictionaryManagement.Application.Tests/Lion.AbpPro.DataDictionaryManagement.Application.Tests.csproj
  56. 2
      aspnet-core/modules/DataDictionaryManagement/test/Lion.AbpPro.DataDictionaryManagement.Domain.Tests/Lion.AbpPro.DataDictionaryManagement.Domain.Tests.csproj
  57. 2
      aspnet-core/modules/DataDictionaryManagement/test/Lion.AbpPro.DataDictionaryManagement.EntityFrameworkCore.Tests/Lion.AbpPro.DataDictionaryManagement.EntityFrameworkCore.Tests.csproj
  58. 2
      aspnet-core/modules/DataDictionaryManagement/test/Lion.AbpPro.DataDictionaryManagement.TestBase/Lion.AbpPro.DataDictionaryManagement.TestBase.csproj
  59. 5
      aspnet-core/modules/FileManagement/host/Lion.AbpPro.FileManagement.HttpApi.Host/Lion.AbpPro.FileManagement.HttpApi.Host.csproj
  60. 62
      aspnet-core/modules/FileManagement/host/Lion.AbpPro.FileManagement.HttpApi.Host/Program.cs
  61. 16
      aspnet-core/modules/FileManagement/host/Lion.AbpPro.FileManagement.HttpApi.Host/Startup.cs
  62. 2
      aspnet-core/modules/FileManagement/src/Lion.AbpPro.FileManagement.Application.Contracts/Lion.AbpPro.FileManagement.Application.Contracts.csproj
  63. 2
      aspnet-core/modules/FileManagement/src/Lion.AbpPro.FileManagement.Application/Lion.AbpPro.FileManagement.Application.csproj
  64. 2
      aspnet-core/modules/FileManagement/src/Lion.AbpPro.FileManagement.Domain.Shared/Lion.AbpPro.FileManagement.Domain.Shared.csproj
  65. 2
      aspnet-core/modules/FileManagement/src/Lion.AbpPro.FileManagement.Domain/Lion.AbpPro.FileManagement.Domain.csproj
  66. 2
      aspnet-core/modules/FileManagement/src/Lion.AbpPro.FileManagement.EntityFrameworkCore/Lion.AbpPro.FileManagement.EntityFrameworkCore.csproj
  67. 2
      aspnet-core/modules/FileManagement/src/Lion.AbpPro.FileManagement.HttpApi.Client/Lion.AbpPro.FileManagement.HttpApi.Client.csproj
  68. 2
      aspnet-core/modules/FileManagement/src/Lion.AbpPro.FileManagement.HttpApi/Lion.AbpPro.FileManagement.HttpApi.csproj
  69. 2
      aspnet-core/modules/FileManagement/test/Lion.AbpPro.FileManagement.Application.Tests/Lion.AbpPro.FileManagement.Application.Tests.csproj
  70. 2
      aspnet-core/modules/FileManagement/test/Lion.AbpPro.FileManagement.Domain.Tests/Lion.AbpPro.FileManagement.Domain.Tests.csproj
  71. 2
      aspnet-core/modules/FileManagement/test/Lion.AbpPro.FileManagement.EntityFrameworkCore.Tests/Lion.AbpPro.FileManagement.EntityFrameworkCore.Tests.csproj
  72. 2
      aspnet-core/modules/FileManagement/test/Lion.AbpPro.FileManagement.TestBase/Lion.AbpPro.FileManagement.TestBase.csproj
  73. 3
      aspnet-core/modules/LanguageManagement/host/Lion.AbpPro.LanguageManagement.HttpApi.Host/Lion.AbpPro.LanguageManagement.HttpApi.Host.csproj
  74. 83
      aspnet-core/modules/LanguageManagement/host/Lion.AbpPro.LanguageManagement.HttpApi.Host/Program.cs
  75. 15
      aspnet-core/modules/LanguageManagement/host/Lion.AbpPro.LanguageManagement.HttpApi.Host/Startup.cs
  76. 2
      aspnet-core/modules/LanguageManagement/src/Lion.AbpPro.LanguageManagement.Application.Contracts/Lion.AbpPro.LanguageManagement.Application.Contracts.csproj
  77. 2
      aspnet-core/modules/LanguageManagement/src/Lion.AbpPro.LanguageManagement.Application/Lion.AbpPro.LanguageManagement.Application.csproj
  78. 2
      aspnet-core/modules/LanguageManagement/src/Lion.AbpPro.LanguageManagement.Domain.Shared/Lion.AbpPro.LanguageManagement.Domain.Shared.csproj
  79. 2
      aspnet-core/modules/LanguageManagement/src/Lion.AbpPro.LanguageManagement.Domain/Lion.AbpPro.LanguageManagement.Domain.csproj
  80. 2
      aspnet-core/modules/LanguageManagement/src/Lion.AbpPro.LanguageManagement.EntityFrameworkCore/Lion.AbpPro.LanguageManagement.EntityFrameworkCore.csproj
  81. 2
      aspnet-core/modules/LanguageManagement/src/Lion.AbpPro.LanguageManagement.HttpApi.Client/Lion.AbpPro.LanguageManagement.HttpApi.Client.csproj
  82. 2
      aspnet-core/modules/LanguageManagement/src/Lion.AbpPro.LanguageManagement.HttpApi/Lion.AbpPro.LanguageManagement.HttpApi.csproj
  83. 2
      aspnet-core/modules/LanguageManagement/test/Lion.AbpPro.LanguageManagement.Application.Tests/Lion.AbpPro.LanguageManagement.Application.Tests.csproj
  84. 2
      aspnet-core/modules/LanguageManagement/test/Lion.AbpPro.LanguageManagement.Domain.Tests/Lion.AbpPro.LanguageManagement.Domain.Tests.csproj
  85. 2
      aspnet-core/modules/LanguageManagement/test/Lion.AbpPro.LanguageManagement.EntityFrameworkCore.Tests/Lion.AbpPro.LanguageManagement.EntityFrameworkCore.Tests.csproj
  86. 2
      aspnet-core/modules/LanguageManagement/test/Lion.AbpPro.LanguageManagement.TestBase/Lion.AbpPro.LanguageManagement.TestBase.csproj
  87. 19
      aspnet-core/modules/NotificationManagement/host/Lion.AbpPro.NotificationManagement.HttpApi.Host/Lion.AbpPro.NotificationManagement.HttpApi.Host.csproj
  88. 62
      aspnet-core/modules/NotificationManagement/host/Lion.AbpPro.NotificationManagement.HttpApi.Host/Program.cs
  89. 18
      aspnet-core/modules/NotificationManagement/host/Lion.AbpPro.NotificationManagement.HttpApi.Host/Startup.cs
  90. 2
      aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Application.Contracts/Lion.AbpPro.NotificationManagement.Application.Contracts.csproj
  91. 2
      aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Application/Lion.AbpPro.NotificationManagement.Application.csproj
  92. 2
      aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Domain.Shared/Lion.AbpPro.NotificationManagement.Domain.Shared.csproj
  93. 2
      aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Domain/Lion.AbpPro.NotificationManagement.Domain.csproj
  94. 2
      aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.EntityFrameworkCore/Lion.AbpPro.NotificationManagement.EntityFrameworkCore.csproj
  95. 2
      aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.HttpApi.Client/Lion.AbpPro.NotificationManagement.HttpApi.Client.csproj
  96. 2
      aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.HttpApi/Lion.AbpPro.NotificationManagement.HttpApi.csproj
  97. 2
      aspnet-core/modules/NotificationManagement/test/Lion.AbpPro.NotificationManagement.Application.Tests/Lion.AbpPro.NotificationManagement.Application.Tests.csproj
  98. 2
      aspnet-core/modules/NotificationManagement/test/Lion.AbpPro.NotificationManagement.Domain.Tests/Lion.AbpPro.NotificationManagement.Domain.Tests.csproj
  99. 2
      aspnet-core/modules/NotificationManagement/test/Lion.AbpPro.NotificationManagement.EntityFrameworkCore.Tests/Lion.AbpPro.NotificationManagement.EntityFrameworkCore.Tests.csproj
  100. 2
      aspnet-core/modules/NotificationManagement/test/Lion.AbpPro.NotificationManagement.TestBase/Lion.AbpPro.NotificationManagement.TestBase.csproj

33
aspnet-core/Directory.Build.Microsoft.targets
View File

@ -1,25 +1,26 @@
<Project> <Project>
<ItemGroup> <ItemGroup>
<PackageReference Update="Microsoft.Extensions.DependencyModel" Version="8.0.0"/> <PackageReference Update="Microsoft.Extensions.DependencyModel" Version="9.0.0"/>
<PackageReference Update="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.0"/> <PackageReference Update="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.0"/>
<PackageReference Update="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.10"/> <PackageReference Update="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.0"/>
<PackageReference Update="Microsoft.EntityFrameworkCore.Tools" Version="8.0.0"/> <PackageReference Update="Microsoft.EntityFrameworkCore.Tools" Version="9.0.0"/>
<PackageReference Update="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="8.0.0"/> <PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="9.0.0" />
<PackageReference Update="Microsoft.EntityFrameworkCore.Proxies" Version="8.0.0"/> <PackageReference Update="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="9.0.0"/>
<PackageReference Update="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="8.0.0"/> <PackageReference Update="Microsoft.EntityFrameworkCore.Proxies" Version="9.0.0"/>
<PackageReference Update="Microsoft.Extensions.Caching.StackExchangeRedis" Version="8.0.0"/> <PackageReference Update="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="9.0.0"/>
<PackageReference Update="Microsoft.Extensions.Http.Polly" Version="8.0.0"/> <PackageReference Update="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.0"/>
<PackageReference Update="Microsoft.EntityFrameworkCore.Abstractions" Version="8.0.0"/> <PackageReference Update="Microsoft.Extensions.Http.Polly" Version="9.0.0"/>
<PackageReference Update="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.4"/> <PackageReference Update="Microsoft.EntityFrameworkCore.Abstractions" Version="9.0.0"/>
<PackageReference Update="Microsoft.Extensions.FileProviders.Embedded" Version="9.0.0"/>
<PackageReference Update="Microsoft.Extensions.Hosting" Version="8.0.0" /> <PackageReference Update="Microsoft.Extensions.Hosting" Version="9.0.0" />
<PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="8.0.0" /> <PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
<PackageReference Update="Microsoft.Extensions.Http" Version="8.0.0"/> <PackageReference Update="Microsoft.Extensions.Http" Version="9.0.0"/>
<PackageReference Update="Microsoft.AspNetCore.Mvc.Core" Version="2.2.0"/> <PackageReference Update="Microsoft.AspNetCore.Mvc.Core" Version="2.2.0"/>
<PackageReference Update="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0"/> <PackageReference Update="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0"/>
<PackageReference Update="Microsoft.CSharp" Version="4.7.0"/> <PackageReference Update="Microsoft.CSharp" Version="4.12.0"/>
<PackageReference Update="Microsoft.CodeAnalysis.CSharp" Version="3.7.0"/> <PackageReference Update="Microsoft.CodeAnalysis.CSharp" Version="4.12.0"/>
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.8.0"/> <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.8.0"/>
</ItemGroup> </ItemGroup>
</Project> </Project>

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

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

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

@ -28,14 +28,14 @@
<PackageReference Update="Ocelot.Provider.Polly" Version="18.0.0"/> <PackageReference Update="Ocelot.Provider.Polly" Version="18.0.0"/>
<!-- FreeSql--> <!-- FreeSql-->
<PackageReference Update="FreeSql" Version="3.2.806"/> <PackageReference Update="FreeSql" Version="3.5.104"/>
<PackageReference Update="FreeSql.Provider.MysqlConnector" Version="3.2.806"/> <PackageReference Update="FreeSql.Provider.MysqlConnector" Version="3.5.104"/>
<PackageReference Update="FreeSql.Provider.Sqlite" Version="3.2.806"/> <PackageReference Update="FreeSql.Provider.Sqlite" Version="3.2.806"/>
<!-- 单元测试包--> <!-- 单元测试包-->
<PackageReference Update="xunit" Version="2.6.1"/> <PackageReference Update="xunit" Version="2.9.2"/>
<PackageReference Update="xunit.extensibility.execution" Version="2.6.1"/> <PackageReference Update="xunit.extensibility.execution" Version="2.9.2"/>
<PackageReference Update="xunit.runner.visualstudio" Version="2.5.3"/> <PackageReference Update="xunit.runner.visualstudio" Version="2.8.2"/>
<PackageReference Update="NSubstitute" Version="5.1.0"/> <PackageReference Update="NSubstitute" Version="5.1.0"/>
<PackageReference Update="Shouldly" Version="4.2.1"/> <PackageReference Update="Shouldly" Version="4.2.1"/>
<PackageReference Update="coverlet.collector" Version="6.0.0"/> <PackageReference Update="coverlet.collector" Version="6.0.0"/>
@ -54,21 +54,23 @@
<PackageReference Update="Savorboard.CAP.InMemoryMessageQueue" Version="7.0.0"/> <PackageReference Update="Savorboard.CAP.InMemoryMessageQueue" Version="7.0.0"/>
<!-- Swagger--> <!-- Swagger-->
<PackageReference Update="Swashbuckle.AspNetCore.SwaggerUI" Version="6.5.0"/> <PackageReference Update="Swashbuckle.AspNetCore.SwaggerUI" Version="6.8.1"/>
<PackageReference Update="Swashbuckle.AspNetCore" Version="6.5.0"/> <PackageReference Update="Swashbuckle.AspNetCore" Version="6.8.1"/>
<PackageReference Update="Swashbuckle.AspNetCore.Annotations" Version="6.5.0"/> <PackageReference Update="Swashbuckle.AspNetCore.Annotations" Version="6.5.0"/>
<!-- Serilog 日志--> <!-- Serilog 日志-->
<PackageReference Update="Serilog" Version="3.1.1"/> <PackageReference Update="Serilog" Version="4.0.2"/>
<PackageReference Update="Serilog.Extensions.Logging" Version="8.0.0"/> <PackageReference Update="Serilog.Extensions.Logging" Version="8.0.0"/>
<PackageReference Update="Serilog.Sinks.Async" Version="1.5.0"/> <PackageReference Update="Serilog.Sinks.Async" Version="2.0.0"/>
<PackageReference Update="Serilog.Sinks.File" Version="5.0.0"/> <PackageReference Update="Serilog.Sinks.File" Version="6.0.0"/>
<PackageReference Update="Serilog.Sinks.Console" Version="5.0.0"/> <PackageReference Update="Serilog.Sinks.Console" Version="6.0.0"/>
<PackageReference Update="Serilog.AspNetCore" Version="8.0.0"/> <PackageReference Update="Serilog.AspNetCore" Version="8.0.2"/>
<PackageReference Update="Serilog.Exceptions" Version="8.4.0"/> <PackageReference Update="Serilog.Exceptions" Version="8.4.0"/>
<PackageReference Update="Serilog.Settings.Configuration" Version="8.0.0"/> <PackageReference Update="Serilog.Settings.Configuration" Version="8.0.2"/>
<PackageReference Update="Serilog.Sinks.Elasticsearch" Version="9.0.3"/> <PackageReference Update="Serilog.Sinks.Elasticsearch" Version="9.0.3"/>
<!-- Magicodes 导入导出Excel--> <!-- Magicodes 导入导出Excel-->
<PackageReference Update="Magicodes.IE.Excel" Version="2.7.4.5"/> <PackageReference Update="Magicodes.IE.Excel" Version="2.7.4.5"/>
<PackageReference Update="Magicodes.IE.Excel.AspNetCore" Version="2.7.4.5"/> <PackageReference Update="Magicodes.IE.Excel.AspNetCore" Version="2.7.4.5"/>
@ -79,7 +81,7 @@
<PackageReference Update="MiniProfiler.Shared" Version="4.3.8"/> <PackageReference Update="MiniProfiler.Shared" Version="4.3.8"/>
<!-- Polly 重试机制--> <!-- Polly 重试机制-->
<PackageReference Update="Polly" Version="8.2.0"/> <PackageReference Update="Polly" Version="8.5.0"/>
<!-- Octokit 邮件--> <!-- Octokit 邮件-->
<PackageReference Update="Octokit" Version="9.0.0"/> <PackageReference Update="Octokit" Version="9.0.0"/>
@ -90,7 +92,7 @@
<!-- NEST ElasticSearch--> <!-- NEST ElasticSearch-->
<PackageReference Update="NEST" Version="7.17.5"/> <PackageReference Update="NEST" Version="7.17.5"/>
<PackageReference Update="WebApiClientCore" Version="2.1.4" /> <PackageReference Update="WebApiClientCore" Version="2.1.5" />
<!-- redis分布式锁--> <!-- redis分布式锁-->
<PackageReference Update="DistributedLock.Redis" Version="1.0.3" /> <PackageReference Update="DistributedLock.Redis" Version="1.0.3" />

4
aspnet-core/Dockerfile
View File

@ -1,11 +1,11 @@
FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base
WORKDIR /app WORKDIR /app
EXPOSE 8080 EXPOSE 8080
EXPOSE 443 EXPOSE 443
ENV TZ=Asia/Shanghai ENV TZ=Asia/Shanghai
ENV ASPNETCORE_ENVIRONMENT=Production ENV ASPNETCORE_ENVIRONMENT=Production
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
WORKDIR /src WORKDIR /src
COPY . . COPY . .
WORKDIR "/src/services/host/Lion.AbpPro.HttpApi.Host" WORKDIR "/src/services/host/Lion.AbpPro.HttpApi.Host"

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

@ -39,7 +39,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "0.Solution Items", "0.Solut
Directory.Build.Microsoft.targets = Directory.Build.Microsoft.targets Directory.Build.Microsoft.targets = Directory.Build.Microsoft.targets
Directory.Build.targets = Directory.Build.targets Directory.Build.targets = Directory.Build.targets
Directory.Build.Volo.targets = Directory.Build.Volo.targets Directory.Build.Volo.targets = Directory.Build.Volo.targets
global.json = global.json
NuGet.Config = NuGet.Config NuGet.Config = NuGet.Config
..\Readme.md = ..\Readme.md ..\Readme.md = ..\Readme.md
EndProjectSection EndProjectSection
@ -254,7 +253,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "module", "module", "{9FC033
..\templates\abp-vnext-pro-nuget-module\Directory.Build.Microsoft.targets = ..\templates\abp-vnext-pro-nuget-module\Directory.Build.Microsoft.targets ..\templates\abp-vnext-pro-nuget-module\Directory.Build.Microsoft.targets = ..\templates\abp-vnext-pro-nuget-module\Directory.Build.Microsoft.targets
..\templates\abp-vnext-pro-nuget-module\Directory.Build.targets = ..\templates\abp-vnext-pro-nuget-module\Directory.Build.targets ..\templates\abp-vnext-pro-nuget-module\Directory.Build.targets = ..\templates\abp-vnext-pro-nuget-module\Directory.Build.targets
..\templates\abp-vnext-pro-nuget-module\Directory.Build.Volo.targets = ..\templates\abp-vnext-pro-nuget-module\Directory.Build.Volo.targets ..\templates\abp-vnext-pro-nuget-module\Directory.Build.Volo.targets = ..\templates\abp-vnext-pro-nuget-module\Directory.Build.Volo.targets
..\templates\abp-vnext-pro-nuget-module\global.json = ..\templates\abp-vnext-pro-nuget-module\global.json
..\templates\abp-vnext-pro-nuget-module\NuGet.Config = ..\templates\abp-vnext-pro-nuget-module\NuGet.Config ..\templates\abp-vnext-pro-nuget-module\NuGet.Config = ..\templates\abp-vnext-pro-nuget-module\NuGet.Config
EndProjectSection EndProjectSection
EndProject EndProject
@ -288,33 +286,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.MyModuleName.HttpApi.Host", "..\templates\abp-vnext-pro-nuget-module\host\MyCompanyName.MyProjectName.MyModuleName.HttpApi.Host\MyCompanyName.MyProjectName.MyModuleName.HttpApi.Host.csproj", "{4A970FA4-1C4F-426C-A0DC-0E36B1BA0FDE}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.MyModuleName.HttpApi.Host", "..\templates\abp-vnext-pro-nuget-module\host\MyCompanyName.MyProjectName.MyModuleName.HttpApi.Host\MyCompanyName.MyProjectName.MyModuleName.HttpApi.Host.csproj", "{4A970FA4-1C4F-426C-A0DC-0E36B1BA0FDE}"
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "simplify", "simplify", "{43CB54D7-3511-40F4-BC70-9A34E09D7A62}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "all", "all", "{6A40770E-9DE1-4F15-80E8-8FCA090A749C}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "all", "all", "{6A40770E-9DE1-4F15-80E8-8FCA090A749C}"
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "aspnet-core", "aspnet-core", "{7B757E2D-B5A1-4BFE-9BB2-93CD04E4B28B}"
ProjectSection(SolutionItems) = preProject
..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\Directory.Build.Lion.targets = ..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\Directory.Build.Lion.targets
..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\Directory.Build.Microsoft.targets = ..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\Directory.Build.Microsoft.targets
..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\Directory.Build.targets = ..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\Directory.Build.targets
..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\Directory.Build.Volo.targets = ..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\Directory.Build.Volo.targets
..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\global.json = ..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\global.json
..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\NuGet.Config = ..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\NuGet.Config
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C7AEB4C8-BAE7-4A19-B96E-011FA56ED6A5}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{18E9B97A-3897-4DA8-810E-4435A777ABA7}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "host", "host", "{09CFDF18-4924-44D4-A987-EB9713787FF8}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "aspnet-core", "aspnet-core", "{11801334-CC4A-45F3-BD38-793D4F9D4D4F}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "aspnet-core", "aspnet-core", "{11801334-CC4A-45F3-BD38-793D4F9D4D4F}"
ProjectSection(SolutionItems) = preProject ProjectSection(SolutionItems) = preProject
..\templates\abp-vnext-pro-nuget-all\aspnet-core\Directory.Build.Lion.targets = ..\templates\abp-vnext-pro-nuget-all\aspnet-core\Directory.Build.Lion.targets ..\templates\abp-vnext-pro-nuget-all\aspnet-core\Directory.Build.Lion.targets = ..\templates\abp-vnext-pro-nuget-all\aspnet-core\Directory.Build.Lion.targets
..\templates\abp-vnext-pro-nuget-all\aspnet-core\Directory.Build.Microsoft.targets = ..\templates\abp-vnext-pro-nuget-all\aspnet-core\Directory.Build.Microsoft.targets ..\templates\abp-vnext-pro-nuget-all\aspnet-core\Directory.Build.Microsoft.targets = ..\templates\abp-vnext-pro-nuget-all\aspnet-core\Directory.Build.Microsoft.targets
..\templates\abp-vnext-pro-nuget-all\aspnet-core\Directory.Build.targets = ..\templates\abp-vnext-pro-nuget-all\aspnet-core\Directory.Build.targets ..\templates\abp-vnext-pro-nuget-all\aspnet-core\Directory.Build.targets = ..\templates\abp-vnext-pro-nuget-all\aspnet-core\Directory.Build.targets
..\templates\abp-vnext-pro-nuget-all\aspnet-core\Directory.Build.Volo.targets = ..\templates\abp-vnext-pro-nuget-all\aspnet-core\Directory.Build.Volo.targets ..\templates\abp-vnext-pro-nuget-all\aspnet-core\Directory.Build.Volo.targets = ..\templates\abp-vnext-pro-nuget-all\aspnet-core\Directory.Build.Volo.targets
..\templates\abp-vnext-pro-nuget-all\aspnet-core\global.json = ..\templates\abp-vnext-pro-nuget-all\aspnet-core\global.json
..\templates\abp-vnext-pro-nuget-all\aspnet-core\NuGet.Config = ..\templates\abp-vnext-pro-nuget-all\aspnet-core\NuGet.Config ..\templates\abp-vnext-pro-nuget-all\aspnet-core\NuGet.Config = ..\templates\abp-vnext-pro-nuget-all\aspnet-core\NuGet.Config
EndProjectSection EndProjectSection
EndProject EndProject
@ -354,36 +333,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.HttpApi.Host", "..\templates\abp-vnext-pro-nuget-all\aspnet-core\host\MyCompanyName.MyProjectName.HttpApi.Host\MyCompanyName.MyProjectName.HttpApi.Host.csproj", "{67B45B2E-9682-417D-964B-30DBCE4321CE}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.HttpApi.Host", "..\templates\abp-vnext-pro-nuget-all\aspnet-core\host\MyCompanyName.MyProjectName.HttpApi.Host\MyCompanyName.MyProjectName.HttpApi.Host.csproj", "{67B45B2E-9682-417D-964B-30DBCE4321CE}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.Domain.Shared", "..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\src\MyCompanyName.MyProjectName.Domain.Shared\MyCompanyName.MyProjectName.Domain.Shared.csproj", "{F4F5C1F7-28F3-4297-ACD7-DBB6E6F89E68}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.Domain", "..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\src\MyCompanyName.MyProjectName.Domain\MyCompanyName.MyProjectName.Domain.csproj", "{504A06C9-2A3D-4456-8F61-DCB35C6F93F3}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.EntityFrameworkCore", "..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\src\MyCompanyName.MyProjectName.EntityFrameworkCore\MyCompanyName.MyProjectName.EntityFrameworkCore.csproj", "{07982F9D-F65B-4FDA-8CF6-1D0A9EAA32B8}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.DbMigrator", "..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\src\MyCompanyName.MyProjectName.DbMigrator\MyCompanyName.MyProjectName.DbMigrator.csproj", "{9749B052-5F3D-4442-9B2E-9EC798457DB5}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.Application", "..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\src\MyCompanyName.MyProjectName.Application\MyCompanyName.MyProjectName.Application.csproj", "{2161EFEA-7654-4810-85A0-18293825FFBC}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.Application.Contracts", "..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\src\MyCompanyName.MyProjectName.Application.Contracts\MyCompanyName.MyProjectName.Application.Contracts.csproj", "{4E4856BA-A71F-4753-A497-6F3D197BB455}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.FreeSqlRepository", "..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\src\MyCompanyName.MyProjectName.FreeSqlRepository\MyCompanyName.MyProjectName.FreeSqlRepository.csproj", "{ABA5A546-28DB-4E54-987D-D828B2F79B9D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.HttpApi", "..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\src\MyCompanyName.MyProjectName.HttpApi\MyCompanyName.MyProjectName.HttpApi.csproj", "{50E73D29-F11D-4CBD-8A85-CC34F4DE8C31}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.HttpApi.Client", "..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\src\MyCompanyName.MyProjectName.HttpApi.Client\MyCompanyName.MyProjectName.HttpApi.Client.csproj", "{B66BDD25-49B8-4823-A678-93BC081D65ED}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.HttpApi.Host", "..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\host\MyCompanyName.MyProjectName.HttpApi.Host\MyCompanyName.MyProjectName.HttpApi.Host.csproj", "{04635BE3-67F0-4AB6-BB68-607E73040F07}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.TestBase", "..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\test\MyCompanyName.MyProjectName.TestBase\MyCompanyName.MyProjectName.TestBase.csproj", "{75DE5DA1-8EDA-42EE-8570-169713ECB9CD}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp", "..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\test\MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp\MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp.csproj", "{AF943646-1D48-492D-8C7A-48606F7B36B0}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.EntityFrameworkCore.Tests", "..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\test\MyCompanyName.MyProjectName.EntityFrameworkCore.Tests\MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.csproj", "{80125670-3650-4E72-A172-CA852FE5C98D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.Domain.Tests", "..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\test\MyCompanyName.MyProjectName.Domain.Tests\MyCompanyName.MyProjectName.Domain.Tests.csproj", "{4C8B284F-A216-4812-912F-7CC6F428CDF6}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.Application.Tests", "..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\test\MyCompanyName.MyProjectName.Application.Tests\MyCompanyName.MyProjectName.Application.Tests.csproj", "{2DDC4639-710D-4B9C-98E0-03288184B37C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lion.AbpPro.Core.Cli.Tests", "frameworks\test\Lion.AbpPro.Core.Cli.Tests\Lion.AbpPro.Core.Cli.Tests.csproj", "{9B65C2C8-E94E-46FD-9841-70DFAE5C85E9}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lion.AbpPro.Core.Cli.Tests", "frameworks\test\Lion.AbpPro.Core.Cli.Tests\Lion.AbpPro.Core.Cli.Tests.csproj", "{9B65C2C8-E94E-46FD-9841-70DFAE5C85E9}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.WebGateway", "..\templates\abp-vnext-pro-nuget-all\aspnet-core\host\MyCompanyName.MyProjectName.WebGateway\MyCompanyName.MyProjectName.WebGateway.csproj", "{4C57F50E-50BE-4C1A-BBA3-9D0DA5BF4D6F}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.WebGateway", "..\templates\abp-vnext-pro-nuget-all\aspnet-core\host\MyCompanyName.MyProjectName.WebGateway\MyCompanyName.MyProjectName.WebGateway.csproj", "{4C57F50E-50BE-4C1A-BBA3-9D0DA5BF4D6F}"
@ -862,66 +811,6 @@ Global
{67B45B2E-9682-417D-964B-30DBCE4321CE}.Debug|Any CPU.Build.0 = Debug|Any CPU {67B45B2E-9682-417D-964B-30DBCE4321CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{67B45B2E-9682-417D-964B-30DBCE4321CE}.Release|Any CPU.ActiveCfg = Release|Any CPU {67B45B2E-9682-417D-964B-30DBCE4321CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{67B45B2E-9682-417D-964B-30DBCE4321CE}.Release|Any CPU.Build.0 = Release|Any CPU {67B45B2E-9682-417D-964B-30DBCE4321CE}.Release|Any CPU.Build.0 = Release|Any CPU
{F4F5C1F7-28F3-4297-ACD7-DBB6E6F89E68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F4F5C1F7-28F3-4297-ACD7-DBB6E6F89E68}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F4F5C1F7-28F3-4297-ACD7-DBB6E6F89E68}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F4F5C1F7-28F3-4297-ACD7-DBB6E6F89E68}.Release|Any CPU.Build.0 = Release|Any CPU
{504A06C9-2A3D-4456-8F61-DCB35C6F93F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{504A06C9-2A3D-4456-8F61-DCB35C6F93F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{504A06C9-2A3D-4456-8F61-DCB35C6F93F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{504A06C9-2A3D-4456-8F61-DCB35C6F93F3}.Release|Any CPU.Build.0 = Release|Any CPU
{07982F9D-F65B-4FDA-8CF6-1D0A9EAA32B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{07982F9D-F65B-4FDA-8CF6-1D0A9EAA32B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{07982F9D-F65B-4FDA-8CF6-1D0A9EAA32B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{07982F9D-F65B-4FDA-8CF6-1D0A9EAA32B8}.Release|Any CPU.Build.0 = Release|Any CPU
{9749B052-5F3D-4442-9B2E-9EC798457DB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9749B052-5F3D-4442-9B2E-9EC798457DB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9749B052-5F3D-4442-9B2E-9EC798457DB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9749B052-5F3D-4442-9B2E-9EC798457DB5}.Release|Any CPU.Build.0 = Release|Any CPU
{2161EFEA-7654-4810-85A0-18293825FFBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2161EFEA-7654-4810-85A0-18293825FFBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2161EFEA-7654-4810-85A0-18293825FFBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2161EFEA-7654-4810-85A0-18293825FFBC}.Release|Any CPU.Build.0 = Release|Any CPU
{4E4856BA-A71F-4753-A497-6F3D197BB455}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4E4856BA-A71F-4753-A497-6F3D197BB455}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4E4856BA-A71F-4753-A497-6F3D197BB455}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4E4856BA-A71F-4753-A497-6F3D197BB455}.Release|Any CPU.Build.0 = Release|Any CPU
{ABA5A546-28DB-4E54-987D-D828B2F79B9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{ABA5A546-28DB-4E54-987D-D828B2F79B9D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{ABA5A546-28DB-4E54-987D-D828B2F79B9D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{ABA5A546-28DB-4E54-987D-D828B2F79B9D}.Release|Any CPU.Build.0 = Release|Any CPU
{50E73D29-F11D-4CBD-8A85-CC34F4DE8C31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{50E73D29-F11D-4CBD-8A85-CC34F4DE8C31}.Debug|Any CPU.Build.0 = Debug|Any CPU
{50E73D29-F11D-4CBD-8A85-CC34F4DE8C31}.Release|Any CPU.ActiveCfg = Release|Any CPU
{50E73D29-F11D-4CBD-8A85-CC34F4DE8C31}.Release|Any CPU.Build.0 = Release|Any CPU
{B66BDD25-49B8-4823-A678-93BC081D65ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B66BDD25-49B8-4823-A678-93BC081D65ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B66BDD25-49B8-4823-A678-93BC081D65ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B66BDD25-49B8-4823-A678-93BC081D65ED}.Release|Any CPU.Build.0 = Release|Any CPU
{04635BE3-67F0-4AB6-BB68-607E73040F07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{04635BE3-67F0-4AB6-BB68-607E73040F07}.Debug|Any CPU.Build.0 = Debug|Any CPU
{04635BE3-67F0-4AB6-BB68-607E73040F07}.Release|Any CPU.ActiveCfg = Release|Any CPU
{04635BE3-67F0-4AB6-BB68-607E73040F07}.Release|Any CPU.Build.0 = Release|Any CPU
{75DE5DA1-8EDA-42EE-8570-169713ECB9CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{75DE5DA1-8EDA-42EE-8570-169713ECB9CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{75DE5DA1-8EDA-42EE-8570-169713ECB9CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{75DE5DA1-8EDA-42EE-8570-169713ECB9CD}.Release|Any CPU.Build.0 = Release|Any CPU
{AF943646-1D48-492D-8C7A-48606F7B36B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AF943646-1D48-492D-8C7A-48606F7B36B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AF943646-1D48-492D-8C7A-48606F7B36B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AF943646-1D48-492D-8C7A-48606F7B36B0}.Release|Any CPU.Build.0 = Release|Any CPU
{80125670-3650-4E72-A172-CA852FE5C98D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{80125670-3650-4E72-A172-CA852FE5C98D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{80125670-3650-4E72-A172-CA852FE5C98D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{80125670-3650-4E72-A172-CA852FE5C98D}.Release|Any CPU.Build.0 = Release|Any CPU
{4C8B284F-A216-4812-912F-7CC6F428CDF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4C8B284F-A216-4812-912F-7CC6F428CDF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4C8B284F-A216-4812-912F-7CC6F428CDF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4C8B284F-A216-4812-912F-7CC6F428CDF6}.Release|Any CPU.Build.0 = Release|Any CPU
{2DDC4639-710D-4B9C-98E0-03288184B37C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2DDC4639-710D-4B9C-98E0-03288184B37C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2DDC4639-710D-4B9C-98E0-03288184B37C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2DDC4639-710D-4B9C-98E0-03288184B37C}.Release|Any CPU.Build.0 = Release|Any CPU
{9B65C2C8-E94E-46FD-9841-70DFAE5C85E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9B65C2C8-E94E-46FD-9841-70DFAE5C85E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9B65C2C8-E94E-46FD-9841-70DFAE5C85E9}.Debug|Any CPU.Build.0 = Debug|Any CPU {9B65C2C8-E94E-46FD-9841-70DFAE5C85E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9B65C2C8-E94E-46FD-9841-70DFAE5C85E9}.Release|Any CPU.ActiveCfg = Release|Any CPU {9B65C2C8-E94E-46FD-9841-70DFAE5C85E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
@ -1087,12 +976,7 @@ Global
{71B2D69D-C193-4EF9-AF84-70105B653DF0} = {634E34FF-58F4-4FE9-BE51-3B8F6BD9CA70} {71B2D69D-C193-4EF9-AF84-70105B653DF0} = {634E34FF-58F4-4FE9-BE51-3B8F6BD9CA70}
{F779A92C-38ED-4301-8899-6C3FE63DFD72} = {634E34FF-58F4-4FE9-BE51-3B8F6BD9CA70} {F779A92C-38ED-4301-8899-6C3FE63DFD72} = {634E34FF-58F4-4FE9-BE51-3B8F6BD9CA70}
{4A970FA4-1C4F-426C-A0DC-0E36B1BA0FDE} = {7AF66531-6B7B-4F27-BDEF-308FD9C2E286} {4A970FA4-1C4F-426C-A0DC-0E36B1BA0FDE} = {7AF66531-6B7B-4F27-BDEF-308FD9C2E286}
{43CB54D7-3511-40F4-BC70-9A34E09D7A62} = {E57C6A28-1879-4E83-9B0D-E665824A1F4B}
{6A40770E-9DE1-4F15-80E8-8FCA090A749C} = {E57C6A28-1879-4E83-9B0D-E665824A1F4B} {6A40770E-9DE1-4F15-80E8-8FCA090A749C} = {E57C6A28-1879-4E83-9B0D-E665824A1F4B}
{7B757E2D-B5A1-4BFE-9BB2-93CD04E4B28B} = {43CB54D7-3511-40F4-BC70-9A34E09D7A62}
{C7AEB4C8-BAE7-4A19-B96E-011FA56ED6A5} = {7B757E2D-B5A1-4BFE-9BB2-93CD04E4B28B}
{18E9B97A-3897-4DA8-810E-4435A777ABA7} = {7B757E2D-B5A1-4BFE-9BB2-93CD04E4B28B}
{09CFDF18-4924-44D4-A987-EB9713787FF8} = {7B757E2D-B5A1-4BFE-9BB2-93CD04E4B28B}
{11801334-CC4A-45F3-BD38-793D4F9D4D4F} = {6A40770E-9DE1-4F15-80E8-8FCA090A749C} {11801334-CC4A-45F3-BD38-793D4F9D4D4F} = {6A40770E-9DE1-4F15-80E8-8FCA090A749C}
{AF8A0F3B-B346-466C-87F7-F2405E6158FE} = {11801334-CC4A-45F3-BD38-793D4F9D4D4F} {AF8A0F3B-B346-466C-87F7-F2405E6158FE} = {11801334-CC4A-45F3-BD38-793D4F9D4D4F}
{EA151482-0987-49E0-96A8-2CD876BC8B6E} = {11801334-CC4A-45F3-BD38-793D4F9D4D4F} {EA151482-0987-49E0-96A8-2CD876BC8B6E} = {11801334-CC4A-45F3-BD38-793D4F9D4D4F}
@ -1112,21 +996,6 @@ Global
{EA034B8C-9CF1-498D-AC74-FF2F039FE37A} = {15456C15-58A1-45F6-BBA7-53504210B30D} {EA034B8C-9CF1-498D-AC74-FF2F039FE37A} = {15456C15-58A1-45F6-BBA7-53504210B30D}
{87F0ECFB-144F-499E-995E-F2B61DC20015} = {15456C15-58A1-45F6-BBA7-53504210B30D} {87F0ECFB-144F-499E-995E-F2B61DC20015} = {15456C15-58A1-45F6-BBA7-53504210B30D}
{67B45B2E-9682-417D-964B-30DBCE4321CE} = {EA151482-0987-49E0-96A8-2CD876BC8B6E} {67B45B2E-9682-417D-964B-30DBCE4321CE} = {EA151482-0987-49E0-96A8-2CD876BC8B6E}
{F4F5C1F7-28F3-4297-ACD7-DBB6E6F89E68} = {C7AEB4C8-BAE7-4A19-B96E-011FA56ED6A5}
{504A06C9-2A3D-4456-8F61-DCB35C6F93F3} = {C7AEB4C8-BAE7-4A19-B96E-011FA56ED6A5}
{07982F9D-F65B-4FDA-8CF6-1D0A9EAA32B8} = {C7AEB4C8-BAE7-4A19-B96E-011FA56ED6A5}
{9749B052-5F3D-4442-9B2E-9EC798457DB5} = {C7AEB4C8-BAE7-4A19-B96E-011FA56ED6A5}
{2161EFEA-7654-4810-85A0-18293825FFBC} = {C7AEB4C8-BAE7-4A19-B96E-011FA56ED6A5}
{4E4856BA-A71F-4753-A497-6F3D197BB455} = {C7AEB4C8-BAE7-4A19-B96E-011FA56ED6A5}
{ABA5A546-28DB-4E54-987D-D828B2F79B9D} = {C7AEB4C8-BAE7-4A19-B96E-011FA56ED6A5}
{50E73D29-F11D-4CBD-8A85-CC34F4DE8C31} = {C7AEB4C8-BAE7-4A19-B96E-011FA56ED6A5}
{B66BDD25-49B8-4823-A678-93BC081D65ED} = {C7AEB4C8-BAE7-4A19-B96E-011FA56ED6A5}
{04635BE3-67F0-4AB6-BB68-607E73040F07} = {09CFDF18-4924-44D4-A987-EB9713787FF8}
{75DE5DA1-8EDA-42EE-8570-169713ECB9CD} = {18E9B97A-3897-4DA8-810E-4435A777ABA7}
{AF943646-1D48-492D-8C7A-48606F7B36B0} = {18E9B97A-3897-4DA8-810E-4435A777ABA7}
{80125670-3650-4E72-A172-CA852FE5C98D} = {18E9B97A-3897-4DA8-810E-4435A777ABA7}
{4C8B284F-A216-4812-912F-7CC6F428CDF6} = {18E9B97A-3897-4DA8-810E-4435A777ABA7}
{2DDC4639-710D-4B9C-98E0-03288184B37C} = {18E9B97A-3897-4DA8-810E-4435A777ABA7}
{9B65C2C8-E94E-46FD-9841-70DFAE5C85E9} = {EFC415F8-872F-4C7E-8645-31A51481BCFC} {9B65C2C8-E94E-46FD-9841-70DFAE5C85E9} = {EFC415F8-872F-4C7E-8645-31A51481BCFC}
{4C57F50E-50BE-4C1A-BBA3-9D0DA5BF4D6F} = {EA151482-0987-49E0-96A8-2CD876BC8B6E} {4C57F50E-50BE-4C1A-BBA3-9D0DA5BF4D6F} = {EA151482-0987-49E0-96A8-2CD876BC8B6E}
{021B499E-ABED-4D1D-B6EB-DC453B5A57A6} = {7BE85EBC-99AD-4CDE-957E-4BDD087FC4E3} {021B499E-ABED-4D1D-B6EB-DC453B5A57A6} = {7BE85EBC-99AD-4CDE-957E-4BDD087FC4E3}

1
aspnet-core/Lion.AbpPro.sln
View File

@ -36,7 +36,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "services", "services", "{2C
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "0.Solution Items", "0.Solution Items", "{2C4A6DB8-8D9E-42E6-B7C3-1EDB7B3DE22E}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "0.Solution Items", "0.Solution Items", "{2C4A6DB8-8D9E-42E6-B7C3-1EDB7B3DE22E}"
ProjectSection(SolutionItems) = preProject ProjectSection(SolutionItems) = preProject
global.json = global.json
NuGet.Config = NuGet.Config NuGet.Config = NuGet.Config
Directory.Build.Microsoft.targets = Directory.Build.Microsoft.targets Directory.Build.Microsoft.targets = Directory.Build.Microsoft.targets
Directory.Build.targets = Directory.Build.targets Directory.Build.targets = Directory.Build.targets

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

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<RootNamespace /> <RootNamespace />
<AssemblyName>Lion.AbpPro.CAP.EntityFrameworkCore</AssemblyName> <AssemblyName>Lion.AbpPro.CAP.EntityFrameworkCore</AssemblyName>

2
aspnet-core/frameworks/src/Lion.AbpPro.CAP/Lion.AbpPro.CAP.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<RootNamespace /> <RootNamespace />
<AssemblyName>Lion.AbpPro.CAP</AssemblyName> <AssemblyName>Lion.AbpPro.CAP</AssemblyName>
</PropertyGroup> </PropertyGroup>

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

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<RootNamespace /> <RootNamespace />
</PropertyGroup> </PropertyGroup>

2
aspnet-core/frameworks/src/Lion.AbpPro.Cli/Lion.AbpPro.Cli.csproj
View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<PackAsTool>true</PackAsTool> <PackAsTool>true</PackAsTool>
<PackageId>Lion.AbpPro.Cli</PackageId> <PackageId>Lion.AbpPro.Cli</PackageId>
<ToolCommandName>lion.abp</ToolCommandName> <ToolCommandName>lion.abp</ToolCommandName>

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

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<AssemblyName>Lion.AbpPro.Core</AssemblyName> <AssemblyName>Lion.AbpPro.Core</AssemblyName>
<RootNamespace /> <RootNamespace />
</PropertyGroup> </PropertyGroup>

2
aspnet-core/frameworks/src/Lion.AbpPro.ElasticSearch/Lion.AbpPro.ElasticSearch.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<RootNamespace /> <RootNamespace />
</PropertyGroup> </PropertyGroup>

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

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<RootNamespace /> <RootNamespace />
</PropertyGroup> </PropertyGroup>

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

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<RootNamespace /> <RootNamespace />

44
aspnet-core/frameworks/src/Lion.AbpPro.EntityFrameworkCore/Lion/AbpPro/EntityFrameworkCore/BatchUtils.cs
View File

@ -111,28 +111,28 @@
} }
} }
//this method is from source code ef core // //this method is from source code ef core
public static bool IsNonComposedSetOperation(SelectExpression selectExpression) // public static bool IsNonComposedSetOperation(SelectExpression selectExpression)
{ // {
if (selectExpression.Offset == null && selectExpression.Limit == null && !selectExpression.IsDistinct && selectExpression.Predicate == null && selectExpression.Having == null && selectExpression.Orderings.Count == 0 && selectExpression.GroupBy.Count == 0 && selectExpression.Tables.Count == 1) // if (selectExpression.Offset == null && selectExpression.Limit == null && !selectExpression.IsDistinct && selectExpression.Predicate == null && selectExpression.Having == null && selectExpression.Orderings.Count == 0 && selectExpression.GroupBy.Count == 0 && selectExpression.Tables.Count == 1)
{ // {
TableExpressionBase tableExpressionBase = selectExpression.Tables[0]; // TableExpressionBase tableExpressionBase = selectExpression.Tables[0];
SetOperationBase setOperation = tableExpressionBase as SetOperationBase; // SetOperationBase setOperation = tableExpressionBase as SetOperationBase;
if (setOperation != null && selectExpression.Projection.Count == setOperation.Source1.Projection.Count) // if (setOperation != null && selectExpression.Projection.Count == setOperation.Source1.Projection.Count)
{ // {
return selectExpression.Projection.Select(delegate (ProjectionExpression pe, int index) // return selectExpression.Projection.Select(delegate (ProjectionExpression pe, int index)
{ // {
ColumnExpression columnExpression = pe.Expression as ColumnExpression; // ColumnExpression columnExpression = pe.Expression as ColumnExpression;
if (columnExpression != null && string.Equals(columnExpression.Table.Alias, setOperation.Alias, StringComparison.OrdinalIgnoreCase)) // if (columnExpression != null && string.Equals(columnExpression.Table.Alias, setOperation.Alias, StringComparison.OrdinalIgnoreCase))
{ // {
return string.Equals(columnExpression.Name, setOperation.Source1.Projection[index].Alias, StringComparison.OrdinalIgnoreCase); // return string.Equals(columnExpression.Name, setOperation.Source1.Projection[index].Alias, StringComparison.OrdinalIgnoreCase);
} // }
return false; // return false;
}).All((bool e) => e); // }).All((bool e) => e);
} // }
} // }
return false; // return false;
} // }
public static void OpenIfNeeded(this IDbConnection conn ) public static void OpenIfNeeded(this IDbConnection conn )
{ {

2
aspnet-core/frameworks/src/Lion.AbpPro.HttpClient/Lion.AbpPro.HttpClient.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<AssemblyName>Lion.AbpPro.HttpClient</AssemblyName> <AssemblyName>Lion.AbpPro.HttpClient</AssemblyName>
<RootNamespace /> <RootNamespace />
</PropertyGroup> </PropertyGroup>

2
aspnet-core/frameworks/src/Lion.AbpPro.Localization/Lion.AbpPro.Localization.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<AssemblyName>Lion.AbpPro.Localization</AssemblyName> <AssemblyName>Lion.AbpPro.Localization</AssemblyName>
<RootNamespace /> <RootNamespace />
</PropertyGroup> </PropertyGroup>

2
aspnet-core/frameworks/src/Lion.AbpPro.Starter/Lion.AbpPro.Starter.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<AssemblyName>Lion.AbpPro.Starter</AssemblyName> <AssemblyName>Lion.AbpPro.Starter</AssemblyName>
<RootNamespace /> <RootNamespace />

2
aspnet-core/frameworks/test/Lion.AbpPro.Core.Cli.Tests/Lion.AbpPro.Core.Cli.Tests.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>
<RootNamespace /> <RootNamespace />

2
aspnet-core/frameworks/test/Lion.AbpPro.Core.Tests/Lion.AbpPro.Core.Tests.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>
<RootNamespace /> <RootNamespace />

44
aspnet-core/frameworks/test/Lion.AbpPro.Core.Tests/System/ExceptionExtensionsTests.cs
View File

@ -4,28 +4,28 @@ namespace System;
public class ExceptionExtensionsTests public class ExceptionExtensionsTests
{ {
[Fact] // [Fact]
public void FormatMessage_ReturnsFormattedString() // public void FormatMessage_ReturnsFormattedString()
{ // {
// Arrange // // Arrange
var exception = new Exception("Test exception"); // var exception = new Exception("Test exception");
exception.Data["CustomData"] = "Custom value"; // exception.Data["CustomData"] = "Custom value";
var isHideStackTrace = false; // var isHideStackTrace = false;
var expectedMessage = new StringBuilder() // var expectedMessage = new StringBuilder()
.AppendLine("异常消息：Test exception") // .AppendLine("异常消息：Test exception")
.AppendLine("异常类型：System.Exception") // .AppendLine("异常类型：System.Exception")
.AppendLine("异常方法：") // .AppendLine("异常方法：")
.AppendLine("异常源：") // .AppendLine("异常源：")
.AppendLine("异常堆栈： at YourNamespace.Tests.ExceptionExtensionsTests.FormatMessage_ReturnsFormattedString()") // .AppendLine("异常堆栈： at YourNamespace.Tests.ExceptionExtensionsTests.FormatMessage_ReturnsFormattedString()")
.AppendLine("内部异常：") // .AppendLine("内部异常：")
.ToString(); // .ToString();
//
// Act // // Act
var result = exception.FormatMessage(isHideStackTrace); // var result = exception.FormatMessage(isHideStackTrace);
//
// Assert // // Assert
result.ShouldBe(expectedMessage); // result.ShouldBe(expectedMessage);
} // }
// [Fact] // [Fact]
// public void ReThrow_RethrowsException() // public void ReThrow_RethrowsException()

2
aspnet-core/frameworks/test/Lion.AbpPro.ElasticSearch.Tests/Lion.AbpPro.ElasticSearch.Tests.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>
<IsTestProject>true</IsTestProject> <IsTestProject>true</IsTestProject>

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

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web"> <Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest> <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>

2
aspnet-core/frameworks/test/Lion.AbpPro.Localization.Tests/Lion.AbpPro.Localization.Tests.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>
<RootNamespace /> <RootNamespace />

6
aspnet-core/gateways/Lion.AbpPro.WebGateway/Dockerfile
View File

@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/aspnet:8.0 FROM mcr.microsoft.com/dotnet/aspnet:9.0
# 创建目录 # 创建目录
RUN mkdir /app RUN mkdir /app
@ -8,8 +8,8 @@ COPY publish /app
# 设置工作目录 # 设置工作目录
WORKDIR /app WORKDIR /app
# 暴露80端口 # 暴露8080端口
EXPOSE 80 EXPOSE 8080
# 设置时区 .net6 才有这个问题 # 设置时区 .net6 才有这个问题
ENV TZ=Asia/Shanghai ENV TZ=Asia/Shanghai

2
aspnet-core/gateways/Lion.AbpPro.WebGateway/Lion.AbpPro.WebGateway.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web"> <Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
</PropertyGroup> </PropertyGroup>

15
aspnet-core/gateways/Lion.AbpPro.WebGateway/Program.cs
View File

@ -2,14 +2,15 @@ namespace Lion.AbpPro.WebGateway
{ {
public class Program public class Program
{ {
public static void Main(string[] args) public static async Task Main(string[] args)
{ {
CreateHostBuilder(args).Build().Run(); var builder = WebApplication.CreateBuilder(args);
} builder.Host
private static IHostBuilder CreateHostBuilder(string[] args) =>
Host.CreateDefaultBuilder(args)
.ConfigureWebHostDefaults(webBuilder => { webBuilder.UseStartup<Startup>(); })
.UseAutofac(); .UseAutofac();
await builder.AddApplicationAsync<AbpProWebGatewayModule>();
var app = builder.Build();
await app.InitializeApplicationAsync();
await app.RunAsync();
}
} }
} }

15
aspnet-core/gateways/Lion.AbpPro.WebGateway/Startup.cs
View File

@ -1,15 +0,0 @@
namespace Lion.AbpPro.WebGateway
{
public class Startup
{
public void ConfigureServices(IServiceCollection services)
{
services.AddApplication<AbpProWebGatewayModule>();
}
public void Configure(IApplicationBuilder app)
{
app.InitializeApplication();
}
}
}

7
aspnet-core/global.json
View File

@ -1,7 +0,0 @@
{
"sdk": {
"version": "8.0.0",
"rollForward": "latestFeature",
"allowPrerelease": true
}
}

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

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web"> <Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<RootNamespace>Lion.AbpPro.BasicManagement</RootNamespace> <RootNamespace>Lion.AbpPro.BasicManagement</RootNamespace>
<PreserveCompilationReferences>true</PreserveCompilationReferences> <PreserveCompilationReferences>true</PreserveCompilationReferences>
<UserSecretsId>Lion.AbpPro.BasicManagement-c2d31439-b723-48e2-b061-5ebd7aeb6010</UserSecretsId> <UserSecretsId>Lion.AbpPro.BasicManagement-c2d31439-b723-48e2-b061-5ebd7aeb6010</UserSecretsId>

66
aspnet-core/modules/BasicManagement/host/Lion.AbpPro.BasicManagement.HttpApi.Host/Program.cs
View File

@ -10,23 +10,55 @@ namespace Lion.AbpPro.BasicManagement;
public class Program public class Program
{ {
public static void Main(string[] args) public static async Task<int> Main(string[] args)
{ {
CreateHostBuilder(args).Build().Run(); Log.Logger = new LoggerConfiguration()
.WriteTo.Async(c => c.File("Logs/logs.txt"))
} .WriteTo.Async(c => c.Console())
.CreateBootstrapLogger();
private static IHostBuilder CreateHostBuilder(string[] args) => try
Host.CreateDefaultBuilder(args) {
.ConfigureWebHostDefaults(webBuilder => var builder = WebApplication.CreateBuilder(args);
{ builder.Host
webBuilder.ConfigureKestrel((context, options) => { options.Limits.MaxRequestBodySize = 1024 * 50; }); .AddAppSettingsSecretsJson()
webBuilder.UseStartup<Startup>(); .UseAutofac()
}) .UseSerilog((context, loggerConfiguration) =>
.UseSerilog((context, loggerConfiguration) => {
loggerConfiguration
#if DEBUG
.MinimumLevel.Debug()
#else
.MinimumLevel.Information()
#endif
.MinimumLevel.Override("Microsoft", LogEventLevel.Information)
.MinimumLevel.Override("Microsoft.EntityFrameworkCore", LogEventLevel.Warning)
.Enrich.FromLogContext()
.WriteTo.Async(c => c.File("Logs/logs.txt"))
.WriteTo.Async(c => c.Console());
SerilogToEsExtensions.SetSerilogConfiguration(
loggerConfiguration,
context.Configuration);
});
await builder.AddApplicationAsync<BasicManagementHttpApiHostModule>();
var app = builder.Build();
await app.InitializeApplicationAsync();
await app.RunAsync();
return 0;
}
catch (Exception ex)
{
if (ex is HostAbortedException)
{ {
SerilogToEsExtensions.SetSerilogConfiguration( throw;
loggerConfiguration, }
context.Configuration);
}).UseAutofac(); Log.Fatal(ex, "Host terminated unexpectedly!");
} return 1;
}
finally
{
await Log.CloseAndFlushAsync();
}
}
}

15
aspnet-core/modules/BasicManagement/host/Lion.AbpPro.BasicManagement.HttpApi.Host/SerilogToEsExtensions.cs
View File

@ -1,15 +0,0 @@
using Serilog;
namespace Lion.AbpPro.BasicManagement
{
public static class SerilogToEsExtensions
{
public static void SetSerilogConfiguration(LoggerConfiguration loggerConfiguration, IConfiguration configuration)
{
// 默认读取 configuration 中 "Serilog" 节点下的配置
loggerConfiguration
.ReadFrom.Configuration(configuration)
.Enrich.FromLogContext();
}
}
}

15
aspnet-core/modules/BasicManagement/host/Lion.AbpPro.BasicManagement.HttpApi.Host/Startup.cs
View File

@ -1,15 +0,0 @@
namespace Lion.AbpPro.BasicManagement
{
public class Startup
{
public void ConfigureServices(IServiceCollection services)
{
services.AddApplication<BasicManagementHttpApiHostModule>();
}
public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory)
{
app.InitializeApplication();
}
}
}

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

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<RootNamespace>Lion.AbpPro.BasicManagement</RootNamespace> <RootNamespace>Lion.AbpPro.BasicManagement</RootNamespace>
</PropertyGroup> </PropertyGroup>

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

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<RootNamespace>Lion.AbpPro.BasicManagement</RootNamespace> <RootNamespace>Lion.AbpPro.BasicManagement</RootNamespace>
</PropertyGroup> </PropertyGroup>

2
aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Domain.Shared/Lion.AbpPro.BasicManagement.Domain.Shared.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<RootNamespace>Lion.AbpPro.BasicManagement</RootNamespace> <RootNamespace>Lion.AbpPro.BasicManagement</RootNamespace>
<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest> <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
</PropertyGroup> </PropertyGroup>

2
aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Domain/Lion.AbpPro.BasicManagement.Domain.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<RootNamespace>Lion.AbpPro.BasicManagement</RootNamespace> <RootNamespace>Lion.AbpPro.BasicManagement</RootNamespace>
</PropertyGroup> </PropertyGroup>

2
aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.EntityFrameworkCore/Lion.AbpPro.BasicManagement.EntityFrameworkCore.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<RootNamespace>Lion.AbpPro.BasicManagement</RootNamespace> <RootNamespace>Lion.AbpPro.BasicManagement</RootNamespace>
</PropertyGroup> </PropertyGroup>

2
aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.HttpApi.Client/Lion.AbpPro.BasicManagement.HttpApi.Client.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<RootNamespace>Lion.AbpPro.BasicManagement</RootNamespace> <RootNamespace>Lion.AbpPro.BasicManagement</RootNamespace>
</PropertyGroup> </PropertyGroup>

2
aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.HttpApi/Lion.AbpPro.BasicManagement.HttpApi.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<RootNamespace>Lion.AbpPro.BasicManagement</RootNamespace> <RootNamespace>Lion.AbpPro.BasicManagement</RootNamespace>
</PropertyGroup> </PropertyGroup>

2
aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.Application.Tests/Lion.AbpPro.BasicManagement.Application.Tests.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<RootNamespace>Lion.AbpPro.BasicManagement</RootNamespace> <RootNamespace>Lion.AbpPro.BasicManagement</RootNamespace>
</PropertyGroup> </PropertyGroup>

2
aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.Domain.Tests/Lion.AbpPro.BasicManagement.Domain.Tests.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<RootNamespace>Lion.AbpPro.BasicManagement</RootNamespace> <RootNamespace>Lion.AbpPro.BasicManagement</RootNamespace>
</PropertyGroup> </PropertyGroup>

2
aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.EntityFrameworkCore.Tests/Lion.AbpPro.BasicManagement.EntityFrameworkCore.Tests.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<RootNamespace>Lion.AbpPro.BasicManagement</RootNamespace> <RootNamespace>Lion.AbpPro.BasicManagement</RootNamespace>
</PropertyGroup> </PropertyGroup>

2
aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.TestBase/Lion.AbpPro.BasicManagement.TestBase.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<RootNamespace>Lion.AbpPro.BasicManagement</RootNamespace> <RootNamespace>Lion.AbpPro.BasicManagement</RootNamespace>
</PropertyGroup> </PropertyGroup>

3
aspnet-core/modules/DataDictionaryManagement/host/Lion.AbpPro.DataDictionaryManagement.HttpApi.Host/Lion.AbpPro.DataDictionaryManagement.HttpApi.Host.csproj
View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<RootNamespace>Lion.AbpPro.DataDictionaryManagement</RootNamespace> <RootNamespace>Lion.AbpPro.DataDictionaryManagement</RootNamespace>
<PreserveCompilationReferences>true</PreserveCompilationReferences> <PreserveCompilationReferences>true</PreserveCompilationReferences>
<UserSecretsId>Lion.AbpPro.DataDictionaryManagement-c2d31439-b723-48e2-b061-5ebd7aeb6010</UserSecretsId> <UserSecretsId>Lion.AbpPro.DataDictionaryManagement-c2d31439-b723-48e2-b061-5ebd7aeb6010</UserSecretsId>
@ -26,6 +26,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\..\..\shared\Lion.AbpPro.Shared.Hosting.Microservices\Lion.AbpPro.Shared.Hosting.Microservices.csproj" />
<ProjectReference Include="..\..\src\Lion.AbpPro.DataDictionaryManagement.HttpApi\Lion.AbpPro.DataDictionaryManagement.HttpApi.csproj" /> <ProjectReference Include="..\..\src\Lion.AbpPro.DataDictionaryManagement.HttpApi\Lion.AbpPro.DataDictionaryManagement.HttpApi.csproj" />
<ProjectReference Include="..\..\src\Lion.AbpPro.DataDictionaryManagement.Application\Lion.AbpPro.DataDictionaryManagement.Application.csproj" /> <ProjectReference Include="..\..\src\Lion.AbpPro.DataDictionaryManagement.Application\Lion.AbpPro.DataDictionaryManagement.Application.csproj" />
<ProjectReference Include="..\..\src\Lion.AbpPro.DataDictionaryManagement.EntityFrameworkCore\Lion.AbpPro.DataDictionaryManagement.EntityFrameworkCore.csproj" /> <ProjectReference Include="..\..\src\Lion.AbpPro.DataDictionaryManagement.EntityFrameworkCore\Lion.AbpPro.DataDictionaryManagement.EntityFrameworkCore.csproj" />

83
aspnet-core/modules/DataDictionaryManagement/host/Lion.AbpPro.DataDictionaryManagement.HttpApi.Host/Program.cs
View File

@ -1,47 +1,56 @@
namespace Lion.AbpPro.DataDictionaryManagement namespace Lion.AbpPro.DataDictionaryManagement;
public class Program
{ {
public class Program public static async Task<int> Main(string[] args)
{ {
public static int Main(string[] args) Log.Logger = new LoggerConfiguration()
.WriteTo.Async(c => c.File("Logs/logs.txt"))
.WriteTo.Async(c => c.Console())
.CreateBootstrapLogger();
try
{ {
Log.Logger = new LoggerConfiguration() var builder = WebApplication.CreateBuilder(args);
builder.Host
.AddAppSettingsSecretsJson()
.UseAutofac()
.UseSerilog((context, loggerConfiguration) =>
{
loggerConfiguration
#if DEBUG #if DEBUG
.MinimumLevel.Debug() .MinimumLevel.Debug()
#else #else
.MinimumLevel.Information() .MinimumLevel.Information()
#endif
.MinimumLevel.Override("Microsoft", LogEventLevel.Information)
.Enrich.FromLogContext()
.WriteTo.Async(c => c.File("Logs/logs.txt"))
#if DEBUG
.WriteTo.Async(c => c.Console())
#endif #endif
.CreateLogger(); .MinimumLevel.Override("Microsoft", LogEventLevel.Information)
.MinimumLevel.Override("Microsoft.EntityFrameworkCore", LogEventLevel.Warning)
try .Enrich.FromLogContext()
{ .WriteTo.Async(c => c.File("Logs/logs.txt"))
Log.Information("Starting web host."); .WriteTo.Async(c => c.Console());
CreateHostBuilder(args).Build().Run(); SerilogToEsExtensions.SetSerilogConfiguration(
return 0; loggerConfiguration,
} context.Configuration);
catch (Exception ex) });
{ await builder.AddApplicationAsync<DataDictionaryManagementHttpApiHostModule>();
Log.Fatal(ex, "Host terminated unexpectedly!"); var app = builder.Build();
return 1; await app.InitializeApplicationAsync();
} await app.RunAsync();
finally return 0;
}
catch (Exception ex)
{
if (ex is HostAbortedException)
{ {
Log.CloseAndFlush(); throw;
} }
}
internal static IHostBuilder CreateHostBuilder(string[] args) => Log.Fatal(ex, "Host terminated unexpectedly!");
Host.CreateDefaultBuilder(args) return 1;
.ConfigureWebHostDefaults(webBuilder => }
{ finally
webBuilder.UseStartup<Startup>(); {
}) await Log.CloseAndFlushAsync();
.UseAutofac() }
.UseSerilog();
} }
} }

15
aspnet-core/modules/DataDictionaryManagement/host/Lion.AbpPro.DataDictionaryManagement.HttpApi.Host/Startup.cs
View File

@ -1,15 +0,0 @@
namespace Lion.AbpPro.DataDictionaryManagement
{
public class Startup
{
public void ConfigureServices(IServiceCollection services)
{
services.AddApplication<DataDictionaryManagementHttpApiHostModule>();
}
public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory)
{
app.InitializeApplication();
}
}
}

2
aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Application.Contracts/Lion.AbpPro.DataDictionaryManagement.Application.Contracts.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<RootNamespace>Lion.AbpPro.DataDictionaryManagement</RootNamespace> <RootNamespace>Lion.AbpPro.DataDictionaryManagement</RootNamespace>
</PropertyGroup> </PropertyGroup>

2
aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Application/Lion.AbpPro.DataDictionaryManagement.Application.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<RootNamespace>Lion.AbpPro.DataDictionaryManagement</RootNamespace> <RootNamespace>Lion.AbpPro.DataDictionaryManagement</RootNamespace>
</PropertyGroup> </PropertyGroup>

2
aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Domain.Shared/Lion.AbpPro.DataDictionaryManagement.Domain.Shared.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<RootNamespace>Lion.AbpPro.DataDictionaryManagement</RootNamespace> <RootNamespace>Lion.AbpPro.DataDictionaryManagement</RootNamespace>
<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest> <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
</PropertyGroup> </PropertyGroup>

2
aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Domain/Lion.AbpPro.DataDictionaryManagement.Domain.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<RootNamespace>Lion.AbpPro.DataDictionaryManagement</RootNamespace> <RootNamespace>Lion.AbpPro.DataDictionaryManagement</RootNamespace>
</PropertyGroup> </PropertyGroup>

2
aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.EntityFrameworkCore/Lion.AbpPro.DataDictionaryManagement.EntityFrameworkCore.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<RootNamespace>Lion.AbpPro.DataDictionaryManagement</RootNamespace> <RootNamespace>Lion.AbpPro.DataDictionaryManagement</RootNamespace>
</PropertyGroup> </PropertyGroup>

2
aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.HttpApi.Client/Lion.AbpPro.DataDictionaryManagement.HttpApi.Client.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<RootNamespace>Lion.AbpPro.DataDictionaryManagement</RootNamespace> <RootNamespace>Lion.AbpPro.DataDictionaryManagement</RootNamespace>
</PropertyGroup> </PropertyGroup>

2
aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.HttpApi/Lion.AbpPro.DataDictionaryManagement.HttpApi.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<RootNamespace>Lion.AbpPro.DataDictionaryManagement</RootNamespace> <RootNamespace>Lion.AbpPro.DataDictionaryManagement</RootNamespace>
</PropertyGroup> </PropertyGroup>

2
aspnet-core/modules/DataDictionaryManagement/test/Lion.AbpPro.DataDictionaryManagement.Application.Tests/Lion.AbpPro.DataDictionaryManagement.Application.Tests.csproj
View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<RootNamespace>Lion.AbpPro.DataDictionaryManagement</RootNamespace> <RootNamespace>Lion.AbpPro.DataDictionaryManagement</RootNamespace>
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>
</PropertyGroup> </PropertyGroup>

2
aspnet-core/modules/DataDictionaryManagement/test/Lion.AbpPro.DataDictionaryManagement.Domain.Tests/Lion.AbpPro.DataDictionaryManagement.Domain.Tests.csproj
View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<RootNamespace>Lion.AbpPro.DataDictionaryManagement</RootNamespace> <RootNamespace>Lion.AbpPro.DataDictionaryManagement</RootNamespace>
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>
</PropertyGroup> </PropertyGroup>

2
aspnet-core/modules/DataDictionaryManagement/test/Lion.AbpPro.DataDictionaryManagement.EntityFrameworkCore.Tests/Lion.AbpPro.DataDictionaryManagement.EntityFrameworkCore.Tests.csproj
View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<RootNamespace>Lion.AbpPro.DataDictionaryManagement</RootNamespace> <RootNamespace>Lion.AbpPro.DataDictionaryManagement</RootNamespace>
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>
</PropertyGroup> </PropertyGroup>

2
aspnet-core/modules/DataDictionaryManagement/test/Lion.AbpPro.DataDictionaryManagement.TestBase/Lion.AbpPro.DataDictionaryManagement.TestBase.csproj
View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<RootNamespace>Lion.AbpPro.DataDictionaryManagement</RootNamespace> <RootNamespace>Lion.AbpPro.DataDictionaryManagement</RootNamespace>
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>
</PropertyGroup> </PropertyGroup>

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

@ -2,15 +2,15 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<RootNamespace>Lion.AbpPro.FileManagement</RootNamespace> <RootNamespace>Lion.AbpPro.FileManagement</RootNamespace>
<PreserveCompilationReferences>true</PreserveCompilationReferences> <PreserveCompilationReferences>true</PreserveCompilationReferences>
<UserSecretsId>Lion.AbpPro.FileManagement-c2d31439-b723-48e2-b061-5ebd7aeb6010</UserSecretsId> <UserSecretsId>Lion.AbpPro.FileManagement-c2d31439-b723-48e2-b061-5ebd7aeb6010</UserSecretsId>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Serilog" />
<PackageReference Include="Serilog.AspNetCore" /> <PackageReference Include="Serilog.AspNetCore" />
<PackageReference Include="Serilog.Sinks.Async" />
<PackageReference Include="Serilog.Exceptions" /> <PackageReference Include="Serilog.Exceptions" />
<PackageReference Include="Serilog.Extensions.Logging" /> <PackageReference Include="Serilog.Extensions.Logging" />
<PackageReference Include="Serilog.Settings.Configuration" /> <PackageReference Include="Serilog.Settings.Configuration" />
@ -32,6 +32,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\..\..\shared\Lion.AbpPro.Shared.Hosting.Microservices\Lion.AbpPro.Shared.Hosting.Microservices.csproj" />
<ProjectReference Include="..\..\src\Lion.AbpPro.FileManagement.HttpApi\Lion.AbpPro.FileManagement.HttpApi.csproj" /> <ProjectReference Include="..\..\src\Lion.AbpPro.FileManagement.HttpApi\Lion.AbpPro.FileManagement.HttpApi.csproj" />
<ProjectReference Include="..\..\src\Lion.AbpPro.FileManagement.Application\Lion.AbpPro.FileManagement.Application.csproj" /> <ProjectReference Include="..\..\src\Lion.AbpPro.FileManagement.Application\Lion.AbpPro.FileManagement.Application.csproj" />
<ProjectReference Include="..\..\src\Lion.AbpPro.FileManagement.EntityFrameworkCore\Lion.AbpPro.FileManagement.EntityFrameworkCore.csproj" /> <ProjectReference Include="..\..\src\Lion.AbpPro.FileManagement.EntityFrameworkCore\Lion.AbpPro.FileManagement.EntityFrameworkCore.csproj" />

62
aspnet-core/modules/FileManagement/host/Lion.AbpPro.FileManagement.HttpApi.Host/Program.cs
View File

@ -1,20 +1,58 @@
namespace Lion.AbpPro.FileManagement; using Serilog.Events;
namespace Lion.AbpPro.FileManagement;
public class Program public class Program
{ {
public static void Main(string[] args) public static async Task<int> Main(string[] args)
{ {
CreateHostBuilder(args).Build().Run(); Log.Logger = new LoggerConfiguration()
} .WriteTo.Async(c => c.File("Logs/logs.txt"))
.WriteTo.Async(c => c.Console())
.CreateBootstrapLogger();
public static IHostBuilder CreateHostBuilder(string[] args) try
{ {
return Host.CreateDefaultBuilder(args) var builder = WebApplication.CreateBuilder(args);
.ConfigureWebHostDefaults(webBuilder => builder.Host
.AddAppSettingsSecretsJson()
.UseAutofac()
.UseSerilog((context, loggerConfiguration) =>
{
loggerConfiguration
#if DEBUG
.MinimumLevel.Debug()
#else
.MinimumLevel.Information()
#endif
.MinimumLevel.Override("Microsoft", LogEventLevel.Information)
.MinimumLevel.Override("Microsoft.EntityFrameworkCore", LogEventLevel.Warning)
.Enrich.FromLogContext()
.WriteTo.Async(c => c.Console());
SerilogToEsExtensions.SetSerilogConfiguration(
loggerConfiguration,
context.Configuration);
});
await builder.AddApplicationAsync<FileManagementHttpApiHostModule>();
var app = builder.Build();
await app.InitializeApplicationAsync();
await app.RunAsync();
return 0;
}
catch (Exception ex)
{
if (ex is HostAbortedException)
{ {
webBuilder.ConfigureKestrel((context, options) => { options.Limits.MaxRequestBodySize = 1024 * 50; }); throw;
webBuilder.UseStartup<Startup>(); }
})
.UseSerilog().UseAutofac(); Log.Fatal(ex, "Host terminated unexpectedly!");
return 1;
}
finally
{
await Log.CloseAndFlushAsync();
}
} }
} }

16
aspnet-core/modules/FileManagement/host/Lion.AbpPro.FileManagement.HttpApi.Host/Startup.cs
View File

@ -1,16 +0,0 @@
using Microsoft.Extensions.Logging;
namespace Lion.AbpPro.FileManagement;
public class Startup
{
public void ConfigureServices(IServiceCollection services)
{
services.AddApplication<FileManagementHttpApiHostModule>();
}
public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory)
{
app.InitializeApplication();
}
}

2
aspnet-core/modules/FileManagement/src/Lion.AbpPro.FileManagement.Application.Contracts/Lion.AbpPro.FileManagement.Application.Contracts.csproj
View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<RootNamespace>Lion.AbpPro.FileManagement</RootNamespace> <RootNamespace>Lion.AbpPro.FileManagement</RootNamespace>
</PropertyGroup> </PropertyGroup>

2
aspnet-core/modules/FileManagement/src/Lion.AbpPro.FileManagement.Application/Lion.AbpPro.FileManagement.Application.csproj
View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<RootNamespace>Lion.AbpPro.FileManagement</RootNamespace> <RootNamespace>Lion.AbpPro.FileManagement</RootNamespace>
</PropertyGroup> </PropertyGroup>

2
aspnet-core/modules/FileManagement/src/Lion.AbpPro.FileManagement.Domain.Shared/Lion.AbpPro.FileManagement.Domain.Shared.csproj
View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<RootNamespace>Lion.AbpPro.FileManagement</RootNamespace> <RootNamespace>Lion.AbpPro.FileManagement</RootNamespace>
<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest> <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
</PropertyGroup> </PropertyGroup>

2
aspnet-core/modules/FileManagement/src/Lion.AbpPro.FileManagement.Domain/Lion.AbpPro.FileManagement.Domain.csproj
View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<RootNamespace>Lion.AbpPro.FileManagement</RootNamespace> <RootNamespace>Lion.AbpPro.FileManagement</RootNamespace>
</PropertyGroup> </PropertyGroup>

2
aspnet-core/modules/FileManagement/src/Lion.AbpPro.FileManagement.EntityFrameworkCore/Lion.AbpPro.FileManagement.EntityFrameworkCore.csproj
View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<RootNamespace>Lion.AbpPro.FileManagement</RootNamespace> <RootNamespace>Lion.AbpPro.FileManagement</RootNamespace>
</PropertyGroup> </PropertyGroup>

2
aspnet-core/modules/FileManagement/src/Lion.AbpPro.FileManagement.HttpApi.Client/Lion.AbpPro.FileManagement.HttpApi.Client.csproj
View File

@ -3,7 +3,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<RootNamespace>Lion.AbpPro.FileManagement</RootNamespace> <RootNamespace>Lion.AbpPro.FileManagement</RootNamespace>
</PropertyGroup> </PropertyGroup>

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

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<RootNamespace>Lion.AbpPro.FileManagement</RootNamespace> <RootNamespace>Lion.AbpPro.FileManagement</RootNamespace>
</PropertyGroup> </PropertyGroup>

2
aspnet-core/modules/FileManagement/test/Lion.AbpPro.FileManagement.Application.Tests/Lion.AbpPro.FileManagement.Application.Tests.csproj
View File

@ -3,7 +3,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<RootNamespace>Lion.AbpPro.FileManagement</RootNamespace> <RootNamespace>Lion.AbpPro.FileManagement</RootNamespace>
</PropertyGroup> </PropertyGroup>

2
aspnet-core/modules/FileManagement/test/Lion.AbpPro.FileManagement.Domain.Tests/Lion.AbpPro.FileManagement.Domain.Tests.csproj
View File

@ -3,7 +3,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<RootNamespace>Lion.AbpPro.FileManagement</RootNamespace> <RootNamespace>Lion.AbpPro.FileManagement</RootNamespace>
</PropertyGroup> </PropertyGroup>

2
aspnet-core/modules/FileManagement/test/Lion.AbpPro.FileManagement.EntityFrameworkCore.Tests/Lion.AbpPro.FileManagement.EntityFrameworkCore.Tests.csproj
View File

@ -3,7 +3,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<RootNamespace>Lion.AbpPro.FileManagement</RootNamespace> <RootNamespace>Lion.AbpPro.FileManagement</RootNamespace>
</PropertyGroup> </PropertyGroup>

2
aspnet-core/modules/FileManagement/test/Lion.AbpPro.FileManagement.TestBase/Lion.AbpPro.FileManagement.TestBase.csproj
View File

@ -3,7 +3,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<RootNamespace>Lion.AbpPro.FileManagement</RootNamespace> <RootNamespace>Lion.AbpPro.FileManagement</RootNamespace>
</PropertyGroup> </PropertyGroup>

3
aspnet-core/modules/LanguageManagement/host/Lion.AbpPro.LanguageManagement.HttpApi.Host/Lion.AbpPro.LanguageManagement.HttpApi.Host.csproj
View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<RootNamespace>Lion.AbpPro.LanguageManagement</RootNamespace> <RootNamespace>Lion.AbpPro.LanguageManagement</RootNamespace>
<PreserveCompilationReferences>true</PreserveCompilationReferences> <PreserveCompilationReferences>true</PreserveCompilationReferences>
<UserSecretsId>Lion.AbpPro.LanguageManagement-c2d31439-b723-48e2-b061-5ebd7aeb6010</UserSecretsId> <UserSecretsId>Lion.AbpPro.LanguageManagement-c2d31439-b723-48e2-b061-5ebd7aeb6010</UserSecretsId>
@ -26,6 +26,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\..\..\shared\Lion.AbpPro.Shared.Hosting.Microservices\Lion.AbpPro.Shared.Hosting.Microservices.csproj" />
<ProjectReference Include="..\..\src\Lion.AbpPro.LanguageManagement.HttpApi\Lion.AbpPro.LanguageManagement.HttpApi.csproj" /> <ProjectReference Include="..\..\src\Lion.AbpPro.LanguageManagement.HttpApi\Lion.AbpPro.LanguageManagement.HttpApi.csproj" />
<ProjectReference Include="..\..\src\Lion.AbpPro.LanguageManagement.Application\Lion.AbpPro.LanguageManagement.Application.csproj" /> <ProjectReference Include="..\..\src\Lion.AbpPro.LanguageManagement.Application\Lion.AbpPro.LanguageManagement.Application.csproj" />
<ProjectReference Include="..\..\src\Lion.AbpPro.LanguageManagement.EntityFrameworkCore\Lion.AbpPro.LanguageManagement.EntityFrameworkCore.csproj" /> <ProjectReference Include="..\..\src\Lion.AbpPro.LanguageManagement.EntityFrameworkCore\Lion.AbpPro.LanguageManagement.EntityFrameworkCore.csproj" />

83
aspnet-core/modules/LanguageManagement/host/Lion.AbpPro.LanguageManagement.HttpApi.Host/Program.cs
View File

@ -1,47 +1,56 @@
namespace Lion.AbpPro.LanguageManagement namespace Lion.AbpPro.LanguageManagement;
public class Program
{ {
public class Program public static async Task<int> Main(string[] args)
{ {
public static int Main(string[] args) Log.Logger = new LoggerConfiguration()
.WriteTo.Async(c => c.File("Logs/logs.txt"))
.WriteTo.Async(c => c.Console())
.CreateBootstrapLogger();
try
{ {
Log.Logger = new LoggerConfiguration() var builder = WebApplication.CreateBuilder(args);
builder.Host
.AddAppSettingsSecretsJson()
.UseAutofac()
.UseSerilog((context, loggerConfiguration) =>
{
loggerConfiguration
#if DEBUG #if DEBUG
.MinimumLevel.Debug() .MinimumLevel.Debug()
#else #else
.MinimumLevel.Information() .MinimumLevel.Information()
#endif
.MinimumLevel.Override("Microsoft", LogEventLevel.Information)
.Enrich.FromLogContext()
.WriteTo.Async(c => c.File("Logs/logs.txt"))
#if DEBUG
.WriteTo.Async(c => c.Console())
#endif #endif
.CreateLogger(); .MinimumLevel.Override("Microsoft", LogEventLevel.Information)
.MinimumLevel.Override("Microsoft.EntityFrameworkCore", LogEventLevel.Warning)
try .Enrich.FromLogContext()
{ .WriteTo.Async(c => c.File("Logs/logs.txt"))
Log.Information("Starting web host."); .WriteTo.Async(c => c.Console());
CreateHostBuilder(args).Build().Run(); SerilogToEsExtensions.SetSerilogConfiguration(
return 0; loggerConfiguration,
} context.Configuration);
catch (Exception ex) });
{ await builder.AddApplicationAsync<LanguageManagementHttpApiHostModule>();
Log.Fatal(ex, "Host terminated unexpectedly!"); var app = builder.Build();
return 1; await app.InitializeApplicationAsync();
} await app.RunAsync();
finally return 0;
}
catch (Exception ex)
{
if (ex is HostAbortedException)
{ {
Log.CloseAndFlush(); throw;
} }
}
internal static IHostBuilder CreateHostBuilder(string[] args) => Log.Fatal(ex, "Host terminated unexpectedly!");
Host.CreateDefaultBuilder(args) return 1;
.ConfigureWebHostDefaults(webBuilder => }
{ finally
webBuilder.UseStartup<Startup>(); {
}) await Log.CloseAndFlushAsync();
.UseAutofac() }
.UseSerilog();
} }
} }

15
aspnet-core/modules/LanguageManagement/host/Lion.AbpPro.LanguageManagement.HttpApi.Host/Startup.cs
View File

@ -1,15 +0,0 @@
namespace Lion.AbpPro.LanguageManagement
{
public class Startup
{
public void ConfigureServices(IServiceCollection services)
{
services.AddApplication<LanguageManagementHttpApiHostModule>();
}
public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory)
{
app.InitializeApplication();
}
}
}

2
aspnet-core/modules/LanguageManagement/src/Lion.AbpPro.LanguageManagement.Application.Contracts/Lion.AbpPro.LanguageManagement.Application.Contracts.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<RootNamespace>Lion.AbpPro.LanguageManagement</RootNamespace> <RootNamespace>Lion.AbpPro.LanguageManagement</RootNamespace>
</PropertyGroup> </PropertyGroup>

2
aspnet-core/modules/LanguageManagement/src/Lion.AbpPro.LanguageManagement.Application/Lion.AbpPro.LanguageManagement.Application.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<RootNamespace>Lion.AbpPro.LanguageManagement</RootNamespace> <RootNamespace>Lion.AbpPro.LanguageManagement</RootNamespace>
</PropertyGroup> </PropertyGroup>

2
aspnet-core/modules/LanguageManagement/src/Lion.AbpPro.LanguageManagement.Domain.Shared/Lion.AbpPro.LanguageManagement.Domain.Shared.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<RootNamespace>Lion.AbpPro.LanguageManagement</RootNamespace> <RootNamespace>Lion.AbpPro.LanguageManagement</RootNamespace>
<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest> <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
</PropertyGroup> </PropertyGroup>

2
aspnet-core/modules/LanguageManagement/src/Lion.AbpPro.LanguageManagement.Domain/Lion.AbpPro.LanguageManagement.Domain.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<RootNamespace>Lion.AbpPro.LanguageManagement</RootNamespace> <RootNamespace>Lion.AbpPro.LanguageManagement</RootNamespace>
</PropertyGroup> </PropertyGroup>

2
aspnet-core/modules/LanguageManagement/src/Lion.AbpPro.LanguageManagement.EntityFrameworkCore/Lion.AbpPro.LanguageManagement.EntityFrameworkCore.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<RootNamespace>Lion.AbpPro.LanguageManagement</RootNamespace> <RootNamespace>Lion.AbpPro.LanguageManagement</RootNamespace>
</PropertyGroup> </PropertyGroup>

2
aspnet-core/modules/LanguageManagement/src/Lion.AbpPro.LanguageManagement.HttpApi.Client/Lion.AbpPro.LanguageManagement.HttpApi.Client.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<RootNamespace>Lion.AbpPro.LanguageManagement</RootNamespace> <RootNamespace>Lion.AbpPro.LanguageManagement</RootNamespace>
</PropertyGroup> </PropertyGroup>

2
aspnet-core/modules/LanguageManagement/src/Lion.AbpPro.LanguageManagement.HttpApi/Lion.AbpPro.LanguageManagement.HttpApi.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<RootNamespace>Lion.AbpPro.LanguageManagement</RootNamespace> <RootNamespace>Lion.AbpPro.LanguageManagement</RootNamespace>
</PropertyGroup> </PropertyGroup>

2
aspnet-core/modules/LanguageManagement/test/Lion.AbpPro.LanguageManagement.Application.Tests/Lion.AbpPro.LanguageManagement.Application.Tests.csproj
View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<RootNamespace>Lion.AbpPro.LanguageManagement</RootNamespace> <RootNamespace>Lion.AbpPro.LanguageManagement</RootNamespace>
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>
</PropertyGroup> </PropertyGroup>

2
aspnet-core/modules/LanguageManagement/test/Lion.AbpPro.LanguageManagement.Domain.Tests/Lion.AbpPro.LanguageManagement.Domain.Tests.csproj
View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<RootNamespace>Lion.AbpPro.LanguageManagement</RootNamespace> <RootNamespace>Lion.AbpPro.LanguageManagement</RootNamespace>
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>
</PropertyGroup> </PropertyGroup>

2
aspnet-core/modules/LanguageManagement/test/Lion.AbpPro.LanguageManagement.EntityFrameworkCore.Tests/Lion.AbpPro.LanguageManagement.EntityFrameworkCore.Tests.csproj
View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<RootNamespace>Lion.AbpPro.LanguageManagement</RootNamespace> <RootNamespace>Lion.AbpPro.LanguageManagement</RootNamespace>
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>
</PropertyGroup> </PropertyGroup>

2
aspnet-core/modules/LanguageManagement/test/Lion.AbpPro.LanguageManagement.TestBase/Lion.AbpPro.LanguageManagement.TestBase.csproj
View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<RootNamespace>Lion.AbpPro.LanguageManagement</RootNamespace> <RootNamespace>Lion.AbpPro.LanguageManagement</RootNamespace>
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>
</PropertyGroup> </PropertyGroup>

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

@ -2,21 +2,21 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<RootNamespace>Lion.AbpPro.NotificationManagement</RootNamespace> <RootNamespace>Lion.AbpPro.NotificationManagement</RootNamespace>
<PreserveCompilationReferences>true</PreserveCompilationReferences> <PreserveCompilationReferences>true</PreserveCompilationReferences>
<UserSecretsId>Lion.AbpPro.NotificationManagement-c2d31439-b723-48e2-b061-5ebd7aeb6010</UserSecretsId> <UserSecretsId>Lion.AbpPro.NotificationManagement-c2d31439-b723-48e2-b061-5ebd7aeb6010</UserSecretsId>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Serilog"/> <PackageReference Include="Serilog.AspNetCore" />
<PackageReference Include="Serilog.AspNetCore"/> <PackageReference Include="Serilog.Sinks.Async" />
<PackageReference Include="Serilog.Exceptions"/> <PackageReference Include="Serilog.Exceptions" />
<PackageReference Include="Serilog.Extensions.Logging"/> <PackageReference Include="Serilog.Extensions.Logging" />
<PackageReference Include="Serilog.Settings.Configuration"/> <PackageReference Include="Serilog.Settings.Configuration" />
<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="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"/>
@ -32,6 +32,7 @@
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\..\..\frameworks\src\Lion.AbpPro.CAP\Lion.AbpPro.CAP.csproj"/> <ProjectReference Include="..\..\..\..\frameworks\src\Lion.AbpPro.CAP\Lion.AbpPro.CAP.csproj"/>
<ProjectReference Include="..\..\..\..\shared\Lion.AbpPro.Shared.Hosting.Microservices\Lion.AbpPro.Shared.Hosting.Microservices.csproj" />
<ProjectReference Include="..\..\src\Lion.AbpPro.NotificationManagement.HttpApi\Lion.AbpPro.NotificationManagement.HttpApi.csproj"/> <ProjectReference Include="..\..\src\Lion.AbpPro.NotificationManagement.HttpApi\Lion.AbpPro.NotificationManagement.HttpApi.csproj"/>
<ProjectReference Include="..\..\src\Lion.AbpPro.NotificationManagement.Application\Lion.AbpPro.NotificationManagement.Application.csproj"/> <ProjectReference Include="..\..\src\Lion.AbpPro.NotificationManagement.Application\Lion.AbpPro.NotificationManagement.Application.csproj"/>
<ProjectReference Include="..\..\src\Lion.AbpPro.NotificationManagement.EntityFrameworkCore\Lion.AbpPro.NotificationManagement.EntityFrameworkCore.csproj"/> <ProjectReference Include="..\..\src\Lion.AbpPro.NotificationManagement.EntityFrameworkCore\Lion.AbpPro.NotificationManagement.EntityFrameworkCore.csproj"/>

62
aspnet-core/modules/NotificationManagement/host/Lion.AbpPro.NotificationManagement.HttpApi.Host/Program.cs
View File

@ -1,20 +1,58 @@
namespace Lion.AbpPro.NotificationManagement; using Serilog.Events;
namespace Lion.AbpPro.NotificationManagement;
public class Program public class Program
{ {
public static void Main(string[] args) public static async Task<int> Main(string[] args)
{ {
CreateHostBuilder(args).Build().Run(); Log.Logger = new LoggerConfiguration()
} .WriteTo.Async(c => c.File("Logs/logs.txt"))
.WriteTo.Async(c => c.Console())
.CreateBootstrapLogger();
public static IHostBuilder CreateHostBuilder(string[] args) try
{ {
return Host.CreateDefaultBuilder(args) var builder = WebApplication.CreateBuilder(args);
.ConfigureWebHostDefaults(webBuilder => builder.Host
.AddAppSettingsSecretsJson()
.UseAutofac()
.UseSerilog((context, loggerConfiguration) =>
{
loggerConfiguration
#if DEBUG
.MinimumLevel.Debug()
#else
.MinimumLevel.Information()
#endif
.MinimumLevel.Override("Microsoft", LogEventLevel.Information)
.MinimumLevel.Override("Microsoft.EntityFrameworkCore", LogEventLevel.Warning)
.Enrich.FromLogContext()
.WriteTo.Async(c => c.File("Logs/logs.txt"))
.WriteTo.Async(c => c.Console());
SerilogToEsExtensions.SetSerilogConfiguration(
loggerConfiguration,
context.Configuration);
});
await builder.AddApplicationAsync<NotificationManagementHttpApiHostModule>();
var app = builder.Build();
await app.InitializeApplicationAsync();
await app.RunAsync();
return 0;
}
catch (Exception ex)
{
if (ex is HostAbortedException)
{ {
webBuilder.ConfigureKestrel((context, options) => { options.Limits.MaxRequestBodySize = 1024 * 50; }); throw;
webBuilder.UseStartup<Startup>(); }
})
.UseSerilog().UseAutofac(); Log.Fatal(ex, "Host terminated unexpectedly!");
return 1;
}
finally
{
await Log.CloseAndFlushAsync();
}
} }
} }

18
aspnet-core/modules/NotificationManagement/host/Lion.AbpPro.NotificationManagement.HttpApi.Host/Startup.cs
View File

@ -1,18 +0,0 @@
using Microsoft.AspNetCore.Builder;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
namespace Lion.AbpPro.NotificationManagement;
public class Startup
{
public void ConfigureServices(IServiceCollection services)
{
services.AddApplication<NotificationManagementHttpApiHostModule>();
}
public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory)
{
app.InitializeApplication();
}
}

2
aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Application.Contracts/Lion.AbpPro.NotificationManagement.Application.Contracts.csproj
View File

@ -3,7 +3,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<RootNamespace>Lion.AbpPro.NotificationManagement</RootNamespace> <RootNamespace>Lion.AbpPro.NotificationManagement</RootNamespace>
</PropertyGroup> </PropertyGroup>

2
aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Application/Lion.AbpPro.NotificationManagement.Application.csproj
View File

@ -3,7 +3,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<RootNamespace>Lion.AbpPro.NotificationManagement</RootNamespace> <RootNamespace>Lion.AbpPro.NotificationManagement</RootNamespace>
</PropertyGroup> </PropertyGroup>

2
aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Domain.Shared/Lion.AbpPro.NotificationManagement.Domain.Shared.csproj
View File

@ -3,7 +3,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<RootNamespace>Lion.AbpPro.NotificationManagement</RootNamespace> <RootNamespace>Lion.AbpPro.NotificationManagement</RootNamespace>
<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest> <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
</PropertyGroup> </PropertyGroup>

2
aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Domain/Lion.AbpPro.NotificationManagement.Domain.csproj
View File

@ -3,7 +3,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<RootNamespace>Lion.AbpPro.NotificationManagement</RootNamespace> <RootNamespace>Lion.AbpPro.NotificationManagement</RootNamespace>
</PropertyGroup> </PropertyGroup>

2
aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.EntityFrameworkCore/Lion.AbpPro.NotificationManagement.EntityFrameworkCore.csproj
View File

@ -3,7 +3,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<RootNamespace>Lion.AbpPro.NotificationManagement</RootNamespace> <RootNamespace>Lion.AbpPro.NotificationManagement</RootNamespace>
</PropertyGroup> </PropertyGroup>

2
aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.HttpApi.Client/Lion.AbpPro.NotificationManagement.HttpApi.Client.csproj
View File

@ -3,7 +3,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<RootNamespace>Lion.AbpPro.NotificationManagement</RootNamespace> <RootNamespace>Lion.AbpPro.NotificationManagement</RootNamespace>
</PropertyGroup> </PropertyGroup>

2
aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.HttpApi/Lion.AbpPro.NotificationManagement.HttpApi.csproj
View File

@ -3,7 +3,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<RootNamespace>Lion.AbpPro.NotificationManagement</RootNamespace> <RootNamespace>Lion.AbpPro.NotificationManagement</RootNamespace>
</PropertyGroup> </PropertyGroup>

2
aspnet-core/modules/NotificationManagement/test/Lion.AbpPro.NotificationManagement.Application.Tests/Lion.AbpPro.NotificationManagement.Application.Tests.csproj
View File

@ -3,7 +3,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<RootNamespace>Lion.AbpPro.NotificationManagement</RootNamespace> <RootNamespace>Lion.AbpPro.NotificationManagement</RootNamespace>
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>
</PropertyGroup> </PropertyGroup>

2
aspnet-core/modules/NotificationManagement/test/Lion.AbpPro.NotificationManagement.Domain.Tests/Lion.AbpPro.NotificationManagement.Domain.Tests.csproj
View File

@ -3,7 +3,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<RootNamespace>Lion.AbpPro.NotificationManagement</RootNamespace> <RootNamespace>Lion.AbpPro.NotificationManagement</RootNamespace>
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>
</PropertyGroup> </PropertyGroup>

2
aspnet-core/modules/NotificationManagement/test/Lion.AbpPro.NotificationManagement.EntityFrameworkCore.Tests/Lion.AbpPro.NotificationManagement.EntityFrameworkCore.Tests.csproj
View File

@ -3,7 +3,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<RootNamespace>Lion.AbpPro.NotificationManagement</RootNamespace> <RootNamespace>Lion.AbpPro.NotificationManagement</RootNamespace>
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>
</PropertyGroup> </PropertyGroup>

2
aspnet-core/modules/NotificationManagement/test/Lion.AbpPro.NotificationManagement.TestBase/Lion.AbpPro.NotificationManagement.TestBase.csproj
View File

@ -3,7 +3,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<RootNamespace>Lion.AbpPro.NotificationManagement</RootNamespace> <RootNamespace>Lion.AbpPro.NotificationManagement</RootNamespace>
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>
</PropertyGroup> </PropertyGroup>

Some files were not shown because too many files changed in this diff

Write Preview
Loading…
Cancel
Save