Clean up *.vcproj files

1 files changed, 84 insertions, 336 deletions

diff --git a/vsprojects/tests.vcproj b/vsprojects/tests.vcproj
index 90515ba5..ac671a8a 100644
--- a/vsprojects/tests.vcproj
+++ b/vsprojects/tests.vcproj
@@ -178,65 +178,23 @@
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
-			<File
-				RelativePath=".\google\protobuf\compiler\cpp\cpp_test_bad_identifiers.pb.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\testing\file.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\testing\googletest.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\test_util.h"
-				>
-			</File>
+			<File RelativePath=".\google\protobuf\compiler\cpp\cpp_test_bad_identifiers.pb.h"></File>
+			<File RelativePath=".\google\protobuf\unittest.pb.h"></File>
+			<File RelativePath=".\google\protobuf\unittest_custom_options.pb.h"></File>
+			<File RelativePath=".\google\protobuf\unittest_embed_optimize_for.pb.h"></File>
+			<File RelativePath=".\google\protobuf\unittest_import.pb.h"></File>
+			<File RelativePath=".\google\protobuf\unittest_import_public.pb.h"></File>
+			<File RelativePath=".\google\protobuf\unittest_lite_imports_nonline.pb.h"></File>
+			<File RelativePath=".\google\protobuf\unittest_mset.pb.h"></File>
+			<File RelativePath=".\google\protobuf\unittest_no_generic_services.pb.h"></File>
+			<File RelativePath=".\google\protobuf\unittest_optimize_for.pb.h"></File>
+			<File RelativePath="..\src\google\protobuf\testing\file.h"></File>
+			<File RelativePath="..\src\google\protobuf\testing\googletest.h"></File>
+			<File RelativePath="..\src\google\protobuf\test_util.h"></File>
 			<File RelativePath="..\src\google\protobuf\map_test_util_impl.h"></File>
 			<File RelativePath="..\src\google\protobuf\map_test_util.h"></File>
 			<File RelativePath="..\src\google\protobuf\arena_test_util.h"></File>
-			<File
-				RelativePath="..\src\google\protobuf\compiler\mock_code_generator.h"
-				>
-			</File>
-			<File
-				RelativePath=".\google\protobuf\unittest.pb.h"
-				>
-			</File>
-			<File
-				RelativePath=".\google\protobuf\unittest_custom_options.pb.h"
-				>
-			</File>
-			<File
-				RelativePath=".\google\protobuf\unittest_embed_optimize_for.pb.h"
-				>
-			</File>
-			<File
-				RelativePath=".\google\protobuf\unittest_import.pb.h"
-				>
-			</File>
-			<File
-				RelativePath=".\google\protobuf\unittest_import_public.pb.h"
-				>
-			</File>
-			<File
-				RelativePath=".\google\protobuf\unittest_lite_imports_nonline.pb.h"
-				>
-			</File>
-			<File
-				RelativePath=".\google\protobuf\unittest_mset.pb.h"
-				>
-			</File>
-			<File
-				RelativePath=".\google\protobuf\unittest_optimize_for.pb.h"
-				>
-			</File>
-			<File
-				RelativePath=".\google\protobuf\unittest_no_generic_services.pb.h"
-				>
-			</File>
+			<File RelativePath="..\src\google\protobuf\compiler\mock_code_generator.h"></File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
@@ -249,287 +207,77 @@
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
-			<File
-				RelativePath="..\src\google\protobuf\arenastring_unittest.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\arena_unittest.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\compiler\command_line_interface_unittest.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\compiler\cpp\cpp_bootstrap_unittest.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\compiler\cpp\cpp_plugin_unittest.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\compiler\cpp\cpp_unittest.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\compiler\csharp\csharp_generator_unittest.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\compiler\importer_unittest.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\compiler\java\java_doc_comment_unittest.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\compiler\java\java_plugin_unittest.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\compiler\mock_code_generator.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\compiler\parser_unittest.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\compiler\python\python_plugin_unittest.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\descriptor_database_unittest.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\descriptor_unittest.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\drop_unknown_fields_test.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\dynamic_message_unittest.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\extension_set_unittest.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\generated_message_reflection_unittest.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\io\coded_stream_unittest.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\io\printer_unittest.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\io\tokenizer_unittest.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\io\zero_copy_stream_unittest.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\map_field_test.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\map_test.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\map_test_util.cc"
-				>
-			</File>
+			<File RelativePath=".\google\protobuf\compiler\cpp\cpp_test_bad_identifiers.pb.cc"></File>
+			<File RelativePath=".\google\protobuf\unittest_preserve_unknown_enum2.pb.cc"></File>
+			<File RelativePath=".\google\protobuf\map_proto2_unittest.pb.cc"></File>
+			<File RelativePath=".\google\protobuf\map_unittest.pb.cc"></File>
+			<File RelativePath=".\google\protobuf\unittest_arena.pb.cc"></File>
+			<File RelativePath=".\google\protobuf\unittest_custom_options.pb.cc"></File>
+			<File RelativePath=".\google\protobuf\unittest_drop_unknown_fields.pb.cc"></File>
+			<File RelativePath=".\google\protobuf\unittest_embed_optimize_for.pb.cc"></File>
+			<File RelativePath=".\google\protobuf\unittest_empty.pb.cc"></File>
+			<File RelativePath=".\google\protobuf\unittest_import_lite.pb.cc"></File>
+			<File RelativePath=".\google\protobuf\unittest_import.pb.cc"></File>
+			<File RelativePath=".\google\protobuf\unittest_import_public_lite.pb.cc"></File>
+			<File RelativePath=".\google\protobuf\unittest_import_public.pb.cc"></File>
+			<File RelativePath=".\google\protobuf\unittest_lite_imports_nonlite.pb.cc"></File>
+			<File RelativePath=".\google\protobuf\unittest_lite.pb.cc"></File>
+			<File RelativePath=".\google\protobuf\unittest_mset.pb.cc"></File>
+			<File RelativePath=".\google\protobuf\unittest_no_arena_import.pb.cc"></File>
+			<File RelativePath=".\google\protobuf\unittest_no_arena.pb.cc"></File>
+			<File RelativePath=".\google\protobuf\unittest_no_field_presence.pb.cc"></File>
+			<File RelativePath=".\google\protobuf\unittest_no_generic_services.pb.cc"></File>
+			<File RelativePath=".\google\protobuf\unittest_optimize_for.pb.cc"></File>
+			<File RelativePath=".\google\protobuf\unittest.pb.cc"></File>
+			<File RelativePath=".\google\protobuf\unittest_preserve_unknown_enum.pb.cc"></File>
+			<File RelativePath=".\google\protobuf\unittest_proto3_arena.pb.cc"></File>
+			<File RelativePath="..\src\google\protobuf\arenastring_unittest.cc"></File>
 			<File RelativePath="..\src\google\protobuf\arena_test_util.cc"></File>
