diff options
| author |  David Garcia Quintas <dgq@google.com> | 2017-03-06 15:58:03 -0800 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2017-03-06 15:58:03 -0800 |
| commit | 78fd7db29f122a59ae5cbdf65d5ae90fc94b8787 (patch) | |
| tree | ed241cf03061315daabc405990d8c948b08d4bae /src/csharp | |
| parent | cf54c151f1853af1fe1df2058ccbc2ca3a26c43c (diff) | |
| parent | 7bc4f4a1e044976130dde5170a814e59019afc78 (diff) | |
Merge remote-tracking branch 'upstream/v1.1.x' into 1.1.x_to_master_again
Diffstat (limited to 'src/csharp')
| -rw-r--r-- | src/csharp/Grpc.Examples/project.json | 7 | ||||
| -rw-r--r-- | src/csharp/Grpc.HealthCheck/project.json | 7 | ||||
| -rw-r--r-- | src/csharp/Grpc.IntegrationTesting/project.json | 5 | ||||
| -rw-r--r-- | src/csharp/Grpc.Reflection/project.json | 7 |
4 files changed, 4 insertions, 22 deletions
diff --git a/src/csharp/Grpc.Examples/project.json b/src/csharp/Grpc.Examples/project.json index 21a730cb22..84254e897e 100644 --- a/src/csharp/Grpc.Examples/project.json +++ b/src/csharp/Grpc.Examples/project.json @@ -9,12 +9,7 @@ "Google.Protobuf": "3.0.0" }, "frameworks": { - "net45": { - "frameworkAssemblies": { - "System.Runtime": "", - "System.IO": "" - } - }, + "net45": {}, "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { diff --git a/src/csharp/Grpc.HealthCheck/project.json b/src/csharp/Grpc.HealthCheck/project.json index 5d3b2f554b..db99b317e8 100644 --- a/src/csharp/Grpc.HealthCheck/project.json +++ b/src/csharp/Grpc.HealthCheck/project.json @@ -25,12 +25,7 @@ "Google.Protobuf": "3.0.0" }, "frameworks": { - "net45": { - "frameworkAssemblies": { - "System.Runtime": "", - "System.IO": "" - } - }, + "net45": {}, "netstandard1.5": { "dependencies": { "NETStandard.Library": "1.6.0" diff --git a/src/csharp/Grpc.IntegrationTesting/project.json b/src/csharp/Grpc.IntegrationTesting/project.json index eba54318a5..b86227a258 100644 --- a/src/csharp/Grpc.IntegrationTesting/project.json +++ b/src/csharp/Grpc.IntegrationTesting/project.json @@ -62,10 +62,7 @@ }, "frameworks": { "net45": { - "frameworkAssemblies": { - "System.Runtime": "", - "System.IO": "" - } + "frameworkAssemblies": {} }, "netcoreapp1.0": { "imports": [ diff --git a/src/csharp/Grpc.Reflection/project.json b/src/csharp/Grpc.Reflection/project.json index bfc57661eb..dfb9ba5021 100644 --- a/src/csharp/Grpc.Reflection/project.json +++ b/src/csharp/Grpc.Reflection/project.json @@ -25,12 +25,7 @@ "Google.Protobuf": "3.0.0" }, "frameworks": { - "net45": { - "frameworkAssemblies": { - "System.Runtime": "", - "System.IO": "" - } - }, + "net45": {}, "netstandard1.5": { "dependencies": { "NETStandard.Library": "1.6.0" |