diff options
author | murgatroid99 <mlumish@google.com> | 2016-08-02 14:37:05 -0700 |
---|---|---|
committer | murgatroid99 <mlumish@google.com> | 2016-08-02 14:37:05 -0700 |
commit | a1c442a203f6526b280c9dd29dd629249b2d0da5 (patch) | |
tree | 55a3383da920d9390c20263d0137ed12aa650123 /templates/src/csharp/Grpc.IntegrationTesting.Client/project.json.template | |
parent | fcb5271105ec2c439f83ec3cce6456b73824b6be (diff) | |
parent | 9fa684fa0d0527b9a9271681940d8f99b9c2787c (diff) |
Merge remote-tracking branch 'upstream/v1.0.x' into node_dependency_update
Diffstat (limited to 'templates/src/csharp/Grpc.IntegrationTesting.Client/project.json.template')
-rw-r--r-- | templates/src/csharp/Grpc.IntegrationTesting.Client/project.json.template | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/templates/src/csharp/Grpc.IntegrationTesting.Client/project.json.template b/templates/src/csharp/Grpc.IntegrationTesting.Client/project.json.template index 10ed549347..93151f2b89 100644 --- a/templates/src/csharp/Grpc.IntegrationTesting.Client/project.json.template +++ b/templates/src/csharp/Grpc.IntegrationTesting.Client/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" } } } |