Skip to content

Commit 7ff722a

Browse files
colinincolinin
committed
feat: Adjust the microservice template project
1 parent ee1d306 commit 7ff722a

41 files changed

Lines changed: 580 additions & 559 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎aspnet-core/framework/cli/LINGYUN.Abp.Cli/LINGYUN.Abp.Cli.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<Import Project="..\..\..\..\configureawait.props" />
44

55
<PropertyGroup>
66
<OutputType>Exe</OutputType>
77
<TargetFramework>net10.0</TargetFramework>
8-
<Version>9.3.6</Version>
8+
<Version>10.2.0</Version>
99
<Copyright>colin</Copyright>
1010
<Description>Use LINGYUN.MicroService.Templates command line</Description>
1111
<PackAsTool>true</PackAsTool>
@@ -28,7 +28,7 @@
2828
</ItemGroup>
2929

3030
<ItemGroup>
31-
<PackageReference Include="Microsoft.CSharp" />
31+
<!--<PackageReference Include="Microsoft.CSharp" />-->
3232
<!--<PackageReference Include="NETStandard.Library" Version="2.0.3" />-->
3333
<PackageReference Include="Serilog.Extensions.Logging" />
3434
<PackageReference Include="Serilog.Sinks.File" />

‎aspnet-core/templates/micro/PackageName.CompanyName.ProjectName.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<TargetFramework>net10.0</TargetFramework>
44
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
55
<PackageId>LINGYUN.Abp.MicroService.Templates</PackageId>
6-
<Version>9.3.6</Version>
6+
<Version>10.2.0</Version>
77
<Authors>colin.in@foxmail.com</Authors>
88
<Description>Abp framework micro-service template</Description>
99
<PackageLicenseExpression>MIT</PackageLicenseExpression>
@@ -27,4 +27,4 @@
2727
<PackagePath>content</PackagePath>
2828
</Content>
2929
</ItemGroup>
30-
</Project>
30+
</Project>

‎aspnet-core/templates/micro/content/.gitlab-ci.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
image: mcr.microsoft.com/dotnet/sdk:9.0
2-
31
stages:
42
- build
53
- test

aspnet-core/templates/micro/content/deploy/deployment.yaml renamed to aspnet-core/templates/micro/content/.k8s/deployment.yaml

File renamed without changes.

‎aspnet-core/templates/micro/content/Directory.Packages.props‎

Lines changed: 43 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<Project>
22
<PropertyGroup>
3-
<DotNetCoreCAPPackageVersion>8.3.5</DotNetCoreCAPPackageVersion>
4-
<ElsaPackageVersion>2.15.1</ElsaPackageVersion>
5-
<VoloAbpPackageVersion>9.3.6</VoloAbpPackageVersion>
6-
<LINGYUNAbpPackageVersion>9.3.6</LINGYUNAbpPackageVersion>
7-
<MicrosoftExtensionsPackageVersion>9.0.5</MicrosoftExtensionsPackageVersion>
8-
<MicrosoftAspNetCorePackageVersion>9.0.5</MicrosoftAspNetCorePackageVersion>
9-
<MicrosoftEntityFrameworkCorePackageVersion>9.0.5</MicrosoftEntityFrameworkCorePackageVersion>
3+
<DotNetCoreCAPPackageVersion>10.0.0</DotNetCoreCAPPackageVersion>
4+
<ElsaPackageVersion>2.16.1</ElsaPackageVersion>
5+
<VoloAbpPackageVersion>10.2.0</VoloAbpPackageVersion>
6+
<LINGYUNAbpPackageVersion>10.2.0</LINGYUNAbpPackageVersion>
7+
<MicrosoftExtensionsPackageVersion>10.0.2</MicrosoftExtensionsPackageVersion>
8+
<MicrosoftAspNetCorePackageVersion>10.0.2</MicrosoftAspNetCorePackageVersion>
9+
<MicrosoftEntityFrameworkCorePackageVersion>10.0.2</MicrosoftEntityFrameworkCorePackageVersion>
1010
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
1111
</PropertyGroup>
1212

