Merge pull request #229 from bdach/net8

Update to .NET 8
ppy · Feb 12, 2024 · 2f68d48 · 2f68d48
2 parents 1969d63 + f8b38ae
commit 2f68d48
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/osu.Server.DifficultyCalculator/Dockerfile b/osu.Server.DifficultyCalculator/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build-env
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env
 WORKDIR /app
 
 # Handle project files and dependencies first for caching benefits
@@ -16,7 +16,7 @@ RUN dotnet publish -c Release -o out
 RUN rm -rf ./out/runtimes ./out/osu.Game.Resources.dll
 
 # Build runtime image
-FROM mcr.microsoft.com/dotnet/runtime:6.0
+FROM mcr.microsoft.com/dotnet/runtime:8.0
 WORKDIR /app
 COPY --from=build-env /app/osu.Server.DifficultyCalculator/out .
 ENTRYPOINT ["dotnet", "osu.Server.DifficultyCalculator.dll"]
diff --git a/osu.Server.DifficultyCalculator/osu.Server.DifficultyCalculator.csproj b/osu.Server.DifficultyCalculator/osu.Server.DifficultyCalculator.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <AssemblyName>osu.Server.DifficultyCalculator</AssemblyName>
         <RootNamespace>osu.Server.DifficultyCalculator</RootNamespace>
         <LangVersion>latest</LangVersion>
@@ -17,11 +17,11 @@
         <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0" />
         <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
         <PackageReference Include="MySqlConnector" Version="2.3.1" />
-        <PackageReference Include="ppy.osu.Game" Version="2024.114.0" />
-        <PackageReference Include="ppy.osu.Game.Rulesets.Osu" Version="2024.114.0" />
-        <PackageReference Include="ppy.osu.Game.Rulesets.Taiko" Version="2024.114.0" />
-        <PackageReference Include="ppy.osu.Game.Rulesets.Catch" Version="2024.114.0" />
-        <PackageReference Include="ppy.osu.Game.Rulesets.Mania" Version="2024.114.0" />
+        <PackageReference Include="ppy.osu.Game" Version="2024.210.0" />
+        <PackageReference Include="ppy.osu.Game.Rulesets.Osu" Version="2024.210.0" />
+        <PackageReference Include="ppy.osu.Game.Rulesets.Taiko" Version="2024.210.0" />
+        <PackageReference Include="ppy.osu.Game.Rulesets.Catch" Version="2024.210.0" />
+        <PackageReference Include="ppy.osu.Game.Rulesets.Mania" Version="2024.210.0" />
     </ItemGroup>
     <ItemGroup>
         <None Update="appsettings.*.json">

diff --git a/osu.Server.Queues.BeatmapProcessor/Dockerfile b/osu.Server.Queues.BeatmapProcessor/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build-env
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env
 WORKDIR /app
 
 # Handle project files and dependencies first for caching benefits
@@ -16,7 +16,7 @@ RUN dotnet publish -c Release -o out
 RUN rm -rf ./out/runtimes ./out/osu.Game.Resources.dll
 
 # Build runtime image
-FROM mcr.microsoft.com/dotnet/runtime:6.0
+FROM mcr.microsoft.com/dotnet/runtime:8.0
 WORKDIR /app
 COPY --from=build-env /app/osu.Server.Queues.BeatmapProcessor/out .
 ENTRYPOINT ["dotnet", "osu.Server.Queues.BeatmapProcessor.dll"]
diff --git a/osu.Server.Queues.BeatmapProcessor/osu.Server.Queues.BeatmapProcessor.csproj b/osu.Server.Queues.BeatmapProcessor/osu.Server.Queues.BeatmapProcessor.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <Nullable>enable</Nullable>
         <LangVersion>latest</LangVersion>
         <ServerGarbageCollection>true</ServerGarbageCollection>