diff --git a/bin/objc-language-services-VS2017.vsix b/bin/objc-language-services-VS2017.vsix
new file mode 100644
index 0000000000..c72f8461c9
--- /dev/null
+++ b/bin/objc-language-services-VS2017.vsix
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fc42b91ea9612bacd37d5fc06a40afc585e87c24be60669ed61020ed3423d690
+size 270368
diff --git a/bin/objc-syntax-highlighting.vsix b/bin/objc-syntax-highlighting.vsix
index 6a61d86882..00160bdea8 100644
--- a/bin/objc-syntax-highlighting.vsix
+++ b/bin/objc-syntax-highlighting.vsix
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9cfccbdff583413afb36ec473050c1c67dd88c7079ace11efd398cf543fe09d5
-size 274747
+oid sha256:5a4aaa0c57327f9bee210d345be195184ba1ff9446d9240ec00e6678a4d963bc
+size 276447
diff --git a/msvc/language/BuildMonitor/BuildMonitor.csproj b/msvc/language/BuildMonitor/BuildMonitor.csproj
index 2dbcc41ca4..973e0c8d1f 100644
--- a/msvc/language/BuildMonitor/BuildMonitor.csproj
+++ b/msvc/language/BuildMonitor/BuildMonitor.csproj
@@ -2,12 +2,17 @@
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\packages\Microsoft.VSSDK.BuildTools.14.1.24720\build\Microsoft.VSSDK.BuildTools.props" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.14.1.24720\build\Microsoft.VSSDK.BuildTools.props')" />
   <PropertyGroup>
-    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+    <MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
     <UseCodebase>true</UseCodebase>
     <TargetFrameworkProfile />
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>14.0</OldToolsVersion>
   </PropertyGroup>
   <PropertyGroup>
     <SignAssembly>false</SignAssembly>
@@ -22,9 +27,9 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectTypeGuids>{82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>{4AFFC8B4-B61B-4749-BA97-D7CD5596976A}</ProjectGuid>
+    <ProjectGuid>{AC63D242-9FDD-4958-A79B-A7CD2EBC7F25}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <AppDesignerFolder>..\src\BuildMonitor\Properties</AppDesignerFolder>
     <RootNamespace>BuildMonitor</RootNamespace>
     <AssemblyName>BuildMonitor</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
@@ -53,15 +58,15 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="BuildMonitor.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="BuildTelemetryClient.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
+    <Compile Include="..\src\BuildMonitor\BuildMonitor.cs" />
+    <Compile Include="..\src\BuildMonitor\Properties\AssemblyInfo.cs" />
+    <Compile Include="..\src\BuildMonitor\BuildTelemetryClient.cs" />
+    <Compile Include="..\src\BuildMonitor\Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
-    <Compile Include="BuildEventProcessor.cs" />
+    <Compile Include="..\src\BuildMonitor\BuildEventProcessor.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config">
@@ -179,27 +184,18 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Properties\Resources.resx">
+    <EmbeddedResource Include="..\src\BuildMonitor\Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <EmbeddedResource Include="VSPackage.resx">
+    <EmbeddedResource Include="..\src\BuildMonitor\VSPackage.resx">
       <MergeWithCTO>true</MergeWithCTO>
       <ManifestResourceName>VSPackage</ManifestResourceName>
       <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Resources\" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\ObjectiveC\ObjectiveC.csproj">
-      <Project>{D92AF1E6-7318-4CC0-9E1E-074E96C7E0FB}</Project>
-      <Name>ObjectiveC</Name>
-      <VSIXSubPath>Asset</VSIXSubPath>
-      <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bBuiltProjectOutputGroupDependencies%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
-      <IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
-    </ProjectReference>
+    <Folder Include="..\src\BuildMonitor\Resources\" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
diff --git a/msvc/language/BuildMonitor/source.extension.vsixmanifest b/msvc/language/BuildMonitor/source.extension.vsixmanifest
index 7bb3bf308a..01520b2856 100644
--- a/msvc/language/BuildMonitor/source.extension.vsixmanifest
+++ b/msvc/language/BuildMonitor/source.extension.vsixmanifest
@@ -1,24 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
-  <Metadata>
-    <Identity Id="BuildMonitor..0a528553-98c4-4948-a43c-bef2784df92c" Version="1.5" Language="en-US" Publisher="Microsoft" />
-    <DisplayName>BuildMonitor</DisplayName>
-    <Description xml:space="preserve">BuildMonitor watches the solution build process and reports WinObjC errors.</Description>
-  </Metadata>
-  <Installation>
-    <InstallationTarget Version="[12.0,15.0)" Id="Microsoft.VisualStudio.Community" />
-    <InstallationTarget Version="[12.0,15.0)" Id="Microsoft.VisualStudio.Premium" />
-    <InstallationTarget Version="[12.0,15.0)" Id="Microsoft.VisualStudio.Pro" />
-    <InstallationTarget Version="[12.0,15.0)" Id="Microsoft.VisualStudio.Ultimate" />
-    <InstallationTarget Version="[12.0,15.0)" Id="Microsoft.VisualStudio.Enterprise" />
-  </Installation>
-  <Dependencies>
-    <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
-  </Dependencies>
-  <Assets>
-    <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="ObjectiveC" d:VsixSubPath="Asset" Path="|ObjectiveC|" />
-    <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:VsixSubPath="BM" Path="|BuildMonitor;PkgdefProjectOutputGroup|" />
-    <Asset Type="NativeVisualizer" d:Source="File" Path="Visualizers\ObjectiveC.natvis" />
-    <Asset Type="StepFilter" d:Source="File" Path="Visualizers\ObjectiveC.natstepfilter" />
-  </Assets>
+    <Metadata>
+        <Identity Id="BuildMonitor..0a528553-98c4-4948-a43c-bef2784df92c" Version="1.5" Language="en-US" Publisher="Microsoft" />
+        <DisplayName>BuildMonitor</DisplayName>
+        <Description xml:space="preserve">BuildMonitor watches the solution build process and reports WinObjC errors.</Description>
+    </Metadata>
+    <Installation>
+        <InstallationTarget Version="[15.0,16.0)" Id="Microsoft.VisualStudio.Community" />
+        <InstallationTarget Version="[15.0,16.0)" Id="Microsoft.VisualStudio.Premium" />
+        <InstallationTarget Version="[15.0,16.0)" Id="Microsoft.VisualStudio.Pro" />
+        <InstallationTarget Version="[15.0,16.0)" Id="Microsoft.VisualStudio.Ultimate" />
+        <InstallationTarget Version="[15.0,16.0)" Id="Microsoft.VisualStudio.Enterprise" />
+    </Installation>
+    <Dependencies>
+        <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
+    </Dependencies>
+    <Assets>
+        <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:VsixSubPath="BM" Path="|BuildMonitor;PkgdefProjectOutputGroup|" />
+        <Asset Type="NativeVisualizer" d:Source="File" Path="Visualizers\ObjectiveC.natvis" />
+        <Asset Type="StepFilter" d:Source="File" Path="Visualizers\ObjectiveC.natstepfilter" />
+    </Assets>
+    <Prerequisites>
+        <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,16.0)" DisplayName="Visual Studio core editor" />
+    </Prerequisites>
 </PackageManifest>
