Merge pull request #103 from ctiller/build-cleaner

Add a tool to cleanup build.json

tools/buildgen/build-cleaner.py

+#!/usr/bin/python
+# produces cleaner build.json files
+
+import collections
+import json
+import os
+import sys
+
+_TOP_LEVEL_KEYS = ['settings', 'filegroups', 'libs', 'targets']
+_VERSION_KEYS = ['major', 'minor', 'micro', 'build']
+_ELEM_KEYS = [
+    'name', 
+    'build', 
+    'language', 
+    'public_headers', 
+    'headers', 
+    'src', 
+    'deps']
+
+def rebuild_as_ordered_dict(indict, special_keys):
+  outdict = collections.OrderedDict()
+  for key in special_keys:
+    if key in indict:
+      outdict[key] = indict[key]
+  for key in sorted(indict.keys()):
+    if key in special_keys: continue
+    outdict[key] = indict[key]
+  return outdict
+
+def clean_elem(indict):
+  for name in ['public_headers', 'headers', 'src']:
+    if name not in indict: continue
+    inlist = indict[name]
+    protos = set(x for x in inlist if os.path.splitext(x)[1] == '.proto')
+    others = set(x for x in inlist if x not in protos)
+    indict[name] = sorted(protos) + sorted(others)
+  return rebuild_as_ordered_dict(indict, _ELEM_KEYS)
+
+for filename in sys.argv[1:]:
+  with open(filename) as f:
+    js = json.load(f)
+  js = rebuild_as_ordered_dict(js, _TOP_LEVEL_KEYS)
+  js['settings']['version'] = rebuild_as_ordered_dict(
+      js['settings']['version'], _VERSION_KEYS)
+  for grp in ['filegroups', 'libs', 'targets']:
+    if grp not in js: continue
+    js[grp] = sorted([clean_elem(x) for x in js[grp]],
+                     key=lambda x: (x.get('language', '_'), x['name']))
+  output = json.dumps(js, indent = 2)
+  # massage out trailing whitespace
+  lines = []
+  for line in output.splitlines():
+    lines.append(line.rstrip() + '\n')
+  with open(filename, 'w') as f:
+    f.write(''.join(lines))
+

tools/run_tests/tests.json

