aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Nicolas Noble <nicolasnoble@users.noreply.github.com>2016-02-08 16:23:27 -0800
committerGravatar Nicolas Noble <nicolasnoble@users.noreply.github.com>2016-02-08 16:23:27 -0800
commitbb32cee0ba828f9ae81134484149c5c74b1f8854 (patch)
treedb635c7bc0ceead9d880db263115ee03badef556
parent6d65bc3930a55890b496a9086d4a93f1f50cab93 (diff)
parentd980047a047264b74dc14daa9b3daf54c8160997 (diff)
Merge pull request #5142 from jtattermusch/csharp_fix_assemblyversion
Fix C# build
-rw-r--r--src/csharp/Grpc.Core/VersionInfo.cs2
-rw-r--r--templates/src/csharp/Grpc.Core/VersionInfo.cs.template2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/csharp/Grpc.Core/VersionInfo.cs b/src/csharp/Grpc.Core/VersionInfo.cs
index 6b114eaf0e..65813909de 100644
--- a/src/csharp/Grpc.Core/VersionInfo.cs
+++ b/src/csharp/Grpc.Core/VersionInfo.cs
@@ -41,6 +41,6 @@ namespace Grpc.Core
/// <summary>
/// Current version of gRPC C#
/// </summary>
- public const string CurrentVersion = "0.13.0-pre1";
+ public const string CurrentVersion = "0.13.0";
}
}
diff --git a/templates/src/csharp/Grpc.Core/VersionInfo.cs.template b/templates/src/csharp/Grpc.Core/VersionInfo.cs.template
index 578f01f079..6cb6280de6 100644
--- a/templates/src/csharp/Grpc.Core/VersionInfo.cs.template
+++ b/templates/src/csharp/Grpc.Core/VersionInfo.cs.template
@@ -43,6 +43,6 @@
/// <summary>
/// Current version of gRPC C#
/// </summary>
- public const string CurrentVersion = "${settings.csharp_version}";
+ public const string CurrentVersion = "${settings.version.major}.${settings.version.minor}.${settings.version.patch}";
}
}