diff options
Diffstat (limited to 'vsprojects/vcxproj')
18 files changed, 82 insertions, 540 deletions
diff --git a/vsprojects/vcxproj/gpr/gpr.vcxproj b/vsprojects/vcxproj/gpr/gpr.vcxproj index 479286fe97..fa495db07b 100644 --- a/vsprojects/vcxproj/gpr/gpr.vcxproj +++ b/vsprojects/vcxproj/gpr/gpr.vcxproj @@ -163,6 +163,7 @@ <ClInclude Include="..\..\..\include\grpc\support\useful.h" /> </ItemGroup> <ItemGroup> + <ClInclude Include="..\..\..\src\core\profiling\timers.h" /> <ClInclude Include="..\..\..\src\core\support\block_annotate.h" /> <ClInclude Include="..\..\..\src\core\support\env.h" /> <ClInclude Include="..\..\..\src\core\support\file.h" /> @@ -174,6 +175,10 @@ <ClInclude Include="..\..\..\src\core\support\time_precise.h" /> </ItemGroup> <ItemGroup> + <ClCompile Include="..\..\..\src\core\profiling\basic_timers.c"> + </ClCompile> + <ClCompile Include="..\..\..\src\core\profiling\stap_timers.c"> + </ClCompile> <ClCompile Include="..\..\..\src\core\support\alloc.c"> </ClCompile> <ClCompile Include="..\..\..\src\core\support\cmdline.c"> @@ -244,6 +249,8 @@ </ClCompile> <ClCompile Include="..\..\..\src\core\support\time_posix.c"> </ClCompile> + <ClCompile Include="..\..\..\src\core\support\time_precise.c"> + </ClCompile> <ClCompile Include="..\..\..\src\core\support\time_win32.c"> </ClCompile> <ClCompile Include="..\..\..\src\core\support\tls_pthread.c"> diff --git a/vsprojects/vcxproj/gpr/gpr.vcxproj.filters b/vsprojects/vcxproj/gpr/gpr.vcxproj.filters index be5bb5162d..ee03e45453 100644 --- a/vsprojects/vcxproj/gpr/gpr.vcxproj.filters +++ b/vsprojects/vcxproj/gpr/gpr.vcxproj.filters @@ -1,6 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> + <ClCompile Include="..\..\..\src\core\profiling\basic_timers.c"> + <Filter>src\core\profiling</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\core\profiling\stap_timers.c"> + <Filter>src\core\profiling</Filter> + </ClCompile> <ClCompile Include="..\..\..\src\core\support\alloc.c"> <Filter>src\core\support</Filter> </ClCompile> @@ -106,6 +112,9 @@ <ClCompile Include="..\..\..\src\core\support\time_posix.c"> <Filter>src\core\support</Filter> </ClCompile> + <ClCompile Include="..\..\..\src\core\support\time_precise.c"> + <Filter>src\core\support</Filter> + </ClCompile> <ClCompile Include="..\..\..\src\core\support\time_win32.c"> <Filter>src\core\support</Filter> </ClCompile> @@ -197,6 +206,9 @@ </ClInclude> </ItemGroup> <ItemGroup> + <ClInclude Include="..\..\..\src\core\profiling\timers.h"> + <Filter>src\core\profiling</Filter> + </ClInclude> <ClInclude Include="..\..\..\src\core\support\block_annotate.h"> <Filter>src\core\support</Filter> </ClInclude> @@ -242,6 +254,9 @@ <Filter Include="src\core"> <UniqueIdentifier>{c5e1baa7-de77-beb1-9675-942261648f79}</UniqueIdentifier> </Filter> + <Filter Include="src\core\profiling"> + <UniqueIdentifier>{93b7086c-8c8a-6bbf-fb14-1f166bf0146a}</UniqueIdentifier> + </Filter> <Filter Include="src\core\support"> <UniqueIdentifier>{bb116f2a-ea2a-c233-82da-0c54e3cbfec1}</UniqueIdentifier> </Filter> diff --git a/vsprojects/vcxproj/grpc++/grpc++.vcxproj b/vsprojects/vcxproj/grpc++/grpc++.vcxproj index da8c51c5a7..9f88c728c6 100644 --- a/vsprojects/vcxproj/grpc++/grpc++.vcxproj +++ b/vsprojects/vcxproj/grpc++/grpc++.vcxproj @@ -237,7 +237,6 @@ </Link> </ItemDefinitionGroup> <ItemGroup> - <ClInclude Include="..\..\..\include\grpc++\alarm.h" /> <ClInclude Include="..\..\..\include\grpc++\channel.h" /> <ClInclude Include="..\..\..\include\grpc++\client_context.h" /> <ClInclude Include="..\..\..\include\grpc++\completion_queue.h" /> @@ -319,8 +318,6 @@ </ClCompile> <ClCompile Include="..\..\..\src\cpp\client\insecure_credentials.cc"> </ClCompile> - <ClCompile Include="..\..\..\src\cpp\common\alarm.cc"> - </ClCompile> <ClCompile Include="..\..\..\src\cpp\common\call.cc"> </ClCompile> <ClCompile Include="..\..\..\src\cpp\common\completion_queue.cc"> diff --git a/vsprojects/vcxproj/grpc++/grpc++.vcxproj.filters b/vsprojects/vcxproj/grpc++/grpc++.vcxproj.filters index f9a03cba85..7d9cd4769d 100644 --- a/vsprojects/vcxproj/grpc++/grpc++.vcxproj.filters +++ b/vsprojects/vcxproj/grpc++/grpc++.vcxproj.filters @@ -43,9 +43,6 @@ <ClCompile Include="..\..\..\src\cpp\client\insecure_credentials.cc"> <Filter>src\cpp\client</Filter> </ClCompile> - <ClCompile Include="..\..\..\src\cpp\common\alarm.cc"> - <Filter>src\cpp\common</Filter> - </ClCompile> <ClCompile Include="..\..\..\src\cpp\common\call.cc"> <Filter>src\cpp\common</Filter> </ClCompile> @@ -102,9 +99,6 @@ </ClCompile> </ItemGroup> <ItemGroup> - <ClInclude Include="..\..\..\include\grpc++\alarm.h"> - <Filter>include\grpc++</Filter> - </ClInclude> <ClInclude Include="..\..\..\include\grpc++\channel.h"> <Filter>include\grpc++</Filter> </ClInclude> diff --git a/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj b/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj index 3484d4bdc3..74b0fbf2be 100644 --- a/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj +++ b/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj @@ -237,7 +237,6 @@ </Link> </ItemDefinitionGroup> <ItemGroup> - <ClInclude Include="..\..\..\include\grpc++\alarm.h" /> <ClInclude Include="..\..\..\include\grpc++\channel.h" /> <ClInclude Include="..\..\..\include\grpc++\client_context.h" /> <ClInclude Include="..\..\..\include\grpc++\completion_queue.h" /> @@ -306,8 +305,6 @@ </ClCompile> <ClCompile Include="..\..\..\src\cpp\client\insecure_credentials.cc"> </ClCompile> - <ClCompile Include="..\..\..\src\cpp\common\alarm.cc"> - </ClCompile> <ClCompile Include="..\..\..\src\cpp\common\call.cc"> </ClCompile> <ClCompile Include="..\..\..\src\cpp\common\completion_queue.cc"> diff --git a/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj.filters b/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj.filters index 39261b3191..96effe2961 100644 --- a/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj.filters +++ b/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj.filters @@ -28,9 +28,6 @@ <ClCompile Include="..\..\..\src\cpp\client\insecure_credentials.cc"> <Filter>src\cpp\client</Filter> </ClCompile> - <ClCompile Include="..\..\..\src\cpp\common\alarm.cc"> - <Filter>src\cpp\common</Filter> - </ClCompile> <ClCompile Include="..\..\..\src\cpp\common\call.cc"> <Filter>src\cpp\common</Filter> </ClCompile> @@ -87,9 +84,6 @@ </ClCompile> </ItemGroup> <ItemGroup> - <ClInclude Include="..\..\..\include\grpc++\alarm.h"> - <Filter>include\grpc++</Filter> - </ClInclude> <ClInclude Include="..\..\..\include\grpc++\channel.h"> <Filter>include\grpc++</Filter> </ClInclude> diff --git a/vsprojects/vcxproj/grpc/grpc.vcxproj b/vsprojects/vcxproj/grpc/grpc.vcxproj index d9b0b84b94..23bcd0c443 100644 --- a/vsprojects/vcxproj/grpc/grpc.vcxproj +++ b/vsprojects/vcxproj/grpc/grpc.vcxproj @@ -298,6 +298,9 @@ <ClInclude Include="..\..\..\src\core\httpcli\format_request.h" /> <ClInclude Include="..\..\..\src\core\httpcli\httpcli.h" /> <ClInclude Include="..\..\..\src\core\httpcli\parser.h" /> + <ClInclude Include="..\..\..\src\core\iomgr\alarm.h" /> + <ClInclude Include="..\..\..\src\core\iomgr\alarm_heap.h" /> + <ClInclude Include="..\..\..\src\core\iomgr\alarm_internal.h" /> <ClInclude Include="..\..\..\src\core\iomgr\closure.h" /> <ClInclude Include="..\..\..\src\core\iomgr\endpoint.h" /> <ClInclude Include="..\..\..\src\core\iomgr\endpoint_pair.h" /> @@ -325,9 +328,6 @@ <ClInclude Include="..\..\..\src\core\iomgr\tcp_server.h" /> <ClInclude Include="..\..\..\src\core\iomgr\tcp_windows.h" /> <ClInclude Include="..\..\..\src\core\iomgr\time_averaged_stats.h" /> - <ClInclude Include="..\..\..\src\core\iomgr\timer.h" /> - <ClInclude Include="..\..\..\src\core\iomgr\timer_heap.h" /> - <ClInclude Include="..\..\..\src\core\iomgr\timer_internal.h" /> <ClInclude Include="..\..\..\src\core\iomgr\udp_server.h" /> <ClInclude Include="..\..\..\src\core\iomgr\wakeup_fd_pipe.h" /> <ClInclude Include="..\..\..\src\core\iomgr\wakeup_fd_posix.h" /> @@ -338,7 +338,6 @@ <ClInclude Include="..\..\..\src\core\json\json_common.h" /> <ClInclude Include="..\..\..\src\core\json\json_reader.h" /> <ClInclude Include="..\..\..\src\core\json\json_writer.h" /> - <ClInclude Include="..\..\..\src\core\profiling\timers.h" /> <ClInclude Include="..\..\..\src\core\statistics\census_interface.h" /> <ClInclude Include="..\..\..\src\core\statistics\census_rpc_stats.h" /> <ClInclude Include="..\..\..\src\core\surface\api_trace.h" /> @@ -490,6 +489,10 @@ </ClCompile> <ClCompile Include="..\..\..\src\core\httpcli\parser.c"> </ClCompile> + <ClCompile Include="..\..\..\src\core\iomgr\alarm.c"> + </ClCompile> + <ClCompile Include="..\..\..\src\core\iomgr\alarm_heap.c"> + </ClCompile> <ClCompile Include="..\..\..\src\core\iomgr\closure.c"> </ClCompile> <ClCompile Include="..\..\..\src\core\iomgr\endpoint.c"> @@ -550,10 +553,6 @@ </ClCompile> <ClCompile Include="..\..\..\src\core\iomgr\time_averaged_stats.c"> </ClCompile> - <ClCompile Include="..\..\..\src\core\iomgr\timer.c"> - </ClCompile> - <ClCompile Include="..\..\..\src\core\iomgr\timer_heap.c"> - </ClCompile> <ClCompile Include="..\..\..\src\core\iomgr\udp_server.c"> </ClCompile> <ClCompile Include="..\..\..\src\core\iomgr\wakeup_fd_eventfd.c"> @@ -576,12 +575,6 @@ </ClCompile> <ClCompile Include="..\..\..\src\core\json\json_writer.c"> </ClCompile> - <ClCompile Include="..\..\..\src\core\profiling\basic_timers.c"> - </ClCompile> - <ClCompile Include="..\..\..\src\core\profiling\stap_timers.c"> - </ClCompile> - <ClCompile Include="..\..\..\src\core\surface\alarm.c"> - </ClCompile> <ClCompile Include="..\..\..\src\core\surface\api_trace.c"> </ClCompile> <ClCompile Include="..\..\..\src\core\surface\byte_buffer.c"> diff --git a/vsprojects/vcxproj/grpc/grpc.vcxproj.filters b/vsprojects/vcxproj/grpc/grpc.vcxproj.filters index 5a5081e796..1cfccf0e19 100644 --- a/vsprojects/vcxproj/grpc/grpc.vcxproj.filters +++ b/vsprojects/vcxproj/grpc/grpc.vcxproj.filters @@ -163,6 +163,12 @@ <ClCompile Include="..\..\..\src\core\httpcli\parser.c"> <Filter>src\core\httpcli</Filter> </ClCompile> + <ClCompile Include="..\..\..\src\core\iomgr\alarm.c"> + <Filter>src\core\iomgr</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\core\iomgr\alarm_heap.c"> + <Filter>src\core\iomgr</Filter> + </ClCompile> <ClCompile Include="..\..\..\src\core\iomgr\closure.c"> <Filter>src\core\iomgr</Filter> </ClCompile> @@ -253,12 +259,6 @@ <ClCompile Include="..\..\..\src\core\iomgr\time_averaged_stats.c"> <Filter>src\core\iomgr</Filter> </ClCompile> - <ClCompile Include="..\..\..\src\core\iomgr\timer.c"> - <Filter>src\core\iomgr</Filter> - </ClCompile> - <ClCompile Include="..\..\..\src\core\iomgr\timer_heap.c"> - <Filter>src\core\iomgr</Filter> - </ClCompile> <ClCompile Include="..\..\..\src\core\iomgr\udp_server.c"> <Filter>src\core\iomgr</Filter> </ClCompile> @@ -292,15 +292,6 @@ <ClCompile Include="..\..\..\src\core\json\json_writer.c"> <Filter>src\core\json</Filter> </ClCompile> - <ClCompile Include="..\..\..\src\core\profiling\basic_timers.c"> - <Filter>src\core\profiling</Filter> - </ClCompile> - <ClCompile Include="..\..\..\src\core\profiling\stap_timers.c"> - <Filter>src\core\profiling</Filter> - </ClCompile> - <ClCompile Include="..\..\..\src\core\surface\alarm.c"> - <Filter>src\core\surface</Filter> - </ClCompile> <ClCompile Include="..\..\..\src\core\surface\api_trace.c"> <Filter>src\core\surface</Filter> </ClCompile> @@ -608,6 +599,15 @@ <ClInclude Include="..\..\..\src\core\httpcli\parser.h"> <Filter>src\core\httpcli</Filter> </ClInclude> + <ClInclude Include="..\..\..\src\core\iomgr\alarm.h"> + <Filter>src\core\iomgr</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\core\iomgr\alarm_heap.h"> + <Filter>src\core\iomgr</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\core\iomgr\alarm_internal.h"> + <Filter>src\core\iomgr</Filter> + </ClInclude> <ClInclude Include="..\..\..\src\core\iomgr\closure.h"> <Filter>src\core\iomgr</Filter> </ClInclude> @@ -689,15 +689,6 @@ <ClInclude Include="..\..\..\src\core\iomgr\time_averaged_stats.h"> <Filter>src\core\iomgr</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\core\iomgr\timer.h"> - <Filter>src\core\iomgr</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\core\iomgr\timer_heap.h"> - <Filter>src\core\iomgr</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\core\iomgr\timer_internal.h"> - <Filter>src\core\iomgr</Filter> - </ClInclude> <ClInclude Include="..\..\..\src\core\iomgr\udp_server.h"> <Filter>src\core\iomgr</Filter> </ClInclude> @@ -728,9 +719,6 @@ <ClInclude Include="..\..\..\src\core\json\json_writer.h"> <Filter>src\core\json</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\core\profiling\timers.h"> - <Filter>src\core\profiling</Filter> - </ClInclude> <ClInclude Include="..\..\..\src\core\statistics\census_interface.h"> <Filter>src\core\statistics</Filter> </ClInclude> @@ -902,9 +890,6 @@ <Filter Include="src\core\json"> <UniqueIdentifier>{e665cc0e-b994-d7c5-cc18-2007392019f0}</UniqueIdentifier> </Filter> - <Filter Include="src\core\profiling"> - <UniqueIdentifier>{87674b72-0f05-0469-481a-bd8c7af9ad80}</UniqueIdentifier> - </Filter> <Filter Include="src\core\security"> <UniqueIdentifier>{1d850ac6-e639-4eab-5338-4ba40272fcc9}</UniqueIdentifier> </Filter> diff --git a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj index 6027c39ed5..e308a03fda 100644 --- a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj +++ b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj @@ -277,6 +277,9 @@ <ClInclude Include="..\..\..\src\core\httpcli\format_request.h" /> <ClInclude Include="..\..\..\src\core\httpcli\httpcli.h" /> <ClInclude Include="..\..\..\src\core\httpcli\parser.h" /> + <ClInclude Include="..\..\..\src\core\iomgr\alarm.h" /> + <ClInclude Include="..\..\..\src\core\iomgr\alarm_heap.h" /> + <ClInclude Include="..\..\..\src\core\iomgr\alarm_internal.h" /> <ClInclude Include="..\..\..\src\core\iomgr\closure.h" /> <ClInclude Include="..\..\..\src\core\iomgr\endpoint.h" /> <ClInclude Include="..\..\..\src\core\iomgr\endpoint_pair.h" /> @@ -304,9 +307,6 @@ <ClInclude Include="..\..\..\src\core\iomgr\tcp_server.h" /> <ClInclude Include="..\..\..\src\core\iomgr\tcp_windows.h" /> <ClInclude Include="..\..\..\src\core\iomgr\time_averaged_stats.h" /> - <ClInclude Include="..\..\..\src\core\iomgr\timer.h" /> - <ClInclude Include="..\..\..\src\core\iomgr\timer_heap.h" /> - <ClInclude Include="..\..\..\src\core\iomgr\timer_internal.h" /> <ClInclude Include="..\..\..\src\core\iomgr\udp_server.h" /> <ClInclude Include="..\..\..\src\core\iomgr\wakeup_fd_pipe.h" /> <ClInclude Include="..\..\..\src\core\iomgr\wakeup_fd_posix.h" /> @@ -317,7 +317,6 @@ <ClInclude Include="..\..\..\src\core\json\json_common.h" /> <ClInclude Include="..\..\..\src\core\json\json_reader.h" /> <ClInclude Include="..\..\..\src\core\json\json_writer.h" /> - <ClInclude Include="..\..\..\src\core\profiling\timers.h" /> <ClInclude Include="..\..\..\src\core\statistics\census_interface.h" /> <ClInclude Include="..\..\..\src\core\statistics\census_rpc_stats.h" /> <ClInclude Include="..\..\..\src\core\surface\api_trace.h" /> @@ -429,6 +428,10 @@ </ClCompile> <ClCompile Include="..\..\..\src\core\httpcli\parser.c"> </ClCompile> + <ClCompile Include="..\..\..\src\core\iomgr\alarm.c"> + </ClCompile> + <ClCompile Include="..\..\..\src\core\iomgr\alarm_heap.c"> + </ClCompile> <ClCompile Include="..\..\..\src\core\iomgr\closure.c"> </ClCompile> <ClCompile Include="..\..\..\src\core\iomgr\endpoint.c"> @@ -489,10 +492,6 @@ </ClCompile> <ClCompile Include="..\..\..\src\core\iomgr\time_averaged_stats.c"> </ClCompile> - <ClCompile Include="..\..\..\src\core\iomgr\timer.c"> - </ClCompile> - <ClCompile Include="..\..\..\src\core\iomgr\timer_heap.c"> - </ClCompile> <ClCompile Include="..\..\..\src\core\iomgr\udp_server.c"> </ClCompile> <ClCompile Include="..\..\..\src\core\iomgr\wakeup_fd_eventfd.c"> @@ -515,12 +514,6 @@ </ClCompile> <ClCompile Include="..\..\..\src\core\json\json_writer.c"> </ClCompile> - <ClCompile Include="..\..\..\src\core\profiling\basic_timers.c"> - </ClCompile> - <ClCompile Include="..\..\..\src\core\profiling\stap_timers.c"> - </ClCompile> - <ClCompile Include="..\..\..\src\core\surface\alarm.c"> - </ClCompile> <ClCompile Include="..\..\..\src\core\surface\api_trace.c"> </ClCompile> <ClCompile Include="..\..\..\src\core\surface\byte_buffer.c"> diff --git a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters index 7e3efbe754..370d1f6fb2 100644 --- a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters +++ b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters @@ -103,6 +103,12 @@ <ClCompile Include="..\..\..\src\core\httpcli\parser.c"> <Filter>src\core\httpcli</Filter> </ClCompile> + <ClCompile Include="..\..\..\src\core\iomgr\alarm.c"> + <Filter>src\core\iomgr</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\core\iomgr\alarm_heap.c"> + <Filter>src\core\iomgr</Filter> + </ClCompile> <ClCompile Include="..\..\..\src\core\iomgr\closure.c"> <Filter>src\core\iomgr</Filter> </ClCompile> @@ -193,12 +199,6 @@ <ClCompile Include="..\..\..\src\core\iomgr\time_averaged_stats.c"> <Filter>src\core\iomgr</Filter> </ClCompile> - <ClCompile Include="..\..\..\src\core\iomgr\timer.c"> - <Filter>src\core\iomgr</Filter> - </ClCompile> - <ClCompile Include="..\..\..\src\core\iomgr\timer_heap.c"> - <Filter>src\core\iomgr</Filter> - </ClCompile> <ClCompile Include="..\..\..\src\core\iomgr\udp_server.c"> <Filter>src\core\iomgr</Filter> </ClCompile> @@ -232,15 +232,6 @@ <ClCompile Include="..\..\..\src\core\json\json_writer.c"> <Filter>src\core\json</Filter> </ClCompile> - <ClCompile Include="..\..\..\src\core\profiling\basic_timers.c"> - <Filter>src\core\profiling</Filter> - </ClCompile> - <ClCompile Include="..\..\..\src\core\profiling\stap_timers.c"> - <Filter>src\core\profiling</Filter> - </ClCompile> - <ClCompile Include="..\..\..\src\core\surface\alarm.c"> - <Filter>src\core\surface</Filter> - </ClCompile> <ClCompile Include="..\..\..\src\core\surface\api_trace.c"> <Filter>src\core\surface</Filter> </ClCompile> @@ -506,6 +497,15 @@ <ClInclude Include="..\..\..\src\core\httpcli\parser.h"> <Filter>src\core\httpcli</Filter> </ClInclude> + <ClInclude Include="..\..\..\src\core\iomgr\alarm.h"> + <Filter>src\core\iomgr</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\core\iomgr\alarm_heap.h"> + <Filter>src\core\iomgr</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\core\iomgr\alarm_internal.h"> + <Filter>src\core\iomgr</Filter> + </ClInclude> <ClInclude Include="..\..\..\src\core\iomgr\closure.h"> <Filter>src\core\iomgr</Filter> </ClInclude> @@ -587,15 +587,6 @@ <ClInclude Include="..\..\..\src\core\iomgr\time_averaged_stats.h"> <Filter>src\core\iomgr</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\core\iomgr\timer.h"> - <Filter>src\core\iomgr</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\core\iomgr\timer_heap.h"> - <Filter>src\core\iomgr</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\core\iomgr\timer_internal.h"> - <Filter>src\core\iomgr</Filter> - </ClInclude> <ClInclude Include="..\..\..\src\core\iomgr\udp_server.h"> <Filter>src\core\iomgr</Filter> </ClInclude> @@ -626,9 +617,6 @@ <ClInclude Include="..\..\..\src\core\json\json_writer.h"> <Filter>src\core\json</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\core\profiling\timers.h"> - <Filter>src\core\profiling</Filter> - </ClInclude> <ClInclude Include="..\..\..\src\core\statistics\census_interface.h"> <Filter>src\core\statistics</Filter> </ClInclude> @@ -800,9 +788,6 @@ <Filter Include="src\core\json"> <UniqueIdentifier>{443ffc61-1bea-2477-6e54-1ddf8c139264}</UniqueIdentifier> </Filter> - <Filter Include="src\core\profiling"> - <UniqueIdentifier>{7f91d9bf-c9de-835a-d74d-b16f843b89a9}</UniqueIdentifier> - </Filter> <Filter Include="src\core\statistics"> <UniqueIdentifier>{e084164c-a069-00e3-db35-4e0b1cd6f0b7}</UniqueIdentifier> </Filter> diff --git a/vsprojects/vcxproj/test/timer_heap_test/timer_heap_test.vcxproj b/vsprojects/vcxproj/test/alarm_heap_test/alarm_heap_test.vcxproj index 8b84a528a0..f3c0cfd3c2 100644 --- a/vsprojects/vcxproj/test/timer_heap_test/timer_heap_test.vcxproj +++ b/vsprojects/vcxproj/test/alarm_heap_test/alarm_heap_test.vcxproj @@ -20,7 +20,7 @@ </ProjectConfiguration> </ItemGroup> <PropertyGroup Label="Globals"> - <ProjectGuid>{A2110C60-E75A-F76E-205E-1836F86C4D53}</ProjectGuid> + <ProjectGuid>{B1746F03-DFBD-83E6-9886-2BB0F9D70B57}</ProjectGuid> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(VisualStudioVersion)' == '10.0'" Label="Configuration"> @@ -55,13 +55,13 @@ </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup Condition="'$(Configuration)'=='Debug'"> - <TargetName>timer_heap_test</TargetName> + <TargetName>alarm_heap_test</TargetName> <Linkage-grpc_dependencies_zlib>static</Linkage-grpc_dependencies_zlib> <Configuration-grpc_dependencies_zlib>Debug</Configuration-grpc_dependencies_zlib> <Configuration-grpc_dependencies_openssl>Debug</Configuration-grpc_dependencies_openssl> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)'=='Release'"> - <TargetName>timer_heap_test</TargetName> + <TargetName>alarm_heap_test</TargetName> <Linkage-grpc_dependencies_zlib>static</Linkage-grpc_dependencies_zlib> <Configuration-grpc_dependencies_zlib>Debug</Configuration-grpc_dependencies_zlib> <Configuration-grpc_dependencies_openssl>Debug</Configuration-grpc_dependencies_openssl> @@ -143,7 +143,7 @@ </Link> </ItemDefinitionGroup> <ItemGroup> - <ClCompile Include="..\..\..\..\test\core\iomgr\timer_heap_test.c"> + <ClCompile Include="..\..\..\..\test\core\iomgr\alarm_heap_test.c"> </ClCompile> </ItemGroup> <ItemGroup> diff --git a/vsprojects/vcxproj/test/timer_heap_test/timer_heap_test.vcxproj.filters b/vsprojects/vcxproj/test/alarm_heap_test/alarm_heap_test.vcxproj.filters index 6a22addffa..74604fa744 100644 --- a/vsprojects/vcxproj/test/timer_heap_test/timer_heap_test.vcxproj.filters +++ b/vsprojects/vcxproj/test/alarm_heap_test/alarm_heap_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="..\..\..\..\test\core\iomgr\timer_heap_test.c"> + <ClCompile Include="..\..\..\..\test\core\iomgr\alarm_heap_test.c"> <Filter>test\core\iomgr</Filter> </ClCompile> </ItemGroup> <ItemGroup> <Filter Include="test"> - <UniqueIdentifier>{c7789d63-cb31-a5ba-a830-4a6223e5561c}</UniqueIdentifier> + <UniqueIdentifier>{39c80086-e80b-b26f-6db8-7057b2bd93b3}</UniqueIdentifier> </Filter> <Filter Include="test\core"> - <UniqueIdentifier>{320a9cb8-0041-acb0-79d5-6cff8f1fdeba}</UniqueIdentifier> + <UniqueIdentifier>{c551e414-1de0-a7c1-a69b-3ba69c55e5d4}</UniqueIdentifier> </Filter> <Filter Include="test\core\iomgr"> - <UniqueIdentifier>{df867a7c-861e-6482-a5b2-35a8ca345a6a}</UniqueIdentifier> + <UniqueIdentifier>{1330dfd2-f26b-7973-17c9-97c8809e9b74}</UniqueIdentifier> </Filter> </ItemGroup> </Project> diff --git a/vsprojects/vcxproj/test/timer_list_test/timer_list_test.vcxproj b/vsprojects/vcxproj/test/alarm_list_test/alarm_list_test.vcxproj index 4f00b62803..cce21d4c71 100644 --- a/vsprojects/vcxproj/test/timer_list_test/timer_list_test.vcxproj +++ b/vsprojects/vcxproj/test/alarm_list_test/alarm_list_test.vcxproj @@ -20,7 +20,7 @@ </ProjectConfiguration> </ItemGroup> <PropertyGroup Label="Globals"> - <ProjectGuid>{C43EA45B-1E72-C58D-8CE3-A879D1B1E2DB}</ProjectGuid> + <ProjectGuid>{E6F27D86-476F-CB60-AC56-ED3A210C0E96}</ProjectGuid> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(VisualStudioVersion)' == '10.0'" Label="Configuration"> @@ -55,13 +55,13 @@ </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup Condition="'$(Configuration)'=='Debug'"> - <TargetName>timer_list_test</TargetName> + <TargetName>alarm_list_test</TargetName> <Linkage-grpc_dependencies_zlib>static</Linkage-grpc_dependencies_zlib> <Configuration-grpc_dependencies_zlib>Debug</Configuration-grpc_dependencies_zlib> <Configuration-grpc_dependencies_openssl>Debug</Configuration-grpc_dependencies_openssl> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)'=='Release'"> - <TargetName>timer_list_test</TargetName> + <TargetName>alarm_list_test</TargetName> <Linkage-grpc_dependencies_zlib>static</Linkage-grpc_dependencies_zlib> <Configuration-grpc_dependencies_zlib>Debug</Configuration-grpc_dependencies_zlib> <Configuration-grpc_dependencies_openssl>Debug</Configuration-grpc_dependencies_openssl> @@ -143,7 +143,7 @@ </Link> </ItemDefinitionGroup> <ItemGroup> - <ClCompile Include="..\..\..\..\test\core\iomgr\timer_list_test.c"> + <ClCompile Include="..\..\..\..\test\core\iomgr\alarm_list_test.c"> </ClCompile> </ItemGroup> <ItemGroup> diff --git a/vsprojects/vcxproj/test/timer_list_test/timer_list_test.vcxproj.filters b/vsprojects/vcxproj/test/alarm_list_test/alarm_list_test.vcxproj.filters index 8973e5a9bd..cc4cbf7c83 100644 --- a/vsprojects/vcxproj/test/timer_list_test/timer_list_test.vcxproj.filters +++ b/vsprojects/vcxproj/test/alarm_list_test/alarm_list_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="..\..\..\..\test\core\iomgr\timer_list_test.c"> + <ClCompile Include="..\..\..\..\test\core\iomgr\alarm_list_test.c"> <Filter>test\core\iomgr</Filter> </ClCompile> </ItemGroup> <ItemGroup> <Filter Include="test"> - <UniqueIdentifier>{ce536631-1d52-1c3c-8eed-efe2f4bae6ed}</UniqueIdentifier> + <UniqueIdentifier>{5599c85d-915e-7ef2-1b2c-061b82987e1d}</UniqueIdentifier> </Filter> <Filter Include="test\core"> - <UniqueIdentifier>{b877a050-4172-3910-dede-77628e0ef150}</UniqueIdentifier> + <UniqueIdentifier>{46744e86-73cb-67b0-cddb-72655b2ded40}</UniqueIdentifier> </Filter> <Filter Include="test\core\iomgr"> - <UniqueIdentifier>{087dd179-d26d-8e56-707b-6059afbfd70a}</UniqueIdentifier> + <UniqueIdentifier>{26291b48-8dd4-079f-bbfa-a07190367bd7}</UniqueIdentifier> </Filter> </ItemGroup> </Project> diff --git a/vsprojects/vcxproj/test/alarm_test/alarm_test.vcxproj b/vsprojects/vcxproj/test/alarm_test/alarm_test.vcxproj deleted file mode 100644 index d7afec68ea..0000000000 --- a/vsprojects/vcxproj/test/alarm_test/alarm_test.vcxproj +++ /dev/null @@ -1,192 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\vsprojects\packages\grpc.dependencies.openssl.1.0.2.3\build\native\grpc.dependencies.openssl.props" Condition="Exists('..\..\..\..\vsprojects\packages\grpc.dependencies.openssl.1.0.2.3\build\native\1.0.2.3.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>{AFD362D7-0E2A-E700-1F27-9D90F76166DF}</ProjectGuid> - </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="'$(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="..\..\..\..\vsprojects\cpptest.props" /> - <Import Project="..\..\..\..\vsprojects\global.props" /> - <Import Project="..\..\..\..\vsprojects\openssl.props" /> - <Import Project="..\..\..\..\vsprojects\protobuf.props" /> - <Import Project="..\..\..\..\vsprojects\winsock.props" /> - <Import Project="..\..\..\..\vsprojects\zlib.props" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)'=='Debug'"> - <TargetName>alarm_test</TargetName> - <Linkage-grpc_dependencies_zlib>static</Linkage-grpc_dependencies_zlib> - <Configuration-grpc_dependencies_zlib>Debug</Configuration-grpc_dependencies_zlib> - <Configuration-grpc_dependencies_openssl>Debug</Configuration-grpc_dependencies_openssl> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)'=='Release'"> - <TargetName>alarm_test</TargetName> - <Linkage-grpc_dependencies_zlib>static</Linkage-grpc_dependencies_zlib> - <Configuration-grpc_dependencies_zlib>Debug</Configuration-grpc_dependencies_zlib> - <Configuration-grpc_dependencies_openssl>Debug</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;_USE_32BIT_TIME_T;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <SDLCheck>true</SDLCheck> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <TreatWarningAsError>true</TreatWarningAsError> - <DebugInformationFormat Condition="$(Jenkins)">None</DebugInformationFormat> - </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> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <GenerateDebugInformation Condition="!$(Jenkins)">true</GenerateDebugInformation> - <GenerateDebugInformation Condition="$(Jenkins)">false</GenerateDebugInformation> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <PrecompiledHeader>NotUsing</PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <SDLCheck>true</SDLCheck> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <TreatWarningAsError>true</TreatWarningAsError> - <DebugInformationFormat Condition="$(Jenkins)">None</DebugInformationFormat> - </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> - <WarningLevel>Level3</WarningLevel> - <PrecompiledHeader>NotUsing</PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <SDLCheck>true</SDLCheck> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <TreatWarningAsError>true</TreatWarningAsError> - <DebugInformationFormat Condition="$(Jenkins)">None</DebugInformationFormat> - </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="..\..\..\..\test\cpp\common\alarm_test.cc"> - </ClCompile> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\..\..\..\vsprojects\vcxproj\.\grpc++_test_util\grpc++_test_util.vcxproj"> - <Project>{0BE77741-552A-929B-A497-4EF7ECE17A64}</Project> - </ProjectReference> - <ProjectReference Include="..\..\..\..\vsprojects\vcxproj\.\grpc_test_util\grpc_test_util.vcxproj"> - <Project>{17BCAFC0-5FDC-4C94-AEB9-95F3E220614B}</Project> - </ProjectReference> - <ProjectReference Include="..\..\..\..\vsprojects\vcxproj\.\grpc++\grpc++.vcxproj"> - <Project>{C187A093-A0FE-489D-A40A-6E33DE0F9FEB}</Project> - </ProjectReference> - <ProjectReference Include="..\..\..\..\vsprojects\vcxproj\.\grpc\grpc.vcxproj"> - <Project>{29D16885-7228-4C31-81ED-5F9187C7F2A9}</Project> - </ProjectReference> - <ProjectReference Include="..\..\..\..\vsprojects\vcxproj\.\gpr_test_util\gpr_test_util.vcxproj"> - <Project>{EAB0A629-17A9-44DB-B5FF-E91A721FE037}</Project> - </ProjectReference> - <ProjectReference Include="..\..\..\..\vsprojects\vcxproj\.\gpr\gpr.vcxproj"> - <Project>{B23D3D1A-9438-4EDA-BEB6-9A0A03D17792}</Project> - </ProjectReference> - </ItemGroup> - <ItemGroup> - <None Include="packages.config" /> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - <Import Project="..\..\..\..\vsprojects\packages\grpc.dependencies.zlib.redist.1.2.8.9\build\native\grpc.dependencies.zlib.redist.targets" Condition="Exists('..\..\..\..\vsprojects\packages\grpc.dependencies.zlib.redist.1.2.8.9\build\native\grpc.dependencies\grpc.dependencies.zlib.targets')" /> - <Import Project="..\..\..\..\vsprojects\packages\grpc.dependencies.zlib.1.2.8.9\build\native\grpc.dependencies.zlib.targets" Condition="Exists('..\..\..\..\vsprojects\packages\grpc.dependencies.zlib.1.2.8.9\build\native\grpc.dependencies\grpc.dependencies.zlib.targets')" /> - <Import Project="..\..\..\..\vsprojects\packages\grpc.dependencies.openssl.redist.1.0.2.3\build\native\grpc.dependencies.openssl.redist.targets" Condition="Exists('..\..\..\..\vsprojects\packages\grpc.dependencies.openssl.redist.1.0.2.3\build\native\grpc.dependencies\grpc.dependencies.openssl.targets')" /> - <Import Project="..\..\..\..\vsprojects\packages\grpc.dependencies.openssl.1.0.2.3\build\native\grpc.dependencies.openssl.targets" Condition="Exists('..\..\..\..\vsprojects\packages\grpc.dependencies.openssl.1.0.2.3\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('..\..\..\..\vsprojects\packages\grpc.dependencies.zlib.redist.1.2.8.9\build\native\grpc.dependencies.zlib.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\vsprojects\packages\grpc.dependencies.zlib.redist.1.2.8.9\build\native\grpc.dependencies.zlib.redist.targets')" /> - <Error Condition="!Exists('..\..\..\..\vsprojects\packages\grpc.dependencies.zlib.1.2.8.9\build\native\grpc.dependencies.zlib.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\vsprojects\packages\grpc.dependencies.zlib.1.2.8.9\build\native\grpc.dependencies.zlib.targets')" /> - <Error Condition="!Exists('..\..\..\..\vsprojects\packages\grpc.dependencies.openssl.redist.1.0.2.3\build\native\grpc.dependencies.openssl.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\vsprojects\packages\grpc.dependencies.openssl.redist.1.0.2.3\build\native\grpc.dependencies.openssl.redist.targets')" /> - <Error Condition="!Exists('..\..\..\..\vsprojects\packages\grpc.dependencies.openssl.1.0.2.3\build\native\grpc.dependencies.openssl.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\vsprojects\packages\grpc.dependencies.openssl.1.0.2.3\build\native\grpc.dependencies.openssl.props')" /> - <Error Condition="!Exists('..\..\..\..\vsprojects\packages\grpc.dependencies.openssl.1.0.2.3\build\native\grpc.dependencies.openssl.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\vsprojects\packages\grpc.dependencies.openssl.1.0.2.3\build\native\grpc.dependencies.openssl.targets')" /> - </Target> -</Project> - diff --git a/vsprojects/vcxproj/test/alarm_test/alarm_test.vcxproj.filters b/vsprojects/vcxproj/test/alarm_test/alarm_test.vcxproj.filters deleted file mode 100644 index d9e2df67b6..0000000000 --- a/vsprojects/vcxproj/test/alarm_test/alarm_test.vcxproj.filters +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <ClCompile Include="..\..\..\..\test\cpp\common\alarm_test.cc"> - <Filter>test\cpp\common</Filter> - </ClCompile> - </ItemGroup> - - <ItemGroup> - <Filter Include="test"> - <UniqueIdentifier>{ce8dc749-635b-4486-70d6-6bdf52297d09}</UniqueIdentifier> - </Filter> - <Filter Include="test\cpp"> - <UniqueIdentifier>{444fc2e0-ba0f-d8e7-5e6b-de310914a938}</UniqueIdentifier> - </Filter> - <Filter Include="test\cpp\common"> - <UniqueIdentifier>{e6ae3033-66a3-63ec-ac33-33a3b296ba63}</UniqueIdentifier> - </Filter> - </ItemGroup> -</Project> - diff --git a/vsprojects/vcxproj/test/grpc_alarm_test/grpc_alarm_test.vcxproj b/vsprojects/vcxproj/test/grpc_alarm_test/grpc_alarm_test.vcxproj deleted file mode 100644 index 3be433bf9d..0000000000 --- a/vsprojects/vcxproj/test/grpc_alarm_test/grpc_alarm_test.vcxproj +++ /dev/null @@ -1,184 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\vsprojects\packages\grpc.dependencies.openssl.1.0.2.3\build\native\grpc.dependencies.openssl.props" Condition="Exists('..\..\..\..\vsprojects\packages\grpc.dependencies.openssl.1.0.2.3\build\native\1.0.2.3.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>{45AB14B7-333D-86D3-C67E-EA4DD5BFF7E5}</ProjectGuid> - </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="'$(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="..\..\..\..\vsprojects\global.props" /> - <Import Project="..\..\..\..\vsprojects\openssl.props" /> - <Import Project="..\..\..\..\vsprojects\winsock.props" /> - <Import Project="..\..\..\..\vsprojects\zlib.props" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)'=='Debug'"> - <TargetName>grpc_alarm_test</TargetName> - <Linkage-grpc_dependencies_zlib>static</Linkage-grpc_dependencies_zlib> - <Configuration-grpc_dependencies_zlib>Debug</Configuration-grpc_dependencies_zlib> - <Configuration-grpc_dependencies_openssl>Debug</Configuration-grpc_dependencies_openssl> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)'=='Release'"> - <TargetName>grpc_alarm_test</TargetName> - <Linkage-grpc_dependencies_zlib>static</Linkage-grpc_dependencies_zlib> - <Configuration-grpc_dependencies_zlib>Debug</Configuration-grpc_dependencies_zlib> - <Configuration-grpc_dependencies_openssl>Debug</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;_USE_32BIT_TIME_T;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <SDLCheck>true</SDLCheck> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <TreatWarningAsError>true</TreatWarningAsError> - <DebugInformationFormat Condition="$(Jenkins)">None</DebugInformationFormat> - </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> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <GenerateDebugInformation Condition="!$(Jenkins)">true</GenerateDebugInformation> - <GenerateDebugInformation Condition="$(Jenkins)">false</GenerateDebugInformation> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <PrecompiledHeader>NotUsing</PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <SDLCheck>true</SDLCheck> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <TreatWarningAsError>true</TreatWarningAsError> - <DebugInformationFormat Condition="$(Jenkins)">None</DebugInformationFormat> - </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> - <WarningLevel>Level3</WarningLevel> - <PrecompiledHeader>NotUsing</PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <SDLCheck>true</SDLCheck> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <TreatWarningAsError>true</TreatWarningAsError> - <DebugInformationFormat Condition="$(Jenkins)">None</DebugInformationFormat> - </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="..\..\..\..\test\core\surface\alarm_test.c"> - </ClCompile> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\..\..\..\vsprojects\vcxproj\.\grpc_test_util\grpc_test_util.vcxproj"> - <Project>{17BCAFC0-5FDC-4C94-AEB9-95F3E220614B}</Project> - </ProjectReference> - <ProjectReference Include="..\..\..\..\vsprojects\vcxproj\.\grpc\grpc.vcxproj"> - <Project>{29D16885-7228-4C31-81ED-5F9187C7F2A9}</Project> - </ProjectReference> - <ProjectReference Include="..\..\..\..\vsprojects\vcxproj\.\gpr_test_util\gpr_test_util.vcxproj"> - <Project>{EAB0A629-17A9-44DB-B5FF-E91A721FE037}</Project> - </ProjectReference> - <ProjectReference Include="..\..\..\..\vsprojects\vcxproj\.\gpr\gpr.vcxproj"> - <Project>{B23D3D1A-9438-4EDA-BEB6-9A0A03D17792}</Project> - </ProjectReference> - </ItemGroup> - <ItemGroup> - <None Include="packages.config" /> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - <Import Project="..\..\..\..\vsprojects\packages\grpc.dependencies.zlib.redist.1.2.8.9\build\native\grpc.dependencies.zlib.redist.targets" Condition="Exists('..\..\..\..\vsprojects\packages\grpc.dependencies.zlib.redist.1.2.8.9\build\native\grpc.dependencies\grpc.dependencies.zlib.targets')" /> - <Import Project="..\..\..\..\vsprojects\packages\grpc.dependencies.zlib.1.2.8.9\build\native\grpc.dependencies.zlib.targets" Condition="Exists('..\..\..\..\vsprojects\packages\grpc.dependencies.zlib.1.2.8.9\build\native\grpc.dependencies\grpc.dependencies.zlib.targets')" /> - <Import Project="..\..\..\..\vsprojects\packages\grpc.dependencies.openssl.redist.1.0.2.3\build\native\grpc.dependencies.openssl.redist.targets" Condition="Exists('..\..\..\..\vsprojects\packages\grpc.dependencies.openssl.redist.1.0.2.3\build\native\grpc.dependencies\grpc.dependencies.openssl.targets')" /> - <Import Project="..\..\..\..\vsprojects\packages\grpc.dependencies.openssl.1.0.2.3\build\native\grpc.dependencies.openssl.targets" Condition="Exists('..\..\..\..\vsprojects\packages\grpc.dependencies.openssl.1.0.2.3\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('..\..\..\..\vsprojects\packages\grpc.dependencies.zlib.redist.1.2.8.9\build\native\grpc.dependencies.zlib.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\vsprojects\packages\grpc.dependencies.zlib.redist.1.2.8.9\build\native\grpc.dependencies.zlib.redist.targets')" /> - <Error Condition="!Exists('..\..\..\..\vsprojects\packages\grpc.dependencies.zlib.1.2.8.9\build\native\grpc.dependencies.zlib.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\vsprojects\packages\grpc.dependencies.zlib.1.2.8.9\build\native\grpc.dependencies.zlib.targets')" /> - <Error Condition="!Exists('..\..\..\..\vsprojects\packages\grpc.dependencies.openssl.redist.1.0.2.3\build\native\grpc.dependencies.openssl.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\vsprojects\packages\grpc.dependencies.openssl.redist.1.0.2.3\build\native\grpc.dependencies.openssl.redist.targets')" /> - <Error Condition="!Exists('..\..\..\..\vsprojects\packages\grpc.dependencies.openssl.1.0.2.3\build\native\grpc.dependencies.openssl.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\vsprojects\packages\grpc.dependencies.openssl.1.0.2.3\build\native\grpc.dependencies.openssl.props')" /> - <Error Condition="!Exists('..\..\..\..\vsprojects\packages\grpc.dependencies.openssl.1.0.2.3\build\native\grpc.dependencies.openssl.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\vsprojects\packages\grpc.dependencies.openssl.1.0.2.3\build\native\grpc.dependencies.openssl.targets')" /> - </Target> -</Project> - diff --git a/vsprojects/vcxproj/test/grpc_alarm_test/grpc_alarm_test.vcxproj.filters b/vsprojects/vcxproj/test/grpc_alarm_test/grpc_alarm_test.vcxproj.filters deleted file mode 100644 index 05f5d8480f..0000000000 --- a/vsprojects/vcxproj/test/grpc_alarm_test/grpc_alarm_test.vcxproj.filters +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <ClCompile Include="..\..\..\..\test\core\surface\alarm_test.c"> - <Filter>test\core\surface</Filter> - </ClCompile> - </ItemGroup> - - <ItemGroup> - <Filter Include="test"> - <UniqueIdentifier>{eb4e6ce0-1386-4097-8770-b4f76f463e12}</UniqueIdentifier> - </Filter> - <Filter Include="test\core"> - <UniqueIdentifier>{8d511d82-4aa4-c0e5-7ed6-f7a1dc694758}</UniqueIdentifier> - </Filter> - <Filter Include="test\core\surface"> - <UniqueIdentifier>{459fb84a-7d42-98e7-3113-a0ba225d560e}</UniqueIdentifier> - </Filter> - </ItemGroup> -</Project> - |