From cddb3f5e20a2f03e1863414353e7b6a9f6aeed41 Mon Sep 17 00:00:00 2001
From: Justin Clareburt <justinclareburt@gmail.com>
Date: Tue, 9 Nov 2021 13:15:48 +1000
Subject: [PATCH] Upgraded to VS2022

---
 EmacsEmulation.csproj         | 13 ++++---------
 ReleaseNotes.txt              |  1 +
 source.extension.vsixmanifest |  7 +++++--
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/EmacsEmulation.csproj b/EmacsEmulation.csproj
index 1eb96bd..375eb5f 100644
--- a/EmacsEmulation.csproj
+++ b/EmacsEmulation.csproj
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
-  <Import Project="packages\Microsoft.VSSDK.BuildTools.15.5.100\build\Microsoft.VSSDK.BuildTools.props" Condition="Exists('packages\Microsoft.VSSDK.BuildTools.15.5.100\build\Microsoft.VSSDK.BuildTools.props')" />
   <PropertyGroup>
     <MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">15.0</VisualStudioVersion>
@@ -392,14 +391,10 @@ resources
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('packages\Microsoft.VSSDK.BuildTools.15.5.100\build\Microsoft.VSSDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.VSSDK.BuildTools.15.5.100\build\Microsoft.VSSDK.BuildTools.props'))" />
-    <Error Condition="!Exists('packages\Microsoft.VSSDK.BuildTools.15.5.100\build\Microsoft.VSSDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.VSSDK.BuildTools.15.5.100\build\Microsoft.VSSDK.BuildTools.targets'))" />
-  </Target>
-  <Import Project="packages\Microsoft.VSSDK.BuildTools.15.5.100\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('packages\Microsoft.VSSDK.BuildTools.15.5.100\build\Microsoft.VSSDK.BuildTools.targets')" />
+  <ItemGroup>
+    <PackageReference Include="Microsoft.VisualStudio.SDK" Version="17.0.0-previews-4-31709-430" ExcludeAssets="runtime" />
+    <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="17.0.5232" />
+  </ItemGroup>
   <!-- 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/ReleaseNotes.txt b/ReleaseNotes.txt
index 2cb7e61..7be7954 100644
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -1,6 +1,7 @@
 Emacs Emulation
 [Open source code forked from https://github.com/zbrad/EmacsKeys]
 
+09-Nov-2021 - v5.0: Upgraded to VS2022
 30-Aug-2019 - v4.0: New version for VS2017 and VS2019.
 30-Aug-2019 - v3.1: This version ending support for VS2017 and VS2019. New version being released for VS2017/19
 04-Jun-2019 - v3.0: Upgraded to also run on 2019 (Thanks Linus Almström)
diff --git a/source.extension.vsixmanifest b/source.extension.vsixmanifest
index 0af51ee..04ac8a4 100644
--- a/source.extension.vsixmanifest
+++ b/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="EmacsEmulation.9CC71440-2082-4459-BFD0-193CE3C56471" Version="4.0" Language="en-US" Publisher="Justin Clareburt" />
+        <Identity Id="EmacsEmulation.9CC71440-2082-4459-BFD0-193CE3C56471" Version="5.0" Language="en-US" Publisher="Justin Clareburt" />
         <DisplayName>Emacs Emulation 2</DisplayName>
         <Description xml:space="preserve">Provides basic support for Emacs keybindings and text editing commands.</Description>
         <License>LICENSE.rtf</License>
@@ -11,7 +11,10 @@
         <Tags>emacs</Tags>
     </Metadata>
     <Installation InstalledByMsi="false" AllUsers="false">
-        <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[15.0,)" />
+        <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[15.0,17.0)" />
+        <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[17.0, )">
+            <ProductArchitecture>amd64</ProductArchitecture>
+        </InstallationTarget>
     </Installation>
     <Dependencies>
         <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,]" />