From cda4bad582c1a30883f4590f239caaf86828689a Mon Sep 17 00:00:00 2001 From: "Nicolas \"Pixel\" Noble" Date: Tue, 9 Feb 2016 00:44:23 +0100 Subject: Flagging 0.13 as pre1. --- src/csharp/Grpc.Core/VersionInfo.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/csharp/Grpc.Core/VersionInfo.cs') diff --git a/src/csharp/Grpc.Core/VersionInfo.cs b/src/csharp/Grpc.Core/VersionInfo.cs index 7124ec85d3..6b114eaf0e 100644 --- a/src/csharp/Grpc.Core/VersionInfo.cs +++ b/src/csharp/Grpc.Core/VersionInfo.cs @@ -41,6 +41,6 @@ namespace Grpc.Core /// /// Current version of gRPC C# /// - public const string CurrentVersion = "0.13.0-dev"; + public const string CurrentVersion = "0.13.0-pre1"; } } -- cgit v1.2.3 From d980047a047264b74dc14daa9b3daf54c8160997 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Mon, 8 Feb 2016 16:22:23 -0800 Subject: fix C# build --- src/csharp/Grpc.Core/VersionInfo.cs | 2 +- templates/src/csharp/Grpc.Core/VersionInfo.cs.template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/csharp/Grpc.Core/VersionInfo.cs') 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 /// /// Current version of gRPC C# /// - 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 @@ /// /// Current version of gRPC C# /// - public const string CurrentVersion = "${settings.csharp_version}"; + public const string CurrentVersion = "${settings.version.major}.${settings.version.minor}.${settings.version.patch}"; } } -- cgit v1.2.3 From fe0c4a84fa5204fd603c9c094f4c7ca9618305fb Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Mon, 8 Feb 2016 16:39:55 -0800 Subject: C# assembly version and current version --- src/csharp/Grpc.Core/Version.cs | 2 +- src/csharp/Grpc.Core/VersionInfo.cs | 7 ++++++- templates/src/csharp/Grpc.Core/VersionInfo.cs.template | 7 ++++++- 3 files changed, 13 insertions(+), 3 deletions(-) (limited to 'src/csharp/Grpc.Core/VersionInfo.cs') diff --git a/src/csharp/Grpc.Core/Version.cs b/src/csharp/Grpc.Core/Version.cs index d02b301cac..8a26bd8362 100644 --- a/src/csharp/Grpc.Core/Version.cs +++ b/src/csharp/Grpc.Core/Version.cs @@ -34,4 +34,4 @@ using System.Reflection; // The current version of gRPC C#. -[assembly: AssemblyVersion(Grpc.Core.VersionInfo.CurrentVersion + ".0")] +[assembly: AssemblyVersion(Grpc.Core.VersionInfo.CurrentAssemblyVersion)] diff --git a/src/csharp/Grpc.Core/VersionInfo.cs b/src/csharp/Grpc.Core/VersionInfo.cs index 65813909de..1460995fc3 100644 --- a/src/csharp/Grpc.Core/VersionInfo.cs +++ b/src/csharp/Grpc.Core/VersionInfo.cs @@ -38,9 +38,14 @@ namespace Grpc.Core /// public static class VersionInfo { + /// + /// Current version of gRPC C# assemblies + /// + public const string CurrentAssemblyVersion = "0.13.0.0"; + /// /// Current version of gRPC C# /// - public const string CurrentVersion = "0.13.0"; + public const string CurrentVersion = "0.13.0-pre1"; } } diff --git a/templates/src/csharp/Grpc.Core/VersionInfo.cs.template b/templates/src/csharp/Grpc.Core/VersionInfo.cs.template index 6cb6280de6..59864fa058 100644 --- a/templates/src/csharp/Grpc.Core/VersionInfo.cs.template +++ b/templates/src/csharp/Grpc.Core/VersionInfo.cs.template @@ -40,9 +40,14 @@ /// public static class VersionInfo { + /// + /// Current version of gRPC C# assemblies + /// + public const string CurrentAssemblyVersion = "${settings.version.major}.${settings.version.minor}.${settings.version.patch}.0"; + /// /// Current version of gRPC C# /// - public const string CurrentVersion = "${settings.version.major}.${settings.version.minor}.${settings.version.patch}"; + public const string CurrentVersion = "${settings.csharp_version}"; } } -- cgit v1.2.3