diff --git a/vsprojects/global.props b/vsprojects/global.props
index c0792e1..3299131
--- a/vsprojects/global.props
+++ b/vsprojects/global.props
@@ -4,11 +4,15 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <Jenkins>false</Jenkins>
+    <OutDir>$(SolutionDir)build\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)build\$(Platform)\$(Configuration)\$(MSBuildProjectName)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)\..;$(SolutionDir)\..\include;$(SolutionDir)\..\third_party\protobuf\src;$(SolutionDir)\packages\grpc.dependencies.zlib.1.2.8.10\build\native\include;$(SolutionDir)\packages\grpc.dependencies.openssl.1.0.204.1\build\native\include;$(SolutionDir)\packages\gflags.2.1.2.1\build\native\include;$(SolutionDir)\packages\gtest.1.7.0.1\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_WIN32_WINNT=0x600;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..;$(ProjectDir)..\..\..\include;$(ProjectDir)..\..\..\third_party\protobuf\src;$(ProjectDir)..\..\..\..\..\packages\grpc.dependencies.zlib.1.2.8.10\build\native\include;$(ProjectDir)..\..\..\..\..\packages\grpc.dependencies.openssl.1.0.204.1\build\native\include;$(ProjectDir)..\..\..\..\..\packages\gflags.2.1.2.1\build\native\include;$(ProjectDir)..\..\..\..\..\packages\gtest.1.7.0.1\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_WIN32_WINNT=0x600;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;OPENSSL_NO_ASM;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>false</MinimalRebuild>
+      <MultiProcessorCompilation>True</MultiProcessorCompilation>
       <WarningLevel>EnableAllWarnings</WarningLevel>
     </ClCompile>
     <Link>
diff --git a/vsprojects/protobuf.props b/vsprojects/protobuf.props
index b1de8af..b63b603
--- a/vsprojects/protobuf.props
+++ b/vsprojects/protobuf.props
@@ -1 +1,26 @@
-<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ImportGroup Label="PropertySheets" /> <PropertyGroup Label="UserMacros" /> <PropertyGroup /> <ItemDefinitionGroup> <Link> <AdditionalDependencies>libprotobuf.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalLibraryDirectories>$(SolutionDir)\..\third_party\protobuf\cmake\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> </Link> </ItemDefinitionGroup> <ItemGroup /> </Project>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets" />
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <IntDir>$(SolutionDir)build\$(Platform)\$(Configuration)\$(MSBuildProjectName)\</IntDir>
+    <OutDir>$(SolutionDir)build\$(Platform)\$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <MinimalRebuild>false</MinimalRebuild>
+      <DisableSpecificWarnings>4506;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>$(SolutionDir)\..\third_party\protobuf\cmake\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+</Project>
\ No newline at end of file
diff --git a/vsprojects/protoc.props b/vsprojects/protoc.props
index 1bdc071..87a4bf4
--- a/vsprojects/protoc.props
+++ b/vsprojects/protoc.props
@@ -1 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ImportGroup Label="PropertySheets" /> <PropertyGroup Label="UserMacros" /> <PropertyGroup /> <ItemDefinitionGroup> <ClCompile> <DisableSpecificWarnings>4244;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> <Link> <AdditionalDependencies>libprotoc.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalLibraryDirectories>$(SolutionDir)\..\third_party\protobuf\cmake\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> </Link> </ItemDefinitionGroup> <ItemGroup /> </Project>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets" />
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup />
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <DisableSpecificWarnings>4244;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>$(SolutionDir)\..\third_party\protobuf\cmake\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup />
+</Project>
\ No newline at end of file
diff --git a/vsprojects/vcxproj/gpr/gpr.vcxproj b/vsprojects/vcxproj/gpr/gpr.vcxproj
index db8594e..d2ddaff
--- a/vsprojects/vcxproj/gpr/gpr.vcxproj
+++ b/vsprojects/vcxproj/gpr/gpr.vcxproj
@@ -21,7 +21,6 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{B23D3D1A-9438-4EDA-BEB6-9A0A03D17792}</ProjectGuid>
     <IgnoreWarnIntDirInTempDetected>true</IgnoreWarnIntDirInTempDetected>
-    <IntDir>$(SolutionDir)IntDir\$(MSBuildProjectName)\</IntDir>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(VisualStudioVersion)' == '10.0'" Label="Configuration">
@@ -44,7 +43,6 @@
   <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -52,16 +50,10 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(SolutionDir)\..\vsprojects\global.props" />
-    <Import Project="$(SolutionDir)\..\vsprojects\winsock.props" />
+    <Import Project="$(ProjectDir)\..\..\..\vsprojects\global.props" />
+    <Import Project="$(ProjectDir)\..\..\..\vsprojects\winsock.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
-    <TargetName>gpr</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Release'">
-    <TargetName>gpr</TargetName>
-  </PropertyGroup>
     <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
@@ -69,7 +61,6 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <TreatWarningAsError>true</TreatWarningAsError>
       <DebugInformationFormat Condition="$(Jenkins)">None</DebugInformationFormat>
       <MinimalRebuild Condition="$(Jenkins)">false</MinimalRebuild>
@@ -88,7 +79,6 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <TreatWarningAsError>true</TreatWarningAsError>
       <DebugInformationFormat Condition="$(Jenkins)">None</DebugInformationFormat>
       <MinimalRebuild Condition="$(Jenkins)">false</MinimalRebuild>
@@ -109,7 +99,6 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <TreatWarningAsError>true</TreatWarningAsError>
       <DebugInformationFormat Condition="$(Jenkins)">None</DebugInformationFormat>
       <MinimalRebuild Condition="$(Jenkins)">false</MinimalRebuild>
@@ -132,7 +121,6 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <TreatWarningAsError>true</TreatWarningAsError>
       <DebugInformationFormat Condition="$(Jenkins)">None</DebugInformationFormat>
       <MinimalRebuild Condition="$(Jenkins)">false</MinimalRebuild>
@@ -147,152 +135,152 @@
   </ItemDefinitionGroup>
 
   <ItemGroup>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\alloc.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\atm.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\atm_gcc_atomic.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\atm_gcc_sync.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\atm_windows.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\avl.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\cmdline.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\cpu.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\histogram.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\host_port.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\log.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\log_windows.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\port_platform.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\slice.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\slice_buffer.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\string_util.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\subprocess.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\sync.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\sync_generic.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\sync_posix.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\sync_windows.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\thd.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\time.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\tls.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\tls_gcc.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\tls_msvc.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\tls_pthread.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\useful.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\alloc.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_gcc_atomic.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_gcc_sync.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_windows.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\log.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\port_platform.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\slice.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\slice_buffer.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_generic.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_posix.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_windows.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\time.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\support\alloc.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\support\atm.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\support\atm_gcc_atomic.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\support\atm_gcc_sync.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\support\atm_windows.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\support\avl.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\support\cmdline.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\support\cpu.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\support\histogram.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\support\host_port.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\support\log.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\support\log_windows.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\support\port_platform.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\support\slice.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\support\slice_buffer.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\support\string_util.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\support\subprocess.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\support\sync.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\support\sync_generic.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\support\sync_posix.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\support\sync_windows.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\support\thd.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\support\time.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\support\tls.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\support\tls_gcc.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\support\tls_msvc.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\support\tls_pthread.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\support\useful.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\alloc.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\atm.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\atm_gcc_atomic.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\atm_gcc_sync.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\atm_windows.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\log.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\port_platform.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\slice.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\slice_buffer.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\sync.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\sync_generic.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\sync_posix.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\sync_windows.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\time.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\profiling\timers.h" />
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\support\backoff.h" />
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\support\block_annotate.h" />
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\support\env.h" />
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\support\murmur_hash.h" />
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\support\stack_lockfree.h" />
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\support\string.h" />
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\support\string_windows.h" />
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\support\thd_internal.h" />
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\support\time_precise.h" />
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\support\tmpfile.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\profiling\timers.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\support\backoff.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\support\block_annotate.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\support\env.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\support\murmur_hash.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\support\stack_lockfree.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\support\string.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\support\string_windows.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\support\thd_internal.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\support\time_precise.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\support\tmpfile.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\profiling\basic_timers.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\profiling\basic_timers.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\profiling\stap_timers.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\profiling\stap_timers.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\alloc.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\alloc.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\avl.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\avl.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\backoff.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\backoff.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\cmdline.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\cmdline.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\cpu_iphone.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\cpu_iphone.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\cpu_linux.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\cpu_linux.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\cpu_posix.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\cpu_posix.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\cpu_windows.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\cpu_windows.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\env_linux.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\env_linux.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\env_posix.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\env_posix.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\env_windows.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\env_windows.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\histogram.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\histogram.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\host_port.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\host_port.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\log.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\log.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\log_android.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\log_android.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\log_linux.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\log_linux.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\log_posix.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\log_posix.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\log_windows.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\log_windows.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\murmur_hash.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\murmur_hash.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\slice.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\slice.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\slice_buffer.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\slice_buffer.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\stack_lockfree.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\stack_lockfree.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\string.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\string.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\string_posix.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\string_posix.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\string_util_windows.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\string_util_windows.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\string_windows.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\string_windows.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\subprocess_posix.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\subprocess_posix.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\subprocess_windows.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\subprocess_windows.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\sync.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\sync.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\sync_posix.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\sync_posix.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\sync_windows.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\sync_windows.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\thd.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\thd.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\thd_posix.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\thd_posix.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\thd_windows.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\thd_windows.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\time.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\time.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\time_posix.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\time_posix.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\time_precise.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\time_precise.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\time_windows.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\time_windows.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\tls_pthread.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\tls_pthread.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\tmpfile_msys.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\tmpfile_msys.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\tmpfile_posix.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\tmpfile_posix.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\tmpfile_windows.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\tmpfile_windows.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\wrap_memcpy.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\wrap_memcpy.c">
     </ClCompile>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/vsprojects/vcxproj/gpr/gpr.vcxproj.filters b/vsprojects/vcxproj/gpr/gpr.vcxproj.filters
index 9bab373..d13e9c4
--- a/vsprojects/vcxproj/gpr/gpr.vcxproj.filters
+++ b/vsprojects/vcxproj/gpr/gpr.vcxproj.filters
@@ -1,302 +1,302 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\profiling\basic_timers.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\profiling\basic_timers.c">
       <Filter>src\core\lib\profiling</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\profiling\stap_timers.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\profiling\stap_timers.c">
       <Filter>src\core\lib\profiling</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\alloc.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\alloc.c">
       <Filter>src\core\lib\support</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\avl.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\avl.c">
       <Filter>src\core\lib\support</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\backoff.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\backoff.c">
       <Filter>src\core\lib\support</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\cmdline.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\cmdline.c">
       <Filter>src\core\lib\support</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\cpu_iphone.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\cpu_iphone.c">
       <Filter>src\core\lib\support</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\cpu_linux.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\cpu_linux.c">
       <Filter>src\core\lib\support</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\cpu_posix.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\cpu_posix.c">
       <Filter>src\core\lib\support</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\cpu_windows.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\cpu_windows.c">
       <Filter>src\core\lib\support</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\env_linux.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\env_linux.c">
       <Filter>src\core\lib\support</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\env_posix.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\env_posix.c">
       <Filter>src\core\lib\support</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\env_windows.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\env_windows.c">
       <Filter>src\core\lib\support</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\histogram.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\histogram.c">
       <Filter>src\core\lib\support</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\host_port.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\host_port.c">
       <Filter>src\core\lib\support</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\log.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\log.c">
       <Filter>src\core\lib\support</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\log_android.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\log_android.c">
       <Filter>src\core\lib\support</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\log_linux.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\log_linux.c">
       <Filter>src\core\lib\support</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\log_posix.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\log_posix.c">
       <Filter>src\core\lib\support</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\log_windows.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\log_windows.c">
       <Filter>src\core\lib\support</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\murmur_hash.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\murmur_hash.c">
       <Filter>src\core\lib\support</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\slice.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\slice.c">
       <Filter>src\core\lib\support</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\slice_buffer.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\slice_buffer.c">
       <Filter>src\core\lib\support</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\stack_lockfree.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\stack_lockfree.c">
       <Filter>src\core\lib\support</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\string.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\string.c">
       <Filter>src\core\lib\support</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\string_posix.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\string_posix.c">
       <Filter>src\core\lib\support</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\string_util_windows.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\string_util_windows.c">
       <Filter>src\core\lib\support</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\string_windows.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\string_windows.c">
       <Filter>src\core\lib\support</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\subprocess_posix.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\subprocess_posix.c">
       <Filter>src\core\lib\support</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\subprocess_windows.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\subprocess_windows.c">
       <Filter>src\core\lib\support</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\sync.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\sync.c">
       <Filter>src\core\lib\support</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\sync_posix.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\sync_posix.c">
       <Filter>src\core\lib\support</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\sync_windows.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\sync_windows.c">
       <Filter>src\core\lib\support</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\thd.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\thd.c">
       <Filter>src\core\lib\support</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\thd_posix.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\thd_posix.c">
       <Filter>src\core\lib\support</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\thd_windows.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\thd_windows.c">
       <Filter>src\core\lib\support</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\time.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\time.c">
       <Filter>src\core\lib\support</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\time_posix.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\time_posix.c">
       <Filter>src\core\lib\support</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\time_precise.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\time_precise.c">
       <Filter>src\core\lib\support</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\time_windows.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\time_windows.c">
       <Filter>src\core\lib\support</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\tls_pthread.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\tls_pthread.c">
       <Filter>src\core\lib\support</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\tmpfile_msys.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\tmpfile_msys.c">
       <Filter>src\core\lib\support</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\tmpfile_posix.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\tmpfile_posix.c">
       <Filter>src\core\lib\support</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\tmpfile_windows.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\tmpfile_windows.c">
       <Filter>src\core\lib\support</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\support\wrap_memcpy.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\support\wrap_memcpy.c">
       <Filter>src\core\lib\support</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\alloc.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\support\alloc.h">
       <Filter>include\grpc\support</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\atm.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\support\atm.h">
       <Filter>include\grpc\support</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\atm_gcc_atomic.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\support\atm_gcc_atomic.h">
       <Filter>include\grpc\support</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\atm_gcc_sync.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\support\atm_gcc_sync.h">
       <Filter>include\grpc\support</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\atm_windows.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\support\atm_windows.h">
       <Filter>include\grpc\support</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\avl.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\support\avl.h">
       <Filter>include\grpc\support</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\cmdline.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\support\cmdline.h">
       <Filter>include\grpc\support</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\cpu.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\support\cpu.h">
       <Filter>include\grpc\support</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\histogram.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\support\histogram.h">
       <Filter>include\grpc\support</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\host_port.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\support\host_port.h">
       <Filter>include\grpc\support</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\log.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\support\log.h">
       <Filter>include\grpc\support</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\log_windows.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\support\log_windows.h">
       <Filter>include\grpc\support</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\port_platform.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\support\port_platform.h">
       <Filter>include\grpc\support</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\slice.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\support\slice.h">
       <Filter>include\grpc\support</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\slice_buffer.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\support\slice_buffer.h">
       <Filter>include\grpc\support</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\string_util.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\support\string_util.h">
       <Filter>include\grpc\support</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\subprocess.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\support\subprocess.h">
       <Filter>include\grpc\support</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\sync.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\support\sync.h">
       <Filter>include\grpc\support</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\sync_generic.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\support\sync_generic.h">
       <Filter>include\grpc\support</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\sync_posix.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\support\sync_posix.h">
       <Filter>include\grpc\support</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\sync_windows.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\support\sync_windows.h">
       <Filter>include\grpc\support</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\thd.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\support\thd.h">
       <Filter>include\grpc\support</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\time.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\support\time.h">
       <Filter>include\grpc\support</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\tls.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\support\tls.h">
       <Filter>include\grpc\support</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\tls_gcc.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\support\tls_gcc.h">
       <Filter>include\grpc\support</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\tls_msvc.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\support\tls_msvc.h">
       <Filter>include\grpc\support</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\tls_pthread.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\support\tls_pthread.h">
       <Filter>include\grpc\support</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\support\useful.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\support\useful.h">
       <Filter>include\grpc\support</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\alloc.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\alloc.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\atm.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_gcc_atomic.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\atm_gcc_atomic.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_gcc_sync.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\atm_gcc_sync.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_windows.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\atm_windows.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\log.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\log.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\port_platform.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\port_platform.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\slice.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\slice.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\slice_buffer.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\slice_buffer.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\sync.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_generic.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\sync_generic.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_posix.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\sync_posix.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_windows.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\sync_windows.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\time.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\time.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\profiling\timers.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\profiling\timers.h">
       <Filter>src\core\lib\profiling</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\support\backoff.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\support\backoff.h">
       <Filter>src\core\lib\support</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\support\block_annotate.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\support\block_annotate.h">
       <Filter>src\core\lib\support</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\support\env.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\support\env.h">
       <Filter>src\core\lib\support</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\support\murmur_hash.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\support\murmur_hash.h">
       <Filter>src\core\lib\support</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\support\stack_lockfree.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\support\stack_lockfree.h">
       <Filter>src\core\lib\support</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\support\string.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\support\string.h">
       <Filter>src\core\lib\support</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\support\string_windows.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\support\string_windows.h">
       <Filter>src\core\lib\support</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\support\thd_internal.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\support\thd_internal.h">
       <Filter>src\core\lib\support</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\support\time_precise.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\support\time_precise.h">
       <Filter>src\core\lib\support</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\support\tmpfile.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\support\tmpfile.h">
       <Filter>src\core\lib\support</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/vsprojects/vcxproj/grpc++/grpc++.vcxproj b/vsprojects/vcxproj/grpc++/grpc++.vcxproj
