diff options
| author |  Sree Kuchibhotla <sreek@google.com> | 2018-06-18 09:37:46 -0700 |
|---|---|---|
| committer | Sree Kuchibhotla <sreek@google.com> | 2018-06-18 09:39:09 -0700 |
| commit | 09d7da2652e64c38267bde4ba9c52673e2b97f32 (patch) | |
| tree | fbdd9fbc058fa2c55a60044c1bd88bf429e4aa28 /src/csharp | |
| parent | 16ad9b828073579d0c6364570a3803b26e7fb39d (diff) | |
| parent | a2769d5ee4116152eead50678741906b1667923b (diff) | |
Merge branch 'master' into epollex-ownerfd-fix
Diffstat (limited to 'src/csharp')
| -rw-r--r-- | src/csharp/Grpc.Core/Server.cs | 2 | ||||
| -rwxr-xr-x | src/csharp/Grpc.Core/Version.csproj.include | 2 | ||||
| -rw-r--r-- | src/csharp/Grpc.Core/VersionInfo.cs | 4 | ||||
| -rwxr-xr-x | src/csharp/build_packages_dotnetcli.bat | 2 | ||||
| -rwxr-xr-x | src/csharp/build_packages_dotnetcli.sh | 6 |
5 files changed, 8 insertions, 8 deletions
diff --git a/src/csharp/Grpc.Core/Server.cs b/src/csharp/Grpc.Core/Server.cs index 60dacbf126..64bb407c57 100644 --- a/src/csharp/Grpc.Core/Server.cs +++ b/src/csharp/Grpc.Core/Server.cs @@ -29,7 +29,7 @@ using Grpc.Core.Utils; namespace Grpc.Core { /// <summary> - /// gRPC server. A single server can server arbitrary number of services and can listen on more than one ports. + /// gRPC server. A single server can serve an arbitrary number of services and can listen on more than one port. /// </summary> public class Server { diff --git a/src/csharp/Grpc.Core/Version.csproj.include b/src/csharp/Grpc.Core/Version.csproj.include index f5d63b77f0..2b45e7ae20 100755 --- a/src/csharp/Grpc.Core/Version.csproj.include +++ b/src/csharp/Grpc.Core/Version.csproj.include @@ -1,7 +1,7 @@ <!-- This file is generated --> <Project> <PropertyGroup> - <GrpcCsharpVersion>1.13.0-dev</GrpcCsharpVersion> + <GrpcCsharpVersion>1.14.0-dev</GrpcCsharpVersion> <GoogleProtobufVersion>3.5.1</GoogleProtobufVersion> </PropertyGroup> </Project> diff --git a/src/csharp/Grpc.Core/VersionInfo.cs b/src/csharp/Grpc.Core/VersionInfo.cs index 87edddae3f..c4531e5275 100644 --- a/src/csharp/Grpc.Core/VersionInfo.cs +++ b/src/csharp/Grpc.Core/VersionInfo.cs @@ -33,11 +33,11 @@ namespace Grpc.Core /// <summary> /// Current <c>AssemblyFileVersion</c> of gRPC C# assemblies /// </summary> - public const string CurrentAssemblyFileVersion = "1.13.0.0"; + public const string CurrentAssemblyFileVersion = "1.14.0.0"; /// <summary> /// Current version of gRPC C# /// </summary> - public const string CurrentVersion = "1.13.0-dev"; + public const string CurrentVersion = "1.14.0-dev"; } } diff --git a/src/csharp/build_packages_dotnetcli.bat b/src/csharp/build_packages_dotnetcli.bat index f1111781e2..394b859e0b 100755 --- a/src/csharp/build_packages_dotnetcli.bat +++ b/src/csharp/build_packages_dotnetcli.bat @@ -13,7 +13,7 @@ @rem limitations under the License. @rem Current package versions -set VERSION=1.13.0-dev +set VERSION=1.14.0-dev @rem Adjust the location of nuget.exe set NUGET=C:\nuget\nuget.exe diff --git a/src/csharp/build_packages_dotnetcli.sh b/src/csharp/build_packages_dotnetcli.sh index fb4138a4b2..273d745f17 100755 --- a/src/csharp/build_packages_dotnetcli.sh +++ b/src/csharp/build_packages_dotnetcli.sh @@ -45,8 +45,8 @@ dotnet pack --configuration Release Grpc.Auth --output ../../../artifacts dotnet pack --configuration Release Grpc.HealthCheck --output ../../../artifacts dotnet pack --configuration Release Grpc.Reflection --output ../../../artifacts -nuget pack Grpc.nuspec -Version "1.13.0-dev" -OutputDirectory ../../artifacts -nuget pack Grpc.Core.NativeDebug.nuspec -Version "1.13.0-dev" -OutputDirectory ../../artifacts -nuget pack Grpc.Tools.nuspec -Version "1.13.0-dev" -OutputDirectory ../../artifacts +nuget pack Grpc.nuspec -Version "1.14.0-dev" -OutputDirectory ../../artifacts +nuget pack Grpc.Core.NativeDebug.nuspec -Version "1.14.0-dev" -OutputDirectory ../../artifacts +nuget pack Grpc.Tools.nuspec -Version "1.14.0-dev" -OutputDirectory ../../artifacts (cd ../../artifacts && zip csharp_nugets_dotnetcli.zip *.nupkg) |