diff --git a/msvc/language/ObjectiveC.sln b/msvc/language/ObjectiveC.sln
index b144ef0f61..a218a5d32a 100644
--- a/msvc/language/ObjectiveC.sln
+++ b/msvc/language/ObjectiveC.sln
@@ -1,12 +1,10 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.24720.0
+# Visual Studio 15
+VisualStudioVersion = 15.0.26117.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ObjectiveC", "ObjectiveC\ObjectiveC.csproj", "{D92AF1E6-7318-4CC0-9E1E-074E96C7E0FB}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ObjectiveCVSIX", "VSIX\ObjectiveCVSIX.csproj", "{E2DCDF86-DD71-4969-B280-B914EC0181E5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ObjectiveCVSIX", "VSIX\ObjectiveCVSIX.csproj", "{F39AC9D8-76A8-4104-8469-1B7270B49230}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuildMonitor", "BuildMonitor\BuildMonitor.csproj", "{4AFFC8B4-B61B-4749-BA97-D7CD5596976A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuildMonitor", "BuildMonitor\BuildMonitor.csproj", "{AC63D242-9FDD-4958-A79B-A7CD2EBC7F25}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -14,18 +12,14 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D92AF1E6-7318-4CC0-9E1E-074E96C7E0FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D92AF1E6-7318-4CC0-9E1E-074E96C7E0FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D92AF1E6-7318-4CC0-9E1E-074E96C7E0FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D92AF1E6-7318-4CC0-9E1E-074E96C7E0FB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F39AC9D8-76A8-4104-8469-1B7270B49230}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F39AC9D8-76A8-4104-8469-1B7270B49230}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F39AC9D8-76A8-4104-8469-1B7270B49230}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F39AC9D8-76A8-4104-8469-1B7270B49230}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4AFFC8B4-B61B-4749-BA97-D7CD5596976A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4AFFC8B4-B61B-4749-BA97-D7CD5596976A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4AFFC8B4-B61B-4749-BA97-D7CD5596976A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4AFFC8B4-B61B-4749-BA97-D7CD5596976A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E2DCDF86-DD71-4969-B280-B914EC0181E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E2DCDF86-DD71-4969-B280-B914EC0181E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E2DCDF86-DD71-4969-B280-B914EC0181E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E2DCDF86-DD71-4969-B280-B914EC0181E5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AC63D242-9FDD-4958-A79B-A7CD2EBC7F25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AC63D242-9FDD-4958-A79B-A7CD2EBC7F25}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AC63D242-9FDD-4958-A79B-A7CD2EBC7F25}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AC63D242-9FDD-4958-A79B-A7CD2EBC7F25}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/msvc/language/VSIX/ObjectiveCVSIX.csproj b/msvc/language/VSIX/ObjectiveCVSIX.csproj
index b947d5f399..cf65dd7bee 100644
--- a/msvc/language/VSIX/ObjectiveCVSIX.csproj
+++ b/msvc/language/VSIX/ObjectiveCVSIX.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+    <MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
     <FileUpgradeFlags>