index cb9e41e..f3b8b27
--- a/vsprojects/vcxproj/grpc++/grpc++.vcxproj
+++ b/vsprojects/vcxproj/grpc++/grpc++.vcxproj
@@ -37,7 +37,6 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{C187A093-A0FE-489D-A40A-6E33DE0F9FEB}</ProjectGuid>
     <IgnoreWarnIntDirInTempDetected>true</IgnoreWarnIntDirInTempDetected>
-    <IntDir>$(SolutionDir)IntDir\$(MSBuildProjectName)\</IntDir>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(VisualStudioVersion)' == '10.0'" Label="Configuration">
@@ -60,7 +59,6 @@
   <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Debug-DLL'" Label="Configuration">
@@ -71,7 +69,6 @@
   <PropertyGroup Condition="'$(Configuration)'=='Release-DLL'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -79,16 +76,10 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(SolutionDir)\..\vsprojects\global.props" />
-    <Import Project="$(SolutionDir)\..\vsprojects\winsock.props" />
+    <Import Project="$(ProjectDir)\..\..\..\vsprojects\global.props" />
+    <Import Project="$(ProjectDir)\..\..\..\vsprojects\winsock.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
-    <TargetName>grpc++</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Release'">
-    <TargetName>grpc++</TargetName>
-  </PropertyGroup>
     <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-DLL|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
@@ -96,7 +87,6 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <TreatWarningAsError>true</TreatWarningAsError>
       <DebugInformationFormat Condition="$(Jenkins)">None</DebugInformationFormat>
       <MinimalRebuild Condition="$(Jenkins)">false</MinimalRebuild>
@@ -115,7 +105,6 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <TreatWarningAsError>true</TreatWarningAsError>
       <DebugInformationFormat Condition="$(Jenkins)">None</DebugInformationFormat>
       <MinimalRebuild Condition="$(Jenkins)">false</MinimalRebuild>
@@ -136,7 +125,6 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <TreatWarningAsError>true</TreatWarningAsError>
       <DebugInformationFormat Condition="$(Jenkins)">None</DebugInformationFormat>
       <MinimalRebuild Condition="$(Jenkins)">false</MinimalRebuild>
@@ -159,7 +147,6 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <TreatWarningAsError>true</TreatWarningAsError>
       <DebugInformationFormat Condition="$(Jenkins)">None</DebugInformationFormat>
       <MinimalRebuild Condition="$(Jenkins)">false</MinimalRebuild>
@@ -180,7 +167,6 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <TreatWarningAsError>true</TreatWarningAsError>
       <DebugInformationFormat Condition="$(Jenkins)">None</DebugInformationFormat>
       <MinimalRebuild Condition="$(Jenkins)">false</MinimalRebuild>
@@ -199,7 +185,6 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <TreatWarningAsError>true</TreatWarningAsError>
       <DebugInformationFormat Condition="$(Jenkins)">None</DebugInformationFormat>
       <MinimalRebuild Condition="$(Jenkins)">false</MinimalRebuild>
@@ -220,7 +205,6 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <TreatWarningAsError>true</TreatWarningAsError>
       <DebugInformationFormat Condition="$(Jenkins)">None</DebugInformationFormat>
       <MinimalRebuild Condition="$(Jenkins)">false</MinimalRebuild>
@@ -243,7 +227,6 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <TreatWarningAsError>true</TreatWarningAsError>
       <DebugInformationFormat Condition="$(Jenkins)">None</DebugInformationFormat>
       <MinimalRebuild Condition="$(Jenkins)">false</MinimalRebuild>
@@ -258,184 +241,187 @@
   </ItemDefinitionGroup>
 
   <ItemGroup>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\alarm.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\channel.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\client_context.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\completion_queue.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\create_channel.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\create_channel_posix.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\generic\async_generic_service.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\generic\generic_stub.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\grpc++.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\call.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\client_unary_call.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\core_codegen.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\grpc_library.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\method_handler_impl.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\rpc_method.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\rpc_service_method.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\serialization_traits.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\server_builder_option.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\server_builder_plugin.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\server_initializer.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\service_type.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\sync.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\sync_cxx11.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\sync_no_cxx11.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\thd.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\thd_cxx11.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\thd_no_cxx11.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\security\auth_context.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\security\auth_metadata_processor.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\security\credentials.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\security\server_credentials.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\server.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\server_builder.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\server_context.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\server_posix.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\support\async_stream.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\support\async_unary_call.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\support\byte_buffer.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\support\channel_arguments.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\support\config.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\support\slice.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\support\status.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\support\status_code_enum.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\support\string_ref.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\support\stub_options.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\support\sync_stream.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\support\time.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\async_stream.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\async_unary_call.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\call.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\call_hook.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\channel_interface.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\client_context.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\client_unary_call.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\completion_queue.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\completion_queue_tag.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\config.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\core_codegen_interface.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\create_auth_context.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\grpc_library.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\method_handler_impl.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\rpc_method.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\rpc_service_method.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\security\auth_context.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\serialization_traits.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\server_context.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\server_interface.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\service_type.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\status.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\status_code_enum.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\string_ref.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\stub_options.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\sync.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\sync_cxx11.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\sync_no_cxx11.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\sync_stream.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\time.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\byte_buffer.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\byte_buffer_reader.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\compression_types.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\connectivity_state.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\grpc_types.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\propagation_bits.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\status.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\alloc.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_gcc_atomic.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_gcc_sync.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_windows.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\log.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\port_platform.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\slice.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\slice_buffer.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_generic.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_posix.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_windows.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\time.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\alarm.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\channel.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\client_context.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\completion_queue.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\create_channel.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\create_channel_posix.h"><ExcludedFromBuild>true</ExcludedFromBuild></ClInclude>
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\generic\async_generic_service.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\generic\generic_stub.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\grpc++.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\call.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\client_unary_call.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\core_codegen.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\grpc_library.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\method_handler_impl.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\rpc_method.h"><ExcludedFromBuild>true</ExcludedFromBuild></ClInclude>
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\rpc_service_method.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\serialization_traits.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\server_builder_option.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\server_builder_plugin.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\server_initializer.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\service_type.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\sync.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\sync_cxx11.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\sync_no_cxx11.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\thd.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\thd_cxx11.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\thd_no_cxx11.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\security\auth_context.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\security\auth_metadata_processor.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\security\credentials.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\security\server_credentials.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\server.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\server_builder.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\server_context.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\server_posix.h"><ExcludedFromBuild>true</ExcludedFromBuild></ClInclude>
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\support\async_stream.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\support\async_unary_call.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\support\byte_buffer.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\support\channel_arguments.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\support\config.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\support\slice.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\support\status.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\support\status_code_enum.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\support\string_ref.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\support\stub_options.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\support\sync_stream.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\support\time.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\async_stream.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\async_unary_call.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\call.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\call_hook.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\channel_interface.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\client_context.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\client_unary_call.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\completion_queue.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\completion_queue_tag.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\config.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\core_codegen_interface.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\create_auth_context.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\grpc_library.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\method_handler_impl.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\rpc_method.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\rpc_service_method.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\security\auth_context.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\serialization_traits.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\server_context.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\server_interface.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\service_type.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\status.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\status_code_enum.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\string_ref.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\stub_options.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\sync.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\sync_cxx11.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\sync_no_cxx11.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\sync_stream.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\time.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\byte_buffer.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\byte_buffer_reader.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\compression_types.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\connectivity_state.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\grpc_types.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\propagation_bits.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\status.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\alloc.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\atm.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\atm_gcc_atomic.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\atm_gcc_sync.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\atm_windows.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\log.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\port_platform.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\slice.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\slice_buffer.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\sync.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\sync_generic.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\sync_posix.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\sync_windows.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\time.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\core_codegen.h" />
-    <ClInclude Include="$(SolutionDir)\..\src\cpp\client\secure_credentials.h" />
-    <ClInclude Include="$(SolutionDir)\..\src\cpp\common\secure_auth_context.h" />
-    <ClInclude Include="$(SolutionDir)\..\src\cpp\server\secure_server_credentials.h" />
-    <ClInclude Include="$(SolutionDir)\..\src\cpp\client\create_channel_internal.h" />
-    <ClInclude Include="$(SolutionDir)\..\src\cpp\server\dynamic_thread_pool.h" />
-    <ClInclude Include="$(SolutionDir)\..\src\cpp\server\thread_pool_interface.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\core_codegen.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\cpp\client\secure_credentials.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\cpp\common\secure_auth_context.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\cpp\server\secure_server_credentials.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\cpp\client\create_channel_internal.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\cpp\server\dynamic_thread_pool.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\cpp\server\thread_pool_interface.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\client\secure_credentials.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\client\secure_credentials.cc">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\common\auth_property_iterator.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\common\auth_property_iterator.cc">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\common\secure_auth_context.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\common\secure_auth_context.cc">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\common\secure_channel_arguments.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\common\secure_channel_arguments.cc">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\common\secure_create_auth_context.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\common\secure_create_auth_context.cc">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\secure_server_credentials.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\server\secure_server_credentials.cc">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\client\channel.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\client\channel.cc">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\client\client_context.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\client\client_context.cc">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\client\create_channel.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\client\create_channel.cc">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\client\create_channel_internal.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\client\create_channel_internal.cc">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\client\create_channel_posix.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\client\create_channel_posix.cc">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\client\credentials.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\client\credentials.cc">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\client\generic_stub.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\client\generic_stub.cc">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\client\insecure_credentials.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\client\insecure_credentials.cc">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\common\channel_arguments.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\common\channel_arguments.cc">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\common\completion_queue.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\common\completion_queue.cc">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\common\core_codegen.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\common\core_codegen.cc">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\common\rpc_method.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\common\rpc_method.cc">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\async_generic_service.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\server\async_generic_service.cc">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\create_default_thread_pool.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\server\create_default_thread_pool.cc">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\dynamic_thread_pool.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\server\dynamic_thread_pool.cc">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\insecure_server_credentials.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\server\insecure_server_credentials.cc">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\server.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\server\server.cc">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\server_builder.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\server\server_builder.cc">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\server_context.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\server\server_context.cc">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\server_credentials.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\server\server_credentials.cc">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\server_posix.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\server\server_posix.cc">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\util\byte_buffer.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\util\byte_buffer.cc">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\util\slice.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\util\slice.cc">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\util\status.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\util\status.cc">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\util\string_ref.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\util\string_ref.cc">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\util\time.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\util\time.cc">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\codegen\codegen_init.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\codegen\codegen_init.cc">
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SolutionDir)\..\vsprojects\vcxproj\.\grpc\grpc.vcxproj">
+    <ProjectReference Include="$(ProjectDir)\..\..\..\vsprojects\vcxproj\.\grpc\grpc.vcxproj">
       <Project>{29D16885-7228-4C31-81ED-5F9187C7F2A9}</Project>
     </ProjectReference>
   </ItemGroup>
diff --git a/vsprojects/vcxproj/grpc++/grpc++.vcxproj.filters b/vsprojects/vcxproj/grpc++/grpc++.vcxproj.filters
index a905118..cfea49a
--- a/vsprojects/vcxproj/grpc++/grpc++.vcxproj.filters
+++ b/vsprojects/vcxproj/grpc++/grpc++.vcxproj.filters
@@ -1,426 +1,411 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\client\secure_credentials.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\client\secure_credentials.cc">
       <Filter>src\cpp\client</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\common\auth_property_iterator.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\common\auth_property_iterator.cc">
       <Filter>src\cpp\common</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\common\secure_auth_context.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\common\secure_auth_context.cc">
       <Filter>src\cpp\common</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\common\secure_channel_arguments.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\common\secure_channel_arguments.cc">
       <Filter>src\cpp\common</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\common\secure_create_auth_context.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\common\secure_create_auth_context.cc">
       <Filter>src\cpp\common</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\secure_server_credentials.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\server\secure_server_credentials.cc">
       <Filter>src\cpp\server</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\client\channel.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\client\channel.cc">
       <Filter>src\cpp\client</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\client\client_context.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\client\client_context.cc">
       <Filter>src\cpp\client</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\client\create_channel.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\client\create_channel.cc">
       <Filter>src\cpp\client</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\client\create_channel_internal.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\client\create_channel_internal.cc">
       <Filter>src\cpp\client</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\client\create_channel_posix.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\client\credentials.cc">
       <Filter>src\cpp\client</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\client\credentials.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\client\generic_stub.cc">
       <Filter>src\cpp\client</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\client\generic_stub.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\client\insecure_credentials.cc">
       <Filter>src\cpp\client</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\client\insecure_credentials.cc">
-      <Filter>src\cpp\client</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\common\channel_arguments.cc">
-      <Filter>src\cpp\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\common\completion_queue.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\common\channel_arguments.cc">
       <Filter>src\cpp\common</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\common\core_codegen.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\common\completion_queue.cc">
       <Filter>src\cpp\common</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\common\rpc_method.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\common\core_codegen.cc">
       <Filter>src\cpp\common</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\async_generic_service.cc">
