David Nguyen
433b852a43
All checks were successful
Publish NuGets / build (release) Successful in 40s
Replace ProtoFileSourceGenerator and WriteProtoFileTask with a new GenerateProtoFileTask that creates its own Roslyn compilation. This solves the timing issue where source generators run too late for Grpc.Tools to process the generated proto files. The new task runs after ResolveAssemblyReferences but before _gRPC_GetProtoc and CoreCompile, ensuring the proto file exists when Grpc.Tools needs it. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
57 lines
3.5 KiB
XML
57 lines
3.5 KiB
XML
<Project>
|
|
<PropertyGroup>
|
|
<!-- Set default values for proto generation -->
|
|
<GenerateProtoFile Condition="'$(GenerateProtoFile)' == ''">true</GenerateProtoFile>
|
|
<ProtoOutputDirectory Condition="'$(ProtoOutputDirectory)' == ''">$(MSBuildProjectDirectory)\Protos</ProtoOutputDirectory>
|
|
<GeneratedProtoFileName Condition="'$(GeneratedProtoFileName)' == ''">cqrs_services.proto</GeneratedProtoFileName>
|
|
</PropertyGroup>
|
|
|
|
<!-- Determine the assembly path (different for NuGet package vs project reference) -->
|
|
<PropertyGroup>
|
|
<_GeneratorsAssemblyPath Condition="Exists('$(MSBuildThisFileDirectory)\..\analyzers\dotnet\cs\Svrnty.CQRS.Grpc.Generators.dll')">$(MSBuildThisFileDirectory)\..\analyzers\dotnet\cs\Svrnty.CQRS.Grpc.Generators.dll</_GeneratorsAssemblyPath>
|
|
<_GeneratorsAssemblyPath Condition="'$(_GeneratorsAssemblyPath)' == '' AND Exists('$(MSBuildThisFileDirectory)Svrnty.CQRS.Grpc.Generators.dll')">$(MSBuildThisFileDirectory)Svrnty.CQRS.Grpc.Generators.dll</_GeneratorsAssemblyPath>
|
|
<_GeneratorsAssemblyPath Condition="'$(_GeneratorsAssemblyPath)' == '' AND Exists('$(MSBuildThisFileDirectory)\..\bin\Debug\netstandard2.0\Svrnty.CQRS.Grpc.Generators.dll')">$(MSBuildThisFileDirectory)\..\bin\Debug\netstandard2.0\Svrnty.CQRS.Grpc.Generators.dll</_GeneratorsAssemblyPath>
|
|
<_GeneratorsAssemblyPath Condition="'$(_GeneratorsAssemblyPath)' == '' AND Exists('$(MSBuildThisFileDirectory)\..\bin\Release\netstandard2.0\Svrnty.CQRS.Grpc.Generators.dll')">$(MSBuildThisFileDirectory)\..\bin\Release\netstandard2.0\Svrnty.CQRS.Grpc.Generators.dll</_GeneratorsAssemblyPath>
|
|
</PropertyGroup>
|
|
|
|
<!-- Load the GenerateProtoFileTask from the generator assembly -->
|
|
<UsingTask TaskName="Svrnty.CQRS.Grpc.Generators.GenerateProtoFileTask"
|
|
AssemblyFile="$(_GeneratorsAssemblyPath)"
|
|
Condition="'$(_GeneratorsAssemblyPath)' != ''" />
|
|
|
|
<!-- This target ensures the Protos directory exists -->
|
|
<Target Name="EnsureProtosDirectory" BeforeTargets="SvrntyGenerateProtoFile">
|
|
<MakeDir Directories="$(ProtoOutputDirectory)" Condition="!Exists('$(ProtoOutputDirectory)')" />
|
|
</Target>
|
|
|
|
<!--
|
|
Generate the proto file BEFORE Grpc.Tools processes protos and BEFORE CoreCompile.
|
|
This runs AFTER ResolveAssemblyReferences so we have access to @(ReferencePath).
|
|
|
|
Key timing:
|
|
- AfterTargets="ResolveAssemblyReferences" ensures we have all references resolved
|
|
- BeforeTargets="_gRPC_GetProtoc;CoreCompile" ensures proto is generated before:
|
|
1. Grpc.Tools compiles the proto into C# (_gRPC_GetProtoc is Grpc.Tools' entry point)
|
|
2. CoreCompile compiles the project
|
|
-->
|
|
<Target Name="SvrntyGenerateProtoFile"
|
|
BeforeTargets="_gRPC_GetProtoc;CoreCompile"
|
|
AfterTargets="ResolveAssemblyReferences"
|
|
DependsOnTargets="EnsureProtosDirectory"
|
|
Condition="'$(GenerateProtoFile)' == 'true' AND '$(_GeneratorsAssemblyPath)' != ''">
|
|
|
|
<Message Text="Svrnty.CQRS.Grpc: Generating proto file from $(MSBuildProjectName)..." Importance="high" />
|
|
<Message Text="Svrnty.CQRS.Grpc: Source files count: @(Compile->Count())" Importance="normal" />
|
|
<Message Text="Svrnty.CQRS.Grpc: References count: @(ReferencePath->Count())" Importance="normal" />
|
|
|
|
<GenerateProtoFileTask
|
|
ProjectDirectory="$(MSBuildProjectDirectory)"
|
|
OutputDirectory="$(ProtoOutputDirectory)"
|
|
ProtoFileName="$(GeneratedProtoFileName)"
|
|
SourceFiles="@(Compile)"
|
|
References="@(ReferencePath)"
|
|
RootNamespace="$(RootNamespace)"
|
|
AssemblyName="$(AssemblyName)" />
|
|
</Target>
|
|
</Project>
|