diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-05-11 09:13:27 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-05-11 09:13:27 -0700 |
| commit | 5b9e7430d9e056b393ea6aec199260d763840ba5 (patch) | |
| tree | eec1d00f3f8c41435d7732d6694f8eca4d7b30ec /build.json | |
| parent | f7670f3054e4ed05715120728e345e4bb0a13d3d (diff) | |
| parent | ad21fea239769e2a3be14ac56ee747eb0f3c13a3 (diff) | |
Merge github.com:grpc/grpc into bye-bye-completion-queue-pie
Conflicts:
vsprojects/Grpc.mak
Diffstat (limited to 'build.json')
| -rw-r--r-- | build.json | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/build.json b/build.json index 43e9935ea3..fa97b121d2 100644 --- a/build.json +++ b/build.json @@ -555,7 +555,8 @@ "filegroups": [ "grpc++_base" ], - "secure": "no" + "secure": "no", + "vs_project_guid": "{6EE56155-DF7C-4F6E-BFC4-F6F776BEB211}" }, { "name": "grpc_plugin_support", @@ -1000,6 +1001,9 @@ "grpc", "gpr_test_util", "gpr" + ], + "platforms": [ + "posix" ] }, { @@ -1044,6 +1048,9 @@ "grpc", "gpr_test_util", "gpr" + ], + "platforms": [ + "posix" ] }, { @@ -1058,6 +1065,9 @@ "grpc", "gpr_test_util", "gpr" + ], + "platforms": [ + "posix" ] }, { @@ -1599,6 +1609,9 @@ "grpc", "gpr_test_util", "gpr" + ], + "platforms": [ + "posix" ] }, { @@ -1655,6 +1668,9 @@ "grpc", "gpr_test_util", "gpr" + ], + "platforms": [ + "posix" ] }, { @@ -1669,6 +1685,9 @@ "grpc", "gpr_test_util", "gpr" + ], + "platforms": [ + "posix" ] }, { @@ -1683,6 +1702,9 @@ "grpc", "gpr_test_util", "gpr" + ], + "platforms": [ + "posix" ] }, { |