-      <Filter>src\cpp\server</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\create_default_thread_pool.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\server\async_generic_service.cc">
       <Filter>src\cpp\server</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\dynamic_thread_pool.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\server\create_default_thread_pool.cc">
       <Filter>src\cpp\server</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\insecure_server_credentials.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\server\dynamic_thread_pool.cc">
       <Filter>src\cpp\server</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\server.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\server\insecure_server_credentials.cc">
       <Filter>src\cpp\server</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\server_builder.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\server\server.cc">
       <Filter>src\cpp\server</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\server_context.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\server\server_builder.cc">
       <Filter>src\cpp\server</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\server_credentials.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\server\server_context.cc">
       <Filter>src\cpp\server</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\server\server_posix.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\server\server_credentials.cc">
       <Filter>src\cpp\server</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\util\byte_buffer.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\util\byte_buffer.cc">
       <Filter>src\cpp\util</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\util\slice.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\util\slice.cc">
       <Filter>src\cpp\util</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\util\status.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\util\status.cc">
       <Filter>src\cpp\util</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\util\string_ref.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\util\string_ref.cc">
       <Filter>src\cpp\util</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\util\time.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\util\time.cc">
       <Filter>src\cpp\util</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\codegen\codegen_init.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\codegen\codegen_init.cc">
       <Filter>src\cpp\codegen</Filter>
     </ClCompile>
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\cpp\client\create_channel_posix.cc" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\alarm.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\alarm.h">
       <Filter>include\grpc++</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\channel.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\channel.h">
       <Filter>include\grpc++</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\client_context.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\client_context.h">
       <Filter>include\grpc++</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\completion_queue.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\completion_queue.h">
       <Filter>include\grpc++</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\create_channel.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\create_channel.h">
       <Filter>include\grpc++</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\create_channel_posix.h">
-      <Filter>include\grpc++</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\generic\async_generic_service.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\generic\async_generic_service.h">
       <Filter>include\grpc++\generic</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\generic\generic_stub.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\generic\generic_stub.h">
       <Filter>include\grpc++\generic</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\grpc++.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\grpc++.h">
       <Filter>include\grpc++</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\call.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\call.h">
       <Filter>include\grpc++\impl</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\client_unary_call.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\client_unary_call.h">
       <Filter>include\grpc++\impl</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\core_codegen.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\core_codegen.h">
       <Filter>include\grpc++\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\grpc_library.h">
-      <Filter>include\grpc++\impl</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\method_handler_impl.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\grpc_library.h">
       <Filter>include\grpc++\impl</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\rpc_method.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\method_handler_impl.h">
       <Filter>include\grpc++\impl</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\rpc_service_method.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\rpc_service_method.h">
       <Filter>include\grpc++\impl</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\serialization_traits.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\serialization_traits.h">
       <Filter>include\grpc++\impl</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\server_builder_option.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\server_builder_option.h">
       <Filter>include\grpc++\impl</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\server_builder_plugin.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\server_builder_plugin.h">
       <Filter>include\grpc++\impl</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\server_initializer.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\server_initializer.h">
       <Filter>include\grpc++\impl</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\service_type.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\service_type.h">
       <Filter>include\grpc++\impl</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\sync.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\sync.h">
       <Filter>include\grpc++\impl</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\sync_cxx11.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\sync_cxx11.h">
       <Filter>include\grpc++\impl</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\sync_no_cxx11.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\sync_no_cxx11.h">
       <Filter>include\grpc++\impl</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\thd.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\thd.h">
       <Filter>include\grpc++\impl</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\thd_cxx11.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\thd_cxx11.h">
       <Filter>include\grpc++\impl</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\thd_no_cxx11.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\thd_no_cxx11.h">
       <Filter>include\grpc++\impl</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\security\auth_context.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\security\auth_context.h">
       <Filter>include\grpc++\security</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\security\auth_metadata_processor.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\security\auth_metadata_processor.h">
       <Filter>include\grpc++\security</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\security\credentials.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\security\credentials.h">
       <Filter>include\grpc++\security</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\security\server_credentials.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\security\server_credentials.h">
       <Filter>include\grpc++\security</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\server.h">
-      <Filter>include\grpc++</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\server_builder.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\server.h">
       <Filter>include\grpc++</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\server_context.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\server_builder.h">
       <Filter>include\grpc++</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\server_posix.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\server_context.h">
       <Filter>include\grpc++</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\support\async_stream.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\support\async_stream.h">
       <Filter>include\grpc++\support</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\support\async_unary_call.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\support\async_unary_call.h">
       <Filter>include\grpc++\support</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\support\byte_buffer.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\support\byte_buffer.h">
       <Filter>include\grpc++\support</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\support\channel_arguments.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\support\channel_arguments.h">
       <Filter>include\grpc++\support</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\support\config.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\support\config.h">
       <Filter>include\grpc++\support</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\support\slice.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\support\slice.h">
       <Filter>include\grpc++\support</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\support\status.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\support\status.h">
       <Filter>include\grpc++\support</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\support\status_code_enum.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\support\status_code_enum.h">
       <Filter>include\grpc++\support</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\support\string_ref.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\support\string_ref.h">
       <Filter>include\grpc++\support</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\support\stub_options.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\support\stub_options.h">
       <Filter>include\grpc++\support</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\support\sync_stream.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\support\sync_stream.h">
       <Filter>include\grpc++\support</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\support\time.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\support\time.h">
       <Filter>include\grpc++\support</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\async_stream.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\async_stream.h">
       <Filter>include\grpc++\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\async_unary_call.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\async_unary_call.h">
       <Filter>include\grpc++\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\call.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\call.h">
       <Filter>include\grpc++\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\call_hook.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\call_hook.h">
       <Filter>include\grpc++\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\channel_interface.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\channel_interface.h">
       <Filter>include\grpc++\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\client_context.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\client_context.h">
       <Filter>include\grpc++\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\client_unary_call.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\client_unary_call.h">
       <Filter>include\grpc++\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\completion_queue.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\completion_queue.h">
       <Filter>include\grpc++\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\completion_queue_tag.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\completion_queue_tag.h">
       <Filter>include\grpc++\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\config.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\config.h">
       <Filter>include\grpc++\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\core_codegen_interface.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\core_codegen_interface.h">
       <Filter>include\grpc++\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\create_auth_context.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\create_auth_context.h">
       <Filter>include\grpc++\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\grpc_library.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\grpc_library.h">
       <Filter>include\grpc++\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\method_handler_impl.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\method_handler_impl.h">
       <Filter>include\grpc++\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\rpc_method.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\rpc_method.h">
       <Filter>include\grpc++\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\rpc_service_method.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\rpc_service_method.h">
       <Filter>include\grpc++\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\security\auth_context.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\security\auth_context.h">
       <Filter>include\grpc++\impl\codegen\security</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\serialization_traits.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\serialization_traits.h">
       <Filter>include\grpc++\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\server_context.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\server_context.h">
       <Filter>include\grpc++\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\server_interface.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\server_interface.h">
       <Filter>include\grpc++\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\service_type.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\service_type.h">
       <Filter>include\grpc++\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\status.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\status.h">
       <Filter>include\grpc++\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\status_code_enum.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\status_code_enum.h">
       <Filter>include\grpc++\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\string_ref.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\string_ref.h">
       <Filter>include\grpc++\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\stub_options.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\stub_options.h">
       <Filter>include\grpc++\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\sync.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\sync.h">
       <Filter>include\grpc++\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\sync_cxx11.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\sync_cxx11.h">
       <Filter>include\grpc++\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\sync_no_cxx11.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\sync_no_cxx11.h">
       <Filter>include\grpc++\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\sync_stream.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\sync_stream.h">
       <Filter>include\grpc++\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\time.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\time.h">
       <Filter>include\grpc++\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\byte_buffer.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\byte_buffer.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\byte_buffer_reader.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\byte_buffer_reader.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\compression_types.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\compression_types.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\connectivity_state.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\connectivity_state.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\grpc_types.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\grpc_types.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\propagation_bits.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\propagation_bits.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\status.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\status.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\alloc.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\alloc.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\atm.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_gcc_atomic.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\atm_gcc_atomic.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_gcc_sync.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\atm_gcc_sync.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_windows.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\atm_windows.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\log.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\log.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\port_platform.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\port_platform.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\slice.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\slice.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\slice_buffer.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\slice_buffer.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\sync.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_generic.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\sync_generic.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_posix.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\sync_posix.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_windows.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\sync_windows.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\time.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\time.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\core_codegen.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\create_channel_posix.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\core_codegen.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\core_codegen.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\core_codegen.h">
       <Filter>include\grpc++\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\cpp\client\secure_credentials.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\cpp\client\secure_credentials.h">
       <Filter>src\cpp\client</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\cpp\common\secure_auth_context.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\cpp\common\secure_auth_context.h">
       <Filter>src\cpp\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\cpp\server\secure_server_credentials.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\cpp\server\secure_server_credentials.h">
       <Filter>src\cpp\server</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\cpp\client\create_channel_internal.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\cpp\client\create_channel_internal.h">
       <Filter>src\cpp\client</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\cpp\server\dynamic_thread_pool.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\cpp\server\dynamic_thread_pool.h">
       <Filter>src\cpp\server</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\cpp\server\thread_pool_interface.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\cpp\server\thread_pool_interface.h">
       <Filter>src\cpp\server</Filter>
     </ClInclude>
   </ItemGroup>
-
   <ItemGroup>
     <Filter Include="include">
       <UniqueIdentifier>{82445414-24cd-8198-1fe1-4267c3f3df00}</UniqueIdentifier>
@@ -477,5 +462,4 @@
       <UniqueIdentifier>{f842537a-2bf1-1ec3-b495-7d62c64a1c06}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
-</Project>
-
+</Project>
\ No newline at end of file
diff --git a/vsprojects/vcxproj/grpc/grpc.vcxproj b/vsprojects/vcxproj/grpc/grpc.vcxproj
index a9e96da..d95a974
--- a/vsprojects/vcxproj/grpc/grpc.vcxproj
+++ b/vsprojects/vcxproj/grpc/grpc.vcxproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(SolutionDir)\..\vsprojects\packages\grpc.dependencies.openssl.1.0.204.1\build\native\grpc.dependencies.openssl.props" Condition="Exists('$(SolutionDir)\..\vsprojects\packages\grpc.dependencies.openssl.1.0.204.1\build\native\1.0.204.1.props')" />
+  <Import Project="$(SolutionDir)packages\grpc.dependencies.openssl.1.0.204.1\build\native\grpc.dependencies.openssl.props" Condition="Exists('$(SolutionDir)packages\grpc.dependencies.openssl.1.0.204.1\build\native\1.0.204.1.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug-DLL|Win32">
       <Configuration>Debug-DLL</Configuration>
@@ -38,7 +38,6 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{29D16885-7228-4C31-81ED-5F9187C7F2A9}</ProjectGuid>
     <IgnoreWarnIntDirInTempDetected>true</IgnoreWarnIntDirInTempDetected>
-    <IntDir>$(SolutionDir)IntDir\$(MSBuildProjectName)\</IntDir>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(VisualStudioVersion)' == '10.0'" Label="Configuration">
@@ -61,7 +60,6 @@
   <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Debug-DLL'" Label="Configuration">
@@ -72,7 +70,6 @@
   <PropertyGroup Condition="'$(Configuration)'=='Release-DLL'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -80,19 +77,17 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(SolutionDir)\..\vsprojects\global.props" />
-    <Import Project="$(SolutionDir)\..\vsprojects\winsock.props" />
+    <Import Project="$(ProjectDir)\..\..\..\vsprojects\global.props" />
+    <Import Project="$(ProjectDir)\..\..\..\vsprojects\winsock.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)'=='Debug'">
-    <TargetName>grpc</TargetName>
     <Linkage-grpc_dependencies_zlib>static</Linkage-grpc_dependencies_zlib>
     <Configuration-grpc_dependencies_zlib>Debug</Configuration-grpc_dependencies_zlib>
     <Linkage-grpc_dependencies_openssl>static</Linkage-grpc_dependencies_openssl>
     <Configuration-grpc_dependencies_openssl>Debug</Configuration-grpc_dependencies_openssl>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'">
-    <TargetName>grpc</TargetName>
     <Linkage-grpc_dependencies_zlib>static</Linkage-grpc_dependencies_zlib>
     <Configuration-grpc_dependencies_zlib>Release</Configuration-grpc_dependencies_zlib>
     <Linkage-grpc_dependencies_openssl>static</Linkage-grpc_dependencies_openssl>
@@ -105,7 +100,6 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <TreatWarningAsError>true</TreatWarningAsError>
       <DebugInformationFormat Condition="$(Jenkins)">None</DebugInformationFormat>
       <MinimalRebuild Condition="$(Jenkins)">false</MinimalRebuild>
@@ -124,7 +118,6 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <TreatWarningAsError>true</TreatWarningAsError>
       <DebugInformationFormat Condition="$(Jenkins)">None</DebugInformationFormat>
       <MinimalRebuild Condition="$(Jenkins)">false</MinimalRebuild>
@@ -145,7 +138,6 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <TreatWarningAsError>true</TreatWarningAsError>
       <DebugInformationFormat Condition="$(Jenkins)">None</DebugInformationFormat>
       <MinimalRebuild Condition="$(Jenkins)">false</MinimalRebuild>
@@ -168,7 +160,6 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <TreatWarningAsError>true</TreatWarningAsError>
       <DebugInformationFormat Condition="$(Jenkins)">None</DebugInformationFormat>
       <MinimalRebuild Condition="$(Jenkins)">false</MinimalRebuild>
@@ -189,7 +180,6 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <TreatWarningAsError>true</TreatWarningAsError>
       <DebugInformationFormat Condition="$(Jenkins)">None</DebugInformationFormat>
       <MinimalRebuild Condition="$(Jenkins)">false</MinimalRebuild>
@@ -208,7 +198,6 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <TreatWarningAsError>true</TreatWarningAsError>
       <DebugInformationFormat Condition="$(Jenkins)">None</DebugInformationFormat>
       <MinimalRebuild Condition="$(Jenkins)">false</MinimalRebuild>
@@ -229,7 +218,6 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <TreatWarningAsError>true</TreatWarningAsError>
       <DebugInformationFormat Condition="$(Jenkins)">None</DebugInformationFormat>
       <MinimalRebuild Condition="$(Jenkins)">false</MinimalRebuild>
@@ -252,7 +240,6 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <TreatWarningAsError>true</TreatWarningAsError>
       <DebugInformationFormat Condition="$(Jenkins)">None</DebugInformationFormat>
       <MinimalRebuild Condition="$(Jenkins)">false</MinimalRebuild>
@@ -267,570 +254,570 @@
   </ItemDefinitionGroup>
 
   <ItemGroup>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\byte_buffer.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\byte_buffer_reader.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\compression.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\grpc.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\grpc_posix.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\status.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\byte_buffer.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\byte_buffer_reader.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\compression_types.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\connectivity_state.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\grpc_types.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\propagation_bits.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\status.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\alloc.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_gcc_atomic.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_gcc_sync.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_windows.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\log.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\port_platform.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\slice.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\slice_buffer.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_generic.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_posix.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_windows.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\time.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\grpc_security.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\grpc_security_constants.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\census.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\byte_buffer.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\byte_buffer_reader.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\compression.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\grpc.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\grpc_posix.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\status.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\byte_buffer.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\byte_buffer_reader.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\compression_types.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\connectivity_state.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\grpc_types.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\propagation_bits.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\status.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\alloc.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\atm.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\atm_gcc_atomic.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\atm_gcc_sync.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\atm_windows.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\log.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\port_platform.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\slice.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\slice_buffer.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\sync.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\sync_generic.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\sync_posix.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\sync_windows.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\time.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\grpc_security.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\grpc_security_constants.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\census.h" />
   </ItemGroup>
   <ItemGroup>
