Fix a targets bug

VsVim · Jul 20, 2021 · 57b8174 · 57b8174
1 parent e3a1e2c
commit 57b8174
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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 -->