aboutsummaryrefslogtreecommitdiffhomepage
path: root/templates/src
diff options
context:
space:
mode:
authorGravatar David Garcia Quintas <dgq@google.com>2017-03-06 15:58:03 -0800
committerGravatar David Garcia Quintas <dgq@google.com>2017-03-06 15:58:03 -0800
commit78fd7db29f122a59ae5cbdf65d5ae90fc94b8787 (patch)
treeed241cf03061315daabc405990d8c948b08d4bae /templates/src
parentcf54c151f1853af1fe1df2058ccbc2ca3a26c43c (diff)
parent7bc4f4a1e044976130dde5170a814e59019afc78 (diff)
Merge remote-tracking branch 'upstream/v1.1.x' into 1.1.x_to_master_again
Diffstat (limited to 'templates/src')
-rw-r--r--templates/src/csharp/Grpc.Examples/project.json.template7
-rw-r--r--templates/src/csharp/Grpc.HealthCheck/project.json.template7
-rw-r--r--templates/src/csharp/Grpc.IntegrationTesting/project.json.template5
-rw-r--r--templates/src/csharp/Grpc.Reflection/project.json.template7
4 files changed, 4 insertions, 22 deletions
diff --git a/templates/src/csharp/Grpc.Examples/project.json.template b/templates/src/csharp/Grpc.Examples/project.json.template
index b8a8314de1..42c2f31ce5 100644
--- a/templates/src/csharp/Grpc.Examples/project.json.template
+++ b/templates/src/csharp/Grpc.Examples/project.json.template
@@ -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/templates/src/csharp/Grpc.HealthCheck/project.json.template b/templates/src/csharp/Grpc.HealthCheck/project.json.template
index cba6894015..280d529e73 100644
--- a/templates/src/csharp/Grpc.HealthCheck/project.json.template
+++ b/templates/src/csharp/Grpc.HealthCheck/project.json.template
@@ -27,12 +27,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/templates/src/csharp/Grpc.IntegrationTesting/project.json.template b/templates/src/csharp/Grpc.IntegrationTesting/project.json.template
index 3ce94e5838..4d54e63a0e 100644
--- a/templates/src/csharp/Grpc.IntegrationTesting/project.json.template
+++ b/templates/src/csharp/Grpc.IntegrationTesting/project.json.template
@@ -17,10 +17,7 @@
},
"frameworks": {
"net45": {
- "frameworkAssemblies": {
- "System.Runtime": "",
- "System.IO": ""
- }
+ "frameworkAssemblies": {}
},
"netcoreapp1.0": {
"imports": [
diff --git a/templates/src/csharp/Grpc.Reflection/project.json.template b/templates/src/csharp/Grpc.Reflection/project.json.template
index 8a33e1ccc9..6d1c3e891f 100644
--- a/templates/src/csharp/Grpc.Reflection/project.json.template
+++ b/templates/src/csharp/Grpc.Reflection/project.json.template
@@ -27,12 +27,7 @@
"Google.Protobuf": "3.0.0"
},
"frameworks": {
- "net45": {
- "frameworkAssemblies": {
- "System.Runtime": "",
- "System.IO": ""
- }
- },
+ "net45": {},
"netstandard1.5": {
"dependencies": {
"NETStandard.Library": "1.6.0"