Browse Source

feat: Upgrade to .NET 10

Bruce Wayne 2 weeks ago
parent
commit
bf88b28977

+ 10 - 7
.github/workflows/CI.yaml

@@ -4,8 +4,11 @@ on:
   - pull_request
 env:
   ProjectName: ${{ github.event.repository.name }}
-  NET_TFM: net8.0-windows10.0.22621.0
-  Configuration: Release
+  DOTNET_CLI_TELEMETRY_OPTOUT: 1
+  DOTNET_NOLOGO: 1
+  DOTNET_GENERATE_ASPNET_CERTIFICATE: false
+  NET_VERSION: 10.0.x
+  NET_TFM: net10.0-windows10.0.26100.0
 
 jobs:
   check_format:
@@ -15,7 +18,7 @@ jobs:
       - uses: actions/checkout@v5
       - uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: 9.0.x
+          dotnet-version: ${{ env.NET_VERSION }}
       - run: dotnet format -v diag --verify-no-changes
 
   test:
@@ -32,7 +35,7 @@ jobs:
       - uses: actions/checkout@v5
       - uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: 9.0.x
+          dotnet-version: ${{ env.NET_VERSION }}
       - run: dotnet test -c Release
 
   build:
@@ -42,7 +45,7 @@ jobs:
       - uses: actions/checkout@v5
       - uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: 9.0.x
+          dotnet-version: ${{ env.NET_VERSION }}
 
       - name: Build
         shell: pwsh
@@ -53,7 +56,7 @@ jobs:
         uses: actions/upload-artifact@v5
         with:
           name: ${{ env.ProjectName }}
-          path: src\${{ env.ProjectName }}\bin\${{ env.Configuration }}\${{ env.NET_TFM }}\generic\publish\
+          path: src\${{ env.ProjectName }}\bin\Release\${{ env.NET_TFM }}\generic\publish\
 
   nuget:
     needs: [test, check_format]
@@ -70,7 +73,7 @@ jobs:
       - uses: actions/checkout@v5
       - uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: 9.0.x
+          dotnet-version: ${{ env.NET_VERSION }}
 
       - name: Build
         working-directory: src/${{ matrix.PackageName }}

+ 1 - 1
Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>

+ 2 - 2
Directory.Packages.props

@@ -15,8 +15,8 @@
     <PackageVersion Include="Shouldly" Version="4.3.0" />
     <PackageVersion Include="Socks5" Version="1.1.0" />
     <PackageVersion Include="Splat.Microsoft.Extensions.DependencyInjection" Version="17.1.1" />
-    <PackageVersion Include="Volo.Abp.Autofac" Version="9.3.6" />
-    <PackageVersion Include="Volo.Abp.Core" Version="9.3.6" />
+    <PackageVersion Include="Volo.Abp.Autofac" Version="10.0.0" />
+    <PackageVersion Include="Volo.Abp.Core" Version="10.0.0" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
     <PackageVersion Include="xunit.v3" Version="3.2.0" />
   </ItemGroup>

+ 1 - 1
src/NatTypeTester/NatTypeTester.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
+    <TargetFramework>net10.0-windows10.0.26100.0</TargetFramework>
     <OutputType>WinExe</OutputType>
     <UseWPF>true</UseWPF>
     <Version>8.0.5</Version>