fix(extension): resolve extension loading and improve menu placement (#315)

Author: CalvinAllen

src/CodingWithCalvin.CouchbaseExplorer.slnx

@@ -10,7 +10,7 @@
     <File Path="../README.md" />
     <File Path="../resources/extension.manifest.json" />
   </Folder>
-  <Project Path="CodingWithCalvin.CouchbaseExplorer/CodingWithCalvin.CouchbaseExplorer.csproj">
+  <Project Path="CodingWithCalvin.CouchbaseExplorer/CodingWithCalvin.CouchbaseExplorer.csproj" Id="8af8beef-6fcc-4479-8d85-540a414d0ea2">
     <Platform Solution="*|arm64" Project="arm64" />
     <Platform Solution="*|x64" Project="x64" />
     <Platform Solution="*|x86" Project="x86" />

src/CodingWithCalvin.CouchbaseExplorer/CodingWithCalvin.CouchbaseExplorer.csproj

@@ -24,6 +24,7 @@
     <PlatformTarget>x64</PlatformTarget>
     <LangVersion>latest</LangVersion>
     <ErrorReport>prompt</ErrorReport>
+    <DeployExtension>true</DeployExtension>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     <OutputPath>bin\x64\Release\</OutputPath>

src/CodingWithCalvin.CouchbaseExplorer/CouchbaseExplorerPackage.cs

@@ -2,14 +2,20 @@
 using System.Runtime.InteropServices;
 using System.Threading;
 using Microsoft.VisualStudio.Shell;
+using Microsoft.VisualStudio.Shell.Interop;
 
 namespace CodingWithCalvin.CouchbaseExplorer
 {
     [PackageRegistration(UseManagedResourcesOnly = true, AllowsBackgroundLoading = true)]
     [InstalledProductRegistration(Vsix.Name, Vsix.Description, Vsix.Version)]
     [Guid(PackageGuidString)]
     [ProvideMenuResource("Menus.ctmenu", 1)]
-    [ProvideToolWindow(typeof(CouchbaseExplorerWindow))]
+    [ProvideToolWindow(typeof(CouchbaseExplorerWindow),
+        Style = VsDockStyle.Linked,
+        Orientation = ToolWindowOrientation.Left,
+        Window = ToolWindowGuids.ServerExplorer)]
+    [ProvideAutoLoad(UIContextGuids80.NoSolution, PackageAutoLoadFlags.BackgroundLoad)]
+    [ProvideAutoLoad(UIContextGuids80.SolutionExists, PackageAutoLoadFlags.BackgroundLoad)]
     public sealed class CouchbaseExplorerPackage : AsyncPackage
     {
         public const string PackageGuidString = "ef261503-b2ae-4b90-8c86-0becd83348cc";

src/CodingWithCalvin.CouchbaseExplorer/VSCommandTable.vsct

@@ -1,13 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <CommandTable xmlns="http://schemas.microsoft.com/VisualStudio/2005-10-18/CommandTable" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
   <Extern href="stdidcmd.h"/>
   <Extern href="vsshlids.h"/>
-	
+
   <Commands package="guidVsPackage">
+    <Groups>
+      <!-- Custom group for Couchbase Explorer in the View menu -->
+      <Group guid="guidVsPackageCmdSet" id="CouchbaseExplorerMenuGroup" priority="0x0100">
+        <Parent guid="guidSHLMainMenu" id="IDM_VS_MENU_VIEW"/>
+      </Group>
+    </Groups>
+
     <Buttons>
-      <Button guid="guidVsPackageCmdSet" id="CouchbaseExplorerWindowCommandId" priority="5000" type="Button">
-        <Parent guid="guidSHLMainMenu" id="IDG_VS_VIEW_ORG_WINDOWS"/>
+      <Button guid="guidVsPackageCmdSet" id="CouchbaseExplorerWindowCommandId" priority="0x0100" type="Button">
+        <!-- Parent is now our custom group -->
+        <Parent guid="guidVsPackageCmdSet" id="CouchbaseExplorerMenuGroup"/>
         <Icon guid="guidCouchbaseIcon" id="couchbaseIcon" />
         <Strings>
           <ButtonText>Couchbase Explorer</ButtonText>
@@ -16,19 +24,20 @@
     </Buttons>
 
     <Bitmaps>
-	    <Bitmap guid="guidCouchbaseIcon" href="..\..\resources\icon.png" usedList="couchbaseIcon"/>
+      <Bitmap guid="guidCouchbaseIcon" href="..\..\resources\icon.png" usedList="couchbaseIcon"/>
     </Bitmaps>
   </Commands>
 
   <Symbols>
     <GuidSymbol name="guidVsPackage" value="{ef261503-b2ae-4b90-8c86-0becd83348cc}" />
 
-		<GuidSymbol name="guidVsPackageCmdSet" value="{715bc434-afd2-4104-a6a0-287120f718f5}">
+    <GuidSymbol name="guidVsPackageCmdSet" value="{715bc434-afd2-4104-a6a0-287120f718f5}">
+      <IDSymbol name="CouchbaseExplorerMenuGroup" value="0x1000" />
       <IDSymbol name="CouchbaseExplorerWindowCommandId" value="0x0100" />
     </GuidSymbol>
 
-		<GuidSymbol name="guidCouchbaseIcon" value="{5adaa369-1a0a-437f-bf63-f609baad46fb}">
-			<IDSymbol name="couchbaseIcon" value="1"/>
-		</GuidSymbol>
+    <GuidSymbol name="guidCouchbaseIcon" value="{5adaa369-1a0a-437f-bf63-f609baad46fb}">
+      <IDSymbol name="couchbaseIcon" value="1"/>
+    </GuidSymbol>
   </Symbols>
 </CommandTable>

src/CodingWithCalvin.CouchbaseExplorer/source.extension.vsixmanifest

@@ -12,15 +12,18 @@
         <Preview>true</Preview>
     </Metadata>
     <Installation>
-        <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[17.0,18.0)">
+        <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[17.0,19.0)">
             <ProductArchitecture>amd64</ProductArchitecture>
         </InstallationTarget>
+        <InstallationTarget Version="[17.0,19.0)" Id="Microsoft.VisualStudio.Community">
+            <ProductArchitecture>arm64</ProductArchitecture>
+        </InstallationTarget>
     </Installation>
     <Dependencies>
         <Dependency Id="Microsoft.VisualStudio.MPF.15.0" DisplayName="Visual Studio MPF 15.0" d:Source="Installed" Version="[15.0]" />
     </Dependencies>
     <Prerequisites>
-        <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,16.0)" DisplayName="Visual Studio core editor" />
+        <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[17.0,)" DisplayName="Visual Studio core editor" />
     </Prerequisites>
     <Assets>
         <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />