Skip to content

Commit d2bccef

Browse files
sven-nsven-n
committed
Update to .NET 7
* Updated all projects to .NET 7 * Updated all Dockerfiles to use .NET 7 containers - looking forward to try chiseled images * Updated CI/CD pipelines to use .NET 7 * Updated all nuget packages to newest versions; Npgsql is still a release candidate, though. * Removed NpgsqlLoggingProvider * Tested if the server still starts and works
1 parent f0d5e63 commit d2bccef

File tree

59 files changed

+173
-283
lines changed

Some content is hidden

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

59 files changed

+173
-283
lines changed

‎.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: 6.0.100
15+
dotnet-version: 7.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: 6.0.100
15+
dotnet-version: 7.0.100
1616

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

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

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<WarningsAsErrors>nullable;CS4014;VSTHRD110;VSTHRD100</WarningsAsErrors>
77
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
@@ -31,7 +31,7 @@
3131
</ItemGroup>
3232

3333
<ItemGroup>
34-
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.2.32">
34+
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.4.27">
3535
<PrivateAssets>all</PrivateAssets>
3636
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3737
</PackageReference>

‎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>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<WarningsAsErrors>nullable;CS4014;VSTHRD110;VSTHRD100</WarningsAsErrors>
77
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
@@ -28,17 +28,17 @@
2828
<None Include="..\..\.editorconfig" Link=".editorconfig" />
2929
</ItemGroup>
3030
<ItemGroup>
31-
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="6.0.0" />
32-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
33-
<PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="6.0.0" />
34-
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.2.32">
31+
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="7.0.0" />
32+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
33+
<PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="7.0.0" />
34+
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.4.27">
3535
<PrivateAssets>all</PrivateAssets>
3636
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3737
</PackageReference>
38-
<PackageReference Include="Serilog" Version="2.11.0" />
38+
<PackageReference Include="Serilog" Version="2.12.0" />
3939
<PackageReference Include="Serilog.Extensions.Hosting" Version="5.0.1" />
40-
<PackageReference Include="Serilog.Settings.Configuration" Version="3.3.0" />
41-
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
40+
<PackageReference Include="Serilog.Settings.Configuration" Version="3.4.0" />
41+
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
4242
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
4343
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.435">
4444
<PrivateAssets>all</PrivateAssets>

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

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<WarningsAsErrors>nullable;CS4014;VSTHRD110;VSTHRD100</WarningsAsErrors>
77
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
@@ -36,7 +36,7 @@
3636
</ItemGroup>
3737

3838
<ItemGroup>
39-
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.2.32">
39+
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.4.27">
4040
<PrivateAssets>all</PrivateAssets>
4141
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4242
</PackageReference>

‎src/ClientLauncher/MUnique.OpenMU.ClientLauncher.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">
22
<PropertyGroup>
33
<OutputType>WinExe</OutputType>
4-
<TargetFramework>net6.0-windows</TargetFramework>
4+
<TargetFramework>net7.0-windows</TargetFramework>
55
<UseWindowsForms>true</UseWindowsForms>
66
<Nullable>enable</Nullable>
77
<WarningsAsErrors>nullable;CS4014;VSTHRD110;VSTHRD100</WarningsAsErrors>
@@ -33,7 +33,7 @@
3333
</PropertyGroup>
3434

3535
<ItemGroup>
36-
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.2.32">
36+
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.4.27">
3737
<PrivateAssets>all</PrivateAssets>
3838
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3939
</PackageReference>

‎src/ConnectServer/MUnique.OpenMU.ConnectServer.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">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<WarningsAsErrors>nullable;CS4014;VSTHRD110;VSTHRD100</WarningsAsErrors>
77
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
@@ -31,7 +31,7 @@
3131
</ItemGroup>
3232

3333
<ItemGroup>
34-
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.2.32">
34+
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.4.27">
3535
<PrivateAssets>all</PrivateAssets>
3636
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3737
</PackageReference>

‎src/Dapr/AdminPanel.Host/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
FROM mcr.microsoft.com/dotnet/aspnet:6.0-alpine AS base
1+
FROM mcr.microsoft.com/dotnet/aspnet:7.0-alpine AS base
22
WORKDIR /app
33
EXPOSE 80
44

5-
FROM mcr.microsoft.com/dotnet/sdk:6.0-alpine AS build
5+
FROM mcr.microsoft.com/dotnet/sdk:7.0-alpine AS build
66
WORKDIR /src
77
COPY ["Dapr/AdminPanel.Host/MUnique.OpenMU.AdminPanel.Host.csproj", "Dapr/AdminPanel.Host/"]
88
RUN dotnet restore "Dapr/AdminPanel.Host/MUnique.OpenMU.AdminPanel.Host.csproj"

‎src/Dapr/AdminPanel.Host/MUnique.OpenMU.AdminPanel.Host.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
66
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
77
<Nullable>enable</Nullable>
@@ -15,8 +15,8 @@
1515
</PropertyGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.16.1" />
19-
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.2.32">
18+
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.17.0" />
19+
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.4.27">
2020
<PrivateAssets>all</PrivateAssets>
2121
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2222
</PackageReference>

‎src/Dapr/ChatServer.Host/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM mcr.microsoft.com/dotnet/aspnet:6.0-alpine AS base
1+
FROM mcr.microsoft.com/dotnet/aspnet:7.0-alpine AS base
22
WORKDIR /app
33
EXPOSE 80
44
EXPOSE 55980
55

6-
FROM mcr.microsoft.com/dotnet/sdk:6.0-alpine AS build
6+
FROM mcr.microsoft.com/dotnet/sdk:7.0-alpine AS build
77
WORKDIR /src
88
COPY ["Dapr/ChatServer.Host/MUnique.OpenMU.ChatServer.Host.csproj", "Dapr/ChatServer.Host/"]
99
RUN dotnet restore "Dapr/ChatServer.Host/MUnique.OpenMU.ChatServer.Host.csproj"

0 commit comments

Comments
 (0)