diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 0000000..35e328a
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,42 @@
+name: Build
+
+on:
+  workflow_dispatch:
+  pull_request:
+    types: [opened, reopened]
+  push:
+    branches:
+      - main
+
+jobs:
+  build:
+    runs-on: windows-latest
+
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: 1. Generate Version
+      id: version
+      run: |
+        $year = (Get-Date).Year
+        $month = (Get-Date).Month
+        $day = (Get-Date).Day
+        $version = "$year.$month.$day.${{ github.run_number }}"
+        echo "version=$version" >> $env:GITHUB_OUTPUT
+      shell: pwsh
+
+    - name: 2. Build Project
+      run: dotnet build src/CodingWithCalvin.CouchbaseExplorer/CodingWithCalvin.CouchbaseExplorer.csproj -c Release -p:SetVsixVersion=${{ steps.version.outputs.version }}
+
+    - name: 3. Create Information File
+      uses: jsdaniell/create-json@v1.2.3
+      with:
+        name: 'src/CodingWithCalvin.CouchbaseExplorer/bin/Release/CodingWithCalvin.CouchbaseExplorer.info'
+        json: '{"sha":"${{ github.sha }}", "version":"${{ steps.version.outputs.version }}"}'
+
+    - name: 4. Upload Artifact
+      uses: actions/upload-artifact@v4
+      with:
+        path: |
+          src/CodingWithCalvin.CouchbaseExplorer/bin/Release/CodingWithCalvin.CouchbaseExplorer.info
+          src/CodingWithCalvin.CouchbaseExplorer/bin/Release/CodingWithCalvin.CouchbaseExplorer.vsix
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index e2b9a33..f55b225 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -26,7 +26,7 @@ jobs:
         id: download-artifact
         uses: dawidd6/action-download-artifact@v6
         with:
-          workflow: release_build_and_deploy.yml
+          workflow: build.yml
           workflow_conclusion: success
 
       - name: 2. Parse Artifact Manifest
diff --git a/.github/workflows/release_build_and_deploy.yml b/.github/workflows/release_build_and_deploy.yml
deleted file mode 100644
index 15b6132..0000000
--- a/.github/workflows/release_build_and_deploy.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-name: 'Build and Deploy'
-  
-on:
-  workflow_dispatch:
-  pull_request:
-    types: [opened, reopened]
-  push:
-    branches: 
-      - main
-    tags-ignore:
-      - '[0-9]+.[0-9]+.[0-9]+.[0-9]+'
-  
-jobs:
-  Release-Build-and-Deploy: 
-    runs-on: windows-latest
-    
-    steps:
-    - uses: actions/checkout@v4
-    - uses: microsoft/setup-msbuild@v2
-    - uses: nuget/setup-nuget@v2
-
-    - name: 1. Versioning Release
-      id: step-version
-      uses: CodingWithCalvin/GHA-VSVsixVersioner@v1
-      with:
-        extension-manifest-file: 'src/CodingWithCalvin.CouchbaseExplorer/source.extension.vsixmanifest'
-        extension-source-file: 'src/CodingWithCalvin.CouchbaseExplorer/source.extension.cs'
-
-    - name: 2. Restoring Packages
-      run: nuget restore src/CodingWithCalvin.CouchbaseExplorer.slnx
-    
-    - name: 3. Building Project
-      run: msbuild 'src/CodingWithCalvin.CouchbaseExplorer/CodingWithCalvin.CouchbaseExplorer.csproj' /p:configuration='Release' /p:platform='x64' /p:DeployExtension=False
-
-    - name: 4. Create Information File
-      uses: jsdaniell/create-json@v1.2.3
-      with:
-        name: 'src/CodingWithCalvin.CouchbaseExplorer/bin/x64/Release/CodingWithCalvin.CouchbaseExplorer.info'
-        json: '{"sha":"${{ github.sha }}", "version":"${{ steps.step-version.outputs.version }}"}'
-    
-    - name: 5. Publishing Build Artifact
-      uses: actions/upload-artifact@v4
-      with:
-        path: |
-          src/CodingWithCalvin.CouchbaseExplorer/bin/x64/Release/CodingWithCalvin.CouchbaseExplorer.info
-          src/CodingWithCalvin.CouchbaseExplorer/bin/x64/Release/CodingWithCalvin.CouchbaseExplorer.vsix
diff --git a/.gitignore b/.gitignore
index 818112d..7bf42bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -208,6 +208,9 @@ orleans.codegen.cs
 # RIA/Silverlight projects
 Generated_Code/
 
