Skip to content

Commit

Permalink
Update to .NET 9.0 and associated packages (#119)
Browse files Browse the repository at this point in the history
  • Loading branch information
dealloc authored Nov 14, 2024
1 parent b915d8e commit 58a5aa5
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>

Expand Down
4 changes: 2 additions & 2 deletions src/Helldivers-2-API/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 4 additions & 4 deletions src/Helldivers-2-API/Helldivers-2-API.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@

<!-- Dependencies for all build configurations -->
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.10" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.0" />
<PackageReference Include="prometheus-net.AspNetCore" Version="8.2.1" />
<ProjectReference Include="..\Helldivers-2-Models\Helldivers-2-Models.csproj" />
<ProjectReference Include="..\Helldivers-2-Core\Helldivers-2-Core.csproj" />
Expand All @@ -36,8 +36,8 @@

<!-- Only include swagger dependencies in DEBUG builds -->
<ItemGroup Condition="'$(Configuration)' == 'Debug'">
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.10" />
<PackageReference Include="Microsoft.Extensions.ApiDescription.Server" Version="8.0.10">
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.ApiDescription.Server" Version="9.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
2 changes: 1 addition & 1 deletion src/Helldivers-2-Core/Helldivers-2-Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2"/>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0"/>
<ProjectReference Include="..\Helldivers-2-Models\Helldivers-2-Models.csproj"/>
</ItemGroup>

Expand Down
6 changes: 3 additions & 3 deletions src/Helldivers-2-SourceGen/Helldivers-2-SourceGen.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="System.Text.Json" Version="8.0.5" PrivateAssets="all" LocalSourceGenerators="true" />
<PackageReference Include="System.Text.Encodings.Web" Version="8.0.0" PrivateAssets="all" LocalSourceGenerators="true" />
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" PrivateAssets="all" LocalSourceGenerators="true" />
<PackageReference Include="System.Text.Json" Version="9.0.0" PrivateAssets="all" LocalSourceGenerators="true" />
<PackageReference Include="System.Text.Encodings.Web" Version="9.0.0" PrivateAssets="all" LocalSourceGenerators="true" />
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.0" PrivateAssets="all" LocalSourceGenerators="true" />
</ItemGroup>

<!-- Include each nuget reference with property 'LocalSourceGenerators' into final-->
Expand Down
8 changes: 4 additions & 4 deletions src/Helldivers-2-Sync/Helldivers-2-Sync.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2"/>
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1"/>
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1"/>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2"/>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0"/>
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0"/>
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.0"/>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0"/>
<PackageReference Include="System.Linq.Async" Version="6.0.1" />
<ProjectReference Include="..\Helldivers-2-Core\Helldivers-2-Core.csproj" />
<ProjectReference Include="..\Helldivers-2-Models\Helldivers-2-Models.csproj"/>
Expand Down

0 comments on commit 58a5aa5

Please sign in to comment.