From db15d89f895d70a51bde053e1c842b94e3c04538 Mon Sep 17 00:00:00 2001
From: Gregg Miskelly <greggm@microsoft.com>
Date: Thu, 22 Jan 2026 09:11:50 -0800
Subject: [PATCH 1/7] Rename vsix.vcxproj->vsix.csproj

---
 CppCustomVisualizer/CppCustomVisualizer.sln                     | 2 +-
 .../vsix/vsix.vcxproj => CppCustomVisualizer/vsix/vsix.csproj   | 1 +
 CppCustomVisualizer2/CppCustomVisualizer.sln                    | 2 +-
 .../vsix/vsix.vcxproj => CppCustomVisualizer2/vsix/vsix.csproj  | 0
 HelloWorld/Cpp/HelloWorld.sln                                   | 2 +-
 HelloWorld/Cpp/vsix/{vsix.vcxproj => vsix.csproj}               | 0
 6 files changed, 4 insertions(+), 3 deletions(-)
 rename CppCustomVisualizer2/vsix/vsix.vcxproj => CppCustomVisualizer/vsix/vsix.csproj (98%)
 rename CppCustomVisualizer/vsix/vsix.vcxproj => CppCustomVisualizer2/vsix/vsix.csproj (100%)
 rename HelloWorld/Cpp/vsix/{vsix.vcxproj => vsix.csproj} (100%)