-    <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">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\surface\init.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\channel\channel_args.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\channel\channel_args.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\channel\channel_stack.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\channel\channel_stack.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\channel\channel_stack_builder.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\channel\channel_stack_builder.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\channel\compress_filter.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\channel\compress_filter.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\channel\connected_channel.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\channel\connected_channel.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\channel\http_client_filter.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\channel\http_client_filter.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\channel\http_server_filter.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\channel\http_server_filter.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\compression\compression.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\compression\compression.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\compression\message_compress.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\compression\message_compress.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\debug\trace.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\debug\trace.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\http\format_request.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\http\format_request.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\http\httpcli.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\http\httpcli.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\http\parser.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\http\parser.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\closure.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\closure.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\endpoint.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\endpoint.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\endpoint_pair_posix.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\endpoint_pair_posix.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\endpoint_pair_windows.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\endpoint_pair_windows.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\error.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\error.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_epoll_linux.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\ev_epoll_linux.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_poll_and_epoll_posix.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\ev_poll_and_epoll_posix.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_poll_posix.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\ev_poll_posix.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_posix.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\ev_posix.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\exec_ctx.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\exec_ctx.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\executor.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\executor.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\iocp_windows.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\iocp_windows.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\iomgr.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\iomgr.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\iomgr_posix.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\iomgr_posix.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\iomgr_windows.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\iomgr_windows.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\load_file.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\load_file.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\network_status_tracker.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\network_status_tracker.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\polling_entity.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\polling_entity.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\pollset_set_windows.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\pollset_set_windows.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\pollset_windows.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\pollset_windows.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\resolve_address_posix.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\resolve_address_posix.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\resolve_address_windows.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\resolve_address_windows.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\sockaddr_utils.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\sockaddr_utils.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\socket_utils_common_posix.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\socket_utils_common_posix.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\socket_utils_linux.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\socket_utils_linux.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\socket_utils_posix.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\socket_utils_posix.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\socket_windows.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\socket_windows.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\tcp_client_posix.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\tcp_client_posix.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\tcp_client_windows.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\tcp_client_windows.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\tcp_posix.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\tcp_posix.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\tcp_server_posix.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\tcp_server_posix.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\tcp_server_windows.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\tcp_server_windows.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\tcp_windows.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\tcp_windows.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\time_averaged_stats.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\time_averaged_stats.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\timer.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\timer.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\timer_heap.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\timer_heap.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\udp_server.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\udp_server.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\unix_sockets_posix.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\unix_sockets_posix.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\unix_sockets_posix_noop.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\unix_sockets_posix_noop.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\wakeup_fd_eventfd.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\wakeup_fd_eventfd.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\wakeup_fd_nospecial.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\wakeup_fd_nospecial.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\wakeup_fd_pipe.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\wakeup_fd_pipe.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\wakeup_fd_posix.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\wakeup_fd_posix.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\workqueue_posix.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\workqueue_posix.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\workqueue_windows.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\workqueue_windows.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\json\json.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\json\json.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\json\json_reader.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\json\json_reader.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\json\json_string.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\json\json_string.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\json\json_writer.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\json\json_writer.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\alarm.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\surface\alarm.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\api_trace.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\surface\api_trace.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\byte_buffer.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\surface\byte_buffer.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\byte_buffer_reader.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\surface\byte_buffer_reader.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\call.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\surface\call.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\call_details.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\surface\call_details.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\call_log_batch.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\surface\call_log_batch.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\channel.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\surface\channel.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\channel_init.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\surface\channel_init.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\channel_ping.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\surface\channel_ping.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\channel_stack_type.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\surface\channel_stack_type.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\completion_queue.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\surface\completion_queue.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\event_string.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\surface\event_string.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\lame_client.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\surface\lame_client.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\metadata_array.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\surface\metadata_array.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\server.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\surface\server.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\validate_metadata.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\surface\validate_metadata.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\version.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\surface\version.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\byte_stream.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\transport\byte_stream.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\connectivity_state.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\transport\connectivity_state.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\metadata.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\transport\metadata.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\metadata_batch.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\transport\metadata_batch.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\static_metadata.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\transport\static_metadata.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\transport.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\transport\transport.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\transport_op_string.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\transport\transport_op_string.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\server\secure\server_secure_chttp2.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\server\secure\server_secure_chttp2.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\bin_decoder.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\bin_decoder.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\bin_encoder.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\bin_encoder.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\chttp2_plugin.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\chttp2_plugin.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\chttp2_transport.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\chttp2_transport.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_data.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\frame_data.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_goaway.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\frame_goaway.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_ping.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\frame_ping.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_rst_stream.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\frame_rst_stream.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_settings.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\frame_settings.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_window_update.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\frame_window_update.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\hpack_encoder.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\hpack_encoder.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\hpack_parser.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\hpack_parser.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\hpack_table.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\hpack_table.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\huffsyms.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\huffsyms.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\incoming_metadata.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\incoming_metadata.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\parsing.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\parsing.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\status_conversion.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\status_conversion.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\stream_lists.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\stream_lists.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\stream_map.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\stream_map.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\timeout_encoding.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\timeout_encoding.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\varint.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\varint.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\writing.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\writing.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\alpn\alpn.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\alpn\alpn.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\http\httpcli_security_connector.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\http\httpcli_security_connector.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\context\security_context.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\security\context\security_context.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\credentials\composite\composite_credentials.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\security\credentials\composite\composite_credentials.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\credentials\credentials.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\security\credentials\credentials.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\credentials\credentials_metadata.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\security\credentials\credentials_metadata.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\credentials\fake\fake_credentials.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\security\credentials\fake\fake_credentials.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\credentials\google_default\credentials_posix.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\security\credentials\google_default\credentials_posix.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\credentials\google_default\credentials_windows.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\security\credentials\google_default\credentials_windows.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\credentials\google_default\google_default_credentials.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\security\credentials\google_default\google_default_credentials.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\credentials\iam\iam_credentials.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\security\credentials\iam\iam_credentials.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\credentials\jwt\json_token.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\security\credentials\jwt\json_token.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\credentials\jwt\jwt_credentials.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\security\credentials\jwt\jwt_credentials.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\credentials\jwt\jwt_verifier.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\security\credentials\jwt\jwt_verifier.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\credentials\oauth2\oauth2_credentials.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\security\credentials\oauth2\oauth2_credentials.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\credentials\plugin\plugin_credentials.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\security\credentials\plugin\plugin_credentials.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\credentials\ssl\ssl_credentials.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\security\credentials\ssl\ssl_credentials.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\transport\client_auth_filter.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\security\transport\client_auth_filter.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\transport\handshake.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\security\transport\handshake.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\transport\secure_endpoint.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\security\transport\secure_endpoint.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\transport\security_connector.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\security\transport\security_connector.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\transport\server_auth_filter.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\security\transport\server_auth_filter.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\transport\tsi_error.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\security\transport\tsi_error.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\util\b64.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\security\util\b64.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\util\json_util.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\security\util\json_util.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\init_secure.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\surface\init_secure.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\tsi\fake_transport_security.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\tsi\fake_transport_security.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\tsi\ssl_transport_security.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\tsi\ssl_transport_security.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\tsi\transport_security.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\tsi\transport_security.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\client\secure\secure_channel_create.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\client\secure\secure_channel_create.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\channel_connectivity.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\client_config\channel_connectivity.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\client_channel.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\client_config\client_channel.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\client_channel_factory.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\client_config\client_channel_factory.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\client_config.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\client_config\client_config.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\client_config_plugin.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\client_config\client_config_plugin.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\connector.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\client_config\connector.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\default_initial_connect_string.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\client_config\default_initial_connect_string.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\initial_connect_string.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\client_config\initial_connect_string.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\lb_policy.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\client_config\lb_policy.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\lb_policy_factory.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\client_config\lb_policy_factory.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\lb_policy_registry.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\client_config\lb_policy_registry.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\parse_address.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\client_config\parse_address.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\resolver.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\client_config\resolver.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\resolver_factory.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\client_config\resolver_factory.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\resolver_registry.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\client_config\resolver_registry.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\client_config\subchannel.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel_call_holder.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\client_config\subchannel_call_holder.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel_index.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\client_config\subchannel_index.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\uri_parser.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\client_config\uri_parser.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\server\insecure\server_chttp2.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\server\insecure\server_chttp2.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\server\insecure\server_chttp2_posix.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\server\insecure\server_chttp2_posix.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\client\insecure\channel_create.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\client\insecure\channel_create.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\client\insecure\channel_create_posix.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\client\insecure\channel_create_posix.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\lb_policy\grpclb\load_balancer_api.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\lb_policy\grpclb\load_balancer_api.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\lb_policy\grpclb\proto\grpc\lb\v1\load_balancer.pb.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\lb_policy\grpclb\proto\grpc\lb\v1\load_balancer.pb.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\third_party\nanopb\pb_common.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\third_party\nanopb\pb_common.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\third_party\nanopb\pb_decode.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\third_party\nanopb\pb_decode.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\third_party\nanopb\pb_encode.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\third_party\nanopb\pb_encode.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\lb_policy\pick_first\pick_first.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\lb_policy\pick_first\pick_first.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\lb_policy\round_robin\round_robin.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\lb_policy\round_robin\round_robin.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\resolver\dns\native\dns_resolver.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\resolver\dns\native\dns_resolver.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\resolver\sockaddr\sockaddr_resolver.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\resolver\sockaddr\sockaddr_resolver.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\load_reporting\load_reporting.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\load_reporting\load_reporting.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\load_reporting\load_reporting_filter.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\load_reporting\load_reporting_filter.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\census\context.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\census\context.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\census\gen\census.pb.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\census\gen\census.pb.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\census\grpc_context.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\census\grpc_context.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\census\grpc_filter.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\census\grpc_filter.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\census\grpc_plugin.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\census\grpc_plugin.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\census\initialize.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\census\initialize.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\census\mlog.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\census\mlog.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\census\operation.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\census\operation.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\census\placeholders.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\census\placeholders.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\census\tracing.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\census\tracing.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\plugin_registry\grpc_plugin_registry.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\plugin_registry\grpc_plugin_registry.c">
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SolutionDir)\..\vsprojects\vcxproj\.\gpr\gpr.vcxproj">
+    <ProjectReference Include="$(ProjectDir)\..\..\..\vsprojects\vcxproj\.\gpr\gpr.vcxproj">
       <Project>{B23D3D1A-9438-4EDA-BEB6-9A0A03D17792}</Project>
     </ProjectReference>
   </ItemGroup>
@@ -839,20 +826,20 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-  <Import Project="$(SolutionDir)\..\vsprojects\packages\grpc.dependencies.zlib.redist.1.2.8.10\build\native\grpc.dependencies.zlib.redist.targets" Condition="Exists('$(SolutionDir)\..\vsprojects\packages\grpc.dependencies.zlib.redist.1.2.8.10\build\native\grpc.dependencies\grpc.dependencies.zlib.targets')" />
-  <Import Project="$(SolutionDir)\..\vsprojects\packages\grpc.dependencies.zlib.1.2.8.10\build\native\grpc.dependencies.zlib.targets" Condition="Exists('$(SolutionDir)\..\vsprojects\packages\grpc.dependencies.zlib.1.2.8.10\build\native\grpc.dependencies\grpc.dependencies.zlib.targets')" />
-  <Import Project="$(SolutionDir)\..\vsprojects\packages\grpc.dependencies.openssl.redist.1.0.204.1\build\native\grpc.dependencies.openssl.redist.targets" Condition="Exists('$(SolutionDir)\..\vsprojects\packages\grpc.dependencies.openssl.redist.1.0.204.1\build\native\grpc.dependencies\grpc.dependencies.openssl.targets')" />
-  <Import Project="$(SolutionDir)\..\vsprojects\packages\grpc.dependencies.openssl.1.0.204.1\build\native\grpc.dependencies.openssl.targets" Condition="Exists('$(SolutionDir)\..\vsprojects\packages\grpc.dependencies.openssl.1.0.204.1\build\native\grpc.dependencies\grpc.dependencies.openssl.targets')" />
+  <Import Project="$(SolutionDir)packages\grpc.dependencies.zlib.redist.1.2.8.10\build\native\grpc.dependencies.zlib.redist.targets" Condition="Exists('$(SolutionDir)packages\grpc.dependencies.zlib.redist.1.2.8.10\build\native\grpc.dependencies\grpc.dependencies.zlib.targets')" />
+  <Import Project="$(SolutionDir)packages\grpc.dependencies.zlib.1.2.8.10\build\native\grpc.dependencies.zlib.targets" Condition="Exists('$(SolutionDir)packages\grpc.dependencies.zlib.1.2.8.10\build\native\grpc.dependencies\grpc.dependencies.zlib.targets')" />
+  <Import Project="$(SolutionDir)packages\grpc.dependencies.openssl.redist.1.0.204.1\build\native\grpc.dependencies.openssl.redist.targets" Condition="Exists('$(SolutionDir)packages\grpc.dependencies.openssl.redist.1.0.204.1\build\native\grpc.dependencies\grpc.dependencies.openssl.targets')" />
+  <Import Project="$(SolutionDir)packages\grpc.dependencies.openssl.1.0.204.1\build\native\grpc.dependencies.openssl.targets" Condition="Exists('$(SolutionDir)packages\grpc.dependencies.openssl.1.0.204.1\build\native\grpc.dependencies\grpc.dependencies.openssl.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('$(SolutionDir)\..\vsprojects\packages\grpc.dependencies.zlib.redist.1.2.8.10\build\native\grpc.dependencies.zlib.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\..\vsprojects\packages\grpc.dependencies.zlib.redist.1.2.8.10\build\native\grpc.dependencies.zlib.redist.targets')" />
-    <Error Condition="!Exists('$(SolutionDir)\..\vsprojects\packages\grpc.dependencies.zlib.1.2.8.10\build\native\grpc.dependencies.zlib.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\..\vsprojects\packages\grpc.dependencies.zlib.1.2.8.10\build\native\grpc.dependencies.zlib.targets')" />
-    <Error Condition="!Exists('$(SolutionDir)\..\vsprojects\packages\grpc.dependencies.openssl.redist.1.0.204.1\build\native\grpc.dependencies.openssl.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\..\vsprojects\packages\grpc.dependencies.openssl.redist.1.0.204.1\build\native\grpc.dependencies.openssl.redist.targets')" />
-    <Error Condition="!Exists('$(SolutionDir)\..\vsprojects\packages\grpc.dependencies.openssl.1.0.204.1\build\native\grpc.dependencies.openssl.props')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\..\vsprojects\packages\grpc.dependencies.openssl.1.0.204.1\build\native\grpc.dependencies.openssl.props')" />
-    <Error Condition="!Exists('$(SolutionDir)\..\vsprojects\packages\grpc.dependencies.openssl.1.0.204.1\build\native\grpc.dependencies.openssl.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\..\vsprojects\packages\grpc.dependencies.openssl.1.0.204.1\build\native\grpc.dependencies.openssl.targets')" />
+    <Error Condition="!Exists('$(SolutionDir)packages\grpc.dependencies.zlib.redist.1.2.8.10\build\native\grpc.dependencies.zlib.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\grpc.dependencies.zlib.redist.1.2.8.10\build\native\grpc.dependencies.zlib.redist.targets')" />
+    <Error Condition="!Exists('$(SolutionDir)packages\grpc.dependencies.zlib.1.2.8.10\build\native\grpc.dependencies.zlib.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\grpc.dependencies.zlib.1.2.8.10\build\native\grpc.dependencies.zlib.targets')" />
+    <Error Condition="!Exists('$(SolutionDir)packages\grpc.dependencies.openssl.redist.1.0.204.1\build\native\grpc.dependencies.openssl.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\grpc.dependencies.openssl.redist.1.0.204.1\build\native\grpc.dependencies.openssl.redist.targets')" />
+    <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>
 