@@ -21,6 +21,7 @@
2121
<PackageVersion Include="LINGYUN.Abp.Authorization.OrganizationUnits" Version="$(LINGYUNAbpPackageVersion)" />
2222
<PackageVersion Include="LINGYUN.Abp.BackgroundTasks.Abstractions" Version="$(LINGYUNAbpPackageVersion)" />
2323
<PackageVersion Include="LINGYUN.Abp.BackgroundTasks.Jobs" Version="$(LINGYUNAbpPackageVersion)" />
24+
<PackageVersion Include="LINGYUN.Abp.BlobStoring.BlobManagement" Version="$(LINGYUNAbpPackageVersion)" />
2425
<PackageVersion Include="LINGYUN.Abp.Data.DbMigrator" Version="$(LINGYUNAbpPackageVersion)" />
2526
<PackageVersion Include="LINGYUN.Abp.DataProtection" Version="$(LINGYUNAbpPackageVersion)" />
2627
<PackageVersion Include="LINGYUN.Abp.DataProtection.Abstractions" Version="$(LINGYUNAbpPackageVersion)" />
@@ -48,7 +49,7 @@
4849
<PackageVersion Include="LINGYUN.Abp.Exporter.Application.Contracts" Version="$(LINGYUNAbpPackageVersion)" />
4950
<PackageVersion Include="LINGYUN.Abp.Exporter.Core" Version="$(LINGYUNAbpPackageVersion)" />
5051
<PackageVersion Include="LINGYUN.Abp.Exporter.MagicodesIE.Excel" Version="$(LINGYUNAbpPackageVersion)" />
51-
<PackageVersion Include="LINGYUN.Abp.Exporter.MiniExcel" Version="$(LINGYUNAbpPackageVersion)" />
52+
<PackageVersion Include="LINGYUN.Abp.Exporter.MiniSoftware" Version="$(LINGYUNAbpPackageVersion)" />
5253
<PackageVersion Include="LINGYUN.Abp.Http.Client.Wrapper" Version="$(LINGYUNAbpPackageVersion)" />
5354
<PackageVersion Include="LINGYUN.Abp.IdGenerator" Version="$(LINGYUNAbpPackageVersion)" />
5455
<PackageVersion Include="LINGYUN.Abp.Identity.Session" Version="$(LINGYUNAbpPackageVersion)" />
@@ -243,7 +244,7 @@
243244

244245
<!-- Abp Framework -->
245246
<ItemGroup>
246-
<PackageVersion Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="4.3.6" />
247+
<PackageVersion Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="5.2.0" />
247248
<PackageVersion Include="Volo.Abp.Core" Version="$(VoloAbpPackageVersion)" />
248249
<PackageVersion Include="Volo.Abp.Account.Application" Version="$(VoloAbpPackageVersion)" />
249250
<PackageVersion Include="Volo.Abp.Account.Application.Contracts" Version="$(VoloAbpPackageVersion)" />
@@ -332,6 +333,7 @@
332333
<PackageVersion Include="Volo.Abp.Json.Abstractions" Version="$(VoloAbpPackageVersion)" />
333334
<PackageVersion Include="Volo.Abp.Localization" Version="$(VoloAbpPackageVersion)" />
334335
<PackageVersion Include="Volo.Abp.MailKit" Version="$(VoloAbpPackageVersion)" />
336+
<PackageVersion Include="Volo.Abp.Mapperly" Version="$(VoloAbpPackageVersion)" />
335337
<PackageVersion Include="Volo.Abp.MemoryDb" Version="$(VoloAbpPackageVersion)" />
336338
<PackageVersion Include="Volo.Abp.MultiTenancy" Version="$(VoloAbpPackageVersion)" />
337339
<PackageVersion Include="Volo.Abp.MultiTenancy.Abstractions" Version="$(VoloAbpPackageVersion)" />
@@ -392,9 +394,11 @@
392394
<PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="$(MicrosoftExtensionsPackageVersion)" />
393395
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="$(MicrosoftExtensionsPackageVersion)" />
394396
<PackageVersion Include="Microsoft.Extensions.Options" Version="$(MicrosoftExtensionsPackageVersion)" />
395-
<PackageVersion Include="MySql.EntityFrameworkCore" Version="9.0.6" />
397+
<PackageVersion Include="MySql.EntityFrameworkCore" Version="10.0.1" />
396398
<PackageVersion Include="Pomelo.EntityFrameworkCore.MySql" Version="9.0.0" />
397399
<PackageVersion Include="Pomelo.EntityFrameworkCore.MySql.Json.Microsoft" Version="9.0.0" />
400+
<PackageVersion Include="Microting.EntityFrameworkCore.MySql" Version="10.0.3" />
401+
<PackageVersion Include="LINGYUN.Abp.EntityFrameworkCore.MySQL.Microting" Version="$(LINGYUNAbpPackageVersion)" />
398402
</ItemGroup>
399403

