diff --git a/thirdparty/patches/windows/grpc-projects.patch b/thirdparty/patches/windows/grpc-projects.patch
index 05980f006..ca9a68741 100644
--- a/thirdparty/patches/windows/grpc-projects.patch
+++ b/thirdparty/patches/windows/grpc-projects.patch
@@ -1875,7 +1875,7 @@ index a9e96da..f5b9a47
        <TreatWarningAsError>true</TreatWarningAsError>
        <DebugInformationFormat Condition="$(Jenkins)">None</DebugInformationFormat>
        <MinimalRebuild Condition="$(Jenkins)">false</MinimalRebuild>
-@@ -267,36 +256,36 @@
+@@ -267,592 +256,595 @@
    </ItemDefinitionGroup>
  
    <ItemGroup>
@@ -1941,9 +1941,316 @@ index a9e96da..f5b9a47
 +    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\census.h" />
    </ItemGroup>
    <ItemGroup>
-     <ClInclude Include="$(SolutionDir)\..\src\core\lib\channel\channel_args.h" />
-@@ -456,403 +445,405 @@
-     <ClInclude Include="$(SolutionDir)\..\src\core\ext\census\rpc_metric_id.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\channel\channel_args.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\channel\channel_stack.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\channel\channel_stack_builder.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\channel\compress_filter.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\channel\connected_channel.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\channel\context.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\channel\http_client_filter.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\channel\http_server_filter.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\compression\algorithm_metadata.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\compression\message_compress.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\debug\trace.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\http\format_request.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\http\httpcli.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\http\parser.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\closure.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\endpoint.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\endpoint_pair.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\error.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_epoll_linux.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_poll_and_epoll_posix.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_poll_posix.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_posix.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\exec_ctx.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\executor.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\iocp_windows.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\iomgr.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\iomgr_internal.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\iomgr_posix.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\load_file.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\network_status_tracker.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\polling_entity.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\pollset.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\pollset_set.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\pollset_set_windows.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\pollset_windows.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\resolve_address.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\sockaddr.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\sockaddr_posix.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\sockaddr_utils.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\sockaddr_windows.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\socket_utils_posix.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\socket_windows.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\tcp_client.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\tcp_posix.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\tcp_server.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\tcp_windows.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\time_averaged_stats.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\timer.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\timer_heap.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\udp_server.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\unix_sockets_posix.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\wakeup_fd_pipe.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\wakeup_fd_posix.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\workqueue.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\workqueue_posix.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\workqueue_windows.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\json\json.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\json\json_common.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\json\json_reader.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\json\json_writer.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\surface\api_trace.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\surface\call.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\surface\call_test_only.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\surface\channel.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\surface\channel_init.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\surface\channel_stack_type.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\surface\completion_queue.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\surface\event_string.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\surface\init.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\surface\lame_client.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\surface\server.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\byte_stream.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\connectivity_state.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\metadata.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\metadata_batch.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\static_metadata.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\transport.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\transport_impl.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\bin_decoder.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\bin_encoder.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\chttp2_transport.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_data.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_goaway.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_ping.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_rst_stream.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_settings.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_window_update.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\hpack_encoder.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\hpack_parser.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\hpack_table.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\http2_errors.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\huffsyms.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\incoming_metadata.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\internal.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\status_conversion.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\stream_map.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\timeout_encoding.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\varint.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\alpn\alpn.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\security\context\security_context.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\security\credentials\composite\composite_credentials.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\security\credentials\credentials.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\security\credentials\fake\fake_credentials.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\security\credentials\google_default\google_default_credentials.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\security\credentials\iam\iam_credentials.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\security\credentials\jwt\json_token.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\security\credentials\jwt\jwt_credentials.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\security\credentials\jwt\jwt_verifier.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\security\credentials\oauth2\oauth2_credentials.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\security\credentials\plugin\plugin_credentials.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\security\credentials\ssl\ssl_credentials.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\security\transport\auth_filters.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\security\transport\handshake.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\security\transport\secure_endpoint.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\security\transport\security_connector.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\security\transport\tsi_error.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\security\util\b64.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\security\util\json_util.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\tsi\fake_transport_security.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\tsi\ssl_transport_security.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\tsi\ssl_types.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\tsi\transport_security.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\tsi\transport_security_interface.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\client_channel.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\client_channel_factory.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\client_config.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\connector.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\initial_connect_string.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\lb_policy.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\lb_policy_factory.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\lb_policy_registry.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\parse_address.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\resolver.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\resolver_factory.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\resolver_registry.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel_call_holder.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel_index.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\uri_parser.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\lb_policy\grpclb\load_balancer_api.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\lb_policy\grpclb\proto\grpc\lb\v1\load_balancer.pb.h" />
+-    <ClInclude Include="$(SolutionDir)\..\third_party\nanopb\pb.h" />
+-    <ClInclude Include="$(SolutionDir)\..\third_party\nanopb\pb_common.h" />
+-    <ClInclude Include="$(SolutionDir)\..\third_party\nanopb\pb_decode.h" />
+-    <ClInclude Include="$(SolutionDir)\..\third_party\nanopb\pb_encode.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\load_reporting\load_reporting.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\load_reporting\load_reporting_filter.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\census\aggregation.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\census\census_interface.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\census\census_rpc_stats.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\census\gen\census.pb.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\census\grpc_filter.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\census\mlog.h" />
+-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\census\rpc_metric_id.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\channel\channel_args.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\channel\channel_stack.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\channel\channel_stack_builder.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\channel\compress_filter.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\channel\connected_channel.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\channel\context.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\channel\http_client_filter.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\channel\http_server_filter.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\compression\algorithm_metadata.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\compression\message_compress.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\debug\trace.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\http\format_request.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\http\httpcli.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\http\parser.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\iomgr\closure.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\iomgr\endpoint.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\iomgr\endpoint_pair.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\iomgr\error.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\iomgr\ev_epoll_linux.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\iomgr\ev_poll_and_epoll_posix.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\iomgr\ev_poll_posix.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\iomgr\ev_posix.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\iomgr\exec_ctx.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\iomgr\executor.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\iomgr\iocp_windows.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\iomgr\iomgr.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\iomgr\iomgr_internal.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\iomgr\iomgr_posix.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\iomgr\load_file.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\iomgr\network_status_tracker.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\iomgr\polling_entity.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\iomgr\pollset.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\iomgr\pollset_set.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\iomgr\pollset_set_windows.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\iomgr\pollset_windows.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\iomgr\resolve_address.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\iomgr\sockaddr.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\iomgr\sockaddr_posix.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\iomgr\sockaddr_utils.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\iomgr\sockaddr_windows.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\iomgr\socket_utils_posix.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\iomgr\socket_windows.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\iomgr\tcp_client.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\iomgr\tcp_posix.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\iomgr\tcp_server.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\iomgr\tcp_windows.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\iomgr\time_averaged_stats.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\iomgr\timer.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\iomgr\timer_heap.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\iomgr\udp_server.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\iomgr\unix_sockets_posix.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\iomgr\wakeup_fd_pipe.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\iomgr\wakeup_fd_posix.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\iomgr\workqueue.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\iomgr\workqueue_posix.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\iomgr\workqueue_windows.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\json\json.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\json\json_common.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\json\json_reader.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\json\json_writer.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\surface\api_trace.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\surface\call.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\surface\call_test_only.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\surface\channel.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\surface\channel_init.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\surface\channel_stack_type.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\surface\completion_queue.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\surface\event_string.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\surface\init.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\surface\lame_client.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\surface\server.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\transport\byte_stream.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\transport\connectivity_state.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\transport\metadata.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\transport\metadata_batch.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\transport\static_metadata.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\transport\transport.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\transport\transport_impl.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\ext\transport\chttp2\transport\bin_decoder.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\ext\transport\chttp2\transport\bin_encoder.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\ext\transport\chttp2\transport\chttp2_transport.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\ext\transport\chttp2\transport\frame.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\ext\transport\chttp2\transport\frame_data.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\ext\transport\chttp2\transport\frame_goaway.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\ext\transport\chttp2\transport\frame_ping.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\ext\transport\chttp2\transport\frame_rst_stream.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\ext\transport\chttp2\transport\frame_settings.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\ext\transport\chttp2\transport\frame_window_update.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\ext\transport\chttp2\transport\hpack_encoder.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\ext\transport\chttp2\transport\hpack_parser.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\ext\transport\chttp2\transport\hpack_table.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\ext\transport\chttp2\transport\http2_errors.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\ext\transport\chttp2\transport\huffsyms.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\ext\transport\chttp2\transport\incoming_metadata.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\ext\transport\chttp2\transport\internal.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\ext\transport\chttp2\transport\status_conversion.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\ext\transport\chttp2\transport\stream_map.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\ext\transport\chttp2\transport\timeout_encoding.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\ext\transport\chttp2\transport\varint.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\ext\transport\chttp2\alpn\alpn.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\security\context\security_context.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\security\credentials\composite\composite_credentials.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\security\credentials\credentials.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\security\credentials\fake\fake_credentials.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\security\credentials\google_default\google_default_credentials.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\security\credentials\iam\iam_credentials.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\security\credentials\jwt\json_token.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\security\credentials\jwt\jwt_credentials.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\security\credentials\jwt\jwt_verifier.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\security\credentials\oauth2\oauth2_credentials.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\security\credentials\plugin\plugin_credentials.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\security\credentials\ssl\ssl_credentials.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\security\transport\auth_filters.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\security\transport\handshake.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\security\transport\secure_endpoint.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\security\transport\security_connector.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\security\transport\tsi_error.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\security\util\b64.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\security\util\json_util.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\tsi\fake_transport_security.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\tsi\ssl_transport_security.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\tsi\ssl_types.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\tsi\transport_security.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\lib\tsi\transport_security_interface.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\ext\client_config\client_channel.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\ext\client_config\client_channel_factory.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\ext\client_config\client_config.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\ext\client_config\connector.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\ext\client_config\initial_connect_string.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\ext\client_config\lb_policy.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\ext\client_config\lb_policy_factory.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\ext\client_config\lb_policy_registry.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\ext\client_config\parse_address.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\ext\client_config\resolver.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\ext\client_config\resolver_factory.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\ext\client_config\resolver_registry.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\ext\client_config\subchannel.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\ext\client_config\subchannel_call_holder.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\ext\client_config\subchannel_index.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\ext\client_config\uri_parser.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\ext\lb_policy\grpclb\load_balancer_api.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\ext\lb_policy\grpclb\proto\grpc\lb\v1\load_balancer.pb.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\third_party\nanopb\pb.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\third_party\nanopb\pb_common.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\third_party\nanopb\pb_decode.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\third_party\nanopb\pb_encode.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\ext\load_reporting\load_reporting.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\ext\load_reporting\load_reporting_filter.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\ext\census\aggregation.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\ext\census\census_interface.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\ext\census\census_rpc_stats.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\ext\census\gen\census.pb.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\ext\census\grpc_filter.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\ext\census\mlog.h" />
++    <ClInclude Include="$(ProjectDir)\..\..\src\core\ext\census\rpc_metric_id.h" />
    </ItemGroup>
    <ItemGroup>
 -    <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\init.c">
@@ -2543,10 +2850,8 @@ index a9e96da..f5b9a47
 +    <Error Condition="!Exists('$(SolutionDir)packages\grpc.dependencies.openssl.1.0.204.1\build\native\grpc.dependencies.openssl.props')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\grpc.dependencies.openssl.1.0.204.1\build\native\grpc.dependencies.openssl.props')" />
 +    <Error Condition="!Exists('$(SolutionDir)packages\grpc.dependencies.openssl.1.0.204.1\build\native\grpc.dependencies.openssl.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\grpc.dependencies.openssl.1.0.204.1\build\native\grpc.dependencies.openssl.targets')" />
    </Target>
--</Project>
--
-+</Project>
-\ No newline at end of file
+ </Project>
+ 
 diff --git a/vsprojects/vcxproj/grpc/grpc.vcxproj.filters b/vsprojects/vcxproj/grpc/grpc.vcxproj.filters
 index be77e53..7c8ea36
 --- a/vsprojects/vcxproj/grpc/grpc.vcxproj.filters