Skip to content
Snippets Groups Projects
Commit 4e741049 authored by Nicolas Noble's avatar Nicolas Noble Committed by GitHub
Browse files

Merge pull request #7682 from apolcyn/add_runtime_nodes_back_in_ga

add all runtime nodes back into testing packages
parents f2d8c608 6bfe7dad
No related branches found
No related tags found
No related merge requests found
Showing
with 29 additions and 9 deletions
...@@ -42,6 +42,11 @@ ...@@ -42,6 +42,11 @@
} }
} }
}, },
"runtimes": {
"win7-x64": { },
"debian.8-x64": { },
"osx.10.11-x64": { }
},
"dependencies": { "dependencies": {
"Grpc.Examples": { "Grpc.Examples": {
......
...@@ -42,6 +42,11 @@ ...@@ -42,6 +42,11 @@
} }
} }
}, },
"runtimes": {
"win7-x64": { },
"debian.8-x64": { },
"osx.10.11-x64": { }
},
"dependencies": { "dependencies": {
"Grpc.Examples": { "Grpc.Examples": {
......
...@@ -20,11 +20,12 @@ ...@@ -20,11 +20,12 @@
"System.IO": "" "System.IO": ""
} }
}, },
"netstandard1.5": { "netcoreapp1.0": {
"imports": [ "imports": [
"portable-net45" "portable-net45"
], ],
"dependencies": { "dependencies": {
"Microsoft.NETCore.App": "1.0.0",
"NETStandard.Library": "1.6.0" "NETStandard.Library": "1.6.0"
} }
} }
......
...@@ -44,6 +44,11 @@ ...@@ -44,6 +44,11 @@
} }
} }
}, },
"runtimes": {
"win7-x64": { },
"debian.8-x64": { },
"osx.10.11-x64": { }
},
"dependencies": { "dependencies": {
"Grpc.IntegrationTesting": { "Grpc.IntegrationTesting": {
......
...@@ -44,6 +44,11 @@ ...@@ -44,6 +44,11 @@
} }
} }
}, },
"runtimes": {
"win7-x64": { },
"debian.8-x64": { },
"osx.10.11-x64": { }
},
"dependencies": { "dependencies": {
"Grpc.IntegrationTesting": { "Grpc.IntegrationTesting": {
......
%YAML 1.2 %YAML 1.2
--- | --- |
{ {
<%include file="../build_options.include" args="executable=True,includeRuntimes=False"/> <%include file="../build_options.include" args="executable=True"/>
"dependencies": { "dependencies": {
"Grpc.Examples": { "Grpc.Examples": {
"target": "project" "target": "project"
......
%YAML 1.2 %YAML 1.2
--- | --- |
{ {
<%include file="../build_options.include" args="executable=True,includeRuntimes=False"/> <%include file="../build_options.include" args="executable=True"/>
"dependencies": { "dependencies": {
"Grpc.Examples": { "Grpc.Examples": {
"target": "project" "target": "project"
......
...@@ -15,11 +15,12 @@ ...@@ -15,11 +15,12 @@
"System.IO": "" "System.IO": ""
} }
}, },
"netstandard1.5": { "netcoreapp1.0": {
"imports": [ "imports": [
"portable-net45" "portable-net45"
], ],
"dependencies": { "dependencies": {
"Microsoft.NETCore.App": "1.0.0",
"NETStandard.Library": "1.6.0" "NETStandard.Library": "1.6.0"
} }
} }
......
%YAML 1.2 %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": { "dependencies": {
"Grpc.IntegrationTesting": { "Grpc.IntegrationTesting": {
"target": "project" "target": "project"
......
%YAML 1.2 %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": { "dependencies": {
"Grpc.IntegrationTesting": { "Grpc.IntegrationTesting": {
"target": "project" "target": "project"
......
<%page args="executable=False,includeData=False,includeRuntimes=True"/>\ <%page args="executable=False,includeData=False"/>\
"buildOptions": { "buildOptions": {
% if executable: % if executable:
"emitEntryPoint": true "emitEntryPoint": true
...@@ -52,10 +52,8 @@ ...@@ -52,10 +52,8 @@
} }
}, },
%endif %endif
% if includeRuntimes:
"runtimes": { "runtimes": {
"win7-x64": { }, "win7-x64": { },
"debian.8-x64": { }, "debian.8-x64": { },
"osx.10.11-x64": { } "osx.10.11-x64": { }
}, },
% endif
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment