Consolidate C++ proto files under src/proto

- make the directory structure match the package structure
- sanitize the package structure (test --> testing)
- add auto-detection of proto file dependencies

2 files changed, 30 insertions, 21 deletions

diff --git a/vsprojects/vcxproj/interop_server_main/interop_server_main.vcxproj b/vsprojects/vcxproj/interop_server_main/interop_server_main.vcxproj
index 3f8f4d61aa..9bb3650aa7 100644
--- a/vsprojects/vcxproj/interop_server_main/interop_server_main.vcxproj
+++ b/vsprojects/vcxproj/interop_server_main/interop_server_main.vcxproj
@@ -137,29 +137,29 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\test\proto\empty.pb.cc">
+    <ClCompile Include="..\..\..\src\proto\grpc\testing\empty.pb.cc">
     </ClCompile>
-    <ClInclude Include="..\..\..\test\proto\empty.pb.h">
+    <ClInclude Include="..\..\..\src\proto\grpc\testing\empty.pb.h">
     </ClInclude>
-    <ClCompile Include="..\..\..\test\proto\empty.grpc.pb.cc">
+    <ClCompile Include="..\..\..\src\proto\grpc\testing\empty.grpc.pb.cc">
     </ClCompile>
-    <ClInclude Include="..\..\..\test\proto\empty.grpc.pb.h">
+    <ClInclude Include="..\..\..\src\proto\grpc\testing\empty.grpc.pb.h">
     </ClInclude>
-    <ClCompile Include="..\..\..\test\proto\messages.pb.cc">
+    <ClCompile Include="..\..\..\src\proto\grpc\testing\messages.pb.cc">
     </ClCompile>
-    <ClInclude Include="..\..\..\test\proto\messages.pb.h">
+    <ClInclude Include="..\..\..\src\proto\grpc\testing\messages.pb.h">
     </ClInclude>
-    <ClCompile Include="..\..\..\test\proto\messages.grpc.pb.cc">
+    <ClCompile Include="..\..\..\src\proto\grpc\testing\messages.grpc.pb.cc">
     </ClCompile>
-    <ClInclude Include="..\..\..\test\proto\messages.grpc.pb.h">
+    <ClInclude Include="..\..\..\src\proto\grpc\testing\messages.grpc.pb.h">
     </ClInclude>
-    <ClCompile Include="..\..\..\test\proto\test.pb.cc">
+    <ClCompile Include="..\..\..\src\proto\grpc\testing\test.pb.cc">
     </ClCompile>
-    <ClInclude Include="..\..\..\test\proto\test.pb.h">
+    <ClInclude Include="..\..\..\src\proto\grpc\testing\test.pb.h">
     </ClInclude>
-    <ClCompile Include="..\..\..\test\proto\test.grpc.pb.cc">
+    <ClCompile Include="..\..\..\src\proto\grpc\testing\test.grpc.pb.cc">
     </ClCompile>
-    <ClInclude Include="..\..\..\test\proto\test.grpc.pb.h">
+    <ClInclude Include="..\..\..\src\proto\grpc\testing\test.grpc.pb.h">
     </ClInclude>
     <ClCompile Include="..\..\..\test\cpp\interop\server.cc">
     </ClCompile>
diff --git a/vsprojects/vcxproj/interop_server_main/interop_server_main.vcxproj.filters b/vsprojects/vcxproj/interop_server_main/interop_server_main.vcxproj.filters
index 93d8bf2b4a..eda2c7dbca 100644
--- a/vsprojects/vcxproj/interop_server_main/interop_server_main.vcxproj.filters
+++ b/vsprojects/vcxproj/interop_server_main/interop_server_main.vcxproj.filters
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="..\..\..\test\proto\empty.proto">
-      <Filter>test\proto</Filter>
+    <ClCompile Include="..\..\..\src\proto\grpc\testing\empty.proto">
+      <Filter>src\proto\grpc\testing</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\test\proto\messages.proto">
-      <Filter>test\proto</Filter>
+    <ClCompile Include="..\..\..\src\proto\grpc\testing\messages.proto">
+      <Filter>src\proto\grpc\testing</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\test\proto\test.proto">
-      <Filter>test\proto</Filter>
+    <ClCompile Include="..\..\..\src\proto\grpc\testing\test.proto">
+      <Filter>src\proto\grpc\testing</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\test\cpp\interop\server.cc">
       <Filter>test\cpp\interop</Filter>
@@ -16,6 +16,18 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Filter Include="src">
+      <UniqueIdentifier>{9dfb04b3-9e58-7efb-70a2-b02ec8c5e83e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\proto">
+      <UniqueIdentifier>{ebd8177f-6130-a4fb-1c41-d894f801e3b9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\proto\grpc">
+      <UniqueIdentifier>{1df1acf2-4654-4530-10af-912381c69012}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\proto\grpc\testing">
+      <UniqueIdentifier>{ba56d830-1546-c07f-f5ee-03164e41914e}</UniqueIdentifier>
+    </Filter>
     <Filter Include="test">
       <UniqueIdentifier>{02523054-816a-75a0-b24b-f527e99c7142}</UniqueIdentifier>
     </Filter>
@@ -25,9 +37,6 @@
     <Filter Include="test\cpp\interop">
       <UniqueIdentifier>{ca4121b0-3c58-ad24-318c-1d1684152ce1}</UniqueIdentifier>
     </Filter>
-    <Filter Include="test\proto">
-      <UniqueIdentifier>{0d66af43-d873-cae8-4c0c-f953772dfc11}</UniqueIdentifier>
-    </Filter>
   </ItemGroup>
 </Project>