Merge pull request #5146 from jtattermusch/fix_csharp_environment_test

Fix csharp environment test
pull/5143/head
Nicolas Noble 9 years ago
commit 359e4b11c4
  1. 2
      src/csharp/Grpc.Core.Tests/GrpcEnvironmentTest.cs
  2. 2
      src/csharp/Grpc.Core/Version.cs
  3. 7
      src/csharp/Grpc.Core/VersionInfo.cs
  4. 7
      templates/src/csharp/Grpc.Core/VersionInfo.cs.template

@ -84,7 +84,7 @@ namespace Grpc.Core.Tests
{
var coreVersion = GrpcEnvironment.GetCoreVersionString();
var parts = coreVersion.Split('.');
Assert.AreEqual(4, parts.Length);
Assert.AreEqual(3, parts.Length);
}
}
}

@ -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)]

@ -38,9 +38,14 @@ namespace Grpc.Core
/// </summary>
public static class VersionInfo
{
/// <summary>
/// Current version of gRPC C# assemblies
/// </summary>
public const string CurrentAssemblyVersion = "0.13.0.0";
/// <summary>
/// Current version of gRPC C#
/// </summary>
public const string CurrentVersion = "0.13.0";
public const string CurrentVersion = "0.13.0-pre1";
}
}

@ -40,9 +40,14 @@
/// </summary>
public static class VersionInfo
{
/// <summary>
/// Current version of gRPC C# assemblies
/// </summary>
public const string CurrentAssemblyVersion = "${settings.version.major}.${settings.version.minor}.${settings.version.patch}.0";
/// <summary>
/// Current version of gRPC C#
/// </summary>
public const string CurrentVersion = "${settings.version.major}.${settings.version.minor}.${settings.version.patch}";
public const string CurrentVersion = "${settings.csharp_version}";
}
}

Loading…
Cancel
Save