aboutsummaryrefslogtreecommitdiffhomepage
path: root/vsprojects
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2017-04-25 10:31:08 -0700
committerGravatar Craig Tiller <ctiller@google.com>2017-04-25 10:31:08 -0700
commitf54b89c4f83ecb830b221d6abb76ffef8c8964d2 (patch)
tree6169d6afae90c126358b2ef6e4d4bc1eec9ed34c /vsprojects
parentc3c9bf2442664493f081460c10f98ea2c43e9496 (diff)
parentb864e7c41c6d0363e23093fb090625f260994962 (diff)
Merge github.com:grpc/grpc into epex4
Diffstat (limited to 'vsprojects')
-rw-r--r--vsprojects/vcxproj/test/mock_test/mock_test.vcxproj3
-rw-r--r--vsprojects/vcxproj/test/mock_test/mock_test.vcxproj.filters14
2 files changed, 17 insertions, 0 deletions
diff --git a/vsprojects/vcxproj/test/mock_test/mock_test.vcxproj b/vsprojects/vcxproj/test/mock_test/mock_test.vcxproj
index 8c840fd5be..bc1cae5911 100644
--- a/vsprojects/vcxproj/test/mock_test/mock_test.vcxproj
+++ b/vsprojects/vcxproj/test/mock_test/mock_test.vcxproj
@@ -160,6 +160,9 @@
</ItemDefinitionGroup>
<ItemGroup>
+ <ClInclude Include="$(SolutionDir)\..\include\grpc++\test\mock_stream.h" />
+ </ItemGroup>
+ <ItemGroup>
<ClCompile Include="$(SolutionDir)\..\test\cpp\end2end\mock_test.cc">
</ClCompile>
</ItemGroup>
diff --git a/vsprojects/vcxproj/test/mock_test/mock_test.vcxproj.filters b/vsprojects/vcxproj/test/mock_test/mock_test.vcxproj.filters
index 1b3b773b08..6db61c9037 100644
--- a/vsprojects/vcxproj/test/mock_test/mock_test.vcxproj.filters
+++ b/vsprojects/vcxproj/test/mock_test/mock_test.vcxproj.filters
@@ -5,8 +5,22 @@
<Filter>test\cpp\end2end</Filter>
</ClCompile>
</ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="$(SolutionDir)\..\include\grpc++\test\mock_stream.h">
+ <Filter>include\grpc++\test</Filter>
+ </ClInclude>
+ </ItemGroup>
<ItemGroup>
+ <Filter Include="include">
+ <UniqueIdentifier>{b827d6d2-cfa5-2dd4-6ebc-afcccd5e8e0c}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="include\grpc++">
+ <UniqueIdentifier>{28289e8f-b68e-b9f5-7680-c15d77b574a5}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="include\grpc++\test">
+ <UniqueIdentifier>{4a7b43be-c730-6221-d190-e394521f9ae7}</UniqueIdentifier>
+ </Filter>
<Filter Include="test">
<UniqueIdentifier>{69c257a2-3e4c-a86e-ce0d-1a97b237d294}</UniqueIdentifier>
</Filter>