Skip to content

Commit 8720383

Browse files
authored
Merge pull request #533 from MUnique/dev/dotnet9
Upgrade to .NET 9
2 parents eab38f3 + ebbdad6 commit 8720383

71 files changed

Lines changed: 202 additions & 189 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.

.github/workflows/dotnetcore.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ jobs:
1212
- name: Setup .NET Core
1313
uses: actions/setup-dotnet@v1
1414
with:
15-
dotnet-version: 8.0.100
15+
dotnet-version: 9.0.100
1616
- name: Build with dotnet
1717
run: dotnet publish src/Startup/MUnique.OpenMU.Startup.csproj --configuration Release -p:ci=true

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- name: Setup .NET Core
1313
uses: actions/setup-dotnet@v1
1414
with:
15-
dotnet-version: 8.0.100
15+
dotnet-version: 9.0.100
1616

1717
- name: publish MUnique.OpenMU.PlugIns on version change
1818
uses: rohith/publish-nuget@5fdc86fb81a38b37521c9f153bfb60ac44e7ba93

QuickStart.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ General requirements:
1313
* A game client (check our Discord FAQs)
1414
* Knowledge or way to start the game client, so that it connects to the server. Our Launcher will do that.
1515

16-
* Launcher binaries: [MUnique.OpenMU.ClientLauncher v0.8.17.zip](https://github.com/MUnique/OpenMU/releases/download/v0.8.17/MUnique.OpenMU.ClientLauncher_0.8.17.zip)
17-
* It requires the [.NET 8 runtime](https://dotnet.microsoft.com/download/dotnet/8.0)
16+
* Launcher binaries: [MUnique.OpenMU.ClientLauncher v0.9.0.zip](https://github.com/MUnique/OpenMU/releases/download/v0.9.0/MUnique.OpenMU.ClientLauncher_0.9.0.zip)
17+
* It requires the [.NET 9 runtime](https://dotnet.microsoft.com/download/dotnet/9.0)
1818
* If your server and client runs on your local host, use any IP of 127.x.x.x, except 127.0.0.1, because this one is blocked by the client. For example, you could use 127.127.127.127
1919

2020
This guide describes two ways of starting the server. Use Docker, if you just
@@ -55,16 +55,16 @@ Requirements:
5555

5656
* PostgreSQL installed
5757

58-
* Visual Studio 2022 (17.8+) installed, with workloads for ASP.NET Web development
58+
* Visual Studio 2022 (17.12+) installed, with workloads for ASP.NET Web development
5959
and .NET Desktop development. Please keep it up-to-date to prevent any issues.
6060

6161
* Visual Stuido Extension "Web Compiler 2022+", if you plan to edit SCSS files
6262
for the admin panel.
6363
* https://marketplace.visualstudio.com/items?itemName=Failwyn.WebCompiler64
6464

65-
* [.NET SDK 8](https://dotnet.microsoft.com/download/dotnet/8.0)
66-
(it should be included in Visual Studio 17.8+)
67-
* `winget install Microsoft.DotNet.SDK.8`
65+
* [.NET SDK 9](https://dotnet.microsoft.com/download/dotnet/9.0)
66+
(it should be included in Visual Studio 17.12+)
67+
* `winget install Microsoft.DotNet.SDK.9`
6868

6969
* [NodeJS 16+](https://nodejs.org) installed
7070
* `winget install OpenJS.NodeJS.LTS`

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ This project is released under the MIT license (see LICENSE file).
4343

4444
## Used technologies
4545

46-
The project is mainly written in C# and targets .NET 8.0.
46+
The project is mainly written in C# and targets .NET 9.0.
4747

4848
The servers admin panel is hosted on an embedded ASP.NET Core webserver (Kestrel)
4949
and implemented as Blazor Server App.

azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ steps:
1616
- task: UseDotNet@2
1717
displayName: 'Install .NET Core SDK'
1818
inputs:
19-
version: 8.0.x
19+
version: 9.0.x
2020
performMultiLevelLookup: true
2121
includePreviewVersions: true # Required for preview versions
2222

src/AttributeSystem/MUnique.OpenMU.AttributeSystem.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

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<WarningsAsErrors>nullable;CS4014;VSTHRD110;VSTHRD100</WarningsAsErrors>
77
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>

src/ChatServer/ExDbConnector/MUnique.OpenMU.ChatServer.ExDbConnector.csproj

Lines changed: 8 additions & 8 deletions
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-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<WarningsAsErrors>nullable;CS4014;VSTHRD110;VSTHRD100</WarningsAsErrors>
77
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
@@ -18,14 +18,14 @@
1818
<DocumentationFile>bin\Release\MUnique.OpenMU.ChatServer.ExDbConnector.xml</DocumentationFile>
1919
</PropertyGroup>
2020
<ItemGroup>
21-
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="8.0.0" />
22-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
23-
<PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="8.0.0" />
24-
<PackageReference Include="Serilog" Version="3.1.1" />
21+
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="9.0.0" />
22+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
23+
<PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="9.0.0" />
24+
<PackageReference Include="Serilog" Version="4.1.0" />
2525
<PackageReference Include="Serilog.Extensions.Hosting" Version="8.0.0" />
26-
<PackageReference Include="Serilog.Settings.Configuration" Version="8.0.1" />
27-
<PackageReference Include="Serilog.Sinks.Console" Version="5.0.0" />
28-
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
26+
<PackageReference Include="Serilog.Settings.Configuration" Version="8.0.4" />
27+
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
28+
<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
2929
</ItemGroup>
3030
<ItemGroup>
3131
<ProjectReference Include="..\..\PlugIns\MUnique.OpenMU.PlugIns.csproj" />

src/ChatServer/MUnique.OpenMU.ChatServer.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

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<WarningsAsErrors>nullable;CS4014;VSTHRD110;VSTHRD100</WarningsAsErrors>
77
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>

src/ClientErrorLogDecryptor/MUnique.OpenMU.ClientErrorLogDecryptor.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
5+
<TargetFramework>net9.0</TargetFramework>
66
<Nullable>enable</Nullable>
77
<WarningsAsErrors>nullable;CS4014;VSTHRD110;VSTHRD100</WarningsAsErrors>
88
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>

src/ClientLauncher/HostConfigurationDialog.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
namespace MUnique.OpenMU.ClientLauncher;
66

7+
using System.ComponentModel;
78
using System.Windows.Forms;
89

910
/// <summary>
@@ -22,6 +23,7 @@ public HostConfigurationDialog()
2223
/// <summary>
2324
/// Gets or sets the settings.
2425
/// </summary>
26+
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
2527
public ServerHostSettings Settings
2628
{
2729
get

0 commit comments

Comments
 (0)