|  | @@ -38,7 +38,7 @@
 | 
	
		
			
				|  |  |  using System;
 | 
	
		
			
				|  |  |  using System.Threading;
 | 
	
		
			
				|  |  |  using System.Threading.Tasks;
 | 
	
		
			
				|  |  | -using Grpc.Core;
 | 
	
		
			
				|  |  | +using grpc = global::Grpc.Core;
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  namespace Grpc.Testing {
 | 
	
		
			
				|  |  |    /// <summary>
 | 
	
	
		
			
				|  | @@ -49,65 +49,65 @@ namespace Grpc.Testing {
 | 
	
		
			
				|  |  |    {
 | 
	
		
			
				|  |  |      static readonly string __ServiceName = "grpc.testing.TestService";
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -    static readonly Marshaller<global::Grpc.Testing.Empty> __Marshaller_Empty = Marshallers.Create((arg) => global::Google.Protobuf.MessageExtensions.ToByteArray(arg), global::Grpc.Testing.Empty.Parser.ParseFrom);
 | 
	
		
			
				|  |  | -    static readonly Marshaller<global::Grpc.Testing.SimpleRequest> __Marshaller_SimpleRequest = Marshallers.Create((arg) => global::Google.Protobuf.MessageExtensions.ToByteArray(arg), global::Grpc.Testing.SimpleRequest.Parser.ParseFrom);
 | 
	
		
			
				|  |  | -    static readonly Marshaller<global::Grpc.Testing.SimpleResponse> __Marshaller_SimpleResponse = Marshallers.Create((arg) => global::Google.Protobuf.MessageExtensions.ToByteArray(arg), global::Grpc.Testing.SimpleResponse.Parser.ParseFrom);
 | 
	
		
			
				|  |  | -    static readonly Marshaller<global::Grpc.Testing.StreamingOutputCallRequest> __Marshaller_StreamingOutputCallRequest = Marshallers.Create((arg) => global::Google.Protobuf.MessageExtensions.ToByteArray(arg), global::Grpc.Testing.StreamingOutputCallRequest.Parser.ParseFrom);
 | 
	
		
			
				|  |  | -    static readonly Marshaller<global::Grpc.Testing.StreamingOutputCallResponse> __Marshaller_StreamingOutputCallResponse = Marshallers.Create((arg) => global::Google.Protobuf.MessageExtensions.ToByteArray(arg), global::Grpc.Testing.StreamingOutputCallResponse.Parser.ParseFrom);
 | 
	
		
			
				|  |  | -    static readonly Marshaller<global::Grpc.Testing.StreamingInputCallRequest> __Marshaller_StreamingInputCallRequest = Marshallers.Create((arg) => global::Google.Protobuf.MessageExtensions.ToByteArray(arg), global::Grpc.Testing.StreamingInputCallRequest.Parser.ParseFrom);
 | 
	
		
			
				|  |  | -    static readonly Marshaller<global::Grpc.Testing.StreamingInputCallResponse> __Marshaller_StreamingInputCallResponse = Marshallers.Create((arg) => global::Google.Protobuf.MessageExtensions.ToByteArray(arg), global::Grpc.Testing.StreamingInputCallResponse.Parser.ParseFrom);
 | 
	
		
			
				|  |  | +    static readonly grpc::Marshaller<global::Grpc.Testing.Empty> __Marshaller_Empty = grpc::Marshallers.Create((arg) => global::Google.Protobuf.MessageExtensions.ToByteArray(arg), global::Grpc.Testing.Empty.Parser.ParseFrom);
 | 
	
		
			
				|  |  | +    static readonly grpc::Marshaller<global::Grpc.Testing.SimpleRequest> __Marshaller_SimpleRequest = grpc::Marshallers.Create((arg) => global::Google.Protobuf.MessageExtensions.ToByteArray(arg), global::Grpc.Testing.SimpleRequest.Parser.ParseFrom);
 | 
	
		
			
				|  |  | +    static readonly grpc::Marshaller<global::Grpc.Testing.SimpleResponse> __Marshaller_SimpleResponse = grpc::Marshallers.Create((arg) => global::Google.Protobuf.MessageExtensions.ToByteArray(arg), global::Grpc.Testing.SimpleResponse.Parser.ParseFrom);
 | 
	
		
			
				|  |  | +    static readonly grpc::Marshaller<global::Grpc.Testing.StreamingOutputCallRequest> __Marshaller_StreamingOutputCallRequest = grpc::Marshallers.Create((arg) => global::Google.Protobuf.MessageExtensions.ToByteArray(arg), global::Grpc.Testing.StreamingOutputCallRequest.Parser.ParseFrom);
 | 
	
		
			
				|  |  | +    static readonly grpc::Marshaller<global::Grpc.Testing.StreamingOutputCallResponse> __Marshaller_StreamingOutputCallResponse = grpc::Marshallers.Create((arg) => global::Google.Protobuf.MessageExtensions.ToByteArray(arg), global::Grpc.Testing.StreamingOutputCallResponse.Parser.ParseFrom);
 | 
	
		
			
				|  |  | +    static readonly grpc::Marshaller<global::Grpc.Testing.StreamingInputCallRequest> __Marshaller_StreamingInputCallRequest = grpc::Marshallers.Create((arg) => global::Google.Protobuf.MessageExtensions.ToByteArray(arg), global::Grpc.Testing.StreamingInputCallRequest.Parser.ParseFrom);
 | 
	
		
			
				|  |  | +    static readonly grpc::Marshaller<global::Grpc.Testing.StreamingInputCallResponse> __Marshaller_StreamingInputCallResponse = grpc::Marshallers.Create((arg) => global::Google.Protobuf.MessageExtensions.ToByteArray(arg), global::Grpc.Testing.StreamingInputCallResponse.Parser.ParseFrom);
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -    static readonly Method<global::Grpc.Testing.Empty, global::Grpc.Testing.Empty> __Method_EmptyCall = new Method<global::Grpc.Testing.Empty, global::Grpc.Testing.Empty>(
 | 
	
		
			
				|  |  | -        MethodType.Unary,
 | 
	
		
			
				|  |  | +    static readonly grpc::Method<global::Grpc.Testing.Empty, global::Grpc.Testing.Empty> __Method_EmptyCall = new grpc::Method<global::Grpc.Testing.Empty, global::Grpc.Testing.Empty>(
 | 
	
		
			
				|  |  | +        grpc::MethodType.Unary,
 | 
	
		
			
				|  |  |          __ServiceName,
 | 
	
		
			
				|  |  |          "EmptyCall",
 | 
	
		
			
				|  |  |          __Marshaller_Empty,
 | 
	
		
			
				|  |  |          __Marshaller_Empty);
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -    static readonly Method<global::Grpc.Testing.SimpleRequest, global::Grpc.Testing.SimpleResponse> __Method_UnaryCall = new Method<global::Grpc.Testing.SimpleRequest, global::Grpc.Testing.SimpleResponse>(
 | 
	
		
			
				|  |  | -        MethodType.Unary,
 | 
	
		
			
				|  |  | +    static readonly grpc::Method<global::Grpc.Testing.SimpleRequest, global::Grpc.Testing.SimpleResponse> __Method_UnaryCall = new grpc::Method<global::Grpc.Testing.SimpleRequest, global::Grpc.Testing.SimpleResponse>(
 | 
	
		
			
				|  |  | +        grpc::MethodType.Unary,
 | 
	
		
			
				|  |  |          __ServiceName,
 | 
	
		
			
				|  |  |          "UnaryCall",
 | 
	
		
			
				|  |  |          __Marshaller_SimpleRequest,
 | 
	
		
			
				|  |  |          __Marshaller_SimpleResponse);
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -    static readonly Method<global::Grpc.Testing.SimpleRequest, global::Grpc.Testing.SimpleResponse> __Method_CacheableUnaryCall = new Method<global::Grpc.Testing.SimpleRequest, global::Grpc.Testing.SimpleResponse>(
 | 
	
		
			
				|  |  | -        MethodType.Unary,
 | 
	
		
			
				|  |  | +    static readonly grpc::Method<global::Grpc.Testing.SimpleRequest, global::Grpc.Testing.SimpleResponse> __Method_CacheableUnaryCall = new grpc::Method<global::Grpc.Testing.SimpleRequest, global::Grpc.Testing.SimpleResponse>(
 | 
	
		
			
				|  |  | +        grpc::MethodType.Unary,
 | 
	
		
			
				|  |  |          __ServiceName,
 | 
	
		
			
				|  |  |          "CacheableUnaryCall",
 | 
	
		
			
				|  |  |          __Marshaller_SimpleRequest,
 | 
	
		
			
				|  |  |          __Marshaller_SimpleResponse);
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -    static readonly Method<global::Grpc.Testing.StreamingOutputCallRequest, global::Grpc.Testing.StreamingOutputCallResponse> __Method_StreamingOutputCall = new Method<global::Grpc.Testing.StreamingOutputCallRequest, global::Grpc.Testing.StreamingOutputCallResponse>(
 | 
	
		
			
				|  |  | -        MethodType.ServerStreaming,
 | 
	
		
			
				|  |  | +    static readonly grpc::Method<global::Grpc.Testing.StreamingOutputCallRequest, global::Grpc.Testing.StreamingOutputCallResponse> __Method_StreamingOutputCall = new grpc::Method<global::Grpc.Testing.StreamingOutputCallRequest, global::Grpc.Testing.StreamingOutputCallResponse>(
 | 
	
		
			
				|  |  | +        grpc::MethodType.ServerStreaming,
 | 
	
		
			
				|  |  |          __ServiceName,
 | 
	
		
			
				|  |  |          "StreamingOutputCall",
 | 
	
		
			
				|  |  |          __Marshaller_StreamingOutputCallRequest,
 | 
	
		
			
				|  |  |          __Marshaller_StreamingOutputCallResponse);
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -    static readonly Method<global::Grpc.Testing.StreamingInputCallRequest, global::Grpc.Testing.StreamingInputCallResponse> __Method_StreamingInputCall = new Method<global::Grpc.Testing.StreamingInputCallRequest, global::Grpc.Testing.StreamingInputCallResponse>(
 | 
	
		
			
				|  |  | -        MethodType.ClientStreaming,
 | 
	
		
			
				|  |  | +    static readonly grpc::Method<global::Grpc.Testing.StreamingInputCallRequest, global::Grpc.Testing.StreamingInputCallResponse> __Method_StreamingInputCall = new grpc::Method<global::Grpc.Testing.StreamingInputCallRequest, global::Grpc.Testing.StreamingInputCallResponse>(
 | 
	
		
			
				|  |  | +        grpc::MethodType.ClientStreaming,
 | 
	
		
			
				|  |  |          __ServiceName,
 | 
	
		
			
				|  |  |          "StreamingInputCall",
 | 
	
		
			
				|  |  |          __Marshaller_StreamingInputCallRequest,
 | 
	
		
			
				|  |  |          __Marshaller_StreamingInputCallResponse);
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -    static readonly Method<global::Grpc.Testing.StreamingOutputCallRequest, global::Grpc.Testing.StreamingOutputCallResponse> __Method_FullDuplexCall = new Method<global::Grpc.Testing.StreamingOutputCallRequest, global::Grpc.Testing.StreamingOutputCallResponse>(
 | 
	
		
			
				|  |  | -        MethodType.DuplexStreaming,
 | 
	
		
			
				|  |  | +    static readonly grpc::Method<global::Grpc.Testing.StreamingOutputCallRequest, global::Grpc.Testing.StreamingOutputCallResponse> __Method_FullDuplexCall = new grpc::Method<global::Grpc.Testing.StreamingOutputCallRequest, global::Grpc.Testing.StreamingOutputCallResponse>(
 | 
	
		
			
				|  |  | +        grpc::MethodType.DuplexStreaming,
 | 
	
		
			
				|  |  |          __ServiceName,
 | 
	
		
			
				|  |  |          "FullDuplexCall",
 | 
	
		
			
				|  |  |          __Marshaller_StreamingOutputCallRequest,
 | 
	
		
			
				|  |  |          __Marshaller_StreamingOutputCallResponse);
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -    static readonly Method<global::Grpc.Testing.StreamingOutputCallRequest, global::Grpc.Testing.StreamingOutputCallResponse> __Method_HalfDuplexCall = new Method<global::Grpc.Testing.StreamingOutputCallRequest, global::Grpc.Testing.StreamingOutputCallResponse>(
 | 
	
		
			
				|  |  | -        MethodType.DuplexStreaming,
 | 
	
		
			
				|  |  | +    static readonly grpc::Method<global::Grpc.Testing.StreamingOutputCallRequest, global::Grpc.Testing.StreamingOutputCallResponse> __Method_HalfDuplexCall = new grpc::Method<global::Grpc.Testing.StreamingOutputCallRequest, global::Grpc.Testing.StreamingOutputCallResponse>(
 | 
	
		
			
				|  |  | +        grpc::MethodType.DuplexStreaming,
 | 
	
		
			
				|  |  |          __ServiceName,
 | 
	
		
			
				|  |  |          "HalfDuplexCall",
 | 
	
		
			
				|  |  |          __Marshaller_StreamingOutputCallRequest,
 | 
	
		
			
				|  |  |          __Marshaller_StreamingOutputCallResponse);
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -    static readonly Method<global::Grpc.Testing.Empty, global::Grpc.Testing.Empty> __Method_UnimplementedCall = new Method<global::Grpc.Testing.Empty, global::Grpc.Testing.Empty>(
 | 
	
		
			
				|  |  | -        MethodType.Unary,
 | 
	
		
			
				|  |  | +    static readonly grpc::Method<global::Grpc.Testing.Empty, global::Grpc.Testing.Empty> __Method_UnimplementedCall = new grpc::Method<global::Grpc.Testing.Empty, global::Grpc.Testing.Empty>(
 | 
	
		
			
				|  |  | +        grpc::MethodType.Unary,
 | 
	
		
			
				|  |  |          __ServiceName,
 | 
	
		
			
				|  |  |          "UnimplementedCall",
 | 
	
		
			
				|  |  |          __Marshaller_Empty,
 | 
	
	
		
			
				|  | @@ -128,9 +128,9 @@ namespace Grpc.Testing {
 | 
	
		
			
				|  |  |        /// <param name="request">The request received from the client.</param>
 | 
	
		
			
				|  |  |        /// <param name="context">The context of the server-side call handler being invoked.</param>
 | 
	
		
			
				|  |  |        /// <returns>The response to send back to the client (wrapped by a task).</returns>
 | 
	
		
			
				|  |  | -      public virtual global::System.Threading.Tasks.Task<global::Grpc.Testing.Empty> EmptyCall(global::Grpc.Testing.Empty request, ServerCallContext context)
 | 
	
		
			
				|  |  | +      public virtual global::System.Threading.Tasks.Task<global::Grpc.Testing.Empty> EmptyCall(global::Grpc.Testing.Empty request, grpc::ServerCallContext context)
 | 
	
		
			
				|  |  |        {
 | 
	
		
			
				|  |  | -        throw new RpcException(new Status(StatusCode.Unimplemented, ""));
 | 
	
		
			
				|  |  | +        throw new grpc::RpcException(new grpc::Status(grpc::StatusCode.Unimplemented, ""));
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |        /// <summary>
 | 
	
	
		
			
				|  | @@ -139,9 +139,9 @@ namespace Grpc.Testing {
 | 
	
		
			
				|  |  |        /// <param name="request">The request received from the client.</param>
 | 
	
		
			
				|  |  |        /// <param name="context">The context of the server-side call handler being invoked.</param>
 | 
	
		
			
				|  |  |        /// <returns>The response to send back to the client (wrapped by a task).</returns>
 | 
	
		
			
				|  |  | -      public virtual global::System.Threading.Tasks.Task<global::Grpc.Testing.SimpleResponse> UnaryCall(global::Grpc.Testing.SimpleRequest request, ServerCallContext context)
 | 
	
		
			
				|  |  | +      public virtual global::System.Threading.Tasks.Task<global::Grpc.Testing.SimpleResponse> UnaryCall(global::Grpc.Testing.SimpleRequest request, grpc::ServerCallContext context)
 | 
	
		
			
				|  |  |        {
 | 
	
		
			
				|  |  | -        throw new RpcException(new Status(StatusCode.Unimplemented, ""));
 | 
	
		
			
				|  |  | +        throw new grpc::RpcException(new grpc::Status(grpc::StatusCode.Unimplemented, ""));
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |        /// <summary>
 | 
	
	
		
			
				|  | @@ -152,9 +152,9 @@ namespace Grpc.Testing {
 | 
	
		
			
				|  |  |        /// <param name="request">The request received from the client.</param>
 | 
	
		
			
				|  |  |        /// <param name="context">The context of the server-side call handler being invoked.</param>
 | 
	
		
			
				|  |  |        /// <returns>The response to send back to the client (wrapped by a task).</returns>
 | 
	
		
			
				|  |  | -      public virtual global::System.Threading.Tasks.Task<global::Grpc.Testing.SimpleResponse> CacheableUnaryCall(global::Grpc.Testing.SimpleRequest request, ServerCallContext context)
 | 
	
		
			
				|  |  | +      public virtual global::System.Threading.Tasks.Task<global::Grpc.Testing.SimpleResponse> CacheableUnaryCall(global::Grpc.Testing.SimpleRequest request, grpc::ServerCallContext context)
 | 
	
		
			
				|  |  |        {
 | 
	
		
			
				|  |  | -        throw new RpcException(new Status(StatusCode.Unimplemented, ""));
 | 
	
		
			
				|  |  | +        throw new grpc::RpcException(new grpc::Status(grpc::StatusCode.Unimplemented, ""));
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |        /// <summary>
 | 
	
	
		
			
				|  | @@ -165,9 +165,9 @@ namespace Grpc.Testing {
 | 
	
		
			
				|  |  |        /// <param name="responseStream">Used for sending responses back to the client.</param>
 | 
	
		
			
				|  |  |        /// <param name="context">The context of the server-side call handler being invoked.</param>
 | 
	
		
			
				|  |  |        /// <returns>A task indicating completion of the handler.</returns>
 | 
	
		
			
				|  |  | -      public virtual global::System.Threading.Tasks.Task StreamingOutputCall(global::Grpc.Testing.StreamingOutputCallRequest request, IServerStreamWriter<global::Grpc.Testing.StreamingOutputCallResponse> responseStream, ServerCallContext context)
 | 
	
		
			
				|  |  | +      public virtual global::System.Threading.Tasks.Task StreamingOutputCall(global::Grpc.Testing.StreamingOutputCallRequest request, grpc::IServerStreamWriter<global::Grpc.Testing.StreamingOutputCallResponse> responseStream, grpc::ServerCallContext context)
 | 
	
		
			
				|  |  |        {
 | 
	
		
			
				|  |  | -        throw new RpcException(new Status(StatusCode.Unimplemented, ""));
 | 
	
		
			
				|  |  | +        throw new grpc::RpcException(new grpc::Status(grpc::StatusCode.Unimplemented, ""));
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |        /// <summary>
 | 
	
	
		
			
				|  | @@ -177,9 +177,9 @@ namespace Grpc.Testing {
 | 
	
		
			
				|  |  |        /// <param name="requestStream">Used for reading requests from the client.</param>
 | 
	
		
			
				|  |  |        /// <param name="context">The context of the server-side call handler being invoked.</param>
 | 
	
		
			
				|  |  |        /// <returns>The response to send back to the client (wrapped by a task).</returns>
 | 
	
		
			
				|  |  | -      public virtual global::System.Threading.Tasks.Task<global::Grpc.Testing.StreamingInputCallResponse> StreamingInputCall(IAsyncStreamReader<global::Grpc.Testing.StreamingInputCallRequest> requestStream, ServerCallContext context)
 | 
	
		
			
				|  |  | +      public virtual global::System.Threading.Tasks.Task<global::Grpc.Testing.StreamingInputCallResponse> StreamingInputCall(grpc::IAsyncStreamReader<global::Grpc.Testing.StreamingInputCallRequest> requestStream, grpc::ServerCallContext context)
 | 
	
		
			
				|  |  |        {
 | 
	
		
			
				|  |  | -        throw new RpcException(new Status(StatusCode.Unimplemented, ""));
 | 
	
		
			
				|  |  | +        throw new grpc::RpcException(new grpc::Status(grpc::StatusCode.Unimplemented, ""));
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |        /// <summary>
 | 
	
	
		
			
				|  | @@ -191,9 +191,9 @@ namespace Grpc.Testing {
 | 
	
		
			
				|  |  |        /// <param name="responseStream">Used for sending responses back to the client.</param>
 | 
	
		
			
				|  |  |        /// <param name="context">The context of the server-side call handler being invoked.</param>
 | 
	
		
			
				|  |  |        /// <returns>A task indicating completion of the handler.</returns>
 | 
	
		
			
				|  |  | -      public virtual global::System.Threading.Tasks.Task FullDuplexCall(IAsyncStreamReader<global::Grpc.Testing.StreamingOutputCallRequest> requestStream, IServerStreamWriter<global::Grpc.Testing.StreamingOutputCallResponse> responseStream, ServerCallContext context)
 | 
	
		
			
				|  |  | +      public virtual global::System.Threading.Tasks.Task FullDuplexCall(grpc::IAsyncStreamReader<global::Grpc.Testing.StreamingOutputCallRequest> requestStream, grpc::IServerStreamWriter<global::Grpc.Testing.StreamingOutputCallResponse> responseStream, grpc::ServerCallContext context)
 | 
	
		
			
				|  |  |        {
 | 
	
		
			
				|  |  | -        throw new RpcException(new Status(StatusCode.Unimplemented, ""));
 | 
	
		
			
				|  |  | +        throw new grpc::RpcException(new grpc::Status(grpc::StatusCode.Unimplemented, ""));
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |        /// <summary>
 | 
	
	
		
			
				|  | @@ -206,9 +206,9 @@ namespace Grpc.Testing {
 | 
	
		
			
				|  |  |        /// <param name="responseStream">Used for sending responses back to the client.</param>
 | 
	
		
			
				|  |  |        /// <param name="context">The context of the server-side call handler being invoked.</param>
 | 
	
		
			
				|  |  |        /// <returns>A task indicating completion of the handler.</returns>
 | 
	
		
			
				|  |  | -      public virtual global::System.Threading.Tasks.Task HalfDuplexCall(IAsyncStreamReader<global::Grpc.Testing.StreamingOutputCallRequest> requestStream, IServerStreamWriter<global::Grpc.Testing.StreamingOutputCallResponse> responseStream, ServerCallContext context)
 | 
	
		
			
				|  |  | +      public virtual global::System.Threading.Tasks.Task HalfDuplexCall(grpc::IAsyncStreamReader<global::Grpc.Testing.StreamingOutputCallRequest> requestStream, grpc::IServerStreamWriter<global::Grpc.Testing.StreamingOutputCallResponse> responseStream, grpc::ServerCallContext context)
 | 
	
		
			
				|  |  |        {
 | 
	
		
			
				|  |  | -        throw new RpcException(new Status(StatusCode.Unimplemented, ""));
 | 
	
		
			
				|  |  | +        throw new grpc::RpcException(new grpc::Status(grpc::StatusCode.Unimplemented, ""));
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |        /// <summary>
 | 
	
	
		
			
				|  | @@ -218,24 +218,24 @@ namespace Grpc.Testing {
 | 
	
		
			
				|  |  |        /// <param name="request">The request received from the client.</param>
 | 
	
		
			
				|  |  |        /// <param name="context">The context of the server-side call handler being invoked.</param>
 | 
	
		
			
				|  |  |        /// <returns>The response to send back to the client (wrapped by a task).</returns>
 | 
	
		
			
				|  |  | -      public virtual global::System.Threading.Tasks.Task<global::Grpc.Testing.Empty> UnimplementedCall(global::Grpc.Testing.Empty request, ServerCallContext context)
 | 
	
		
			
				|  |  | +      public virtual global::System.Threading.Tasks.Task<global::Grpc.Testing.Empty> UnimplementedCall(global::Grpc.Testing.Empty request, grpc::ServerCallContext context)
 | 
	
		
			
				|  |  |        {
 | 
	
		
			
				|  |  | -        throw new RpcException(new Status(StatusCode.Unimplemented, ""));
 | 
	
		
			
				|  |  | +        throw new grpc::RpcException(new grpc::Status(grpc::StatusCode.Unimplemented, ""));
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      /// <summary>Client for TestService</summary>
 | 
	
		
			
				|  |  | -    public partial class TestServiceClient : ClientBase<TestServiceClient>
 | 
	
		
			
				|  |  | +    public partial class TestServiceClient : grpc::ClientBase<TestServiceClient>
 | 
	
		
			
				|  |  |      {
 | 
	
		
			
				|  |  |        /// <summary>Creates a new client for TestService</summary>
 | 
	
		
			
				|  |  |        /// <param name="channel">The channel to use to make remote calls.</param>
 | 
	
		
			
				|  |  | -      public TestServiceClient(Channel channel) : base(channel)
 | 
	
		
			
				|  |  | +      public TestServiceClient(grpc::Channel channel) : base(channel)
 | 
	
		
			
				|  |  |        {
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  |        /// <summary>Creates a new client for TestService that uses a custom <c>CallInvoker</c>.</summary>
 | 
	
		
			
				|  |  |        /// <param name="callInvoker">The callInvoker to use to make remote calls.</param>
 | 
	
		
			
				|  |  | -      public TestServiceClient(CallInvoker callInvoker) : base(callInvoker)
 | 
	
		
			
				|  |  | +      public TestServiceClient(grpc::CallInvoker callInvoker) : base(callInvoker)
 | 
	
		
			
				|  |  |        {
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  |        /// <summary>Protected parameterless constructor to allow creation of test doubles.</summary>
 | 
	
	
		
			
				|  | @@ -256,9 +256,9 @@ namespace Grpc.Testing {
 | 
	
		
			
				|  |  |        /// <param name="deadline">An optional deadline for the call. The call will be cancelled if deadline is hit.</param>
 | 
	
		
			
				|  |  |        /// <param name="cancellationToken">An optional token for canceling the call.</param>
 | 
	
		
			
				|  |  |        /// <returns>The response received from the server.</returns>
 | 
	
		
			
				|  |  | -      public virtual global::Grpc.Testing.Empty EmptyCall(global::Grpc.Testing.Empty request, Metadata headers = null, DateTime? deadline = null, CancellationToken cancellationToken = default(CancellationToken))
 | 
	
		
			
				|  |  | +      public virtual global::Grpc.Testing.Empty EmptyCall(global::Grpc.Testing.Empty request, grpc::Metadata headers = null, DateTime? deadline = null, CancellationToken cancellationToken = default(CancellationToken))
 | 
	
		
			
				|  |  |        {
 | 
	
		
			
				|  |  | -        return EmptyCall(request, new CallOptions(headers, deadline, cancellationToken));
 | 
	
		
			
				|  |  | +        return EmptyCall(request, new grpc::CallOptions(headers, deadline, cancellationToken));
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  |        /// <summary>
 | 
	
		
			
				|  |  |        /// One empty request followed by one empty response.
 | 
	
	
		
			
				|  | @@ -266,7 +266,7 @@ namespace Grpc.Testing {
 | 
	
		
			
				|  |  |        /// <param name="request">The request to send to the server.</param>
 | 
	
		
			
				|  |  |        /// <param name="options">The options for the call.</param>
 | 
	
		
			
				|  |  |        /// <returns>The response received from the server.</returns>
 | 
	
		
			
				|  |  | -      public virtual global::Grpc.Testing.Empty EmptyCall(global::Grpc.Testing.Empty request, CallOptions options)
 | 
	
		
			
				|  |  | +      public virtual global::Grpc.Testing.Empty EmptyCall(global::Grpc.Testing.Empty request, grpc::CallOptions options)
 | 
	
		
			
				|  |  |        {
 | 
	
		
			
				|  |  |          return CallInvoker.BlockingUnaryCall(__Method_EmptyCall, null, options, request);
 | 
	
		
			
				|  |  |        }
 | 
	
	
		
			
				|  | @@ -278,9 +278,9 @@ namespace Grpc.Testing {
 | 
	
		
			
				|  |  |        /// <param name="deadline">An optional deadline for the call. The call will be cancelled if deadline is hit.</param>
 | 
	
		
			
				|  |  |        /// <param name="cancellationToken">An optional token for canceling the call.</param>
 | 
	
		
			
				|  |  |        /// <returns>The call object.</returns>
 | 
	
		
			
				|  |  | -      public virtual AsyncUnaryCall<global::Grpc.Testing.Empty> EmptyCallAsync(global::Grpc.Testing.Empty request, Metadata headers = null, DateTime? deadline = null, CancellationToken cancellationToken = default(CancellationToken))
 | 
	
		
			
				|  |  | +      public virtual grpc::AsyncUnaryCall<global::Grpc.Testing.Empty> EmptyCallAsync(global::Grpc.Testing.Empty request, grpc::Metadata headers = null, DateTime? deadline = null, CancellationToken cancellationToken = default(CancellationToken))
 | 
	
		
			
				|  |  |        {
 | 
	
		
			
				|  |  | -        return EmptyCallAsync(request, new CallOptions(headers, deadline, cancellationToken));
 | 
	
		
			
				|  |  | +        return EmptyCallAsync(request, new grpc::CallOptions(headers, deadline, cancellationToken));
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  |        /// <summary>
 | 
	
		
			
				|  |  |        /// One empty request followed by one empty response.
 | 
	
	
		
			
				|  | @@ -288,7 +288,7 @@ namespace Grpc.Testing {
 | 
	
		
			
				|  |  |        /// <param name="request">The request to send to the server.</param>
 | 
	
		
			
				|  |  |        /// <param name="options">The options for the call.</param>
 | 
	
		
			
				|  |  |        /// <returns>The call object.</returns>
 | 
	
		
			
				|  |  | -      public virtual AsyncUnaryCall<global::Grpc.Testing.Empty> EmptyCallAsync(global::Grpc.Testing.Empty request, CallOptions options)
 | 
	
		
			
				|  |  | +      public virtual grpc::AsyncUnaryCall<global::Grpc.Testing.Empty> EmptyCallAsync(global::Grpc.Testing.Empty request, grpc::CallOptions options)
 | 
	
		
			
				|  |  |        {
 | 
	
		
			
				|  |  |          return CallInvoker.AsyncUnaryCall(__Method_EmptyCall, null, options, request);
 | 
	
		
			
				|  |  |        }
 | 
	
	
		
			
				|  | @@ -300,9 +300,9 @@ namespace Grpc.Testing {
 | 
	
		
			
				|  |  |        /// <param name="deadline">An optional deadline for the call. The call will be cancelled if deadline is hit.</param>
 | 
	
		
			
				|  |  |        /// <param name="cancellationToken">An optional token for canceling the call.</param>
 | 
	
		
			
				|  |  |        /// <returns>The response received from the server.</returns>
 | 
	
		
			
				|  |  | -      public virtual global::Grpc.Testing.SimpleResponse UnaryCall(global::Grpc.Testing.SimpleRequest request, Metadata headers = null, DateTime? deadline = null, CancellationToken cancellationToken = default(CancellationToken))
 | 
	
		
			
				|  |  | +      public virtual global::Grpc.Testing.SimpleResponse UnaryCall(global::Grpc.Testing.SimpleRequest request, grpc::Metadata headers = null, DateTime? deadline = null, CancellationToken cancellationToken = default(CancellationToken))
 | 
	
		
			
				|  |  |        {
 | 
	
		
			
				|  |  | -        return UnaryCall(request, new CallOptions(headers, deadline, cancellationToken));
 | 
	
		
			
				|  |  | +        return UnaryCall(request, new grpc::CallOptions(headers, deadline, cancellationToken));
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  |        /// <summary>
 | 
	
		
			
				|  |  |        /// One request followed by one response.
 | 
	
	
		
			
				|  | @@ -310,7 +310,7 @@ namespace Grpc.Testing {
 | 
	
		
			
				|  |  |        /// <param name="request">The request to send to the server.</param>
 | 
	
		
			
				|  |  |        /// <param name="options">The options for the call.</param>
 | 
	
		
			
				|  |  |        /// <returns>The response received from the server.</returns>
 | 
	
		
			
				|  |  | -      public virtual global::Grpc.Testing.SimpleResponse UnaryCall(global::Grpc.Testing.SimpleRequest request, CallOptions options)
 | 
	
		
			
				|  |  | +      public virtual global::Grpc.Testing.SimpleResponse UnaryCall(global::Grpc.Testing.SimpleRequest request, grpc::CallOptions options)
 | 
	
		
			
				|  |  |        {
 | 
	
		
			
				|  |  |          return CallInvoker.BlockingUnaryCall(__Method_UnaryCall, null, options, request);
 | 
	
		
			
				|  |  |        }
 | 
	
	
		
			
				|  | @@ -322,9 +322,9 @@ namespace Grpc.Testing {
 | 
	
		
			
				|  |  |        /// <param name="deadline">An optional deadline for the call. The call will be cancelled if deadline is hit.</param>
 | 
	
		
			
				|  |  |        /// <param name="cancellationToken">An optional token for canceling the call.</param>
 | 
	
		
			
				|  |  |        /// <returns>The call object.</returns>
 | 
	
		
			
				|  |  | -      public virtual AsyncUnaryCall<global::Grpc.Testing.SimpleResponse> UnaryCallAsync(global::Grpc.Testing.SimpleRequest request, Metadata headers = null, DateTime? deadline = null, CancellationToken cancellationToken = default(CancellationToken))
 | 
	
		
			
				|  |  | +      public virtual grpc::AsyncUnaryCall<global::Grpc.Testing.SimpleResponse> UnaryCallAsync(global::Grpc.Testing.SimpleRequest request, grpc::Metadata headers = null, DateTime? deadline = null, CancellationToken cancellationToken = default(CancellationToken))
 | 
	
		
			
				|  |  |        {
 | 
	
		
			
				|  |  | -        return UnaryCallAsync(request, new CallOptions(headers, deadline, cancellationToken));
 | 
	
		
			
				|  |  | +        return UnaryCallAsync(request, new grpc::CallOptions(headers, deadline, cancellationToken));
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  |        /// <summary>
 | 
	
		
			
				|  |  |        /// One request followed by one response.
 | 
	
	
		
			
				|  | @@ -332,7 +332,7 @@ namespace Grpc.Testing {
 | 
	
		
			
				|  |  |        /// <param name="request">The request to send to the server.</param>
 | 
	
		
			
				|  |  |        /// <param name="options">The options for the call.</param>
 | 
	
		
			
				|  |  |        /// <returns>The call object.</returns>
 | 
	
		
			
				|  |  | -      public virtual AsyncUnaryCall<global::Grpc.Testing.SimpleResponse> UnaryCallAsync(global::Grpc.Testing.SimpleRequest request, CallOptions options)
 | 
	
		
			
				|  |  | +      public virtual grpc::AsyncUnaryCall<global::Grpc.Testing.SimpleResponse> UnaryCallAsync(global::Grpc.Testing.SimpleRequest request, grpc::CallOptions options)
 | 
	
		
			
				|  |  |        {
 | 
	
		
			
				|  |  |          return CallInvoker.AsyncUnaryCall(__Method_UnaryCall, null, options, request);
 | 
	
		
			
				|  |  |        }
 | 
	
	
		
			
				|  | @@ -346,9 +346,9 @@ namespace Grpc.Testing {
 | 
	
		
			
				|  |  |        /// <param name="deadline">An optional deadline for the call. The call will be cancelled if deadline is hit.</param>
 | 
	
		
			
				|  |  |        /// <param name="cancellationToken">An optional token for canceling the call.</param>
 | 
	
		
			
				|  |  |        /// <returns>The response received from the server.</returns>
 | 
	
		
			
				|  |  | -      public virtual global::Grpc.Testing.SimpleResponse CacheableUnaryCall(global::Grpc.Testing.SimpleRequest request, Metadata headers = null, DateTime? deadline = null, CancellationToken cancellationToken = default(CancellationToken))
 | 
	
		
			
				|  |  | +      public virtual global::Grpc.Testing.SimpleResponse CacheableUnaryCall(global::Grpc.Testing.SimpleRequest request, grpc::Metadata headers = null, DateTime? deadline = null, CancellationToken cancellationToken = default(CancellationToken))
 | 
	
		
			
				|  |  |        {
 | 
	
		
			
				|  |  | -        return CacheableUnaryCall(request, new CallOptions(headers, deadline, cancellationToken));
 | 
	
		
			
				|  |  | +        return CacheableUnaryCall(request, new grpc::CallOptions(headers, deadline, cancellationToken));
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  |        /// <summary>
 | 
	
		
			
				|  |  |        /// One request followed by one response. Response has cache control
 | 
	
	
		
			
				|  | @@ -358,7 +358,7 @@ namespace Grpc.Testing {
 | 
	
		
			
				|  |  |        /// <param name="request">The request to send to the server.</param>
 | 
	
		
			
				|  |  |        /// <param name="options">The options for the call.</param>
 | 
	
		
			
				|  |  |        /// <returns>The response received from the server.</returns>
 | 
	
		
			
				|  |  | -      public virtual global::Grpc.Testing.SimpleResponse CacheableUnaryCall(global::Grpc.Testing.SimpleRequest request, CallOptions options)
 | 
	
		
			
				|  |  | +      public virtual global::Grpc.Testing.SimpleResponse CacheableUnaryCall(global::Grpc.Testing.SimpleRequest request, grpc::CallOptions options)
 | 
	
		
			
				|  |  |        {
 | 
	
		
			
				|  |  |          return CallInvoker.BlockingUnaryCall(__Method_CacheableUnaryCall, null, options, request);
 | 
	
		
			
				|  |  |        }
 | 
	
	
		
			
				|  | @@ -372,9 +372,9 @@ namespace Grpc.Testing {
 | 
	
		
			
				|  |  |        /// <param name="deadline">An optional deadline for the call. The call will be cancelled if deadline is hit.</param>
 | 
	
		
			
				|  |  |        /// <param name="cancellationToken">An optional token for canceling the call.</param>
 | 
	
		
			
				|  |  |        /// <returns>The call object.</returns>
 | 
	
		
			
				|  |  | -      public virtual AsyncUnaryCall<global::Grpc.Testing.SimpleResponse> CacheableUnaryCallAsync(global::Grpc.Testing.SimpleRequest request, Metadata headers = null, DateTime? deadline = null, CancellationToken cancellationToken = default(CancellationToken))
 | 
	
		
			
				|  |  | +      public virtual grpc::AsyncUnaryCall<global::Grpc.Testing.SimpleResponse> CacheableUnaryCallAsync(global::Grpc.Testing.SimpleRequest request, grpc::Metadata headers = null, DateTime? deadline = null, CancellationToken cancellationToken = default(CancellationToken))
 | 
	
		
			
				|  |  |        {
 | 
	
		
			
				|  |  | -        return CacheableUnaryCallAsync(request, new CallOptions(headers, deadline, cancellationToken));
 | 
	
		
			
				|  |  | +        return CacheableUnaryCallAsync(request, new grpc::CallOptions(headers, deadline, cancellationToken));
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  |        /// <summary>
 | 
	
		
			
				|  |  |        /// One request followed by one response. Response has cache control
 | 
	
	
		
			
				|  | @@ -384,7 +384,7 @@ namespace Grpc.Testing {
 | 
	
		
			
				|  |  |        /// <param name="request">The request to send to the server.</param>
 | 
	
		
			
				|  |  |        /// <param name="options">The options for the call.</param>
 | 
	
		
			
				|  |  |        /// <returns>The call object.</returns>
 | 
	
		
			
				|  |  | -      public virtual AsyncUnaryCall<global::Grpc.Testing.SimpleResponse> CacheableUnaryCallAsync(global::Grpc.Testing.SimpleRequest request, CallOptions options)
 | 
	
		
			
				|  |  | +      public virtual grpc::AsyncUnaryCall<global::Grpc.Testing.SimpleResponse> CacheableUnaryCallAsync(global::Grpc.Testing.SimpleRequest request, grpc::CallOptions options)
 | 
	
		
			
				|  |  |        {
 | 
	
		
			
				|  |  |          return CallInvoker.AsyncUnaryCall(__Method_CacheableUnaryCall, null, options, request);
 | 
	
		
			
				|  |  |        }
 | 
	
	
		
			
				|  | @@ -397,9 +397,9 @@ namespace Grpc.Testing {
 | 
	
		
			
				|  |  |        /// <param name="deadline">An optional deadline for the call. The call will be cancelled if deadline is hit.</param>
 | 
	
		
			
				|  |  |        /// <param name="cancellationToken">An optional token for canceling the call.</param>
 | 
	
		
			
				|  |  |        /// <returns>The call object.</returns>
 | 
	
		
			
				|  |  | -      public virtual AsyncServerStreamingCall<global::Grpc.Testing.StreamingOutputCallResponse> StreamingOutputCall(global::Grpc.Testing.StreamingOutputCallRequest request, Metadata headers = null, DateTime? deadline = null, CancellationToken cancellationToken = default(CancellationToken))
 | 
	
		
			
				|  |  | +      public virtual grpc::AsyncServerStreamingCall<global::Grpc.Testing.StreamingOutputCallResponse> StreamingOutputCall(global::Grpc.Testing.StreamingOutputCallRequest request, grpc::Metadata headers = null, DateTime? deadline = null, CancellationToken cancellationToken = default(CancellationToken))
 | 
	
		
			
				|  |  |        {
 | 
	
		
			
				|  |  | -        return StreamingOutputCall(request, new CallOptions(headers, deadline, cancellationToken));
 | 
	
		
			
				|  |  | +        return StreamingOutputCall(request, new grpc::CallOptions(headers, deadline, cancellationToken));
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  |        /// <summary>
 | 
	
		
			
				|  |  |        /// One request followed by a sequence of responses (streamed download).
 | 
	
	
		
			
				|  | @@ -408,7 +408,7 @@ namespace Grpc.Testing {
 | 
	
		
			
				|  |  |        /// <param name="request">The request to send to the server.</param>
 | 
	
		
			
				|  |  |        /// <param name="options">The options for the call.</param>
 | 
	
		
			
				|  |  |        /// <returns>The call object.</returns>
 | 
	
		
			
				|  |  | -      public virtual AsyncServerStreamingCall<global::Grpc.Testing.StreamingOutputCallResponse> StreamingOutputCall(global::Grpc.Testing.StreamingOutputCallRequest request, CallOptions options)
 | 
	
		
			
				|  |  | +      public virtual grpc::AsyncServerStreamingCall<global::Grpc.Testing.StreamingOutputCallResponse> StreamingOutputCall(global::Grpc.Testing.StreamingOutputCallRequest request, grpc::CallOptions options)
 | 
	
		
			
				|  |  |        {
 | 
	
		
			
				|  |  |          return CallInvoker.AsyncServerStreamingCall(__Method_StreamingOutputCall, null, options, request);
 | 
	
		
			
				|  |  |        }
 | 
	
	
		
			
				|  | @@ -420,9 +420,9 @@ namespace Grpc.Testing {
 | 
	
		
			
				|  |  |        /// <param name="deadline">An optional deadline for the call. The call will be cancelled if deadline is hit.</param>
 | 
	
		
			
				|  |  |        /// <param name="cancellationToken">An optional token for canceling the call.</param>
 | 
	
		
			
				|  |  |        /// <returns>The call object.</returns>
 | 
	
		
			
				|  |  | -      public virtual AsyncClientStreamingCall<global::Grpc.Testing.StreamingInputCallRequest, global::Grpc.Testing.StreamingInputCallResponse> StreamingInputCall(Metadata headers = null, DateTime? deadline = null, CancellationToken cancellationToken = default(CancellationToken))
 | 
	
		
			
				|  |  | +      public virtual grpc::AsyncClientStreamingCall<global::Grpc.Testing.StreamingInputCallRequest, global::Grpc.Testing.StreamingInputCallResponse> StreamingInputCall(grpc::Metadata headers = null, DateTime? deadline = null, CancellationToken cancellationToken = default(CancellationToken))
 | 
	
		
			
				|  |  |        {
 | 
	
		
			
				|  |  | -        return StreamingInputCall(new CallOptions(headers, deadline, cancellationToken));
 | 
	
		
			
				|  |  | +        return StreamingInputCall(new grpc::CallOptions(headers, deadline, cancellationToken));
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  |        /// <summary>
 | 
	
		
			
				|  |  |        /// A sequence of requests followed by one response (streamed upload).
 | 
	
	
		
			
				|  | @@ -430,7 +430,7 @@ namespace Grpc.Testing {
 | 
	
		
			
				|  |  |        /// </summary>
 | 
	
		
			
				|  |  |        /// <param name="options">The options for the call.</param>
 | 
	
		
			
				|  |  |        /// <returns>The call object.</returns>
 | 
	
		
			
				|  |  | -      public virtual AsyncClientStreamingCall<global::Grpc.Testing.StreamingInputCallRequest, global::Grpc.Testing.StreamingInputCallResponse> StreamingInputCall(CallOptions options)
 | 
	
		
			
				|  |  | +      public virtual grpc::AsyncClientStreamingCall<global::Grpc.Testing.StreamingInputCallRequest, global::Grpc.Testing.StreamingInputCallResponse> StreamingInputCall(grpc::CallOptions options)
 | 
	
		
			
				|  |  |        {
 | 
	
		
			
				|  |  |          return CallInvoker.AsyncClientStreamingCall(__Method_StreamingInputCall, null, options);
 | 
	
		
			
				|  |  |        }
 | 
	
	
		
			
				|  | @@ -443,9 +443,9 @@ namespace Grpc.Testing {
 | 
	
		
			
				|  |  |        /// <param name="deadline">An optional deadline for the call. The call will be cancelled if deadline is hit.</param>
 | 
	
		
			
				|  |  |        /// <param name="cancellationToken">An optional token for canceling the call.</param>
 | 
	
		
			
				|  |  |        /// <returns>The call object.</returns>
 | 
	
		
			
				|  |  | -      public virtual AsyncDuplexStreamingCall<global::Grpc.Testing.StreamingOutputCallRequest, global::Grpc.Testing.StreamingOutputCallResponse> FullDuplexCall(Metadata headers = null, DateTime? deadline = null, CancellationToken cancellationToken = default(CancellationToken))
 | 
	
		
			
				|  |  | +      public virtual grpc::AsyncDuplexStreamingCall<global::Grpc.Testing.StreamingOutputCallRequest, global::Grpc.Testing.StreamingOutputCallResponse> FullDuplexCall(grpc::Metadata headers = null, DateTime? deadline = null, CancellationToken cancellationToken = default(CancellationToken))
 | 
	
		
			
				|  |  |        {
 | 
	
		
			
				|  |  | -        return FullDuplexCall(new CallOptions(headers, deadline, cancellationToken));
 | 
	
		
			
				|  |  | +        return FullDuplexCall(new grpc::CallOptions(headers, deadline, cancellationToken));
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  |        /// <summary>
 | 
	
		
			
				|  |  |        /// A sequence of requests with each request served by the server immediately.
 | 
	
	
		
			
				|  | @@ -454,7 +454,7 @@ namespace Grpc.Testing {
 | 
	
		
			
				|  |  |        /// </summary>
 | 
	
		
			
				|  |  |        /// <param name="options">The options for the call.</param>
 | 
	
		
			
				|  |  |        /// <returns>The call object.</returns>
 | 
	
		
			
				|  |  | -      public virtual AsyncDuplexStreamingCall<global::Grpc.Testing.StreamingOutputCallRequest, global::Grpc.Testing.StreamingOutputCallResponse> FullDuplexCall(CallOptions options)
 | 
	
		
			
				|  |  | +      public virtual grpc::AsyncDuplexStreamingCall<global::Grpc.Testing.StreamingOutputCallRequest, global::Grpc.Testing.StreamingOutputCallResponse> FullDuplexCall(grpc::CallOptions options)
 | 
	
		
			
				|  |  |        {
 | 
	
		
			
				|  |  |          return CallInvoker.AsyncDuplexStreamingCall(__Method_FullDuplexCall, null, options);
 | 
	
		
			
				|  |  |        }
 | 
	
	
		
			
				|  | @@ -468,9 +468,9 @@ namespace Grpc.Testing {
 | 
	
		
			
				|  |  |        /// <param name="deadline">An optional deadline for the call. The call will be cancelled if deadline is hit.</param>
 | 
	
		
			
				|  |  |        /// <param name="cancellationToken">An optional token for canceling the call.</param>
 | 
	
		
			
				|  |  |        /// <returns>The call object.</returns>
 | 
	
		
			
				|  |  | -      public virtual AsyncDuplexStreamingCall<global::Grpc.Testing.StreamingOutputCallRequest, global::Grpc.Testing.StreamingOutputCallResponse> HalfDuplexCall(Metadata headers = null, DateTime? deadline = null, CancellationToken cancellationToken = default(CancellationToken))
 | 
	
		
			
				|  |  | +      public virtual grpc::AsyncDuplexStreamingCall<global::Grpc.Testing.StreamingOutputCallRequest, global::Grpc.Testing.StreamingOutputCallResponse> HalfDuplexCall(grpc::Metadata headers = null, DateTime? deadline = null, CancellationToken cancellationToken = default(CancellationToken))
 | 
	
		
			
				|  |  |        {
 | 
	
		
			
				|  |  | -        return HalfDuplexCall(new CallOptions(headers, deadline, cancellationToken));
 | 
	
		
			
				|  |  | +        return HalfDuplexCall(new grpc::CallOptions(headers, deadline, cancellationToken));
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  |        /// <summary>
 | 
	
		
			
				|  |  |        /// A sequence of requests followed by a sequence of responses.
 | 
	
	
		
			
				|  | @@ -480,7 +480,7 @@ namespace Grpc.Testing {
 | 
	
		
			
				|  |  |        /// </summary>
 | 
	
		
			
				|  |  |        /// <param name="options">The options for the call.</param>
 | 
	
		
			
				|  |  |        /// <returns>The call object.</returns>
 | 
	
		
			
				|  |  | -      public virtual AsyncDuplexStreamingCall<global::Grpc.Testing.StreamingOutputCallRequest, global::Grpc.Testing.StreamingOutputCallResponse> HalfDuplexCall(CallOptions options)
 | 
	
		
			
				|  |  | +      public virtual grpc::AsyncDuplexStreamingCall<global::Grpc.Testing.StreamingOutputCallRequest, global::Grpc.Testing.StreamingOutputCallResponse> HalfDuplexCall(grpc::CallOptions options)
 | 
	
		
			
				|  |  |        {
 | 
	
		
			
				|  |  |          return CallInvoker.AsyncDuplexStreamingCall(__Method_HalfDuplexCall, null, options);
 | 
	
		
			
				|  |  |        }
 | 
	
	
		
			
				|  | @@ -493,9 +493,9 @@ namespace Grpc.Testing {
 | 
	
		
			
				|  |  |        /// <param name="deadline">An optional deadline for the call. The call will be cancelled if deadline is hit.</param>
 | 
	
		
			
				|  |  |        /// <param name="cancellationToken">An optional token for canceling the call.</param>
 | 
	
		
			
				|  |  |        /// <returns>The response received from the server.</returns>
 | 
	
		
			
				|  |  | -      public virtual global::Grpc.Testing.Empty UnimplementedCall(global::Grpc.Testing.Empty request, Metadata headers = null, DateTime? deadline = null, CancellationToken cancellationToken = default(CancellationToken))
 | 
	
		
			
				|  |  | +      public virtual global::Grpc.Testing.Empty UnimplementedCall(global::Grpc.Testing.Empty request, grpc::Metadata headers = null, DateTime? deadline = null, CancellationToken cancellationToken = default(CancellationToken))
 | 
	
		
			
				|  |  |        {
 | 
	
		
			
				|  |  | -        return UnimplementedCall(request, new CallOptions(headers, deadline, cancellationToken));
 | 
	
		
			
				|  |  | +        return UnimplementedCall(request, new grpc::CallOptions(headers, deadline, cancellationToken));
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  |        /// <summary>
 | 
	
		
			
				|  |  |        /// The test server will not implement this method. It will be used
 | 
	
	
		
			
				|  | @@ -504,7 +504,7 @@ namespace Grpc.Testing {
 | 
	
		
			
				|  |  |        /// <param name="request">The request to send to the server.</param>
 | 
	
		
			
				|  |  |        /// <param name="options">The options for the call.</param>
 | 
	
		
			
				|  |  |        /// <returns>The response received from the server.</returns>
 | 
	
		
			
				|  |  | -      public virtual global::Grpc.Testing.Empty UnimplementedCall(global::Grpc.Testing.Empty request, CallOptions options)
 | 
	
		
			
				|  |  | +      public virtual global::Grpc.Testing.Empty UnimplementedCall(global::Grpc.Testing.Empty request, grpc::CallOptions options)
 | 
	
		
			
				|  |  |        {
 | 
	
		
			
				|  |  |          return CallInvoker.BlockingUnaryCall(__Method_UnimplementedCall, null, options, request);
 | 
	
		
			
				|  |  |        }
 | 
	
	
		
			
				|  | @@ -517,9 +517,9 @@ namespace Grpc.Testing {
 | 
	
		
			
				|  |  |        /// <param name="deadline">An optional deadline for the call. The call will be cancelled if deadline is hit.</param>
 | 
	
		
			
				|  |  |        /// <param name="cancellationToken">An optional token for canceling the call.</param>
 | 
	
		
			
				|  |  |        /// <returns>The call object.</returns>
 | 
	
		
			
				|  |  | -      public virtual AsyncUnaryCall<global::Grpc.Testing.Empty> UnimplementedCallAsync(global::Grpc.Testing.Empty request, Metadata headers = null, DateTime? deadline = null, CancellationToken cancellationToken = default(CancellationToken))
 | 
	
		
			
				|  |  | +      public virtual grpc::AsyncUnaryCall<global::Grpc.Testing.Empty> UnimplementedCallAsync(global::Grpc.Testing.Empty request, grpc::Metadata headers = null, DateTime? deadline = null, CancellationToken cancellationToken = default(CancellationToken))
 | 
	
		
			
				|  |  |        {
 | 
	
		
			
				|  |  | -        return UnimplementedCallAsync(request, new CallOptions(headers, deadline, cancellationToken));
 | 
	
		
			
				|  |  | +        return UnimplementedCallAsync(request, new grpc::CallOptions(headers, deadline, cancellationToken));
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  |        /// <summary>
 | 
	
		
			
				|  |  |        /// The test server will not implement this method. It will be used
 | 
	
	
		
			
				|  | @@ -528,7 +528,7 @@ namespace Grpc.Testing {
 | 
	
		
			
				|  |  |        /// <param name="request">The request to send to the server.</param>
 | 
	
		
			
				|  |  |        /// <param name="options">The options for the call.</param>
 | 
	
		
			
				|  |  |        /// <returns>The call object.</returns>
 | 
	
		
			
				|  |  | -      public virtual AsyncUnaryCall<global::Grpc.Testing.Empty> UnimplementedCallAsync(global::Grpc.Testing.Empty request, CallOptions options)
 | 
	
		
			
				|  |  | +      public virtual grpc::AsyncUnaryCall<global::Grpc.Testing.Empty> UnimplementedCallAsync(global::Grpc.Testing.Empty request, grpc::CallOptions options)
 | 
	
		
			
				|  |  |        {
 | 
	
		
			
				|  |  |          return CallInvoker.AsyncUnaryCall(__Method_UnimplementedCall, null, options, request);
 | 
	
		
			
				|  |  |        }
 | 
	
	
		
			
				|  | @@ -541,9 +541,9 @@ namespace Grpc.Testing {
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      /// <summary>Creates service definition that can be registered with a server</summary>
 | 
	
		
			
				|  |  |      /// <param name="serviceImpl">An object implementing the server-side handling logic.</param>
 | 
	
		
			
				|  |  | -    public static ServerServiceDefinition BindService(TestServiceBase serviceImpl)
 | 
	
		
			
				|  |  | +    public static grpc::ServerServiceDefinition BindService(TestServiceBase serviceImpl)
 | 
	
		
			
				|  |  |      {
 | 
	
		
			
				|  |  | -      return ServerServiceDefinition.CreateBuilder()
 | 
	
		
			
				|  |  | +      return grpc::ServerServiceDefinition.CreateBuilder()
 | 
	
		
			
				|  |  |            .AddMethod(__Method_EmptyCall, serviceImpl.EmptyCall)
 | 
	
		
			
				|  |  |            .AddMethod(__Method_UnaryCall, serviceImpl.UnaryCall)
 | 
	
		
			
				|  |  |            .AddMethod(__Method_CacheableUnaryCall, serviceImpl.CacheableUnaryCall)
 | 
	
	
		
			
				|  | @@ -563,10 +563,10 @@ namespace Grpc.Testing {
 | 
	
		
			
				|  |  |    {
 | 
	
		
			
				|  |  |      static readonly string __ServiceName = "grpc.testing.UnimplementedService";
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -    static readonly Marshaller<global::Grpc.Testing.Empty> __Marshaller_Empty = Marshallers.Create((arg) => global::Google.Protobuf.MessageExtensions.ToByteArray(arg), global::Grpc.Testing.Empty.Parser.ParseFrom);
 | 
	
		
			
				|  |  | +    static readonly grpc::Marshaller<global::Grpc.Testing.Empty> __Marshaller_Empty = grpc::Marshallers.Create((arg) => global::Google.Protobuf.MessageExtensions.ToByteArray(arg), global::Grpc.Testing.Empty.Parser.ParseFrom);
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -    static readonly Method<global::Grpc.Testing.Empty, global::Grpc.Testing.Empty> __Method_UnimplementedCall = new Method<global::Grpc.Testing.Empty, global::Grpc.Testing.Empty>(
 | 
	
		
			
				|  |  | -        MethodType.Unary,
 | 
	
		
			
				|  |  | +    static readonly grpc::Method<global::Grpc.Testing.Empty, global::Grpc.Testing.Empty> __Method_UnimplementedCall = new grpc::Method<global::Grpc.Testing.Empty, global::Grpc.Testing.Empty>(
 | 
	
		
			
				|  |  | +        grpc::MethodType.Unary,
 | 
	
		
			
				|  |  |          __ServiceName,
 | 
	
		
			
				|  |  |          "UnimplementedCall",
 | 
	
		
			
				|  |  |          __Marshaller_Empty,
 | 
	
	
		
			
				|  | @@ -587,24 +587,24 @@ namespace Grpc.Testing {
 | 
	
		
			
				|  |  |        /// <param name="request">The request received from the client.</param>
 | 
	
		
			
				|  |  |        /// <param name="context">The context of the server-side call handler being invoked.</param>
 | 
	
		
			
				|  |  |        /// <returns>The response to send back to the client (wrapped by a task).</returns>
 | 
	
		
			
				|  |  | -      public virtual global::System.Threading.Tasks.Task<global::Grpc.Testing.Empty> UnimplementedCall(global::Grpc.Testing.Empty request, ServerCallContext context)
 | 
	
		
			
				|  |  | +      public virtual global::System.Threading.Tasks.Task<global::Grpc.Testing.Empty> UnimplementedCall(global::Grpc.Testing.Empty request, grpc::ServerCallContext context)
 | 
	
		
			
				|  |  |        {
 | 
	
		
			
				|  |  | -        throw new RpcException(new Status(StatusCode.Unimplemented, ""));
 | 
	
		
			
				|  |  | +        throw new grpc::RpcException(new grpc::Status(grpc::StatusCode.Unimplemented, ""));
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      /// <summary>Client for UnimplementedService</summary>
 | 
	
		
			
				|  |  | -    public partial class UnimplementedServiceClient : ClientBase<UnimplementedServiceClient>
 | 
	
		
			
				|  |  | +    public partial class UnimplementedServiceClient : grpc::ClientBase<UnimplementedServiceClient>
 | 
	
		
			
				|  |  |      {
 | 
	
		
			
				|  |  |        /// <summary>Creates a new client for UnimplementedService</summary>
 | 
	
		
			
				|  |  |        /// <param name="channel">The channel to use to make remote calls.</param>
 | 
	
		
			
				|  |  | -      public UnimplementedServiceClient(Channel channel) : base(channel)
 | 
	
		
			
				|  |  | +      public UnimplementedServiceClient(grpc::Channel channel) : base(channel)
 | 
	
		
			
				|  |  |        {
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  |        /// <summary>Creates a new client for UnimplementedService that uses a custom <c>CallInvoker</c>.</summary>
 | 
	
		
			
				|  |  |        /// <param name="callInvoker">The callInvoker to use to make remote calls.</param>
 | 
	
		
			
				|  |  | -      public UnimplementedServiceClient(CallInvoker callInvoker) : base(callInvoker)
 | 
	
		
			
				|  |  | +      public UnimplementedServiceClient(grpc::CallInvoker callInvoker) : base(callInvoker)
 | 
	
		
			
				|  |  |        {
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  |        /// <summary>Protected parameterless constructor to allow creation of test doubles.</summary>
 | 
	
	
		
			
				|  | @@ -625,9 +625,9 @@ namespace Grpc.Testing {
 | 
	
		
			
				|  |  |        /// <param name="deadline">An optional deadline for the call. The call will be cancelled if deadline is hit.</param>
 | 
	
		
			
				|  |  |        /// <param name="cancellationToken">An optional token for canceling the call.</param>
 | 
	
		
			
				|  |  |        /// <returns>The response received from the server.</returns>
 | 
	
		
			
				|  |  | -      public virtual global::Grpc.Testing.Empty UnimplementedCall(global::Grpc.Testing.Empty request, Metadata headers = null, DateTime? deadline = null, CancellationToken cancellationToken = default(CancellationToken))
 | 
	
		
			
				|  |  | +      public virtual global::Grpc.Testing.Empty UnimplementedCall(global::Grpc.Testing.Empty request, grpc::Metadata headers = null, DateTime? deadline = null, CancellationToken cancellationToken = default(CancellationToken))
 | 
	
		
			
				|  |  |        {
 | 
	
		
			
				|  |  | -        return UnimplementedCall(request, new CallOptions(headers, deadline, cancellationToken));
 | 
	
		
			
				|  |  | +        return UnimplementedCall(request, new grpc::CallOptions(headers, deadline, cancellationToken));
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  |        /// <summary>
 | 
	
		
			
				|  |  |        /// A call that no server should implement
 | 
	
	
		
			
				|  | @@ -635,7 +635,7 @@ namespace Grpc.Testing {
 | 
	
		
			
				|  |  |        /// <param name="request">The request to send to the server.</param>
 | 
	
		
			
				|  |  |        /// <param name="options">The options for the call.</param>
 | 
	
		
			
				|  |  |        /// <returns>The response received from the server.</returns>
 | 
	
		
			
				|  |  | -      public virtual global::Grpc.Testing.Empty UnimplementedCall(global::Grpc.Testing.Empty request, CallOptions options)
 | 
	
		
			
				|  |  | +      public virtual global::Grpc.Testing.Empty UnimplementedCall(global::Grpc.Testing.Empty request, grpc::CallOptions options)
 | 
	
		
			
				|  |  |        {
 | 
	
		
			
				|  |  |          return CallInvoker.BlockingUnaryCall(__Method_UnimplementedCall, null, options, request);
 | 
	
		
			
				|  |  |        }
 | 
	
	
		
			
				|  | @@ -647,9 +647,9 @@ namespace Grpc.Testing {
 | 
	
		
			
				|  |  |        /// <param name="deadline">An optional deadline for the call. The call will be cancelled if deadline is hit.</param>
 | 
	
		
			
				|  |  |        /// <param name="cancellationToken">An optional token for canceling the call.</param>
 | 
	
		
			
				|  |  |        /// <returns>The call object.</returns>
 | 
	
		
			
				|  |  | -      public virtual AsyncUnaryCall<global::Grpc.Testing.Empty> UnimplementedCallAsync(global::Grpc.Testing.Empty request, Metadata headers = null, DateTime? deadline = null, CancellationToken cancellationToken = default(CancellationToken))
 | 
	
		
			
				|  |  | +      public virtual grpc::AsyncUnaryCall<global::Grpc.Testing.Empty> UnimplementedCallAsync(global::Grpc.Testing.Empty request, grpc::Metadata headers = null, DateTime? deadline = null, CancellationToken cancellationToken = default(CancellationToken))
 | 
	
		
			
				|  |  |        {
 | 
	
		
			
				|  |  | -        return UnimplementedCallAsync(request, new CallOptions(headers, deadline, cancellationToken));
 | 
	
		
			
				|  |  | +        return UnimplementedCallAsync(request, new grpc::CallOptions(headers, deadline, cancellationToken));
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  |        /// <summary>
 | 
	
		
			
				|  |  |        /// A call that no server should implement
 | 
	
	
		
			
				|  | @@ -657,7 +657,7 @@ namespace Grpc.Testing {
 | 
	
		
			
				|  |  |        /// <param name="request">The request to send to the server.</param>
 | 
	
		
			
				|  |  |        /// <param name="options">The options for the call.</param>
 | 
	
		
			
				|  |  |        /// <returns>The call object.</returns>
 | 
	
		
			
				|  |  | -      public virtual AsyncUnaryCall<global::Grpc.Testing.Empty> UnimplementedCallAsync(global::Grpc.Testing.Empty request, CallOptions options)
 | 
	
		
			
				|  |  | +      public virtual grpc::AsyncUnaryCall<global::Grpc.Testing.Empty> UnimplementedCallAsync(global::Grpc.Testing.Empty request, grpc::CallOptions options)
 | 
	
		
			
				|  |  |        {
 | 
	
		
			
				|  |  |          return CallInvoker.AsyncUnaryCall(__Method_UnimplementedCall, null, options, request);
 | 
	
		
			
				|  |  |        }
 | 
	
	
		
			
				|  | @@ -670,9 +670,9 @@ namespace Grpc.Testing {
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      /// <summary>Creates service definition that can be registered with a server</summary>
 | 
	
		
			
				|  |  |      /// <param name="serviceImpl">An object implementing the server-side handling logic.</param>
 | 
	
		
			
				|  |  | -    public static ServerServiceDefinition BindService(UnimplementedServiceBase serviceImpl)
 | 
	
		
			
				|  |  | +    public static grpc::ServerServiceDefinition BindService(UnimplementedServiceBase serviceImpl)
 | 
	
		
			
				|  |  |      {
 | 
	
		
			
				|  |  | -      return ServerServiceDefinition.CreateBuilder()
 | 
	
		
			
				|  |  | +      return grpc::ServerServiceDefinition.CreateBuilder()
 | 
	
		
			
				|  |  |            .AddMethod(__Method_UnimplementedCall, serviceImpl.UnimplementedCall).Build();
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |  
 | 
	
	
		
			
				|  | @@ -684,19 +684,19 @@ namespace Grpc.Testing {
 | 
	
		
			
				|  |  |    {
 | 
	
		
			
				|  |  |      static readonly string __ServiceName = "grpc.testing.ReconnectService";
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -    static readonly Marshaller<global::Grpc.Testing.ReconnectParams> __Marshaller_ReconnectParams = Marshallers.Create((arg) => global::Google.Protobuf.MessageExtensions.ToByteArray(arg), global::Grpc.Testing.ReconnectParams.Parser.ParseFrom);
 | 
	
		
			
				|  |  | -    static readonly Marshaller<global::Grpc.Testing.Empty> __Marshaller_Empty = Marshallers.Create((arg) => global::Google.Protobuf.MessageExtensions.ToByteArray(arg), global::Grpc.Testing.Empty.Parser.ParseFrom);
 | 
	
		
			
				|  |  | -    static readonly Marshaller<global::Grpc.Testing.ReconnectInfo> __Marshaller_ReconnectInfo = Marshallers.Create((arg) => global::Google.Protobuf.MessageExtensions.ToByteArray(arg), global::Grpc.Testing.ReconnectInfo.Parser.ParseFrom);
 | 
	
		
			
				|  |  | +    static readonly grpc::Marshaller<global::Grpc.Testing.ReconnectParams> __Marshaller_ReconnectParams = grpc::Marshallers.Create((arg) => global::Google.Protobuf.MessageExtensions.ToByteArray(arg), global::Grpc.Testing.ReconnectParams.Parser.ParseFrom);
 | 
	
		
			
				|  |  | +    static readonly grpc::Marshaller<global::Grpc.Testing.Empty> __Marshaller_Empty = grpc::Marshallers.Create((arg) => global::Google.Protobuf.MessageExtensions.ToByteArray(arg), global::Grpc.Testing.Empty.Parser.ParseFrom);
 | 
	
		
			
				|  |  | +    static readonly grpc::Marshaller<global::Grpc.Testing.ReconnectInfo> __Marshaller_ReconnectInfo = grpc::Marshallers.Create((arg) => global::Google.Protobuf.MessageExtensions.ToByteArray(arg), global::Grpc.Testing.ReconnectInfo.Parser.ParseFrom);
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -    static readonly Method<global::Grpc.Testing.ReconnectParams, global::Grpc.Testing.Empty> __Method_Start = new Method<global::Grpc.Testing.ReconnectParams, global::Grpc.Testing.Empty>(
 | 
	
		
			
				|  |  | -        MethodType.Unary,
 | 
	
		
			
				|  |  | +    static readonly grpc::Method<global::Grpc.Testing.ReconnectParams, global::Grpc.Testing.Empty> __Method_Start = new grpc::Method<global::Grpc.Testing.ReconnectParams, global::Grpc.Testing.Empty>(
 | 
	
		
			
				|  |  | +        grpc::MethodType.Unary,
 | 
	
		
			
				|  |  |          __ServiceName,
 | 
	
		
			
				|  |  |          "Start",
 | 
	
		
			
				|  |  |          __Marshaller_ReconnectParams,
 | 
	
		
			
				|  |  |          __Marshaller_Empty);
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -    static readonly Method<global::Grpc.Testing.Empty, global::Grpc.Testing.ReconnectInfo> __Method_Stop = new Method<global::Grpc.Testing.Empty, global::Grpc.Testing.ReconnectInfo>(
 | 
	
		
			
				|  |  | -        MethodType.Unary,
 | 
	
		
			
				|  |  | +    static readonly grpc::Method<global::Grpc.Testing.Empty, global::Grpc.Testing.ReconnectInfo> __Method_Stop = new grpc::Method<global::Grpc.Testing.Empty, global::Grpc.Testing.ReconnectInfo>(
 | 
	
		
			
				|  |  | +        grpc::MethodType.Unary,
 | 
	
		
			
				|  |  |          __ServiceName,
 | 
	
		
			
				|  |  |          "Stop",
 | 
	
		
			
				|  |  |          __Marshaller_Empty,
 | 
	
	
		
			
				|  | @@ -711,29 +711,29 @@ namespace Grpc.Testing {
 | 
	
		
			
				|  |  |      /// <summary>Base class for server-side implementations of ReconnectService</summary>
 | 
	
		
			
				|  |  |      public abstract partial class ReconnectServiceBase
 | 
	
		
			
				|  |  |      {
 | 
	
		
			
				|  |  | -      public virtual global::System.Threading.Tasks.Task<global::Grpc.Testing.Empty> Start(global::Grpc.Testing.ReconnectParams request, ServerCallContext context)
 | 
	
		
			
				|  |  | +      public virtual global::System.Threading.Tasks.Task<global::Grpc.Testing.Empty> Start(global::Grpc.Testing.ReconnectParams request, grpc::ServerCallContext context)
 | 
	
		
			
				|  |  |        {
 | 
	
		
			
				|  |  | -        throw new RpcException(new Status(StatusCode.Unimplemented, ""));
 | 
	
		
			
				|  |  | +        throw new grpc::RpcException(new grpc::Status(grpc::StatusCode.Unimplemented, ""));
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -      public virtual global::System.Threading.Tasks.Task<global::Grpc.Testing.ReconnectInfo> Stop(global::Grpc.Testing.Empty request, ServerCallContext context)
 | 
	
		
			
				|  |  | +      public virtual global::System.Threading.Tasks.Task<global::Grpc.Testing.ReconnectInfo> Stop(global::Grpc.Testing.Empty request, grpc::ServerCallContext context)
 | 
	
		
			
				|  |  |        {
 | 
	
		
			
				|  |  | -        throw new RpcException(new Status(StatusCode.Unimplemented, ""));
 | 
	
		
			
				|  |  | +        throw new grpc::RpcException(new grpc::Status(grpc::StatusCode.Unimplemented, ""));
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      /// <summary>Client for ReconnectService</summary>
 | 
	
		
			
				|  |  | -    public partial class ReconnectServiceClient : ClientBase<ReconnectServiceClient>
 | 
	
		
			
				|  |  | +    public partial class ReconnectServiceClient : grpc::ClientBase<ReconnectServiceClient>
 | 
	
		
			
				|  |  |      {
 | 
	
		
			
				|  |  |        /// <summary>Creates a new client for ReconnectService</summary>
 | 
	
		
			
				|  |  |        /// <param name="channel">The channel to use to make remote calls.</param>
 | 
	
		
			
				|  |  | -      public ReconnectServiceClient(Channel channel) : base(channel)
 | 
	
		
			
				|  |  | +      public ReconnectServiceClient(grpc::Channel channel) : base(channel)
 | 
	
		
			
				|  |  |        {
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  |        /// <summary>Creates a new client for ReconnectService that uses a custom <c>CallInvoker</c>.</summary>
 | 
	
		
			
				|  |  |        /// <param name="callInvoker">The callInvoker to use to make remote calls.</param>
 | 
	
		
			
				|  |  | -      public ReconnectServiceClient(CallInvoker callInvoker) : base(callInvoker)
 | 
	
		
			
				|  |  | +      public ReconnectServiceClient(grpc::CallInvoker callInvoker) : base(callInvoker)
 | 
	
		
			
				|  |  |        {
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  |        /// <summary>Protected parameterless constructor to allow creation of test doubles.</summary>
 | 
	
	
		
			
				|  | @@ -746,35 +746,35 @@ namespace Grpc.Testing {
 | 
	
		
			
				|  |  |        {
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -      public virtual global::Grpc.Testing.Empty Start(global::Grpc.Testing.ReconnectParams request, Metadata headers = null, DateTime? deadline = null, CancellationToken cancellationToken = default(CancellationToken))
 | 
	
		
			
				|  |  | +      public virtual global::Grpc.Testing.Empty Start(global::Grpc.Testing.ReconnectParams request, grpc::Metadata headers = null, DateTime? deadline = null, CancellationToken cancellationToken = default(CancellationToken))
 | 
	
		
			
				|  |  |        {
 | 
	
		
			
				|  |  | -        return Start(request, new CallOptions(headers, deadline, cancellationToken));
 | 
	
		
			
				|  |  | +        return Start(request, new grpc::CallOptions(headers, deadline, cancellationToken));
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  | -      public virtual global::Grpc.Testing.Empty Start(global::Grpc.Testing.ReconnectParams request, CallOptions options)
 | 
	
		
			
				|  |  | +      public virtual global::Grpc.Testing.Empty Start(global::Grpc.Testing.ReconnectParams request, grpc::CallOptions options)
 | 
	
		
			
				|  |  |        {
 | 
	
		
			
				|  |  |          return CallInvoker.BlockingUnaryCall(__Method_Start, null, options, request);
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  | -      public virtual AsyncUnaryCall<global::Grpc.Testing.Empty> StartAsync(global::Grpc.Testing.ReconnectParams request, Metadata headers = null, DateTime? deadline = null, CancellationToken cancellationToken = default(CancellationToken))
 | 
	
		
			
				|  |  | +      public virtual grpc::AsyncUnaryCall<global::Grpc.Testing.Empty> StartAsync(global::Grpc.Testing.ReconnectParams request, grpc::Metadata headers = null, DateTime? deadline = null, CancellationToken cancellationToken = default(CancellationToken))
 | 
	
		
			
				|  |  |        {
 | 
	
		
			
				|  |  | -        return StartAsync(request, new CallOptions(headers, deadline, cancellationToken));
 | 
	
		
			
				|  |  | +        return StartAsync(request, new grpc::CallOptions(headers, deadline, cancellationToken));
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  | -      public virtual AsyncUnaryCall<global::Grpc.Testing.Empty> StartAsync(global::Grpc.Testing.ReconnectParams request, CallOptions options)
 | 
	
		
			
				|  |  | +      public virtual grpc::AsyncUnaryCall<global::Grpc.Testing.Empty> StartAsync(global::Grpc.Testing.ReconnectParams request, grpc::CallOptions options)
 | 
	
		
			
				|  |  |        {
 | 
	
		
			
				|  |  |          return CallInvoker.AsyncUnaryCall(__Method_Start, null, options, request);
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  | -      public virtual global::Grpc.Testing.ReconnectInfo Stop(global::Grpc.Testing.Empty request, Metadata headers = null, DateTime? deadline = null, CancellationToken cancellationToken = default(CancellationToken))
 | 
	
		
			
				|  |  | +      public virtual global::Grpc.Testing.ReconnectInfo Stop(global::Grpc.Testing.Empty request, grpc::Metadata headers = null, DateTime? deadline = null, CancellationToken cancellationToken = default(CancellationToken))
 | 
	
		
			
				|  |  |        {
 | 
	
		
			
				|  |  | -        return Stop(request, new CallOptions(headers, deadline, cancellationToken));
 | 
	
		
			
				|  |  | +        return Stop(request, new grpc::CallOptions(headers, deadline, cancellationToken));
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  | -      public virtual global::Grpc.Testing.ReconnectInfo Stop(global::Grpc.Testing.Empty request, CallOptions options)
 | 
	
		
			
				|  |  | +      public virtual global::Grpc.Testing.ReconnectInfo Stop(global::Grpc.Testing.Empty request, grpc::CallOptions options)
 | 
	
		
			
				|  |  |        {
 | 
	
		
			
				|  |  |          return CallInvoker.BlockingUnaryCall(__Method_Stop, null, options, request);
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  | -      public virtual AsyncUnaryCall<global::Grpc.Testing.ReconnectInfo> StopAsync(global::Grpc.Testing.Empty request, Metadata headers = null, DateTime? deadline = null, CancellationToken cancellationToken = default(CancellationToken))
 | 
	
		
			
				|  |  | +      public virtual grpc::AsyncUnaryCall<global::Grpc.Testing.ReconnectInfo> StopAsync(global::Grpc.Testing.Empty request, grpc::Metadata headers = null, DateTime? deadline = null, CancellationToken cancellationToken = default(CancellationToken))
 | 
	
		
			
				|  |  |        {
 | 
	
		
			
				|  |  | -        return StopAsync(request, new CallOptions(headers, deadline, cancellationToken));
 | 
	
		
			
				|  |  | +        return StopAsync(request, new grpc::CallOptions(headers, deadline, cancellationToken));
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  | -      public virtual AsyncUnaryCall<global::Grpc.Testing.ReconnectInfo> StopAsync(global::Grpc.Testing.Empty request, CallOptions options)
 | 
	
		
			
				|  |  | +      public virtual grpc::AsyncUnaryCall<global::Grpc.Testing.ReconnectInfo> StopAsync(global::Grpc.Testing.Empty request, grpc::CallOptions options)
 | 
	
		
			
				|  |  |        {
 | 
	
		
			
				|  |  |          return CallInvoker.AsyncUnaryCall(__Method_Stop, null, options, request);
 | 
	
		
			
				|  |  |        }
 | 
	
	
		
			
				|  | @@ -787,9 +787,9 @@ namespace Grpc.Testing {
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      /// <summary>Creates service definition that can be registered with a server</summary>
 | 
	
		
			
				|  |  |      /// <param name="serviceImpl">An object implementing the server-side handling logic.</param>
 | 
	
		
			
				|  |  | -    public static ServerServiceDefinition BindService(ReconnectServiceBase serviceImpl)
 | 
	
		
			
				|  |  | +    public static grpc::ServerServiceDefinition BindService(ReconnectServiceBase serviceImpl)
 | 
	
		
			
				|  |  |      {
 | 
	
		
			
				|  |  | -      return ServerServiceDefinition.CreateBuilder()
 | 
	
		
			
				|  |  | +      return grpc::ServerServiceDefinition.CreateBuilder()
 | 
	
		
			
				|  |  |            .AddMethod(__Method_Start, serviceImpl.Start)
 | 
	
		
			
				|  |  |            .AddMethod(__Method_Stop, serviceImpl.Stop).Build();
 | 
	
		
			
				|  |  |      }
 |