diff --git a/CppCustomVisualizer/CppCustomVisualizer.sln b/CppCustomVisualizer/CppCustomVisualizer.sln
index 592b4d7..b339f38 100644
--- a/CppCustomVisualizer/CppCustomVisualizer.sln
+++ b/CppCustomVisualizer/CppCustomVisualizer.sln
@@ -8,7 +8,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		README.md = README.md
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vsix", "vsix\vsix.vcxproj", "{0E22D156-940B-431D-945D-51B7DFA08AEF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vsix", "vsix\vsix.csproj", "{0E22D156-940B-431D-945D-51B7DFA08AEF}"
 	ProjectSection(ProjectDependencies) = postProject
 		{F7062FB7-42BB-4FEF-8E9B-2F65FFC7EAFA} = {F7062FB7-42BB-4FEF-8E9B-2F65FFC7EAFA}
 	EndProjectSection
diff --git a/CppCustomVisualizer2/vsix/vsix.vcxproj b/CppCustomVisualizer/vsix/vsix.csproj
similarity index 98%
rename from CppCustomVisualizer2/vsix/vsix.vcxproj
rename to CppCustomVisualizer/vsix/vsix.csproj
index ce538f3..c227276 100644
--- a/CppCustomVisualizer2/vsix/vsix.vcxproj
+++ b/CppCustomVisualizer/vsix/vsix.csproj
@@ -14,6 +14,7 @@
     <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+	<DeployExtension>true</DeployExtension>
   </PropertyGroup>
   <PropertyGroup>
     <TargetVsixContainerName>CppCustomVisualizer.vsix</TargetVsixContainerName>
diff --git a/CppCustomVisualizer2/CppCustomVisualizer.sln b/CppCustomVisualizer2/CppCustomVisualizer.sln
index 592b4d7..b339f38 100644
--- a/CppCustomVisualizer2/CppCustomVisualizer.sln
+++ b/CppCustomVisualizer2/CppCustomVisualizer.sln
@@ -8,7 +8,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		README.md = README.md
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vsix", "vsix\vsix.vcxproj", "{0E22D156-940B-431D-945D-51B7DFA08AEF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vsix", "vsix\vsix.csproj", "{0E22D156-940B-431D-945D-51B7DFA08AEF}"
 	ProjectSection(ProjectDependencies) = postProject
 		{F7062FB7-42BB-4FEF-8E9B-2F65FFC7EAFA} = {F7062FB7-42BB-4FEF-8E9B-2F65FFC7EAFA}
 	EndProjectSection
diff --git a/CppCustomVisualizer/vsix/vsix.vcxproj b/CppCustomVisualizer2/vsix/vsix.csproj
similarity index 100%
rename from CppCustomVisualizer/vsix/vsix.vcxproj
rename to CppCustomVisualizer2/vsix/vsix.csproj
diff --git a/HelloWorld/Cpp/HelloWorld.sln b/HelloWorld/Cpp/HelloWorld.sln
index 8eb4d81..4f2b3ed 100644
--- a/HelloWorld/Cpp/HelloWorld.sln
+++ b/HelloWorld/Cpp/HelloWorld.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.65535.65535.65535
 MinimumVisualStudioVersion = 17.0.0.0
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vsix", "vsix\vsix.vcxproj", "{0E22D156-940B-431D-945D-51B7DFA08AEF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vsix", "vsix\vsix.csproj", "{0E22D156-940B-431D-945D-51B7DFA08AEF}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloWorld", "dll\HelloWorld.vcxproj", "{D547DF85-7B84-462C-BCE7-8F166D7C543D}"
 EndProject
diff --git a/HelloWorld/Cpp/vsix/vsix.vcxproj b/HelloWorld/Cpp/vsix/vsix.csproj
similarity index 100%
rename from HelloWorld/Cpp/vsix/vsix.vcxproj
rename to HelloWorld/Cpp/vsix/vsix.csproj

From 258093b38c9e8d79e8c78ead302fe859c435b105 Mon Sep 17 00:00:00 2001
From: Gregg Miskelly <greggm@microsoft.com>
Date: Thu, 22 Jan 2026 11:38:37 -0800
Subject: [PATCH 2/7] Migrate HelloWorld\Cpp

---
 HelloWorld/Cpp/HelloWorld.sln   |  8 ++-
 HelloWorld/Cpp/vsix/vsix.csproj | 92 +++++++++++++++------------------
 2 files changed, 46 insertions(+), 54 deletions(-)

diff --git a/HelloWorld/Cpp/HelloWorld.sln b/HelloWorld/Cpp/HelloWorld.sln
index 4f2b3ed..6561057 100644
--- a/HelloWorld/Cpp/HelloWorld.sln
+++ b/HelloWorld/Cpp/HelloWorld.sln
@@ -1,15 +1,13 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.65535.65535.65535
+# Visual Studio Version 18
+VisualStudioVersion = 18.65535.65535.65535
 MinimumVisualStudioVersion = 17.0.0.0
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vsix", "vsix\vsix.csproj", "{0E22D156-940B-431D-945D-51B7DFA08AEF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "vsix", "vsix\vsix.csproj", "{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
-	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/HelloWorld/Cpp/vsix/vsix.csproj b/HelloWorld/Cpp/vsix/vsix.csproj
index aab5bcc..68c6335 100644
--- a/HelloWorld/Cpp/vsix/vsix.csproj
+++ b/HelloWorld/Cpp/vsix/vsix.csproj
@@ -1,23 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
+    <MinimumVisualStudioVersion>17.0</MinimumVisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
   </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
     <TargetVsixContainerName>HelloWorld-Cpp.vsix</TargetVsixContainerName>
     <ProjectTypeGuids>{82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ProjectGuid>{0E22D156-940B-431D-945D-51B7DFA08AEF}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>vsix</RootNamespace>
+    <AssemblyName>vsix</AssemblyName>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <GeneratePkgDefFile>false</GeneratePkgDefFile>
     <IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
     <IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
@@ -25,56 +24,51 @@
     <CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
     <CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
   </PropertyGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{0E22D156-940B-431D-945D-51B7DFA08AEF}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>vsix</RootNamespace>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
-  <Import Project="..\..\..\build\targets\Cpp.props" />
-  <PropertyGroup Label="Configuration">
-    <ConfigurationType>NONE</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup>
-    <LocalDebuggerCommand>$(DevEnvDir)devenv.exe</LocalDebuggerCommand>
-    <LocalDebuggerCommandArguments>/rootsuffix Exp</LocalDebuggerCommandArguments>
-    <LocalDebuggerWorkingDirectory>$(DevEnvDir)</LocalDebuggerWorkingDirectory>
-    <LocalDebuggerAttach>false</LocalDebuggerAttach>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+    <StartAction>Program</StartAction>
+    <!--Force use of the native debugger for this project since the sample is implemented in native.
+	Comment this out if you need to debug managed code in the devenv.exe process as well.-->
+    <DebugEngines>{92EF0900-2251-11D2-B72E-0000F87572EF}</DebugEngines>
+    <StartProgram>$(DevEnvDir)devenv.exe</StartProgram>
+    <StartWorkingDirectory>$(DevEnvDir)</StartWorkingDirectory>
+    <StartArguments>/rootsuffix Exp</StartArguments>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>..\$(Configuration)\$(Platform)\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>..\$(Configuration)\$(Platform)\</OutDir>
-  </PropertyGroup>
-  <!--Provide an empty CoreCompile target to make the build happy-->
-  <Target Name="CoreCompile">
-  </Target>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
   <ItemGroup>
     <None Include="source.extension.vsixmanifest">
       <SubType>Designer</SubType>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.VisualStudio.SDK" Version="17.0.32112.339" ExcludeAssets="runtime" NoWarn="NU1604" />
+    <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="17.14.2120" NoWarn="NU1604" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\HelloWorld.vcxproj">
-      <Project>{d547df85-7b84-462c-bce7-8f166d7c543d}</Project>
+      <Project>{D547DF85-7B84-462C-BCE7-8F166D7C543D}</Project>
       <Name>HelloWorld</Name>
       <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bBuiltProjectOutputGroupDependencies%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
\ No newline at end of file

From d8a6447755eed881e0c3276841bd11913391af73 Mon Sep 17 00:00:00 2001
From: Gregg Miskelly <greggm@microsoft.com>
Date: Thu, 22 Jan 2026 11:42:50 -0800
Subject: [PATCH 3/7] Migrate HelloWorld\Cs

---
 HelloWorld/Cs/HelloWorld.sln   |  4 ++--
 HelloWorld/Cs/vsix/vsix.csproj | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/HelloWorld/Cs/HelloWorld.sln b/HelloWorld/Cs/HelloWorld.sln
index 29adb5a..8781c92 100644
--- 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 Version 17
-VisualStudioVersion = 17.65535.65535.65535
+# Visual Studio Version 18
+VisualStudioVersion = 18.65535.65535.65535
 MinimumVisualStudioVersion = 17.0.0.0
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "vsix", "vsix\vsix.csproj", "{BDC856C1-DC07-4BF0-916E-8FD1419D0ED4}"
 EndProject
diff --git a/HelloWorld/Cs/vsix/vsix.csproj b/HelloWorld/Cs/vsix/vsix.csproj
index 93961f2..8f8d925 100644
--- a/HelloWorld/Cs/vsix/vsix.csproj
+++ b/HelloWorld/Cs/vsix/vsix.csproj
@@ -1,13 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <!--Visual Studio will use the value of will use MinimumVisualStudioVersion to detect if a project needs to be updated.
-    To allow the project to be loaded in multiple VS versions, conditionally check the project -->
-    <MinimumVisualStudioVersion Condition="'$(VisualStudioVersion)' == '15.0'">15.0</MinimumVisualStudioVersion>
-    <MinimumVisualStudioVersion Condition="'$(VisualStudioVersion)' != '15.0'">14.0</MinimumVisualStudioVersion>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
+    <MinimumVisualStudioVersion>17.0</MinimumVisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -60,11 +55,16 @@
       <SubType>Designer</SubType>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.VisualStudio.SDK" Version="17.0.32112.339" ExcludeAssets="runtime" NoWarn="NU1604" />
+    <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="17.14.2120" NoWarn="NU1604" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\HelloWorld.csproj">
       <Project>{9C899D87-5BFA-4886-B701-68C515F1371C}</Project>
       <Name>HelloWorld</Name>
       <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bBuiltProjectOutputGroupDependencies%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

From 4e72cda8848f746a372b3325aee4c758c9c48643 Mon Sep 17 00:00:00 2001
From: Gregg Miskelly <greggm@microsoft.com>
Date: Thu, 22 Jan 2026 12:07:19 -0800
Subject: [PATCH 4/7] Migrate CppCustomVisualizer

---
 CppCustomVisualizer/CppCustomVisualizer.sln |  6 +-
 CppCustomVisualizer/vsix/vsix.csproj        | 84 ++++++++++-----------
 2 files changed, 44 insertions(+), 46 deletions(-)

diff --git a/CppCustomVisualizer/CppCustomVisualizer.sln b/CppCustomVisualizer/CppCustomVisualizer.sln
index b339f38..7c220d4 100644
--- a/CppCustomVisualizer/CppCustomVisualizer.sln
+++ b/CppCustomVisualizer/CppCustomVisualizer.sln
@@ -1,14 +1,14 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.65535.65535.65535
+# Visual Studio Version 18
+VisualStudioVersion = 18.65535.65535.65535
 MinimumVisualStudioVersion = 17.0.0.0
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{1375CB4F-7AD1-4269-927D-54AA9052B9BF}"
 	ProjectSection(SolutionItems) = preProject
 		README.md = README.md
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vsix", "vsix\vsix.csproj", "{0E22D156-940B-431D-945D-51B7DFA08AEF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "vsix", "vsix\vsix.csproj", "{0E22D156-940B-431D-945D-51B7DFA08AEF}"
 	ProjectSection(ProjectDependencies) = postProject
 		{F7062FB7-42BB-4FEF-8E9B-2F65FFC7EAFA} = {F7062FB7-42BB-4FEF-8E9B-2F65FFC7EAFA}
 	EndProjectSection
diff --git a/CppCustomVisualizer/vsix/vsix.csproj b/CppCustomVisualizer/vsix/vsix.csproj
index c227276..76afd4e 100644
--- a/CppCustomVisualizer/vsix/vsix.csproj
+++ b/CppCustomVisualizer/vsix/vsix.csproj
@@ -1,24 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
+    <MinimumVisualStudioVersion>17.0</MinimumVisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-	<DeployExtension>true</DeployExtension>
   </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
     <TargetVsixContainerName>CppCustomVisualizer.vsix</TargetVsixContainerName>
     <ProjectTypeGuids>{82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ProjectGuid>{0E22D156-940B-431D-945D-51B7DFA08AEF}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>vsix</RootNamespace>
+    <AssemblyName>vsix</AssemblyName>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <GeneratePkgDefFile>false</GeneratePkgDefFile>
     <IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
     <IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
@@ -26,45 +24,45 @@
     <CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
     <CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
   </PropertyGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{0E22D156-940B-431D-945D-51B7DFA08AEF}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>vsix</RootNamespace>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
-  <Import Project="..\..\build\targets\Cpp.props" />
-  <PropertyGroup Label="Configuration">
-    <ConfigurationType>NONE</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup>
-    <LocalDebuggerCommand>$(DevEnvDir)devenv.exe</LocalDebuggerCommand>
-    <LocalDebuggerCommandArguments>/rootsuffix Exp "$(SolutionDir)\TargetApp\TargetApp.sln"</LocalDebuggerCommandArguments>
-    <LocalDebuggerWorkingDirectory>$(DevEnvDir)</LocalDebuggerWorkingDirectory>
-    <LocalDebuggerAttach>false</LocalDebuggerAttach>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+    <StartAction>Program</StartAction>
+    <!--Force use of the native debugger for this project since the sample is implemented in native.
+	Comment this out if you need to debug managed code in the devenv.exe process as well.-->
+    <DebugEngines>{92EF0900-2251-11D2-B72E-0000F87572EF}</DebugEngines>
+    <StartProgram>$(DevEnvDir)devenv.exe</StartProgram>
+    <StartWorkingDirectory>$(DevEnvDir)</StartWorkingDirectory>
+    <StartArguments>/rootsuffix Exp "$(SolutionDir)\TargetApp\TargetApp.sln"</StartArguments>
   </PropertyGroup>
-  <!--Provide an empty CoreCompile target to make the build happy-->
-  <Target Name="CoreCompile">
-  </Target>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
   <ItemGroup>
     <None Include="source.extension.vsixmanifest">
       <SubType>Designer</SubType>
     </None>
     <None Include="VSIXSourceItems.props" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.VisualStudio.SDK" Version="17.0.32112.339" ExcludeAssets="runtime" NoWarn="NU1604" />
+    <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="17.14.2120" NoWarn="NU1604" />
+  </ItemGroup>
   <Import Project="VSIXSourceItems.props"/>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
\ No newline at end of file

From 7c7a47adf5c9c6988b079b1dcae4f170a86b3b76 Mon Sep 17 00:00:00 2001
From: Gregg Miskelly <greggm@microsoft.com>
Date: Thu, 22 Jan 2026 12:24:16 -0800
Subject: [PATCH 5/7] Migrate CppCustomVisuazer2

---
 CppCustomVisualizer2/CppCustomVisualizer.sln |  6 +-
 CppCustomVisualizer2/vsix/vsix.csproj        | 83 ++++++++++----------
 2 files changed, 44 insertions(+), 45 deletions(-)

diff --git a/CppCustomVisualizer2/CppCustomVisualizer.sln b/CppCustomVisualizer2/CppCustomVisualizer.sln
index b339f38..7c220d4 100644
--- a/CppCustomVisualizer2/CppCustomVisualizer.sln
+++ b/CppCustomVisualizer2/CppCustomVisualizer.sln
@@ -1,14 +1,14 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.65535.65535.65535
+# Visual Studio Version 18
+VisualStudioVersion = 18.65535.65535.65535
 MinimumVisualStudioVersion = 17.0.0.0
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{1375CB4F-7AD1-4269-927D-54AA9052B9BF}"
 	ProjectSection(SolutionItems) = preProject
 		README.md = README.md
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vsix", "vsix\vsix.csproj", "{0E22D156-940B-431D-945D-51B7DFA08AEF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "vsix", "vsix\vsix.csproj", "{0E22D156-940B-431D-945D-51B7DFA08AEF}"
 	ProjectSection(ProjectDependencies) = postProject
 		{F7062FB7-42BB-4FEF-8E9B-2F65FFC7EAFA} = {F7062FB7-42BB-4FEF-8E9B-2F65FFC7EAFA}
 	EndProjectSection
diff --git a/CppCustomVisualizer2/vsix/vsix.csproj b/CppCustomVisualizer2/vsix/vsix.csproj
index ce538f3..76afd4e 100644
--- a/CppCustomVisualizer2/vsix/vsix.csproj
+++ b/CppCustomVisualizer2/vsix/vsix.csproj
@@ -1,23 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
+    <MinimumVisualStudioVersion>17.0</MinimumVisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
   </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
     <TargetVsixContainerName>CppCustomVisualizer.vsix</TargetVsixContainerName>
     <ProjectTypeGuids>{82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ProjectGuid>{0E22D156-940B-431D-945D-51B7DFA08AEF}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>vsix</RootNamespace>
+    <AssemblyName>vsix</AssemblyName>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <GeneratePkgDefFile>false</GeneratePkgDefFile>
     <IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
     <IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
@@ -25,45 +24,45 @@
     <CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
     <CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
   </PropertyGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{0E22D156-940B-431D-945D-51B7DFA08AEF}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>vsix</RootNamespace>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
-  <Import Project="..\..\build\targets\Cpp.props" />
-  <PropertyGroup Label="Configuration">
-    <ConfigurationType>NONE</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup>
-    <LocalDebuggerCommand>$(DevEnvDir)devenv.exe</LocalDebuggerCommand>
-    <LocalDebuggerCommandArguments>/rootsuffix Exp "$(SolutionDir)\TargetApp\TargetApp.sln"</LocalDebuggerCommandArguments>
-    <LocalDebuggerWorkingDirectory>$(DevEnvDir)</LocalDebuggerWorkingDirectory>
-    <LocalDebuggerAttach>false</LocalDebuggerAttach>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+    <StartAction>Program</StartAction>
+    <!--Force use of the native debugger for this project since the sample is implemented in native.
+	Comment this out if you need to debug managed code in the devenv.exe process as well.-->
+    <DebugEngines>{92EF0900-2251-11D2-B72E-0000F87572EF}</DebugEngines>
+    <StartProgram>$(DevEnvDir)devenv.exe</StartProgram>
+    <StartWorkingDirectory>$(DevEnvDir)</StartWorkingDirectory>
+    <StartArguments>/rootsuffix Exp "$(SolutionDir)\TargetApp\TargetApp.sln"</StartArguments>
   </PropertyGroup>
-  <!--Provide an empty CoreCompile target to make the build happy-->
-  <Target Name="CoreCompile">
-  </Target>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
   <ItemGroup>
     <None Include="source.extension.vsixmanifest">
       <SubType>Designer</SubType>
     </None>
     <None Include="VSIXSourceItems.props" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.VisualStudio.SDK" Version="17.0.32112.339" ExcludeAssets="runtime" NoWarn="NU1604" />
+    <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="17.14.2120" NoWarn="NU1604" />
+  </ItemGroup>
   <Import Project="VSIXSourceItems.props"/>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
\ No newline at end of file

From 03746a193e8ccccb05b99d0fb6c703b4134b7ae5 Mon Sep 17 00:00:00 2001
From: Gregg Miskelly <greggm@microsoft.com>
Date: Thu, 22 Jan 2026 12:26:38 -0800
Subject: [PATCH 6/7] Update version numbers in .sln files

---
 CppCustomVisualizer/TargetApp/TargetApp.sln  | 4 ++--
 CppCustomVisualizer2/TargetApp/TargetApp.sln | 4 ++--
 Iris/Iris.sln                                | 4 ++--
 Iris/Programs/TicTacToe.sln                  | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/CppCustomVisualizer/TargetApp/TargetApp.sln b/CppCustomVisualizer/TargetApp/TargetApp.sln
index 92ba0a3..360f0f2 100644
--- a/CppCustomVisualizer/TargetApp/TargetApp.sln
+++ b/CppCustomVisualizer/TargetApp/TargetApp.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.65535.65535.65535
+# Visual Studio Version 18
+VisualStudioVersion = 18.65535.65535.65535
 MinimumVisualStudioVersion = 17.0.0.0
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TargetApp", "TargetApp.vcxproj", "{CFE3A899-F357-4721-B717-9BB5F6A108E3}"
 EndProject
diff --git a/CppCustomVisualizer2/TargetApp/TargetApp.sln b/CppCustomVisualizer2/TargetApp/TargetApp.sln
index 92ba0a3..360f0f2 100644
--- a/CppCustomVisualizer2/TargetApp/TargetApp.sln
+++ b/CppCustomVisualizer2/TargetApp/TargetApp.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.65535.65535.65535
+# Visual Studio Version 18
+VisualStudioVersion = 18.65535.65535.65535
 MinimumVisualStudioVersion = 17.0.0.0
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TargetApp", "TargetApp.vcxproj", "{CFE3A899-F357-4721-B717-9BB5F6A108E3}"
 EndProject
diff --git a/Iris/Iris.sln b/Iris/Iris.sln
index 8ca59c4..70bb780 100644
--- a/Iris/Iris.sln
+++ b/Iris/Iris.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.65535.65535.65535
+# Visual Studio Version 18
+VisualStudioVersion = 18.65535.65535.65535
 MinimumVisualStudioVersion = 17.0.0.0
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "vsix", "vsix\vsix.csproj", "{5AA27035-AE02-4B58-AE01-02E1D1ECB8D3}"
 	ProjectSection(ProjectDependencies) = postProject
diff --git a/Iris/Programs/TicTacToe.sln b/Iris/Programs/TicTacToe.sln
index 68969fb..bd52616 100644
--- a/Iris/Programs/TicTacToe.sln
+++ b/Iris/Programs/TicTacToe.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.65535.65535.65535
+# Visual Studio Version 18
+VisualStudioVersion = 18.65535.65535.65535
 MinimumVisualStudioVersion = 17.0.0.0
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TicTacToe", "TicTacToe.csproj", "{4D255E19-A90B-44EC-81DB-297A965490AD}"
 EndProject

From aa583fc1d391c97426c30f5365660fdc7a801397 Mon Sep 17 00:00:00 2001
From: Gregg Miskelly <greggm@microsoft.com>
Date: Thu, 22 Jan 2026 12:29:40 -0800
Subject: [PATCH 7/7] Update Iris

---
 Iris/vsix/vsix.csproj | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/Iris/vsix/vsix.csproj b/Iris/vsix/vsix.csproj
index 2fbfea5..0e2be11 100644
--- a/Iris/vsix/vsix.csproj
+++ b/Iris/vsix/vsix.csproj
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <!--Visual Studio will use the value of will use MinimumVisualStudioVersion to detect if a project needs to be updated.
-    To allow the project to be loaded in multiple VS versions, conditionally check the project -->
-    <MinimumVisualStudioVersion Condition="'$(VisualStudioVersion)' == '15.0'">15.0</MinimumVisualStudioVersion>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">16.0</VisualStudioVersion>
+    <MinimumVisualStudioVersion>17.0</MinimumVisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
@@ -59,10 +56,8 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="17.3.2093">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
+    <PackageReference Include="Microsoft.VisualStudio.SDK" Version="17.0.32112.339" ExcludeAssets="runtime" NoWarn="NU1604" />
+    <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="17.14.2120" NoWarn="NU1604" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\IrisExtension\IrisExtension.csproj">