update templates to not include runtime sections in project.json

9 years ago · 86e40c6e35
parent 84f0f791e9
commit 86e40c6e35
7 changed files with 13 additions and 6 deletions
--- a/src/csharp/Grpc.Examples/project.json
+++ b/src/csharp/Grpc.Examples/project.json
@ -1,6 +1,11 @@
 {
  "buildOptions": {
  },
+  "runtimes": {
+    "win7-x64": { },
+    "debian.8-x64": { },
+    "osx.10.11-x64": { }
+  },

  "dependencies": {
    "Grpc.Core": {
--- a/templates/src/csharp/Grpc.Core/project.json.template
+++ b/templates/src/csharp/Grpc.Core/project.json.template
@ -33,7 +33,7 @@
      "xmlDoc": true
    },
    "dependencies": {
-      "Ix-Async": "1.2.5"
+      "System.Interactive.Async": "3.0.0"
    },
    "frameworks": {
      "net45": { },
--- 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"/>
+    <%include file="../build_options.include" args="executable=True,includeRuntimes=False"/>
    "dependencies": {
      "Grpc.Examples": {
        "target": "project"
--- 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"/>
+    <%include file="../build_options.include" args="executable=True,includeRuntimes=False"/>
    "dependencies": {
      "Grpc.Examples": {
        "target": "project"
--- 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"/>
+    <%include file="../build_options.include" args="executable=True,includeData=True,includeRuntimes=False"/>
    "dependencies": {
      "Grpc.IntegrationTesting": {
        "target": "project"
--- 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"/>
+    <%include file="../build_options.include" args="executable=True,includeData=True,includeRuntimes=False"/>
    "dependencies": {
      "Grpc.IntegrationTesting": {
        "target": "project"
--- a/templates/src/csharp/build_options.include
+++ b/templates/src/csharp/build_options.include
@ -1,4 +1,4 @@
-<%page args="executable=False,includeData=False"/>\
+<%page args="executable=False,includeData=False,includeRuntimes=True"/>\
 "buildOptions": {
  % if executable:
    "emitEntryPoint": true
@ -51,6 +51,8 @@
      }
    }
  },
+  %endif
+  % if includeRuntimes:
  "runtimes": {
    "win7-x64": { },
    "debian.8-x64": { },