From 57b81741ad3c7618c6031dc326790adf1c8822fc Mon Sep 17 00:00:00 2001
From: Jared Parsons <jaredpparsons@gmail.com>
Date: Tue, 20 Jul 2021 11:48:54 -0700
Subject: [PATCH] Fix a targets bug

---
 References/Vs2022/Vs2022.Build.targets  | 1 -
 Src/VsVim2022/VsVim2022.csproj          | 2 +-
 Src/VsVimShared/VsVimHost.cs            | 4 ++--
 Test/VsVimTest2022/VsVimTest2022.csproj | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/References/Vs2022/Vs2022.Build.targets b/References/Vs2022/Vs2022.Build.targets
index 3c0a14a60..72c14696c 100644
--- a/References/Vs2022/Vs2022.Build.targets
+++ b/References/Vs2022/Vs2022.Build.targets
@@ -10,7 +10,6 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.VisualStudio.Sdk" Version="17.0.0-previews-2-31512-422" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.0.0-1.final" />
-    <PackageReference Include="Microsoft.VisualStudio.Sdk.EmbedInteropTypes" Version="15.0.36" ExcludeAssets="all" />
 
     <!--
       These are private assemblies and not typically considered as a part of the official VS SDK. But
diff --git a/Src/VsVim2022/VsVim2022.csproj b/Src/VsVim2022/VsVim2022.csproj
index c3ee80705..18eb91632 100644
--- a/Src/VsVim2022/VsVim2022.csproj
+++ b/Src/VsVim2022/VsVim2022.csproj
@@ -12,7 +12,7 @@
     <StartArguments>/rootsuffix Exp</StartArguments>
     <EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
     <VsVimProjectType>Vsix</VsVimProjectType>
-    <VsVimVisualStudioTargetVersion>16.0</VsVimVisualStudioTargetVersion>
+    <VsVimVisualStudioTargetVersion>17.0</VsVimVisualStudioTargetVersion>
 
     <!-- Enabling tracked by https://github.com/VsVim/VsVim/issues/2904 -->
     <RunAnalyzers>false</RunAnalyzers>
diff --git a/Src/VsVimShared/VsVimHost.cs b/Src/VsVimShared/VsVimHost.cs
index 9ba50eb89..06c03716e 100644
--- a/Src/VsVimShared/VsVimHost.cs
+++ b/Src/VsVimShared/VsVimHost.cs
@@ -25,7 +25,7 @@
 using System.Diagnostics;
 using Vim.Interpreter;
 
-#if VS_SPECIFIC_2019
+#if VS_SPECIFIC_2019 || VS_SPECIFIC_2022
 using Microsoft.VisualStudio.Platform.WindowManagement;
 using Microsoft.VisualStudio.PlatformUI.Shell;
 #elif VS_SPECIFIC_2017
@@ -752,7 +752,7 @@ public override int GetTabIndex(ITextView textView)
             return windowFrameState.ActiveWindowFrameIndex;
         }
 
-#if VS_SPECIFIC_2019
+#if VS_SPECIFIC_2019 || VS_SPECIFIC_2022
 
         /// <summary>
         /// Get the state of the active tab group in Visual Studio
diff --git a/Test/VsVimTest2022/VsVimTest2022.csproj b/Test/VsVimTest2022/VsVimTest2022.csproj
index fdf569964..0526347c3 100644
--- a/Test/VsVimTest2022/VsVimTest2022.csproj
+++ b/Test/VsVimTest2022/VsVimTest2022.csproj
@@ -4,7 +4,7 @@
     <RootNamespace>Vim.VisualStudio.UnitTest</RootNamespace>
     <AssemblyName>Vim.VisualStudio.Shared.2022.UnitTest</AssemblyName>
     <TargetFramework>net472</TargetFramework>
-    <VsVimVisualStudioTargetVersion>16.0</VsVimVisualStudioTargetVersion>
+    <VsVimVisualStudioTargetVersion>17.0</VsVimVisualStudioTargetVersion>
     <VsVimProjectType>EditorHost</VsVimProjectType>
     <DefineConstants>$(DefineConstants);VS_UNIT_TEST_HOST</DefineConstants>
     <!-- Enabling tracked by https://github.com/VsVim/VsVim/issues/2904 -->