diff options
Diffstat (limited to 'vsprojects/vs2013')
| -rw-r--r-- | vsprojects/vs2013/Grpc.mak | 12 | ||||
| -rw-r--r-- | vsprojects/vs2013/grpc.sln | 16 | ||||
| -rw-r--r-- | vsprojects/vs2013/grpc.vcxproj | 36 | ||||
| -rw-r--r-- | vsprojects/vs2013/grpc.vcxproj.filters | 71 | ||||
| -rw-r--r-- | vsprojects/vs2013/grpc_shared.vcxproj | 36 | ||||
| -rw-r--r-- | vsprojects/vs2013/grpc_shared.vcxproj.filters | 71 | ||||
| -rw-r--r-- | vsprojects/vs2013/grpc_test_util.vcxproj | 2 | ||||
| -rw-r--r-- | vsprojects/vs2013/grpc_unsecure.vcxproj | 17 | ||||
| -rw-r--r-- | vsprojects/vs2013/grpc_unsecure.vcxproj.filters | 36 |
9 files changed, 136 insertions, 161 deletions
diff --git a/vsprojects/vs2013/Grpc.mak b/vsprojects/vs2013/Grpc.mak index 1803561819..be0c0b8254 100644 --- a/vsprojects/vs2013/Grpc.mak +++ b/vsprojects/vs2013/Grpc.mak @@ -25,10 +25,10 @@ grpc_test_util: $(OUT_DIR): mkdir $(OUT_DIR) -buildtests: alarm_heap_test.exe alarm_list_test.exe alarm_test.exe alpn_test.exe bin_encoder_test.exe census_hash_table_test.exe census_statistics_multiple_writers_circular_buffer_test.exe census_statistics_multiple_writers_test.exe census_statistics_performance_test.exe census_statistics_quick_test.exe census_statistics_small_log_test.exe census_stats_store_test.exe census_stub_test.exe census_trace_store_test.exe census_window_stats_test.exe chttp2_status_conversion_test.exe chttp2_stream_encoder_test.exe chttp2_stream_map_test.exe chttp2_transport_end2end_test.exe dualstack_socket_test.exe echo_test.exe fd_posix_test.exe fling_stream_test.exe fling_test.exe gpr_cancellable_test.exe gpr_cmdline_test.exe gpr_env_test.exe gpr_file_test.exe gpr_histogram_test.exe gpr_host_port_test.exe gpr_log_test.exe gpr_slice_buffer_test.exe gpr_slice_test.exe gpr_string_test.exe gpr_sync_test.exe gpr_thd_test.exe gpr_time_test.exe gpr_useful_test.exe grpc_base64_test.exe grpc_byte_buffer_reader_test.exe grpc_channel_stack_test.exe grpc_completion_queue_test.exe grpc_credentials_test.exe grpc_json_token_test.exe grpc_stream_op_test.exe hpack_parser_test.exe hpack_table_test.exe httpcli_format_request_test.exe httpcli_parser_test.exe httpcli_test.exe json_rewrite_test.exe json_test.exe lame_client_test.exe message_compress_test.exe metadata_buffer_test.exe multi_init_test.exe murmur_hash_test.exe no_server_test.exe poll_kick_posix_test.exe resolve_address_test.exe secure_endpoint_test.exe sockaddr_utils_test.exe tcp_client_posix_test.exe tcp_posix_test.exe tcp_server_posix_test.exe time_averaged_stats_test.exe time_test.exe timeout_encoding_test.exe transport_metadata_test.exe +buildtests: alarm_heap_test.exe alarm_list_test.exe alarm_test.exe alpn_test.exe bin_encoder_test.exe census_hash_table_test.exe census_statistics_multiple_writers_circular_buffer_test.exe census_statistics_multiple_writers_test.exe census_statistics_performance_test.exe census_statistics_quick_test.exe census_statistics_small_log_test.exe census_stats_store_test.exe census_stub_test.exe census_trace_store_test.exe census_window_stats_test.exe chttp2_status_conversion_test.exe chttp2_stream_encoder_test.exe chttp2_stream_map_test.exe chttp2_transport_end2end_test.exe dualstack_socket_test.exe echo_test.exe fd_posix_test.exe fling_stream_test.exe fling_test.exe gpr_cancellable_test.exe gpr_cmdline_test.exe gpr_env_test.exe gpr_file_test.exe gpr_histogram_test.exe gpr_host_port_test.exe gpr_log_test.exe gpr_slice_buffer_test.exe gpr_slice_test.exe gpr_string_test.exe gpr_sync_test.exe gpr_thd_test.exe gpr_time_test.exe gpr_useful_test.exe grpc_base64_test.exe grpc_byte_buffer_reader_test.exe grpc_channel_stack_test.exe grpc_completion_queue_test.exe grpc_credentials_test.exe grpc_json_token_test.exe grpc_stream_op_test.exe hpack_parser_test.exe hpack_table_test.exe httpcli_format_request_test.exe httpcli_parser_test.exe httpcli_test.exe interop_test.exe json_rewrite_test.exe json_test.exe lame_client_test.exe message_compress_test.exe metadata_buffer_test.exe multi_init_test.exe murmur_hash_test.exe no_server_test.exe poll_kick_posix_test.exe resolve_address_test.exe secure_endpoint_test.exe sockaddr_utils_test.exe tcp_client_posix_test.exe tcp_posix_test.exe tcp_server_posix_test.exe time_averaged_stats_test.exe time_test.exe timeout_encoding_test.exe transport_metadata_test.exe echo All tests built. -test: alarm_heap_test alarm_list_test alarm_test alpn_test bin_encoder_test census_hash_table_test census_statistics_multiple_writers_circular_buffer_test census_statistics_multiple_writers_test census_statistics_performance_test census_statistics_quick_test census_statistics_small_log_test census_stats_store_test census_stub_test census_trace_store_test census_window_stats_test chttp2_status_conversion_test chttp2_stream_encoder_test chttp2_stream_map_test chttp2_transport_end2end_test dualstack_socket_test echo_test fd_posix_test fling_stream_test fling_test gpr_cancellable_test gpr_cmdline_test gpr_env_test gpr_file_test gpr_histogram_test gpr_host_port_test gpr_log_test gpr_slice_buffer_test gpr_slice_test gpr_string_test gpr_sync_test gpr_thd_test gpr_time_test gpr_useful_test grpc_base64_test grpc_byte_buffer_reader_test grpc_channel_stack_test grpc_completion_queue_test grpc_credentials_test grpc_json_token_test grpc_stream_op_test hpack_parser_test hpack_table_test httpcli_format_request_test httpcli_parser_test httpcli_test json_rewrite_test json_test lame_client_test message_compress_test metadata_buffer_test multi_init_test murmur_hash_test no_server_test poll_kick_posix_test resolve_address_test secure_endpoint_test sockaddr_utils_test tcp_client_posix_test tcp_posix_test tcp_server_posix_test time_averaged_stats_test time_test timeout_encoding_test transport_metadata_test +test: alarm_heap_test alarm_list_test alarm_test alpn_test bin_encoder_test census_hash_table_test census_statistics_multiple_writers_circular_buffer_test census_statistics_multiple_writers_test census_statistics_performance_test census_statistics_quick_test census_statistics_small_log_test census_stats_store_test census_stub_test census_trace_store_test census_window_stats_test chttp2_status_conversion_test chttp2_stream_encoder_test chttp2_stream_map_test chttp2_transport_end2end_test dualstack_socket_test echo_test fd_posix_test fling_stream_test fling_test gpr_cancellable_test gpr_cmdline_test gpr_env_test gpr_file_test gpr_histogram_test gpr_host_port_test gpr_log_test gpr_slice_buffer_test gpr_slice_test gpr_string_test gpr_sync_test gpr_thd_test gpr_time_test gpr_useful_test grpc_base64_test grpc_byte_buffer_reader_test grpc_channel_stack_test grpc_completion_queue_test grpc_credentials_test grpc_json_token_test grpc_stream_op_test hpack_parser_test hpack_table_test httpcli_format_request_test httpcli_parser_test httpcli_test interop_test json_rewrite_test json_test lame_client_test message_compress_test metadata_buffer_test multi_init_test murmur_hash_test no_server_test poll_kick_posix_test resolve_address_test secure_endpoint_test sockaddr_utils_test tcp_client_posix_test tcp_posix_test tcp_server_posix_test time_averaged_stats_test time_test timeout_encoding_test transport_metadata_test echo All tests ran. test_gpr: gpr_cancellable_test gpr_cmdline_test gpr_env_test gpr_file_test gpr_histogram_test gpr_host_port_test gpr_log_test gpr_slice_buffer_test gpr_slice_test gpr_string_test gpr_sync_test gpr_thd_test gpr_time_test gpr_useful_test @@ -498,6 +498,14 @@ httpcli_test: httpcli_test.exe echo Running httpcli_test $(OUT_DIR)\httpcli_test.exe +interop_test.exe: grpc_test_util + echo Building interop_test + $(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ ..\..\test\cpp\interop\interop_test.c + $(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\interop_test.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\interop_test.obj +interop_test: interop_test.exe + echo Running interop_test + $(OUT_DIR)\interop_test.exe + json_rewrite.exe: grpc_test_util echo Building json_rewrite $(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ ..\..\test\core\json\json_rewrite.c diff --git a/vsprojects/vs2013/grpc.sln b/vsprojects/vs2013/grpc.sln index f34d360fdf..fd21ea782e 100644 --- a/vsprojects/vs2013/grpc.sln +++ b/vsprojects/vs2013/grpc.sln @@ -15,21 +15,21 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpc", "grpc.vcxproj", "{29 {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} = {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpc_csharp_ext", "grpc_csharp_ext.vcxproj", "{D64C6D63-4458-4A88-AB38-35678384A7E4}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpc_test_util", "grpc_test_util.vcxproj", "{17BCAFC0-5FDC-4C94-AEB9-95F3E220614B}" ProjectSection(ProjectDependencies) = postProject {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} = {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} {29D16885-7228-4C31-81ED-5F9187C7F2A9} = {29D16885-7228-4C31-81ED-5F9187C7F2A9} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpc_test_util", "grpc_test_util.vcxproj", "{17BCAFC0-5FDC-4C94-AEB9-95F3E220614B}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpc_unsecure", "grpc_unsecure.vcxproj", "{46CEDFFF-9692-456A-AA24-38B5D6BCF4C5}" ProjectSection(ProjectDependencies) = postProject {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} = {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} - {29D16885-7228-4C31-81ED-5F9187C7F2A9} = {29D16885-7228-4C31-81ED-5F9187C7F2A9} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpc_unsecure", "grpc_unsecure.vcxproj", "{46CEDFFF-9692-456A-AA24-38B5D6BCF4C5}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpc_csharp_ext", "grpc_csharp_ext.vcxproj", "{D64C6D63-4458-4A88-AB38-35678384A7E4}" ProjectSection(ProjectDependencies) = postProject {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} = {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} + {29D16885-7228-4C31-81ED-5F9187C7F2A9} = {29D16885-7228-4C31-81ED-5F9187C7F2A9} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gpr_shared", "gpr_shared.vcxproj", "{3D304D6B-AAF8-428B-AC7D-A698DDDE93C0}" @@ -60,10 +60,6 @@ Global {29D16885-7228-4C31-81ED-5F9187C7F2A9}.Debug|Win32.Build.0 = Debug|Win32 {29D16885-7228-4C31-81ED-5F9187C7F2A9}.Release|Win32.ActiveCfg = Release|Win32 {29D16885-7228-4C31-81ED-5F9187C7F2A9}.Release|Win32.Build.0 = Release|Win32 - {D64C6D63-4458-4A88-AB38-35678384A7E4}.Debug|Win32.ActiveCfg = Debug|Win32 - {D64C6D63-4458-4A88-AB38-35678384A7E4}.Debug|Win32.Build.0 = Debug|Win32 - {D64C6D63-4458-4A88-AB38-35678384A7E4}.Release|Win32.ActiveCfg = Release|Win32 - {D64C6D63-4458-4A88-AB38-35678384A7E4}.Release|Win32.Build.0 = Release|Win32 {17BCAFC0-5FDC-4C94-AEB9-95F3E220614B}.Debug|Win32.ActiveCfg = Debug|Win32 {17BCAFC0-5FDC-4C94-AEB9-95F3E220614B}.Debug|Win32.Build.0 = Debug|Win32 {17BCAFC0-5FDC-4C94-AEB9-95F3E220614B}.Release|Win32.ActiveCfg = Release|Win32 @@ -72,6 +68,10 @@ Global {46CEDFFF-9692-456A-AA24-38B5D6BCF4C5}.Debug|Win32.Build.0 = Debug|Win32 {46CEDFFF-9692-456A-AA24-38B5D6BCF4C5}.Release|Win32.ActiveCfg = Release|Win32 {46CEDFFF-9692-456A-AA24-38B5D6BCF4C5}.Release|Win32.Build.0 = Release|Win32 + {D64C6D63-4458-4A88-AB38-35678384A7E4}.Debug|Win32.ActiveCfg = Debug|Win32 + {D64C6D63-4458-4A88-AB38-35678384A7E4}.Debug|Win32.Build.0 = Debug|Win32 + {D64C6D63-4458-4A88-AB38-35678384A7E4}.Release|Win32.ActiveCfg = Release|Win32 + {D64C6D63-4458-4A88-AB38-35678384A7E4}.Release|Win32.Build.0 = Release|Win32 {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.ActiveCfg = Debug|Win32 {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.Build.0 = Debug|Win32 {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.ActiveCfg = Release|Win32 diff --git a/vsprojects/vs2013/grpc.vcxproj b/vsprojects/vs2013/grpc.vcxproj index dab819c51b..b55c7f926b 100644 --- a/vsprojects/vs2013/grpc.vcxproj +++ b/vsprojects/vs2013/grpc.vcxproj @@ -85,10 +85,13 @@ <ClInclude Include="..\..\include\grpc\status.h" /> </ItemGroup> <ItemGroup> + <ClInclude Include="..\..\src\core\httpcli\format_request.h" /> + <ClInclude Include="..\..\src\core\httpcli\httpcli.h" /> + <ClInclude Include="..\..\src\core\httpcli\httpcli_security_context.h" /> + <ClInclude Include="..\..\src\core\httpcli\parser.h" /> <ClInclude Include="..\..\src\core\security\auth.h" /> <ClInclude Include="..\..\src\core\security\base64.h" /> <ClInclude Include="..\..\src\core\security\credentials.h" /> - <ClInclude Include="..\..\src\core\security\google_root_certs.h" /> <ClInclude Include="..\..\src\core\security\json_token.h" /> <ClInclude Include="..\..\src\core\security\secure_transport_setup.h" /> <ClInclude Include="..\..\src\core\security\security_context.h" /> @@ -110,10 +113,7 @@ <ClInclude Include="..\..\src\core\channel\noop_filter.h" /> <ClInclude Include="..\..\src\core\compression\algorithm.h" /> <ClInclude Include="..\..\src\core\compression\message_compress.h" /> - <ClInclude Include="..\..\src\core\httpcli\format_request.h" /> - <ClInclude Include="..\..\src\core\httpcli\httpcli.h" /> - <ClInclude Include="..\..\src\core\httpcli\httpcli_security_context.h" /> - <ClInclude Include="..\..\src\core\httpcli\parser.h" /> + <ClInclude Include="..\..\src\core\debug\trace.h" /> <ClInclude Include="..\..\src\core\iomgr\alarm.h" /> <ClInclude Include="..\..\src\core\iomgr\alarm_heap.h" /> <ClInclude Include="..\..\src\core\iomgr\alarm_internal.h" /> @@ -187,6 +187,14 @@ <ClInclude Include="..\..\src\core\transport\transport_impl.h" /> </ItemGroup> <ItemGroup> + <ClCompile Include="..\..\src\core\httpcli\format_request.c"> + </ClCompile> + <ClCompile Include="..\..\src\core\httpcli\httpcli.c"> + </ClCompile> + <ClCompile Include="..\..\src\core\httpcli\httpcli_security_context.c"> + </ClCompile> + <ClCompile Include="..\..\src\core\httpcli\parser.c"> + </ClCompile> <ClCompile Include="..\..\src\core\security\auth.c"> </ClCompile> <ClCompile Include="..\..\src\core\security\base64.c"> @@ -195,8 +203,6 @@ </ClCompile> <ClCompile Include="..\..\src\core\security\factories.c"> </ClCompile> - <ClCompile Include="..\..\src\core\security\google_root_certs.c"> - </ClCompile> <ClCompile Include="..\..\src\core\security\json_token.c"> </ClCompile> <ClCompile Include="..\..\src\core\security\secure_endpoint.c"> @@ -207,6 +213,10 @@ </ClCompile> <ClCompile Include="..\..\src\core\security\server_secure_chttp2.c"> </ClCompile> + <ClCompile Include="..\..\src\core\surface\secure_channel_create.c"> + </ClCompile> + <ClCompile Include="..\..\src\core\surface\secure_server_create.c"> + </ClCompile> <ClCompile Include="..\..\src\core\tsi\fake_transport_security.c"> </ClCompile> <ClCompile Include="..\..\src\core\tsi\ssl_transport_security.c"> @@ -243,13 +253,7 @@ </ClCompile> <ClCompile Include="..\..\src\core\compression\message_compress.c"> </ClCompile> - <ClCompile Include="..\..\src\core\httpcli\format_request.c"> - </ClCompile> - <ClCompile Include="..\..\src\core\httpcli\httpcli.c"> - </ClCompile> - <ClCompile Include="..\..\src\core\httpcli\httpcli_security_context.c"> - </ClCompile> - <ClCompile Include="..\..\src\core\httpcli\parser.c"> + <ClCompile Include="..\..\src\core\debug\trace.c"> </ClCompile> <ClCompile Include="..\..\src\core\iomgr\alarm.c"> </ClCompile> @@ -359,10 +363,6 @@ </ClCompile> <ClCompile Include="..\..\src\core\surface\metadata_array.c"> </ClCompile> - <ClCompile Include="..\..\src\core\surface\secure_channel_create.c"> - </ClCompile> - <ClCompile Include="..\..\src\core\surface\secure_server_create.c"> - </ClCompile> <ClCompile Include="..\..\src\core\surface\server.c"> </ClCompile> <ClCompile Include="..\..\src\core\surface\server_chttp2.c"> diff --git a/vsprojects/vs2013/grpc.vcxproj.filters b/vsprojects/vs2013/grpc.vcxproj.filters index 8c174d9159..9505c37ef4 100644 --- a/vsprojects/vs2013/grpc.vcxproj.filters +++ b/vsprojects/vs2013/grpc.vcxproj.filters @@ -1,6 +1,18 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> + <ClCompile Include="..\..\src\core\httpcli\format_request.c"> + <Filter>src\core\httpcli</Filter> + </ClCompile> + <ClCompile Include="..\..\src\core\httpcli\httpcli.c"> + <Filter>src\core\httpcli</Filter> + </ClCompile> + <ClCompile Include="..\..\src\core\httpcli\httpcli_security_context.c"> + <Filter>src\core\httpcli</Filter> + </ClCompile> + <ClCompile Include="..\..\src\core\httpcli\parser.c"> + <Filter>src\core\httpcli</Filter> + </ClCompile> <ClCompile Include="..\..\src\core\security\auth.c"> <Filter>src\core\security</Filter> </ClCompile> @@ -13,9 +25,6 @@ <ClCompile Include="..\..\src\core\security\factories.c"> <Filter>src\core\security</Filter> </ClCompile> - <ClCompile Include="..\..\src\core\security\google_root_certs.c"> - <Filter>src\core\security</Filter> - </ClCompile> <ClCompile Include="..\..\src\core\security\json_token.c"> <Filter>src\core\security</Filter> </ClCompile> @@ -31,6 +40,12 @@ <ClCompile Include="..\..\src\core\security\server_secure_chttp2.c"> <Filter>src\core\security</Filter> </ClCompile> + <ClCompile Include="..\..\src\core\surface\secure_channel_create.c"> + <Filter>src\core\surface</Filter> + </ClCompile> + <ClCompile Include="..\..\src\core\surface\secure_server_create.c"> + <Filter>src\core\surface</Filter> + </ClCompile> <ClCompile Include="..\..\src\core\tsi\fake_transport_security.c"> <Filter>src\core\tsi</Filter> </ClCompile> @@ -85,17 +100,8 @@ <ClCompile Include="..\..\src\core\compression\message_compress.c"> <Filter>src\core\compression</Filter> </ClCompile> - <ClCompile Include="..\..\src\core\httpcli\format_request.c"> - <Filter>src\core\httpcli</Filter> - </ClCompile> - <ClCompile Include="..\..\src\core\httpcli\httpcli.c"> - <Filter>src\core\httpcli</Filter> - </ClCompile> - <ClCompile Include="..\..\src\core\httpcli\httpcli_security_context.c"> - <Filter>src\core\httpcli</Filter> - </ClCompile> - <ClCompile Include="..\..\src\core\httpcli\parser.c"> - <Filter>src\core\httpcli</Filter> + <ClCompile Include="..\..\src\core\debug\trace.c"> + <Filter>src\core\debug</Filter> </ClCompile> <ClCompile Include="..\..\src\core\iomgr\alarm.c"> <Filter>src\core\iomgr</Filter> @@ -259,12 +265,6 @@ <ClCompile Include="..\..\src\core\surface\metadata_array.c"> <Filter>src\core\surface</Filter> </ClCompile> - <ClCompile Include="..\..\src\core\surface\secure_channel_create.c"> - <Filter>src\core\surface</Filter> - </ClCompile> - <ClCompile Include="..\..\src\core\surface\secure_server_create.c"> - <Filter>src\core\surface</Filter> - </ClCompile> <ClCompile Include="..\..\src\core\surface\server.c"> <Filter>src\core\surface</Filter> </ClCompile> @@ -353,6 +353,18 @@ </ClInclude> </ItemGroup> <ItemGroup> + <ClInclude Include="..\..\src\core\httpcli\format_request.h"> + <Filter>src\core\httpcli</Filter> + </ClInclude> + <ClInclude Include="..\..\src\core\httpcli\httpcli.h"> + <Filter>src\core\httpcli</Filter> + </ClInclude> + <ClInclude Include="..\..\src\core\httpcli\httpcli_security_context.h"> + <Filter>src\core\httpcli</Filter> + </ClInclude> + <ClInclude Include="..\..\src\core\httpcli\parser.h"> + <Filter>src\core\httpcli</Filter> + </ClInclude> <ClInclude Include="..\..\src\core\security\auth.h"> <Filter>src\core\security</Filter> </ClInclude> @@ -362,9 +374,6 @@ <ClInclude Include="..\..\src\core\security\credentials.h"> <Filter>src\core\security</Filter> </ClInclude> - <ClInclude Include="..\..\src\core\security\google_root_certs.h"> - <Filter>src\core\security</Filter> - </ClInclude> <ClInclude Include="..\..\src\core\security\json_token.h"> <Filter>src\core\security</Filter> </ClInclude> @@ -428,17 +437,8 @@ <ClInclude Include="..\..\src\core\compression\message_compress.h"> <Filter>src\core\compression</Filter> </ClInclude> - <ClInclude Include="..\..\src\core\httpcli\format_request.h"> - <Filter>src\core\httpcli</Filter> - </ClInclude> - <ClInclude Include="..\..\src\core\httpcli\httpcli.h"> - <Filter>src\core\httpcli</Filter> - </ClInclude> - <ClInclude Include="..\..\src\core\httpcli\httpcli_security_context.h"> - <Filter>src\core\httpcli</Filter> - </ClInclude> - <ClInclude Include="..\..\src\core\httpcli\parser.h"> - <Filter>src\core\httpcli</Filter> + <ClInclude Include="..\..\src\core\debug\trace.h"> + <Filter>src\core\debug</Filter> </ClInclude> <ClInclude Include="..\..\src\core\iomgr\alarm.h"> <Filter>src\core\iomgr</Filter> @@ -674,6 +674,9 @@ <Filter Include="src\core\compression"> <UniqueIdentifier>{263cb913-dfe6-42a4-096b-cac231f76305}</UniqueIdentifier> </Filter> + <Filter Include="src\core\debug"> + <UniqueIdentifier>{1da7ef8a-a06d-5499-b3de-19fee4a4214d}</UniqueIdentifier> + </Filter> <Filter Include="src\core\httpcli"> <UniqueIdentifier>{a9bc00ad-835f-c625-c6d9-6a1324f98b9f}</UniqueIdentifier> </Filter> diff --git a/vsprojects/vs2013/grpc_shared.vcxproj b/vsprojects/vs2013/grpc_shared.vcxproj index 7ef520b7b6..dfb0899138 100644 --- a/vsprojects/vs2013/grpc_shared.vcxproj +++ b/vsprojects/vs2013/grpc_shared.vcxproj @@ -89,10 +89,13 @@ <ClInclude Include="..\..\include\grpc\status.h" /> </ItemGroup> <ItemGroup> + <ClInclude Include="..\..\src\core\httpcli\format_request.h" /> + <ClInclude Include="..\..\src\core\httpcli\httpcli.h" /> + <ClInclude Include="..\..\src\core\httpcli\httpcli_security_context.h" /> + <ClInclude Include="..\..\src\core\httpcli\parser.h" /> <ClInclude Include="..\..\src\core\security\auth.h" /> <ClInclude Include="..\..\src\core\security\base64.h" /> <ClInclude Include="..\..\src\core\security\credentials.h" /> - <ClInclude Include="..\..\src\core\security\google_root_certs.h" /> <ClInclude Include="..\..\src\core\security\json_token.h" /> <ClInclude Include="..\..\src\core\security\secure_transport_setup.h" /> <ClInclude Include="..\..\src\core\security\security_context.h" /> @@ -114,10 +117,7 @@ <ClInclude Include="..\..\src\core\channel\noop_filter.h" /> <ClInclude Include="..\..\src\core\compression\algorithm.h" /> <ClInclude Include="..\..\src\core\compression\message_compress.h" /> - <ClInclude Include="..\..\src\core\httpcli\format_request.h" /> - <ClInclude Include="..\..\src\core\httpcli\httpcli.h" /> - <ClInclude Include="..\..\src\core\httpcli\httpcli_security_context.h" /> - <ClInclude Include="..\..\src\core\httpcli\parser.h" /> + <ClInclude Include="..\..\src\core\debug\trace.h" /> <ClInclude Include="..\..\src\core\iomgr\alarm.h" /> <ClInclude Include="..\..\src\core\iomgr\alarm_heap.h" /> <ClInclude Include="..\..\src\core\iomgr\alarm_internal.h" /> @@ -191,6 +191,14 @@ <ClInclude Include="..\..\src\core\transport\transport_impl.h" /> </ItemGroup> <ItemGroup> + <ClCompile Include="..\..\src\core\httpcli\format_request.c"> + </ClCompile> + <ClCompile Include="..\..\src\core\httpcli\httpcli.c"> + </ClCompile> + <ClCompile Include="..\..\src\core\httpcli\httpcli_security_context.c"> + </ClCompile> + <ClCompile Include="..\..\src\core\httpcli\parser.c"> + </ClCompile> <ClCompile Include="..\..\src\core\security\auth.c"> </ClCompile> <ClCompile Include="..\..\src\core\security\base64.c"> @@ -199,8 +207,6 @@ </ClCompile> <ClCompile Include="..\..\src\core\security\factories.c"> </ClCompile> - <ClCompile Include="..\..\src\core\security\google_root_certs.c"> - </ClCompile> <ClCompile Include="..\..\src\core\security\json_token.c"> </ClCompile> <ClCompile Include="..\..\src\core\security\secure_endpoint.c"> @@ -211,6 +217,10 @@ </ClCompile> <ClCompile Include="..\..\src\core\security\server_secure_chttp2.c"> </ClCompile> + <ClCompile Include="..\..\src\core\surface\secure_channel_create.c"> + </ClCompile> + <ClCompile Include="..\..\src\core\surface\secure_server_create.c"> + </ClCompile> <ClCompile Include="..\..\src\core\tsi\fake_transport_security.c"> </ClCompile> <ClCompile Include="..\..\src\core\tsi\ssl_transport_security.c"> @@ -247,13 +257,7 @@ </ClCompile> <ClCompile Include="..\..\src\core\compression\message_compress.c"> </ClCompile> - <ClCompile Include="..\..\src\core\httpcli\format_request.c"> - </ClCompile> - <ClCompile Include="..\..\src\core\httpcli\httpcli.c"> - </ClCompile> - <ClCompile Include="..\..\src\core\httpcli\httpcli_security_context.c"> - </ClCompile> - <ClCompile Include="..\..\src\core\httpcli\parser.c"> + <ClCompile Include="..\..\src\core\debug\trace.c"> </ClCompile> <ClCompile Include="..\..\src\core\iomgr\alarm.c"> </ClCompile> @@ -363,10 +367,6 @@ </ClCompile> <ClCompile Include="..\..\src\core\surface\metadata_array.c"> </ClCompile> - <ClCompile Include="..\..\src\core\surface\secure_channel_create.c"> - </ClCompile> - <ClCompile Include="..\..\src\core\surface\secure_server_create.c"> - </ClCompile> <ClCompile Include="..\..\src\core\surface\server.c"> </ClCompile> <ClCompile Include="..\..\src\core\surface\server_chttp2.c"> diff --git a/vsprojects/vs2013/grpc_shared.vcxproj.filters b/vsprojects/vs2013/grpc_shared.vcxproj.filters index 8c174d9159..9505c37ef4 100644 --- a/vsprojects/vs2013/grpc_shared.vcxproj.filters +++ b/vsprojects/vs2013/grpc_shared.vcxproj.filters @@ -1,6 +1,18 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> + <ClCompile Include="..\..\src\core\httpcli\format_request.c"> + <Filter>src\core\httpcli</Filter> + </ClCompile> + <ClCompile Include="..\..\src\core\httpcli\httpcli.c"> + <Filter>src\core\httpcli</Filter> + </ClCompile> + <ClCompile Include="..\..\src\core\httpcli\httpcli_security_context.c"> + <Filter>src\core\httpcli</Filter> + </ClCompile> + <ClCompile Include="..\..\src\core\httpcli\parser.c"> + <Filter>src\core\httpcli</Filter> + </ClCompile> <ClCompile Include="..\..\src\core\security\auth.c"> <Filter>src\core\security</Filter> </ClCompile> @@ -13,9 +25,6 @@ <ClCompile Include="..\..\src\core\security\factories.c"> <Filter>src\core\security</Filter> </ClCompile> - <ClCompile Include="..\..\src\core\security\google_root_certs.c"> - <Filter>src\core\security</Filter> - </ClCompile> <ClCompile Include="..\..\src\core\security\json_token.c"> <Filter>src\core\security</Filter> </ClCompile> @@ -31,6 +40,12 @@ <ClCompile Include="..\..\src\core\security\server_secure_chttp2.c"> <Filter>src\core\security</Filter> </ClCompile> + <ClCompile Include="..\..\src\core\surface\secure_channel_create.c"> + <Filter>src\core\surface</Filter> + </ClCompile> + <ClCompile Include="..\..\src\core\surface\secure_server_create.c"> + <Filter>src\core\surface</Filter> + </ClCompile> <ClCompile Include="..\..\src\core\tsi\fake_transport_security.c"> <Filter>src\core\tsi</Filter> </ClCompile> @@ -85,17 +100,8 @@ <ClCompile Include="..\..\src\core\compression\message_compress.c"> <Filter>src\core\compression</Filter> </ClCompile> - <ClCompile Include="..\..\src\core\httpcli\format_request.c"> - <Filter>src\core\httpcli</Filter> - </ClCompile> - <ClCompile Include="..\..\src\core\httpcli\httpcli.c"> - <Filter>src\core\httpcli</Filter> - </ClCompile> - <ClCompile Include="..\..\src\core\httpcli\httpcli_security_context.c"> - <Filter>src\core\httpcli</Filter> - </ClCompile> - <ClCompile Include="..\..\src\core\httpcli\parser.c"> - <Filter>src\core\httpcli</Filter> + <ClCompile Include="..\..\src\core\debug\trace.c"> + <Filter>src\core\debug</Filter> </ClCompile> <ClCompile Include="..\..\src\core\iomgr\alarm.c"> <Filter>src\core\iomgr</Filter> @@ -259,12 +265,6 @@ <ClCompile Include="..\..\src\core\surface\metadata_array.c"> <Filter>src\core\surface</Filter> </ClCompile> - <ClCompile Include="..\..\src\core\surface\secure_channel_create.c"> - <Filter>src\core\surface</Filter> - </ClCompile> - <ClCompile Include="..\..\src\core\surface\secure_server_create.c"> - <Filter>src\core\surface</Filter> - </ClCompile> <ClCompile Include="..\..\src\core\surface\server.c"> <Filter>src\core\surface</Filter> </ClCompile> @@ -353,6 +353,18 @@ </ClInclude> </ItemGroup> <ItemGroup> + <ClInclude Include="..\..\src\core\httpcli\format_request.h"> + <Filter>src\core\httpcli</Filter> + </ClInclude> + <ClInclude Include="..\..\src\core\httpcli\httpcli.h"> + <Filter>src\core\httpcli</Filter> + </ClInclude> + <ClInclude Include="..\..\src\core\httpcli\httpcli_security_context.h"> + <Filter>src\core\httpcli</Filter> + </ClInclude> + <ClInclude Include="..\..\src\core\httpcli\parser.h"> + <Filter>src\core\httpcli</Filter> + </ClInclude> <ClInclude Include="..\..\src\core\security\auth.h"> <Filter>src\core\security</Filter> </ClInclude> @@ -362,9 +374,6 @@ <ClInclude Include="..\..\src\core\security\credentials.h"> <Filter>src\core\security</Filter> </ClInclude> - <ClInclude Include="..\..\src\core\security\google_root_certs.h"> - <Filter>src\core\security</Filter> - </ClInclude> <ClInclude Include="..\..\src\core\security\json_token.h"> <Filter>src\core\security</Filter> </ClInclude> @@ -428,17 +437,8 @@ <ClInclude Include="..\..\src\core\compression\message_compress.h"> <Filter>src\core\compression</Filter> </ClInclude> - <ClInclude Include="..\..\src\core\httpcli\format_request.h"> - <Filter>src\core\httpcli</Filter> - </ClInclude> - <ClInclude Include="..\..\src\core\httpcli\httpcli.h"> - <Filter>src\core\httpcli</Filter> - </ClInclude> - <ClInclude Include="..\..\src\core\httpcli\httpcli_security_context.h"> - <Filter>src\core\httpcli</Filter> - </ClInclude> - <ClInclude Include="..\..\src\core\httpcli\parser.h"> - <Filter>src\core\httpcli</Filter> + <ClInclude Include="..\..\src\core\debug\trace.h"> + <Filter>src\core\debug</Filter> </ClInclude> <ClInclude Include="..\..\src\core\iomgr\alarm.h"> <Filter>src\core\iomgr</Filter> @@ -674,6 +674,9 @@ <Filter Include="src\core\compression"> <UniqueIdentifier>{263cb913-dfe6-42a4-096b-cac231f76305}</UniqueIdentifier> </Filter> + <Filter Include="src\core\debug"> + <UniqueIdentifier>{1da7ef8a-a06d-5499-b3de-19fee4a4214d}</UniqueIdentifier> + </Filter> <Filter Include="src\core\httpcli"> <UniqueIdentifier>{a9bc00ad-835f-c625-c6d9-6a1324f98b9f}</UniqueIdentifier> </Filter> diff --git a/vsprojects/vs2013/grpc_test_util.vcxproj b/vsprojects/vs2013/grpc_test_util.vcxproj index e6af807bb8..7269671bd3 100644 --- a/vsprojects/vs2013/grpc_test_util.vcxproj +++ b/vsprojects/vs2013/grpc_test_util.vcxproj @@ -80,8 +80,6 @@ <ItemGroup> <ClCompile Include="..\..\test\core\end2end\cq_verifier.c"> </ClCompile> - <ClCompile Include="..\..\test\core\end2end\data\prod_roots_certs.c"> - </ClCompile> <ClCompile Include="..\..\test\core\end2end\data\server1_cert.c"> </ClCompile> <ClCompile Include="..\..\test\core\end2end\data\server1_key.c"> diff --git a/vsprojects/vs2013/grpc_unsecure.vcxproj b/vsprojects/vs2013/grpc_unsecure.vcxproj index 8b3b853cce..74fc6c96ec 100644 --- a/vsprojects/vs2013/grpc_unsecure.vcxproj +++ b/vsprojects/vs2013/grpc_unsecure.vcxproj @@ -98,10 +98,7 @@ <ClInclude Include="..\..\src\core\channel\noop_filter.h" /> <ClInclude Include="..\..\src\core\compression\algorithm.h" /> <ClInclude Include="..\..\src\core\compression\message_compress.h" /> - <ClInclude Include="..\..\src\core\httpcli\format_request.h" /> - <ClInclude Include="..\..\src\core\httpcli\httpcli.h" /> - <ClInclude Include="..\..\src\core\httpcli\httpcli_security_context.h" /> - <ClInclude Include="..\..\src\core\httpcli\parser.h" /> + <ClInclude Include="..\..\src\core\debug\trace.h" /> <ClInclude Include="..\..\src\core\iomgr\alarm.h" /> <ClInclude Include="..\..\src\core\iomgr\alarm_heap.h" /> <ClInclude Include="..\..\src\core\iomgr\alarm_internal.h" /> @@ -205,13 +202,7 @@ </ClCompile> <ClCompile Include="..\..\src\core\compression\message_compress.c"> </ClCompile> - <ClCompile Include="..\..\src\core\httpcli\format_request.c"> - </ClCompile> - <ClCompile Include="..\..\src\core\httpcli\httpcli.c"> - </ClCompile> - <ClCompile Include="..\..\src\core\httpcli\httpcli_security_context.c"> - </ClCompile> - <ClCompile Include="..\..\src\core\httpcli\parser.c"> + <ClCompile Include="..\..\src\core\debug\trace.c"> </ClCompile> <ClCompile Include="..\..\src\core\iomgr\alarm.c"> </ClCompile> @@ -321,10 +312,6 @@ </ClCompile> <ClCompile Include="..\..\src\core\surface\metadata_array.c"> </ClCompile> - <ClCompile Include="..\..\src\core\surface\secure_channel_create.c"> - </ClCompile> - <ClCompile Include="..\..\src\core\surface\secure_server_create.c"> - </ClCompile> <ClCompile Include="..\..\src\core\surface\server.c"> </ClCompile> <ClCompile Include="..\..\src\core\surface\server_chttp2.c"> diff --git a/vsprojects/vs2013/grpc_unsecure.vcxproj.filters b/vsprojects/vs2013/grpc_unsecure.vcxproj.filters index 6fac846422..ea34d210bf 100644 --- a/vsprojects/vs2013/grpc_unsecure.vcxproj.filters +++ b/vsprojects/vs2013/grpc_unsecure.vcxproj.filters @@ -46,17 +46,8 @@ <ClCompile Include="..\..\src\core\compression\message_compress.c"> <Filter>src\core\compression</Filter> </ClCompile> - <ClCompile Include="..\..\src\core\httpcli\format_request.c"> - <Filter>src\core\httpcli</Filter> - </ClCompile> - <ClCompile Include="..\..\src\core\httpcli\httpcli.c"> - <Filter>src\core\httpcli</Filter> - </ClCompile> - <ClCompile Include="..\..\src\core\httpcli\httpcli_security_context.c"> - <Filter>src\core\httpcli</Filter> - </ClCompile> - <ClCompile Include="..\..\src\core\httpcli\parser.c"> - <Filter>src\core\httpcli</Filter> + <ClCompile Include="..\..\src\core\debug\trace.c"> + <Filter>src\core\debug</Filter> </ClCompile> <ClCompile Include="..\..\src\core\iomgr\alarm.c"> <Filter>src\core\iomgr</Filter> @@ -220,12 +211,6 @@ <ClCompile Include="..\..\src\core\surface\metadata_array.c"> <Filter>src\core\surface</Filter> </ClCompile> - <ClCompile Include="..\..\src\core\surface\secure_channel_create.c"> - <Filter>src\core\surface</Filter> - </ClCompile> - <ClCompile Include="..\..\src\core\surface\secure_server_create.c"> - <Filter>src\core\surface</Filter> - </ClCompile> <ClCompile Include="..\..\src\core\surface\server.c"> <Filter>src\core\surface</Filter> </ClCompile> @@ -353,17 +338,8 @@ <ClInclude Include="..\..\src\core\compression\message_compress.h"> <Filter>src\core\compression</Filter> </ClInclude> - <ClInclude Include="..\..\src\core\httpcli\format_request.h"> - <Filter>src\core\httpcli</Filter> - </ClInclude> - <ClInclude Include="..\..\src\core\httpcli\httpcli.h"> - <Filter>src\core\httpcli</Filter> - </ClInclude> - <ClInclude Include="..\..\src\core\httpcli\httpcli_security_context.h"> - <Filter>src\core\httpcli</Filter> - </ClInclude> - <ClInclude Include="..\..\src\core\httpcli\parser.h"> - <Filter>src\core\httpcli</Filter> + <ClInclude Include="..\..\src\core\debug\trace.h"> + <Filter>src\core\debug</Filter> </ClInclude> <ClInclude Include="..\..\src\core\iomgr\alarm.h"> <Filter>src\core\iomgr</Filter> @@ -599,8 +575,8 @@ <Filter Include="src\core\compression"> <UniqueIdentifier>{2e3aca1d-223d-10a1-b282-7f9fc68ee6f5}</UniqueIdentifier> </Filter> - <Filter Include="src\core\httpcli"> - <UniqueIdentifier>{1ba3a245-47e7-89b5-b0c9-aca758bd0277}</UniqueIdentifier> + <Filter Include="src\core\debug"> + <UniqueIdentifier>{6d8d5774-7291-554d-fafa-583463cd3fd9}</UniqueIdentifier> </Filter> <Filter Include="src\core\iomgr"> <UniqueIdentifier>{a9df8b24-ecea-ff6d-8999-d8fa54cd70bf}</UniqueIdentifier> |