Merge pull request #202 from yuanchunchen/Change_Google_Api_Proto_Fil…

…e_Depand_to_Google.Api.CommonProtos Change google api proto file depend, from Google.Api.CommonProtos.
shubhamranjan · Feb 4, 2024 · cc49189 · cc49189
2 parents 8e0a4db + 30f44ef
commit cc49189
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 1,333 deletions.
diff --git a/dotnet-etcd/dotnet-etcd.csproj b/dotnet-etcd/dotnet-etcd.csproj
@@ -6,6 +6,7 @@
     </TargetFrameworks>
     <TargetFrameworks Condition="'$(LibraryFrameworks)'!=''">$(LibraryFrameworks)</TargetFrameworks>
     <RootNamespace>dotnet_etcd</RootNamespace>
+    <IncludeGoogleApiCommonProtos>True</IncludeGoogleApiCommonProtos>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <RepositoryUrl>https://github.com/shubhamranjan/dotnet-etcd</RepositoryUrl>

diff --git a/dotnet-etcd/grpc/proto/etcd/election.proto b/dotnet-etcd/grpc/proto/etcd/election.proto
@@ -6,7 +6,7 @@ import "grpc/proto/etcd/rpc.proto";
 import "grpc/proto/etcd/kv.proto";
 
 // for grpc-gateway
-import "grpc/proto/google/api/annotations.proto";
+import "google/api/annotations.proto";
 
 option (gogoproto.marshaler_all) = true;
 option (gogoproto.unmarshaler_all) = true;

diff --git a/dotnet-etcd/grpc/proto/etcd/lock.proto b/dotnet-etcd/grpc/proto/etcd/lock.proto
@@ -5,7 +5,7 @@ import "grpc/proto/gogoproto/gogo.proto";
 import "grpc/proto/etcd/rpc.proto";
 
 // for grpc-gateway
-import "grpc/proto/google/api/annotations.proto";
+import "google/api/annotations.proto";
 
 option (gogoproto.marshaler_all) = true;
 option (gogoproto.unmarshaler_all) = true;

diff --git a/dotnet-etcd/grpc/proto/etcd/rpc.proto b/dotnet-etcd/grpc/proto/etcd/rpc.proto
@@ -7,7 +7,7 @@ import "grpc/proto/etcd/auth.proto";
 import "grpc/proto/etcd/version.proto";
 
 // for grpc-gateway
-import "grpc/proto/google/api/annotations.proto";
+import "google/api/annotations.proto";
 
 option (gogoproto.marshaler_all) = true;
 option (gogoproto.unmarshaler_all) = true;

diff --git a/dotnet-etcd/grpc/proto/etcd/version.proto b/dotnet-etcd/grpc/proto/etcd/version.proto
@@ -2,7 +2,7 @@
 package versionpb;
 
 import "grpc/proto/gogoproto/gogo.proto";
-import "grpc/proto/google/protobuf/descriptor.proto";
+import "google/protobuf/descriptor.proto";
 
 option (gogoproto.marshaler_all) = true;
 option (gogoproto.unmarshaler_all) = true;

diff --git a/dotnet-etcd/grpc/proto/gogoproto/gogo.proto b/dotnet-etcd/grpc/proto/gogoproto/gogo.proto
@@ -29,7 +29,7 @@
 syntax = "proto2";
 package gogoproto;
 
-import "grpc/proto/google/protobuf/descriptor.proto";
+import "google/protobuf/descriptor.proto";
 
 option java_package = "com.google.protobuf";
 option java_outer_classname = "GoGoProtos";

diff --git a/dotnet-etcd/grpc/proto/google/api/annotations.proto b/dotnet-etcd/grpc/proto/google/api/annotations.proto