diff --git a/vsprojects/vcxproj/grpc/grpc.vcxproj.filters b/vsprojects/vcxproj/grpc/grpc.vcxproj.filters
index be77e53..ba69b28
--- a/vsprojects/vcxproj/grpc/grpc.vcxproj.filters
+++ b/vsprojects/vcxproj/grpc/grpc.vcxproj.filters
@@ -1,1121 +1,1121 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\init.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\surface\init.c">
       <Filter>src\core\lib\surface</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\channel\channel_args.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\channel\channel_args.c">
       <Filter>src\core\lib\channel</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\channel\channel_stack.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\channel\channel_stack.c">
       <Filter>src\core\lib\channel</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\channel\channel_stack_builder.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\channel\channel_stack_builder.c">
       <Filter>src\core\lib\channel</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\channel\compress_filter.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\channel\compress_filter.c">
       <Filter>src\core\lib\channel</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\channel\connected_channel.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\channel\connected_channel.c">
       <Filter>src\core\lib\channel</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\channel\http_client_filter.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\channel\http_client_filter.c">
       <Filter>src\core\lib\channel</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\channel\http_server_filter.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\channel\http_server_filter.c">
       <Filter>src\core\lib\channel</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\compression\compression.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\compression\compression.c">
       <Filter>src\core\lib\compression</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\compression\message_compress.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\compression\message_compress.c">
       <Filter>src\core\lib\compression</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\debug\trace.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\debug\trace.c">
       <Filter>src\core\lib\debug</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\http\format_request.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\http\format_request.c">
       <Filter>src\core\lib\http</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\http\httpcli.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\http\httpcli.c">
       <Filter>src\core\lib\http</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\http\parser.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\http\parser.c">
       <Filter>src\core\lib\http</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\closure.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\closure.c">
       <Filter>src\core\lib\iomgr</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\endpoint.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\endpoint.c">
       <Filter>src\core\lib\iomgr</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\endpoint_pair_posix.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\endpoint_pair_posix.c">
       <Filter>src\core\lib\iomgr</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\endpoint_pair_windows.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\endpoint_pair_windows.c">
       <Filter>src\core\lib\iomgr</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\error.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\error.c">
       <Filter>src\core\lib\iomgr</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_epoll_linux.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\ev_epoll_linux.c">
       <Filter>src\core\lib\iomgr</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_poll_and_epoll_posix.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\ev_poll_and_epoll_posix.c">
       <Filter>src\core\lib\iomgr</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_poll_posix.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\ev_poll_posix.c">
       <Filter>src\core\lib\iomgr</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_posix.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\ev_posix.c">
       <Filter>src\core\lib\iomgr</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\exec_ctx.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\exec_ctx.c">
       <Filter>src\core\lib\iomgr</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\executor.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\executor.c">
       <Filter>src\core\lib\iomgr</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\iocp_windows.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\iocp_windows.c">
       <Filter>src\core\lib\iomgr</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\iomgr.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\iomgr.c">
       <Filter>src\core\lib\iomgr</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\iomgr_posix.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\iomgr_posix.c">
       <Filter>src\core\lib\iomgr</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\iomgr_windows.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\iomgr_windows.c">
       <Filter>src\core\lib\iomgr</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\load_file.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\load_file.c">
       <Filter>src\core\lib\iomgr</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\network_status_tracker.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\network_status_tracker.c">
       <Filter>src\core\lib\iomgr</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\polling_entity.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\polling_entity.c">
       <Filter>src\core\lib\iomgr</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\pollset_set_windows.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\pollset_set_windows.c">
       <Filter>src\core\lib\iomgr</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\pollset_windows.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\pollset_windows.c">
       <Filter>src\core\lib\iomgr</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\resolve_address_posix.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\resolve_address_posix.c">
       <Filter>src\core\lib\iomgr</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\resolve_address_windows.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\resolve_address_windows.c">
       <Filter>src\core\lib\iomgr</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\sockaddr_utils.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\sockaddr_utils.c">
       <Filter>src\core\lib\iomgr</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\socket_utils_common_posix.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\socket_utils_common_posix.c">
       <Filter>src\core\lib\iomgr</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\socket_utils_linux.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\socket_utils_linux.c">
       <Filter>src\core\lib\iomgr</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\socket_utils_posix.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\socket_utils_posix.c">
       <Filter>src\core\lib\iomgr</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\socket_windows.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\socket_windows.c">
       <Filter>src\core\lib\iomgr</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\tcp_client_posix.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\tcp_client_posix.c">
       <Filter>src\core\lib\iomgr</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\tcp_client_windows.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\tcp_client_windows.c">
       <Filter>src\core\lib\iomgr</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\tcp_posix.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\tcp_posix.c">
       <Filter>src\core\lib\iomgr</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\tcp_server_posix.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\tcp_server_posix.c">
       <Filter>src\core\lib\iomgr</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\tcp_server_windows.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\tcp_server_windows.c">
       <Filter>src\core\lib\iomgr</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\tcp_windows.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\tcp_windows.c">
       <Filter>src\core\lib\iomgr</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\time_averaged_stats.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\time_averaged_stats.c">
       <Filter>src\core\lib\iomgr</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\timer.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\timer.c">
       <Filter>src\core\lib\iomgr</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\timer_heap.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\timer_heap.c">
       <Filter>src\core\lib\iomgr</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\udp_server.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\udp_server.c">
       <Filter>src\core\lib\iomgr</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\unix_sockets_posix.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\unix_sockets_posix.c">
       <Filter>src\core\lib\iomgr</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\unix_sockets_posix_noop.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\unix_sockets_posix_noop.c">
       <Filter>src\core\lib\iomgr</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\wakeup_fd_eventfd.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\wakeup_fd_eventfd.c">
       <Filter>src\core\lib\iomgr</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\wakeup_fd_nospecial.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\wakeup_fd_nospecial.c">
       <Filter>src\core\lib\iomgr</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\wakeup_fd_pipe.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\wakeup_fd_pipe.c">
       <Filter>src\core\lib\iomgr</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\wakeup_fd_posix.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\wakeup_fd_posix.c">
       <Filter>src\core\lib\iomgr</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\workqueue_posix.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\workqueue_posix.c">
       <Filter>src\core\lib\iomgr</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\workqueue_windows.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\workqueue_windows.c">
       <Filter>src\core\lib\iomgr</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\json\json.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\json\json.c">
       <Filter>src\core\lib\json</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\json\json_reader.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\json\json_reader.c">
       <Filter>src\core\lib\json</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\json\json_string.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\json\json_string.c">
       <Filter>src\core\lib\json</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\json\json_writer.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\json\json_writer.c">
       <Filter>src\core\lib\json</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\alarm.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\surface\alarm.c">
       <Filter>src\core\lib\surface</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\api_trace.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\surface\api_trace.c">
       <Filter>src\core\lib\surface</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\byte_buffer.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\surface\byte_buffer.c">
       <Filter>src\core\lib\surface</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\byte_buffer_reader.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\surface\byte_buffer_reader.c">
       <Filter>src\core\lib\surface</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\call.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\surface\call.c">
       <Filter>src\core\lib\surface</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\call_details.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\surface\call_details.c">
       <Filter>src\core\lib\surface</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\call_log_batch.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\surface\call_log_batch.c">
       <Filter>src\core\lib\surface</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\channel.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\surface\channel.c">
       <Filter>src\core\lib\surface</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\channel_init.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\surface\channel_init.c">
       <Filter>src\core\lib\surface</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\channel_ping.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\surface\channel_ping.c">
       <Filter>src\core\lib\surface</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\channel_stack_type.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\surface\channel_stack_type.c">
       <Filter>src\core\lib\surface</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\completion_queue.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\surface\completion_queue.c">
       <Filter>src\core\lib\surface</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\event_string.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\surface\event_string.c">
       <Filter>src\core\lib\surface</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\lame_client.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\surface\lame_client.c">
       <Filter>src\core\lib\surface</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\metadata_array.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\surface\metadata_array.c">
       <Filter>src\core\lib\surface</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\server.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\surface\server.c">
       <Filter>src\core\lib\surface</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\validate_metadata.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\surface\validate_metadata.c">
       <Filter>src\core\lib\surface</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\version.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\surface\version.c">
       <Filter>src\core\lib\surface</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\byte_stream.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\transport\byte_stream.c">
       <Filter>src\core\lib\transport</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\connectivity_state.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\transport\connectivity_state.c">
       <Filter>src\core\lib\transport</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\metadata.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\transport\metadata.c">
       <Filter>src\core\lib\transport</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\metadata_batch.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\transport\metadata_batch.c">
       <Filter>src\core\lib\transport</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\static_metadata.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\transport\static_metadata.c">
       <Filter>src\core\lib\transport</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\transport.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\transport\transport.c">
       <Filter>src\core\lib\transport</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\transport\transport_op_string.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\transport\transport_op_string.c">
       <Filter>src\core\lib\transport</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\server\secure\server_secure_chttp2.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\server\secure\server_secure_chttp2.c">
       <Filter>src\core\ext\transport\chttp2\server\secure</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\bin_decoder.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\bin_decoder.c">
       <Filter>src\core\ext\transport\chttp2\transport</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\bin_encoder.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\bin_encoder.c">
       <Filter>src\core\ext\transport\chttp2\transport</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\chttp2_plugin.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\chttp2_plugin.c">
       <Filter>src\core\ext\transport\chttp2\transport</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\chttp2_transport.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\chttp2_transport.c">
       <Filter>src\core\ext\transport\chttp2\transport</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_data.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\frame_data.c">
       <Filter>src\core\ext\transport\chttp2\transport</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_goaway.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\frame_goaway.c">
       <Filter>src\core\ext\transport\chttp2\transport</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_ping.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\frame_ping.c">
       <Filter>src\core\ext\transport\chttp2\transport</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_rst_stream.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\frame_rst_stream.c">
       <Filter>src\core\ext\transport\chttp2\transport</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_settings.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\frame_settings.c">
       <Filter>src\core\ext\transport\chttp2\transport</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_window_update.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\frame_window_update.c">
       <Filter>src\core\ext\transport\chttp2\transport</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\hpack_encoder.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\hpack_encoder.c">
       <Filter>src\core\ext\transport\chttp2\transport</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\hpack_parser.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\hpack_parser.c">
       <Filter>src\core\ext\transport\chttp2\transport</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\hpack_table.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\hpack_table.c">
       <Filter>src\core\ext\transport\chttp2\transport</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\huffsyms.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\huffsyms.c">
       <Filter>src\core\ext\transport\chttp2\transport</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\incoming_metadata.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\incoming_metadata.c">
       <Filter>src\core\ext\transport\chttp2\transport</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\parsing.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\parsing.c">
       <Filter>src\core\ext\transport\chttp2\transport</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\status_conversion.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\status_conversion.c">
       <Filter>src\core\ext\transport\chttp2\transport</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\stream_lists.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\stream_lists.c">
       <Filter>src\core\ext\transport\chttp2\transport</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\stream_map.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\stream_map.c">
       <Filter>src\core\ext\transport\chttp2\transport</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\timeout_encoding.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\timeout_encoding.c">
       <Filter>src\core\ext\transport\chttp2\transport</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\varint.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\varint.c">
       <Filter>src\core\ext\transport\chttp2\transport</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\writing.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\writing.c">
       <Filter>src\core\ext\transport\chttp2\transport</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\alpn\alpn.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\alpn\alpn.c">
       <Filter>src\core\ext\transport\chttp2\alpn</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\http\httpcli_security_connector.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\http\httpcli_security_connector.c">
       <Filter>src\core\lib\http</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\context\security_context.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\security\context\security_context.c">
       <Filter>src\core\lib\security\context</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\credentials\composite\composite_credentials.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\security\credentials\composite\composite_credentials.c">
       <Filter>src\core\lib\security\credentials\composite</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\credentials\credentials.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\security\credentials\credentials.c">
       <Filter>src\core\lib\security\credentials</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\credentials\credentials_metadata.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\security\credentials\credentials_metadata.c">
       <Filter>src\core\lib\security\credentials</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\credentials\fake\fake_credentials.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\security\credentials\fake\fake_credentials.c">
       <Filter>src\core\lib\security\credentials\fake</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\credentials\google_default\credentials_posix.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\security\credentials\google_default\credentials_posix.c">
       <Filter>src\core\lib\security\credentials\google_default</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\credentials\google_default\credentials_windows.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\security\credentials\google_default\credentials_windows.c">
       <Filter>src\core\lib\security\credentials\google_default</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\credentials\google_default\google_default_credentials.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\security\credentials\google_default\google_default_credentials.c">
       <Filter>src\core\lib\security\credentials\google_default</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\credentials\iam\iam_credentials.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\security\credentials\iam\iam_credentials.c">
       <Filter>src\core\lib\security\credentials\iam</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\credentials\jwt\json_token.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\security\credentials\jwt\json_token.c">
       <Filter>src\core\lib\security\credentials\jwt</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\credentials\jwt\jwt_credentials.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\security\credentials\jwt\jwt_credentials.c">
       <Filter>src\core\lib\security\credentials\jwt</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\credentials\jwt\jwt_verifier.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\security\credentials\jwt\jwt_verifier.c">
       <Filter>src\core\lib\security\credentials\jwt</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\credentials\oauth2\oauth2_credentials.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\security\credentials\oauth2\oauth2_credentials.c">
       <Filter>src\core\lib\security\credentials\oauth2</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\credentials\plugin\plugin_credentials.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\security\credentials\plugin\plugin_credentials.c">
       <Filter>src\core\lib\security\credentials\plugin</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\credentials\ssl\ssl_credentials.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\security\credentials\ssl\ssl_credentials.c">
       <Filter>src\core\lib\security\credentials\ssl</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\transport\client_auth_filter.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\security\transport\client_auth_filter.c">
       <Filter>src\core\lib\security\transport</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\transport\handshake.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\security\transport\handshake.c">
       <Filter>src\core\lib\security\transport</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\transport\secure_endpoint.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\security\transport\secure_endpoint.c">
       <Filter>src\core\lib\security\transport</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\transport\security_connector.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\security\transport\security_connector.c">
       <Filter>src\core\lib\security\transport</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\transport\server_auth_filter.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\security\transport\server_auth_filter.c">
       <Filter>src\core\lib\security\transport</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\transport\tsi_error.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\security\transport\tsi_error.c">
       <Filter>src\core\lib\security\transport</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\util\b64.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\security\util\b64.c">
       <Filter>src\core\lib\security\util</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\util\json_util.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\security\util\json_util.c">
       <Filter>src\core\lib\security\util</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\init_secure.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\surface\init_secure.c">
       <Filter>src\core\lib\surface</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\tsi\fake_transport_security.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\tsi\fake_transport_security.c">
       <Filter>src\core\lib\tsi</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\tsi\ssl_transport_security.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\tsi\ssl_transport_security.c">
       <Filter>src\core\lib\tsi</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\tsi\transport_security.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\lib\tsi\transport_security.c">
       <Filter>src\core\lib\tsi</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\client\secure\secure_channel_create.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\client\secure\secure_channel_create.c">
       <Filter>src\core\ext\transport\chttp2\client\secure</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\channel_connectivity.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\client_config\channel_connectivity.c">
       <Filter>src\core\ext\client_config</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\client_channel.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\client_config\client_channel.c">
       <Filter>src\core\ext\client_config</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\client_channel_factory.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\client_config\client_channel_factory.c">
       <Filter>src\core\ext\client_config</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\client_config.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\client_config\client_config.c">
       <Filter>src\core\ext\client_config</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\client_config_plugin.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\client_config\client_config_plugin.c">
       <Filter>src\core\ext\client_config</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\connector.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\client_config\connector.c">
       <Filter>src\core\ext\client_config</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\default_initial_connect_string.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\client_config\default_initial_connect_string.c">
       <Filter>src\core\ext\client_config</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\initial_connect_string.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\client_config\initial_connect_string.c">
       <Filter>src\core\ext\client_config</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\lb_policy.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\client_config\lb_policy.c">
       <Filter>src\core\ext\client_config</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\lb_policy_factory.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\client_config\lb_policy_factory.c">
       <Filter>src\core\ext\client_config</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\lb_policy_registry.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\client_config\lb_policy_registry.c">
       <Filter>src\core\ext\client_config</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\parse_address.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\client_config\parse_address.c">
       <Filter>src\core\ext\client_config</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\resolver.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\client_config\resolver.c">
       <Filter>src\core\ext\client_config</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\resolver_factory.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\client_config\resolver_factory.c">
       <Filter>src\core\ext\client_config</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\resolver_registry.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\client_config\resolver_registry.c">
       <Filter>src\core\ext\client_config</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\client_config\subchannel.c">
       <Filter>src\core\ext\client_config</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel_call_holder.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\client_config\subchannel_call_holder.c">
       <Filter>src\core\ext\client_config</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel_index.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\client_config\subchannel_index.c">
       <Filter>src\core\ext\client_config</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\uri_parser.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\client_config\uri_parser.c">
       <Filter>src\core\ext\client_config</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\server\insecure\server_chttp2.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\server\insecure\server_chttp2.c">
       <Filter>src\core\ext\transport\chttp2\server\insecure</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\server\insecure\server_chttp2_posix.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\server\insecure\server_chttp2_posix.c">
       <Filter>src\core\ext\transport\chttp2\server\insecure</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\client\insecure\channel_create.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\client\insecure\channel_create.c">
       <Filter>src\core\ext\transport\chttp2\client\insecure</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\client\insecure\channel_create_posix.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\client\insecure\channel_create_posix.c">
       <Filter>src\core\ext\transport\chttp2\client\insecure</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\lb_policy\grpclb\load_balancer_api.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\lb_policy\grpclb\load_balancer_api.c">
       <Filter>src\core\ext\lb_policy\grpclb</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\lb_policy\grpclb\proto\grpc\lb\v1\load_balancer.pb.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\lb_policy\grpclb\proto\grpc\lb\v1\load_balancer.pb.c">
       <Filter>src\core\ext\lb_policy\grpclb\proto\grpc\lb\v1</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\third_party\nanopb\pb_common.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\third_party\nanopb\pb_common.c">
       <Filter>third_party\nanopb</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\third_party\nanopb\pb_decode.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\third_party\nanopb\pb_decode.c">
       <Filter>third_party\nanopb</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\third_party\nanopb\pb_encode.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\third_party\nanopb\pb_encode.c">
       <Filter>third_party\nanopb</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\lb_policy\pick_first\pick_first.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\lb_policy\pick_first\pick_first.c">
       <Filter>src\core\ext\lb_policy\pick_first</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\lb_policy\round_robin\round_robin.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\lb_policy\round_robin\round_robin.c">
       <Filter>src\core\ext\lb_policy\round_robin</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\resolver\dns\native\dns_resolver.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\resolver\dns\native\dns_resolver.c">
       <Filter>src\core\ext\resolver\dns\native</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\resolver\sockaddr\sockaddr_resolver.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\resolver\sockaddr\sockaddr_resolver.c">
       <Filter>src\core\ext\resolver\sockaddr</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\load_reporting\load_reporting.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\load_reporting\load_reporting.c">
       <Filter>src\core\ext\load_reporting</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\load_reporting\load_reporting_filter.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\load_reporting\load_reporting_filter.c">
       <Filter>src\core\ext\load_reporting</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\census\context.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\census\context.c">
       <Filter>src\core\ext\census</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\census\gen\census.pb.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\census\gen\census.pb.c">
       <Filter>src\core\ext\census\gen</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\census\grpc_context.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\census\grpc_context.c">
       <Filter>src\core\ext\census</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\census\grpc_filter.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\census\grpc_filter.c">
       <Filter>src\core\ext\census</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\census\grpc_plugin.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\census\grpc_plugin.c">
       <Filter>src\core\ext\census</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\census\initialize.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\census\initialize.c">
       <Filter>src\core\ext\census</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\census\mlog.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\census\mlog.c">
       <Filter>src\core\ext\census</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\census\operation.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\census\operation.c">
       <Filter>src\core\ext\census</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\census\placeholders.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\census\placeholders.c">
       <Filter>src\core\ext\census</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\census\tracing.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\ext\census\tracing.c">
       <Filter>src\core\ext\census</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\plugin_registry\grpc_plugin_registry.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\core\plugin_registry\grpc_plugin_registry.c">
       <Filter>src\core\plugin_registry</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\byte_buffer.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\byte_buffer.h">
       <Filter>include\grpc</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\byte_buffer_reader.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\byte_buffer_reader.h">
       <Filter>include\grpc</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\compression.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\compression.h">
       <Filter>include\grpc</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\grpc.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\grpc.h">
       <Filter>include\grpc</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\grpc_posix.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\grpc_posix.h">
       <Filter>include\grpc</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\status.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\status.h">
       <Filter>include\grpc</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\byte_buffer.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\byte_buffer.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\byte_buffer_reader.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\byte_buffer_reader.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\compression_types.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\compression_types.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\connectivity_state.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\connectivity_state.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\grpc_types.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\grpc_types.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\propagation_bits.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\propagation_bits.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\status.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\status.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\alloc.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\alloc.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\atm.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_gcc_atomic.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\atm_gcc_atomic.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_gcc_sync.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\atm_gcc_sync.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\atm_windows.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\atm_windows.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\log.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\log.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\port_platform.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\port_platform.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\slice.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\slice.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\slice_buffer.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\slice_buffer.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\sync.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_generic.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\sync_generic.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_posix.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\sync_posix.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\sync_windows.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\sync_windows.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\time.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\impl\codegen\time.h">
       <Filter>include\grpc\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\grpc_security.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\grpc_security.h">
       <Filter>include\grpc</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\grpc_security_constants.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\grpc_security_constants.h">
       <Filter>include\grpc</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc\census.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc\census.h">
       <Filter>include\grpc</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\channel\channel_args.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\channel\channel_args.h">
       <Filter>src\core\lib\channel</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\channel\channel_stack.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\channel\channel_stack.h">
       <Filter>src\core\lib\channel</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\channel\channel_stack_builder.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\channel\channel_stack_builder.h">
       <Filter>src\core\lib\channel</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\channel\compress_filter.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\channel\compress_filter.h">
       <Filter>src\core\lib\channel</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\channel\connected_channel.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\channel\connected_channel.h">
       <Filter>src\core\lib\channel</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\channel\context.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\channel\context.h">
       <Filter>src\core\lib\channel</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\channel\http_client_filter.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\channel\http_client_filter.h">
       <Filter>src\core\lib\channel</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\channel\http_server_filter.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\channel\http_server_filter.h">
       <Filter>src\core\lib\channel</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\compression\algorithm_metadata.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\compression\algorithm_metadata.h">
       <Filter>src\core\lib\compression</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\compression\message_compress.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\compression\message_compress.h">
       <Filter>src\core\lib\compression</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\debug\trace.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\debug\trace.h">
       <Filter>src\core\lib\debug</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\http\format_request.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\http\format_request.h">
       <Filter>src\core\lib\http</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\http\httpcli.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\http\httpcli.h">
       <Filter>src\core\lib\http</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\http\parser.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\http\parser.h">
       <Filter>src\core\lib\http</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\closure.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\closure.h">
       <Filter>src\core\lib\iomgr</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\endpoint.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\endpoint.h">
       <Filter>src\core\lib\iomgr</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\endpoint_pair.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\endpoint_pair.h">
       <Filter>src\core\lib\iomgr</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\error.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\error.h">
       <Filter>src\core\lib\iomgr</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_epoll_linux.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\ev_epoll_linux.h">
       <Filter>src\core\lib\iomgr</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_poll_and_epoll_posix.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\ev_poll_and_epoll_posix.h">
       <Filter>src\core\lib\iomgr</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_poll_posix.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\ev_poll_posix.h">
       <Filter>src\core\lib\iomgr</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\ev_posix.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\ev_posix.h">
       <Filter>src\core\lib\iomgr</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\exec_ctx.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\exec_ctx.h">
       <Filter>src\core\lib\iomgr</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\executor.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\executor.h">
       <Filter>src\core\lib\iomgr</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\iocp_windows.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\iocp_windows.h">
       <Filter>src\core\lib\iomgr</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\iomgr.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\iomgr.h">
       <Filter>src\core\lib\iomgr</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\iomgr_internal.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\iomgr_internal.h">
       <Filter>src\core\lib\iomgr</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\iomgr_posix.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\iomgr_posix.h">
       <Filter>src\core\lib\iomgr</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\load_file.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\load_file.h">
       <Filter>src\core\lib\iomgr</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\network_status_tracker.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\network_status_tracker.h">
       <Filter>src\core\lib\iomgr</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\polling_entity.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\polling_entity.h">
       <Filter>src\core\lib\iomgr</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\pollset.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\pollset.h">
       <Filter>src\core\lib\iomgr</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\pollset_set.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\pollset_set.h">
       <Filter>src\core\lib\iomgr</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\pollset_set_windows.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\pollset_set_windows.h">
       <Filter>src\core\lib\iomgr</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\pollset_windows.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\pollset_windows.h">
       <Filter>src\core\lib\iomgr</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\resolve_address.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\resolve_address.h">
       <Filter>src\core\lib\iomgr</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\sockaddr.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\sockaddr.h">
       <Filter>src\core\lib\iomgr</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\sockaddr_posix.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\sockaddr_posix.h">
       <Filter>src\core\lib\iomgr</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\sockaddr_utils.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\sockaddr_utils.h">
       <Filter>src\core\lib\iomgr</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\sockaddr_windows.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\sockaddr_windows.h">
       <Filter>src\core\lib\iomgr</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\socket_utils_posix.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\socket_utils_posix.h">
       <Filter>src\core\lib\iomgr</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\socket_windows.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\socket_windows.h">
       <Filter>src\core\lib\iomgr</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\tcp_client.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\tcp_client.h">
       <Filter>src\core\lib\iomgr</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\tcp_posix.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\tcp_posix.h">
       <Filter>src\core\lib\iomgr</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\tcp_server.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\tcp_server.h">
       <Filter>src\core\lib\iomgr</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\tcp_windows.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\tcp_windows.h">
       <Filter>src\core\lib\iomgr</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\time_averaged_stats.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\time_averaged_stats.h">
       <Filter>src\core\lib\iomgr</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\timer.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\timer.h">
       <Filter>src\core\lib\iomgr</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\timer_heap.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\timer_heap.h">
       <Filter>src\core\lib\iomgr</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\udp_server.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\udp_server.h">
       <Filter>src\core\lib\iomgr</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\unix_sockets_posix.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\unix_sockets_posix.h">
       <Filter>src\core\lib\iomgr</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\wakeup_fd_pipe.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\wakeup_fd_pipe.h">
       <Filter>src\core\lib\iomgr</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\wakeup_fd_posix.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\wakeup_fd_posix.h">
       <Filter>src\core\lib\iomgr</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\workqueue.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\workqueue.h">
       <Filter>src\core\lib\iomgr</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\workqueue_posix.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\workqueue_posix.h">
       <Filter>src\core\lib\iomgr</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\workqueue_windows.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\iomgr\workqueue_windows.h">
       <Filter>src\core\lib\iomgr</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\json\json.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\json\json.h">
       <Filter>src\core\lib\json</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\json\json_common.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\json\json_common.h">
       <Filter>src\core\lib\json</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\json\json_reader.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\json\json_reader.h">
       <Filter>src\core\lib\json</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\json\json_writer.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\json\json_writer.h">
       <Filter>src\core\lib\json</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\surface\api_trace.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\surface\api_trace.h">
       <Filter>src\core\lib\surface</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\surface\call.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\surface\call.h">
       <Filter>src\core\lib\surface</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\surface\call_test_only.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\surface\call_test_only.h">
       <Filter>src\core\lib\surface</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\surface\channel.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\surface\channel.h">
       <Filter>src\core\lib\surface</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\surface\channel_init.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\surface\channel_init.h">
       <Filter>src\core\lib\surface</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\surface\channel_stack_type.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\surface\channel_stack_type.h">
       <Filter>src\core\lib\surface</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\surface\completion_queue.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\surface\completion_queue.h">
       <Filter>src\core\lib\surface</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\surface\event_string.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\surface\event_string.h">
       <Filter>src\core\lib\surface</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\surface\init.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\surface\init.h">
       <Filter>src\core\lib\surface</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\surface\lame_client.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\surface\lame_client.h">
       <Filter>src\core\lib\surface</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\surface\server.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\surface\server.h">
       <Filter>src\core\lib\surface</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\byte_stream.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\transport\byte_stream.h">
       <Filter>src\core\lib\transport</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\connectivity_state.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\transport\connectivity_state.h">
       <Filter>src\core\lib\transport</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\metadata.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\transport\metadata.h">
       <Filter>src\core\lib\transport</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\metadata_batch.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\transport\metadata_batch.h">
       <Filter>src\core\lib\transport</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\static_metadata.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\transport\static_metadata.h">
       <Filter>src\core\lib\transport</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\transport.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\transport\transport.h">
       <Filter>src\core\lib\transport</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\transport\transport_impl.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\transport\transport_impl.h">
       <Filter>src\core\lib\transport</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\bin_decoder.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\bin_decoder.h">
       <Filter>src\core\ext\transport\chttp2\transport</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\bin_encoder.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\bin_encoder.h">
       <Filter>src\core\ext\transport\chttp2\transport</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\chttp2_transport.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\chttp2_transport.h">
       <Filter>src\core\ext\transport\chttp2\transport</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\frame.h">
       <Filter>src\core\ext\transport\chttp2\transport</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_data.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\frame_data.h">
       <Filter>src\core\ext\transport\chttp2\transport</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_goaway.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\frame_goaway.h">
       <Filter>src\core\ext\transport\chttp2\transport</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_ping.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\frame_ping.h">
       <Filter>src\core\ext\transport\chttp2\transport</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_rst_stream.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\frame_rst_stream.h">
       <Filter>src\core\ext\transport\chttp2\transport</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_settings.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\frame_settings.h">
       <Filter>src\core\ext\transport\chttp2\transport</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\frame_window_update.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\frame_window_update.h">
       <Filter>src\core\ext\transport\chttp2\transport</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\hpack_encoder.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\hpack_encoder.h">
       <Filter>src\core\ext\transport\chttp2\transport</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\hpack_parser.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\hpack_parser.h">
       <Filter>src\core\ext\transport\chttp2\transport</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\hpack_table.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\hpack_table.h">
       <Filter>src\core\ext\transport\chttp2\transport</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\http2_errors.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\http2_errors.h">
       <Filter>src\core\ext\transport\chttp2\transport</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\huffsyms.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\huffsyms.h">
       <Filter>src\core\ext\transport\chttp2\transport</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\incoming_metadata.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\incoming_metadata.h">
       <Filter>src\core\ext\transport\chttp2\transport</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\internal.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\internal.h">
       <Filter>src\core\ext\transport\chttp2\transport</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\status_conversion.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\status_conversion.h">
       <Filter>src\core\ext\transport\chttp2\transport</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\stream_map.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\stream_map.h">
       <Filter>src\core\ext\transport\chttp2\transport</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\timeout_encoding.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\timeout_encoding.h">
       <Filter>src\core\ext\transport\chttp2\transport</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\varint.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\transport\varint.h">
       <Filter>src\core\ext\transport\chttp2\transport</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\alpn\alpn.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\ext\transport\chttp2\alpn\alpn.h">
       <Filter>src\core\ext\transport\chttp2\alpn</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\security\context\security_context.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\security\context\security_context.h">
       <Filter>src\core\lib\security\context</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\security\credentials\composite\composite_credentials.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\security\credentials\composite\composite_credentials.h">
       <Filter>src\core\lib\security\credentials\composite</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\security\credentials\credentials.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\security\credentials\credentials.h">
       <Filter>src\core\lib\security\credentials</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\security\credentials\fake\fake_credentials.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\security\credentials\fake\fake_credentials.h">
       <Filter>src\core\lib\security\credentials\fake</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\security\credentials\google_default\google_default_credentials.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\security\credentials\google_default\google_default_credentials.h">
       <Filter>src\core\lib\security\credentials\google_default</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\security\credentials\iam\iam_credentials.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\security\credentials\iam\iam_credentials.h">
       <Filter>src\core\lib\security\credentials\iam</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\security\credentials\jwt\json_token.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\security\credentials\jwt\json_token.h">
       <Filter>src\core\lib\security\credentials\jwt</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\security\credentials\jwt\jwt_credentials.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\security\credentials\jwt\jwt_credentials.h">
       <Filter>src\core\lib\security\credentials\jwt</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\security\credentials\jwt\jwt_verifier.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\security\credentials\jwt\jwt_verifier.h">
       <Filter>src\core\lib\security\credentials\jwt</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\security\credentials\oauth2\oauth2_credentials.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\security\credentials\oauth2\oauth2_credentials.h">
       <Filter>src\core\lib\security\credentials\oauth2</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\security\credentials\plugin\plugin_credentials.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\security\credentials\plugin\plugin_credentials.h">
       <Filter>src\core\lib\security\credentials\plugin</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\security\credentials\ssl\ssl_credentials.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\security\credentials\ssl\ssl_credentials.h">
       <Filter>src\core\lib\security\credentials\ssl</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\security\transport\auth_filters.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\security\transport\auth_filters.h">
       <Filter>src\core\lib\security\transport</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\security\transport\handshake.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\security\transport\handshake.h">
       <Filter>src\core\lib\security\transport</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\security\transport\secure_endpoint.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\security\transport\secure_endpoint.h">
       <Filter>src\core\lib\security\transport</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\security\transport\security_connector.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\security\transport\security_connector.h">
       <Filter>src\core\lib\security\transport</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\security\transport\tsi_error.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\security\transport\tsi_error.h">
       <Filter>src\core\lib\security\transport</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\security\util\b64.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\security\util\b64.h">
       <Filter>src\core\lib\security\util</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\security\util\json_util.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\security\util\json_util.h">
       <Filter>src\core\lib\security\util</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\tsi\fake_transport_security.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\tsi\fake_transport_security.h">
       <Filter>src\core\lib\tsi</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\tsi\ssl_transport_security.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\tsi\ssl_transport_security.h">
       <Filter>src\core\lib\tsi</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\tsi\ssl_types.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\tsi\ssl_types.h">
       <Filter>src\core\lib\tsi</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\tsi\transport_security.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\tsi\transport_security.h">
       <Filter>src\core\lib\tsi</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\tsi\transport_security_interface.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\lib\tsi\transport_security_interface.h">
       <Filter>src\core\lib\tsi</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\client_channel.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\ext\client_config\client_channel.h">
       <Filter>src\core\ext\client_config</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\client_channel_factory.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\ext\client_config\client_channel_factory.h">
       <Filter>src\core\ext\client_config</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\client_config.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\ext\client_config\client_config.h">
       <Filter>src\core\ext\client_config</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\connector.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\ext\client_config\connector.h">
       <Filter>src\core\ext\client_config</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\initial_connect_string.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\ext\client_config\initial_connect_string.h">
       <Filter>src\core\ext\client_config</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\lb_policy.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\ext\client_config\lb_policy.h">
       <Filter>src\core\ext\client_config</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\lb_policy_factory.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\ext\client_config\lb_policy_factory.h">
       <Filter>src\core\ext\client_config</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\lb_policy_registry.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\ext\client_config\lb_policy_registry.h">
       <Filter>src\core\ext\client_config</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\parse_address.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\ext\client_config\parse_address.h">
       <Filter>src\core\ext\client_config</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\resolver.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\ext\client_config\resolver.h">
       <Filter>src\core\ext\client_config</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\resolver_factory.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\ext\client_config\resolver_factory.h">
       <Filter>src\core\ext\client_config</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\resolver_registry.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\ext\client_config\resolver_registry.h">
       <Filter>src\core\ext\client_config</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\ext\client_config\subchannel.h">
       <Filter>src\core\ext\client_config</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel_call_holder.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\ext\client_config\subchannel_call_holder.h">
       <Filter>src\core\ext\client_config</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel_index.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\ext\client_config\subchannel_index.h">
       <Filter>src\core\ext\client_config</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\uri_parser.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\ext\client_config\uri_parser.h">
       <Filter>src\core\ext\client_config</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\lb_policy\grpclb\load_balancer_api.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\ext\lb_policy\grpclb\load_balancer_api.h">
       <Filter>src\core\ext\lb_policy\grpclb</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\lb_policy\grpclb\proto\grpc\lb\v1\load_balancer.pb.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\ext\lb_policy\grpclb\proto\grpc\lb\v1\load_balancer.pb.h">
       <Filter>src\core\ext\lb_policy\grpclb\proto\grpc\lb\v1</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\third_party\nanopb\pb.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\third_party\nanopb\pb.h">
       <Filter>third_party\nanopb</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\third_party\nanopb\pb_common.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\third_party\nanopb\pb_common.h">
       <Filter>third_party\nanopb</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\third_party\nanopb\pb_decode.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\third_party\nanopb\pb_decode.h">
       <Filter>third_party\nanopb</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\third_party\nanopb\pb_encode.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\third_party\nanopb\pb_encode.h">
       <Filter>third_party\nanopb</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\load_reporting\load_reporting.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\ext\load_reporting\load_reporting.h">
       <Filter>src\core\ext\load_reporting</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\load_reporting\load_reporting_filter.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\ext\load_reporting\load_reporting_filter.h">
       <Filter>src\core\ext\load_reporting</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\census\aggregation.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\ext\census\aggregation.h">
       <Filter>src\core\ext\census</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\census\census_interface.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\ext\census\census_interface.h">
       <Filter>src\core\ext\census</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\census\census_rpc_stats.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\ext\census\census_rpc_stats.h">
       <Filter>src\core\ext\census</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\census\gen\census.pb.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\ext\census\gen\census.pb.h">
       <Filter>src\core\ext\census\gen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\census\grpc_filter.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\ext\census\grpc_filter.h">
       <Filter>src\core\ext\census</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\census\mlog.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\ext\census\mlog.h">
       <Filter>src\core\ext\census</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\census\rpc_metric_id.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\core\ext\census\rpc_metric_id.h">
       <Filter>src\core\ext\census</Filter>
     </ClInclude>
   </ItemGroup>