-			<File
-				RelativePath="..\src\google\protobuf\message_unittest.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\no_field_presence_test.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\preserve_unknown_enum_test.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\proto3_arena_unittest.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\reflection_ops_unittest.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\repeated_field_reflection_unittest.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\repeated_field_unittest.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\stubs\common_unittest.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\stubs\once_unittest.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\stubs\stringprintf_unittest.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\stubs\structurally_valid_unittest.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\stubs\strutil_unittest.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\stubs\template_util_unittest.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\stubs\type_traits_unittest.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\testing\file.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\testing\googletest.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\test_util.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\text_format_unittest.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\unknown_field_set_unittest.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\wire_format_unittest.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\google\protobuf\compiler\cpp\cpp_test_bad_identifiers.pb.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\google\protobuf\unittest_preserve_unknown_enum2.pb.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\google\protobuf\map_proto2_unittest.pb.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\google\protobuf\map_unittest.pb.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\google\protobuf\unittest_arena.pb.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\google\protobuf\unittest_custom_options.pb.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\google\protobuf\unittest_drop_unknown_fields.pb.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\google\protobuf\unittest_embed_optimize_for.pb.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\google\protobuf\unittest_empty.pb.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\google\protobuf\unittest_import_lite.pb.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\google\protobuf\unittest_import.pb.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\google\protobuf\unittest_import_public_lite.pb.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\google\protobuf\unittest_import_public.pb.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\google\protobuf\unittest_lite_imports_nonlite.pb.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\google\protobuf\unittest_lite.pb.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\google\protobuf\unittest_mset.pb.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\google\protobuf\unittest_no_arena_import.pb.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\google\protobuf\unittest_no_arena.pb.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\google\protobuf\unittest_no_field_presence.pb.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\google\protobuf\unittest_no_generic_services.pb.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\google\protobuf\unittest_optimize_for.pb.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\google\protobuf\unittest.pb.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\google\protobuf\unittest_preserve_unknown_enum.pb.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\google\protobuf\unittest_proto3_arena.pb.cc"
-				>
-			</File>
+			<File RelativePath="..\src\google\protobuf\arena_unittest.cc"></File>
+			<File RelativePath="..\src\google\protobuf\compiler\command_line_interface_unittest.cc"></File>
+			<File RelativePath="..\src\google\protobuf\compiler\cpp\cpp_bootstrap_unittest.cc"></File>
+			<File RelativePath="..\src\google\protobuf\compiler\cpp\cpp_plugin_unittest.cc"></File>
+			<File RelativePath="..\src\google\protobuf\compiler\cpp\cpp_unittest.cc"></File>
+			<File RelativePath="..\src\google\protobuf\compiler\csharp\csharp_generator_unittest.cc"></File>
+			<File RelativePath="..\src\google\protobuf\compiler\importer_unittest.cc"></File>
+			<File RelativePath="..\src\google\protobuf\compiler\java\java_doc_comment_unittest.cc"></File>
+			<File RelativePath="..\src\google\protobuf\compiler\java\java_plugin_unittest.cc"></File>
+			<File RelativePath="..\src\google\protobuf\compiler\mock_code_generator.cc"></File>
+			<File RelativePath="..\src\google\protobuf\compiler\parser_unittest.cc"></File>
+			<File RelativePath="..\src\google\protobuf\compiler\python\python_plugin_unittest.cc"></File>
+			<File RelativePath="..\src\google\protobuf\descriptor_database_unittest.cc"></File>
+			<File RelativePath="..\src\google\protobuf\descriptor_unittest.cc"></File>
+			<File RelativePath="..\src\google\protobuf\drop_unknown_fields_test.cc"></File>
+			<File RelativePath="..\src\google\protobuf\dynamic_message_unittest.cc"></File>
+			<File RelativePath="..\src\google\protobuf\extension_set_unittest.cc"></File>
+			<File RelativePath="..\src\google\protobuf\generated_message_reflection_unittest.cc"></File>
+			<File RelativePath="..\src\google\protobuf\io\coded_stream_unittest.cc"></File>
+			<File RelativePath="..\src\google\protobuf\io\printer_unittest.cc"></File>
+			<File RelativePath="..\src\google\protobuf\io\tokenizer_unittest.cc"></File>
+			<File RelativePath="..\src\google\protobuf\io\zero_copy_stream_unittest.cc"></File>
+			<File RelativePath="..\src\google\protobuf\map_field_test.cc"></File>
+			<File RelativePath="..\src\google\protobuf\map_test.cc"></File>
+			<File RelativePath="..\src\google\protobuf\map_test_util.cc"></File>
+			<File RelativePath="..\src\google\protobuf\message_unittest.cc"></File>
+			<File RelativePath="..\src\google\protobuf\no_field_presence_test.cc"></File>
+			<File RelativePath="..\src\google\protobuf\preserve_unknown_enum_test.cc"></File>
+			<File RelativePath="..\src\google\protobuf\proto3_arena_unittest.cc"></File>
+			<File RelativePath="..\src\google\protobuf\reflection_ops_unittest.cc"></File>
+			<File RelativePath="..\src\google\protobuf\repeated_field_reflection_unittest.cc"></File>
+			<File RelativePath="..\src\google\protobuf\repeated_field_unittest.cc"></File>
+			<File RelativePath="..\src\google\protobuf\stubs\common_unittest.cc"></File>
+			<File RelativePath="..\src\google\protobuf\stubs\once_unittest.cc"></File>
+			<File RelativePath="..\src\google\protobuf\stubs\stringprintf_unittest.cc"></File>
+			<File RelativePath="..\src\google\protobuf\stubs\structurally_valid_unittest.cc"></File>
+			<File RelativePath="..\src\google\protobuf\stubs\strutil_unittest.cc"></File>
+			<File RelativePath="..\src\google\protobuf\stubs\template_util_unittest.cc"></File>
+			<File RelativePath="..\src\google\protobuf\stubs\type_traits_unittest.cc"></File>
+			<File RelativePath="..\src\google\protobuf\testing\file.cc"></File>
+			<File RelativePath="..\src\google\protobuf\testing\googletest.cc"></File>
+			<File RelativePath="..\src\google\protobuf\test_util.cc"></File>
+			<File RelativePath="..\src\google\protobuf\text_format_unittest.cc"></File>
+			<File RelativePath="..\src\google\protobuf\unknown_field_set_unittest.cc"></File>
+			<File RelativePath="..\src\google\protobuf\wire_format_unittest.cc"></File>
 		</Filter>
 		<File
 			RelativePath="..\src\google\protobuf\unittest_preserve_unknown_enum2.proto"