@@ -3,191 +3,187 @@
 [
   {
     "language": "c", 
-    "name": "grpc_byte_buffer_reader_test"
-  }, 
-  {
-    "language": "c", 
-    "name": "gpr_cancellable_test"
+    "name": "alarm_heap_test"
   }, 
   {
     "language": "c", 
-    "name": "gpr_log_test"
+    "name": "alarm_list_test"
   }, 
   {
     "language": "c", 
-    "name": "gpr_useful_test"
+    "name": "alarm_test"
   }, 
   {
     "language": "c", 
-    "name": "gpr_cmdline_test"
+    "name": "alpn_test"
   }, 
   {
     "language": "c", 
-    "name": "gpr_histogram_test"
+    "name": "bin_encoder_test"
   }, 
   {
     "language": "c", 
-    "name": "gpr_host_port_test"
+    "name": "census_hash_table_test"
   }, 
   {
     "language": "c", 
-    "name": "gpr_slice_buffer_test"
+    "name": "census_statistics_multiple_writers_circular_buffer_test"
   }, 
   {
     "language": "c", 
-    "name": "gpr_slice_test"
+    "name": "census_statistics_multiple_writers_test"
   }, 
   {
     "language": "c", 
-    "name": "gpr_string_test"
+    "name": "census_statistics_performance_test"
   }, 
   {
     "language": "c", 
-    "name": "gpr_sync_test"
+    "name": "census_statistics_quick_test"
   }, 
   {
     "language": "c", 
-    "name": "gpr_thd_test"
+    "name": "census_statistics_small_log_test"
   }, 
   {
     "language": "c", 
-    "name": "gpr_time_test"
+    "name": "census_stub_test"
   }, 
   {
     "language": "c", 
-    "name": "murmur_hash_test"
+    "name": "census_window_stats_test"
   }, 
   {
-    "language": "c", 
-    "name": "grpc_stream_op_test"
+    "language": "c++", 
+    "name": "channel_arguments_test"
   }, 
   {
     "language": "c", 
-    "name": "alpn_test"
+    "name": "chttp2_status_conversion_test"
   }, 
   {
     "language": "c", 
-    "name": "time_averaged_stats_test"
+    "name": "chttp2_stream_encoder_test"
   }, 
   {
     "language": "c", 
-    "name": "chttp2_stream_encoder_test"
+    "name": "chttp2_stream_map_test"
   }, 
   {
     "language": "c", 
-    "name": "hpack_table_test"
+    "name": "chttp2_transport_end2end_test"
   }, 
   {
-    "language": "c", 
-    "name": "chttp2_stream_map_test"
+    "language": "c++", 
+    "name": "credentials_test"
   }, 
   {
     "language": "c", 
-    "name": "hpack_parser_test"
+    "name": "dualstack_socket_test"
   }, 
   {
     "language": "c", 
-    "name": "transport_metadata_test"
+    "name": "echo_test"
   }, 
   {
-    "language": "c", 
-    "name": "chttp2_status_conversion_test"
+    "language": "c++", 
+    "name": "end2end_test"
   }, 
   {
     "language": "c", 
-    "name": "chttp2_transport_end2end_test"
+    "name": "fd_posix_test"
   }, 
   {
     "language": "c", 
-    "name": "tcp_posix_test"
+    "name": "fling_stream_test"
   }, 
   {
     "language": "c", 
-    "name": "dualstack_socket_test"
+    "name": "fling_test"
   }, 
   {
     "language": "c", 
-    "name": "no_server_test"
+    "name": "gpr_cancellable_test"
   }, 
   {
     "language": "c", 
-    "name": "resolve_address_test"
+    "name": "gpr_cmdline_test"
   }, 
   {
     "language": "c", 
-    "name": "sockaddr_utils_test"
+    "name": "gpr_histogram_test"
   }, 
   {
     "language": "c", 
-    "name": "tcp_server_posix_test"
+    "name": "gpr_host_port_test"
   }, 
   {
     "language": "c", 
-    "name": "tcp_client_posix_test"
+    "name": "gpr_log_test"
   }, 
   {
     "language": "c", 
-    "name": "grpc_channel_stack_test"
+    "name": "gpr_slice_buffer_test"
   }, 
   {
     "language": "c", 
-    "name": "metadata_buffer_test"
+    "name": "gpr_slice_test"
   }, 
   {
     "language": "c", 
-    "name": "grpc_completion_queue_test"
+    "name": "gpr_string_test"
   }, 
   {
     "language": "c", 
-    "name": "census_window_stats_test"
+    "name": "gpr_sync_test"
   }, 
   {
     "language": "c", 
-    "name": "census_statistics_quick_test"
+    "name": "gpr_thd_test"
   }, 
   {
     "language": "c", 
-    "name": "census_statistics_small_log_test"
+    "name": "gpr_time_test"
   }, 
   {
     "language": "c", 
-    "name": "census_statistics_performance_test"
+    "name": "gpr_useful_test"
   }, 
   {
     "language": "c", 
-    "name": "census_statistics_multiple_writers_test"
+    "name": "grpc_base64_test"
   }, 
   {
     "language": "c", 
-    "name": "census_statistics_multiple_writers_circular_buffer_test"
+    "name": "grpc_byte_buffer_reader_test"
   }, 
   {
     "language": "c", 
-    "name": "census_stub_test"
+    "name": "grpc_channel_stack_test"
   }, 
   {
     "language": "c", 
-    "name": "census_hash_table_test"
+    "name": "grpc_completion_queue_test"
   }, 
   {
     "language": "c", 
-    "name": "fling_test"
+    "name": "grpc_credentials_test"
   }, 
   {
     "language": "c", 
-    "name": "echo_test"
+    "name": "grpc_json_token_test"
   }, 
   {
     "language": "c", 
-    "name": "message_compress_test"
+    "name": "grpc_stream_op_test"
   }, 
   {
     "language": "c", 
-    "name": "bin_encoder_test"
+    "name": "hpack_parser_test"
   }, 
   {
     "language": "c", 
-    "name": "secure_endpoint_test"
+    "name": "hpack_table_test"
   }, 
   {
     "language": "c", 
@@ -203,35 +199,39 @@
   }, 
   {
     "language": "c", 
-    "name": "grpc_credentials_test"
+    "name": "lame_client_test"
   }, 
   {
     "language": "c", 
-    "name": "grpc_base64_test"
+    "name": "message_compress_test"
   }, 
   {
     "language": "c", 
-    "name": "grpc_json_token_test"
+    "name": "metadata_buffer_test"
   }, 
   {
     "language": "c", 
-    "name": "timeout_encoding_test"
+    "name": "murmur_hash_test"
   }, 
   {
     "language": "c", 
-    "name": "fd_posix_test"
+    "name": "no_server_test"
   }, 
   {
     "language": "c", 
-    "name": "fling_stream_test"
+    "name": "poll_kick_test"
   }, 
   {
     "language": "c", 
-    "name": "lame_client_test"
+    "name": "resolve_address_test"
   }, 
   {
-    "language": "c++", 
-    "name": "thread_pool_test"
+    "language": "c", 
+    "name": "secure_endpoint_test"
+  }, 
+  {
+    "language": "c", 
+    "name": "sockaddr_utils_test"
   }, 
   {
     "language": "c++", 
@@ -242,36 +242,36 @@
     "name": "sync_client_async_server_test"
   }, 
   {
-    "language": "c++", 
-    "name": "end2end_test"
+    "language": "c", 
+    "name": "tcp_client_posix_test"
   }, 
   {
-    "language": "c++", 
-    "name": "channel_arguments_test"
+    "language": "c", 
+    "name": "tcp_posix_test"
   }, 
   {
-    "language": "c++", 
-    "name": "credentials_test"
+    "language": "c", 
+    "name": "tcp_server_posix_test"
   }, 
   {
-    "language": "c", 
-    "name": "alarm_test"
+    "language": "c++", 
+    "name": "thread_pool_test"
   }, 
   {
     "language": "c", 
-    "name": "alarm_list_test"
+    "name": "time_averaged_stats_test"
   }, 
   {
     "language": "c", 
-    "name": "alarm_heap_test"
+    "name": "time_test"
   }, 
   {
     "language": "c", 
-    "name": "time_test"
+    "name": "timeout_encoding_test"
   }, 
   {
     "language": "c", 
-    "name": "poll_kick_test"
+    "name": "transport_metadata_test"
   }, 
   {
     "language": "c", 

vsprojects/vs2013/build_and_run_tests.bat

@@ -17,22 +17,6 @@ echo Running test gpr_cancellable_test
 test_bin\gpr_cancellable_test.exe || echo TEST FAILED: gpr_cancellable_test && exit /b
 echo(
 
-echo Building test gpr_log_test
-cl.exe /c /I..\.. /I..\..\include /nologo /ZI /W3 /WX- /sdl /D WIN32 /D _LIB /D _USE_32BIT_TIME_T /D _UNICODE /D UNICODE /Gm /EHsc /RTC1 /MDd /GS /fp:precise /Zc:wchar_t /Zc:forScope /Gd /TC /analyze- /Fo:test_bin\ ..\..\test\core\support\log_test.c 
-link.exe /OUT:"test_bin\gpr_log_test.exe" /INCREMENTAL /NOLOGO /SUBSYSTEM:CONSOLE /TLBID:1 /DYNAMICBASE /NXCOMPAT /MACHINE:X86 Debug\gpr_test_util.lib Debug\gpr.lib test_bin\log_test.obj 
-echo(
-echo Running test gpr_log_test
-test_bin\gpr_log_test.exe || echo TEST FAILED: gpr_log_test && exit /b
-echo(
-
-echo Building test gpr_useful_test
-cl.exe /c /I..\.. /I..\..\include /nologo /ZI /W3 /WX- /sdl /D WIN32 /D _LIB /D _USE_32BIT_TIME_T /D _UNICODE /D UNICODE /Gm /EHsc /RTC1 /MDd /GS /fp:precise /Zc:wchar_t /Zc:forScope /Gd /TC /analyze- /Fo:test_bin\ ..\..\test\core\support\useful_test.c 
-link.exe /OUT:"test_bin\gpr_useful_test.exe" /INCREMENTAL /NOLOGO /SUBSYSTEM:CONSOLE /TLBID:1 /DYNAMICBASE /NXCOMPAT /MACHINE:X86 Debug\gpr_test_util.lib Debug\gpr.lib test_bin\useful_test.obj 
-echo(
-echo Running test gpr_useful_test
-test_bin\gpr_useful_test.exe || echo TEST FAILED: gpr_useful_test && exit /b
-echo(
-
 echo Building test gpr_cmdline_test
 cl.exe /c /I..\.. /I..\..\include /nologo /ZI /W3 /WX- /sdl /D WIN32 /D _LIB /D _USE_32BIT_TIME_T /D _UNICODE /D UNICODE /Gm /EHsc /RTC1 /MDd /GS /fp:precise /Zc:wchar_t /Zc:forScope /Gd /TC /analyze- /Fo:test_bin\ ..\..\test\core\support\cmdline_test.c 
 link.exe /OUT:"test_bin\gpr_cmdline_test.exe" /INCREMENTAL /NOLOGO /SUBSYSTEM:CONSOLE /TLBID:1 /DYNAMICBASE /NXCOMPAT /MACHINE:X86 Debug\gpr_test_util.lib Debug\gpr.lib test_bin\cmdline_test.obj 
@@ -57,6 +41,14 @@ echo Running test gpr_host_port_test
 test_bin\gpr_host_port_test.exe || echo TEST FAILED: gpr_host_port_test && exit /b
 echo(
 
+echo Building test gpr_log_test
+cl.exe /c /I..\.. /I..\..\include /nologo /ZI /W3 /WX- /sdl /D WIN32 /D _LIB /D _USE_32BIT_TIME_T /D _UNICODE /D UNICODE /Gm /EHsc /RTC1 /MDd /GS /fp:precise /Zc:wchar_t /Zc:forScope /Gd /TC /analyze- /Fo:test_bin\ ..\..\test\core\support\log_test.c 
+link.exe /OUT:"test_bin\gpr_log_test.exe" /INCREMENTAL /NOLOGO /SUBSYSTEM:CONSOLE /TLBID:1 /DYNAMICBASE /NXCOMPAT /MACHINE:X86 Debug\gpr_test_util.lib Debug\gpr.lib test_bin\log_test.obj 
+echo(
+echo Running test gpr_log_test
+test_bin\gpr_log_test.exe || echo TEST FAILED: gpr_log_test && exit /b
+echo(
+
 echo Building test gpr_slice_buffer_test
 cl.exe /c /I..\.. /I..\..\include /nologo /ZI /W3 /WX- /sdl /D WIN32 /D _LIB /D _USE_32BIT_TIME_T /D _UNICODE /D UNICODE /Gm /EHsc /RTC1 /MDd /GS /fp:precise /Zc:wchar_t /Zc:forScope /Gd /TC /analyze- /Fo:test_bin\ ..\..\test\core\support\slice_buffer_test.c 
 link.exe /OUT:"test_bin\gpr_slice_buffer_test.exe" /INCREMENTAL /NOLOGO /SUBSYSTEM:CONSOLE /TLBID:1 /DYNAMICBASE /NXCOMPAT /MACHINE:X86 Debug\gpr_test_util.lib Debug\gpr.lib test_bin\slice_buffer_test.obj 
@@ -105,3 +97,11 @@ echo Running test gpr_time_test
 test_bin\gpr_time_test.exe || echo TEST FAILED: gpr_time_test && exit /b
 echo(
 
+echo Building test gpr_useful_test
+cl.exe /c /I..\.. /I..\..\include /nologo /ZI /W3 /WX- /sdl /D WIN32 /D _LIB /D _USE_32BIT_TIME_T /D _UNICODE /D UNICODE /Gm /EHsc /RTC1 /MDd /GS /fp:precise /Zc:wchar_t /Zc:forScope /Gd /TC /analyze- /Fo:test_bin\ ..\..\test\core\support\useful_test.c 
+link.exe /OUT:"test_bin\gpr_useful_test.exe" /INCREMENTAL /NOLOGO /SUBSYSTEM:CONSOLE /TLBID:1 /DYNAMICBASE /NXCOMPAT /MACHINE:X86 Debug\gpr_test_util.lib Debug\gpr.lib test_bin\useful_test.obj 
+echo(
+echo Running test gpr_useful_test
+test_bin\gpr_useful_test.exe || echo TEST FAILED: gpr_useful_test && exit /b
+echo(
+

vsprojects/vs2013/gpr.vcxproj

@@ -74,9 +74,9 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="..\..\include\grpc\support\alloc.h" />
+    <ClInclude Include="..\..\include\grpc\support\atm.h" />
     <ClInclude Include="..\..\include\grpc\support\atm_gcc_atomic.h" />
     <ClInclude Include="..\..\include\grpc\support\atm_gcc_sync.h" />
-    <ClInclude Include="..\..\include\grpc\support\atm.h" />
     <ClInclude Include="..\..\include\grpc\support\atm_win32.h" />
     <ClInclude Include="..\..\include\grpc\support\cancellable_platform.h" />
     <ClInclude Include="..\..\include\grpc\support\cmdline.h" />
@@ -84,11 +84,11 @@
     <ClInclude Include="..\..\include\grpc\support\host_port.h" />
     <ClInclude Include="..\..\include\grpc\support\log.h" />
     <ClInclude Include="..\..\include\grpc\support\port_platform.h" />
-    <ClInclude Include="..\..\include\grpc\support\slice_buffer.h" />
     <ClInclude Include="..\..\include\grpc\support\slice.h" />
+    <ClInclude Include="..\..\include\grpc\support\slice_buffer.h" />
     <ClInclude Include="..\..\include\grpc\support\string.h" />
-    <ClInclude Include="..\..\include\grpc\support\sync_generic.h" />
     <ClInclude Include="..\..\include\grpc\support\sync.h" />
+    <ClInclude Include="..\..\include\grpc\support\sync_generic.h" />
     <ClInclude Include="..\..\include\grpc\support\sync_posix.h" />
     <ClInclude Include="..\..\include\grpc\support\sync_win32.h" />
     <ClInclude Include="..\..\include\grpc\support\thd.h" />
@@ -119,10 +119,10 @@
     </ClCompile>
     <ClCompile Include="..\..\src\core\support\host_port.c">
     </ClCompile>
-    <ClCompile Include="..\..\src\core\support\log_android.c">
-    </ClCompile>
     <ClCompile Include="..\..\src\core\support\log.c">
     </ClCompile>
+    <ClCompile Include="..\..\src\core\support\log_android.c">
+    </ClCompile>
     <ClCompile Include="..\..\src\core\support\log_linux.c">
     </ClCompile>
     <ClCompile Include="..\..\src\core\support\log_posix.c">
@@ -131,10 +131,10 @@
     </ClCompile>
     <ClCompile Include="..\..\src\core\support\murmur_hash.c">
     </ClCompile>
-    <ClCompile Include="..\..\src\core\support\slice_buffer.c">
-    </ClCompile>
     <ClCompile Include="..\..\src\core\support\slice.c">
     </ClCompile>
+    <ClCompile Include="..\..\src\core\support\slice_buffer.c">
+    </ClCompile>
     <ClCompile Include="..\..\src\core\support\string.c">
     </ClCompile>
     <ClCompile Include="..\..\src\core\support\string_posix.c">

vsprojects/vs2013/grpc.sln

@@ -5,20 +5,20 @@ VisualStudioVersion = 12.0.21005.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gpr", "gpr.vcxproj", "{B23D3D1A-9438-4EDA-BEB6-9A0A03D17792}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gpr_test_util", "gpr_test_util.vcxproj", "{EAB0A629-17A9-44DB-B5FF-E91A721FE037}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpc", "grpc.vcxproj", "{29D16885-7228-4C31-81ED-5F9187C7F2A9}"
 	ProjectSection(ProjectDependencies) = postProject
 		{B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} = {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpc_test_util", "grpc_test_util.vcxproj", "{17BCAFC0-5FDC-4C94-AEB9-95F3E220614B}"
+EndProject
 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}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gpr_test_util", "gpr_test_util.vcxproj", "{EAB0A629-17A9-44DB-B5FF-E91A721FE037}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpc_test_util", "grpc_test_util.vcxproj", "{17BCAFC0-5FDC-4C94-AEB9-95F3E220614B}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibvc", "third_party\zlibvc.vcxproj", "{8FD826F8-3739-44E6-8CC8-997122E53B8D}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "third_party", "third_party", "{DD51818F-0BCA-4035-9E5B-F28A9F87DED4}"
@@ -33,22 +33,22 @@ Global
 		{B23D3D1A-9438-4EDA-BEB6-9A0A03D17792}.Debug|Win32.Build.0 = Debug|Win32
 		{B23D3D1A-9438-4EDA-BEB6-9A0A03D17792}.Release|Win32.ActiveCfg = Release|Win32
 		{B23D3D1A-9438-4EDA-BEB6-9A0A03D17792}.Release|Win32.Build.0 = Release|Win32
-		{29D16885-7228-4C31-81ED-5F9187C7F2A9}.Debug|Win32.ActiveCfg = Debug|Win32
-		{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
-		{46CEDFFF-9692-456A-AA24-38B5D6BCF4C5}.Debug|Win32.ActiveCfg = Debug|Win32
-		{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
 		{EAB0A629-17A9-44DB-B5FF-E91A721FE037}.Debug|Win32.ActiveCfg = Debug|Win32
 		{EAB0A629-17A9-44DB-B5FF-E91A721FE037}.Debug|Win32.Build.0 = Debug|Win32
 		{EAB0A629-17A9-44DB-B5FF-E91A721FE037}.Release|Win32.ActiveCfg = Release|Win32
 		{EAB0A629-17A9-44DB-B5FF-E91A721FE037}.Release|Win32.Build.0 = Release|Win32
+		{29D16885-7228-4C31-81ED-5F9187C7F2A9}.Debug|Win32.ActiveCfg = Debug|Win32
+		{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
 		{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
 		{17BCAFC0-5FDC-4C94-AEB9-95F3E220614B}.Release|Win32.Build.0 = Release|Win32
+		{46CEDFFF-9692-456A-AA24-38B5D6BCF4C5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{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
 		{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

vsprojects/vs2013/grpc.vcxproj

@@ -118,9 +118,9 @@
     <ClInclude Include="..\..\src\core\iomgr\iomgr.h" />
     <ClInclude Include="..\..\src\core\iomgr\iomgr_internal.h" />
     <ClInclude Include="..\..\src\core\iomgr\iomgr_posix.h" />
+    <ClInclude Include="..\..\src\core\iomgr\pollset.h" />
     <ClInclude Include="..\..\src\core\iomgr\pollset_kick.h" />
     <ClInclude Include="..\..\src\core\iomgr\pollset_kick_posix.h" />
-    <ClInclude Include="..\..\src\core\iomgr\pollset.h" />
     <ClInclude Include="..\..\src\core\iomgr\pollset_posix.h" />
     <ClInclude Include="..\..\src\core\iomgr\resolve_address.h" />
     <ClInclude Include="..\..\src\core\iomgr\sockaddr.h" />

vsprojects/vs2013/grpc_test_util.vcxproj

@@ -75,14 +75,14 @@
   <ItemGroup>
     <ClCompile Include="..\..\test\core\end2end\cq_verifier.c">
     </ClCompile>
-    <ClCompile Include="..\..\test\core\end2end\data\test_root_cert.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">
     </ClCompile>
+    <ClCompile Include="..\..\test\core\end2end\data\test_root_cert.c">
+    </ClCompile>
     <ClCompile Include="..\..\test\core\iomgr\endpoint_tests.c">
     </ClCompile>
     <ClCompile Include="..\..\test\core\statistics\census_log_tests.c">
@@ -91,10 +91,10 @@
     </ClCompile>
     <ClCompile Include="..\..\test\core\util\grpc_profiler.c">
     </ClCompile>
-    <ClCompile Include="..\..\test\core\util\port_posix.c">
-    </ClCompile>
     <ClCompile Include="..\..\test\core\util\parse_hexstring.c">
     </ClCompile>
+    <ClCompile Include="..\..\test\core\util\port_posix.c">
+    </ClCompile>
     <ClCompile Include="..\..\test\core\util\slice_splitter.c">
     </ClCompile>
   </ItemGroup>

vsprojects/vs2013/grpc_unsecure.vcxproj

@@ -118,9 +118,9 @@
     <ClInclude Include="..\..\src\core\iomgr\iomgr.h" />
     <ClInclude Include="..\..\src\core\iomgr\iomgr_internal.h" />
     <ClInclude Include="..\..\src\core\iomgr\iomgr_posix.h" />
+    <ClInclude Include="..\..\src\core\iomgr\pollset.h" />
     <ClInclude Include="..\..\src\core\iomgr\pollset_kick.h" />
     <ClInclude Include="..\..\src\core\iomgr\pollset_kick_posix.h" />
-    <ClInclude Include="..\..\src\core\iomgr\pollset.h" />
     <ClInclude Include="..\..\src\core\iomgr\pollset_posix.h" />
     <ClInclude Include="..\..\src\core\iomgr\resolve_address.h" />
     <ClInclude Include="..\..\src\core\iomgr\sockaddr.h" />