@@ -31,9 +31,9 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectTypeGuids>{82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>{F39AC9D8-76A8-4104-8469-1B7270B49230}</ProjectGuid>
+    <ProjectGuid>{E2DCDF86-DD71-4969-B280-B914EC0181E5}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <AppDesignerFolder>..\src\VSIX\Properties</AppDesignerFolder>
     <RootNamespace>VSIX</RootNamespace>
     <AssemblyName>VSIX</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
@@ -62,10 +62,10 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="..\src\VSIX\Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Visualizers\ObjectiveC.natstepfilter">
+    <Content Include="..\src\VSIX\Visualizers\ObjectiveC.natstepfilter">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
     <None Include="source.extension.vsixmanifest">
@@ -74,19 +74,12 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\BuildMonitor\BuildMonitor.csproj">
-      <Project>{4AFFC8B4-B61B-4749-BA97-D7CD5596976A}</Project>
+      <Project>{AC63D242-9FDD-4958-A79B-A7CD2EBC7F25}</Project>
       <Name>BuildMonitor</Name>
       <VSIXSubPath>BM</VSIXSubPath>
       <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bBuiltProjectOutputGroupDependencies%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3bPkgdefProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
       <IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
     </ProjectReference>
-    <ProjectReference Include="..\ObjectiveC\ObjectiveC.csproj">
-      <Project>{D92AF1E6-7318-4CC0-9E1E-074E96C7E0FB}</Project>
-      <Name>ObjectiveC</Name>
-      <VSIXSubPath>Asset</VSIXSubPath>
-      <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bBuiltProjectOutputGroupDependencies%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
-      <IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.5">
@@ -105,11 +98,6 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="Visualizers\ObjectiveC.natvis">
-      <IncludeInVSIX>true</IncludeInVSIX>
-    </Content>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/msvc/language/VSIX/source.extension.vsixmanifest b/msvc/language/VSIX/source.extension.vsixmanifest
index 061be342f4..26ff65f494 100644
--- a/msvc/language/VSIX/source.extension.vsixmanifest
+++ b/msvc/language/VSIX/source.extension.vsixmanifest
@@ -1,24 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
-  <Metadata>
-    <Identity Id="VSIX..9c35fff1-f084-44c1-a38e-68c707163aa2" Version="1.5" Language="en-US" Publisher="Microsoft" />
-    <DisplayName>Objective-C Language Service</DisplayName>
-    <Description xml:space="preserve">This package contains Objective-C language service components such as syntax higlighting etc</Description>
-  </Metadata>
-  <Installation>
-    <InstallationTarget Version="[12.0,15.0)" Id="Microsoft.VisualStudio.Community" />
-    <InstallationTarget Version="[12.0,15.0)" Id="Microsoft.VisualStudio.Premium" />
-    <InstallationTarget Version="[12.0,15.0)" Id="Microsoft.VisualStudio.Pro" />
-    <InstallationTarget Version="[12.0,15.0)" Id="Microsoft.VisualStudio.Ultimate" />
-    <InstallationTarget Version="[12.0,15.0)" Id="Microsoft.VisualStudio.Enterprise" />
-  </Installation>
-  <Dependencies>
-    <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
-  </Dependencies>
-  <Assets>
-    <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="ObjectiveC" d:VsixSubPath="Asset" Path="|ObjectiveC|" />
-    <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:VsixSubPath="BM" Path="|BuildMonitor;PkgdefProjectOutputGroup|" />
-    <Asset Type="NativeVisualizer" d:Source="File" Path="Visualizers\ObjectiveC.natvis" />
-    <Asset Type="StepFilter" d:Source="File" Path="Visualizers\ObjectiveC.natstepfilter" />
-  </Assets>
+    <Metadata>
+        <Identity Id="VSIX..9c35fff1-f084-44c1-a38e-68c707163aa2" Version="1.5" Language="en-US" Publisher="Microsoft" />
+        <DisplayName>Objective-C Language Service</DisplayName>
+        <Description xml:space="preserve">This package contains Objective-C language service components such as Native Visualization support etc.</Description>
+    </Metadata>
+    <Installation>
+        <InstallationTarget Version="[15.0,16.0)" Id="Microsoft.VisualStudio.Community" />
+        <InstallationTarget Version="[15.0,16.0)" Id="Microsoft.VisualStudio.Premium" />
+        <InstallationTarget Version="[15.0,16.0)" Id="Microsoft.VisualStudio.Pro" />
+        <InstallationTarget Version="[15.0,16.0)" Id="Microsoft.VisualStudio.Ultimate" />
+        <InstallationTarget Version="[15.0,16.0)" Id="Microsoft.VisualStudio.Enterprise" />
+    </Installation>
+    <Dependencies>
+        <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
+    </Dependencies>
+    <Assets>
+        <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:VsixSubPath="BM" Path="|BuildMonitor;PkgdefProjectOutputGroup|" />
+        <Asset Type="NativeVisualizer" d:Source="File" Path="Visualizers\ObjectiveC.natvis" />
+        <Asset Type="StepFilter" d:Source="File" Path="Visualizers\ObjectiveC.natstepfilter" />
+    </Assets>
+    <Prerequisites>
+        <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,16.0)" DisplayName="Visual Studio core editor" />
+    </Prerequisites>
 </PackageManifest>
