diff options
| author |  murgatroid99 <mlumish@google.com> | 2016-06-28 14:17:39 -0700 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2016-06-28 14:17:39 -0700 |
| commit | 13c22ae59506ff2de95b105077cdef31ae4a1393 (patch) | |
| tree | 9e20729ebe892a8b81032215d6b1bd2937facf1a /src/csharp/Grpc.Core/project.json | |
| parent | 00338657d949f248e5b978b2c03769f9ae19b53b (diff) | |
| parent | fe466b0e170120263811ab12a4406c7438201481 (diff) | |
Resolved merge conflicts with master
Diffstat (limited to 'src/csharp/Grpc.Core/project.json')
| -rw-r--r-- | src/csharp/Grpc.Core/project.json | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/csharp/Grpc.Core/project.json b/src/csharp/Grpc.Core/project.json index 7253107e04..775764e1d7 100644 --- a/src/csharp/Grpc.Core/project.json +++ b/src/csharp/Grpc.Core/project.json @@ -1,5 +1,5 @@ { - "version": "0.15.0-dev", + "version": "0.16.0-dev", "title": "gRPC C# Core", "authors": [ "Google Inc." ], "copyright": "Copyright 2015, Google Inc.", @@ -21,8 +21,13 @@ "build/native/bin/macosx_x64/": "../nativelibs/macosx_x64/libgrpc_csharp_ext.dylib" } }, + "shared": "Version.cs", "buildOptions": { - "embed": [ "../../../etc/roots.pem" ] + "embed": [ "../../../etc/roots.pem" ], + "define": [ "SIGNED" ], + "keyFile": "../keys/Grpc.snk", + "publicSign": true, + "xmlDoc": true }, "dependencies": { "Ix-Async": "1.2.5" |