Change to use grpc-dotnet instead of Grpc.Core in C# SDK

build/build-sdk-images/csharp/Dockerfile

@@ -31,7 +31,7 @@ RUN wget -q https://packages.microsoft.com/config/ubuntu/19.04/packages-microsof
 
 
 RUN apt-get update \
-    && apt-get install -y dotnet-sdk-7.0 dotnet-sdk-3.1
+    && apt-get install -y dotnet-sdk-7.0
 
 # code generation scripts
 COPY *.sh /root/

build/build-sdk-images/csharp/gen.sh

@@ -16,52 +16,37 @@
 
 set -ex
 
-header() {
-    cat /go/src/agones.dev/agones/build/boilerplate.go.txt "$1" | sponge "$1"
-}
+proto=/go/src/agones.dev/agones/proto
+sdk=${proto}/sdk
+googleapis=${proto}/googleapis
+csharp_proto_file_output_dir=/go/src/agones.dev/agones/sdks/csharp/proto
 
-sdk=/go/src/agones.dev/agones/proto/sdk
-googleapis=/go/src/agones.dev/agones/proto/googleapis
-protoc_intermediate=/go/src/agones.dev/agones/sdks/csharp/proto
-protoc_destination=/go/src/agones.dev/agones/sdks/csharp/sdk/generated
-
-# Create temporary proto files
-mkdir -p ${protoc_intermediate}
-cp -r ${sdk} ${protoc_intermediate}
+echo "Copying protobuffers to csharp sdk"
+mkdir -p ${csharp_proto_file_output_dir}
+cp -r ${sdk} ${csharp_proto_file_output_dir}
+cp -r ${googleapis} ${csharp_proto_file_output_dir}
 
 # Remove protoc-gen-openapiv2 definitions because C# package doesn't support grpc-gateway
