Merge pull request #258 from EasyAbp/abp-10

Upgrade to ABP 10.0.1

Author: gdlcf88

.github/workflows/publish-docs.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           persist-credentials: false
           fetch-depth: 0

.github/workflows/publish.yml

@@ -8,11 +8,11 @@ jobs:
   publish:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: NuGet/setup-nuget@v2
-      - uses: actions/setup-dotnet@v4
+      - uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: '9.0.x'
+          dotnet-version: '10.0.x'
 
       - name: read common.props
         id: commonProps

Directory.Build.props

@@ -1,5 +1,5 @@
 <Project>
   <PropertyGroup>
-    <AbpVersion>9.3.3</AbpVersion>
+    <AbpVersion>10.0.1</AbpVersion>
   </PropertyGroup>
 </Project>

common.props

@@ -1,10 +1,10 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>0.26.0</Version>
-    <PackageVersion>0.26.0</PackageVersion>
-    <AssemblyVersion>0.26.0</AssemblyVersion>
-    <FileVersion>0.26.0</FileVersion>
+    <Version>0.27.0</Version>
+    <PackageVersion>0.27.0</PackageVersion>
+    <AssemblyVersion>0.27.0</AssemblyVersion>
+    <FileVersion>0.27.0</FileVersion>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>EasyAbp Team</Authors>
@@ -34,3 +34,4 @@
 
 
 
+

src/AbpHelper.Core/AbpHelper.Core.csproj

@@ -3,7 +3,7 @@
   <Import Project="..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <PackageId>EasyAbp.AbpHelper.Core</PackageId>
     <AssemblyName>EasyAbp.AbpHelper.Core</AssemblyName>
     <RootNamespace>EasyAbp.AbpHelper.Core</RootNamespace>
@@ -16,14 +16,14 @@
     <PackageReference Include="Elsa" Version="1.2.2.29" />
     <PackageReference Include="Humanizer.Core" Version="2.14.1" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.5.0" />
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="9.0.5" />
-    <PackageReference Include="Scriban" Version="6.2.1" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="10.0.0" />
+    <PackageReference Include="Scriban" Version="6.3.0" />
     <PackageReference Include="System.CommandLine" Version="2.0.0-beta1.20371.2" />
     <PackageReference Include="Volo.Abp.Autofac" Version="$(AbpVersion)" />
     <PackageReference Include="Volo.Abp.Core" Version="$(AbpVersion)" />
     <PackageReference Include="Volo.Abp.Http" Version="$(AbpVersion)" />
     <PackageReference Include="Volo.Abp.VirtualFileSystem" Version="$(AbpVersion)" />
-    <PackageReference Include="Serilog.Extensions.Logging" Version="9.0.1" />
+    <PackageReference Include="Serilog.Extensions.Logging" Version="9.0.2" />
     <PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
     <PackageReference Include="NuGet.Protocol" Version="6.2.2" />

src/AbpHelper.Core/Commands/Generate/Service/ServiceCommandOption.cs

@@ -2,7 +2,7 @@
 
 namespace EasyAbp.AbpHelper.Core.Commands.Generate.Service
 {
-    public class ServiceCommandOption : GenerateCommandOption
+    public class ServiceCommandOption : GenerateCommandOption // todo: supports integration services
     {
         [Argument("name", Description = "The service name(without 'AppService' postfix)")]
         public string Name { get; set; } = null!;

src/AbpHelper/AbpHelper.csproj

@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <LangVersion>10.0</LangVersion>
     <Nullable>enable</Nullable>
     <PackAsTool>true</PackAsTool>

test/AbpHelper.Tests/AbpHelper.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
 
         <IsPackable>false</IsPackable>
 
@@ -11,11 +11,11 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
         <PackageReference Include="Shouldly" Version="4.3.0" />
         <PackageReference Include="Volo.Abp.TestBase" Version="$(AbpVersion)" />
         <PackageReference Include="xunit" Version="2.9.3" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
+        <PackageReference Include="xunit.runner.visualstudio" Version="3.1.4">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>