diff options
| author |  kpayson64 <kpayson@google.com> | 2018-05-03 15:50:56 -0700 |
|---|---|---|
| committer | kpayson64 <kpayson@google.com> | 2018-05-03 15:50:56 -0700 |
| commit | 6d6c780ffcb95c3e99c8dcd1dc2204425589ed80 (patch) | |
| tree | b14231e944f29662fe892415c0eac5e076a639d4 /src/csharp/Grpc.Core | |
| parent | a0bc0ac169ecae34b5a7a43cb5e0fdfc9662d22a (diff) | |
| parent | 6a14efc0236d8ff723c662305b5e7dac7f0cf491 (diff) | |
Merge remote-tracking branch 'upstream/master' into remove_cleanup_thread
Diffstat (limited to 'src/csharp/Grpc.Core')
| -rwxr-xr-x | src/csharp/Grpc.Core/Version.csproj.include | 2 | ||||
| -rw-r--r-- | src/csharp/Grpc.Core/VersionInfo.cs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/csharp/Grpc.Core/Version.csproj.include b/src/csharp/Grpc.Core/Version.csproj.include index 6e28c11df2..f5d63b77f0 100755 --- a/src/csharp/Grpc.Core/Version.csproj.include +++ b/src/csharp/Grpc.Core/Version.csproj.include @@ -1,7 +1,7 @@ <!-- This file is generated --> <Project> <PropertyGroup> - <GrpcCsharpVersion>1.12.0-dev</GrpcCsharpVersion> + <GrpcCsharpVersion>1.13.0-dev</GrpcCsharpVersion> <GoogleProtobufVersion>3.5.1</GoogleProtobufVersion> </PropertyGroup> </Project> diff --git a/src/csharp/Grpc.Core/VersionInfo.cs b/src/csharp/Grpc.Core/VersionInfo.cs index 06a0396c34..87edddae3f 100644 --- a/src/csharp/Grpc.Core/VersionInfo.cs +++ b/src/csharp/Grpc.Core/VersionInfo.cs @@ -33,11 +33,11 @@ namespace Grpc.Core /// <summary> /// Current <c>AssemblyFileVersion</c> of gRPC C# assemblies /// </summary> - public const string CurrentAssemblyFileVersion = "1.12.0.0"; + public const string CurrentAssemblyFileVersion = "1.13.0.0"; /// <summary> /// Current version of gRPC C# /// </summary> - public const string CurrentVersion = "1.12.0-dev"; + public const string CurrentVersion = "1.13.0-dev"; } } |