From 84a803d8a1d7dc0b110dd9201506d3128fef0731 Mon Sep 17 00:00:00 2001
From: Mayuki Sawatari <mayuki+github@misuzilla.org>
Date: Thu, 28 Nov 2024 18:26:50 +0900
Subject: [PATCH 1/2] Adopt to .NET 9

---
 Directory.Packages.props                                    | 2 +-
 .../MagicOnion.Server.JsonTranscoding.Swagger.csproj        | 2 +-
 .../MagicOnion.Server.JsonTranscoding.csproj                | 2 +-
 src/MagicOnion.Server.Redis/MagicOnion.Server.Redis.csproj  | 2 +-
 src/MagicOnion.Server/MagicOnion.Server.csproj              | 6 +++++-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 4c921923d..fc51690f7 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -32,7 +32,7 @@
     <PackageVersion Include="System.Threading.Channels" Version="8.0.0" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageVersion Include="PolySharp" Version="1.13.2" />
+    <PackageVersion Include="PolySharp" Version="1.15.0" />
     <PackageVersion Include="System.Text.Json" Version="8.0.5" />
     <PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4" />
   </ItemGroup>
diff --git a/src/MagicOnion.Server.JsonTranscoding.Swagger/MagicOnion.Server.JsonTranscoding.Swagger.csproj b/src/MagicOnion.Server.JsonTranscoding.Swagger/MagicOnion.Server.JsonTranscoding.Swagger.csproj
index 6c565e09d..04de5e676 100644
--- a/src/MagicOnion.Server.JsonTranscoding.Swagger/MagicOnion.Server.JsonTranscoding.Swagger.csproj
+++ b/src/MagicOnion.Server.JsonTranscoding.Swagger/MagicOnion.Server.JsonTranscoding.Swagger.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
diff --git a/src/MagicOnion.Server.JsonTranscoding/MagicOnion.Server.JsonTranscoding.csproj b/src/MagicOnion.Server.JsonTranscoding/MagicOnion.Server.JsonTranscoding.csproj
index 9401d6595..ece1d1547 100644
--- a/src/MagicOnion.Server.JsonTranscoding/MagicOnion.Server.JsonTranscoding.csproj
+++ b/src/MagicOnion.Server.JsonTranscoding/MagicOnion.Server.JsonTranscoding.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
diff --git a/src/MagicOnion.Server.Redis/MagicOnion.Server.Redis.csproj b/src/MagicOnion.Server.Redis/MagicOnion.Server.Redis.csproj
index a385a461e..3a3b7f73c 100644
--- a/src/MagicOnion.Server.Redis/MagicOnion.Server.Redis.csproj
+++ b/src/MagicOnion.Server.Redis/MagicOnion.Server.Redis.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
 
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
diff --git a/src/MagicOnion.Server/MagicOnion.Server.csproj b/src/MagicOnion.Server/MagicOnion.Server.csproj
index 1a10d389e..0dd3f04f8 100644
--- a/src/MagicOnion.Server/MagicOnion.Server.csproj
+++ b/src/MagicOnion.Server/MagicOnion.Server.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
 
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
@@ -22,6 +22,10 @@
     <PackageReference Include="Grpc.AspNetCore.Server" />
     <PackageReference Include="Grpc.Core.Api" />
     <PackageReference Include="Multicaster" />
+    <PackageReference Include="PolySharp">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>

From 7a4b7b6084a5056996bc8c32b0e79f1cf87608ef Mon Sep 17 00:00:00 2001
From: Mayuki Sawatari <mayuki+github@misuzilla.org>
Date: Thu, 28 Nov 2024 18:33:25 +0900
Subject: [PATCH 2/2] Adopt to .NET 9

---
 src/MagicOnion.Client/MagicOnion.Client.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/MagicOnion.Client/MagicOnion.Client.csproj b/src/MagicOnion.Client/MagicOnion.Client.csproj
index 9478da412..ae2a380fb 100644
--- a/src/MagicOnion.Client/MagicOnion.Client.csproj
+++ b/src/MagicOnion.Client/MagicOnion.Client.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net8.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net8.0;net9.0</TargetFrameworks>
 
     <LangVersion>$(_LangVersionUnityBaseline)</LangVersion>
     <Nullable>enable</Nullable>
-    <IsTrimmable Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">true</IsTrimmable>
+    <IsTrimmable Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))">true</IsTrimmable>
 
     <!-- NuGet -->
     <PackageId>MagicOnion.Client</PackageId>