-sed -i -e 's/import "protoc-gen-openapiv2\/options\/annotations.proto";//' ${protoc_intermediate}/sdk/sdk.proto
-sed -i -e 's/option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {//' ${protoc_intermediate}/sdk/sdk.proto
-sed -i -e 's/info: {//' ${protoc_intermediate}/sdk/sdk.proto
-sed -i -e 's/title: "sdk.proto";//' ${protoc_intermediate}/sdk/sdk.proto
-sed -i -z 's/version: "version not set";\n    };//' ${protoc_intermediate}/sdk/sdk.proto
-sed -i -e 's/schemes: HTTP;//' ${protoc_intermediate}/sdk/sdk.proto
-sed -i -e 's/consumes: "application\/json";//' ${protoc_intermediate}/sdk/sdk.proto
-sed -i -z 's/produces: "application\/json";\n};//' ${protoc_intermediate}/sdk/sdk.proto
-sed -i -e 's/bool disabled = 1.*/bool disabled = 1;/' ${protoc_intermediate}/sdk/sdk.proto
-
-sed -i -e 's/import "protoc-gen-openapiv2\/options\/annotations.proto";//' ${protoc_intermediate}/sdk/alpha/alpha.proto
-sed -i -e 's/option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {//' ${protoc_intermediate}/sdk/alpha/alpha.proto
-sed -i -e 's/info: {//' ${protoc_intermediate}/sdk/alpha/alpha.proto
-sed -i -e 's/title: "alpha.proto";//' ${protoc_intermediate}/sdk/alpha/alpha.proto
-sed -i -z 's/version: "version not set";\n    };//' ${protoc_intermediate}/sdk/alpha/alpha.proto
-sed -i -e 's/schemes: HTTP;//' ${protoc_intermediate}/sdk/alpha/alpha.proto
-sed -i -e 's/consumes: "application\/json";//' ${protoc_intermediate}/sdk/alpha/alpha.proto
-sed -i -z 's/produces: "application\/json";\n};//' ${protoc_intermediate}/sdk/alpha/alpha.proto
-sed -i -e 's/bool bool = 1.*/bool bool = 1;/' ${protoc_intermediate}/sdk/alpha/alpha.proto
-
-# Generate C# proto file like `Sdk.cs`
-protoc -I ${googleapis} -I ${protoc_intermediate}/sdk --plugin=protoc-gen-grpc=`which grpc_csharp_plugin` --csharp_out=${protoc_destination}  ${protoc_intermediate}/sdk/sdk.proto
-protoc -I ${googleapis} -I ${protoc_intermediate}/sdk/alpha --plugin=protoc-gen-grpc=`which grpc_csharp_plugin` --csharp_out=${protoc_destination} ${protoc_intermediate}/sdk/alpha/alpha.proto
-
-# Generate grpc file like `SdkGrpc.cs`
-protoc -I ${googleapis} -I ${protoc_intermediate}/sdk --plugin=protoc-gen-grpc=`which grpc_csharp_plugin` --grpc_out=${protoc_destination} ${protoc_intermediate}/sdk/sdk.proto
-protoc -I ${googleapis} -I ${protoc_intermediate}/sdk/alpha --plugin=protoc-gen-grpc=`which grpc_csharp_plugin`  --grpc_out=${protoc_destination} ${protoc_intermediate}/sdk/alpha/alpha.proto
-
-cd ${protoc_destination}
-header Alpha.cs
-header AlphaGrpc.cs
-header Sdk.cs
-header SdkGrpc.cs
-
-rm -rf ${protoc_intermediate}
+sed -i -e 's/import "protoc-gen-openapiv2\/options\/annotations.proto";//' ${csharp_proto_file_output_dir}/sdk/sdk.proto
+sed -i -e 's/option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {//' ${csharp_proto_file_output_dir}/sdk/sdk.proto
+sed -i -e 's/info: {//' ${csharp_proto_file_output_dir}/sdk/sdk.proto
+sed -i -e 's/title: "sdk.proto";//' ${csharp_proto_file_output_dir}/sdk/sdk.proto
+sed -i -z 's/version: "version not set";\n    };//' ${csharp_proto_file_output_dir}/sdk/sdk.proto
+sed -i -e 's/schemes: HTTP;//' ${csharp_proto_file_output_dir}/sdk/sdk.proto
+sed -i -e 's/consumes: "application\/json";//' ${csharp_proto_file_output_dir}/sdk/sdk.proto
+sed -i -z 's/produces: "application\/json";\n};//' ${csharp_proto_file_output_dir}/sdk/sdk.proto
+sed -i -e 's/bool disabled = 1.*/bool disabled = 1;/' ${csharp_proto_file_output_dir}/sdk/sdk.proto
+sed -i -e 's/^ *$//' ${csharp_proto_file_output_dir}/sdk/sdk.proto
+
+sed -i -e 's/import "protoc-gen-openapiv2\/options\/annotations.proto";//' ${csharp_proto_file_output_dir}/sdk/alpha/alpha.proto
+sed -i -e 's/option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {//' ${csharp_proto_file_output_dir}/sdk/alpha/alpha.proto
+sed -i -e 's/info: {//' ${csharp_proto_file_output_dir}/sdk/alpha/alpha.proto
+sed -i -e 's/title: "alpha.proto";//' ${csharp_proto_file_output_dir}/sdk/alpha/alpha.proto
+sed -i -z 's/version: "version not set";\n    };//' ${csharp_proto_file_output_dir}/sdk/alpha/alpha.proto
+sed -i -e 's/schemes: HTTP;//' ${csharp_proto_file_output_dir}/sdk/alpha/alpha.proto
+sed -i -e 's/consumes: "application\/json";//' ${csharp_proto_file_output_dir}/sdk/alpha/alpha.proto
+sed -i -z 's/produces: "application\/json";\n};//' ${csharp_proto_file_output_dir}/sdk/alpha/alpha.proto
+sed -i -e 's/bool bool = 1.*/bool bool = 1;/' ${csharp_proto_file_output_dir}/sdk/alpha/alpha.proto
+sed -i -e 's/^ *$//' ${csharp_proto_file_output_dir}/sdk/alpha/alpha.proto
+
+echo "csharp code is generated at build time"

sdks/csharp/proto/googleapis/google/api/annotations.proto

@@ -0,0 +1,31 @@
+// Copyright (c) 2015, Google Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+syntax = "proto3";
+
+package google.api;
+
+import "google/api/http.proto";
+import "google/protobuf/descriptor.proto";
+
+option go_package = "google.golang.org/genproto/googleapis/api/annotations;annotations";
+option java_multiple_files = true;
+option java_outer_classname = "AnnotationsProto";
+option java_package = "com.google.api";
+option objc_class_prefix = "GAPI";
+
+extend google.protobuf.MethodOptions {
+  // See `HttpRule`.
+  HttpRule http = 72295728;
+}