aboutsummaryrefslogtreecommitdiffhomepage
path: root/templates/src/csharp
diff options
context:
space:
mode:
authorGravatar Alexander Polcyn <apolcyn@google.com>2016-08-09 11:40:05 -0700
committerGravatar Alexander Polcyn <apolcyn@google.com>2016-08-09 13:10:53 -0700
commit6bfe7dadf71ce6637adef1adc990a653849f56c1 (patch)
treef24bba614eb492183630e6014de94136d0903da9 /templates/src/csharp
parent10776b99cfa17dceae79f2e96d6b694b3d636db2 (diff)
add all runtime nodes back into testing packages
Diffstat (limited to 'templates/src/csharp')
-rw-r--r--templates/src/csharp/Grpc.Examples.MathClient/project.json.template2
-rw-r--r--templates/src/csharp/Grpc.Examples.MathServer/project.json.template2
-rw-r--r--templates/src/csharp/Grpc.Examples/project.json.template3
-rw-r--r--templates/src/csharp/Grpc.IntegrationTesting.QpsWorker/project.json.template2
-rw-r--r--templates/src/csharp/Grpc.IntegrationTesting.StressClient/project.json.template2
-rw-r--r--templates/src/csharp/build_options.include4
6 files changed, 7 insertions, 8 deletions
diff --git a/templates/src/csharp/Grpc.Examples.MathClient/project.json.template b/templates/src/csharp/Grpc.Examples.MathClient/project.json.template
index 51c5e85c66..67151dbcfa 100644
--- a/templates/src/csharp/Grpc.Examples.MathClient/project.json.template
+++ b/templates/src/csharp/Grpc.Examples.MathClient/project.json.template
@@ -1,7 +1,7 @@
%YAML 1.2
--- |
{
- <%include file="../build_options.include" args="executable=True,includeRuntimes=False"/>
+ <%include file="../build_options.include" args="executable=True"/>
"dependencies": {
"Grpc.Examples": {
"target": "project"
diff --git a/templates/src/csharp/Grpc.Examples.MathServer/project.json.template b/templates/src/csharp/Grpc.Examples.MathServer/project.json.template
index 51c5e85c66..67151dbcfa 100644
--- a/templates/src/csharp/Grpc.Examples.MathServer/project.json.template
+++ b/templates/src/csharp/Grpc.Examples.MathServer/project.json.template
@@ -1,7 +1,7 @@
%YAML 1.2
--- |
{
- <%include file="../build_options.include" args="executable=True,includeRuntimes=False"/>
+ <%include file="../build_options.include" args="executable=True"/>
"dependencies": {
"Grpc.Examples": {
"target": "project"
diff --git a/templates/src/csharp/Grpc.Examples/project.json.template b/templates/src/csharp/Grpc.Examples/project.json.template
index d5d63f658e..117f842e01 100644
--- a/templates/src/csharp/Grpc.Examples/project.json.template
+++ b/templates/src/csharp/Grpc.Examples/project.json.template
@@ -15,11 +15,12 @@
"System.IO": ""
}
},
- "netstandard1.5": {
+ "netcoreapp1.0": {
"imports": [
"portable-net45"
],
"dependencies": {
+ "Microsoft.NETCore.App": "1.0.0",
"NETStandard.Library": "1.6.0"
}
}
diff --git a/templates/src/csharp/Grpc.IntegrationTesting.QpsWorker/project.json.template b/templates/src/csharp/Grpc.IntegrationTesting.QpsWorker/project.json.template
index af1ee42509..93151f2b89 100644
--- a/templates/src/csharp/Grpc.IntegrationTesting.QpsWorker/project.json.template
+++ b/templates/src/csharp/Grpc.IntegrationTesting.QpsWorker/project.json.template
@@ -1,7 +1,7 @@
%YAML 1.2
--- |
{
- <%include file="../build_options.include" args="executable=True,includeData=True,includeRuntimes=False"/>
+ <%include file="../build_options.include" args="executable=True,includeData=True"/>
"dependencies": {
"Grpc.IntegrationTesting": {
"target": "project"
diff --git a/templates/src/csharp/Grpc.IntegrationTesting.StressClient/project.json.template b/templates/src/csharp/Grpc.IntegrationTesting.StressClient/project.json.template
index af1ee42509..93151f2b89 100644
--- a/templates/src/csharp/Grpc.IntegrationTesting.StressClient/project.json.template
+++ b/templates/src/csharp/Grpc.IntegrationTesting.StressClient/project.json.template
@@ -1,7 +1,7 @@
%YAML 1.2
--- |
{
- <%include file="../build_options.include" args="executable=True,includeData=True,includeRuntimes=False"/>
+ <%include file="../build_options.include" args="executable=True,includeData=True"/>
"dependencies": {
"Grpc.IntegrationTesting": {
"target": "project"
diff --git a/templates/src/csharp/build_options.include b/templates/src/csharp/build_options.include
index a200897e0f..8597ae3367 100644
--- a/templates/src/csharp/build_options.include
+++ b/templates/src/csharp/build_options.include
@@ -1,4 +1,4 @@
-<%page args="executable=False,includeData=False,includeRuntimes=True"/>\
+<%page args="executable=False,includeData=False"/>\
"buildOptions": {
% if executable:
"emitEntryPoint": true
@@ -52,10 +52,8 @@
}
},
%endif
- % if includeRuntimes:
"runtimes": {
"win7-x64": { },
"debian.8-x64": { },
"osx.10.11-x64": { }
},
- % endif \ No newline at end of file