upgrade to .net 9

dragonfruitnetwork · Dec 25, 2024 · c9d38db · c9d38db
1 parent 4d9e09a
commit c9d38db
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -43,7 +43,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '8.0.x'
+          dotnet-version: '9.0.x'
 
       - uses: docker/setup-qemu-action@v3
       - uses: docker/setup-buildx-action@v3
@@ -94,7 +94,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '8.0.x'
+          dotnet-version: '9.0.x'
 
       - name: Build Program
         run: dotnet publish -c Release -p:Version=${{ github.event.release.tag_name }} -p:PublishProfile=Web.pubxml DragonFruit.Sakura.Host

diff --git a/DragonFruit.Sakura.Host/Dockerfile b/DragonFruit.Sakura.Host/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine
+FROM mcr.microsoft.com/dotnet/aspnet:9.0-alpine
 
 WORKDIR /app
 

diff --git a/DragonFruit.Sakura.Host/DragonFruit.Sakura.Host.csproj b/DragonFruit.Sakura.Host/DragonFruit.Sakura.Host.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
         <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
     </PropertyGroup>
@@ -11,9 +11,9 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.11" />
-      <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.11" />
-      <PackageReference Include="Sentry.Extensions.Logging" Version="4.13.0" />
+      <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
+      <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.0" />
+      <PackageReference Include="Sentry.Extensions.Logging" Version="5.0.0" />
     </ItemGroup>
 
 </Project>
diff --git a/DragonFruit.Sakura.Host/Program.cs b/DragonFruit.Sakura.Host/Program.cs
@@ -54,7 +54,7 @@ public static Task Main(string[] args)
             var app = builder.Build();
 
             app.UseBlazorFrameworkFiles();
-            app.UseStaticFiles();
+            app.MapStaticAssets();
 
             app.UseRouting();
             app.MapControllers();

diff --git a/DragonFruit.Sakura/DragonFruit.Sakura.csproj b/DragonFruit.Sakura/DragonFruit.Sakura.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <IsPackable>true</IsPackable>
     </PropertyGroup>
@@ -24,15 +24,15 @@
     <ItemGroup>
         <PackageReference Include="DragonFruit.Data" Version="4.1.2" />
         <PackageReference Include="DragonFruit.Data.Roslyn" Version="4.1.2" PrivateAssets="all" />
-        <PackageReference Include="Google.Protobuf" Version="3.29.1" />
+        <PackageReference Include="Google.Protobuf" Version="3.29.2" />
         <PackageReference Include="Grpc.Tools" Version="2.68.1" PrivateAssets="all">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Markdig" Version="0.38.0" />
-        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.11" />
-        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="8.0.11" />
+        <PackageReference Include="Markdig" Version="0.39.1" />
+        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
+        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="9.0.0" />
         <PackageReference Include="MudBlazor" Version="7.15.0" />
-        <PackageReference Include="Sentry.Extensions.Logging" Version="4.13.0" />
+        <PackageReference Include="Sentry.Extensions.Logging" Version="5.0.0" />
         <PackageReference Include="SharpYaml" Version="2.1.1" />
     </ItemGroup>
 

diff --git a/DragonFruit.Sakura/Wiki/Wiki.razor.cs b/DragonFruit.Sakura/Wiki/Wiki.razor.cs
@@ -99,7 +99,7 @@ private List<BreadcrumbItem> GenerateBreadcrumbs()
 
             // split the url into a set of segments representing the location of each page (i.e. the topmost page has to include all the parents)
             var segmentArrays = Enumerable.Range(1, pathSegments.Length).Select(i => new ArraySegment<string>(pathSegments, 0, i));
-            return segmentArrays.Select(x => new BreadcrumbItem(x.Last(), $"/{string.Join("/", x)}")).ToList();
+            return segmentArrays.Select(x => new BreadcrumbItem(x.Last(), $"/{string.Join('/', (IEnumerable<string>)x)}")).ToList();
         }
     }
 }