Skip to content

Commit 36fdd25

Browse files
NetDwarfNetDwarf
authored
Update to Net8 (#481)
2 parents 0e9a0f9 + 45fd543 commit 36fdd25

File tree

69 files changed

+1535
-1536
lines changed

Some content is hidden

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

69 files changed

+1535
-1536
lines changed

‎.github/workflows/create_release.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
version: ${{ steps.release_info.outputs.version }}
1515
steps:
1616
- name: Checkout
17-
uses: actions/checkout@v3
17+
uses: actions/checkout@v4
1818
with:
1919
fetch-depth: 0
2020
- name: Generate Release Info
@@ -39,7 +39,7 @@ jobs:
3939
#Prepend patch notes with backticks
4040
sed -i '1s/^/```\n/' patch_notes.txt
4141
- name: Upload
42-
uses: actions/upload-artifact@v3
42+
uses: actions/upload-artifact@v4
4343
with:
4444
name: release_info
4545
path: |
@@ -56,9 +56,9 @@ jobs:
5656
OUTPUT_FILE_NAME: DOLServer_${{ matrix.build_target }}.zip
5757
steps:
5858
- name: Checkout
59-
uses: actions/checkout@v3
59+
uses: actions/checkout@v4
6060
- name: Setup Dotnet
61-
uses: actions/setup-dotnet@v3
61+
uses: actions/setup-dotnet@v4
6262
with:
6363
dotnet-version: '6.0.x'
6464
- name: Setup MinGW-w64
@@ -87,8 +87,8 @@ jobs:
8787
cp libdol_detour.dll ../../../${{ matrix.build_target }}/dol_detour.dll
8888
- name: Test Build
8989
run: |
90-
dotnet test --verbosity normal --filter "DOL.UnitTests&TestCategory!=Explicit" ./build/Tests/${{ matrix.build_target }}/lib/Tests.dll
91-
dotnet test --verbosity normal --filter "DOL.Integration&TestCategory!=Explicit" ./build/Tests/${{ matrix.build_target }}/lib/Tests.dll
90+
dotnet test --verbosity normal --filter "DOL.UnitTests" ./build/Tests/${{ matrix.build_target }}/lib/Tests.dll
91+
dotnet test --verbosity normal --filter "DOL.Integration" ./build/Tests/${{ matrix.build_target }}/lib/Tests.dll
9292
- name: Add DOLConfig
9393
if: ${{ github.repository_owner == 'Dawn-of-Light' }}
9494
run: |
@@ -112,7 +112,7 @@ jobs:
112112
run: |
113113
(cd ${{ matrix.build_target }}/ && zip -r ../${{ env.OUTPUT_FILE_NAME }} * )
114114
- name: Upload Build Output
115-
uses: actions/upload-artifact@v3
115+
uses: actions/upload-artifact@v4
116116
with:
117117
name: build_artifacts
118118
path: ${{ env.OUTPUT_FILE_NAME }}
@@ -123,9 +123,9 @@ jobs:
123123
runs-on: ubuntu-22.04
124124
steps:
125125
- name: Checkout
126-
uses: actions/checkout@v3
126+
uses: actions/checkout@v4
127127
- name: Download artifacts
128-
uses: actions/download-artifact@v3
128+
uses: actions/download-artifact@v4
129129
- name: Create Release
130130
run: |
131131
set -x

‎.github/workflows/docker_build_push.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,18 @@ jobs:
2020
run: |
2121
echo "date=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT
2222
- name: Checkout
23-
uses: actions/checkout@v3
23+
uses: actions/checkout@v4
2424
- name: Set up QEMU for Docker
25-
uses: docker/setup-qemu-action@v2
25+
uses: docker/setup-qemu-action@v3
2626
- name: Set up Docker Buildx
27-
uses: docker/setup-buildx-action@v2
27+
uses: docker/setup-buildx-action@v3
2828
- name: Login to DockerHub
29-
uses: docker/login-action@v2
29+
uses: docker/login-action@v3
3030
with:
3131
username: ${{ secrets.DOCKERHUB_USERNAME }}
3232
password: ${{ secrets.DOCKERHUB_TOKEN }}
3333
- name: Build and push
34-
uses: docker/build-push-action@v4
34+
uses: docker/build-push-action@v5
3535
with:
3636
context: .github/Docker
3737
target: release_dotnet
@@ -44,7 +44,7 @@ jobs:
4444
push: true
4545
tags: dawnoflight/dolsharp:latest
4646
- name: Build and push Sandbox
47-
uses: docker/build-push-action@v4
47+
uses: docker/build-push-action@v5
4848
with:
4949
context: .github/Docker
5050
target: release_sandbox_dotnet

‎.github/workflows/test_netcore_linux.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ jobs:
1313
runs-on: ubuntu-22.04
1414
steps:
1515
- name: Checkout
16-
uses: actions/checkout@v3
16+
uses: actions/checkout@v4
1717
- name: Setup Dotnet
18-
uses: actions/setup-dotnet@v3
18+
uses: actions/setup-dotnet@v4
1919
with:
20-
dotnet-version: '6.0.x'
20+
dotnet-version: '8.0.x'
2121
- name: Build
2222
run: |
2323
dotnet build -c ${{ matrix.build_target }} "Tests/Tests.csproj" --verbosity normal
2424
- name: Test
2525
run: |
26-
dotnet test ./build/Tests/${{ matrix.build_target }}/lib/Tests.dll -v n --filter "DOL.UnitTests&TestCategory!=Explicit"
27-
dotnet test ./build/Tests/${{ matrix.build_target }}/lib/Tests.dll -v n --filter "DOL.Integration&TestCategory!=Explicit"
26+
dotnet test ./build/Tests/${{ matrix.build_target }}/lib/Tests.dll -v n --filter "DOL.UnitTests"
27+
dotnet test ./build/Tests/${{ matrix.build_target }}/lib/Tests.dll -v n --filter "DOL.Integration"

‎.github/workflows/test_netcore_windows.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ jobs:
1313
runs-on: windows-2019
1414
steps:
1515
- name: Checkout
16-
uses: actions/checkout@v3
16+
uses: actions/checkout@v4
1717
- name: Setup Dotnet
18-
uses: actions/setup-dotnet@v3
18+
uses: actions/setup-dotnet@v4
1919
with:
20-
dotnet-version: '6.0.x'
20+
dotnet-version: '8.0.x'
2121
- name: Build
2222
run: |
2323
dotnet build -c ${{ matrix.build_target }} "Tests\Tests.csproj" --verbosity normal
2424
- name: Test
2525
run: |
26-
dotnet test .\build\Tests\${{ matrix.build_target }}\lib\Tests.dll -v n --filter "DOL.UnitTests&TestCategory!=Explicit"
27-
dotnet test .\build\Tests\${{ matrix.build_target }}\lib\Tests.dll -v n --filter "DOL.Integration&TestCategory!=Explicit"
26+
dotnet test .\build\Tests\${{ matrix.build_target }}\lib\Tests.dll -v n --filter "DOL.UnitTests"
27+
dotnet test .\build\Tests\${{ matrix.build_target }}\lib\Tests.dll -v n --filter "DOL.Integration"

‎DOLBase/DOLBase.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<ItemGroup>
3939
<PackageReference Include="SharpZipLib" Version="1.4.2" />
4040
<PackageReference Include="log4net" Version="2.0.15" />
41-
<PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
41+
<PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
4242
</ItemGroup>
4343
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
4444
</Project>

‎DOLDatabase/DOLDatabase.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
</PropertyGroup>
4040
<ItemGroup>
4141
<PackageReference Include="log4net" Version="2.0.15" />
42-
<PackageReference Include="Microsoft.Data.Sqlite" Version="7.0.11" />
43-
<PackageReference Include="MySqlConnector" Version="2.2.7" />
42+
<PackageReference Include="Microsoft.Data.Sqlite" Version="8.0.1" />
43+
<PackageReference Include="MySqlConnector" Version="2.3.5" />
4444
</ItemGroup>
4545
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
4646
</Project>

‎DOLServer/DOLServer.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
</PropertyGroup>
55
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
66
<PropertyGroup>
7-
<TargetFramework>net6.0</TargetFramework>
7+
<TargetFramework>net8.0</TargetFramework>
88
<OutputType>Exe</OutputType>
99
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
1010
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -45,7 +45,7 @@
4545
<RegisterForComInterop>False</RegisterForComInterop>
4646
</PropertyGroup>
4747
<ItemGroup>
48-
<PackageReference Include="System.ServiceProcess.ServiceController" Version="7.0.1" />
48+
<PackageReference Include="System.ServiceProcess.ServiceController" Version="8.0.0" />
4949
<PackageReference Include="log4net" Version="2.0.15" />
5050
<ProjectReference Include="..\GameServer\GameServer.csproj" Name="GameServer" />
5151
</ItemGroup>

‎GameServer/GameServer.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
</PropertyGroup>
55
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
66
<PropertyGroup>
7-
<TargetFramework>net6.0</TargetFramework>
7+
<TargetFramework>net8.0</TargetFramework>
88
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
99
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
1010
<AssemblyName>GameServer</AssemblyName>
@@ -38,9 +38,9 @@
3838
</PropertyGroup>
3939
<ItemGroup>
4040
<PackageReference Include="log4net" Version="2.0.15" />
41-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.7.0" />
42-
<PackageReference Include="Microsoft.Diagnostics.Runtime" Version="3.0.442202" />
43-
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="7.0.0" />
41+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />
42+
<PackageReference Include="Microsoft.Diagnostics.Runtime" Version="3.1.456101" />
43+
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="8.0.0" />
4444
<ProjectReference Include="..\DOLBase\DOLBase.csproj" Name="DOLBase" />
4545
<ProjectReference Include="..\DOLDatabase\DOLDatabase.csproj" Name="DOLDatabase" />
4646
</ItemGroup>

‎GameServer/gameutils/DOLScriptCompiler.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,7 @@ private static void LoadDefaultAssemblies()
135135
.Where(s => !string.IsNullOrEmpty(s))
136136
.Select(s => MetadataReference.CreateFromFile(s));
137137
var additionalReferences = new string[] {
138-
"System.Security.Cryptography.Algorithms", //for SHA256 in AutoXMLDatabaseUpdate
139-
"System.Security.Cryptography.Primitives", //for SHA256 in AutoXMLDatabaseUpdate
138+
"System.Security.Cryptography", //for SHA256 in AutoXMLDatabaseUpdate
140139
"System.Net.Http"
141140
}.Union(GameServer.Instance.Configuration.AdditionalScriptAssemblies)
142141
.Select(r => GetPortableExecutableReference(r));

‎GameServerScripts/GameServerScripts.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
</PropertyGroup>
55
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
66
<PropertyGroup>
7-
<TargetFramework>net6.0</TargetFramework>
7+
<TargetFramework>net8.0</TargetFramework>
88
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
99
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
1010
<OutputType>Library</OutputType>

0 commit comments

Comments
 (0)