400404
<!-- Elsa -->
@@ -430,71 +434,73 @@
430434

431435
<!-- Serilog -->
432436
<ItemGroup>
433-
<PackageVersion Include="Serilog" Version="4.2.0" />
434-
<PackageVersion Include="Serilog.AspNetCore" Version="9.0.0" />
437+
<PackageVersion Include="Serilog" Version="4.3.0" />
438+
<PackageVersion Include="Serilog.AspNetCore" Version="10.0.0" />
435439
<PackageVersion Include="Serilog.Enrichers.Environment" Version="3.0.1" />
436440
<PackageVersion Include="Serilog.Enrichers.Assembly" Version="2.0.0" />
441+
<PackageVersion Include="Serilog.Enrichers.AssemblyName" Version="2.0.0" />
437442
<PackageVersion Include="Serilog.Enrichers.Process" Version="3.0.0" />
438443
<PackageVersion Include="Serilog.Enrichers.Thread" Version="4.0.0" />
439444
<PackageVersion Include="Serilog.Extensions.Hosting" Version="9.0.0" />
440-
<PackageVersion Include="Serilog.Extensions.Logging" Version="9.0.1" />
441-
<PackageVersion Include="Serilog.Settings.Configuration" Version="9.0.0" />
445+
<PackageVersion Include="Serilog.Extensions.Logging" Version="9.0.2" />
446+
<PackageVersion Include="Serilog.Settings.Configuration" Version="10.0.0" />
442447
<PackageVersion Include="Serilog.Sinks.Async" Version="2.1.0" />
443-
<PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0" />
444-
<PackageVersion Include="Serilog.Sinks.Elasticsearch" Version="9.0.3" />
448+
<PackageVersion Include="Serilog.Sinks.Console" Version="6.1.1" />
449+
<PackageVersion Include="Serilog.Sinks.Elasticsearch" Version="10.0.0" />
445450
<PackageVersion Include="Serilog.Sinks.File" Version="7.0.0" />
451+
<PackageVersion Include="Serilog.Sinks.OpenTelemetry" Version="4.2.0" />
446452
</ItemGroup>
447453

448454
<!-- Test -->
449455
<ItemGroup>
450456
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
451-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
457+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
452458
<PackageVersion Include="Moq.AutoMock" Version="3.5.0" />
453459
<PackageVersion Include="NSubstitute" Version="5.3.0" />
454460
<PackageVersion Include="Shouldly" Version="4.3.0" />
455461
<PackageVersion Include="xunit" Version="2.9.3" />
456462
<PackageVersion Include="xunit.extensibility.execution" Version="2.9.3" />
457-
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.2" />
463+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.4" />
458464
</ItemGroup>
459465

460466
<!-- Fody -->
461467
<ItemGroup>
462468
<PackageVersion Include="ConfigureAwait.Fody" Version="3.3.2" />
463-
<PackageVersion Include="Fody" Version="6.9.2" />
469+
<PackageVersion Include="Fody" Version="6.9.3" />
464470
</ItemGroup>
465471

