From 82fd31ac35c38a81b15e25d61971a9811303ee79 Mon Sep 17 00:00:00 2001 From: Alexander Polcyn Date: Mon, 25 Jul 2016 14:25:02 -0700 Subject: update nuget after installing in docker --- templates/tools/dockerfile/csharp_deps.include | 2 ++ 1 file changed, 2 insertions(+) (limited to 'templates') diff --git a/templates/tools/dockerfile/csharp_deps.include b/templates/tools/dockerfile/csharp_deps.include index 489dc44a43..7e89dec2cc 100644 --- a/templates/tools/dockerfile/csharp_deps.include +++ b/templates/tools/dockerfile/csharp_deps.include @@ -14,3 +14,5 @@ RUN apt-get update && apt-get -y dist-upgrade && apt-get install -y ${'\\'} ca-certificates-mono ${'\\'} nuget ${'\\'} && apt-get clean + +RUN nuget update -self -- cgit v1.2.3 From 86e40c6e353ec07f928a0d8c15d368f3f0c6a84b Mon Sep 17 00:00:00 2001 From: Alexander Polcyn Date: Wed, 27 Jul 2016 14:43:33 -0700 Subject: update templates to not include runtime sections in project.json --- src/csharp/Grpc.Examples/project.json | 5 +++++ templates/src/csharp/Grpc.Core/project.json.template | 2 +- templates/src/csharp/Grpc.Examples.MathClient/project.json.template | 2 +- templates/src/csharp/Grpc.Examples.MathServer/project.json.template | 2 +- .../csharp/Grpc.IntegrationTesting.QpsWorker/project.json.template | 2 +- .../Grpc.IntegrationTesting.StressClient/project.json.template | 2 +- templates/src/csharp/build_options.include | 4 +++- 7 files changed, 13 insertions(+), 6 deletions(-) (limited to 'templates') diff --git a/src/csharp/Grpc.Examples/project.json b/src/csharp/Grpc.Examples/project.json index 48ec530abb..5329f390e4 100644 --- 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": { diff --git a/templates/src/csharp/Grpc.Core/project.json.template b/templates/src/csharp/Grpc.Core/project.json.template index bd0e8b2c13..e6f8290200 100644 --- 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": { }, diff --git a/templates/src/csharp/Grpc.Examples.MathClient/project.json.template b/templates/src/csharp/Grpc.Examples.MathClient/project.json.template index 67151dbcfa..51c5e85c66 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"/> + <%include file="../build_options.include" args="executable=True,includeRuntimes=False"/> "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 67151dbcfa..51c5e85c66 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"/> + <%include file="../build_options.include" args="executable=True,includeRuntimes=False"/> "dependencies": { "Grpc.Examples": { "target": "project" diff --git a/templates/src/csharp/Grpc.IntegrationTesting.QpsWorker/project.json.template b/templates/src/csharp/Grpc.IntegrationTesting.QpsWorker/project.json.template index 93151f2b89..af1ee42509 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"/> + <%include file="../build_options.include" args="executable=True,includeData=True,includeRuntimes=False"/> "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 93151f2b89..af1ee42509 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"/> + <%include file="../build_options.include" args="executable=True,includeData=True,includeRuntimes=False"/> "dependencies": { "Grpc.IntegrationTesting": { "target": "project" diff --git a/templates/src/csharp/build_options.include b/templates/src/csharp/build_options.include index 169a45a808..a200897e0f 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"/>\ +<%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": { }, -- cgit v1.2.3