diff options
| author |  Mark D. Roth <roth@google.com> | 2016-09-09 07:24:52 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-09-09 07:24:52 -0700 |
| commit | f451d50d4ce1157a014e32faf2ef419eab2b9aea (patch) | |
| tree | a5b71d02588dd1ae10ea2d9e1265fba61b978573 /templates/src/csharp/Grpc.IntegrationTesting/project.json.template | |
| parent | 5f84400ba85e18044ea7dea302c8c23174b0b912 (diff) | |
| parent | 1b5f057995fb2b53746db281ae519d9ae475d24c (diff) | |
Merge remote-tracking branch 'upstream/master' into deadline_filter
Diffstat (limited to 'templates/src/csharp/Grpc.IntegrationTesting/project.json.template')
| -rw-r--r-- | templates/src/csharp/Grpc.IntegrationTesting/project.json.template | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/templates/src/csharp/Grpc.IntegrationTesting/project.json.template b/templates/src/csharp/Grpc.IntegrationTesting/project.json.template index 1cb5ca4ba3..6a32ddb2f3 100644 --- a/templates/src/csharp/Grpc.IntegrationTesting/project.json.template +++ b/templates/src/csharp/Grpc.IntegrationTesting/project.json.template @@ -9,16 +9,14 @@ "Grpc.Core": { "target": "project" }, - "Google.Protobuf": "3.0.0-beta3", + "Google.Protobuf": "3.0.0", "CommandLineParser.Unofficial": "2.0.275", + "Moq": "4.6.38-alpha", "NUnit": "3.2.0", "NUnitLite": "3.2.0-*" }, "frameworks": { "net45": { - "dependencies": { - "Moq": "4.2.1510.2205" - }, "frameworkAssemblies": { "System.Runtime": "", "System.IO": "" @@ -26,8 +24,7 @@ }, "netcoreapp1.0": { "imports": [ - "portable-net45", - "net45" + "portable-net45" ], "dependencies": { "Microsoft.NETCore.App": "1.0.0", |