diff options
| author |  murgatroid99 <mlumish@google.com> | 2016-01-13 11:42:18 -0800 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2016-01-13 11:42:18 -0800 |
| commit | b70206fe52ee6509f3f965bf2a95b2cbd321088d (patch) | |
| tree | fa59a43171854465c89af72734d45350070b7366 /vsprojects/vcxproj/test/metrics_client | |
| parent | 295a7ce511f1a2145f70942f826d0e225c00ba62 (diff) | |
| parent | 7149ca6bd0ce73a08fa512415d3f641a06a15a75 (diff) | |
Merge branch 'master' into release-0_12_master_merge
Diffstat (limited to 'vsprojects/vcxproj/test/metrics_client')
| -rw-r--r-- | vsprojects/vcxproj/test/metrics_client/metrics_client.vcxproj | 8 | ||||
| -rw-r--r-- | vsprojects/vcxproj/test/metrics_client/metrics_client.vcxproj.filters | 19 |
2 files changed, 18 insertions, 9 deletions
diff --git a/vsprojects/vcxproj/test/metrics_client/metrics_client.vcxproj b/vsprojects/vcxproj/test/metrics_client/metrics_client.vcxproj index dc5d57869b..68a00653e4 100644 --- a/vsprojects/vcxproj/test/metrics_client/metrics_client.vcxproj +++ b/vsprojects/vcxproj/test/metrics_client/metrics_client.vcxproj @@ -161,13 +161,13 @@ <ClInclude Include="$(SolutionDir)\..\test\cpp\util\metrics_server.h" /> </ItemGroup> <ItemGroup> - <ClCompile Include="$(SolutionDir)\..\test\proto\metrics.pb.cc"> + <ClCompile Include="$(SolutionDir)\..\src\proto\grpc\testing\metrics.pb.cc"> </ClCompile> - <ClInclude Include="$(SolutionDir)\..\test\proto\metrics.pb.h"> + <ClInclude Include="$(SolutionDir)\..\src\proto\grpc\testing\metrics.pb.h"> </ClInclude> - <ClCompile Include="$(SolutionDir)\..\test\proto\metrics.grpc.pb.cc"> + <ClCompile Include="$(SolutionDir)\..\src\proto\grpc\testing\metrics.grpc.pb.cc"> </ClCompile> - <ClInclude Include="$(SolutionDir)\..\test\proto\metrics.grpc.pb.h"> + <ClInclude Include="$(SolutionDir)\..\src\proto\grpc\testing\metrics.grpc.pb.h"> </ClInclude> <ClCompile Include="$(SolutionDir)\..\test\cpp\interop\metrics_client.cc"> </ClCompile> diff --git a/vsprojects/vcxproj/test/metrics_client/metrics_client.vcxproj.filters b/vsprojects/vcxproj/test/metrics_client/metrics_client.vcxproj.filters index cbb4ad5b9b..7329489cd3 100644 --- a/vsprojects/vcxproj/test/metrics_client/metrics_client.vcxproj.filters +++ b/vsprojects/vcxproj/test/metrics_client/metrics_client.vcxproj.filters @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> - <ClCompile Include="$(SolutionDir)\..\test\proto\metrics.proto"> - <Filter>test\proto</Filter> + <ClCompile Include="$(SolutionDir)\..\src\proto\grpc\testing\metrics.proto"> + <Filter>src\proto\grpc\testing</Filter> </ClCompile> <ClCompile Include="$(SolutionDir)\..\test\cpp\interop\metrics_client.cc"> <Filter>test\cpp\interop</Filter> @@ -15,6 +15,18 @@ </ItemGroup> <ItemGroup> + <Filter Include="src"> + <UniqueIdentifier>{2f2185a6-32fc-013a-9860-d623721af645}</UniqueIdentifier> + </Filter> + <Filter Include="src\proto"> + <UniqueIdentifier>{bf59f117-18fd-cc4b-b073-1a6c11dcbbbd}</UniqueIdentifier> + </Filter> + <Filter Include="src\proto\grpc"> + <UniqueIdentifier>{a2d30ba0-0eec-29c7-9257-d55e8456eca3}</UniqueIdentifier> + </Filter> + <Filter Include="src\proto\grpc\testing"> + <UniqueIdentifier>{47a85da2-170b-d623-a6c9-d3b4eaab5302}</UniqueIdentifier> + </Filter> <Filter Include="test"> <UniqueIdentifier>{2c00b6b1-865c-55b2-0d9d-8d7b42ad7d03}</UniqueIdentifier> </Filter> @@ -27,9 +39,6 @@ <Filter Include="test\cpp\util"> <UniqueIdentifier>{16f4e45d-a509-3e4d-4a19-9383576bec54}</UniqueIdentifier> </Filter> - <Filter Include="test\proto"> - <UniqueIdentifier>{c638ed75-9aa0-ccc3-a8d2-a1a6203977b1}</UniqueIdentifier> - </Filter> </ItemGroup> </Project> |