diff --git a/msvc/language/legacy/BuildMonitor/BuildMonitor.csproj b/msvc/language/legacy/BuildMonitor/BuildMonitor.csproj
new file mode 100644
index 0000000000..c818747092
--- /dev/null
+++ b/msvc/language/legacy/BuildMonitor/BuildMonitor.csproj
@@ -0,0 +1,221 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\Microsoft.VSSDK.BuildTools.14.1.24720\build\Microsoft.VSSDK.BuildTools.props" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.14.1.24720\build\Microsoft.VSSDK.BuildTools.props')" />
+  <PropertyGroup>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
+    <UseCodebase>true</UseCodebase>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>false</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectTypeGuids>{82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ProjectGuid>{4AFFC8B4-B61B-4749-BA97-D7CD5596976A}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>..\..\src\BuildMonitor\Properties</AppDesignerFolder>
+    <RootNamespace>BuildMonitor</RootNamespace>
+    <AssemblyName>BuildMonitor</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <GeneratePkgDefFile>true</GeneratePkgDefFile>
+    <IncludeAssemblyInVSIXContainer>true</IncludeAssemblyInVSIXContainer>
+    <IncludeDebugSymbolsInVSIXContainer>true</IncludeDebugSymbolsInVSIXContainer>
+    <IncludeDebugSymbolsInLocalVSIXDeployment>true</IncludeDebugSymbolsInLocalVSIXDeployment>
+    <CopyBuildOutputToOutputDirectory>true</CopyBuildOutputToOutputDirectory>
+    <CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\src\BuildMonitor\BuildMonitor.cs" />
+    <Compile Include="..\..\src\BuildMonitor\Properties\AssemblyInfo.cs" />
+    <Compile Include="..\..\src\BuildMonitor\BuildTelemetryClient.cs" />
+    <Compile Include="..\..\src\BuildMonitor\Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="..\..\src\BuildMonitor\BuildEventProcessor.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
+    <None Include="source.extension.vsixmanifest">
+      <SubType>Designer</SubType>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="EnvDTE, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <EmbedInteropTypes>False</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="EnvDTE100, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <EmbedInteropTypes>False</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="EnvDTE80, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <EmbedInteropTypes>False</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="EnvDTE90, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <EmbedInteropTypes>False</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="Microsoft.ApplicationInsights, Version=1.2.3.490, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.ApplicationInsights.1.2.3\lib\net45\Microsoft.ApplicationInsights.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.Build.Framework" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Microsoft.VisualStudio.CommandBars, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <EmbedInteropTypes>False</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Imaging, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.Imaging.14.1.24720\lib\net45\Microsoft.VisualStudio.Imaging.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.OLE.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>..\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6070\lib\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Shell.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.Shell.14.0.14.1.24720\lib\Microsoft.VisualStudio.Shell.14.0.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.Shell.Immutable.10.0.10.0.30319\lib\net40\Microsoft.VisualStudio.Shell.Immutable.10.0.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Shell.Immutable.11.0, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.Shell.Immutable.11.0.11.0.50727\lib\net45\Microsoft.VisualStudio.Shell.Immutable.11.0.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Shell.Immutable.12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.Shell.Immutable.12.0.12.0.21003\lib\net45\Microsoft.VisualStudio.Shell.Immutable.12.0.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Shell.Immutable.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.Shell.Immutable.14.0.14.1.24720\lib\net45\Microsoft.VisualStudio.Shell.Immutable.14.0.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Shell.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.7.10.6071\lib\Microsoft.VisualStudio.Shell.Interop.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Shell.Interop.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+      <HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.10.0.10.0.30319\lib\Microsoft.VisualStudio.Shell.Interop.10.0.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Shell.Interop.11.0, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+      <HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.11.0.11.0.61030\lib\Microsoft.VisualStudio.Shell.Interop.11.0.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Shell.Interop.12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+      <HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.12.0.12.0.30110\lib\Microsoft.VisualStudio.Shell.Interop.12.0.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.Shell.Interop.8.0.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.9.0.9.0.30729\lib\Microsoft.VisualStudio.Shell.Interop.9.0.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.TextManager.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>..\packages\Microsoft.VisualStudio.TextManager.Interop.7.10.6070\lib\Microsoft.VisualStudio.TextManager.Interop.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.TextManager.Interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>..\packages\Microsoft.VisualStudio.TextManager.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.TextManager.Interop.8.0.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Threading, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.Threading.14.1.114\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Utilities, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.Utilities.14.1.24720\lib\net45\Microsoft.VisualStudio.Utilities.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Validation, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.Validation.14.1.111\lib\net45\Microsoft.VisualStudio.Validation.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="stdole, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <EmbedInteropTypes>False</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Design" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="..\..\src\BuildMonitor\Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <EmbeddedResource Include="..\..\src\BuildMonitor\VSPackage.resx">
+      <MergeWithCTO>true</MergeWithCTO>
+      <ManifestResourceName>VSPackage</ManifestResourceName>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="..\..\src\BuildMonitor\Resources\" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\ObjectiveC\ObjectiveC.csproj">
+      <Project>{D92AF1E6-7318-4CC0-9E1E-074E96C7E0FB}</Project>
+      <Name>ObjectiveC</Name>
+      <VSIXSubPath>Asset</VSIXSubPath>
+      <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bBuiltProjectOutputGroupDependencies%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
+      <IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use 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('..\packages\Microsoft.VSSDK.BuildTools.14.1.24720\build\Microsoft.VSSDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.14.1.24720\build\Microsoft.VSSDK.BuildTools.props'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.14.1.24720\build\Microsoft.VSSDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.14.1.24720\build\Microsoft.VSSDK.BuildTools.targets'))" />
+  </Target>
+  <Import Project="..\packages\Microsoft.VSSDK.BuildTools.14.1.24720\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.14.1.24720\build\Microsoft.VSSDK.BuildTools.targets')" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/msvc/language/legacy/BuildMonitor/packages.config b/msvc/language/legacy/BuildMonitor/packages.config
new file mode 100644
index 0000000000..dadc4358c5
--- /dev/null
+++ b/msvc/language/legacy/BuildMonitor/packages.config
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.ApplicationInsights" version="1.2.3" targetFramework="net45" />
+  <package id="Microsoft.VisualStudio.Imaging" version="14.1.24720" targetFramework="net45" />
+  <package id="Microsoft.VisualStudio.OLE.Interop" version="7.10.6070" targetFramework="net45" />
+  <package id="Microsoft.VisualStudio.Shell.14.0" version="14.1.24720" targetFramework="net45" />
+  <package id="Microsoft.VisualStudio.Shell.Immutable.10.0" version="10.0.30319" targetFramework="net45" />
+  <package id="Microsoft.VisualStudio.Shell.Immutable.11.0" version="11.0.50727" targetFramework="net45" />
+  <package id="Microsoft.VisualStudio.Shell.Immutable.12.0" version="12.0.21003" targetFramework="net45" />
+  <package id="Microsoft.VisualStudio.Shell.Immutable.14.0" version="14.1.24720" targetFramework="net45" />
+  <package id="Microsoft.VisualStudio.Shell.Interop" version="7.10.6071" targetFramework="net45" />
+  <package id="Microsoft.VisualStudio.Shell.Interop.10.0" version="10.0.30319" targetFramework="net45" />
+  <package id="Microsoft.VisualStudio.Shell.Interop.11.0" version="11.0.61030" targetFramework="net45" />
+  <package id="Microsoft.VisualStudio.Shell.Interop.12.0" version="12.0.30110" targetFramework="net45" />
+  <package id="Microsoft.VisualStudio.Shell.Interop.8.0" version="8.0.50727" targetFramework="net45" />
+  <package id="Microsoft.VisualStudio.Shell.Interop.9.0" version="9.0.30729" targetFramework="net45" />
+  <package id="Microsoft.VisualStudio.TextManager.Interop" version="7.10.6070" targetFramework="net45" />
+  <package id="Microsoft.VisualStudio.TextManager.Interop.8.0" version="8.0.50727" targetFramework="net45" />
+  <package id="Microsoft.VisualStudio.Threading" version="14.1.114" targetFramework="net45" />
+  <package id="Microsoft.VisualStudio.Utilities" version="14.1.24720" targetFramework="net45" />
+  <package id="Microsoft.VisualStudio.Validation" version="14.1.111" targetFramework="net45" />
+  <package id="Microsoft.VSSDK.BuildTools" version="14.1.24720" targetFramework="net45" developmentDependency="true" />
+</packages>
\ No newline at end of file
diff --git a/msvc/language/legacy/BuildMonitor/source.extension.vsixmanifest b/msvc/language/legacy/BuildMonitor/source.extension.vsixmanifest
new file mode 100644
index 0000000000..7bb3bf308a
--- /dev/null
+++ b/msvc/language/legacy/BuildMonitor/source.extension.vsixmanifest
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
+  <Metadata>
+    <Identity Id="BuildMonitor..0a528553-98c4-4948-a43c-bef2784df92c" Version="1.5" Language="en-US" Publisher="Microsoft" />
+    <DisplayName>BuildMonitor</DisplayName>
+    <Description xml:space="preserve">BuildMonitor watches the solution build process and reports WinObjC errors.</Description>
+  </Metadata>
+  <Installation>
+    <InstallationTarget Version="[12.0,15.0)" Id="Microsoft.VisualStudio.Community" />
+    <InstallationTarget Version="[12.0,15.0)" Id="Microsoft.VisualStudio.Premium" />
+    <InstallationTarget Version="[12.0,15.0)" Id="Microsoft.VisualStudio.Pro" />
+    <InstallationTarget Version="[12.0,15.0)" Id="Microsoft.VisualStudio.Ultimate" />
+    <InstallationTarget Version="[12.0,15.0)" Id="Microsoft.VisualStudio.Enterprise" />
+  </Installation>
+  <Dependencies>
+    <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
+  </Dependencies>
+  <Assets>
+    <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="ObjectiveC" d:VsixSubPath="Asset" Path="|ObjectiveC|" />
+    <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:VsixSubPath="BM" Path="|BuildMonitor;PkgdefProjectOutputGroup|" />
+    <Asset Type="NativeVisualizer" d:Source="File" Path="Visualizers\ObjectiveC.natvis" />
+    <Asset Type="StepFilter" d:Source="File" Path="Visualizers\ObjectiveC.natstepfilter" />
+  </Assets>
+</PackageManifest>
diff --git a/msvc/language/legacy/ObjectiveC.sln b/msvc/language/legacy/ObjectiveC.sln
new file mode 100644
index 0000000000..b144ef0f61
--- /dev/null
+++ b/msvc/language/legacy/ObjectiveC.sln
@@ -0,0 +1,33 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.24720.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ObjectiveC", "ObjectiveC\ObjectiveC.csproj", "{D92AF1E6-7318-4CC0-9E1E-074E96C7E0FB}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ObjectiveCVSIX", "VSIX\ObjectiveCVSIX.csproj", "{F39AC9D8-76A8-4104-8469-1B7270B49230}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuildMonitor", "BuildMonitor\BuildMonitor.csproj", "{4AFFC8B4-B61B-4749-BA97-D7CD5596976A}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{D92AF1E6-7318-4CC0-9E1E-074E96C7E0FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D92AF1E6-7318-4CC0-9E1E-074E96C7E0FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D92AF1E6-7318-4CC0-9E1E-074E96C7E0FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D92AF1E6-7318-4CC0-9E1E-074E96C7E0FB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F39AC9D8-76A8-4104-8469-1B7270B49230}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F39AC9D8-76A8-4104-8469-1B7270B49230}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F39AC9D8-76A8-4104-8469-1B7270B49230}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F39AC9D8-76A8-4104-8469-1B7270B49230}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4AFFC8B4-B61B-4749-BA97-D7CD5596976A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4AFFC8B4-B61B-4749-BA97-D7CD5596976A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4AFFC8B4-B61B-4749-BA97-D7CD5596976A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4AFFC8B4-B61B-4749-BA97-D7CD5596976A}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/msvc/language/ObjectiveC/ObjectiveC.csproj b/msvc/language/legacy/ObjectiveC/ObjectiveC.csproj
similarity index 100%
rename from msvc/language/ObjectiveC/ObjectiveC.csproj
rename to msvc/language/legacy/ObjectiveC/ObjectiveC.csproj
diff --git a/msvc/language/ObjectiveC/ObjectiveCClassifier.cs b/msvc/language/legacy/ObjectiveC/ObjectiveCClassifier.cs
similarity index 100%
rename from msvc/language/ObjectiveC/ObjectiveCClassifier.cs
rename to msvc/language/legacy/ObjectiveC/ObjectiveCClassifier.cs
diff --git a/msvc/language/ObjectiveC/ObjectiveCFormat.cs b/msvc/language/legacy/ObjectiveC/ObjectiveCFormat.cs
similarity index 100%
rename from msvc/language/ObjectiveC/ObjectiveCFormat.cs
rename to msvc/language/legacy/ObjectiveC/ObjectiveCFormat.cs
diff --git a/msvc/language/ObjectiveC/ObjectiveCTokenTag.cs b/msvc/language/legacy/ObjectiveC/ObjectiveCTokenTag.cs
similarity index 100%
rename from msvc/language/ObjectiveC/ObjectiveCTokenTag.cs
rename to msvc/language/legacy/ObjectiveC/ObjectiveCTokenTag.cs
diff --git a/msvc/language/ObjectiveC/ObjectiveCTokenTypes.cs b/msvc/language/legacy/ObjectiveC/ObjectiveCTokenTypes.cs
similarity index 100%
rename from msvc/language/ObjectiveC/ObjectiveCTokenTypes.cs
rename to msvc/language/legacy/ObjectiveC/ObjectiveCTokenTypes.cs
diff --git a/msvc/language/ObjectiveC/ObjectiveCType.cs b/msvc/language/legacy/ObjectiveC/ObjectiveCType.cs
similarity index 100%
rename from msvc/language/ObjectiveC/ObjectiveCType.cs
rename to msvc/language/legacy/ObjectiveC/ObjectiveCType.cs
diff --git a/msvc/language/ObjectiveC/Properties/AssemblyInfo.cs b/msvc/language/legacy/ObjectiveC/Properties/AssemblyInfo.cs
similarity index 100%
rename from msvc/language/ObjectiveC/Properties/AssemblyInfo.cs
rename to msvc/language/legacy/ObjectiveC/Properties/AssemblyInfo.cs
diff --git a/msvc/language/ObjectiveC/source.extension.vsixmanifest b/msvc/language/legacy/ObjectiveC/source.extension.vsixmanifest
similarity index 67%
rename from msvc/language/ObjectiveC/source.extension.vsixmanifest
rename to msvc/language/legacy/ObjectiveC/source.extension.vsixmanifest
index ee26d99df1..12707abdeb 100644
--- a/msvc/language/ObjectiveC/source.extension.vsixmanifest
+++ b/msvc/language/legacy/ObjectiveC/source.extension.vsixmanifest
@@ -6,7 +6,11 @@
     <Description xml:space="preserve">Basic Objective-C classifier for syntax highlightingBasic Objective-C </Description>
   </Metadata>
   <Installation>
