diff options
author | Craig Tiller <ctiller@google.com> | 2016-02-24 09:01:14 -0800 |
---|---|---|
committer | Craig Tiller <ctiller@google.com> | 2016-02-24 09:01:14 -0800 |
commit | ee1f1f347de8c9a74d8b2cf01840a44fbed83996 (patch) | |
tree | a0ee2bf2e305b40b95d4d13b525442de68ac8155 /vsprojects/vcxproj | |
parent | c605c62b30ca15c83a7c4e98386062c62de0d36d (diff) | |
parent | 9114a142c9211e0f3401166c0b753349573caf14 (diff) |
Merge branch 'hide-the-worker' into hide-the-pollset
Diffstat (limited to 'vsprojects/vcxproj')
13 files changed, 773 insertions, 171 deletions
diff --git a/vsprojects/vcxproj/grpc++_test_util/grpc++_test_util.vcxproj b/vsprojects/vcxproj/grpc++_test_util/grpc++_test_util.vcxproj index 3d353716a9..33860af620 100644 --- a/vsprojects/vcxproj/grpc++_test_util/grpc++_test_util.vcxproj +++ b/vsprojects/vcxproj/grpc++_test_util/grpc++_test_util.vcxproj @@ -153,6 +153,7 @@ <ClInclude Include="$(SolutionDir)\..\test\cpp\util\create_test_channel.h" /> <ClInclude Include="$(SolutionDir)\..\test\cpp\util\string_ref_helper.h" /> <ClInclude Include="$(SolutionDir)\..\test\cpp\util\subprocess.h" /> + <ClInclude Include="$(SolutionDir)\..\test\cpp\util\test_credentials_provider.h" /> </ItemGroup> <ItemGroup> <ClCompile Include="$(SolutionDir)\..\src\proto\grpc\testing\echo_messages.pb.cc"> @@ -191,6 +192,8 @@ </ClCompile> <ClCompile Include="$(SolutionDir)\..\test\cpp\util\subprocess.cc"> </ClCompile> + <ClCompile Include="$(SolutionDir)\..\test\cpp\util\test_credentials_provider.cc"> + </ClCompile> </ItemGroup> <ItemGroup> <ProjectReference Include="$(SolutionDir)\..\vsprojects\vcxproj\.\grpc++\grpc++.vcxproj"> diff --git a/vsprojects/vcxproj/grpc++_test_util/grpc++_test_util.vcxproj.filters b/vsprojects/vcxproj/grpc++_test_util/grpc++_test_util.vcxproj.filters index 27ac6751b9..b35ba1fd91 100644 --- a/vsprojects/vcxproj/grpc++_test_util/grpc++_test_util.vcxproj.filters +++ b/vsprojects/vcxproj/grpc++_test_util/grpc++_test_util.vcxproj.filters @@ -28,6 +28,9 @@ <ClCompile Include="$(SolutionDir)\..\test\cpp\util\subprocess.cc"> <Filter>test\cpp\util</Filter> </ClCompile> + <ClCompile Include="$(SolutionDir)\..\test\cpp\util\test_credentials_provider.cc"> + <Filter>test\cpp\util</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="$(SolutionDir)\..\test\cpp\end2end\test_service_impl.h"> @@ -48,6 +51,9 @@ <ClInclude Include="$(SolutionDir)\..\test\cpp\util\subprocess.h"> <Filter>test\cpp\util</Filter> </ClInclude> + <ClInclude Include="$(SolutionDir)\..\test\cpp\util\test_credentials_provider.h"> + <Filter>test\cpp\util</Filter> + </ClInclude> </ItemGroup> <ItemGroup> diff --git a/vsprojects/vcxproj/grpc/grpc.vcxproj b/vsprojects/vcxproj/grpc/grpc.vcxproj index f866a15f8b..4b39ff284f 100644 --- a/vsprojects/vcxproj/grpc/grpc.vcxproj +++ b/vsprojects/vcxproj/grpc/grpc.vcxproj @@ -282,20 +282,6 @@ <ClInclude Include="$(SolutionDir)\..\include\grpc\census.h" /> </ItemGroup> <ItemGroup> - <ClInclude Include="$(SolutionDir)\..\src\core\security\auth_filters.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\security\base64.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\security\credentials.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\security\handshake.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\security\json_token.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\security\jwt_verifier.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\security\secure_endpoint.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\security\security_connector.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\security\security_context.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\tsi\fake_transport_security.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\tsi\ssl_transport_security.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\tsi\ssl_types.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\tsi\transport_security.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\tsi\transport_security_interface.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\census\grpc_filter.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\channel\channel_args.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\channel\channel_stack.h" /> @@ -310,6 +296,7 @@ <ClInclude Include="$(SolutionDir)\..\src\core\client_config\client_config.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\client_config\connector.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\client_config\initial_connect_string.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\client_config\lb_policies\load_balancer_api.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\client_config\lb_policies\pick_first.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\client_config\lb_policies\round_robin.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\client_config\lb_policy.h" /> @@ -370,6 +357,7 @@ <ClInclude Include="$(SolutionDir)\..\src\core\json\json_common.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\json\json_reader.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\json\json_writer.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\proto\grpc\lb\v0\load_balancer.pb.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\statistics\census_interface.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\statistics\census_rpc_stats.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\surface\api_trace.h" /> @@ -409,53 +397,29 @@ <ClInclude Include="$(SolutionDir)\..\src\core\transport\static_metadata.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\transport\transport.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\transport\transport_impl.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\security\auth_filters.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\security\base64.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\security\credentials.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\security\handshake.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\security\json_token.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\security\jwt_verifier.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\security\secure_endpoint.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\security\security_connector.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\security\security_context.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\tsi\fake_transport_security.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\tsi\ssl_transport_security.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\tsi\ssl_types.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\tsi\transport_security.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\tsi\transport_security_interface.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\census\aggregation.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\census\log.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\census\mlog.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\census\rpc_metric_id.h" /> + <ClInclude Include="$(SolutionDir)\..\third_party\nanopb\pb.h" /> + <ClInclude Include="$(SolutionDir)\..\third_party\nanopb\pb_common.h" /> + <ClInclude Include="$(SolutionDir)\..\third_party\nanopb\pb_decode.h" /> + <ClInclude Include="$(SolutionDir)\..\third_party\nanopb\pb_encode.h" /> </ItemGroup> <ItemGroup> - <ClCompile Include="$(SolutionDir)\..\src\core\httpcli\httpcli_security_connector.c"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\security\base64.c"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\security\client_auth_filter.c"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\security\credentials.c"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\security\credentials_metadata.c"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\security\credentials_posix.c"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\security\credentials_win32.c"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\security\google_default_credentials.c"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\security\handshake.c"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\security\json_token.c"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\security\jwt_verifier.c"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\security\secure_endpoint.c"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\security\security_connector.c"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\security\security_context.c"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\security\server_auth_filter.c"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\security\server_secure_chttp2.c"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\surface\init_secure.c"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\surface\secure_channel_create.c"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\tsi\fake_transport_security.c"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\tsi\ssl_transport_security.c"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\tsi\transport_security.c"> - </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\census\grpc_context.c"> </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\census\grpc_filter.c"> @@ -486,6 +450,8 @@ </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\client_config\initial_connect_string.c"> </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\client_config\lb_policies\load_balancer_api.c"> + </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\client_config\lb_policies\pick_first.c"> </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\client_config\lb_policies\round_robin.c"> @@ -614,6 +580,8 @@ </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\json\json_writer.c"> </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\proto\grpc\lb\v0\load_balancer.pb.c"> + </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\surface\alarm.c"> </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\surface\api_trace.c"> @@ -712,11 +680,53 @@ </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\transport\transport_op_string.c"> </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\httpcli\httpcli_security_connector.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\security\base64.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\security\client_auth_filter.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\security\credentials.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\security\credentials_metadata.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\security\credentials_posix.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\security\credentials_win32.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\security\google_default_credentials.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\security\handshake.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\security\json_token.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\security\jwt_verifier.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\security\secure_endpoint.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\security\security_connector.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\security\security_context.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\security\server_auth_filter.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\security\server_secure_chttp2.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\surface\init_secure.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\surface\secure_channel_create.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\tsi\fake_transport_security.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\tsi\ssl_transport_security.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\tsi\transport_security.c"> + </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\census\context.c"> </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\census\initialize.c"> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\census\log.c"> + <ClCompile Include="$(SolutionDir)\..\src\core\census\mlog.c"> </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\census\operation.c"> </ClCompile> @@ -724,6 +734,12 @@ </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\census\tracing.c"> </ClCompile> + <ClCompile Include="$(SolutionDir)\..\third_party\nanopb\pb_common.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\third_party\nanopb\pb_decode.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\third_party\nanopb\pb_encode.c"> + </ClCompile> </ItemGroup> <ItemGroup> <ProjectReference Include="$(SolutionDir)\..\vsprojects\vcxproj\.\gpr\gpr.vcxproj"> diff --git a/vsprojects/vcxproj/grpc/grpc.vcxproj.filters b/vsprojects/vcxproj/grpc/grpc.vcxproj.filters index 344cdcf9a9..1989a47059 100644 --- a/vsprojects/vcxproj/grpc/grpc.vcxproj.filters +++ b/vsprojects/vcxproj/grpc/grpc.vcxproj.filters @@ -1,69 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> - <ClCompile Include="$(SolutionDir)\..\src\core\httpcli\httpcli_security_connector.c"> - <Filter>src\core\httpcli</Filter> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\security\base64.c"> - <Filter>src\core\security</Filter> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\security\client_auth_filter.c"> - <Filter>src\core\security</Filter> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\security\credentials.c"> - <Filter>src\core\security</Filter> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\security\credentials_metadata.c"> - <Filter>src\core\security</Filter> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\security\credentials_posix.c"> - <Filter>src\core\security</Filter> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\security\credentials_win32.c"> - <Filter>src\core\security</Filter> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\security\google_default_credentials.c"> - <Filter>src\core\security</Filter> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\security\handshake.c"> - <Filter>src\core\security</Filter> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\security\json_token.c"> - <Filter>src\core\security</Filter> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\security\jwt_verifier.c"> - <Filter>src\core\security</Filter> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\security\secure_endpoint.c"> - <Filter>src\core\security</Filter> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\security\security_connector.c"> - <Filter>src\core\security</Filter> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\security\security_context.c"> - <Filter>src\core\security</Filter> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\security\server_auth_filter.c"> - <Filter>src\core\security</Filter> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\security\server_secure_chttp2.c"> - <Filter>src\core\security</Filter> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\surface\init_secure.c"> - <Filter>src\core\surface</Filter> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\surface\secure_channel_create.c"> - <Filter>src\core\surface</Filter> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\tsi\fake_transport_security.c"> - <Filter>src\core\tsi</Filter> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\tsi\ssl_transport_security.c"> - <Filter>src\core\tsi</Filter> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\tsi\transport_security.c"> - <Filter>src\core\tsi</Filter> - </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\census\grpc_context.c"> <Filter>src\core\census</Filter> </ClCompile> @@ -109,6 +46,9 @@ <ClCompile Include="$(SolutionDir)\..\src\core\client_config\initial_connect_string.c"> <Filter>src\core\client_config</Filter> </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\client_config\lb_policies\load_balancer_api.c"> + <Filter>src\core\client_config\lb_policies</Filter> + </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\client_config\lb_policies\pick_first.c"> <Filter>src\core\client_config\lb_policies</Filter> </ClCompile> @@ -301,6 +241,9 @@ <ClCompile Include="$(SolutionDir)\..\src\core\json\json_writer.c"> <Filter>src\core\json</Filter> </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\proto\grpc\lb\v0\load_balancer.pb.c"> + <Filter>src\core\proto\grpc\lb\v0</Filter> + </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\surface\alarm.c"> <Filter>src\core\surface</Filter> </ClCompile> @@ -448,13 +391,76 @@ <ClCompile Include="$(SolutionDir)\..\src\core\transport\transport_op_string.c"> <Filter>src\core\transport</Filter> </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\httpcli\httpcli_security_connector.c"> + <Filter>src\core\httpcli</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\security\base64.c"> + <Filter>src\core\security</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\security\client_auth_filter.c"> + <Filter>src\core\security</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\security\credentials.c"> + <Filter>src\core\security</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\security\credentials_metadata.c"> + <Filter>src\core\security</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\security\credentials_posix.c"> + <Filter>src\core\security</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\security\credentials_win32.c"> + <Filter>src\core\security</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\security\google_default_credentials.c"> + <Filter>src\core\security</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\security\handshake.c"> + <Filter>src\core\security</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\security\json_token.c"> + <Filter>src\core\security</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\security\jwt_verifier.c"> + <Filter>src\core\security</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\security\secure_endpoint.c"> + <Filter>src\core\security</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\security\security_connector.c"> + <Filter>src\core\security</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\security\security_context.c"> + <Filter>src\core\security</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\security\server_auth_filter.c"> + <Filter>src\core\security</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\security\server_secure_chttp2.c"> + <Filter>src\core\security</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\surface\init_secure.c"> + <Filter>src\core\surface</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\surface\secure_channel_create.c"> + <Filter>src\core\surface</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\tsi\fake_transport_security.c"> + <Filter>src\core\tsi</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\tsi\ssl_transport_security.c"> + <Filter>src\core\tsi</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\tsi\transport_security.c"> + <Filter>src\core\tsi</Filter> + </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\census\context.c"> <Filter>src\core\census</Filter> </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\census\initialize.c"> <Filter>src\core\census</Filter> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\census\log.c"> + <ClCompile Include="$(SolutionDir)\..\src\core\census\mlog.c"> <Filter>src\core\census</Filter> </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\census\operation.c"> @@ -466,6 +472,15 @@ <ClCompile Include="$(SolutionDir)\..\src\core\census\tracing.c"> <Filter>src\core\census</Filter> </ClCompile> + <ClCompile Include="$(SolutionDir)\..\third_party\nanopb\pb_common.c"> + <Filter>third_party\nanopb</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\third_party\nanopb\pb_decode.c"> + <Filter>third_party\nanopb</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\third_party\nanopb\pb_encode.c"> + <Filter>third_party\nanopb</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="$(SolutionDir)\..\include\grpc\grpc_security.h"> @@ -509,48 +524,6 @@ </ClInclude> </ItemGroup> <ItemGroup> - <ClInclude Include="$(SolutionDir)\..\src\core\security\auth_filters.h"> - <Filter>src\core\security</Filter> - </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\security\base64.h"> - <Filter>src\core\security</Filter> - </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\security\credentials.h"> - <Filter>src\core\security</Filter> - </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\security\handshake.h"> - <Filter>src\core\security</Filter> - </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\security\json_token.h"> - <Filter>src\core\security</Filter> - </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\security\jwt_verifier.h"> - <Filter>src\core\security</Filter> - </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\security\secure_endpoint.h"> - <Filter>src\core\security</Filter> - </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\security\security_connector.h"> - <Filter>src\core\security</Filter> - </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\security\security_context.h"> - <Filter>src\core\security</Filter> - </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\tsi\fake_transport_security.h"> - <Filter>src\core\tsi</Filter> - </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\tsi\ssl_transport_security.h"> - <Filter>src\core\tsi</Filter> - </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\tsi\ssl_types.h"> - <Filter>src\core\tsi</Filter> - </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\tsi\transport_security.h"> - <Filter>src\core\tsi</Filter> - </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\tsi\transport_security_interface.h"> - <Filter>src\core\tsi</Filter> - </ClInclude> <ClInclude Include="$(SolutionDir)\..\src\core\census\grpc_filter.h"> <Filter>src\core\census</Filter> </ClInclude> @@ -593,6 +566,9 @@ <ClInclude Include="$(SolutionDir)\..\src\core\client_config\initial_connect_string.h"> <Filter>src\core\client_config</Filter> </ClInclude> + <ClInclude Include="$(SolutionDir)\..\src\core\client_config\lb_policies\load_balancer_api.h"> + <Filter>src\core\client_config\lb_policies</Filter> + </ClInclude> <ClInclude Include="$(SolutionDir)\..\src\core\client_config\lb_policies\pick_first.h"> <Filter>src\core\client_config\lb_policies</Filter> </ClInclude> @@ -773,6 +749,9 @@ <ClInclude Include="$(SolutionDir)\..\src\core\json\json_writer.h"> <Filter>src\core\json</Filter> </ClInclude> + <ClInclude Include="$(SolutionDir)\..\src\core\proto\grpc\lb\v0\load_balancer.pb.h"> + <Filter>src\core\proto\grpc\lb\v0</Filter> + </ClInclude> <ClInclude Include="$(SolutionDir)\..\src\core\statistics\census_interface.h"> <Filter>src\core\statistics</Filter> </ClInclude> @@ -890,15 +869,69 @@ <ClInclude Include="$(SolutionDir)\..\src\core\transport\transport_impl.h"> <Filter>src\core\transport</Filter> </ClInclude> + <ClInclude Include="$(SolutionDir)\..\src\core\security\auth_filters.h"> + <Filter>src\core\security</Filter> + </ClInclude> + <ClInclude Include="$(SolutionDir)\..\src\core\security\base64.h"> + <Filter>src\core\security</Filter> + </ClInclude> + <ClInclude Include="$(SolutionDir)\..\src\core\security\credentials.h"> + <Filter>src\core\security</Filter> + </ClInclude> + <ClInclude Include="$(SolutionDir)\..\src\core\security\handshake.h"> + <Filter>src\core\security</Filter> + </ClInclude> + <ClInclude Include="$(SolutionDir)\..\src\core\security\json_token.h"> + <Filter>src\core\security</Filter> + </ClInclude> + <ClInclude Include="$(SolutionDir)\..\src\core\security\jwt_verifier.h"> + <Filter>src\core\security</Filter> + </ClInclude> + <ClInclude Include="$(SolutionDir)\..\src\core\security\secure_endpoint.h"> + <Filter>src\core\security</Filter> + </ClInclude> + <ClInclude Include="$(SolutionDir)\..\src\core\security\security_connector.h"> + <Filter>src\core\security</Filter> + </ClInclude> + <ClInclude Include="$(SolutionDir)\..\src\core\security\security_context.h"> + <Filter>src\core\security</Filter> + </ClInclude> + <ClInclude Include="$(SolutionDir)\..\src\core\tsi\fake_transport_security.h"> + <Filter>src\core\tsi</Filter> + </ClInclude> + <ClInclude Include="$(SolutionDir)\..\src\core\tsi\ssl_transport_security.h"> + <Filter>src\core\tsi</Filter> + </ClInclude> + <ClInclude Include="$(SolutionDir)\..\src\core\tsi\ssl_types.h"> + <Filter>src\core\tsi</Filter> + </ClInclude> + <ClInclude Include="$(SolutionDir)\..\src\core\tsi\transport_security.h"> + <Filter>src\core\tsi</Filter> + </ClInclude> + <ClInclude Include="$(SolutionDir)\..\src\core\tsi\transport_security_interface.h"> + <Filter>src\core\tsi</Filter> + </ClInclude> <ClInclude Include="$(SolutionDir)\..\src\core\census\aggregation.h"> <Filter>src\core\census</Filter> </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\census\log.h"> + <ClInclude Include="$(SolutionDir)\..\src\core\census\mlog.h"> <Filter>src\core\census</Filter> </ClInclude> <ClInclude Include="$(SolutionDir)\..\src\core\census\rpc_metric_id.h"> <Filter>src\core\census</Filter> </ClInclude> + <ClInclude Include="$(SolutionDir)\..\third_party\nanopb\pb.h"> + <Filter>third_party\nanopb</Filter> + </ClInclude> + <ClInclude Include="$(SolutionDir)\..\third_party\nanopb\pb_common.h"> + <Filter>third_party\nanopb</Filter> + </ClInclude> + <ClInclude Include="$(SolutionDir)\..\third_party\nanopb\pb_decode.h"> + <Filter>third_party\nanopb</Filter> + </ClInclude> + <ClInclude Include="$(SolutionDir)\..\third_party\nanopb\pb_encode.h"> + <Filter>third_party\nanopb</Filter> + </ClInclude> </ItemGroup> <ItemGroup> @@ -950,6 +983,18 @@ <Filter Include="src\core\json"> <UniqueIdentifier>{e665cc0e-b994-d7c5-cc18-2007392019f0}</UniqueIdentifier> </Filter> + <Filter Include="src\core\proto"> + <UniqueIdentifier>{1ff04466-0905-8a5d-d6f4-7ff2df4c13b5}</UniqueIdentifier> + </Filter> + <Filter Include="src\core\proto\grpc"> + <UniqueIdentifier>{7c7ad0b3-bf85-5bd3-e0c8-4f5468a8e2e6}</UniqueIdentifier> + </Filter> + <Filter Include="src\core\proto\grpc\lb"> + <UniqueIdentifier>{3d533dad-8100-e8a3-b7c3-1fc13a4d60da}</UniqueIdentifier> + </Filter> + <Filter Include="src\core\proto\grpc\lb\v0"> + <UniqueIdentifier>{0ffcf868-7617-5fed-b6ce-2162d9d09148}</UniqueIdentifier> + </Filter> <Filter Include="src\core\security"> <UniqueIdentifier>{1d850ac6-e639-4eab-5338-4ba40272fcc9}</UniqueIdentifier> </Filter> @@ -968,6 +1013,12 @@ <Filter Include="src\core\tsi"> <UniqueIdentifier>{0b0f9ab1-efa4-7f03-e446-6fb9b5227e84}</UniqueIdentifier> </Filter> + <Filter Include="third_party"> + <UniqueIdentifier>{aaab30a4-2a15-732e-c141-3fbc0f0f5a7a}</UniqueIdentifier> + </Filter> + <Filter Include="third_party\nanopb"> + <UniqueIdentifier>{93d6596d-330c-1d27-6f84-3c840e57869e}</UniqueIdentifier> + </Filter> </ItemGroup> </Project> diff --git a/vsprojects/vcxproj/grpc_dll/grpc_dll.vcxproj b/vsprojects/vcxproj/grpc_dll/grpc_dll.vcxproj new file mode 100644 index 0000000000..cafc951867 --- /dev/null +++ b/vsprojects/vcxproj/grpc_dll/grpc_dll.vcxproj @@ -0,0 +1,200 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$(SolutionDir)\..\vsprojects\packages\grpc.dependencies.openssl.1.0.204.1\build\native\grpc.dependencies.openssl.props" Condition="Exists('$(SolutionDir)\..\vsprojects\packages\grpc.dependencies.openssl.1.0.204.1\build\native\1.0.204.1.props')" /> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{A2F6CBBA-A553-41B3-A7DE-F26DECCC27F0}</ProjectGuid> + <IgnoreWarnIntDirInTempDetected>true</IgnoreWarnIntDirInTempDetected> + <IntDir>$(SolutionDir)IntDir\$(MSBuildProjectName)\</IntDir> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(VisualStudioVersion)' == '10.0'" Label="Configuration"> + <PlatformToolset>v100</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(VisualStudioVersion)' == '11.0'" Label="Configuration"> + <PlatformToolset>v110</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(VisualStudioVersion)' == '12.0'" Label="Configuration"> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(VisualStudioVersion)' == '14.0'" Label="Configuration"> + <PlatformToolset>v140</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="$(SolutionDir)\..\vsprojects\global.props" /> + <Import Project="$(SolutionDir)\..\vsprojects\openssl.props" /> + <Import Project="$(SolutionDir)\..\vsprojects\winsock.props" /> + <Import Project="$(SolutionDir)\..\vsprojects\zlib.props" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup Condition="'$(Configuration)'=='Debug'"> + <TargetName>grpc_dll</TargetName> + <Linkage-grpc_dependencies_zlib>static</Linkage-grpc_dependencies_zlib> + <Configuration-grpc_dependencies_zlib>Debug</Configuration-grpc_dependencies_zlib> + <Linkage-grpc_dependencies_openssl>static</Linkage-grpc_dependencies_openssl> + <Configuration-grpc_dependencies_openssl>Debug</Configuration-grpc_dependencies_openssl> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)'=='Release'"> + <TargetName>grpc_dll</TargetName> + <Linkage-grpc_dependencies_zlib>static</Linkage-grpc_dependencies_zlib> + <Configuration-grpc_dependencies_zlib>Release</Configuration-grpc_dependencies_zlib> + <Linkage-grpc_dependencies_openssl>static</Linkage-grpc_dependencies_openssl> + <Configuration-grpc_dependencies_openssl>Release</Configuration-grpc_dependencies_openssl> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + <TreatWarningAsError>true</TreatWarningAsError> + <DebugInformationFormat Condition="$(Jenkins)">None</DebugInformationFormat> + <MinimalRebuild Condition="$(Jenkins)">false</MinimalRebuild> + </ClCompile> + <Link> + <SubSystem>Windows</SubSystem> + <GenerateDebugInformation Condition="!$(Jenkins)">true</GenerateDebugInformation> + <GenerateDebugInformation Condition="$(Jenkins)">false</GenerateDebugInformation> + <ModuleDefinitionFile>$(SolutionDir)\..\grpc.def</ModuleDefinitionFile> + </Link> + </ItemDefinitionGroup> + + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + <TreatWarningAsError>true</TreatWarningAsError> + <DebugInformationFormat Condition="$(Jenkins)">None</DebugInformationFormat> + <MinimalRebuild Condition="$(Jenkins)">false</MinimalRebuild> + </ClCompile> + <Link> + <SubSystem>Windows</SubSystem> + <GenerateDebugInformation Condition="!$(Jenkins)">true</GenerateDebugInformation> + <GenerateDebugInformation Condition="$(Jenkins)">false</GenerateDebugInformation> + <ModuleDefinitionFile>$(SolutionDir)\..\grpc.def</ModuleDefinitionFile> + </Link> + </ItemDefinitionGroup> + + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <SDLCheck>true</SDLCheck> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + <TreatWarningAsError>true</TreatWarningAsError> + <DebugInformationFormat Condition="$(Jenkins)">None</DebugInformationFormat> + <MinimalRebuild Condition="$(Jenkins)">false</MinimalRebuild> + </ClCompile> + <Link> + <SubSystem>Windows</SubSystem> + <GenerateDebugInformation Condition="!$(Jenkins)">true</GenerateDebugInformation> + <GenerateDebugInformation Condition="$(Jenkins)">false</GenerateDebugInformation> + <ModuleDefinitionFile>$(SolutionDir)\..\grpc.def</ModuleDefinitionFile> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + </Link> + </ItemDefinitionGroup> + + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <SDLCheck>true</SDLCheck> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + <TreatWarningAsError>true</TreatWarningAsError> + <DebugInformationFormat Condition="$(Jenkins)">None</DebugInformationFormat> + <MinimalRebuild Condition="$(Jenkins)">false</MinimalRebuild> + </ClCompile> + <Link> + <SubSystem>Windows</SubSystem> + <GenerateDebugInformation Condition="!$(Jenkins)">true</GenerateDebugInformation> + <GenerateDebugInformation Condition="$(Jenkins)">false</GenerateDebugInformation> + <ModuleDefinitionFile>$(SolutionDir)\..\grpc.def</ModuleDefinitionFile> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + </Link> + </ItemDefinitionGroup> + + <ItemGroup> + <None Include="$(SolutionDir)\..\grpc.def" /> + </ItemGroup> + <ItemGroup> + <ClCompile Include="$(SolutionDir)\..\vsprojects\dummy.c"> + </ClCompile> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="$(SolutionDir)\..\vsprojects\vcxproj\.\gpr\gpr.vcxproj"> + <Project>{B23D3D1A-9438-4EDA-BEB6-9A0A03D17792}</Project> + </ProjectReference> + <ProjectReference Include="$(SolutionDir)\..\vsprojects\vcxproj\.\grpc\grpc.vcxproj"> + <Project>{29D16885-7228-4C31-81ED-5F9187C7F2A9}</Project> + </ProjectReference> + </ItemGroup> + <ItemGroup> + <None Include="packages.config" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + <Import Project="$(SolutionDir)\..\vsprojects\packages\grpc.dependencies.zlib.redist.1.2.8.10\build\native\grpc.dependencies.zlib.redist.targets" Condition="Exists('$(SolutionDir)\..\vsprojects\packages\grpc.dependencies.zlib.redist.1.2.8.10\build\native\grpc.dependencies\grpc.dependencies.zlib.targets')" /> + <Import Project="$(SolutionDir)\..\vsprojects\packages\grpc.dependencies.zlib.1.2.8.10\build\native\grpc.dependencies.zlib.targets" Condition="Exists('$(SolutionDir)\..\vsprojects\packages\grpc.dependencies.zlib.1.2.8.10\build\native\grpc.dependencies\grpc.dependencies.zlib.targets')" /> + <Import Project="$(SolutionDir)\..\vsprojects\packages\grpc.dependencies.openssl.redist.1.0.204.1\build\native\grpc.dependencies.openssl.redist.targets" Condition="Exists('$(SolutionDir)\..\vsprojects\packages\grpc.dependencies.openssl.redist.1.0.204.1\build\native\grpc.dependencies\grpc.dependencies.openssl.targets')" /> + <Import Project="$(SolutionDir)\..\vsprojects\packages\grpc.dependencies.openssl.1.0.204.1\build\native\grpc.dependencies.openssl.targets" Condition="Exists('$(SolutionDir)\..\vsprojects\packages\grpc.dependencies.openssl.1.0.204.1\build\native\grpc.dependencies\grpc.dependencies.openssl.targets')" /> + </ImportGroup> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> + <PropertyGroup> + <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> + </PropertyGroup> + <Error Condition="!Exists('$(SolutionDir)\..\vsprojects\packages\grpc.dependencies.zlib.redist.1.2.8.10\build\native\grpc.dependencies.zlib.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\..\vsprojects\packages\grpc.dependencies.zlib.redist.1.2.8.10\build\native\grpc.dependencies.zlib.redist.targets')" /> + <Error Condition="!Exists('$(SolutionDir)\..\vsprojects\packages\grpc.dependencies.zlib.1.2.8.10\build\native\grpc.dependencies.zlib.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\..\vsprojects\packages\grpc.dependencies.zlib.1.2.8.10\build\native\grpc.dependencies.zlib.targets')" /> + <Error Condition="!Exists('$(SolutionDir)\..\vsprojects\packages\grpc.dependencies.openssl.redist.1.0.204.1\build\native\grpc.dependencies.openssl.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\..\vsprojects\packages\grpc.dependencies.openssl.redist.1.0.204.1\build\native\grpc.dependencies.openssl.redist.targets')" /> + <Error Condition="!Exists('$(SolutionDir)\..\vsprojects\packages\grpc.dependencies.openssl.1.0.204.1\build\native\grpc.dependencies.openssl.props')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\..\vsprojects\packages\grpc.dependencies.openssl.1.0.204.1\build\native\grpc.dependencies.openssl.props')" /> + <Error Condition="!Exists('$(SolutionDir)\..\vsprojects\packages\grpc.dependencies.openssl.1.0.204.1\build\native\grpc.dependencies.openssl.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\..\vsprojects\packages\grpc.dependencies.openssl.1.0.204.1\build\native\grpc.dependencies.openssl.targets')" /> + </Target> +</Project> + diff --git a/vsprojects/vcxproj/grpc_dll/grpc_dll.vcxproj.filters b/vsprojects/vcxproj/grpc_dll/grpc_dll.vcxproj.filters new file mode 100644 index 0000000000..8493ace0a2 --- /dev/null +++ b/vsprojects/vcxproj/grpc_dll/grpc_dll.vcxproj.filters @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <None Include="$(SolutionDir)\..\grpc.def" /> + </ItemGroup> + + <ItemGroup> + </ItemGroup> +</Project> + diff --git a/vsprojects/vcxproj/grpc_plugin_support/grpc_plugin_support.vcxproj b/vsprojects/vcxproj/grpc_plugin_support/grpc_plugin_support.vcxproj index 89183902d7..a76c883903 100644 --- a/vsprojects/vcxproj/grpc_plugin_support/grpc_plugin_support.vcxproj +++ b/vsprojects/vcxproj/grpc_plugin_support/grpc_plugin_support.vcxproj @@ -53,6 +53,7 @@ <ImportGroup Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(SolutionDir)\..\vsprojects\global.props" /> + <Import Project="$(SolutionDir)\..\vsprojects\protoc.props" /> <Import Project="$(SolutionDir)\..\vsprojects\winsock.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> diff --git a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj index 78c3bcd0e9..d61c5a7574 100644 --- a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj +++ b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj @@ -286,6 +286,7 @@ <ClInclude Include="$(SolutionDir)\..\src\core\client_config\client_config.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\client_config\connector.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\client_config\initial_connect_string.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\client_config\lb_policies\load_balancer_api.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\client_config\lb_policies\pick_first.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\client_config\lb_policies\round_robin.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\client_config\lb_policy.h" /> @@ -346,6 +347,7 @@ <ClInclude Include="$(SolutionDir)\..\src\core\json\json_common.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\json\json_reader.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\json\json_writer.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\proto\grpc\lb\v0\load_balancer.pb.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\statistics\census_interface.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\statistics\census_rpc_stats.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\surface\api_trace.h" /> @@ -386,8 +388,12 @@ <ClInclude Include="$(SolutionDir)\..\src\core\transport\transport.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\transport\transport_impl.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\census\aggregation.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\census\log.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\census\mlog.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\census\rpc_metric_id.h" /> + <ClInclude Include="$(SolutionDir)\..\third_party\nanopb\pb.h" /> + <ClInclude Include="$(SolutionDir)\..\third_party\nanopb\pb_common.h" /> + <ClInclude Include="$(SolutionDir)\..\third_party\nanopb\pb_decode.h" /> + <ClInclude Include="$(SolutionDir)\..\third_party\nanopb\pb_encode.h" /> </ItemGroup> <ItemGroup> <ClCompile Include="$(SolutionDir)\..\src\core\surface\init_unsecure.c"> @@ -422,6 +428,8 @@ </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\client_config\initial_connect_string.c"> </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\client_config\lb_policies\load_balancer_api.c"> + </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\client_config\lb_policies\pick_first.c"> </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\client_config\lb_policies\round_robin.c"> @@ -550,6 +558,8 @@ </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\json\json_writer.c"> </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\proto\grpc\lb\v0\load_balancer.pb.c"> + </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\surface\alarm.c"> </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\surface\api_trace.c"> @@ -652,7 +662,7 @@ </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\census\initialize.c"> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\census\log.c"> + <ClCompile Include="$(SolutionDir)\..\src\core\census\mlog.c"> </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\census\operation.c"> </ClCompile> @@ -660,6 +670,12 @@ </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\census\tracing.c"> </ClCompile> + <ClCompile Include="$(SolutionDir)\..\third_party\nanopb\pb_common.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\third_party\nanopb\pb_decode.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\third_party\nanopb\pb_encode.c"> + </ClCompile> </ItemGroup> <ItemGroup> <ProjectReference Include="$(SolutionDir)\..\vsprojects\vcxproj\.\gpr\gpr.vcxproj"> diff --git a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters index 063bb47dfa..ee51cafd25 100644 --- a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters +++ b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters @@ -49,6 +49,9 @@ <ClCompile Include="$(SolutionDir)\..\src\core\client_config\initial_connect_string.c"> <Filter>src\core\client_config</Filter> </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\client_config\lb_policies\load_balancer_api.c"> + <Filter>src\core\client_config\lb_policies</Filter> + </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\client_config\lb_policies\pick_first.c"> <Filter>src\core\client_config\lb_policies</Filter> </ClCompile> @@ -241,6 +244,9 @@ <ClCompile Include="$(SolutionDir)\..\src\core\json\json_writer.c"> <Filter>src\core\json</Filter> </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\proto\grpc\lb\v0\load_balancer.pb.c"> + <Filter>src\core\proto\grpc\lb\v0</Filter> + </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\surface\alarm.c"> <Filter>src\core\surface</Filter> </ClCompile> @@ -394,7 +400,7 @@ <ClCompile Include="$(SolutionDir)\..\src\core\census\initialize.c"> <Filter>src\core\census</Filter> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\census\log.c"> + <ClCompile Include="$(SolutionDir)\..\src\core\census\mlog.c"> <Filter>src\core\census</Filter> </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\census\operation.c"> @@ -406,6 +412,15 @@ <ClCompile Include="$(SolutionDir)\..\src\core\census\tracing.c"> <Filter>src\core\census</Filter> </ClCompile> + <ClCompile Include="$(SolutionDir)\..\third_party\nanopb\pb_common.c"> + <Filter>third_party\nanopb</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\third_party\nanopb\pb_decode.c"> + <Filter>third_party\nanopb</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\third_party\nanopb\pb_encode.c"> + <Filter>third_party\nanopb</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="$(SolutionDir)\..\include\grpc\byte_buffer.h"> @@ -488,6 +503,9 @@ <ClInclude Include="$(SolutionDir)\..\src\core\client_config\initial_connect_string.h"> <Filter>src\core\client_config</Filter> </ClInclude> + <ClInclude Include="$(SolutionDir)\..\src\core\client_config\lb_policies\load_balancer_api.h"> + <Filter>src\core\client_config\lb_policies</Filter> + </ClInclude> <ClInclude Include="$(SolutionDir)\..\src\core\client_config\lb_policies\pick_first.h"> <Filter>src\core\client_config\lb_policies</Filter> </ClInclude> @@ -668,6 +686,9 @@ <ClInclude Include="$(SolutionDir)\..\src\core\json\json_writer.h"> <Filter>src\core\json</Filter> </ClInclude> + <ClInclude Include="$(SolutionDir)\..\src\core\proto\grpc\lb\v0\load_balancer.pb.h"> + <Filter>src\core\proto\grpc\lb\v0</Filter> + </ClInclude> <ClInclude Include="$(SolutionDir)\..\src\core\statistics\census_interface.h"> <Filter>src\core\statistics</Filter> </ClInclude> @@ -788,12 +809,24 @@ <ClInclude Include="$(SolutionDir)\..\src\core\census\aggregation.h"> <Filter>src\core\census</Filter> </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\census\log.h"> + <ClInclude Include="$(SolutionDir)\..\src\core\census\mlog.h"> <Filter>src\core\census</Filter> </ClInclude> <ClInclude Include="$(SolutionDir)\..\src\core\census\rpc_metric_id.h"> <Filter>src\core\census</Filter> </ClInclude> + <ClInclude Include="$(SolutionDir)\..\third_party\nanopb\pb.h"> + <Filter>third_party\nanopb</Filter> + </ClInclude> + <ClInclude Include="$(SolutionDir)\..\third_party\nanopb\pb_common.h"> + <Filter>third_party\nanopb</Filter> + </ClInclude> + <ClInclude Include="$(SolutionDir)\..\third_party\nanopb\pb_decode.h"> + <Filter>third_party\nanopb</Filter> + </ClInclude> + <ClInclude Include="$(SolutionDir)\..\third_party\nanopb\pb_encode.h"> + <Filter>third_party\nanopb</Filter> + </ClInclude> </ItemGroup> <ItemGroup> @@ -845,6 +878,18 @@ <Filter Include="src\core\json"> <UniqueIdentifier>{443ffc61-1bea-2477-6e54-1ddf8c139264}</UniqueIdentifier> </Filter> + <Filter Include="src\core\proto"> + <UniqueIdentifier>{7f4bb22a-65ba-0f8f-6387-66b1f6677a80}</UniqueIdentifier> + </Filter> + <Filter Include="src\core\proto\grpc"> + <UniqueIdentifier>{9c2bd164-c317-8a13-564d-3b28b0fd79cf}</UniqueIdentifier> + </Filter> + <Filter Include="src\core\proto\grpc\lb"> + <UniqueIdentifier>{2bad8e10-4fc5-d8b3-e026-4abbd0c25cda}</UniqueIdentifier> + </Filter> + <Filter Include="src\core\proto\grpc\lb\v0"> + <UniqueIdentifier>{4475c8ed-e01b-8906-47d0-8a504189c0d5}</UniqueIdentifier> + </Filter> <Filter Include="src\core\statistics"> <UniqueIdentifier>{e084164c-a069-00e3-db35-4e0b1cd6f0b7}</UniqueIdentifier> </Filter> @@ -857,6 +902,12 @@ <Filter Include="src\core\transport\chttp2"> <UniqueIdentifier>{5fcd6206-f774-9ae6-4b85-305d6a723843}</UniqueIdentifier> </Filter> + <Filter Include="third_party"> + <UniqueIdentifier>{025c051e-8eba-125b-67f9-173f95176eb2}</UniqueIdentifier> + </Filter> + <Filter Include="third_party\nanopb"> + <UniqueIdentifier>{6511f77d-f28c-80e0-0889-8975e688e344}</UniqueIdentifier> + </Filter> </ItemGroup> </Project> diff --git a/vsprojects/vcxproj/test/census_log_test/census_log_test.vcxproj b/vsprojects/vcxproj/test/census_log_test/census_log_test.vcxproj index 851086d663..9f2480085b 100644 --- a/vsprojects/vcxproj/test/census_log_test/census_log_test.vcxproj +++ b/vsprojects/vcxproj/test/census_log_test/census_log_test.vcxproj @@ -158,7 +158,7 @@ </ItemDefinitionGroup> <ItemGroup> - <ClCompile Include="$(SolutionDir)\..\test\core\census\log_test.c"> + <ClCompile Include="$(SolutionDir)\..\test\core\census\mlog_test.c"> </ClCompile> </ItemGroup> <ItemGroup> diff --git a/vsprojects/vcxproj/test/census_log_test/census_log_test.vcxproj.filters b/vsprojects/vcxproj/test/census_log_test/census_log_test.vcxproj.filters index 135c77847f..8b70dcb2a4 100644 --- a/vsprojects/vcxproj/test/census_log_test/census_log_test.vcxproj.filters +++ b/vsprojects/vcxproj/test/census_log_test/census_log_test.vcxproj.filters @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> - <ClCompile Include="$(SolutionDir)\..\test\core\census\log_test.c"> + <ClCompile Include="$(SolutionDir)\..\test\core\census\mlog_test.c"> <Filter>test\core\census</Filter> </ClCompile> </ItemGroup> diff --git a/vsprojects/vcxproj/test/grpclb_api_test/grpclb_api_test.vcxproj b/vsprojects/vcxproj/test/grpclb_api_test/grpclb_api_test.vcxproj new file mode 100644 index 0000000000..1509ece9f9 --- /dev/null +++ b/vsprojects/vcxproj/test/grpclb_api_test/grpclb_api_test.vcxproj @@ -0,0 +1,209 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$(SolutionDir)\..\vsprojects\packages\grpc.dependencies.openssl.1.0.204.1\build\native\grpc.dependencies.openssl.props" Condition="Exists('$(SolutionDir)\..\vsprojects\packages\grpc.dependencies.openssl.1.0.204.1\build\native\1.0.204.1.props')" /> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{990AF023-17D7-8DBF-EB6E-14C7C016C77E}</ProjectGuid> + <IgnoreWarnIntDirInTempDetected>true</IgnoreWarnIntDirInTempDetected> + <IntDir>$(SolutionDir)IntDir\$(MSBuildProjectName)\</IntDir> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(VisualStudioVersion)' == '10.0'" Label="Configuration"> + <PlatformToolset>v100</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(VisualStudioVersion)' == '11.0'" Label="Configuration"> + <PlatformToolset>v110</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(VisualStudioVersion)' == '12.0'" Label="Configuration"> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(VisualStudioVersion)' == '14.0'" Label="Configuration"> + <PlatformToolset>v140</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="$(SolutionDir)\..\vsprojects\cpptest.props" /> + <Import Project="$(SolutionDir)\..\vsprojects\global.props" /> + <Import Project="$(SolutionDir)\..\vsprojects\openssl.props" /> + <Import Project="$(SolutionDir)\..\vsprojects\protobuf.props" /> + <Import Project="$(SolutionDir)\..\vsprojects\winsock.props" /> + <Import Project="$(SolutionDir)\..\vsprojects\zlib.props" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup Condition="'$(Configuration)'=='Debug'"> + <TargetName>grpclb_api_test</TargetName> + <Linkage-grpc_dependencies_zlib>static</Linkage-grpc_dependencies_zlib> + <Configuration-grpc_dependencies_zlib>Debug</Configuration-grpc_dependencies_zlib> + <Linkage-grpc_dependencies_openssl>static</Linkage-grpc_dependencies_openssl> + <Configuration-grpc_dependencies_openssl>Debug</Configuration-grpc_dependencies_openssl> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)'=='Release'"> + <TargetName>grpclb_api_test</TargetName> + <Linkage-grpc_dependencies_zlib>static</Linkage-grpc_dependencies_zlib> + <Configuration-grpc_dependencies_zlib>Release</Configuration-grpc_dependencies_zlib> + <Linkage-grpc_dependencies_openssl>static</Linkage-grpc_dependencies_openssl> + <Configuration-grpc_dependencies_openssl>Release</Configuration-grpc_dependencies_openssl> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + <TreatWarningAsError>true</TreatWarningAsError> + <DebugInformationFormat Condition="$(Jenkins)">None</DebugInformationFormat> + <MinimalRebuild Condition="$(Jenkins)">false</MinimalRebuild> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation Condition="!$(Jenkins)">true</GenerateDebugInformation> + <GenerateDebugInformation Condition="$(Jenkins)">false</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + <TreatWarningAsError>true</TreatWarningAsError> + <DebugInformationFormat Condition="$(Jenkins)">None</DebugInformationFormat> + <MinimalRebuild Condition="$(Jenkins)">false</MinimalRebuild> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation Condition="!$(Jenkins)">true</GenerateDebugInformation> + <GenerateDebugInformation Condition="$(Jenkins)">false</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <SDLCheck>true</SDLCheck> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + <TreatWarningAsError>true</TreatWarningAsError> + <DebugInformationFormat Condition="$(Jenkins)">None</DebugInformationFormat> + <MinimalRebuild Condition="$(Jenkins)">false</MinimalRebuild> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation Condition="!$(Jenkins)">true</GenerateDebugInformation> + <GenerateDebugInformation Condition="$(Jenkins)">false</GenerateDebugInformation> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + </Link> + </ItemDefinitionGroup> + + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <SDLCheck>true</SDLCheck> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + <TreatWarningAsError>true</TreatWarningAsError> + <DebugInformationFormat Condition="$(Jenkins)">None</DebugInformationFormat> + <MinimalRebuild Condition="$(Jenkins)">false</MinimalRebuild> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation Condition="!$(Jenkins)">true</GenerateDebugInformation> + <GenerateDebugInformation Condition="$(Jenkins)">false</GenerateDebugInformation> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + </Link> + </ItemDefinitionGroup> + + <ItemGroup> + <ClCompile Include="$(SolutionDir)\..\src\proto\grpc\lb\v0\load_balancer.pb.cc"> + </ClCompile> + <ClInclude Include="$(SolutionDir)\..\src\proto\grpc\lb\v0\load_balancer.pb.h"> + </ClInclude> + <ClCompile Include="$(SolutionDir)\..\src\proto\grpc\lb\v0\load_balancer.grpc.pb.cc"> + </ClCompile> + <ClInclude Include="$(SolutionDir)\..\src\proto\grpc\lb\v0\load_balancer.grpc.pb.h"> + </ClInclude> + <ClCompile Include="$(SolutionDir)\..\test\cpp\grpclb\grpclb_api_test.cc"> + </ClCompile> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="$(SolutionDir)\..\vsprojects\vcxproj\.\grpc++_test_util\grpc++_test_util.vcxproj"> + <Project>{0BE77741-552A-929B-A497-4EF7ECE17A64}</Project> + </ProjectReference> + <ProjectReference Include="$(SolutionDir)\..\vsprojects\vcxproj\.\grpc_test_util\grpc_test_util.vcxproj"> + <Project>{17BCAFC0-5FDC-4C94-AEB9-95F3E220614B}</Project> + </ProjectReference> + <ProjectReference Include="$(SolutionDir)\..\vsprojects\vcxproj\.\grpc++\grpc++.vcxproj"> + <Project>{C187A093-A0FE-489D-A40A-6E33DE0F9FEB}</Project> + </ProjectReference> + <ProjectReference Include="$(SolutionDir)\..\vsprojects\vcxproj\.\grpc\grpc.vcxproj"> + <Project>{29D16885-7228-4C31-81ED-5F9187C7F2A9}</Project> + </ProjectReference> + </ItemGroup> + <ItemGroup> + <None Include="packages.config" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + <Import Project="$(SolutionDir)\..\vsprojects\packages\grpc.dependencies.zlib.redist.1.2.8.10\build\native\grpc.dependencies.zlib.redist.targets" Condition="Exists('$(SolutionDir)\..\vsprojects\packages\grpc.dependencies.zlib.redist.1.2.8.10\build\native\grpc.dependencies\grpc.dependencies.zlib.targets')" /> + <Import Project="$(SolutionDir)\..\vsprojects\packages\grpc.dependencies.zlib.1.2.8.10\build\native\grpc.dependencies.zlib.targets" Condition="Exists('$(SolutionDir)\..\vsprojects\packages\grpc.dependencies.zlib.1.2.8.10\build\native\grpc.dependencies\grpc.dependencies.zlib.targets')" /> + <Import Project="$(SolutionDir)\..\vsprojects\packages\grpc.dependencies.openssl.redist.1.0.204.1\build\native\grpc.dependencies.openssl.redist.targets" Condition="Exists('$(SolutionDir)\..\vsprojects\packages\grpc.dependencies.openssl.redist.1.0.204.1\build\native\grpc.dependencies\grpc.dependencies.openssl.targets')" /> + <Import Project="$(SolutionDir)\..\vsprojects\packages\grpc.dependencies.openssl.1.0.204.1\build\native\grpc.dependencies.openssl.targets" Condition="Exists('$(SolutionDir)\..\vsprojects\packages\grpc.dependencies.openssl.1.0.204.1\build\native\grpc.dependencies\grpc.dependencies.openssl.targets')" /> + </ImportGroup> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> + <PropertyGroup> + <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> + </PropertyGroup> + <Error Condition="!Exists('$(SolutionDir)\..\vsprojects\packages\grpc.dependencies.zlib.redist.1.2.8.10\build\native\grpc.dependencies.zlib.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\..\vsprojects\packages\grpc.dependencies.zlib.redist.1.2.8.10\build\native\grpc.dependencies.zlib.redist.targets')" /> + <Error Condition="!Exists('$(SolutionDir)\..\vsprojects\packages\grpc.dependencies.zlib.1.2.8.10\build\native\grpc.dependencies.zlib.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\..\vsprojects\packages\grpc.dependencies.zlib.1.2.8.10\build\native\grpc.dependencies.zlib.targets')" /> + <Error Condition="!Exists('$(SolutionDir)\..\vsprojects\packages\grpc.dependencies.openssl.redist.1.0.204.1\build\native\grpc.dependencies.openssl.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\..\vsprojects\packages\grpc.dependencies.openssl.redist.1.0.204.1\build\native\grpc.dependencies.openssl.redist.targets')" /> + <Error Condition="!Exists('$(SolutionDir)\..\vsprojects\packages\grpc.dependencies.openssl.1.0.204.1\build\native\grpc.dependencies.openssl.props')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\..\vsprojects\packages\grpc.dependencies.openssl.1.0.204.1\build\native\grpc.dependencies.openssl.props')" /> + <Error Condition="!Exists('$(SolutionDir)\..\vsprojects\packages\grpc.dependencies.openssl.1.0.204.1\build\native\grpc.dependencies.openssl.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\..\vsprojects\packages\grpc.dependencies.openssl.1.0.204.1\build\native\grpc.dependencies.openssl.targets')" /> + </Target> +</Project> + diff --git a/vsprojects/vcxproj/test/grpclb_api_test/grpclb_api_test.vcxproj.filters b/vsprojects/vcxproj/test/grpclb_api_test/grpclb_api_test.vcxproj.filters new file mode 100644 index 0000000000..6c57b8c162 --- /dev/null +++ b/vsprojects/vcxproj/test/grpclb_api_test/grpclb_api_test.vcxproj.filters @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <ClCompile Include="$(SolutionDir)\..\src\proto\grpc\lb\v0\load_balancer.proto"> + <Filter>src\proto\grpc\lb\v0</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\test\cpp\grpclb\grpclb_api_test.cc"> + <Filter>test\cpp\grpclb</Filter> + </ClCompile> + </ItemGroup> + + <ItemGroup> + <Filter Include="src"> + <UniqueIdentifier>{a31d21fb-c6ab-75ce-43dc-7d6f506765e6}</UniqueIdentifier> + </Filter> + <Filter Include="src\proto"> + <UniqueIdentifier>{10d49c90-8503-9b10-6678-eed983bc25d9}</UniqueIdentifier> + </Filter> + <Filter Include="src\proto\grpc"> + <UniqueIdentifier>{8b6be783-e071-44cc-2096-f1c476012556}</UniqueIdentifier> + </Filter> + <Filter Include="src\proto\grpc\lb"> + <UniqueIdentifier>{2981699e-c196-c599-bc17-c177770f89ee}</UniqueIdentifier> + </Filter> + <Filter Include="src\proto\grpc\lb\v0"> + <UniqueIdentifier>{3d04774a-1c2f-e100-435e-08af5d539250}</UniqueIdentifier> + </Filter> + <Filter Include="test"> + <UniqueIdentifier>{64736e1d-eb77-664f-34ab-6cf41263d3d8}</UniqueIdentifier> + </Filter> + <Filter Include="test\cpp"> + <UniqueIdentifier>{c86e9cb1-bed4-3697-40f2-9ecff6297fa5}</UniqueIdentifier> + </Filter> + <Filter Include="test\cpp\grpclb"> + <UniqueIdentifier>{6b5ba83a-6cf2-5a7b-0ab8-62de31882705}</UniqueIdentifier> + </Filter> + </ItemGroup> +</Project> + |