From c5a6aca397e9dd8eb0e080eb343577089f2cb6c0 Mon Sep 17 00:00:00 2001
From: Jan Tattermusch <jtattermusch@google.com>
Date: Sun, 9 Aug 2015 23:41:17 -0700
Subject: [PATCH 1/3] expose C core version string to C#

---
 src/csharp/Grpc.Core/GrpcEnvironment.cs | 12 ++++++++++++
 src/csharp/ext/grpc_csharp_ext.c        |  5 +++++
 2 files changed, 17 insertions(+)

diff --git a/src/csharp/Grpc.Core/GrpcEnvironment.cs b/src/csharp/Grpc.Core/GrpcEnvironment.cs
index 034a66be3c5..29a6ea78724 100644
--- a/src/csharp/Grpc.Core/GrpcEnvironment.cs
+++ b/src/csharp/Grpc.Core/GrpcEnvironment.cs
@@ -53,6 +53,9 @@ namespace Grpc.Core
         [DllImport("grpc_csharp_ext.dll")]
         static extern void grpcsharp_shutdown();
 
+        [DllImport("grpc_csharp_ext.dll")]
+        static extern IntPtr grpcsharp_version_string();  // returns not-owned const char*
+
         static object staticLock = new object();
         static GrpcEnvironment instance;
 
@@ -163,6 +166,15 @@ namespace Grpc.Core
             }
         }
 
+        /// <summary>
+        /// Gets version of gRPC C core.
+        /// </summary>
+        internal string GetCoreVersionString()
+        {
+            var ptr = grpcsharp_version_string();  // the pointer is not owned
+            return Marshal.PtrToStringAnsi(ptr);
+        }
+
         /// <summary>
         /// Shuts down this environment.
         /// </summary>
diff --git a/src/csharp/ext/grpc_csharp_ext.c b/src/csharp/ext/grpc_csharp_ext.c
index 048887bc12a..0d2a74adb6c 100644
--- a/src/csharp/ext/grpc_csharp_ext.c
+++ b/src/csharp/ext/grpc_csharp_ext.c
@@ -849,6 +849,11 @@ GPR_EXPORT void GPR_CALLTYPE grpcsharp_redirect_log(grpcsharp_log_func func) {
 
 typedef void(GPR_CALLTYPE *test_callback_funcptr)(gpr_int32 success);
 
+/* Version info */
+GPR_EXPORT char *GPR_CALLTYPE grpcsharp_version_string() {
+  return grpc_version_string();
+}
+
 /* For testing */
 GPR_EXPORT void GPR_CALLTYPE
 grpcsharp_test_callback(test_callback_funcptr callback) {

From 03ad9510cee313148e0f942e23bc202f956fda6d Mon Sep 17 00:00:00 2001
From: Jan Tattermusch <jtattermusch@google.com>
Date: Mon, 10 Aug 2015 11:06:58 -0700
Subject: [PATCH 2/3] add const modifier

---
 src/csharp/ext/grpc_csharp_ext.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/csharp/ext/grpc_csharp_ext.c b/src/csharp/ext/grpc_csharp_ext.c
index 0d2a74adb6c..0eb236590ce 100644
--- a/src/csharp/ext/grpc_csharp_ext.c
+++ b/src/csharp/ext/grpc_csharp_ext.c
@@ -850,7 +850,7 @@ GPR_EXPORT void GPR_CALLTYPE grpcsharp_redirect_log(grpcsharp_log_func func) {
 typedef void(GPR_CALLTYPE *test_callback_funcptr)(gpr_int32 success);
 
 /* Version info */
-GPR_EXPORT char *GPR_CALLTYPE grpcsharp_version_string() {
+GPR_EXPORT const char *GPR_CALLTYPE grpcsharp_version_string() {
   return grpc_version_string();
 }
 

From 1338798897378d8d05ab2a4633f25bcd63cfdc87 Mon Sep 17 00:00:00 2001
From: Jan Tattermusch <jtattermusch@google.com>
Date: Mon, 10 Aug 2015 11:13:28 -0700
Subject: [PATCH 3/3] fix method signature and add test

---
 src/csharp/Grpc.Core.Tests/GrpcEnvironmentTest.cs | 8 ++++++++
 src/csharp/Grpc.Core/GrpcEnvironment.cs           | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/csharp/Grpc.Core.Tests/GrpcEnvironmentTest.cs b/src/csharp/Grpc.Core.Tests/GrpcEnvironmentTest.cs
index 9ae12776f3c..4ed93c7eca2 100644
--- a/src/csharp/Grpc.Core.Tests/GrpcEnvironmentTest.cs
+++ b/src/csharp/Grpc.Core.Tests/GrpcEnvironmentTest.cs
@@ -69,5 +69,13 @@ namespace Grpc.Core.Tests
 
             Assert.IsFalse(object.ReferenceEquals(env1, env2));
         }
+
+        [Test]
+        public void GetCoreVersionString()
+        {
+            var coreVersion = GrpcEnvironment.GetCoreVersionString();
+            var parts = coreVersion.Split('.');
+            Assert.AreEqual(4, parts.Length);
+        }
     }
 }
diff --git a/src/csharp/Grpc.Core/GrpcEnvironment.cs b/src/csharp/Grpc.Core/GrpcEnvironment.cs
index 29a6ea78724..1bb83c9962d 100644
--- a/src/csharp/Grpc.Core/GrpcEnvironment.cs
+++ b/src/csharp/Grpc.Core/GrpcEnvironment.cs
@@ -169,7 +169,7 @@ namespace Grpc.Core
         /// <summary>
         /// Gets version of gRPC C core.
         /// </summary>
-        internal string GetCoreVersionString()
+        internal static string GetCoreVersionString()
         {
             var ptr = grpcsharp_version_string();  // the pointer is not owned
             return Marshal.PtrToStringAnsi(ptr);