-    <InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="12.0" />
+    <InstallationTarget Version="[12.0,15.0)" Id="Microsoft.VisualStudio.Community" />
+    <InstallationTarget Version="[12.0,15.0)" Id="Microsoft.VisualStudio.Premium" />
+    <InstallationTarget Version="[12.0,15.0)" Id="Microsoft.VisualStudio.Pro" />
+    <InstallationTarget Version="[12.0,15.0)" Id="Microsoft.VisualStudio.Ultimate" />
+    <InstallationTarget Version="[12.0,15.0)" Id="Microsoft.VisualStudio.Enterprise" />
   </Installation>
   <Dependencies>
     <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="4.5" />
diff --git a/msvc/language/legacy/VSIX/ObjectiveCVSIX.csproj b/msvc/language/legacy/VSIX/ObjectiveCVSIX.csproj
new file mode 100644
index 0000000000..352119b152
--- /dev/null
+++ b/msvc/language/legacy/VSIX/ObjectiveCVSIX.csproj
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>12.0</OldToolsVersion>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectTypeGuids>{82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ProjectGuid>{F39AC9D8-76A8-4104-8469-1B7270B49230}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>..\..\src\VSIX\Properties</AppDesignerFolder>
+    <RootNamespace>VSIX</RootNamespace>
+    <AssemblyName>VSIX</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <GeneratePkgDefFile>false</GeneratePkgDefFile>
+    <IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
+    <IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
+    <IncludeDebugSymbolsInLocalVSIXDeployment>false</IncludeDebugSymbolsInLocalVSIXDeployment>
+    <CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
+    <CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\src\VSIX\Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="..\..\src\VSIX\Visualizers\ObjectiveC.natstepfilter">
+      <IncludeInVSIX>true</IncludeInVSIX>
+    </Content>
+    <None Include="source.extension.vsixmanifest">
+      <SubType>Designer</SubType>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\BuildMonitor\BuildMonitor.csproj">
+      <Project>{4AFFC8B4-B61B-4749-BA97-D7CD5596976A}</Project>
+      <Name>BuildMonitor</Name>
+      <VSIXSubPath>BM</VSIXSubPath>
+      <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bBuiltProjectOutputGroupDependencies%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3bPkgdefProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
+      <IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
+    </ProjectReference>
+    <ProjectReference Include="..\ObjectiveC\ObjectiveC.csproj">
+      <Project>{D92AF1E6-7318-4CC0-9E1E-074E96C7E0FB}</Project>
+      <Name>ObjectiveC</Name>
+      <VSIXSubPath>Asset</VSIXSubPath>
+      <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bBuiltProjectOutputGroupDependencies%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
+      <IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.5">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.5 %28x86 and x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="..\..\src\VSIX\Visualizers\ObjectiveC.natvis">
+      <IncludeInVSIX>true</IncludeInVSIX>
+    </Content>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/msvc/language/legacy/VSIX/source.extension.vsixmanifest b/msvc/language/legacy/VSIX/source.extension.vsixmanifest
new file mode 100644
index 0000000000..061be342f4
--- /dev/null
+++ b/msvc/language/legacy/VSIX/source.extension.vsixmanifest
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
+  <Metadata>
+    <Identity Id="VSIX..9c35fff1-f084-44c1-a38e-68c707163aa2" Version="1.5" Language="en-US" Publisher="Microsoft" />
+    <DisplayName>Objective-C Language Service</DisplayName>
+    <Description xml:space="preserve">This package contains Objective-C language service components such as syntax higlighting etc</Description>
+  </Metadata>
+  <Installation>
+    <InstallationTarget Version="[12.0,15.0)" Id="Microsoft.VisualStudio.Community" />
+    <InstallationTarget Version="[12.0,15.0)" Id="Microsoft.VisualStudio.Premium" />
+    <InstallationTarget Version="[12.0,15.0)" Id="Microsoft.VisualStudio.Pro" />
+    <InstallationTarget Version="[12.0,15.0)" Id="Microsoft.VisualStudio.Ultimate" />
+    <InstallationTarget Version="[12.0,15.0)" Id="Microsoft.VisualStudio.Enterprise" />
+  </Installation>
+  <Dependencies>
+    <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
+  </Dependencies>
+  <Assets>
+    <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="ObjectiveC" d:VsixSubPath="Asset" Path="|ObjectiveC|" />
+    <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:VsixSubPath="BM" Path="|BuildMonitor;PkgdefProjectOutputGroup|" />
+    <Asset Type="NativeVisualizer" d:Source="File" Path="Visualizers\ObjectiveC.natvis" />
+    <Asset Type="StepFilter" d:Source="File" Path="Visualizers\ObjectiveC.natstepfilter" />
+  </Assets>
+</PackageManifest>
diff --git a/msvc/language/BuildMonitor/BuildEventProcessor.cs b/msvc/language/src/BuildMonitor/BuildEventProcessor.cs
similarity index 100%
rename from msvc/language/BuildMonitor/BuildEventProcessor.cs
rename to msvc/language/src/BuildMonitor/BuildEventProcessor.cs
diff --git a/msvc/language/BuildMonitor/BuildMonitor.cs b/msvc/language/src/BuildMonitor/BuildMonitor.cs
similarity index 100%
rename from msvc/language/BuildMonitor/BuildMonitor.cs
rename to msvc/language/src/BuildMonitor/BuildMonitor.cs
diff --git a/msvc/language/BuildMonitor/BuildTelemetryClient.cs b/msvc/language/src/BuildMonitor/BuildTelemetryClient.cs
similarity index 100%
rename from msvc/language/BuildMonitor/BuildTelemetryClient.cs
rename to msvc/language/src/BuildMonitor/BuildTelemetryClient.cs
diff --git a/msvc/language/BuildMonitor/Properties/AssemblyInfo.cs b/msvc/language/src/BuildMonitor/Properties/AssemblyInfo.cs
similarity index 100%
rename from msvc/language/BuildMonitor/Properties/AssemblyInfo.cs
rename to msvc/language/src/BuildMonitor/Properties/AssemblyInfo.cs
diff --git a/msvc/language/BuildMonitor/Properties/Resources.Designer.cs b/msvc/language/src/BuildMonitor/Properties/Resources.Designer.cs
similarity index 100%
rename from msvc/language/BuildMonitor/Properties/Resources.Designer.cs
rename to msvc/language/src/BuildMonitor/Properties/Resources.Designer.cs
diff --git a/msvc/language/BuildMonitor/Properties/Resources.resx b/msvc/language/src/BuildMonitor/Properties/Resources.resx
similarity index 100%
rename from msvc/language/BuildMonitor/Properties/Resources.resx
rename to msvc/language/src/BuildMonitor/Properties/Resources.resx
diff --git a/msvc/language/BuildMonitor/VSPackage.resx b/msvc/language/src/BuildMonitor/VSPackage.resx
similarity index 100%
rename from msvc/language/BuildMonitor/VSPackage.resx
rename to msvc/language/src/BuildMonitor/VSPackage.resx
diff --git a/msvc/language/VSIX/Properties/AssemblyInfo.cs b/msvc/language/src/VSIX/Properties/AssemblyInfo.cs
similarity index 100%
rename from msvc/language/VSIX/Properties/AssemblyInfo.cs
rename to msvc/language/src/VSIX/Properties/AssemblyInfo.cs
diff --git a/msvc/language/VSIX/Visualizers/ObjectiveC.natstepfilter b/msvc/language/src/VSIX/Visualizers/ObjectiveC.natstepfilter
similarity index 100%
rename from msvc/language/VSIX/Visualizers/ObjectiveC.natstepfilter
rename to msvc/language/src/VSIX/Visualizers/ObjectiveC.natstepfilter
diff --git a/msvc/language/VSIX/Visualizers/ObjectiveC.natvis b/msvc/language/src/VSIX/Visualizers/ObjectiveC.natvis
similarity index 57%
rename from msvc/language/VSIX/Visualizers/ObjectiveC.natvis
rename to msvc/language/src/VSIX/Visualizers/ObjectiveC.natvis
index 859db11249..7bec8658cd 100644
--- a/msvc/language/VSIX/Visualizers/ObjectiveC.natvis
+++ b/msvc/language/src/VSIX/Visualizers/ObjectiveC.natvis
@@ -1,7 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
-  <!-- Primitive/Runtime Types -->
+     <!--objc_class is defined as an opaque struct outside of libobjc2.dll.  Forward the natvis to the libobjc2.dll version so that the type can be visualized.
+       The libobjc2 view of objc_class is defined within libobjc2.pdb.-->
+  <Type Name="objc_class" ExcludeView="Libobjc2">
+    <DisplayString>{*((libobjc2.dll!objc_class*)this),view(Libobjc2)}</DisplayString>
+    <Expand>
+      <ExpandedItem>*((libobjc2.dll!objc_class*)this),view(Libobjc2)</ExpandedItem>
+    </Expand>
+  </Type>
+  
+  <!-- TODO: Move this entry to libobjc2.pdb -->
   <Type Name="objc_selector">
+    <Version Name="libobjc2.dll" />
     <DisplayString Condition="((libobjc2.dll!objc_selector*)this)->index &lt; libobjc2.dll!selector_count">@selector({libobjc2.dll!selector_list[((libobjc2.dll!objc_selector*)this)->index]->value,s8b})</DisplayString>
     <DisplayString>@selector({((libobjc2.dll!objc_selector*)this)->name,s8b})</DisplayString>
     <Expand HideRawView="true">
@@ -43,6 +53,47 @@
     </Expand>
   </Type>
 
+  <!-- Since any CFStringRef can point to any NSString, we have to go through the NSObject renderer. -->
+  <Type Name="__CFString">
+    <DisplayString>{*(NSObject*)this,na}</DisplayString>
+    <StringView>*(NSObject*)this,na</StringView>
+    <Expand HideRawView="true">
+      <ExpandedItem>*(NSObject*)this</ExpandedItem>
+    </Expand>
+  </Type>
+
+  <!-- Since any CFNumberRef can point to any NSNumber, we have to go through the NSObject renderer. -->
+  <Type Name="__CFNumber">
+    <DisplayString>{*(NSObject*)this,na}</DisplayString>
+    <Expand HideRawView="true">
+      <ExpandedItem>*(NSObject*)this</ExpandedItem>
+    </Expand>
+  </Type>
+
+  <!-- Since any CFArrayRef can point to any NSArray, we have to go through the NSObject renderer. -->
+  <Type Name="__CFArray">
+    <DisplayString>{*(NSObject*)this,na}</DisplayString>
+    <Expand HideRawView="true">
+      <ExpandedItem>*(NSObject*)this</ExpandedItem>
+    </Expand>
+  </Type>
+
+  <!-- Since any __CFBasicHash can point to any NSDictionary/NSSet, we have to go through the NSObject renderer. -->
+  <Type Name="__CFBasicHash">
+    <DisplayString>{*(NSObject*)this,na}</DisplayString>
+    <Expand HideRawView="true">
+      <ExpandedItem>*(NSObject*)this</ExpandedItem>
+    </Expand>
+  </Type>
+
+  <!-- Since any __CFData can point to any NSData, we have to go through the NSObject renderer. -->
+  <Type Name="__CFData">
+    <DisplayString>{*(NSObject*)this,na}</DisplayString>
+    <Expand HideRawView="true">
+      <ExpandedItem>*(NSObject*)this</ExpandedItem>
+    </Expand>
+  </Type>
+
   <Type Name="NSObject">
     <!-- Don't include the description and debug description node in the preview string (via auto-expansion).  The display string should just show the first three
     members of the objects, as it would if this natvis entry did not exist.-->