Use the new MessagePack source generator instead of the old dotnet tool

steamcore · May 12, 2024 · 70c6abb · 70c6abb
1 parent 45060bf
commit 70c6abb
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 41 deletions.
diff --git a/.build.ps1 b/.build.ps1
@@ -13,31 +13,25 @@ task AssertVersion {
     }
 }
 
-task DotnetToolRestore {
-    exec {
-        dotnet tool restore
-    }
-}
-
 task DotnetRestore {
     exec {
         dotnet restore
     }
 }
 
-task DotnetFormat DotnetToolRestore, DotnetRestore, {
+task DotnetFormat DotnetRestore, {
     exec {
         dotnet format --no-restore
     }
 }
 
-task DotnetFormatCheck DotnetToolRestore, DotnetRestore, {
+task DotnetFormatCheck DotnetRestore, {
     exec {
         dotnet format --no-restore --verify-no-changes
     }
 }
 
-task DotnetBuild DotnetToolRestore, DotnetRestore, {
+task DotnetBuild DotnetRestore, {
     exec {
         dotnet build --no-restore
     }

diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
diff --git a/samples/ConsoleApp/ConsoleApp.csproj b/samples/ConsoleApp/ConsoleApp.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net8.0-windows</TargetFramework>
     <OutputType>Exe</OutputType>
+    <PublishAot>true</PublishAot>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/samples/Directory.Packages.props b/samples/Directory.Packages.props
@@ -5,6 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageVersion Include="MessagePack" Version="3.0.54-alpha" />
+    <PackageVersion Include="MessagePackAnalyzer" Version="3.0.54-alpha" />
     <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
     <PackageVersion Include="TinyLogger" Version="1.9.0" />

diff --git a/samples/GenericHost/GenericHost.csproj b/samples/GenericHost/GenericHost.csproj
@@ -3,9 +3,12 @@
   <PropertyGroup>
     <TargetFramework>net8.0-windows</TargetFramework>
     <OutputType>Exe</OutputType>
+    <PublishAot>true</PublishAot>
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="MessagePack" />
+    <PackageReference Include="MessagePackAnalyzer" />
     <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
     <PackageReference Include="Microsoft.Extensions.Hosting" />
     <PackageReference Include="TinyLogger" />
@@ -15,12 +18,4 @@
     <ProjectReference Include="..\..\src\TinyIpc\TinyIpc.csproj" />
   </ItemGroup>
 
-  <Target Name="GenerateMessagePack" BeforeTargets="CoreCompile" Inputs="@(Compile)" Outputs="$(IntermediateOutputPath)\MessagePack.Generated.cs">
-    <Exec Command="dotnet mpc -input $(MSBuildProjectDirectory) -output $(IntermediateOutputPath)\MessagePack.Generated.cs -resolverName GenericHostGeneratedResolver" />
-    <ItemGroup>
-      <Compile Remove="$(IntermediateOutputPath)\MessagePack.Generated.cs" />
-      <Compile Include="$(IntermediateOutputPath)\MessagePack.Generated.cs" />
-    </ItemGroup>
-  </Target>
-
 </Project>
diff --git a/samples/GenericHost/MessagePackOptions.cs b/samples/GenericHost/MessagePackOptions.cs
@@ -9,7 +9,7 @@ internal static class MessagePackOptions
 		MessagePackSerializerOptions.Standard
 			.WithResolver(
 				CompositeResolver.Create(
-					GenericHostGeneratedResolver.Instance,
+					MessageResolver.Instance,
 					StandardResolver.Instance
 				)
 			);

diff --git a/samples/GenericHost/WorkerMessage.cs b/samples/GenericHost/WorkerMessage.cs
@@ -2,6 +2,9 @@
 
 namespace GenericHost;
 
+[GeneratedMessagePackResolver]
+public partial class MessageResolver;
+
 [MessagePackObject]
 public class WorkerMessage
 {

diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -5,7 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageVersion Include="MessagePack" Version="2.5.140" />
+    <PackageVersion Include="MessagePack" Version="3.0.54-alpha" />
+    <PackageVersion Include="MessagePackAnalyzer" Version="3.0.54-alpha" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
     <PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.2" />

diff --git a/src/TinyIpc/MessagePackOptions.cs b/src/TinyIpc/MessagePackOptions.cs
@@ -1,5 +1,6 @@
 using MessagePack;
 using MessagePack.Resolvers;
+using TinyIpc.Messaging;
 
 namespace TinyIpc;
 
@@ -9,7 +10,7 @@ internal static class MessagePackOptions
 		MessagePackSerializerOptions.Standard
 			.WithResolver(
 				CompositeResolver.Create(
-					TinyIpcGeneratedResolver.Instance,
+					LogBookResolver.Instance,
 					StandardResolver.Instance
 				)
 			);

diff --git a/src/TinyIpc/Messaging/TinyMessageBus.cs b/src/TinyIpc/Messaging/TinyMessageBus.cs
@@ -421,6 +421,9 @@ private static LogBook DeserializeLogBook(Stream stream)
 	private static partial void LogReceiveError(ILogger logger, Exception exception, long id);
 }
 
+[GeneratedMessagePackResolver]
+public partial class LogBookResolver;
+
 [MessagePackObject]
 public sealed class LogBook
 {

diff --git a/src/TinyIpc/TinyIpc.csproj b/src/TinyIpc/TinyIpc.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
@@ -16,6 +16,7 @@
 
   <ItemGroup>
     <PackageReference Include="MessagePack" />
+    <PackageReference Include="MessagePackAnalyzer" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
     <PackageReference Include="Microsoft.Extensions.Options" />
@@ -26,12 +27,4 @@
     <PackageReference Include="System.Threading.Channels" />
   </ItemGroup>
 
-  <Target Name="GenerateMessagePack" BeforeTargets="CoreCompile" Inputs="@(Compile)" Outputs="$(IntermediateOutputPath)\MessagePack.Generated.cs">
-    <Exec Command="dotnet mpc -input $(MSBuildProjectDirectory) -output $(IntermediateOutputPath)\MessagePack.Generated.cs -resolverName TinyIpcGeneratedResolver" />
-    <ItemGroup>
-      <Compile Remove="$(IntermediateOutputPath)\MessagePack.Generated.cs" />
-      <Compile Include="$(IntermediateOutputPath)\MessagePack.Generated.cs" />
-    </ItemGroup>
-  </Target>
-
 </Project>