diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-02-09 01:53:41 +0100 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-02-09 01:53:41 +0100 |
| commit | 6f24e761f0848b3544042a75f525fe7951fc9749 (patch) | |
| tree | d887b89d72c60f229cb0ed971c987d1b8a45127f /src/csharp | |
| parent | 32454cfbfcdb8125cae9f6b44e2589e590b0620b (diff) | |
| parent | 359e4b11c454fbb566ca1d0cea55fa0db970a6ef (diff) | |
Merge remote-tracking branch 'google/release-0_13' into master-is-14
Diffstat (limited to 'src/csharp')
| -rw-r--r-- | src/csharp/Grpc.Core.Tests/GrpcEnvironmentTest.cs | 2 | ||||
| -rw-r--r-- | src/csharp/Grpc.Core/Version.cs | 2 | ||||
| -rw-r--r-- | src/csharp/Grpc.Core/VersionInfo.cs | 7 | ||||
| -rw-r--r-- | src/csharp/build_packages.bat | 2 |
4 files changed, 9 insertions, 4 deletions
diff --git a/src/csharp/Grpc.Core.Tests/GrpcEnvironmentTest.cs b/src/csharp/Grpc.Core.Tests/GrpcEnvironmentTest.cs index 78295cf6d4..ab12c120cb 100644 --- a/src/csharp/Grpc.Core.Tests/GrpcEnvironmentTest.cs +++ b/src/csharp/Grpc.Core.Tests/GrpcEnvironmentTest.cs @@ -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); } } } 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 7124ec85d3..1460995fc3 100644 --- a/src/csharp/Grpc.Core/VersionInfo.cs +++ b/src/csharp/Grpc.Core/VersionInfo.cs @@ -39,8 +39,13 @@ namespace Grpc.Core 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-dev"; + public const string CurrentVersion = "0.13.0-pre1"; } } diff --git a/src/csharp/build_packages.bat b/src/csharp/build_packages.bat index 2c4e4e514d..8ffd671011 100644 --- a/src/csharp/build_packages.bat +++ b/src/csharp/build_packages.bat @@ -1,7 +1,7 @@ @rem Builds gRPC NuGet packages @rem Current package versions -set VERSION=0.13.0-dev +set VERSION=0.13.0-pre1 set PROTOBUF_VERSION=3.0.0-beta2 @rem Packages that depend on prerelease packages (like Google.Protobuf) need to have prerelease suffix as well. |