Commit Graph

118 Commits

Author SHA1 Message Date
Jan Tattermusch 43713e6ae1 Merge remote-tracking branch 'upstream/v1.2.x' into HEAD 2017-04-12 09:20:29 +02:00
murgatroid99 7cfa1bfb73 Bump version to 1.2.3 2017-04-07 10:41:21 -07:00
Jan Tattermusch 7727c7649c Initial migration to new .csproj files 2017-04-07 08:51:56 +02:00
Jan Tattermusch 0be726b34d bump version to 1.2.2 2017-04-03 20:04:34 +02:00
Ken Payson 484871bb03 Bump version to 1.2.1 2017-03-28 18:00:33 -07:00
Alexander Polcyn 69c2717c80 bump v1.2.x branch version to 1.2.1-pre2 2017-03-24 11:39:52 -07:00
Nicolas "Pixel" Noble e44a50ffd7 Merge branch 'v1.2.x' of https://github.com/grpc/grpc into upmerge-1.2.0 2017-03-24 00:54:47 +01:00
Alexander Polcyn 3e30832cca bump v1.2.x branch to 1.2.1-pre1 2017-03-20 17:00:45 -07:00
David Garcia Quintas 69e5a28635 Going for 1.2.0 2017-03-20 12:51:17 -07:00
Ken Payson 12ca7d319c Bump 1.2.x version to pre-2 2017-03-16 11:01:06 -07:00
Jan Tattermusch ff4fc13bd2 regenerate code 2017-03-14 09:27:50 +01:00
David Garcia Quintas 904e7f53ae Introducing 1.2.0-pre1 2017-03-09 15:02:19 -08:00
David Garcia Quintas 74cec10619 Bumped version to 1.3.0-dev 2017-03-09 15:00:26 -08:00
David G. Quintas 18f8acf617 Merge pull request #10004 from dgquintas/1.1.x_to_master_again
1.1.x to master again
2017-03-07 17:42:32 -08:00
Jan Tattermusch e2b2c8e193 update nugets in csproj projects 2017-03-07 13:00:19 +01:00
Jan Tattermusch 766c97a408 updgrade C# project.json to protobuf 3.2.0 2017-03-07 13:00:19 +01:00
David Garcia Quintas 78fd7db29f Merge remote-tracking branch 'upstream/v1.1.x' into 1.1.x_to_master_again 2017-03-06 15:58:03 -08:00
Jan Tattermusch aa4abaa8cc fix Grpc.HealthCheck and Grpc.Reflection packages 2017-03-03 10:19:01 +01:00
Muxi Yan 5c2d7e287b Boost grpc version to v1.1.4 2017-03-01 15:31:31 -08:00
Ken Payson fd6cc7de7b Bump version to v1.1.3 2017-02-23 14:25:40 -08:00
murgatroid99 2b3e12ceee Update version to 1.1.2 2017-02-06 17:42:07 -08:00
murgatroid99 e15b5a42af Bump version to 1.1.1 2017-01-31 16:23:54 -08:00
Craig Tiller 5cad46e218 Bump master version numbers 2017-01-30 15:32:24 -08:00
Nicolas "Pixel" Noble 4dcb7862bf Flagging version 1.1.0. 2017-01-30 23:28:06 +01:00
Nicolas "Pixel" Noble da83b376eb Changing versions from -dev to -pre1 on the release branch. 2017-01-23 23:52:35 +01:00
Jan Tattermusch 00f66361b7 Generate param comments in C# proto plugin 2016-12-13 17:50:58 +01:00
Jan Tattermusch c7df4cfd7c get rid of unused ReleaseSigned config 2016-12-09 12:26:29 +01:00
Jan Tattermusch a4945df604 get rid of the obsolete C# package builder 2016-11-30 07:45:29 +01:00
Jan Tattermusch 091057a4e5 fix proto import paths for C# where possible 2016-11-29 09:43:55 +01:00
Jan Tattermusch 8613e474cb Merge remote-tracking branch 'upstream/v1.0.x' into HEAD 2016-11-22 11:15:53 +01:00
Jan Tattermusch e7099c8835 update Grpc.HealthCheck.nuspec 2016-11-21 22:29:08 +01:00
Jan Tattermusch 57cc83e203 Update .csproj files to System.Interactive.Async to 3.1.1 2016-11-21 19:34:06 +01:00
apolcyn 8a4ac886e4 Merge pull request #8619 from apolcyn/gen_csharp_partial_class
Generate c# client stubs as partial classes
2016-11-17 08:35:25 -08:00
Alexander Polcyn c0f4c2cb1e run gen proto c# after proto plugin changed 2016-11-07 10:24:35 -08:00
Alexander Polcyn 84be265239 strong name sign csharp nuget builds with dotnet on windows 2016-11-01 18:40:03 -07:00
Nicolas "Pixel" Noble 50a730bd1c Going 1.0.1. 2016-10-26 21:42:29 +02:00
Jan Tattermusch 10098d1819 regenerate C# protos 2016-10-12 14:43:19 +02:00
Jan Tattermusch f6caaa76a6 add copyrights for AssemblyInfo.cs files 2016-09-21 22:40:11 +02:00
Jan Tattermusch caa965b548 regenerate C# related files after backporting from master 2016-09-15 18:18:28 +02:00
Jan Tattermusch 67b6ef4d6f cleanup of project.json files 2016-09-15 18:18:22 +02:00
Jan Tattermusch ff6c2ad054 update csproj files to Google.Protobuf to 3.0.0 2016-09-15 18:18:21 +02:00
Jan Tattermusch d95ae3749d update Protobuf to 3.0.0 in project.json projects 2016-09-15 18:18:21 +02:00
Jan Tattermusch b9a6f79241 cleanup of project.json files 2016-09-05 18:14:26 +02:00
Jan Tattermusch 350458f714 update csproj files to Google.Protobuf to 3.0.0 2016-09-05 16:04:02 +02:00
Jan Tattermusch d059de7c55 update Protobuf to 3.0.0 in project.json projects 2016-09-05 15:51:34 +02:00
Nicolas "Pixel" Noble 35b8c51485 Bumping version to 1.0.1-pre1. 2016-08-18 21:57:20 +02:00
Nicolas "Pixel" Noble 0f9337b6a0 Removing pre2 flag. 2016-08-16 03:07:09 +02:00
Nicolas "Pixel" Noble 7f074e0e20 Merge branch 'v1.0.x' into manual-upmerge 2016-08-11 21:00:08 +02:00
Nicolas "Pixel" Noble 229b1619f0 Merge branch 'v1.0.x' of https://github.com/grpc/grpc
Conflicts:
	CMakeLists.txt
	Makefile
	build.yaml
	package.json
	src/core/lib/surface/version.c
	src/csharp/Grpc.Auth/project.json
	src/csharp/Grpc.Core/VersionInfo.cs
	src/csharp/Grpc.Core/project.json
	src/csharp/Grpc.HealthCheck/project.json
	src/csharp/build_packages.bat
	src/node/health_check/package.json
	src/node/tools/package.json
	src/python/grpcio/grpc_version.py
	src/python/grpcio_health_checking/grpc_version.py
	src/python/grpcio_tests/grpc_version.py
	src/ruby/lib/grpc/version.rb
	src/ruby/tools/version.rb
	tools/distrib/python/grpcio_tools/grpc_version.py
	tools/doxygen/Doxyfile.c++
	tools/doxygen/Doxyfile.c++.internal
	tools/doxygen/Doxyfile.core
	tools/doxygen/Doxyfile.core.internal
2016-08-03 19:54:49 +02:00
Alex Polcyn 77008b0338 updated hint path to updated library in csproj files 2016-08-02 23:53:09 -07:00