@@ -1299,5 +1299,8 @@
       <UniqueIdentifier>{93d6596d-330c-1d27-6f84-3c840e57869e}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
 </Project>
 
diff --git a/vsprojects/vcxproj/grpc_cpp_plugin/grpc_cpp_plugin.vcxproj b/vsprojects/vcxproj/grpc_cpp_plugin/grpc_cpp_plugin.vcxproj
index a521414..5415b24
--- a/vsprojects/vcxproj/grpc_cpp_plugin/grpc_cpp_plugin.vcxproj
+++ b/vsprojects/vcxproj/grpc_cpp_plugin/grpc_cpp_plugin.vcxproj
@@ -21,7 +21,6 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{7E51A25F-AC59-488F-906C-C60FAAE706AA}</ProjectGuid>
     <IgnoreWarnIntDirInTempDetected>true</IgnoreWarnIntDirInTempDetected>
-    <IntDir>$(SolutionDir)IntDir\$(MSBuildProjectName)\</IntDir>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(VisualStudioVersion)' == '10.0'" Label="Configuration">
@@ -44,7 +43,6 @@
   <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -52,17 +50,11 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(SolutionDir)\..\vsprojects\global.props" />
-    <Import Project="$(SolutionDir)\..\vsprojects\protobuf.props" />
-    <Import Project="$(SolutionDir)\..\vsprojects\protoc.props" />
+    <Import Project="$(ProjectDir)\..\..\..\vsprojects\global.props" />
+    <Import Project="$(ProjectDir)\..\..\..\vsprojects\protobuf.props" />
+    <Import Project="$(ProjectDir)\..\..\..\vsprojects\protoc.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
-    <TargetName>grpc_cpp_plugin</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Release'">
-    <TargetName>grpc_cpp_plugin</TargetName>
-  </PropertyGroup>
     <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
