diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 201b06e..84cf793 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -18,7 +18,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: 8.0.x + dotnet-version: 9.0.x - name: download JSON submodule run: git submodule update --init ./src/Helldivers-2-Models/json - name: Restore dependencies diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml index 4d67ba6..4040e2a 100644 --- a/.github/workflows/pages.yml +++ b/.github/workflows/pages.yml @@ -29,7 +29,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: 8.0.x + dotnet-version: 9.0.x - name: Install DocFX run: dotnet tool install -g docfx - name: Initial static JSON schema submodule diff --git a/Directory.Build.props b/Directory.Build.props index 40c4110..bf255bb 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -2,7 +2,7 @@ enable enable - net8.0 + net9.0 true diff --git a/src/Helldivers-2-API/Dockerfile b/src/Helldivers-2-API/Dockerfile index 2453301..adf4c70 100644 --- a/src/Helldivers-2-API/Dockerfile +++ b/src/Helldivers-2-API/Dockerfile @@ -1,8 +1,8 @@ -FROM mcr.microsoft.com/dotnet/runtime-deps:8.0-alpine-extra AS base +FROM mcr.microsoft.com/dotnet/runtime-deps:9.0-alpine-extra AS base USER $APP_UID WORKDIR /app -FROM mcr.microsoft.com/dotnet/sdk:8.0-alpine AS build +FROM mcr.microsoft.com/dotnet/sdk:9.0-alpine AS build RUN apk add --upgrade --no-cache build-base clang zlib-dev ARG BUILD_CONFIGURATION=Release ARG BUILD_RUNTIME=linux-musl-x64 diff --git a/src/Helldivers-2-API/Helldivers-2-API.csproj b/src/Helldivers-2-API/Helldivers-2-API.csproj index 8316a3a..24f5d5f 100644 --- a/src/Helldivers-2-API/Helldivers-2-API.csproj +++ b/src/Helldivers-2-API/Helldivers-2-API.csproj @@ -23,8 +23,8 @@ - - + + @@ -36,8 +36,8 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Helldivers-2-API/Program.cs b/src/Helldivers-2-API/Program.cs index 3648928..c90ed9e 100644 --- a/src/Helldivers-2-API/Program.cs +++ b/src/Helldivers-2-API/Program.cs @@ -214,6 +214,9 @@ // Make sure ASP.NET Core uses the correct addresses internally rather than Fly's proxy app.UseForwardedHeaders(); +// Maps Prometheus to /metrics +app.MapMetrics(); + // Handles rate limiting so everyone plays nice app.UseMiddleware(); @@ -281,7 +284,4 @@ You can also find additional resources on our Github: https://github.com/helldivers-2/api Consider supporting us at https://github.com/sponsors/dealloc"); -// Maps Prometheus to /metrics -app.MapMetrics(); - await app.RunAsync(); diff --git a/src/Helldivers-2-Core/Helldivers-2-Core.csproj b/src/Helldivers-2-Core/Helldivers-2-Core.csproj index 50b582d..0d66e02 100644 --- a/src/Helldivers-2-Core/Helldivers-2-Core.csproj +++ b/src/Helldivers-2-Core/Helldivers-2-Core.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Helldivers-2-SourceGen/Helldivers-2-SourceGen.csproj b/src/Helldivers-2-SourceGen/Helldivers-2-SourceGen.csproj index 43ddd4a..55e74cf 100644 --- a/src/Helldivers-2-SourceGen/Helldivers-2-SourceGen.csproj +++ b/src/Helldivers-2-SourceGen/Helldivers-2-SourceGen.csproj @@ -22,9 +22,9 @@ - - - + + + diff --git a/src/Helldivers-2-Sync/Helldivers-2-Sync.csproj b/src/Helldivers-2-Sync/Helldivers-2-Sync.csproj index 2016b56..bcb6843 100644 --- a/src/Helldivers-2-Sync/Helldivers-2-Sync.csproj +++ b/src/Helldivers-2-Sync/Helldivers-2-Sync.csproj @@ -6,10 +6,10 @@ - - - - + + + +