Merge pull request #20 from justcla/VS2022

VS2022 Upgrade
justcla · Jan 23, 2022 · 11e9bcc · 11e9bcc
2 parents 5bba9cd + 8441cc9
commit 11e9bcc
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 6 deletions.
diff --git a/HotKeysVSIX/EmbeddedVSIX/KeyboardShortcutsManager-v2.1.0.vsix b/HotKeysVSIX/EmbeddedVSIX/KeyboardShortcutsManager-v2.1.0.vsix
diff --git a/HotKeysVSIX/EmbeddedVSIX/KeyboardShortcutsManager-v3.0.0.vsix b/HotKeysVSIX/EmbeddedVSIX/KeyboardShortcutsManager-v3.0.0.vsix
diff --git a/HotKeysVSIX/HotKeysVSIX.csproj b/HotKeysVSIX/HotKeysVSIX.csproj
@@ -48,7 +48,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="EmbeddedVSIX\KeyboardShortcutsManager-v2.1.0.vsix">
+    <Content Include="EmbeddedVSIX\KeyboardShortcutsManager-v3.0.0.vsix">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>

diff --git a/HotKeysVSIX/IntelliJ IDEA.vssettings b/HotKeysVSIX/IntelliJ IDEA.vssettings
@@ -67,6 +67,12 @@
         </DefaultShortcuts>
         <ShortcutsScheme/>
         <UserShortcuts>
+          <!-- Remove bindings that interfere at a lower scope -->
+          <RemoveShortcut Command="Edit.NextSubword" Scope="Text Editor">Ctrl+Alt+Right Arrow</RemoveShortcut>
+          <RemoveShortcut Command="Edit.NextSubwordExtend" Scope="Text Editor">Ctrl+Shift+Alt+Right Arrow</RemoveShortcut>
+          <RemoveShortcut Command="Edit.PreviousSubword" Scope="Text Editor">Ctrl+Alt+Left Arrow</RemoveShortcut>
+          <RemoveShortcut Command="Edit.PreviousSubwordExtend" Scope="Text Editor">Ctrl+Shift+Alt+Left Arrow</RemoveShortcut>
+          <RemoveShortcut Command="Edit.SelectCurrentWord" Scope="Text Editor">Ctrl+W</RemoveShortcut>
           <!-- Editing Key bindings -->
           <Shortcut Command="Edit.CompleteWord" Scope="Text Editor">Ctrl+Space</Shortcut>
           <Shortcut Command="Edit.SmartCompleteWord" Scope="Text Editor">Ctrl+Shift+Space</Shortcut>  <!-- NYI -->

diff --git a/HotKeysVSIX/ReleaseNotes.txt b/HotKeysVSIX/ReleaseNotes.txt
@@ -1,6 +1,8 @@
 Hot Keys - Keyboard Shortcuts
 by Justin Clareburt
-12-Jul-2019: v3.0.0 Basic upgrade for VS2019 compatibility. Included VSShortcutManager-v2.1.0
+19-Jan-2022: v4.0.0 Upgraded for VS2022+. Included KeyboardShortcutsManager-v3.0.0
+23-Jan-2022: v3.1.0 New version created for VS2017-VS2019 legacy maintenance.
+12-Jul-2019: v3.0.0 Basic upgrade for VS2019 compatibility. Included KeyboardShortcutsManager-v2.1.0
 16-Jan-2018: v2.0.2 Added shortcuts for new VS features: Duplicate Text and Expland Selection
 12-Jan-2018: v2.0.1 Embedded Keyboard Shortcuts Manager and supplied IntelliJ and R# VS and IDEA shortcut defs
 12-Aug-2017: v2.0.0 Moved to VSIX instead of MSI

diff --git a/HotKeysVSIX/source.extension.vsixmanifest b/HotKeysVSIX/source.extension.vsixmanifest
@@ -1,21 +1,24 @@
 <?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="HotKeys.e18a1a2b-78e5-4f4c-aade-448d36fd6016" Version="3.0.0" Language="en-US" Publisher="Justin Clareburt" />
+        <Identity Id="HotKeys.e18a1a2b-78e5-4f4c-aade-448d36fd6016" Version="4.0.0" Language="en-US" Publisher="Justin Clareburt" />
         <DisplayName>Hot Keys - Keyboard Shortcuts</DisplayName>
         <Description xml:space="preserve">Installs alternative keyboard mapping schemes to work with Visual Studio.</Description>
         <MoreInfo>https://aka.ms/hotkeys2017</MoreInfo>
-        <ReleaseNotes>ReleaseNotes.txt</ReleaseNotes>
+        <GettingStartedGuide>https://github.com/justcla/KeyBindings</GettingStartedGuide>
+        <ReleaseNotes>https://github.com/justcla/KeyBindings/blob/master/HotKeysVSIX/ReleaseNotes.txt</ReleaseNotes>
         <Icon>Resources\Market_HotKeys_128x.png</Icon>
         <PreviewImage>Resources\HotKeysPreviewImage.png</PreviewImage>
     </Metadata>
     <Installation>
-        <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[15.0,)" />
+        <InstallationTarget Version="[17.0,)" Id="Microsoft.VisualStudio.Community">
+            <ProductArchitecture>amd64</ProductArchitecture>
+        </InstallationTarget>
     </Installation>
     <Dependencies>
         <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
         <Dependency Id="Microsoft.VisualStudio.MPF.15.0" DisplayName="Visual Studio MPF 15.0" d:Source="Installed" Version="[15.0]" />
-        <Dependency d:Source="File" Version="[1.0.6,)" d:InstallSource="Embed" Location="EmbeddedVSIX\KeyboardShortcutsManager-v2.1.0.vsix" DisplayName="Keyboard Shortcuts Manager" Id="VSShortcutsManager.d8578b8b-cb70-49ee-b009-9e659c413f4b" />
+        <Dependency d:Source="File" Version="[3.0.0,4.0.0.0)" d:InstallSource="Embed" Location="EmbeddedVSIX\KeyboardShortcutsManager-v3.0.0.vsix" DisplayName="Keyboard Shortcuts Manager" Id="VSShortcutsManager.d8578b8b-cb70-49ee-b009-9e659c413f4b" />
     </Dependencies>
     <Prerequisites>
         <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,)" DisplayName="Visual Studio core editor" />