Index: tools/msbuild/LLVM.Cpp.Common.props
===================================================================
--- tools/msbuild/LLVM.Cpp.Common.props
+++ tools/msbuild/LLVM.Cpp.Common.props
@@ -72,6 +72,8 @@
            not pass the option).  Only if the user explicitly overrode this setting in a project to use
            /RTCu would we see the warning. -->
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <!-- Clang does not supports Just My Code debugging but it is enabled by default. -->
+      <SupportJustMyCode>false</SupportJustMyCode>
     </ClCompile>
   </ItemDefinitionGroup>
 </Project>
Index: tools/msbuild/LLVM.Cpp.Common.targets
===================================================================
--- tools/msbuild/LLVM.Cpp.Common.targets
+++ tools/msbuild/LLVM.Cpp.Common.targets
@@ -75,6 +75,11 @@
            File="@(ClCompile)(0,0)"
            Text="clang-cl does not support MSVC Modules (/experimental:module).  This file cannot be compiled."/>
 
+    <!-- Error if Just My Code debugging is enabled. -->
+    <Error Condition="'%(ClCompile.SupportJustMyCode)' == 'true'"
+           File="@(ClCompile)(0,0)"
+           Text="clang-cl does not support Just My Code debugging (/JMC).  This file cannot be compiled."/>
+
     <ItemGroup>
       <ClCompile>
         <!-- Map /ZI and /Zi to /Z7.  Clang internally does this, so if we were
Index: tools/msbuild/source.extension.vsixmanifest
===================================================================
--- tools/msbuild/source.extension.vsixmanifest
+++ tools/msbuild/source.extension.vsixmanifest
@@ -7,16 +7,16 @@
         <License>license.txt</License>
     </Metadata>
     <Installation AllUsers="true">
-        <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[15.0,16.0)" />
-        <InstallationTarget Version="[15.0,16.0)" Id="Microsoft.VisualStudio.Pro" />
-        <InstallationTarget Version="[15.0,16.0)" Id="Microsoft.VisualStudio.Enterprise" />
+        <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[15.0,17.0)" />
+        <InstallationTarget Version="[15.0,17.0)" Id="Microsoft.VisualStudio.Pro" />
+        <InstallationTarget Version="[15.0,17.0)" Id="Microsoft.VisualStudio.Enterprise" />
     </Installation>
     <Dependencies>
         <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
     </Dependencies>
     <Prerequisites>
-        <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,16.0)" DisplayName="Visual Studio core editor" />
-        <Prerequisite Id="Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core" Version="[15.0.26621.2,16.0)" DisplayName="Visual C++ core desktop features" />
-        <Prerequisite Id="Microsoft.VisualStudio.Component.VC.CoreIde" Version="[15.0.26606.0,16.0)" DisplayName="Visual Studio C++ core features" />
+        <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,17.0)" DisplayName="Visual Studio core editor" />
+        <Prerequisite Id="Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core" Version="[15.0.26621.2,17.0)" DisplayName="Visual C++ core desktop features" />
+        <Prerequisite Id="Microsoft.VisualStudio.Component.VC.CoreIde" Version="[15.0.26606.0,17.0)" DisplayName="Visual Studio C++ core features" />
     </Prerequisites>
 </PackageManifest>