@@ -70,7 +62,6 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <TreatWarningAsError>true</TreatWarningAsError>
       <DebugInformationFormat Condition="$(Jenkins)">None</DebugInformationFormat>
       <MinimalRebuild Condition="$(Jenkins)">false</MinimalRebuild>
@@ -89,7 +80,6 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <TreatWarningAsError>true</TreatWarningAsError>
       <DebugInformationFormat Condition="$(Jenkins)">None</DebugInformationFormat>
       <MinimalRebuild Condition="$(Jenkins)">false</MinimalRebuild>
@@ -110,7 +100,6 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <TreatWarningAsError>true</TreatWarningAsError>
       <DebugInformationFormat Condition="$(Jenkins)">None</DebugInformationFormat>
       <MinimalRebuild Condition="$(Jenkins)">false</MinimalRebuild>
@@ -133,7 +122,6 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <TreatWarningAsError>true</TreatWarningAsError>
       <DebugInformationFormat Condition="$(Jenkins)">None</DebugInformationFormat>
       <MinimalRebuild Condition="$(Jenkins)">false</MinimalRebuild>
@@ -148,13 +136,16 @@
   </ItemDefinitionGroup>
 
   <ItemGroup>
-    <ClCompile Include="$(SolutionDir)\..\src\compiler\cpp_plugin.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\compiler\cpp_plugin.cc">
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SolutionDir)\..\vsprojects\vcxproj\.\grpc_plugin_support\grpc_plugin_support.vcxproj">
+    <ProjectReference Include="$(ProjectDir)\..\..\..\vsprojects\vcxproj\.\grpc_plugin_support\grpc_plugin_support.vcxproj">
       <Project>{B6E81D84-2ACB-41B8-8781-493A944C7817}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\third_party\protobuf\vsprojects\libprotoc.vcxproj">
+      <Project>{2b4f3bb4-adde-4cb7-b832-c964de4e0087}</Project>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/vsprojects/vcxproj/grpc_cpp_plugin/grpc_cpp_plugin.vcxproj.filters b/vsprojects/vcxproj/grpc_cpp_plugin/grpc_cpp_plugin.vcxproj.filters
index 421c308..bfa41be
--- a/vsprojects/vcxproj/grpc_cpp_plugin/grpc_cpp_plugin.vcxproj.filters
+++ b/vsprojects/vcxproj/grpc_cpp_plugin/grpc_cpp_plugin.vcxproj.filters
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="$(SolutionDir)\..\src\compiler\cpp_plugin.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\compiler\cpp_plugin.cc">
       <Filter>src\compiler</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/vsprojects/vcxproj/grpc_plugin_support/grpc_plugin_support.vcxproj b/vsprojects/vcxproj/grpc_plugin_support/grpc_plugin_support.vcxproj
index 9828b8b..bc4716b
--- a/vsprojects/vcxproj/grpc_plugin_support/grpc_plugin_support.vcxproj
+++ b/vsprojects/vcxproj/grpc_plugin_support/grpc_plugin_support.vcxproj
@@ -21,7 +21,6 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{B6E81D84-2ACB-41B8-8781-493A944C7817}</ProjectGuid>
     <IgnoreWarnIntDirInTempDetected>true</IgnoreWarnIntDirInTempDetected>
-    <IntDir>$(SolutionDir)IntDir\$(MSBuildProjectName)\</IntDir>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(VisualStudioVersion)' == '10.0'" Label="Configuration">
@@ -44,7 +43,6 @@
   <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -52,17 +50,11 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(SolutionDir)\..\vsprojects\global.props" />
-    <Import Project="$(SolutionDir)\..\vsprojects\protoc.props" />
-    <Import Project="$(SolutionDir)\..\vsprojects\winsock.props" />
+    <Import Project="$(ProjectDir)\..\..\..\vsprojects\global.props" />
+    <Import Project="$(ProjectDir)\..\..\..\vsprojects\protoc.props" />
+    <Import Project="$(ProjectDir)\..\..\..\vsprojects\winsock.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
-    <TargetName>grpc_plugin_support</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Release'">
-    <TargetName>grpc_plugin_support</TargetName>
-  </PropertyGroup>
     <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
@@ -70,7 +62,6 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <TreatWarningAsError>true</TreatWarningAsError>
       <DebugInformationFormat Condition="$(Jenkins)">None</DebugInformationFormat>
       <MinimalRebuild Condition="$(Jenkins)">false</MinimalRebuild>
@@ -89,7 +80,6 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <TreatWarningAsError>true</TreatWarningAsError>
       <DebugInformationFormat Condition="$(Jenkins)">None</DebugInformationFormat>
       <MinimalRebuild Condition="$(Jenkins)">false</MinimalRebuild>
