Skip to content

Commit b12c37a

Browse files
committed
v11.16.2024.1114 升级net9
1 parent 81cb64d commit b12c37a

File tree

8 files changed

+19
-17
lines changed

8 files changed

+19
-17
lines changed

.github/workflows/publish-beta.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,13 @@ jobs:
1818
steps:
1919
- uses: actions/checkout@v4
2020
- name: Setup dotNET
21-
uses: actions/setup-dotnet@v3
21+
uses: actions/setup-dotnet@v4
2222
with:
2323
dotnet-version: |
24-
6.0.x
25-
7.0.x
24+
6.x
25+
7.x
2626
8.x
27+
9.x
2728
- name: Get Version
2829
run: echo "VERSION=$(date '+%Y.%m%d-beta%H%M')" >> $GITHUB_ENV
2930
- name: Build

.github/workflows/publish.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,13 @@ jobs:
1212
steps:
1313
- uses: actions/checkout@v4
1414
- name: Setup dotNET
15-
uses: actions/setup-dotnet@v3
15+
uses: actions/setup-dotnet@v4
1616
with:
1717
dotnet-version: |
18-
6.0.x
19-
7.0.x
18+
6.x
19+
7.x
2020
8.x
21+
9.x
2122
- name: Get Version
2223
run: echo "VERSION=$(date '+%Y.%m%d')" >> $GITHUB_ENV
2324
- name: Build

.github/workflows/test.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,13 @@ jobs:
1414
steps:
1515
- uses: actions/checkout@v4
1616
- name: Setup dotNET
17-
uses: actions/setup-dotnet@v3
17+
uses: actions/setup-dotnet@v4
1818
with:
1919
dotnet-version: |
20-
6.0.x
21-
7.0.x
20+
6.x
21+
7.x
2222
8.x
23+
9.x
2324
- name: Build
2425
run: |
2526
dotnet build -c Release

Test/Test.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="Current">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFrameworks>net8.0</TargetFrameworks>
4+
<TargetFrameworks>net9.0</TargetFrameworks>
55
<LangVersion>latest</LangVersion>
66
<VersionPrefix>1.0</VersionPrefix>
77
<VersionSuffix>$([System.DateTime]::Now.ToString(`yyyy.MMdd`))</VersionSuffix>
@@ -39,7 +39,7 @@
3939
<PackageReference Include="IBM.Data.DB2.Core" Version="3.1.0.600" />
4040
<PackageReference Include="MySql.Data" Version="9.1.0" />
4141
<PackageReference Include="NewLife.Redis" Version="6.0.2024.1101" />
42-
<PackageReference Include="NewLife.Remoting" Version="3.1.2024.1101" />
42+
<PackageReference Include="NewLife.Remoting" Version="3.2.2024.1113" />
4343
<PackageReference Include="NewLife.Stardust" Version="3.1.2024.1101" />
4444
<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="23.6.1" />
4545
<PackageReference Include="SapHana.DotNetCore.Data.Provider" Version="2.11.14" />

XCode.DaMeng/XCode.DaMeng.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
</ItemGroup>
3838
<ItemGroup>
3939
<PackageReference Include="dmdbms.DmProvider" Version="1.1.0.20739" />
40-
<PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
4140
</ItemGroup>
4241
<ItemGroup>
4342
<ProjectReference Include="..\XCode\XCode.csproj" />

XCode/XCode.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
</PackageReference>
4545
</ItemGroup>
4646
<ItemGroup>
47-
<PackageReference Include="NewLife.Core" Version="11.0.2024.1101" />
47+
<PackageReference Include="NewLife.Core" Version="11.0.2024.1113" />
4848
</ItemGroup>
4949
<ItemGroup>
5050
<Compile Remove="build\**" />

XCodeTool/XCodeTool.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
55
<AssemblyName>xcodetool</AssemblyName>
66
<RootNamespace>XCode</RootNamespace>
77
<AssemblyTitle>数据中间件工具</AssemblyTitle>

XUnitTest.XCode/XUnitTest.XCode.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="Current">
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFramework>net9.0</TargetFramework>
44
<OutputPath>..\Bin\UnitTest</OutputPath>
55
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
66
<SatelliteResourceLanguages>en</SatelliteResourceLanguages>
@@ -81,10 +81,10 @@
8181
</ItemGroup>
8282
<ItemGroup>
8383
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
84-
<PackageReference Include="NewLife.Core" Version="11.0.2024.1101" />
84+
<PackageReference Include="NewLife.Core" Version="11.0.2024.1113" />
8585
<PackageReference Include="NewLife.IP" Version="2.2.2024.1102" />
8686
<PackageReference Include="NewLife.UnitTest" Version="1.0.2024.1006" />
87-
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="8.0.1" />
87+
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="9.0.0" />
8888
<PackageReference Include="xunit" Version="2.9.2" />
8989
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
9090
<PrivateAssets>all</PrivateAssets>

0 commit comments

Comments
 (0)