From 33187449f3cc918124447156f92dc90990ee2cdb Mon Sep 17 00:00:00 2001
From: lu-xiaoshuang <121755080+lu-xiaoshuang@users.noreply.github.com>
Date: Wed, 20 Mar 2024 08:00:00 +0800
Subject: [PATCH] spin off grpc reporter stuff from protocol stuff

---
 .../SkyApm.Transport.Grpc.Protocol.csproj                    | 5 +++--
 src/SkyApm.Transport.Grpc/SkyApm.Transport.Grpc.csproj       | 4 ++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/SkyApm.Transport.Grpc.Protocol/SkyApm.Transport.Grpc.Protocol.csproj b/src/SkyApm.Transport.Grpc.Protocol/SkyApm.Transport.Grpc.Protocol.csproj
index df63a4c7..e7321057 100644
--- a/src/SkyApm.Transport.Grpc.Protocol/SkyApm.Transport.Grpc.Protocol.csproj
+++ b/src/SkyApm.Transport.Grpc.Protocol/SkyApm.Transport.Grpc.Protocol.csproj
@@ -15,7 +15,8 @@
 
     <ItemGroup>
         <PackageReference Include="Google.Protobuf" Version="3.21.5" />
-        <PackageReference Include="Grpc.Net.Client" Version="2.47.0" />
+        <!-- Grpc.Tools is only used at build-time and has no runtime components. -->
+        <!-- https://github.com/grpc/grpc/blob/master/src/csharp/BUILD-INTEGRATION.md -->
         <PackageReference Include="Grpc.Tools" Version="2.48.0">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
@@ -23,7 +24,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <Protobuf Include="protocol-v3/**/*.proto" ProtoRoot="protocol-v3" OutputDir="%(RelativePath)generated-v3" CompileOutputs="false" />
+        <Protobuf Include="protocol-v3/**/*.proto" ProtoRoot="protocol-v3" GrpcServices="Client" OutputDir="generated-v3" GrpcOutputDir="../SkyApm.Transport.Grpc/generated-v3" CompileOutputs="false" />
     </ItemGroup>
 
     <PropertyGroup>
diff --git a/src/SkyApm.Transport.Grpc/SkyApm.Transport.Grpc.csproj b/src/SkyApm.Transport.Grpc/SkyApm.Transport.Grpc.csproj
index b8be2d07..20b6e8fb 100644
--- a/src/SkyApm.Transport.Grpc/SkyApm.Transport.Grpc.csproj
+++ b/src/SkyApm.Transport.Grpc/SkyApm.Transport.Grpc.csproj
@@ -13,6 +13,10 @@
         <RootNamespace>SkyApm.Transport.Grpc</RootNamespace>
     </PropertyGroup>
 
+    <ItemGroup>
+        <PackageReference Include="Grpc.Net.Client" Version="2.47.0" />
+    </ItemGroup>
+
     <ItemGroup>
         <ProjectReference Include="..\SkyApm.Abstractions\SkyApm.Abstractions.csproj" />
         <ProjectReference Include="..\SkyApm.Transport.Grpc.Protocol\SkyApm.Transport.Grpc.Protocol.csproj" />