diff options
Diffstat (limited to 'vsprojects/vcxproj')
27 files changed, 468 insertions, 99 deletions
diff --git a/vsprojects/vcxproj/gpr/gpr.vcxproj b/vsprojects/vcxproj/gpr/gpr.vcxproj index e1b3963c91..dae8e623d8 100644 --- a/vsprojects/vcxproj/gpr/gpr.vcxproj +++ b/vsprojects/vcxproj/gpr/gpr.vcxproj @@ -194,13 +194,14 @@ <ClInclude Include="$(SolutionDir)\..\src\core\profiling\timers.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\support\block_annotate.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\support\env.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\support\file.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\support\load_file.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\support\murmur_hash.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\support\stack_lockfree.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\support\string.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\support\string_win32.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\support\thd_internal.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\support\time_precise.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\support\tmpfile.h" /> </ItemGroup> <ItemGroup> <ClCompile Include="$(SolutionDir)\..\src\core\profiling\basic_timers.c"> @@ -227,16 +228,12 @@ </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\support\env_win32.c"> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\support\file.c"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\support\file_posix.c"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\support\file_win32.c"> - </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\support\histogram.c"> </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\support\host_port.c"> </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\support\load_file.c"> + </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\support\log.c"> </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\support\log_android.c"> @@ -287,6 +284,10 @@ </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\support\tls_pthread.c"> </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\support\tmpfile_posix.c"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\support\tmpfile_win32.c"> + </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\support\wrap_memcpy.c"> </ClCompile> </ItemGroup> diff --git a/vsprojects/vcxproj/gpr/gpr.vcxproj.filters b/vsprojects/vcxproj/gpr/gpr.vcxproj.filters index aedba93e88..055b29f648 100644 --- a/vsprojects/vcxproj/gpr/gpr.vcxproj.filters +++ b/vsprojects/vcxproj/gpr/gpr.vcxproj.filters @@ -37,21 +37,15 @@ <ClCompile Include="$(SolutionDir)\..\src\core\support\env_win32.c"> <Filter>src\core\support</Filter> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\support\file.c"> - <Filter>src\core\support</Filter> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\support\file_posix.c"> - <Filter>src\core\support</Filter> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\support\file_win32.c"> - <Filter>src\core\support</Filter> - </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\support\histogram.c"> <Filter>src\core\support</Filter> </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\support\host_port.c"> <Filter>src\core\support</Filter> </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\support\load_file.c"> + <Filter>src\core\support</Filter> + </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\support\log.c"> <Filter>src\core\support</Filter> </ClCompile> @@ -127,6 +121,12 @@ <ClCompile Include="$(SolutionDir)\..\src\core\support\tls_pthread.c"> <Filter>src\core\support</Filter> </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\support\tmpfile_posix.c"> + <Filter>src\core\support</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\support\tmpfile_win32.c"> + <Filter>src\core\support</Filter> + </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\support\wrap_memcpy.c"> <Filter>src\core\support</Filter> </ClCompile> @@ -269,7 +269,7 @@ <ClInclude Include="$(SolutionDir)\..\src\core\support\env.h"> <Filter>src\core\support</Filter> </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\support\file.h"> + <ClInclude Include="$(SolutionDir)\..\src\core\support\load_file.h"> <Filter>src\core\support</Filter> </ClInclude> <ClInclude Include="$(SolutionDir)\..\src\core\support\murmur_hash.h"> @@ -290,6 +290,9 @@ <ClInclude Include="$(SolutionDir)\..\src\core\support\time_precise.h"> <Filter>src\core\support</Filter> </ClInclude> + <ClInclude Include="$(SolutionDir)\..\src\core\support\tmpfile.h"> + <Filter>src\core\support</Filter> + </ClInclude> </ItemGroup> <ItemGroup> diff --git a/vsprojects/vcxproj/grpc++/grpc++.vcxproj b/vsprojects/vcxproj/grpc++/grpc++.vcxproj index c62faf33e6..0b8c345196 100644 --- a/vsprojects/vcxproj/grpc++/grpc++.vcxproj +++ b/vsprojects/vcxproj/grpc++/grpc++.vcxproj @@ -369,8 +369,6 @@ </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\cpp\client\insecure_credentials.cc"> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\cpp\common\alarm.cc"> - </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\cpp\common\call.cc"> </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\cpp\common\channel_arguments.cc"> diff --git a/vsprojects/vcxproj/grpc++/grpc++.vcxproj.filters b/vsprojects/vcxproj/grpc++/grpc++.vcxproj.filters index 5f9350e76a..0f3dccf17c 100644 --- a/vsprojects/vcxproj/grpc++/grpc++.vcxproj.filters +++ b/vsprojects/vcxproj/grpc++/grpc++.vcxproj.filters @@ -40,9 +40,6 @@ <ClCompile Include="$(SolutionDir)\..\src\cpp\client\insecure_credentials.cc"> <Filter>src\cpp\client</Filter> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\cpp\common\alarm.cc"> - <Filter>src\cpp\common</Filter> - </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\cpp\common\call.cc"> <Filter>src\cpp\common</Filter> </ClCompile> diff --git a/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj b/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj index fb4246580f..2dcadbaec0 100644 --- a/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj +++ b/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj @@ -356,8 +356,6 @@ </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\cpp\client\insecure_credentials.cc"> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\cpp\common\alarm.cc"> - </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\cpp\common\call.cc"> </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\cpp\common\channel_arguments.cc"> diff --git a/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj.filters b/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj.filters index eeff7d3697..3572c651b6 100644 --- a/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj.filters +++ b/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj.filters @@ -25,9 +25,6 @@ <ClCompile Include="$(SolutionDir)\..\src\cpp\client\insecure_credentials.cc"> <Filter>src\cpp\client</Filter> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\cpp\common\alarm.cc"> - <Filter>src\cpp\common</Filter> - </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\cpp\common\call.cc"> <Filter>src\cpp\common</Filter> </ClCompile> diff --git a/vsprojects/vcxproj/grpc/grpc.vcxproj b/vsprojects/vcxproj/grpc/grpc.vcxproj index ebab196fcb..c2635c31a3 100644 --- a/vsprojects/vcxproj/grpc/grpc.vcxproj +++ b/vsprojects/vcxproj/grpc/grpc.vcxproj @@ -296,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" /> @@ -346,7 +347,6 @@ <ClInclude Include="$(SolutionDir)\..\src\core\iomgr\time_averaged_stats.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\iomgr\timer.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\iomgr\timer_heap.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\iomgr\timer_internal.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\iomgr\udp_server.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\iomgr\wakeup_fd_pipe.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\iomgr\wakeup_fd_posix.h" /> @@ -357,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" /> @@ -397,7 +398,7 @@ <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\b64.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" /> @@ -413,6 +414,10 @@ <ClInclude Include="$(SolutionDir)\..\src\core\census\aggregation.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\census\grpc_context.c"> @@ -445,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"> @@ -473,7 +480,7 @@ </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\client_config\uri_parser.c"> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\compression\algorithm.c"> + <ClCompile Include="$(SolutionDir)\..\src\core\compression\compression_algorithm.c"> </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\compression\message_compress.c"> </ClCompile> @@ -573,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"> @@ -673,7 +682,7 @@ </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\httpcli\httpcli_security_connector.c"> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\security\base64.c"> + <ClCompile Include="$(SolutionDir)\..\src\core\security\b64.c"> </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\security\client_auth_filter.c"> </ClCompile> @@ -725,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 68fc952fd6..6dd10d3dd3 100644 --- a/vsprojects/vcxproj/grpc/grpc.vcxproj.filters +++ b/vsprojects/vcxproj/grpc/grpc.vcxproj.filters @@ -46,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> @@ -88,7 +91,7 @@ <ClCompile Include="$(SolutionDir)\..\src\core\client_config\uri_parser.c"> <Filter>src\core\client_config</Filter> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\compression\algorithm.c"> + <ClCompile Include="$(SolutionDir)\..\src\core\compression\compression_algorithm.c"> <Filter>src\core\compression</Filter> </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\compression\message_compress.c"> @@ -238,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> @@ -388,7 +394,7 @@ <ClCompile Include="$(SolutionDir)\..\src\core\httpcli\httpcli_security_connector.c"> <Filter>src\core\httpcli</Filter> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\security\base64.c"> + <ClCompile Include="$(SolutionDir)\..\src\core\security\b64.c"> <Filter>src\core\security</Filter> </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\security\client_auth_filter.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"> @@ -551,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> @@ -701,9 +719,6 @@ <ClInclude Include="$(SolutionDir)\..\src\core\iomgr\timer_heap.h"> <Filter>src\core\iomgr</Filter> </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\iomgr\timer_internal.h"> - <Filter>src\core\iomgr</Filter> - </ClInclude> <ClInclude Include="$(SolutionDir)\..\src\core\iomgr\udp_server.h"> <Filter>src\core\iomgr</Filter> </ClInclude> @@ -734,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> @@ -854,7 +872,7 @@ <ClInclude Include="$(SolutionDir)\..\src\core\security\auth_filters.h"> <Filter>src\core\security</Filter> </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\security\base64.h"> + <ClInclude Include="$(SolutionDir)\..\src\core\security\b64.h"> <Filter>src\core\security</Filter> </ClInclude> <ClInclude Include="$(SolutionDir)\..\src\core\security\credentials.h"> @@ -902,6 +920,18 @@ <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> @@ -953,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> @@ -971,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_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 5daa7900f8..f0d869ba93 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" /> @@ -336,7 +337,6 @@ <ClInclude Include="$(SolutionDir)\..\src\core\iomgr\time_averaged_stats.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\iomgr\timer.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\iomgr\timer_heap.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\iomgr\timer_internal.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\iomgr\udp_server.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\iomgr\wakeup_fd_pipe.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\iomgr\wakeup_fd_posix.h" /> @@ -347,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" /> @@ -389,6 +390,10 @@ <ClInclude Include="$(SolutionDir)\..\src\core\census\aggregation.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"> @@ -423,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"> @@ -451,7 +458,7 @@ </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\client_config\uri_parser.c"> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\compression\algorithm.c"> + <ClCompile Include="$(SolutionDir)\..\src\core\compression\compression_algorithm.c"> </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\compression\message_compress.c"> </ClCompile> @@ -551,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"> @@ -661,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 68f136398b..1f240212a3 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> @@ -91,7 +94,7 @@ <ClCompile Include="$(SolutionDir)\..\src\core\client_config\uri_parser.c"> <Filter>src\core\client_config</Filter> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\compression\algorithm.c"> + <ClCompile Include="$(SolutionDir)\..\src\core\compression\compression_algorithm.c"> <Filter>src\core\compression</Filter> </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\compression\message_compress.c"> @@ -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> @@ -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> @@ -638,9 +656,6 @@ <ClInclude Include="$(SolutionDir)\..\src\core\iomgr\timer_heap.h"> <Filter>src\core\iomgr</Filter> </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\iomgr\timer_internal.h"> - <Filter>src\core\iomgr</Filter> - </ClInclude> <ClInclude Include="$(SolutionDir)\..\src\core\iomgr\udp_server.h"> <Filter>src\core\iomgr</Filter> </ClInclude> @@ -671,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> @@ -797,6 +815,18 @@ <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> @@ -848,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> @@ -860,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/interop_server_main/interop_server_main.vcxproj b/vsprojects/vcxproj/interop_server_main/interop_server_main.vcxproj index 69f80a8e59..075750afc6 100644 --- a/vsprojects/vcxproj/interop_server_main/interop_server_main.vcxproj +++ b/vsprojects/vcxproj/interop_server_main/interop_server_main.vcxproj @@ -171,7 +171,7 @@ </ClCompile> <ClInclude Include="$(SolutionDir)\..\src\proto\grpc\testing\test.grpc.pb.h"> </ClInclude> - <ClCompile Include="$(SolutionDir)\..\test\cpp\interop\server.cc"> + <ClCompile Include="$(SolutionDir)\..\test\cpp\interop\server_main.cc"> </ClCompile> </ItemGroup> <ItemGroup> diff --git a/vsprojects/vcxproj/interop_server_main/interop_server_main.vcxproj.filters b/vsprojects/vcxproj/interop_server_main/interop_server_main.vcxproj.filters index 8a9ff2704a..51a6b9e73c 100644 --- a/vsprojects/vcxproj/interop_server_main/interop_server_main.vcxproj.filters +++ b/vsprojects/vcxproj/interop_server_main/interop_server_main.vcxproj.filters @@ -10,7 +10,7 @@ <ClCompile Include="$(SolutionDir)\..\src\proto\grpc\testing\test.proto"> <Filter>src\proto\grpc\testing</Filter> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\test\cpp\interop\server.cc"> + <ClCompile Include="$(SolutionDir)\..\test\cpp\interop\server_main.cc"> <Filter>test\cpp\interop</Filter> </ClCompile> </ItemGroup> diff --git a/vsprojects/vcxproj/qps/qps.vcxproj b/vsprojects/vcxproj/qps/qps.vcxproj index 8306e2e235..a57b7409b6 100644 --- a/vsprojects/vcxproj/qps/qps.vcxproj +++ b/vsprojects/vcxproj/qps/qps.vcxproj @@ -157,7 +157,7 @@ <ClInclude Include="$(SolutionDir)\..\test\cpp\qps\report.h" /> <ClInclude Include="$(SolutionDir)\..\test\cpp\qps\server.h" /> <ClInclude Include="$(SolutionDir)\..\test\cpp\qps\stats.h" /> - <ClInclude Include="$(SolutionDir)\..\test\cpp\qps\timer.h" /> + <ClInclude Include="$(SolutionDir)\..\test\cpp\qps\usage_timer.h" /> <ClInclude Include="$(SolutionDir)\..\test\cpp\util\benchmark_config.h" /> </ItemGroup> <ItemGroup> @@ -227,7 +227,7 @@ </ClCompile> <ClCompile Include="$(SolutionDir)\..\test\cpp\qps\server_sync.cc"> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\test\cpp\qps\timer.cc"> + <ClCompile Include="$(SolutionDir)\..\test\cpp\qps\usage_timer.cc"> </ClCompile> <ClCompile Include="$(SolutionDir)\..\test\cpp\util\benchmark_config.cc"> </ClCompile> diff --git a/vsprojects/vcxproj/qps/qps.vcxproj.filters b/vsprojects/vcxproj/qps/qps.vcxproj.filters index 650116a912..eeb9555a6a 100644 --- a/vsprojects/vcxproj/qps/qps.vcxproj.filters +++ b/vsprojects/vcxproj/qps/qps.vcxproj.filters @@ -46,7 +46,7 @@ <ClCompile Include="$(SolutionDir)\..\test\cpp\qps\server_sync.cc"> <Filter>test\cpp\qps</Filter> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\test\cpp\qps\timer.cc"> + <ClCompile Include="$(SolutionDir)\..\test\cpp\qps\usage_timer.cc"> <Filter>test\cpp\qps</Filter> </ClCompile> <ClCompile Include="$(SolutionDir)\..\test\cpp\util\benchmark_config.cc"> @@ -84,7 +84,7 @@ <ClInclude Include="$(SolutionDir)\..\test\cpp\qps\stats.h"> <Filter>test\cpp\qps</Filter> </ClInclude> - <ClInclude Include="$(SolutionDir)\..\test\cpp\qps\timer.h"> + <ClInclude Include="$(SolutionDir)\..\test\cpp\qps\usage_timer.h"> <Filter>test\cpp\qps</Filter> </ClInclude> <ClInclude Include="$(SolutionDir)\..\test\cpp\util\benchmark_config.h"> diff --git a/vsprojects/vcxproj/test/end2end/tests/end2end_nosec_tests/end2end_nosec_tests.vcxproj b/vsprojects/vcxproj/test/end2end/tests/end2end_nosec_tests/end2end_nosec_tests.vcxproj index 50c1b61c43..2f3b591dfc 100644 --- a/vsprojects/vcxproj/test/end2end/tests/end2end_nosec_tests/end2end_nosec_tests.vcxproj +++ b/vsprojects/vcxproj/test/end2end/tests/end2end_nosec_tests/end2end_nosec_tests.vcxproj @@ -169,12 +169,10 @@ </ClCompile> <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\cancel_with_status.c"> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\channel_connectivity.c"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\channel_ping.c"> - </ClCompile> <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\compressed_payload.c"> </ClCompile> + <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\connectivity.c"> + </ClCompile> <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\default_host.c"> </ClCompile> <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\disappearing_server.c"> @@ -195,14 +193,14 @@ </ClCompile> <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\max_message_length.c"> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\metadata.c"> - </ClCompile> <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\negative_deadline.c"> </ClCompile> <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\no_op.c"> </ClCompile> <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\payload.c"> </ClCompile> + <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\ping.c"> + </ClCompile> <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\ping_pong_streaming.c"> </ClCompile> <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\registered_call.c"> @@ -219,6 +217,8 @@ </ClCompile> <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\simple_delayed_request.c"> </ClCompile> + <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\simple_metadata.c"> + </ClCompile> <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\simple_request.c"> </ClCompile> <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\trailing_metadata.c"> diff --git a/vsprojects/vcxproj/test/end2end/tests/end2end_nosec_tests/end2end_nosec_tests.vcxproj.filters b/vsprojects/vcxproj/test/end2end/tests/end2end_nosec_tests/end2end_nosec_tests.vcxproj.filters index a825a2d8ca..c63ebe7d81 100644 --- a/vsprojects/vcxproj/test/end2end/tests/end2end_nosec_tests/end2end_nosec_tests.vcxproj.filters +++ b/vsprojects/vcxproj/test/end2end/tests/end2end_nosec_tests/end2end_nosec_tests.vcxproj.filters @@ -28,13 +28,10 @@ <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\cancel_with_status.c"> <Filter>test\core\end2end\tests</Filter> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\channel_connectivity.c"> + <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\compressed_payload.c"> <Filter>test\core\end2end\tests</Filter> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\channel_ping.c"> - <Filter>test\core\end2end\tests</Filter> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\compressed_payload.c"> + <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\connectivity.c"> <Filter>test\core\end2end\tests</Filter> </ClCompile> <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\default_host.c"> @@ -67,9 +64,6 @@ <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\max_message_length.c"> <Filter>test\core\end2end\tests</Filter> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\metadata.c"> - <Filter>test\core\end2end\tests</Filter> - </ClCompile> <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\negative_deadline.c"> <Filter>test\core\end2end\tests</Filter> </ClCompile> @@ -79,6 +73,9 @@ <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\payload.c"> <Filter>test\core\end2end\tests</Filter> </ClCompile> + <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\ping.c"> + <Filter>test\core\end2end\tests</Filter> + </ClCompile> <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\ping_pong_streaming.c"> <Filter>test\core\end2end\tests</Filter> </ClCompile> @@ -103,6 +100,9 @@ <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\simple_delayed_request.c"> <Filter>test\core\end2end\tests</Filter> </ClCompile> + <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\simple_metadata.c"> + <Filter>test\core\end2end\tests</Filter> + </ClCompile> <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\simple_request.c"> <Filter>test\core\end2end\tests</Filter> </ClCompile> diff --git a/vsprojects/vcxproj/test/end2end/tests/end2end_tests/end2end_tests.vcxproj b/vsprojects/vcxproj/test/end2end/tests/end2end_tests/end2end_tests.vcxproj index fa559e1af3..9d7bdc574c 100644 --- a/vsprojects/vcxproj/test/end2end/tests/end2end_tests/end2end_tests.vcxproj +++ b/vsprojects/vcxproj/test/end2end/tests/end2end_tests/end2end_tests.vcxproj @@ -171,12 +171,10 @@ </ClCompile> <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\cancel_with_status.c"> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\channel_connectivity.c"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\channel_ping.c"> - </ClCompile> <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\compressed_payload.c"> </ClCompile> + <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\connectivity.c"> + </ClCompile> <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\default_host.c"> </ClCompile> <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\disappearing_server.c"> @@ -197,14 +195,14 @@ </ClCompile> <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\max_message_length.c"> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\metadata.c"> - </ClCompile> <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\negative_deadline.c"> </ClCompile> <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\no_op.c"> </ClCompile> <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\payload.c"> </ClCompile> + <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\ping.c"> + </ClCompile> <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\ping_pong_streaming.c"> </ClCompile> <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\registered_call.c"> @@ -221,6 +219,8 @@ </ClCompile> <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\simple_delayed_request.c"> </ClCompile> + <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\simple_metadata.c"> + </ClCompile> <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\simple_request.c"> </ClCompile> <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\trailing_metadata.c"> diff --git a/vsprojects/vcxproj/test/end2end/tests/end2end_tests/end2end_tests.vcxproj.filters b/vsprojects/vcxproj/test/end2end/tests/end2end_tests/end2end_tests.vcxproj.filters index 61afa17e06..c30054a17b 100644 --- a/vsprojects/vcxproj/test/end2end/tests/end2end_tests/end2end_tests.vcxproj.filters +++ b/vsprojects/vcxproj/test/end2end/tests/end2end_tests/end2end_tests.vcxproj.filters @@ -31,13 +31,10 @@ <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\cancel_with_status.c"> <Filter>test\core\end2end\tests</Filter> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\channel_connectivity.c"> + <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\compressed_payload.c"> <Filter>test\core\end2end\tests</Filter> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\channel_ping.c"> - <Filter>test\core\end2end\tests</Filter> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\compressed_payload.c"> + <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\connectivity.c"> <Filter>test\core\end2end\tests</Filter> </ClCompile> <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\default_host.c"> @@ -70,9 +67,6 @@ <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\max_message_length.c"> <Filter>test\core\end2end\tests</Filter> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\metadata.c"> - <Filter>test\core\end2end\tests</Filter> - </ClCompile> <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\negative_deadline.c"> <Filter>test\core\end2end\tests</Filter> </ClCompile> @@ -82,6 +76,9 @@ <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\payload.c"> <Filter>test\core\end2end\tests</Filter> </ClCompile> + <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\ping.c"> + <Filter>test\core\end2end\tests</Filter> + </ClCompile> <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\ping_pong_streaming.c"> <Filter>test\core\end2end\tests</Filter> </ClCompile> @@ -106,6 +103,9 @@ <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\simple_delayed_request.c"> <Filter>test\core\end2end\tests</Filter> </ClCompile> + <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\simple_metadata.c"> + <Filter>test\core\end2end\tests</Filter> + </ClCompile> <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\simple_request.c"> <Filter>test\core\end2end\tests</Filter> </ClCompile> diff --git a/vsprojects/vcxproj/test/gpr_file_test/gpr_file_test.vcxproj b/vsprojects/vcxproj/test/gpr_load_file_test/gpr_load_file_test.vcxproj index 5a2fdee123..4182969f50 100644 --- a/vsprojects/vcxproj/test/gpr_file_test/gpr_file_test.vcxproj +++ b/vsprojects/vcxproj/test/gpr_load_file_test/gpr_load_file_test.vcxproj @@ -20,7 +20,7 @@ </ProjectConfiguration> </ItemGroup> <PropertyGroup Label="Globals"> - <ProjectGuid>{13B0BA63-A3A4-D0E7-1DF2-C73281EB0678}</ProjectGuid> + <ProjectGuid>{B36DE5B4-8B73-1194-7539-974D9524D609}</ProjectGuid> <IgnoreWarnIntDirInTempDetected>true</IgnoreWarnIntDirInTempDetected> <IntDir>$(SolutionDir)IntDir\$(MSBuildProjectName)\</IntDir> </PropertyGroup> @@ -60,14 +60,14 @@ </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup Condition="'$(Configuration)'=='Debug'"> - <TargetName>gpr_file_test</TargetName> + <TargetName>gpr_load_file_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>gpr_file_test</TargetName> + <TargetName>gpr_load_file_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> @@ -158,7 +158,7 @@ </ItemDefinitionGroup> <ItemGroup> - <ClCompile Include="$(SolutionDir)\..\test\core\support\file_test.c"> + <ClCompile Include="$(SolutionDir)\..\test\core\support\load_file_test.c"> </ClCompile> </ItemGroup> <ItemGroup> diff --git a/vsprojects/vcxproj/test/gpr_file_test/gpr_file_test.vcxproj.filters b/vsprojects/vcxproj/test/gpr_load_file_test/gpr_load_file_test.vcxproj.filters index ec225bd427..0edd0fe299 100644 --- a/vsprojects/vcxproj/test/gpr_file_test/gpr_file_test.vcxproj.filters +++ b/vsprojects/vcxproj/test/gpr_load_file_test/gpr_load_file_test.vcxproj.filters @@ -1,20 +1,20 @@ <?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\support\file_test.c"> + <ClCompile Include="$(SolutionDir)\..\test\core\support\load_file_test.c"> <Filter>test\core\support</Filter> </ClCompile> </ItemGroup> <ItemGroup> <Filter Include="test"> - <UniqueIdentifier>{ea0f8f5c-afe0-ed4b-ae64-d98a8f32a9e1}</UniqueIdentifier> + <UniqueIdentifier>{7defb822-a4cc-a221-8900-1041a6c2c134}</UniqueIdentifier> </Filter> <Filter Include="test\core"> - <UniqueIdentifier>{2ac0488e-8ef6-c61d-96c0-9cf580283589}</UniqueIdentifier> + <UniqueIdentifier>{3f3cae49-1efd-7015-0fa1-5621168945d5}</UniqueIdentifier> </Filter> <Filter Include="test\core\support"> - <UniqueIdentifier>{d2feffa9-e47c-ec2c-ecce-caf8ce85cb08}</UniqueIdentifier> + <UniqueIdentifier>{54e9b9b9-021a-139b-53f2-2f8b7173306c}</UniqueIdentifier> </Filter> </ItemGroup> </Project> diff --git a/vsprojects/vcxproj/test/grpc_base64_test/grpc_base64_test.vcxproj b/vsprojects/vcxproj/test/grpc_b64_test/grpc_b64_test.vcxproj index 3e49ac8ae2..7e6b4df961 100644 --- a/vsprojects/vcxproj/test/grpc_base64_test/grpc_base64_test.vcxproj +++ b/vsprojects/vcxproj/test/grpc_b64_test/grpc_b64_test.vcxproj @@ -20,7 +20,7 @@ </ProjectConfiguration> </ItemGroup> <PropertyGroup Label="Globals"> - <ProjectGuid>{759A2BB1-DA1B-196C-94A3-98687BBC9F36}</ProjectGuid> + <ProjectGuid>{A19FD81D-DF19-B8A4-4A8A-6967217FEC85}</ProjectGuid> <IgnoreWarnIntDirInTempDetected>true</IgnoreWarnIntDirInTempDetected> <IntDir>$(SolutionDir)IntDir\$(MSBuildProjectName)\</IntDir> </PropertyGroup> @@ -60,14 +60,14 @@ </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup Condition="'$(Configuration)'=='Debug'"> - <TargetName>grpc_base64_test</TargetName> + <TargetName>grpc_b64_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>grpc_base64_test</TargetName> + <TargetName>grpc_b64_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> @@ -158,7 +158,7 @@ </ItemDefinitionGroup> <ItemGroup> - <ClCompile Include="$(SolutionDir)\..\test\core\security\base64_test.c"> + <ClCompile Include="$(SolutionDir)\..\test\core\security\b64_test.c"> </ClCompile> </ItemGroup> <ItemGroup> diff --git a/vsprojects/vcxproj/test/grpc_base64_test/grpc_base64_test.vcxproj.filters b/vsprojects/vcxproj/test/grpc_b64_test/grpc_b64_test.vcxproj.filters index 6db15dfe2d..4335011fe3 100644 --- a/vsprojects/vcxproj/test/grpc_base64_test/grpc_base64_test.vcxproj.filters +++ b/vsprojects/vcxproj/test/grpc_b64_test/grpc_b64_test.vcxproj.filters @@ -1,20 +1,20 @@ <?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\security\base64_test.c"> + <ClCompile Include="$(SolutionDir)\..\test\core\security\b64_test.c"> <Filter>test\core\security</Filter> </ClCompile> </ItemGroup> <ItemGroup> <Filter Include="test"> - <UniqueIdentifier>{a996936d-cc5f-01b6-024a-8c48e97621a1}</UniqueIdentifier> + <UniqueIdentifier>{61d5c8e1-ac27-5bd0-d581-aeb585f0157e}</UniqueIdentifier> </Filter> <Filter Include="test\core"> - <UniqueIdentifier>{f24de076-eae7-0bf0-1028-c08488419d68}</UniqueIdentifier> + <UniqueIdentifier>{409b4a57-584c-1dc5-db72-1e8d4c462e9d}</UniqueIdentifier> </Filter> <Filter Include="test\core\security"> - <UniqueIdentifier>{4e36400d-5525-a04f-f6bf-4960c950aa00}</UniqueIdentifier> + <UniqueIdentifier>{0cb2c3ef-ed46-78ae-140c-29f21dc6fdb1}</UniqueIdentifier> </Filter> </ItemGroup> </Project> 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> + diff --git a/vsprojects/vcxproj/test/census_log_test/census_log_test.vcxproj b/vsprojects/vcxproj/test/mlog_test/mlog_test.vcxproj index 9f2480085b..44b9a971f8 100644 --- a/vsprojects/vcxproj/test/census_log_test/census_log_test.vcxproj +++ b/vsprojects/vcxproj/test/mlog_test/mlog_test.vcxproj @@ -20,7 +20,7 @@ </ProjectConfiguration> </ItemGroup> <PropertyGroup Label="Globals"> - <ProjectGuid>{C27CEE16-2BEC-5572-3956-677E9F6F8BED}</ProjectGuid> + <ProjectGuid>{9345E329-80F3-DED4-FDC3-BF63FCEA2C03}</ProjectGuid> <IgnoreWarnIntDirInTempDetected>true</IgnoreWarnIntDirInTempDetected> <IntDir>$(SolutionDir)IntDir\$(MSBuildProjectName)\</IntDir> </PropertyGroup> @@ -60,14 +60,14 @@ </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup Condition="'$(Configuration)'=='Debug'"> - <TargetName>census_log_test</TargetName> + <TargetName>mlog_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>census_log_test</TargetName> + <TargetName>mlog_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> diff --git a/vsprojects/vcxproj/test/census_log_test/census_log_test.vcxproj.filters b/vsprojects/vcxproj/test/mlog_test/mlog_test.vcxproj.filters index 8b70dcb2a4..982deddf97 100644 --- a/vsprojects/vcxproj/test/census_log_test/census_log_test.vcxproj.filters +++ b/vsprojects/vcxproj/test/mlog_test/mlog_test.vcxproj.filters @@ -8,13 +8,13 @@ <ItemGroup> <Filter Include="test"> - <UniqueIdentifier>{4d0aae38-6975-cafb-30a6-a7c2c87d22ff}</UniqueIdentifier> + <UniqueIdentifier>{cf4f3b02-7a43-f5b5-708a-938b179be26e}</UniqueIdentifier> </Filter> <Filter Include="test\core"> - <UniqueIdentifier>{fb85321f-d3b5-ef2f-c5aa-34660a5e0c7b}</UniqueIdentifier> + <UniqueIdentifier>{74b31c41-bf60-9274-a718-f33cd7c659b4}</UniqueIdentifier> </Filter> <Filter Include="test\core\census"> - <UniqueIdentifier>{f23141da-cbe2-70fa-8207-858af868eb18}</UniqueIdentifier> + <UniqueIdentifier>{2117a367-a751-9526-028f-07b5e88f7037}</UniqueIdentifier> </Filter> </ItemGroup> </Project> |