Update samples to work in Dev16 and obtain packages from NuGet (micro…

…soft#40) For Dev16, Concord extension API and tools are now packaged in easier to use nuget packages. This updates the samples to obtain them from there. This also makes a few other fixes/improvements: - Make projects buildable/runable in Dev16 - Use 'PackageReference' to download packages instead of packages.config - Remove source control disable properties - Add a README.md for the Iris directory
Dave-Lowndes · Jan 23, 2019 · ca1ed4c · ca1ed4c
1 parent 651c7aa
commit ca1ed4c
Show file tree

Hide file tree

Showing 22 changed files with 174 additions and 168 deletions.
diff --git a/HelloWorld/Cpp/Cpp.props b/HelloWorld/Cpp/Cpp.props
@@ -0,0 +1,40 @@
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+<!-- Copyright (c) Microsoft. All rights reserved.
+Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+This file sets PlatformToolset/WindowsTargetPlatformVersion to allow this project to compile with multiple versions
+of Visual Studio.
+-->
+
+<PropertyGroup>
+    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '16.0'">v142</PlatformToolset>
+
+    <!--In Visual Studio 16, use the default Windows10 SDK-->
+    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'=='' and '$(VisualStudioVersion)' == '16.0'">10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+
+  <!--In Dev14/Dev15, we need to set 'WindowsTargetPlatformVersion' to an exact build number. -->
+  <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'==''">
+    <!--Try and find an SDK which is installed-->
+    <WinSDKRoot>$(WindowsSdkDir)</WinSDKRoot>
+    <WinSDKRoot Condition="'$(WinSDKRoot)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0@InstallationFolder)</WinSDKRoot>
+    <WinSDKRoot Condition="'$(WinSDKRoot)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows\v10.0@InstallationFolder)</WinSDKRoot>
+    <WinSDKRoot Condition="'$(WinSDKRoot)'==''">$(MSBuildProgramFiles32)\Windows Kits\10\</WinSDKRoot>
+
+    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'=='' and Exists('$(WinSDKRoot)Include\10.0.17763.0\um\WinBase.h')">10.0.17763.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'=='' and Exists('$(WinSDKRoot)Include\10.0.17134.0\um\WinBase.h')">10.0.17134.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'=='' and Exists('$(WinSDKRoot)Include\10.0.16299.0\um\WinBase.h')">10.0.16299.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'=='' and Exists('$(WinSDKRoot)Include\10.0.15063.0\um\WinBase.h')">10.0.15063.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'=='' and Exists('$(WinSDKRoot)Include\10.0.14393.0\um\WinBase.h')">10.0.14393.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'=='' and Exists('$(WinSDKRoot)Include\10.0.10586.0\um\WinBase.h')">10.0.10586.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'=='' and Exists('$(WinSDKRoot)Include\10.0.10240.0\um\WinBase.h')">10.0.10240.0</WindowsTargetPlatformVersion>
+
+    <!--Fall back to the default 15.9 version if nothing else is found.-->
+    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'==''">10.0.17763.0"</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+</Project>
diff --git a/HelloWorld/Cpp/HelloWorld.sln b/HelloWorld/Cpp/HelloWorld.sln
@@ -1,32 +1,36 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.23107.0
+# Visual Studio Version 16
+VisualStudioVersion = 16.65535.65535.65535
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vsix", "vsix\vsix.vcxproj", "{0E22D156-940B-431D-945D-51B7DFA08AEF}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloWorld", "dll\HelloWorld.vcxproj", "{D547DF85-7B84-462C-BCE7-8F166D7C543D}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{DE930018-3F5B-4586-A11D-8F9220A9596D}"
+	ProjectSection(SolutionItems) = preProject
+		Cpp.props = Cpp.props
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
 		Release|Win32 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D547DF85-7B84-462C-BCE7-8F166D7C543D}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{D547DF85-7B84-462C-BCE7-8F166D7C543D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D547DF85-7B84-462C-BCE7-8F166D7C543D}.Debug|Win32.Build.0 = Debug|Win32
