diff options
author | Mark D. Roth <roth@google.com> | 2016-09-13 11:01:50 -0700 |
---|---|---|
committer | Mark D. Roth <roth@google.com> | 2016-09-13 11:01:50 -0700 |
commit | c6dfe859dc53adf87357f9d7f568c00cf25b0dcb (patch) | |
tree | cc7bfed667536b87c0adb7bd89a0f427285327d0 /templates/src/csharp/Grpc.Examples | |
parent | a587b4136976ab19f370b0ff18a2cd9f4c720cda (diff) | |
parent | 6e51f992c6bfdfba61d984ab173305da455bd2e7 (diff) |
Merge remote-tracking branch 'upstream/master' into grpclb_resolver_changes
Diffstat (limited to 'templates/src/csharp/Grpc.Examples')
-rw-r--r-- | templates/src/csharp/Grpc.Examples/project.json.template | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/templates/src/csharp/Grpc.Examples/project.json.template b/templates/src/csharp/Grpc.Examples/project.json.template index 117f842e01..b8a8314de1 100644 --- a/templates/src/csharp/Grpc.Examples/project.json.template +++ b/templates/src/csharp/Grpc.Examples/project.json.template @@ -6,7 +6,7 @@ "Grpc.Core": { "target": "project" }, - "Google.Protobuf": "3.0.0-beta3" + "Google.Protobuf": "3.0.0" }, "frameworks": { "net45": { @@ -16,12 +16,11 @@ } }, "netcoreapp1.0": { - "imports": [ - "portable-net45" - ], "dependencies": { - "Microsoft.NETCore.App": "1.0.0", - "NETStandard.Library": "1.6.0" + "Microsoft.NETCore.App": { + "type": "platform", + "version": "1.0.0" + } } } } |