466472
<!-- Other -->
467473
<ItemGroup>
468-
<PackageVersion Include="aliyun-net-sdk-core" Version="1.5.10" />
474+
<PackageVersion Include="aliyun-net-sdk-core" Version="1.6.2" />
469475
<PackageVersion Include="Aliyun.OSS.SDK.NetCore" Version="2.14.1" />
470-
<PackageVersion Include="AgileConfig.Client" Version="1.6.9" />
471-
<PackageVersion Include="Dapr.Client" Version="1.15.4" />
472-
<PackageVersion Include="Dapr.Actors" Version="1.15.4" />
473-
<PackageVersion Include="Dapr.Actors.AspNetCore" Version="1.15.4" />
476+
<PackageVersion Include="AgileConfig.Client" Version="1.8.0" />
477+
<PackageVersion Include="Dapr.Client" Version="1.16.0" />
478+
<PackageVersion Include="Dapr.Actors" Version="1.16.0" />
479+
<PackageVersion Include="Dapr.Actors.AspNetCore" Version="1.16.0" />
474480
<PackageVersion Include="DistributedLock.Core" Version="1.0.8" />
475-
<PackageVersion Include="DistributedLock.Redis" Version="1.0.3" />
481+
<PackageVersion Include="DistributedLock.Redis" Version="1.1.0" />
476482
<PackageVersion Include="Hangfire.MySqlStorage" Version="2.0.3" />
477-
<PackageVersion Include="HangFire.SqlServer" Version="1.8.18" />
483+
<PackageVersion Include="HangFire.SqlServer" Version="1.8.21" />
478484
<PackageVersion Include="IdentityModel" Version="7.0.0" />
479-
<PackageVersion Include="JetBrains.Annotations" Version="2024.3.0" />
480-
<PackageVersion Include="Markdig" Version="0.34.0" />
481-
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
485+
<PackageVersion Include="JetBrains.Annotations" Version="2025.2.2" />
486+
<PackageVersion Include="Markdig" Version="0.44.0" />
487+
<PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
482488
<PackageVersion Include="NEST" Version="7.17.5" />
483489
<PackageVersion Include="NRules" Version="0.9.2" />
484490
<PackageVersion Include="Ocelot.Provider.Polly" Version="20.0.0" />
485491
<PackageVersion Include="Polly" Version="8.5.2" />
486492
<PackageVersion Include="Quartz.Serialization.Json" Version="3.14.0" />
487493
<PackageVersion Include="RulesEngine" Version="5.0.5" />
488494
<PackageVersion Include="Senparc.Weixin.MP" Version="16.18.9" />
489-
<PackageVersion Include="SixLabors.ImageSharp" Version="3.1.8" />
490-
<PackageVersion Include="SixLabors.ImageSharp.Drawing" Version="2.1.6" />
491-
<PackageVersion Include="StackExchange.Redis" Version="2.8.31" />
492-
<PackageVersion Include="Swashbuckle.AspNetCore" Version="8.1.1" />
495+
<PackageVersion Include="SixLabors.ImageSharp" Version="3.1.11" />
496+
<PackageVersion Include="SixLabors.ImageSharp.Drawing" Version="2.1.7" />
497+
<PackageVersion Include="StackExchange.Redis" Version="2.9.17" />
498+
<PackageVersion Include="Swashbuckle.AspNetCore" Version="10.0.1" />
493499
<PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
494500
<PackageVersion Include="Tencent.QCloud.Cos.Sdk" Version="5.4.37" />
495-
<PackageVersion Include="TencentCloudSDK" Version="3.0.712" />
496-
<PackageVersion Include="Yarp.ReverseProxy" Version="2.1.0" />
497-
<PackageVersion Include="OpenIddict.Server.DataProtection" Version="6.2.1" />
498-
<PackageVersion Include="OpenIddict.Validation.DataProtection" Version="6.2.1" />
501+
<PackageVersion Include="TencentCloudSDK" Version="3.0.1273" />
502+
<PackageVersion Include="Yarp.ReverseProxy" Version="2.3.0" />
503+
<PackageVersion Include="OpenIddict.Server.DataProtection" Version="7.2.0" />
504+
<PackageVersion Include="OpenIddict.Validation.DataProtection" Version="7.2.0" />
499505
</ItemGroup>
500506
</Project>

0 commit comments

Comments
 (0)