diff options
author | Mark D. Roth <roth@google.com> | 2016-08-26 13:01:15 -0700 |
---|---|---|
committer | Mark D. Roth <roth@google.com> | 2016-08-26 13:01:15 -0700 |
commit | 366c6ceb8c53a4f8c4a2f9aa2c6fee8f2a070479 (patch) | |
tree | 32ad24fe9b02e6354037a9f2ca78b219537f2afe /templates/src/csharp/Grpc.IntegrationTesting.QpsWorker/project.json.template | |
parent | b9151e3c0b0a5d01d6077c50e3ed483cb1f49b10 (diff) | |
parent | 4275e60eb686ceb202c042fe578c9cf992e590d0 (diff) |
Merge remote-tracking branch 'upstream/master' into run_interop_tests_go
Diffstat (limited to 'templates/src/csharp/Grpc.IntegrationTesting.QpsWorker/project.json.template')
-rw-r--r-- | templates/src/csharp/Grpc.IntegrationTesting.QpsWorker/project.json.template | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/templates/src/csharp/Grpc.IntegrationTesting.QpsWorker/project.json.template b/templates/src/csharp/Grpc.IntegrationTesting.QpsWorker/project.json.template index 10ed549347..93151f2b89 100644 --- a/templates/src/csharp/Grpc.IntegrationTesting.QpsWorker/project.json.template +++ b/templates/src/csharp/Grpc.IntegrationTesting.QpsWorker/project.json.template @@ -9,13 +9,14 @@ }, "frameworks": { "net45": { }, - "netstandard1.5": { + "netcoreapp1.0": { "imports": [ "portable-net45", "net45" ], "dependencies": { - "NETStandard.Library": "1.5.0-rc2-24027" + "Microsoft.NETCore.App": "1.0.0", + "NETStandard.Library": "1.6.0" } } } |