-		{D547DF85-7B84-462C-BCE7-8F166D7C543D}.Release|Any CPU.ActiveCfg = Release|Win32
-		{D547DF85-7B84-462C-BCE7-8F166D7C543D}.Release|Win32.ActiveCfg = Release|Win32
-		{D547DF85-7B84-462C-BCE7-8F166D7C543D}.Release|Win32.Build.0 = Release|Win32
-		{0E22D156-940B-431D-945D-51B7DFA08AEF}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{0E22D156-940B-431D-945D-51B7DFA08AEF}.Debug|Win32.ActiveCfg = Debug|Win32
 		{0E22D156-940B-431D-945D-51B7DFA08AEF}.Debug|Win32.Build.0 = Debug|Win32
-		{0E22D156-940B-431D-945D-51B7DFA08AEF}.Release|Any CPU.ActiveCfg = Release|Win32
 		{0E22D156-940B-431D-945D-51B7DFA08AEF}.Release|Win32.ActiveCfg = Release|Win32
 		{0E22D156-940B-431D-945D-51B7DFA08AEF}.Release|Win32.Build.0 = Release|Win32
+		{D547DF85-7B84-462C-BCE7-8F166D7C543D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D547DF85-7B84-462C-BCE7-8F166D7C543D}.Debug|Win32.Build.0 = Debug|Win32
+		{D547DF85-7B84-462C-BCE7-8F166D7C543D}.Release|Win32.ActiveCfg = Release|Win32
+		{D547DF85-7B84-462C-BCE7-8F166D7C543D}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {D4ECDC99-526F-4A2D-90BF-7BF54C4043D2}
+	EndGlobalSection
 EndGlobal
diff --git a/HelloWorld/Cpp/dll/HelloWorld.vcxproj b/HelloWorld/Cpp/dll/HelloWorld.vcxproj
@@ -14,26 +14,11 @@
     <ProjectGuid>{D547DF85-7B84-462C-BCE7-8F166D7C543D}</ProjectGuid>
     <RootNamespace>HelloWorld</RootNamespace>
     <Keyword>AtlProj</Keyword>
-    <PlatformToolset>v140</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
-
-    <!--Try and find an SDK which is installed-->
-    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'=='' and Exists('$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.14393.0\um\WinBase.h')">10.0.14393.0</WindowsTargetPlatformVersion>
-
-    <!--Failing that, fall back to some defaults-->
-    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'=='' and '$(VisualStudioVersion)' == '15.0'">10.0.14393.0</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'=='' and '$(VisualStudioVersion)' == '14.0'">10.0.10240.0</WindowsTargetPlatformVersion>
+    <NugetPackagesDirectory>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\packages\))</NugetPackagesDirectory>
   </PropertyGroup>
