Merge github.com:grpc/grpc into cleaner-build
diff --git a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters
index 7b66d4a..35f8599 100644
--- a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters
+++ b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters
@@ -361,9 +361,6 @@
<ClCompile Include="..\..\..\src\core\census\operation.c">
<Filter>src\core\census</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\src\core\census\record_stat.c">
- <Filter>src\core\census</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\src\core\census\tracing.c">
<Filter>src\core\census</Filter>
</ClCompile>
@@ -692,10 +689,13 @@
<ClInclude Include="..\..\..\src\core\transport\transport_impl.h">
<Filter>src\core\transport</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\src\core\census\aggregation.h">
+ <Filter>src\core\census</Filter>
+ </ClInclude>
<ClInclude Include="..\..\..\src\core\census\context.h">
<Filter>src\core\census</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\src\core\census\rpc_stat_id.h">
+ <ClInclude Include="..\..\..\src\core\census\rpc_metric_id.h">
<Filter>src\core\census</Filter>
</ClInclude>
</ItemGroup>