@@ -110,7 +100,6 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <TreatWarningAsError>true</TreatWarningAsError>
       <DebugInformationFormat Condition="$(Jenkins)">None</DebugInformationFormat>
       <MinimalRebuild Condition="$(Jenkins)">false</MinimalRebuild>
@@ -133,7 +122,6 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <TreatWarningAsError>true</TreatWarningAsError>
       <DebugInformationFormat Condition="$(Jenkins)">None</DebugInformationFormat>
       <MinimalRebuild Condition="$(Jenkins)">false</MinimalRebuild>
@@ -148,37 +136,37 @@
   </ItemDefinitionGroup>
 
   <ItemGroup>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\config_protobuf.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\config_protobuf.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="$(SolutionDir)\..\src\compiler\config.h" />
-    <ClInclude Include="$(SolutionDir)\..\src\compiler\cpp_generator.h" />
-    <ClInclude Include="$(SolutionDir)\..\src\compiler\cpp_generator_helpers.h" />
-    <ClInclude Include="$(SolutionDir)\..\src\compiler\csharp_generator.h" />
-    <ClInclude Include="$(SolutionDir)\..\src\compiler\csharp_generator_helpers.h" />
-    <ClInclude Include="$(SolutionDir)\..\src\compiler\generator_helpers.h" />
-    <ClInclude Include="$(SolutionDir)\..\src\compiler\node_generator.h" />
-    <ClInclude Include="$(SolutionDir)\..\src\compiler\node_generator_helpers.h" />
-    <ClInclude Include="$(SolutionDir)\..\src\compiler\objective_c_generator.h" />
-    <ClInclude Include="$(SolutionDir)\..\src\compiler\objective_c_generator_helpers.h" />
-    <ClInclude Include="$(SolutionDir)\..\src\compiler\python_generator.h" />
-    <ClInclude Include="$(SolutionDir)\..\src\compiler\ruby_generator.h" />
-    <ClInclude Include="$(SolutionDir)\..\src\compiler\ruby_generator_helpers-inl.h" />
-    <ClInclude Include="$(SolutionDir)\..\src\compiler\ruby_generator_map-inl.h" />
-    <ClInclude Include="$(SolutionDir)\..\src\compiler\ruby_generator_string-inl.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\compiler\config.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\compiler\cpp_generator.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\compiler\cpp_generator_helpers.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\compiler\csharp_generator.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\compiler\csharp_generator_helpers.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\compiler\generator_helpers.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\compiler\node_generator.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\compiler\node_generator_helpers.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\compiler\objective_c_generator.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\compiler\objective_c_generator_helpers.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\compiler\python_generator.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\compiler\ruby_generator.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\compiler\ruby_generator_helpers-inl.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\compiler\ruby_generator_map-inl.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\compiler\ruby_generator_string-inl.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="$(SolutionDir)\..\src\compiler\cpp_generator.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\compiler\cpp_generator.cc">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\compiler\csharp_generator.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\compiler\csharp_generator.cc">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\compiler\node_generator.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\compiler\node_generator.cc">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\compiler\objective_c_generator.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\compiler\objective_c_generator.cc">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\compiler\python_generator.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\compiler\python_generator.cc">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\compiler\ruby_generator.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\compiler\ruby_generator.cc">
     </ClCompile>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/vsprojects/vcxproj/grpc_plugin_support/grpc_plugin_support.vcxproj.filters b/vsprojects/vcxproj/grpc_plugin_support/grpc_plugin_support.vcxproj.filters
index 27eb935..207944a
--- a/vsprojects/vcxproj/grpc_plugin_support/grpc_plugin_support.vcxproj.filters
+++ b/vsprojects/vcxproj/grpc_plugin_support/grpc_plugin_support.vcxproj.filters
@@ -1,74 +1,74 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="$(SolutionDir)\..\src\compiler\cpp_generator.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\compiler\cpp_generator.cc">
       <Filter>src\compiler</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\compiler\csharp_generator.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\compiler\csharp_generator.cc">
       <Filter>src\compiler</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\compiler\node_generator.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\compiler\node_generator.cc">
       <Filter>src\compiler</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\compiler\objective_c_generator.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\compiler\objective_c_generator.cc">
       <Filter>src\compiler</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\compiler\python_generator.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\compiler\python_generator.cc">
       <Filter>src\compiler</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\compiler\ruby_generator.cc">
+    <ClCompile Include="$(ProjectDir)\..\..\..\src\compiler\ruby_generator.cc">
       <Filter>src\compiler</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\config_protobuf.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\include\grpc++\impl\codegen\config_protobuf.h">
       <Filter>include\grpc++\impl\codegen</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="$(SolutionDir)\..\src\compiler\config.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\compiler\config.h">
       <Filter>src\compiler</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\compiler\cpp_generator.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\compiler\cpp_generator.h">
       <Filter>src\compiler</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\compiler\cpp_generator_helpers.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\compiler\cpp_generator_helpers.h">
       <Filter>src\compiler</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\compiler\csharp_generator.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\compiler\csharp_generator.h">
       <Filter>src\compiler</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\compiler\csharp_generator_helpers.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\compiler\csharp_generator_helpers.h">
       <Filter>src\compiler</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\compiler\generator_helpers.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\compiler\generator_helpers.h">
       <Filter>src\compiler</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\compiler\node_generator.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\compiler\node_generator.h">
       <Filter>src\compiler</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\compiler\node_generator_helpers.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\compiler\node_generator_helpers.h">
       <Filter>src\compiler</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\compiler\objective_c_generator.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\compiler\objective_c_generator.h">
       <Filter>src\compiler</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\compiler\objective_c_generator_helpers.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\compiler\objective_c_generator_helpers.h">
       <Filter>src\compiler</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\compiler\python_generator.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\compiler\python_generator.h">
       <Filter>src\compiler</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\compiler\ruby_generator.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\compiler\ruby_generator.h">
       <Filter>src\compiler</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\compiler\ruby_generator_helpers-inl.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\compiler\ruby_generator_helpers-inl.h">
       <Filter>src\compiler</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\compiler\ruby_generator_map-inl.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\compiler\ruby_generator_map-inl.h">
       <Filter>src\compiler</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\compiler\ruby_generator_string-inl.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\src\compiler\ruby_generator_string-inl.h">
       <Filter>src\compiler</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/vsprojects/vcxproj/z/z.vcxproj b/vsprojects/vcxproj/z/z.vcxproj
index 4505dfa..92b378d
--- a/vsprojects/vcxproj/z/z.vcxproj
+++ b/vsprojects/vcxproj/z/z.vcxproj
@@ -21,7 +21,6 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{FBADE9E3-6A3F-36D3-D676-C1B808451DD7}</ProjectGuid>
     <IgnoreWarnIntDirInTempDetected>true</IgnoreWarnIntDirInTempDetected>
-    <IntDir>$(SolutionDir)IntDir\$(MSBuildProjectName)\</IntDir>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(VisualStudioVersion)' == '10.0'" Label="Configuration">
@@ -44,7 +43,6 @@
   <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -52,16 +50,10 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(SolutionDir)\..\vsprojects\global.props" />
-    <Import Project="$(SolutionDir)\..\vsprojects\winsock.props" />
+    <Import Project="$(ProjectDir)\..\..\..\vsprojects\global.props" />
+    <Import Project="$(ProjectDir)\..\..\..\vsprojects\winsock.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
-    <TargetName>z</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Release'">
-    <TargetName>z</TargetName>
-  </PropertyGroup>
     <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
@@ -69,7 +61,6 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <TreatWarningAsError>true</TreatWarningAsError>
       <DebugInformationFormat Condition="$(Jenkins)">None</DebugInformationFormat>
       <MinimalRebuild Condition="$(Jenkins)">false</MinimalRebuild>
@@ -88,7 +79,6 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <TreatWarningAsError>true</TreatWarningAsError>
       <DebugInformationFormat Condition="$(Jenkins)">None</DebugInformationFormat>
       <MinimalRebuild Condition="$(Jenkins)">false</MinimalRebuild>
@@ -109,7 +99,6 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <TreatWarningAsError>true</TreatWarningAsError>
       <DebugInformationFormat Condition="$(Jenkins)">None</DebugInformationFormat>
       <MinimalRebuild Condition="$(Jenkins)">false</MinimalRebuild>
@@ -132,7 +121,6 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <TreatWarningAsError>true</TreatWarningAsError>
       <DebugInformationFormat Condition="$(Jenkins)">None</DebugInformationFormat>
       <MinimalRebuild Condition="$(Jenkins)">false</MinimalRebuild>
@@ -147,48 +135,48 @@
   </ItemDefinitionGroup>
 
   <ItemGroup>
-    <ClInclude Include="$(SolutionDir)\..\third_party\zlib\crc32.h" />
-    <ClInclude Include="$(SolutionDir)\..\third_party\zlib\deflate.h" />
-    <ClInclude Include="$(SolutionDir)\..\third_party\zlib\gzguts.h" />
-    <ClInclude Include="$(SolutionDir)\..\third_party\zlib\inffast.h" />
-    <ClInclude Include="$(SolutionDir)\..\third_party\zlib\inffixed.h" />
-    <ClInclude Include="$(SolutionDir)\..\third_party\zlib\inflate.h" />
-    <ClInclude Include="$(SolutionDir)\..\third_party\zlib\inftrees.h" />
-    <ClInclude Include="$(SolutionDir)\..\third_party\zlib\trees.h" />
-    <ClInclude Include="$(SolutionDir)\..\third_party\zlib\zconf.h" />
-    <ClInclude Include="$(SolutionDir)\..\third_party\zlib\zlib.h" />
-    <ClInclude Include="$(SolutionDir)\..\third_party\zlib\zutil.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\third_party\zlib\crc32.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\third_party\zlib\deflate.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\third_party\zlib\gzguts.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\third_party\zlib\inffast.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\third_party\zlib\inffixed.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\third_party\zlib\inflate.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\third_party\zlib\inftrees.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\third_party\zlib\trees.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\third_party\zlib\zconf.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\third_party\zlib\zlib.h" />
+    <ClInclude Include="$(ProjectDir)\..\..\..\third_party\zlib\zutil.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="$(SolutionDir)\..\third_party\zlib\adler32.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\third_party\zlib\adler32.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\third_party\zlib\compress.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\third_party\zlib\compress.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\third_party\zlib\crc32.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\third_party\zlib\crc32.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\third_party\zlib\deflate.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\third_party\zlib\deflate.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\third_party\zlib\gzclose.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\third_party\zlib\gzclose.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\third_party\zlib\gzlib.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\third_party\zlib\gzlib.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\third_party\zlib\gzread.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\third_party\zlib\gzread.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\third_party\zlib\gzwrite.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\third_party\zlib\gzwrite.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\third_party\zlib\infback.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\third_party\zlib\infback.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\third_party\zlib\inffast.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\third_party\zlib\inffast.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\third_party\zlib\inflate.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\third_party\zlib\inflate.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\third_party\zlib\inftrees.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\third_party\zlib\inftrees.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\third_party\zlib\trees.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\third_party\zlib\trees.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\third_party\zlib\uncompr.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\third_party\zlib\uncompr.c">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\third_party\zlib\zutil.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\third_party\zlib\zutil.c">
     </ClCompile>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/vsprojects/vcxproj/z/z.vcxproj.filters b/vsprojects/vcxproj/z/z.vcxproj.filters
index 4aea144..9d1cff6
--- a/vsprojects/vcxproj/z/z.vcxproj.filters
+++ b/vsprojects/vcxproj/z/z.vcxproj.filters
@@ -1,84 +1,84 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="$(SolutionDir)\..\third_party\zlib\adler32.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\third_party\zlib\adler32.c">
       <Filter>third_party\zlib</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\third_party\zlib\compress.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\third_party\zlib\compress.c">
       <Filter>third_party\zlib</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\third_party\zlib\crc32.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\third_party\zlib\crc32.c">
       <Filter>third_party\zlib</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\third_party\zlib\deflate.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\third_party\zlib\deflate.c">
       <Filter>third_party\zlib</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\third_party\zlib\gzclose.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\third_party\zlib\gzclose.c">
       <Filter>third_party\zlib</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\third_party\zlib\gzlib.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\third_party\zlib\gzlib.c">
       <Filter>third_party\zlib</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\third_party\zlib\gzread.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\third_party\zlib\gzread.c">
       <Filter>third_party\zlib</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\third_party\zlib\gzwrite.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\third_party\zlib\gzwrite.c">
       <Filter>third_party\zlib</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\third_party\zlib\infback.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\third_party\zlib\infback.c">
       <Filter>third_party\zlib</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\third_party\zlib\inffast.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\third_party\zlib\inffast.c">
       <Filter>third_party\zlib</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\third_party\zlib\inflate.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\third_party\zlib\inflate.c">
       <Filter>third_party\zlib</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\third_party\zlib\inftrees.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\third_party\zlib\inftrees.c">
       <Filter>third_party\zlib</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\third_party\zlib\trees.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\third_party\zlib\trees.c">
       <Filter>third_party\zlib</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\third_party\zlib\uncompr.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\third_party\zlib\uncompr.c">
       <Filter>third_party\zlib</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\third_party\zlib\zutil.c">
+    <ClCompile Include="$(ProjectDir)\..\..\..\third_party\zlib\zutil.c">
       <Filter>third_party\zlib</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="$(SolutionDir)\..\third_party\zlib\crc32.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\third_party\zlib\crc32.h">
       <Filter>third_party\zlib</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\third_party\zlib\deflate.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\third_party\zlib\deflate.h">
       <Filter>third_party\zlib</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\third_party\zlib\gzguts.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\third_party\zlib\gzguts.h">
       <Filter>third_party\zlib</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\third_party\zlib\inffast.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\third_party\zlib\inffast.h">
       <Filter>third_party\zlib</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\third_party\zlib\inffixed.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\third_party\zlib\inffixed.h">
       <Filter>third_party\zlib</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\third_party\zlib\inflate.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\third_party\zlib\inflate.h">
       <Filter>third_party\zlib</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\third_party\zlib\inftrees.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\third_party\zlib\inftrees.h">
       <Filter>third_party\zlib</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\third_party\zlib\trees.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\third_party\zlib\trees.h">
       <Filter>third_party\zlib</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\third_party\zlib\zconf.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\third_party\zlib\zconf.h">
       <Filter>third_party\zlib</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\third_party\zlib\zlib.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\third_party\zlib\zlib.h">
       <Filter>third_party\zlib</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\third_party\zlib\zutil.h">
+    <ClInclude Include="$(ProjectDir)\..\..\..\third_party\zlib\zutil.h">
       <Filter>third_party\zlib</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/vsprojects/zlib.props b/vsprojects/zlib.props
index b64bb21..77f095e
--- a/vsprojects/zlib.props
+++ b/vsprojects/zlib.props
@@ -6,7 +6,7 @@
   <ItemDefinitionGroup>
     <Link>
       <AdditionalDependencies>zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)\packages\grpc.dependencies.zlib.1.2.8.10\build\native\lib\$(PlatformToolset)\$(Platform)\$(Configuration)\static\cdecl;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(ProjectDir)\..\..\..\..\..\packages\grpc.dependencies.zlib.1.2.8.10\build\native\lib\$(PlatformToolset)\$(Platform)\$(Configuration)\static\cdecl;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup />