aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Jan Tattermusch <jtattermusch@users.noreply.github.com>2018-08-11 01:14:46 +0200
committerGravatar GitHub <noreply@github.com>2018-08-11 01:14:46 +0200
commite786b33fb4f7098fb00eb7191affcadf638c94df (patch)
treebcedd397a5a6281cfa65942b37314ed287160b5d
parent46f8637bf76eabf362f9edf10ea7600c2d911b00 (diff)
parent537503dc1a08171271f012d9b48770975d2abd1b (diff)
Merge pull request #16322 from jtattermusch/csharp_protobuf_update361
C#: upgrade protobuf nugets to v3.6.1
-rwxr-xr-xsrc/csharp/Grpc.Core/Version.csproj.include2
-rwxr-xr-xtemplates/src/csharp/Grpc.Core/Version.csproj.include.template2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/csharp/Grpc.Core/Version.csproj.include b/src/csharp/Grpc.Core/Version.csproj.include
index 6b0731eb40..45bd8ebd85 100755
--- a/src/csharp/Grpc.Core/Version.csproj.include
+++ b/src/csharp/Grpc.Core/Version.csproj.include
@@ -2,6 +2,6 @@
<Project>
<PropertyGroup>
<GrpcCsharpVersion>1.15.0-dev</GrpcCsharpVersion>
- <GoogleProtobufVersion>3.6.0</GoogleProtobufVersion>
+ <GoogleProtobufVersion>3.6.1</GoogleProtobufVersion>
</PropertyGroup>
</Project>
diff --git a/templates/src/csharp/Grpc.Core/Version.csproj.include.template b/templates/src/csharp/Grpc.Core/Version.csproj.include.template
index a950b1615d..0ec0a08c49 100755
--- a/templates/src/csharp/Grpc.Core/Version.csproj.include.template
+++ b/templates/src/csharp/Grpc.Core/Version.csproj.include.template
@@ -4,6 +4,6 @@
<Project>
<PropertyGroup>
<GrpcCsharpVersion>${settings.csharp_version}</GrpcCsharpVersion>
- <GoogleProtobufVersion>3.6.0</GoogleProtobufVersion>
+ <GoogleProtobufVersion>3.6.1</GoogleProtobufVersion>
</PropertyGroup>
</Project>