-  <PropertyGroup>
-    <VSSDKRoot Condition="'$(DevEnvDir)'!='' and Exists('$(DevEnvDir)..\..\VSSDK\VisualStudioIntegration\')">$([System.IO.Path]::GetFullPath('$(DevEnvDir)..\..\VSSDK\'))</VSSDKRoot>
-    <VSSDKRoot Condition="'$(VSSDKRoot)'==''">$(registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\VSIP\14.0\@InstallDir)</VSSDKRoot>
-    <VSSDKRoot Condition="'$(VSSDKRoot)'==''">$(registry:HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\VisualStudio\VSIP\14.0\@InstallDir)</VSSDKRoot>
-    <VSSDKRoot Condition="'$(VSSDKRoot)'!='' and '$(VSSDKRoot.EndsWith(&quot;\&quot;))'=='false'">$(VSSDKRoot)\</VSSDKRoot>
-    <!--Root directory to Concord SDK install; includes the trailing backslash '\'.-->
-    <ConcordSDKDir>$(VSSDKRoot)VisualStudioIntegration\</ConcordSDKDir>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="packages.version.props" />
+  <Import Project="..\Cpp.props"/>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfAtl>Dynamic</UseOfAtl>
@@ -59,7 +44,6 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(IntDir);$(ConcordSDKDir)Common\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -75,7 +59,6 @@
     </ResourceCompile>
     <Link>
       <RegisterOutput>false</RegisterOutput>
-      <AdditionalDependencies>$(ConcordSDKDir)Common\lib\$(PlatformTarget)\vsdebugeng.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ModuleDefinitionFile>.\HelloWorld.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
@@ -98,7 +81,6 @@
     </Midl>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>$(IntDir);$(ConcordSDKDir)Common\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -112,7 +94,6 @@
     </ResourceCompile>
     <Link>
       <RegisterOutput>false</RegisterOutput>
-      <AdditionalDependencies>$(ConcordSDKDir)Common\lib\$(PlatformTarget)\vsdebugeng.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ModuleDefinitionFile>.\HelloWorld.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
@@ -131,26 +112,42 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="HelloWorld.def" />
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
+    <None Include="packages.version.props">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="$(NugetPackagesDirectory)Microsoft.VSSDK.Debugger.VSDebugEng.$(ConcordPackageVersion)\inc\VSDebugEng.h" />
+    <ClInclude Include="$(NugetPackagesDirectory)Microsoft.VSSDK.Debugger.VSDebugEng.$(ConcordPackageVersion)\inc\vsdebugeng.templates.h" />
     <ClInclude Include="_HelloWorldService.h" />
     <ClInclude Include="dllmain.h" />
     <ClInclude Include="HelloWorldDataItem.h" />
     <ClInclude Include="Resource.h" />
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="targetver.h" />
     <ClInclude Include="$(IntDir)HelloWorld.Contract.h" />
-    <ClInclude Include="$(ConcordSDKDir)Common\inc\vsdebugeng.h" />
-    <ClInclude Include="$(ConcordSDKDir)Common\inc\inc\vsdebugeng.templates.h" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="HelloWorld.rc" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="$(NugetPackagesDirectory)Microsoft.VSSDK.Debugger.VSDConfigTool.$(ConcordPackageVersion)\content\vsdconfig.xsd">
+      <SubType>Designer</SubType>
+    </None>
+  </ItemGroup>
   <ItemGroup>
     <VsdConfigXmlFiles Include="HelloWorld.vsdconfigxml" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(ConcordSDKDir)Tools\bin\Microsoft.VSDebugger.targets" />
+    <Import Project="$(NugetPackagesDirectory)Microsoft.VSSDK.Debugger.VSDConfigTool.$(ConcordPackageVersion)\build\Microsoft.VSSDK.Debugger.VSDConfigTool.targets" Condition="Exists('$(NugetPackagesDirectory)Microsoft.VSSDK.Debugger.VSDConfigTool.$(ConcordPackageVersion)\build\Microsoft.VSSDK.Debugger.VSDConfigTool.targets')" />
+    <Import Project="$(NugetPackagesDirectory)Microsoft.VSSDK.Debugger.VSDebugEng.$(ConcordPackageVersion)\Microsoft.VSSDK.Debugger.VSDebugEng.targets" Condition="Exists('$(NugetPackagesDirectory)Microsoft.VSSDK.Debugger.VSDebugEng.$(ConcordPackageVersion)\Microsoft.VSSDK.Debugger.VSDebugEng.targets')" />
   </ImportGroup>
+  <Target Name="VerifyConcordNugetPackagesRestored" BeforeTargets="PrepareForBuild">
+    <Error Condition="!Exists('$(NugetPackagesDirectory)Microsoft.VSSDK.Debugger.VSDConfigTool.$(ConcordPackageVersion)\build\Microsoft.VSSDK.Debugger.VSDConfigTool.targets')" Text="Could not find Microsoft.VSSDK.Debugger.VSDConfigTool.targets. Right click on the solution and restore NuGet packages." />
+    <Error Condition="!Exists('$(NugetPackagesDirectory)Microsoft.VSSDK.Debugger.VSDebugEng.$(ConcordPackageVersion)\Microsoft.VSSDK.Debugger.VSDebugEng.targets')" Text="Could not find Microsoft.VSSDK.Debugger.VSDebugEng.targets. Right click on the solution and restore NuGet packages." />
+  </Target>
 </Project>
diff --git a/HelloWorld/Cpp/dll/HelloWorld.vcxproj.filters b/HelloWorld/Cpp/dll/HelloWorld.vcxproj.filters
@@ -39,6 +39,8 @@
     <None Include="HelloWorld.def">
       <Filter>Source Files</Filter>
     </None>
+    <None Include="packages.config" />
+    <None Include="packages.version.props" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="_HelloWorldService.h">
@@ -62,16 +64,21 @@
     <ClInclude Include="$(IntDir)HelloWorld.Contract.h">
       <Filter>Generated Files</Filter>
     </ClInclude>
-    <ClInclude Include="$(ConcordSDKDir)Common\inc\vsdebugeng.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="$(NugetPackagesDirectory)Microsoft.VSSDK.Debugger.VSDebugEng.$(ConcordPackageVersion)\inc\VSDebugEng.h">
+      <Filter>Concord API %28for reference%29</Filter>
     </ClInclude>
-    <ClInclude Include="$(ConcordSDKDir)Common\inc\inc\vsdebugeng.templates.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="$(NugetPackagesDirectory)Microsoft.VSSDK.Debugger.VSDebugEng.$(ConcordPackageVersion)\inc\vsdebugeng.templates.h">
+      <Filter>Concord API %28for reference%29</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="HelloWorld.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="$(NugetPackagesDirectory)Microsoft.VSSDK.Debugger.VSDConfigTool.$(ConcordPackageVersion)\content\vsdconfig.xsd">
+      <Filter>Concord API %28for reference%29</Filter>
+    </None>
+  </ItemGroup>
 </Project>
diff --git a/HelloWorld/Cpp/dll/packages.config b/HelloWorld/Cpp/dll/packages.config
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <!--
+  ** IMPORTANT!!! **
+  * When changing this file, also update packages.props
+  -->
+
+  <package id="Microsoft.VSSDK.Debugger.VSDebugEng" version="16.0.2012201-preview" developmentDependency="true" />
+  <package id="Microsoft.VSSDK.Debugger.VSDConfigTool" version="16.0.2012201-preview" developmentDependency="true" />
+
+</packages>
diff --git a/HelloWorld/Cpp/dll/packages.version.props b/HelloWorld/Cpp/dll/packages.version.props
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <!-- NOTE: This needs to stay in sync with packages.config -->
+    <ConcordPackageVersion>16.0.2012201-preview</ConcordPackageVersion>
+  </PropertyGroup>
+</Project>
diff --git a/HelloWorld/Cpp/vsix/source.extension.vsixmanifest b/HelloWorld/Cpp/vsix/source.extension.vsixmanifest
@@ -6,7 +6,7 @@
     <Description xml:space="preserve">C++ HelloWorld Debugger Sample</Description>
   </Metadata>
   <Installation>
-    <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[14.0, 15.0]" />
+    <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[14.0, 16.0]" />
   </Installation>
   <Prerequisites>
     <Prerequisite Id="Microsoft.VisualStudio.Debugger" Version="[15.0,)" DisplayName="Visual Studio Debugger" />

diff --git a/HelloWorld/Cpp/vsix/vsix.vcxproj b/HelloWorld/Cpp/vsix/vsix.vcxproj
@@ -28,17 +28,8 @@
     <ProjectGuid>{0E22D156-940B-431D-945D-51B7DFA08AEF}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>vsix</RootNamespace>
-    <PlatformToolset>v140</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
-
-    <!--Try and find an SDK which is installed-->
-    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'=='' and Exists('$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.14393.0\um\WinBase.h')">10.0.14393.0</WindowsTargetPlatformVersion>
-
-    <!--Failing that, fall back to some defaults-->
-    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'=='' and '$(VisualStudioVersion)' == '15.0'">10.0.14393.0</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'=='' and '$(VisualStudioVersion)' == '14.0'">10.0.10240.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="..\Cpp.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>NONE</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>

diff --git a/HelloWorld/Cs/HelloWorld.sln b/HelloWorld/Cs/HelloWorld.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.23107.0
+# Visual Studio Version 16
+VisualStudioVersion = 16.65535.65535.65535
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "vsix", "vsix\vsix.csproj", "{BDC856C1-DC07-4BF0-916E-8FD1419D0ED4}"
 EndProject

diff --git a/HelloWorld/Cs/dll/HelloWorld.csproj b/HelloWorld/Cs/dll/HelloWorld.csproj
@@ -10,14 +10,10 @@
     <RootNamespace>HelloWorld</RootNamespace>
     <AssemblyName>HelloWorld</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <RuntimeIdentifiers>win</RuntimeIdentifiers>
     <FileAlignment>512</FileAlignment>
-
-    <VSSDKRoot Condition="'$(DevEnvDir)'!='' and Exists('$(DevEnvDir)..\..\VSSDK\VisualStudioIntegration\')">$([System.IO.Path]::GetFullPath('$(DevEnvDir)..\..\VSSDK\'))</VSSDKRoot>
-    <VSSDKRoot Condition="'$(VSSDKRoot)'==''">$(registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\VSIP\14.0\@InstallDir)</VSSDKRoot>
-    <VSSDKRoot Condition="'$(VSSDKRoot)'==''">$(registry:HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\VisualStudio\VSIP\14.0\@InstallDir)</VSSDKRoot>
-    <VSSDKRoot Condition="'$(VSSDKRoot)'!='' and '$(VSSDKRoot.EndsWith(&quot;\&quot;))'=='false'">$(VSSDKRoot)\</VSSDKRoot>
-    <!--Root directory to Concord SDK install; includes the trailing backslash '\'.-->
-    <ConcordSDKDir>$(VSSDKRoot)VisualStudioIntegration\</ConcordSDKDir>
+    <!--This is version of the Concord API packages -->
+    <ConcordPackageVersion>16.0.2012201-preview</ConcordPackageVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -44,10 +40,6 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml" />
-    <Reference Include="Microsoft.VisualStudio.Debugger.Engine">
-      <HintPath>$(ConcordSDKDir)Reference Assemblies\Microsoft.VisualStudio.Debugger.Engine.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="*.cs" />
@@ -56,8 +48,18 @@
   <ItemGroup>
     <VsdConfigXmlFiles Include="HelloWorld.vsdconfigxml" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.VisualStudio.Debugger.Engine" Version="$(ConcordPackageVersion)">
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <!--Reference the VSDConfigTool package. This brings build tools used to compile the .vsdconfigxml
+    file into a .vsdconfig file.-->
+    <PackageReference Include="Microsoft.VSSDK.Debugger.VSDConfigTool" Version="$(ConcordPackageVersion)">
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(ConcordSDKDir)Tools\bin\Microsoft.VSDebugger.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">

diff --git a/HelloWorld/Cs/vsix/source.extension.vsixmanifest b/HelloWorld/Cs/vsix/source.extension.vsixmanifest
@@ -6,7 +6,7 @@
     <Description xml:space="preserve">C# HelloWorld Debugger Sample</Description>
   </Metadata>
   <Installation>
-    <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[14.0, 15.0]" />
+    <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[14.0, 16.0]" />
   </Installation>
   <Prerequisites>
     <Prerequisite Id="Microsoft.VisualStudio.Debugger" Version="[15.0,)" DisplayName="Visual Studio Debugger" />