+# SDK-style project generated files
+Generated/
+
 # Backup & report files from converting an old project file
 # to a newer Visual Studio version. Backup files are not needed,
 # because we have git ;-)
diff --git a/src/CodingWithCalvin.CouchbaseExplorer/CodingWithCalvin.CouchbaseExplorer.csproj b/src/CodingWithCalvin.CouchbaseExplorer/CodingWithCalvin.CouchbaseExplorer.csproj
index 5ccf785..1fe2e0d 100644
--- a/src/CodingWithCalvin.CouchbaseExplorer/CodingWithCalvin.CouchbaseExplorer.csproj
+++ b/src/CodingWithCalvin.CouchbaseExplorer/CodingWithCalvin.CouchbaseExplorer.csproj
@@ -1,193 +1,37 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <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')" />
+<Project Sdk="CodingWithCalvin.VsixSdk/0.3.0">
+
   <PropertyGroup>
-    <MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-    <UseCodebase>true</UseCodebase>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup>
-    <SignAssembly>false</SignAssembly>
-  </PropertyGroup>
-  <PropertyGroup>
-    <AssemblyOriginatorKeyFile>
-    </AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <LangVersion>latest</LangVersion>
-    <ErrorReport>prompt</ErrorReport>
-    <DeployExtension>true</DeployExtension>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <LangVersion>latest</LangVersion>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectTypeGuids>{82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>{8AF8BEEF-6FCC-4479-8D85-540A414D0EA2}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <TargetFramework>net48</TargetFramework>
     <RootNamespace>CodingWithCalvin.CouchbaseExplorer</RootNamespace>
     <AssemblyName>CodingWithCalvin.CouchbaseExplorer</AssemblyName>
-    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-    <GeneratePkgDefFile>true</GeneratePkgDefFile>
-    <IncludeAssemblyInVSIXContainer>true</IncludeAssemblyInVSIXContainer>
-    <IncludeDebugSymbolsInVSIXContainer>true</IncludeDebugSymbolsInVSIXContainer>
-    <IncludeDebugSymbolsInLocalVSIXDeployment>true</IncludeDebugSymbolsInLocalVSIXDeployment>
-    <CopyBuildOutputToOutputDirectory>true</CopyBuildOutputToOutputDirectory>
-    <CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
-    <StartAction>Program</StartAction>
-    <StartProgram Condition="'$(DevEnvDir)' != ''">$(DevEnvDir)devenv.exe</StartProgram>
-    <StartArguments>/rootsuffix Exp</StartArguments>
+    <LangVersion>latest</LangVersion>
+    <OutputPath>bin/$(Configuration)/</OutputPath>
+    <UseWPF>true</UseWPF>
   </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
+    <DeployExtension>True</DeployExtension>
+  </PropertyGroup>
+
   <ItemGroup>
-    <Compile Include="CouchbaseExplorerWindow.cs" />
-    <Compile Include="CouchbaseExplorerWindowCommand.cs" />
-    <Compile Include="CouchbaseExplorerWindowControl.xaml.cs">
-      <DependentUpon>CouchbaseExplorerWindowControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="CouchbaseExplorerPackage.cs" />
-    <Compile Include="source.extension.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>source.extension.vsixmanifest</DependentUpon>
-    </Compile>
-    <Compile Include="VSCommandTable.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>VSCommandTable.vsct</DependentUpon>
-    </Compile>
-    <Compile Include="Services\ConnectionInfo.cs" />
-    <Compile Include="Services\ConnectionSettingsService.cs" />
-    <Compile Include="Services\CouchbaseService.cs" />
-    <Compile Include="Services\CredentialManagerService.cs" />
-    <Compile Include="Services\DocumentEditorService.cs" />
-    <Compile Include="ViewModels\BindingProxy.cs" />
-    <Compile Include="ViewModels\BucketNode.cs" />
-    <Compile Include="ViewModels\BucketsFolderNode.cs" />
-    <Compile Include="ViewModels\CollectionNode.cs" />
-    <Compile Include="ViewModels\ConnectionNode.cs" />
-    <Compile Include="ViewModels\ConnectionDialogViewModel.cs" />
-    <Compile Include="ViewModels\Converters.cs" />
-    <Compile Include="ViewModels\CouchbaseExplorerViewModel.cs" />
-    <Compile Include="ViewModels\DocumentBatchNode.cs" />
-    <Compile Include="ViewModels\DocumentNode.cs" />
-    <Compile Include="ViewModels\IndexesFolderNode.cs" />
-    <Compile Include="ViewModels\IndexNode.cs" />
-    <Compile Include="ViewModels\LoadMoreNode.cs" />
-    <Compile Include="ViewModels\PlaceholderNode.cs" />
-    <Compile Include="ViewModels\RelayCommand.cs" />
-    <Compile Include="ViewModels\ScopeNode.cs" />
-    <Compile Include="ViewModels\TreeNodeBase.cs" />
-    <Compile Include="Dialogs\ConnectionDialog.xaml.cs">
-      <DependentUpon>ConnectionDialog.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Editors\DocumentEditorControl.xaml.cs">
-      <DependentUpon>DocumentEditorControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Editors\DocumentEditorFactory.cs" />
-    <Compile Include="Editors\DocumentEditorPane.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Page Include="Dialogs\ConnectionDialog.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Editors\DocumentEditorControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
+    <PackageReference Include="CouchbaseNetClient" Version="3.8.1" />
+    <PackageReference Include="Microsoft.VisualStudio.SDK" Version="17.14.40265" />
   </ItemGroup>
+
   <ItemGroup>
     <Resource Include="Resources\watermark.png" />
   </ItemGroup>
+
   <ItemGroup>
-    <Content Include="..\..\LICENSE">
-      <Link>resources\LICENSE</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    <Content Include="..\..\resources\icon.png" Link="resources\icon.png">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <None Include="source.extension.vsixmanifest">
-      <SubType>Designer</SubType>
-      <Generator>VsixManifestGenerator</Generator>
-      <LastGenOutput>source.extension.cs</LastGenOutput>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Page Include="CouchbaseExplorerWindowControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
-  <ItemGroup>
-    <VSCTCompile Include="VSCommandTable.vsct">
-      <ResourceName>Menus.ctmenu</ResourceName>
-      <SubType>Designer</SubType>
-      <Generator>VsctGenerator</Generator>
-      <LastGenOutput>VSCommandTable.cs</LastGenOutput>
-    </VSCTCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="netstandard" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-    <Reference Include="System" />
-    <Reference Include="System.ComponentModel.Composition" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Design" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Drawing.Design" />
-    <Reference Include="System.Management" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Numerics" />
-    <Reference Include="System.Runtime" />
-    <Reference Include="System.Transactions" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xaml" />
-    <Reference Include="System.Xml" />
-    <Reference Include="WindowsBase" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="CouchbaseNetClient">
-      <Version>3.8.1</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.VisualStudio.SDK">
-      <Version>17.9.37000</Version>
-    </PackageReference>
-  </ItemGroup>
-  <ItemGroup />
-  <ItemGroup>
-    <Content Include="..\..\resources\icon.png">
-      <Link>resources\icon.png</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    <Content Include="..\..\resources\logo.png" Link="resources\logo.png">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="..\..\resources\logo.png">
-      <Link>resources\logo.png</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    <Content Include="..\..\LICENSE" Link="resources\LICENSE">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
\ No newline at end of file
+
+</Project>
diff --git a/src/CodingWithCalvin.CouchbaseExplorer/Properties/AssemblyInfo.cs b/src/CodingWithCalvin.CouchbaseExplorer/Properties/AssemblyInfo.cs
deleted file mode 100644
index c1fcdc2..0000000
--- a/src/CodingWithCalvin.CouchbaseExplorer/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-using CodingWithCalvin.CouchbaseExplorer;
-
-[assembly: AssemblyTitle(Vsix.Name)]
-[assembly: AssemblyDescription(Vsix.Description)]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany(Vsix.Author)]
-[assembly: AssemblyProduct(Vsix.Name)]
-[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: ComVisible(false)]
-[assembly: AssemblyVersion(Vsix.Version)]
-[assembly: AssemblyFileVersion(Vsix.Version)]