diff --git a/templates/pro-module/Directory.Build.Microsoft.targets b/templates/pro-module/Directory.Build.Microsoft.targets index 938c0b67..1e807352 100644 --- a/templates/pro-module/Directory.Build.Microsoft.targets +++ b/templates/pro-module/Directory.Build.Microsoft.targets @@ -1,21 +1,21 @@  - - - - - - - - - - - - + + + + + + + + + + + + - - - + + + diff --git a/templates/pro-module/Directory.Build.Volo.targets b/templates/pro-module/Directory.Build.Volo.targets index 2c848ba2..f949bc55 100644 --- a/templates/pro-module/Directory.Build.Volo.targets +++ b/templates/pro-module/Directory.Build.Volo.targets @@ -1,99 +1,99 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/templates/pro-module/Directory.Build.targets b/templates/pro-module/Directory.Build.targets index e1e47a80..fb6f557c 100644 --- a/templates/pro-module/Directory.Build.targets +++ b/templates/pro-module/Directory.Build.targets @@ -2,13 +2,13 @@ - latest 1.0.0 Abp vNext Pro - $(NoWarn);CS1591;CS0436;NU1504 + $(NoWarnNuGet)$(NoWarn);CS1591;CS0436; + $(NoWarnNuGet);1902;NU1903 app true WangJunZzz @@ -24,14 +24,15 @@ - - - + + + - - - + + + + @@ -47,17 +48,18 @@ - - - - - + + + + + + - - - - + + + @@ -82,13 +84,13 @@ - + - + - + @@ -96,8 +98,21 @@ - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/templates/pro-module/host/MyCompanyName.MyProjectName.MyModuleName.HttpApi.Host/EntityFrameworkCore/MyModuleNameHttpApiHostMigrationsDbContextFactory.cs b/templates/pro-module/host/MyCompanyName.MyProjectName.MyModuleName.HttpApi.Host/EntityFrameworkCore/MyModuleNameHttpApiHostMigrationsDbContextFactory.cs index 2b731382..c4316b69 100644 --- a/templates/pro-module/host/MyCompanyName.MyProjectName.MyModuleName.HttpApi.Host/EntityFrameworkCore/MyModuleNameHttpApiHostMigrationsDbContextFactory.cs +++ b/templates/pro-module/host/MyCompanyName.MyProjectName.MyModuleName.HttpApi.Host/EntityFrameworkCore/MyModuleNameHttpApiHostMigrationsDbContextFactory.cs @@ -7,7 +7,7 @@ namespace MyCompanyName.MyProjectName.MyModuleName.EntityFrameworkCore var configuration = BuildConfiguration(); var builder = new DbContextOptionsBuilder() - .UseMySQL(configuration.GetConnectionString("MyModuleName") ?? string.Empty); + .UseNpgsql(configuration.GetConnectionString("MyModuleName") ?? string.Empty); return new MyModuleNameHttpApiHostMigrationsDbContext(builder.Options); } diff --git a/templates/pro-module/host/MyCompanyName.MyProjectName.MyModuleName.HttpApi.Host/GlobalUsings.cs b/templates/pro-module/host/MyCompanyName.MyProjectName.MyModuleName.HttpApi.Host/GlobalUsings.cs index 4d7bff2a..829c952a 100644 --- a/templates/pro-module/host/MyCompanyName.MyProjectName.MyModuleName.HttpApi.Host/GlobalUsings.cs +++ b/templates/pro-module/host/MyCompanyName.MyProjectName.MyModuleName.HttpApi.Host/GlobalUsings.cs @@ -30,7 +30,7 @@ global using Volo.Abp.Autofac; global using Volo.Abp.Caching; global using Volo.Abp.Caching.StackExchangeRedis; global using Volo.Abp.EntityFrameworkCore; -global using Volo.Abp.EntityFrameworkCore.MySQL; +global using Volo.Abp.EntityFrameworkCore.PostgreSql; global using Volo.Abp.Localization; global using Volo.Abp.Modularity; global using Volo.Abp.PermissionManagement.EntityFrameworkCore; diff --git a/templates/pro-module/host/MyCompanyName.MyProjectName.MyModuleName.HttpApi.Host/Microsoft/Extensions/DependencyInjection/ServiceCollectionExtensions.cs b/templates/pro-module/host/MyCompanyName.MyProjectName.MyModuleName.HttpApi.Host/Microsoft/Extensions/DependencyInjection/ServiceCollectionExtensions.cs index 96b3d446..ce13bcf3 100644 --- a/templates/pro-module/host/MyCompanyName.MyProjectName.MyModuleName.HttpApi.Host/Microsoft/Extensions/DependencyInjection/ServiceCollectionExtensions.cs +++ b/templates/pro-module/host/MyCompanyName.MyProjectName.MyModuleName.HttpApi.Host/Microsoft/Extensions/DependencyInjection/ServiceCollectionExtensions.cs @@ -34,7 +34,7 @@ public static class ServiceCollectionExtensions public static IServiceCollection AddAbpProDbContext(this IServiceCollection service) { - service.Configure(options => { options.UseMySQL(builder => { builder.TranslateParameterizedCollectionsToConstants(); }); }); + service.Configure(options => { options.UseNpgsql(builder => { builder.TranslateParameterizedCollectionsToConstants(); }); }); return service; } diff --git a/templates/pro-module/host/MyCompanyName.MyProjectName.MyModuleName.HttpApi.Host/MyCompanyName.MyProjectName.MyModuleName.HttpApi.Host.csproj b/templates/pro-module/host/MyCompanyName.MyProjectName.MyModuleName.HttpApi.Host/MyCompanyName.MyProjectName.MyModuleName.HttpApi.Host.csproj index eebfde98..7b45ca6a 100644 --- a/templates/pro-module/host/MyCompanyName.MyProjectName.MyModuleName.HttpApi.Host/MyCompanyName.MyProjectName.MyModuleName.HttpApi.Host.csproj +++ b/templates/pro-module/host/MyCompanyName.MyProjectName.MyModuleName.HttpApi.Host/MyCompanyName.MyProjectName.MyModuleName.HttpApi.Host.csproj @@ -1,6 +1,6 @@ - net9.0 + net10.0 MyCompanyName.MyProjectName.MyModuleName true MyCompanyName.MyProjectName.MyModuleName-c2d31439-b723-48e2-b061-5ebd7aeb6010 @@ -14,7 +14,7 @@ - + diff --git a/templates/pro-module/host/MyCompanyName.MyProjectName.MyModuleName.HttpApi.Host/MyModuleNameHttpApiHostModule.cs b/templates/pro-module/host/MyCompanyName.MyProjectName.MyModuleName.HttpApi.Host/MyModuleNameHttpApiHostModule.cs index b43c5917..2054aafd 100644 --- a/templates/pro-module/host/MyCompanyName.MyProjectName.MyModuleName.HttpApi.Host/MyModuleNameHttpApiHostModule.cs +++ b/templates/pro-module/host/MyCompanyName.MyProjectName.MyModuleName.HttpApi.Host/MyModuleNameHttpApiHostModule.cs @@ -10,12 +10,17 @@ namespace MyCompanyName.MyProjectName.MyModuleName; typeof(AbpAspNetCoreMvcUiMultiTenancyModule), typeof(AbpAutofacModule), typeof(AbpCachingStackExchangeRedisModule), - typeof(AbpEntityFrameworkCoreMySQLModule), + typeof(AbpEntityFrameworkCorePostgreSqlModule), typeof(AbpAspNetCoreSerilogModule), typeof(AbpSwashbuckleModule) )] public class MyModuleNameHttpApiHostModule : AbpModule { + public override void PreConfigureServices(ServiceConfigurationContext context) + { + AppContext.SetSwitch("Npgsql.EnableLegacyTimestampBehavior", true); + } + public override void ConfigureServices(ServiceConfigurationContext context) { context.Services.AddAbpProSwagger("MyProjectName") diff --git a/templates/pro-module/src/MyCompanyName.MyProjectName.MyModuleName.Application.Contracts/MyCompanyName.MyProjectName.MyModuleName.Application.Contracts.csproj b/templates/pro-module/src/MyCompanyName.MyProjectName.MyModuleName.Application.Contracts/MyCompanyName.MyProjectName.MyModuleName.Application.Contracts.csproj index e04ebc3f..8df5479a 100644 --- a/templates/pro-module/src/MyCompanyName.MyProjectName.MyModuleName.Application.Contracts/MyCompanyName.MyProjectName.MyModuleName.Application.Contracts.csproj +++ b/templates/pro-module/src/MyCompanyName.MyProjectName.MyModuleName.Application.Contracts/MyCompanyName.MyProjectName.MyModuleName.Application.Contracts.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 MyCompanyName.MyProjectName.MyModuleName diff --git a/templates/pro-module/src/MyCompanyName.MyProjectName.MyModuleName.Application/MyCompanyName.MyProjectName.MyModuleName.Application.csproj b/templates/pro-module/src/MyCompanyName.MyProjectName.MyModuleName.Application/MyCompanyName.MyProjectName.MyModuleName.Application.csproj index bebe5ce2..56f2a0e7 100644 --- a/templates/pro-module/src/MyCompanyName.MyProjectName.MyModuleName.Application/MyCompanyName.MyProjectName.MyModuleName.Application.csproj +++ b/templates/pro-module/src/MyCompanyName.MyProjectName.MyModuleName.Application/MyCompanyName.MyProjectName.MyModuleName.Application.csproj @@ -1,12 +1,12 @@ - net9.0 + net10.0 MyCompanyName.MyProjectName.MyModuleName - + diff --git a/templates/pro-module/src/MyCompanyName.MyProjectName.MyModuleName.Application/MyModuleNameApplicationAutoMapperProfile.cs b/templates/pro-module/src/MyCompanyName.MyProjectName.MyModuleName.Application/MyModuleNameApplicationAutoMapperProfile.cs deleted file mode 100644 index faa38051..00000000 --- a/templates/pro-module/src/MyCompanyName.MyProjectName.MyModuleName.Application/MyModuleNameApplicationAutoMapperProfile.cs +++ /dev/null @@ -1,13 +0,0 @@ -namespace MyCompanyName.MyProjectName.MyModuleName -{ - public class MyModuleNameApplicationAutoMapperProfile : Profile - { - public MyModuleNameApplicationAutoMapperProfile() - { - /* You can configure your AutoMapper mapping configuration here. - * Alternatively, you can split your mapping configurations - * into multiple profile classes for a better organization. */ - - } - } -} \ No newline at end of file diff --git a/templates/pro-module/src/MyCompanyName.MyProjectName.MyModuleName.Application/MyModuleNameApplicationModule.cs b/templates/pro-module/src/MyCompanyName.MyProjectName.MyModuleName.Application/MyModuleNameApplicationModule.cs index 56e9d4c1..fa48b0b8 100644 --- a/templates/pro-module/src/MyCompanyName.MyProjectName.MyModuleName.Application/MyModuleNameApplicationModule.cs +++ b/templates/pro-module/src/MyCompanyName.MyProjectName.MyModuleName.Application/MyModuleNameApplicationModule.cs @@ -3,18 +3,10 @@ namespace MyCompanyName.MyProjectName.MyModuleName [DependsOn( typeof(MyModuleNameDomainModule), typeof(MyModuleNameApplicationContractsModule), - typeof(AbpDddApplicationModule), - typeof(AbpAutoMapperModule) + typeof(AbpDddApplicationModule) )] public class MyModuleNameApplicationModule : AbpModule { - public override void ConfigureServices(ServiceConfigurationContext context) - { - context.Services.AddAutoMapperObjectMapper(); - Configure(options => - { - options.AddMaps(validate: true); - }); - } + } } diff --git a/templates/pro-module/src/MyCompanyName.MyProjectName.MyModuleName.Domain.Shared/MyCompanyName.MyProjectName.MyModuleName.Domain.Shared.csproj b/templates/pro-module/src/MyCompanyName.MyProjectName.MyModuleName.Domain.Shared/MyCompanyName.MyProjectName.MyModuleName.Domain.Shared.csproj index 18af6641..2b867fde 100644 --- a/templates/pro-module/src/MyCompanyName.MyProjectName.MyModuleName.Domain.Shared/MyCompanyName.MyProjectName.MyModuleName.Domain.Shared.csproj +++ b/templates/pro-module/src/MyCompanyName.MyProjectName.MyModuleName.Domain.Shared/MyCompanyName.MyProjectName.MyModuleName.Domain.Shared.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 MyCompanyName.MyProjectName.MyModuleName true diff --git a/templates/pro-module/src/MyCompanyName.MyProjectName.MyModuleName.Domain/MyCompanyName.MyProjectName.MyModuleName.Domain.csproj b/templates/pro-module/src/MyCompanyName.MyProjectName.MyModuleName.Domain/MyCompanyName.MyProjectName.MyModuleName.Domain.csproj index 7c4a266f..68c35491 100644 --- a/templates/pro-module/src/MyCompanyName.MyProjectName.MyModuleName.Domain/MyCompanyName.MyProjectName.MyModuleName.Domain.csproj +++ b/templates/pro-module/src/MyCompanyName.MyProjectName.MyModuleName.Domain/MyCompanyName.MyProjectName.MyModuleName.Domain.csproj @@ -1,14 +1,14 @@ - net9.0 + net10.0 MyCompanyName.MyProjectName.MyModuleName - + diff --git a/templates/pro-module/src/MyCompanyName.MyProjectName.MyModuleName.Domain/MyModuleNameDomainAutoMapperProfile.cs b/templates/pro-module/src/MyCompanyName.MyProjectName.MyModuleName.Domain/MyModuleNameDomainAutoMapperProfile.cs deleted file mode 100644 index d0c0d07c..00000000 --- a/templates/pro-module/src/MyCompanyName.MyProjectName.MyModuleName.Domain/MyModuleNameDomainAutoMapperProfile.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace MyCompanyName.MyProjectName.MyModuleName -{ - public class MyModuleNameDomainAutoMapperProfile : Profile - { - public MyModuleNameDomainAutoMapperProfile() - { - } - } -} \ No newline at end of file diff --git a/templates/pro-module/src/MyCompanyName.MyProjectName.MyModuleName.Domain/MyModuleNameDomainModule.cs b/templates/pro-module/src/MyCompanyName.MyProjectName.MyModuleName.Domain/MyModuleNameDomainModule.cs index 0141b207..b17abfd9 100644 --- a/templates/pro-module/src/MyCompanyName.MyProjectName.MyModuleName.Domain/MyModuleNameDomainModule.cs +++ b/templates/pro-module/src/MyCompanyName.MyProjectName.MyModuleName.Domain/MyModuleNameDomainModule.cs @@ -3,18 +3,9 @@ namespace MyCompanyName.MyProjectName.MyModuleName [DependsOn( typeof(AbpDddDomainModule), typeof(MyModuleNameDomainSharedModule), - typeof(AbpCachingModule), - typeof(AbpAutoMapperModule) + typeof(AbpCachingModule) )] public class MyModuleNameDomainModule : AbpModule { - public override void ConfigureServices(ServiceConfigurationContext context) - { - // 配置automapper - Configure(options => - { - options.AddMaps(validate: false); - }); - } } } diff --git a/templates/pro-module/src/MyCompanyName.MyProjectName.MyModuleName.Domain/MyModuleNameDomainService.cs b/templates/pro-module/src/MyCompanyName.MyProjectName.MyModuleName.Domain/MyModuleNameDomainService.cs index 58bdd3ba..3a552a3e 100644 --- a/templates/pro-module/src/MyCompanyName.MyProjectName.MyModuleName.Domain/MyModuleNameDomainService.cs +++ b/templates/pro-module/src/MyCompanyName.MyProjectName.MyModuleName.Domain/MyModuleNameDomainService.cs @@ -17,15 +17,5 @@ namespace MyCompanyName.MyProjectName.MyModuleName /// protected IDistributedEventBus DistributedEventBus => LazyServiceProvider.LazyGetRequiredService(); - - /// - /// 对象映射器 - /// - protected IObjectMapper ObjectMapper => LazyServiceProvider.LazyGetService( - provider => - ObjectMapperContext == null - ? provider.GetRequiredService() - : (IObjectMapper)provider.GetRequiredService( - typeof(IObjectMapper<>).MakeGenericType(ObjectMapperContext))); } } \ No newline at end of file diff --git a/templates/pro-module/src/MyCompanyName.MyProjectName.MyModuleName.EntityFrameworkCore/MyCompanyName.MyProjectName.MyModuleName.EntityFrameworkCore.csproj b/templates/pro-module/src/MyCompanyName.MyProjectName.MyModuleName.EntityFrameworkCore/MyCompanyName.MyProjectName.MyModuleName.EntityFrameworkCore.csproj index 6894da40..0279a345 100644 --- a/templates/pro-module/src/MyCompanyName.MyProjectName.MyModuleName.EntityFrameworkCore/MyCompanyName.MyProjectName.MyModuleName.EntityFrameworkCore.csproj +++ b/templates/pro-module/src/MyCompanyName.MyProjectName.MyModuleName.EntityFrameworkCore/MyCompanyName.MyProjectName.MyModuleName.EntityFrameworkCore.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 MyCompanyName.MyProjectName.MyModuleName diff --git a/templates/pro-module/src/MyCompanyName.MyProjectName.MyModuleName.HttpApi.Client/MyCompanyName.MyProjectName.MyModuleName.HttpApi.Client.csproj b/templates/pro-module/src/MyCompanyName.MyProjectName.MyModuleName.HttpApi.Client/MyCompanyName.MyProjectName.MyModuleName.HttpApi.Client.csproj index c5186b05..be1a6014 100644 --- a/templates/pro-module/src/MyCompanyName.MyProjectName.MyModuleName.HttpApi.Client/MyCompanyName.MyProjectName.MyModuleName.HttpApi.Client.csproj +++ b/templates/pro-module/src/MyCompanyName.MyProjectName.MyModuleName.HttpApi.Client/MyCompanyName.MyProjectName.MyModuleName.HttpApi.Client.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 MyCompanyName.MyProjectName.MyModuleName diff --git a/templates/pro-module/src/MyCompanyName.MyProjectName.MyModuleName.HttpApi/MyCompanyName.MyProjectName.MyModuleName.HttpApi.csproj b/templates/pro-module/src/MyCompanyName.MyProjectName.MyModuleName.HttpApi/MyCompanyName.MyProjectName.MyModuleName.HttpApi.csproj index 39755945..e38336d7 100644 --- a/templates/pro-module/src/MyCompanyName.MyProjectName.MyModuleName.HttpApi/MyCompanyName.MyProjectName.MyModuleName.HttpApi.csproj +++ b/templates/pro-module/src/MyCompanyName.MyProjectName.MyModuleName.HttpApi/MyCompanyName.MyProjectName.MyModuleName.HttpApi.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 MyCompanyName.MyProjectName.MyModuleName diff --git a/templates/pro-module/test/MyCompanyName.MyProjectName.MyModuleName.Application.Tests/MyCompanyName.MyProjectName.MyModuleName.Application.Tests.csproj b/templates/pro-module/test/MyCompanyName.MyProjectName.MyModuleName.Application.Tests/MyCompanyName.MyProjectName.MyModuleName.Application.Tests.csproj index a81db81f..2cfcb597 100644 --- a/templates/pro-module/test/MyCompanyName.MyProjectName.MyModuleName.Application.Tests/MyCompanyName.MyProjectName.MyModuleName.Application.Tests.csproj +++ b/templates/pro-module/test/MyCompanyName.MyProjectName.MyModuleName.Application.Tests/MyCompanyName.MyProjectName.MyModuleName.Application.Tests.csproj @@ -2,7 +2,7 @@ - net9.0 + net10.0 MyCompanyName.MyProjectName.MyModuleName false diff --git a/templates/pro-module/test/MyCompanyName.MyProjectName.MyModuleName.Domain.Tests/MyCompanyName.MyProjectName.MyModuleName.Domain.Tests.csproj b/templates/pro-module/test/MyCompanyName.MyProjectName.MyModuleName.Domain.Tests/MyCompanyName.MyProjectName.MyModuleName.Domain.Tests.csproj index 8ffc2b8b..84bab954 100644 --- a/templates/pro-module/test/MyCompanyName.MyProjectName.MyModuleName.Domain.Tests/MyCompanyName.MyProjectName.MyModuleName.Domain.Tests.csproj +++ b/templates/pro-module/test/MyCompanyName.MyProjectName.MyModuleName.Domain.Tests/MyCompanyName.MyProjectName.MyModuleName.Domain.Tests.csproj @@ -2,7 +2,7 @@ - net9.0 + net10.0 MyCompanyName.MyProjectName.MyModuleName false diff --git a/templates/pro-module/test/MyCompanyName.MyProjectName.MyModuleName.EntityFrameworkCore.Tests/MyCompanyName.MyProjectName.MyModuleName.EntityFrameworkCore.Tests.csproj b/templates/pro-module/test/MyCompanyName.MyProjectName.MyModuleName.EntityFrameworkCore.Tests/MyCompanyName.MyProjectName.MyModuleName.EntityFrameworkCore.Tests.csproj index 1bda30b9..8e2d3448 100644 --- a/templates/pro-module/test/MyCompanyName.MyProjectName.MyModuleName.EntityFrameworkCore.Tests/MyCompanyName.MyProjectName.MyModuleName.EntityFrameworkCore.Tests.csproj +++ b/templates/pro-module/test/MyCompanyName.MyProjectName.MyModuleName.EntityFrameworkCore.Tests/MyCompanyName.MyProjectName.MyModuleName.EntityFrameworkCore.Tests.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 MyCompanyName.MyProjectName.MyModuleName false diff --git a/templates/pro-module/test/MyCompanyName.MyProjectName.MyModuleName.TestBase/MyCompanyName.MyProjectName.MyModuleName.TestBase.csproj b/templates/pro-module/test/MyCompanyName.MyProjectName.MyModuleName.TestBase/MyCompanyName.MyProjectName.MyModuleName.TestBase.csproj index 7427ebaa..8d4c4dd9 100644 --- a/templates/pro-module/test/MyCompanyName.MyProjectName.MyModuleName.TestBase/MyCompanyName.MyProjectName.MyModuleName.TestBase.csproj +++ b/templates/pro-module/test/MyCompanyName.MyProjectName.MyModuleName.TestBase/MyCompanyName.MyProjectName.MyModuleName.TestBase.csproj @@ -2,7 +2,7 @@ - net9.0 + net10.0 MyCompanyName.MyProjectName.MyModuleName false diff --git a/templates/pro-nuget/service/Directory.Build.Microsoft.targets b/templates/pro-nuget/service/Directory.Build.Microsoft.targets index 938c0b67..1e807352 100644 --- a/templates/pro-nuget/service/Directory.Build.Microsoft.targets +++ b/templates/pro-nuget/service/Directory.Build.Microsoft.targets @@ -1,21 +1,21 @@  - - - - - - - - - - - - + + + + + + + + + + + + - - - + + + diff --git a/templates/pro-nuget/service/Directory.Build.Volo.targets b/templates/pro-nuget/service/Directory.Build.Volo.targets index 2c848ba2..f949bc55 100644 --- a/templates/pro-nuget/service/Directory.Build.Volo.targets +++ b/templates/pro-nuget/service/Directory.Build.Volo.targets @@ -1,99 +1,99 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/templates/pro-nuget/service/Directory.Build.targets b/templates/pro-nuget/service/Directory.Build.targets index a5e9bab3..fb6f557c 100644 --- a/templates/pro-nuget/service/Directory.Build.targets +++ b/templates/pro-nuget/service/Directory.Build.targets @@ -2,13 +2,13 @@ - latest 1.0.0 Abp vNext Pro - $(NoWarn);CS1591;CS0436;NU1504;CS0618;ASP0019 + $(NoWarnNuGet)$(NoWarn);CS1591;CS0436; + $(NoWarnNuGet);1902;NU1903 app true WangJunZzz @@ -29,9 +29,10 @@ - - - + + + + @@ -47,17 +48,18 @@ - - - - - + + + + + + - - - - + + + @@ -82,13 +84,13 @@ - + - + - + @@ -96,8 +98,21 @@ - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj b/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj index 30f64da9..3ba9cac7 100644 --- a/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj +++ b/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj @@ -2,7 +2,7 @@ - net9.0 + net10.0 MyCompanyName.MyProjectName true MyCompanyName.MyProjectName-4681b4fd-151f-4221-84a4-929d86723e4c diff --git a/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.WebGateway/MyCompanyName.MyProjectName.WebGateway.csproj b/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.WebGateway/MyCompanyName.MyProjectName.WebGateway.csproj index 25e55aeb..ac8d57fe 100644 --- a/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.WebGateway/MyCompanyName.MyProjectName.WebGateway.csproj +++ b/templates/pro-nuget/service/host/MyCompanyName.MyProjectName.WebGateway/MyCompanyName.MyProjectName.WebGateway.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 diff --git a/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName.MyProjectName.Application.Contracts.csproj b/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName.MyProjectName.Application.Contracts.csproj index 309937b3..1d72a7c1 100644 --- a/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName.MyProjectName.Application.Contracts.csproj +++ b/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName.MyProjectName.Application.Contracts.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 MyCompanyName.MyProjectName diff --git a/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.Application/GlobalUsings.cs b/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.Application/GlobalUsings.cs index 4acf2d15..c98bb35a 100644 --- a/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.Application/GlobalUsings.cs +++ b/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.Application/GlobalUsings.cs @@ -8,7 +8,6 @@ global using Lion.AbpPro.BasicManagement; global using Lion.AbpPro.DataDictionaryManagement; global using Lion.AbpPro.LanguageManagement; global using Lion.AbpPro.NotificationManagement; -global using MyCompanyName.MyProjectName.FreeSqlRepository; global using MyCompanyName.MyProjectName.Permissions; global using Microsoft.AspNetCore.Authorization; global using Microsoft.Extensions.Configuration; @@ -16,5 +15,4 @@ global using Volo.Abp.Application.Services; global using Volo.Abp.AutoMapper; global using Volo.Abp.BackgroundJobs.Hangfire; global using Volo.Abp.DependencyInjection; -global using Volo.Abp.Modularity; -global using Profile = AutoMapper.Profile; \ No newline at end of file +global using Volo.Abp.Modularity; \ No newline at end of file diff --git a/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.Application/Jobs/TestJob.cs b/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.Application/Jobs/TestJob.cs deleted file mode 100644 index 040eae42..00000000 --- a/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.Application/Jobs/TestJob.cs +++ /dev/null @@ -1,11 +0,0 @@ -namespace MyCompanyName.MyProjectName.Jobs -{ - public class TestJob : IRecurringJob - { - public Task ExecuteAsync() - { - Console.WriteLine($"job 测试- {DateTime.Now}"); - return Task.CompletedTask; - } - } -} \ No newline at end of file diff --git a/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.Application/MyCompanyName.MyProjectName.Application.csproj b/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.Application/MyCompanyName.MyProjectName.Application.csproj index 230a22aa..93ec532d 100644 --- a/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.Application/MyCompanyName.MyProjectName.Application.csproj +++ b/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.Application/MyCompanyName.MyProjectName.Application.csproj @@ -2,7 +2,7 @@ - net9.0 + net10.0 MyCompanyName.MyProjectName diff --git a/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationAutoMapperProfile.cs b/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationAutoMapperProfile.cs deleted file mode 100644 index d39e6a5f..00000000 --- a/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationAutoMapperProfile.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace MyCompanyName.MyProjectName -{ - public class MyProjectNameApplicationAutoMapperProfile : Profile - { - public MyProjectNameApplicationAutoMapperProfile() - { - - } - } -} diff --git a/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationModule.cs b/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationModule.cs index c74099ce..c678f627 100644 --- a/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationModule.cs +++ b/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationModule.cs @@ -6,18 +6,10 @@ namespace MyCompanyName.MyProjectName typeof(BasicManagementApplicationModule), typeof(NotificationManagementApplicationModule), typeof(DataDictionaryManagementApplicationModule), - typeof(LanguageManagementApplicationModule), - typeof(MyProjectNameFreeSqlModule) + typeof(LanguageManagementApplicationModule) )] public class MyProjectNameApplicationModule : AbpModule { - public override void ConfigureServices(ServiceConfigurationContext context) - { - Configure(options => - { - options.AddMaps(); - }); - - } + } } diff --git a/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.DbMigrator/MyCompanyName.MyProjectName.DbMigrator.csproj b/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.DbMigrator/MyCompanyName.MyProjectName.DbMigrator.csproj index 562351d6..bd05d84f 100644 --- a/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.DbMigrator/MyCompanyName.MyProjectName.DbMigrator.csproj +++ b/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.DbMigrator/MyCompanyName.MyProjectName.DbMigrator.csproj @@ -2,7 +2,7 @@ Exe - net9.0 + net10.0 diff --git a/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj b/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj index 71fc901e..9384b2a0 100644 --- a/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj +++ b/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj @@ -1,6 +1,6 @@ - net9.0 + net10.0 MyCompanyName.MyProjectName true diff --git a/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.Domain/MyCompanyName.MyProjectName.Domain.csproj b/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.Domain/MyCompanyName.MyProjectName.Domain.csproj index af66d6e7..61ff97b8 100644 --- a/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.Domain/MyCompanyName.MyProjectName.Domain.csproj +++ b/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.Domain/MyCompanyName.MyProjectName.Domain.csproj @@ -1,6 +1,6 @@ - net9.0 + net10.0 MyCompanyName.MyProjectName diff --git a/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDomainService.cs b/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDomainService.cs index c5973e0f..0b58c859 100644 --- a/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDomainService.cs +++ b/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDomainService.cs @@ -22,15 +22,5 @@ namespace MyCompanyName.MyProjectName /// protected IDistributedEventBus DistributedEventBus => LazyServiceProvider.LazyGetRequiredService(); - - /// - /// 对象映射器 - /// - protected IObjectMapper ObjectMapper => LazyServiceProvider.LazyGetService( - provider => - ObjectMapperContext == null - ? provider.GetRequiredService() - : (IObjectMapper)provider.GetRequiredService( - typeof(IObjectMapper<>).MakeGenericType(ObjectMapperContext))); } } \ No newline at end of file diff --git a/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreModule.cs b/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreModule.cs index 43822691..a8a1565a 100644 --- a/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreModule.cs +++ b/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreModule.cs @@ -4,7 +4,7 @@ namespace MyCompanyName.MyProjectName.EntityFrameworkCore { [DependsOn( typeof(MyProjectNameDomainModule), - typeof(AbpEntityFrameworkCoreMySQLModule), + typeof(AbpEntityFrameworkCorePostgreSqlModule), typeof(BasicManagementEntityFrameworkCoreModule), typeof(DataDictionaryManagementEntityFrameworkCoreModule), typeof(NotificationManagementEntityFrameworkCoreModule), @@ -15,6 +15,7 @@ namespace MyCompanyName.MyProjectName.EntityFrameworkCore public override void PreConfigureServices(ServiceConfigurationContext context) { MyProjectNameEfCoreEntityExtensionMappings.Configure(); + AppContext.SetSwitch("Npgsql.EnableLegacyTimestampBehavior", true); } public override void ConfigureServices(ServiceConfigurationContext context) @@ -31,7 +32,7 @@ namespace MyCompanyName.MyProjectName.EntityFrameworkCore }); Configure(options => { - options.UseMySQL(builder => + options.UseNpgsql(builder => { builder.TranslateParameterizedCollectionsToConstants(); }); diff --git a/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameMigrationsDbContextFactory.cs b/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameMigrationsDbContextFactory.cs index c154179c..318e80fc 100644 --- a/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameMigrationsDbContextFactory.cs +++ b/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameMigrationsDbContextFactory.cs @@ -11,7 +11,7 @@ namespace MyCompanyName.MyProjectName.EntityFrameworkCore var configuration = BuildConfiguration(); var builder = new DbContextOptionsBuilder() - .UseMySQL(configuration.GetConnectionString("Default") ?? string.Empty); + .UseNpgsql(configuration.GetConnectionString("Default") ?? string.Empty); return new MyProjectNameDbContext(builder.Options); } diff --git a/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.EntityFrameworkCore/GlobalUsings.cs b/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.EntityFrameworkCore/GlobalUsings.cs index f92c1d20..711b65be 100644 --- a/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.EntityFrameworkCore/GlobalUsings.cs +++ b/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.EntityFrameworkCore/GlobalUsings.cs @@ -29,7 +29,7 @@ global using Volo.Abp.BackgroundJobs; global using Volo.Abp.Data; global using Volo.Abp.DependencyInjection; global using Volo.Abp.EntityFrameworkCore; -global using Volo.Abp.EntityFrameworkCore.MySQL; +global using Volo.Abp.EntityFrameworkCore.PostgreSql; global using Volo.Abp.FeatureManagement; global using Volo.Abp.Identity; global using Volo.Abp.Modularity; diff --git a/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName.MyProjectName.EntityFrameworkCore.csproj b/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName.MyProjectName.EntityFrameworkCore.csproj index 076b6a22..8094e28c 100644 --- a/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName.MyProjectName.EntityFrameworkCore.csproj +++ b/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName.MyProjectName.EntityFrameworkCore.csproj @@ -1,12 +1,12 @@ - net9.0 + net10.0 MyCompanyName.MyProjectName - + diff --git a/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.FreeSqlRepository/FreeSqlBasicRepository.cs b/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.FreeSqlRepository/FreeSqlBasicRepository.cs deleted file mode 100644 index 185fcf3c..00000000 --- a/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.FreeSqlRepository/FreeSqlBasicRepository.cs +++ /dev/null @@ -1,14 +0,0 @@ -namespace MyCompanyName.MyProjectName.FreeSqlRepository; - -public abstract class FreeSqlBasicRepository : DomainService -{ - protected IFreeSql FreeSql => LazyServiceProvider.LazyGetRequiredService(); - - private ICancellationTokenProvider CancellationTokenProvider => - LazyServiceProvider.LazyGetService(NullCancellationTokenProvider.Instance); - - protected virtual CancellationToken GetCancellationToken(CancellationToken preferredValue = default) - { - return CancellationTokenProvider.FallbackToProvider(preferredValue); - } -} \ No newline at end of file diff --git a/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.FreeSqlRepository/GlobalUsings.cs b/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.FreeSqlRepository/GlobalUsings.cs deleted file mode 100644 index 39a34c3d..00000000 --- a/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.FreeSqlRepository/GlobalUsings.cs +++ /dev/null @@ -1,7 +0,0 @@ -// Global using directives - -global using Microsoft.Extensions.Configuration; -global using Microsoft.Extensions.DependencyInjection; -global using Volo.Abp.Domain.Services; -global using Volo.Abp.Modularity; -global using Volo.Abp.Threading; \ No newline at end of file diff --git a/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.FreeSqlRepository/MyCompanyName.MyProjectName.FreeSqlRepository.csproj b/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.FreeSqlRepository/MyCompanyName.MyProjectName.FreeSqlRepository.csproj deleted file mode 100644 index b4d228d7..00000000 --- a/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.FreeSqlRepository/MyCompanyName.MyProjectName.FreeSqlRepository.csproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - net9.0 - enable - - - - - - - - - - - - diff --git a/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.FreeSqlRepository/MyProjectNameFreeSqlModule.cs b/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.FreeSqlRepository/MyProjectNameFreeSqlModule.cs deleted file mode 100644 index c68f0cc5..00000000 --- a/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.FreeSqlRepository/MyProjectNameFreeSqlModule.cs +++ /dev/null @@ -1,15 +0,0 @@ -namespace MyCompanyName.MyProjectName.FreeSqlRepository; - -public class MyProjectNameFreeSqlModule : AbpModule -{ - public override void ConfigureServices(ServiceConfigurationContext context) - { - var configuration = context.Services.GetConfiguration(); - var connectionString = configuration.GetConnectionString("Default"); - var freeSql = new FreeSql.FreeSqlBuilder() - .UseConnectionString(FreeSql.DataType.MySql, connectionString) - .Build(); - - context.Services.AddSingleton(freeSql); - } -} \ No newline at end of file diff --git a/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.HttpApi.Client/MyCompanyName.MyProjectName.HttpApi.Client.csproj b/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.HttpApi.Client/MyCompanyName.MyProjectName.HttpApi.Client.csproj index 2b6c6093..7a071100 100644 --- a/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.HttpApi.Client/MyCompanyName.MyProjectName.HttpApi.Client.csproj +++ b/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.HttpApi.Client/MyCompanyName.MyProjectName.HttpApi.Client.csproj @@ -1,6 +1,6 @@ - net9.0 + net10.0 MyCompanyName.MyProjectName diff --git a/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.HttpApi/MyCompanyName.MyProjectName.HttpApi.csproj b/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.HttpApi/MyCompanyName.MyProjectName.HttpApi.csproj index 3ef888ba..58c349b8 100644 --- a/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.HttpApi/MyCompanyName.MyProjectName.HttpApi.csproj +++ b/templates/pro-nuget/service/src/MyCompanyName.MyProjectName.HttpApi/MyCompanyName.MyProjectName.HttpApi.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 MyCompanyName.MyProjectName diff --git a/templates/pro-nuget/service/test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName.MyProjectName.Application.Tests.csproj b/templates/pro-nuget/service/test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName.MyProjectName.Application.Tests.csproj index facb9f3c..f269a06e 100644 --- a/templates/pro-nuget/service/test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName.MyProjectName.Application.Tests.csproj +++ b/templates/pro-nuget/service/test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName.MyProjectName.Application.Tests.csproj @@ -1,6 +1,6 @@ - net9.0 + net10.0 MyCompanyName.MyProjectName false diff --git a/templates/pro-nuget/service/test/MyCompanyName.MyProjectName.Domain.Tests/MyCompanyName.MyProjectName.Domain.Tests.csproj b/templates/pro-nuget/service/test/MyCompanyName.MyProjectName.Domain.Tests/MyCompanyName.MyProjectName.Domain.Tests.csproj index 9023c2de..916bc513 100644 --- a/templates/pro-nuget/service/test/MyCompanyName.MyProjectName.Domain.Tests/MyCompanyName.MyProjectName.Domain.Tests.csproj +++ b/templates/pro-nuget/service/test/MyCompanyName.MyProjectName.Domain.Tests/MyCompanyName.MyProjectName.Domain.Tests.csproj @@ -1,6 +1,6 @@ - net9.0 + net10.0 MyCompanyName.MyProjectName false diff --git a/templates/pro-nuget/service/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.csproj b/templates/pro-nuget/service/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.csproj index bf987610..8ca6cea0 100644 --- a/templates/pro-nuget/service/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.csproj +++ b/templates/pro-nuget/service/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.csproj @@ -1,6 +1,6 @@ - net9.0 + net10.0 MyCompanyName.MyProjectName false diff --git a/templates/pro-nuget/service/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp.csproj b/templates/pro-nuget/service/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp.csproj index f1428847..98558021 100644 --- a/templates/pro-nuget/service/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp.csproj +++ b/templates/pro-nuget/service/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp.csproj @@ -1,7 +1,7 @@ Exe - net9.0 + net10.0 false diff --git a/templates/pro-nuget/service/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName.MyProjectName.TestBase.csproj b/templates/pro-nuget/service/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName.MyProjectName.TestBase.csproj index e0a66641..83ba6cfe 100644 --- a/templates/pro-nuget/service/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName.MyProjectName.TestBase.csproj +++ b/templates/pro-nuget/service/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName.MyProjectName.TestBase.csproj @@ -1,6 +1,6 @@ - net9.0 + net10.0 MyCompanyName.MyProjectName false