From 9c9e1fe502e101d73b012a43b441fe6cf311e1ae Mon Sep 17 00:00:00 2001
From: Matthew McDonald <mmcdonald@themission.co.uk>
Date: Wed, 23 Aug 2023 21:46:56 +0100
Subject: [PATCH 1/8] Runs in VS2022 in debug, not sure if it works

---
 src/AssemblyLoadDebugger.csproj | 40 ++++++++++++++++++++++++++++-----
 src/VSPackage.cs                |  2 +-
 src/app.config                  | 12 +++++-----
 src/packages.config             |  6 ++++-
 4 files changed, 47 insertions(+), 13 deletions(-)

diff --git a/src/AssemblyLoadDebugger.csproj b/src/AssemblyLoadDebugger.csproj
index b3bc7bc..3c8d46c 100644
--- a/src/AssemblyLoadDebugger.csproj
+++ b/src/AssemblyLoadDebugger.csproj
@@ -1,6 +1,8 @@
 <?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.0.26109-RC3\build\Microsoft.VSSDK.BuildTools.props" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.15.0.26109-RC3\build\Microsoft.VSSDK.BuildTools.props')" />
+  <Import Project="..\packages\Microsoft.VSSDK.BuildTools.17.6.2164\build\Microsoft.VSSDK.BuildTools.props" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.17.6.2164\build\Microsoft.VSSDK.BuildTools.props')" />
+  <Import Project="..\packages\Microsoft.VsSDK.CompatibilityAnalyzer.17.6.2164\build\Microsoft.VsSDK.CompatibilityAnalyzer.props" Condition="Exists('..\packages\Microsoft.VsSDK.CompatibilityAnalyzer.17.6.2164\build\Microsoft.VsSDK.CompatibilityAnalyzer.props')" />
+  <Import Project="..\packages\Microsoft.CodeAnalysis.BannedApiAnalyzers.3.3.2\build\Microsoft.CodeAnalysis.BannedApiAnalyzers.props" Condition="Exists('..\packages\Microsoft.CodeAnalysis.BannedApiAnalyzers.3.3.2\build\Microsoft.CodeAnalysis.BannedApiAnalyzers.props')" />
   <PropertyGroup>
     <MinimumVisualStudioVersion>16.0</MinimumVisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
@@ -13,6 +15,9 @@
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <OldToolsVersion>15.0</OldToolsVersion>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup>
     <SignAssembly>false</SignAssembly>
@@ -32,7 +37,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>AssemblyLoadDebugger</RootNamespace>
     <AssemblyName>AssemblyLoadDebugger</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
     <GeneratePkgDefFile>true</GeneratePkgDefFile>
     <IncludeAssemblyInVSIXContainer>true</IncludeAssemblyInVSIXContainer>
     <IncludeDebugSymbolsInVSIXContainer>true</IncludeDebugSymbolsInVSIXContainer>
@@ -137,6 +142,7 @@
     </Reference>
     <Reference Include="Microsoft.VisualStudio.ImageCatalog, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.VisualStudio.ImageCatalog.14.3.25407\lib\net45\Microsoft.VisualStudio.ImageCatalog.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Imaging, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.VisualStudio.Imaging.15.0.26109-RC3\lib\net45\Microsoft.VisualStudio.Imaging.dll</HintPath>
@@ -228,6 +234,8 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Design" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.IO.Compression.FileSystem" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xaml" />
     <Reference Include="System.Xml" />
@@ -242,16 +250,38 @@
       <ManifestResourceName>VSPackage</ManifestResourceName>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.BannedApiAnalyzers.3.3.2\analyzers\dotnet\cs\Microsoft.CodeAnalysis.BannedApiAnalyzers.dll" />
+    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.BannedApiAnalyzers.3.3.2\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.BannedApiAnalyzers.dll" />
+    <Analyzer Include="..\packages\Microsoft.VisualStudio.SDK.Analyzers.16.10.10\analyzers\cs\Microsoft.VisualStudio.SDK.Analyzers.CodeFixes.dll" />
+    <Analyzer Include="..\packages\Microsoft.VisualStudio.SDK.Analyzers.16.10.10\analyzers\cs\Microsoft.VisualStudio.SDK.Analyzers.dll" />
+    <Analyzer Include="..\packages\Microsoft.VisualStudio.Threading.Analyzers.16.10.56\analyzers\cs\Microsoft.VisualStudio.Threading.Analyzers.CodeFixes.dll" />
+    <Analyzer Include="..\packages\Microsoft.VisualStudio.Threading.Analyzers.16.10.56\analyzers\cs\Microsoft.VisualStudio.Threading.Analyzers.CSharp.dll" />
+    <Analyzer Include="..\packages\Microsoft.VisualStudio.Threading.Analyzers.16.10.56\analyzers\cs\Microsoft.VisualStudio.Threading.Analyzers.dll" />
+    <Analyzer Include="..\packages\Microsoft.VisualStudio.Threading.Analyzers.16.10.56\analyzers\vb\Microsoft.VisualStudio.Threading.Analyzers.CodeFixes.dll" />
+    <Analyzer Include="..\packages\Microsoft.VisualStudio.Threading.Analyzers.16.10.56\analyzers\vb\Microsoft.VisualStudio.Threading.Analyzers.dll" />
+    <Analyzer Include="..\packages\Microsoft.VisualStudio.Threading.Analyzers.16.10.56\analyzers\vb\Microsoft.VisualStudio.Threading.Analyzers.VisualBasic.dll" />
+  </ItemGroup>
   <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.0.26109-RC3\build\Microsoft.VSSDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.15.0.26109-RC3\build\Microsoft.VSSDK.BuildTools.props'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.15.0.26109-RC3\build\Microsoft.VSSDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.15.0.26109-RC3\build\Microsoft.VSSDK.BuildTools.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.BannedApiAnalyzers.3.3.2\build\Microsoft.CodeAnalysis.BannedApiAnalyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.BannedApiAnalyzers.3.3.2\build\Microsoft.CodeAnalysis.BannedApiAnalyzers.props'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.BannedApiAnalyzers.3.3.2\build\Microsoft.CodeAnalysis.BannedApiAnalyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.BannedApiAnalyzers.3.3.2\build\Microsoft.CodeAnalysis.BannedApiAnalyzers.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.VisualStudio.Threading.Analyzers.16.10.56\build\Microsoft.VisualStudio.Threading.Analyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VisualStudio.Threading.Analyzers.16.10.56\build\Microsoft.VisualStudio.Threading.Analyzers.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.VisualStudio.SDK.Analyzers.16.10.10\build\Microsoft.VisualStudio.SDK.Analyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VisualStudio.SDK.Analyzers.16.10.10\build\Microsoft.VisualStudio.SDK.Analyzers.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.VsSDK.CompatibilityAnalyzer.17.6.2164\build\Microsoft.VsSDK.CompatibilityAnalyzer.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VsSDK.CompatibilityAnalyzer.17.6.2164\build\Microsoft.VsSDK.CompatibilityAnalyzer.props'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.VsSDK.CompatibilityAnalyzer.17.6.2164\build\Microsoft.VsSDK.CompatibilityAnalyzer.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VsSDK.CompatibilityAnalyzer.17.6.2164\build\Microsoft.VsSDK.CompatibilityAnalyzer.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.17.6.2164\build\Microsoft.VSSDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.17.6.2164\build\Microsoft.VSSDK.BuildTools.props'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.17.6.2164\build\Microsoft.VSSDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.17.6.2164\build\Microsoft.VSSDK.BuildTools.targets'))" />
   </Target>
-  <Import Project="..\packages\Microsoft.VSSDK.BuildTools.15.0.26109-RC3\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.15.0.26109-RC3\build\Microsoft.VSSDK.BuildTools.targets')" />
+  <Import Project="..\packages\Microsoft.CodeAnalysis.BannedApiAnalyzers.3.3.2\build\Microsoft.CodeAnalysis.BannedApiAnalyzers.targets" Condition="Exists('..\packages\Microsoft.CodeAnalysis.BannedApiAnalyzers.3.3.2\build\Microsoft.CodeAnalysis.BannedApiAnalyzers.targets')" />
+  <Import Project="..\packages\Microsoft.VisualStudio.Threading.Analyzers.16.10.56\build\Microsoft.VisualStudio.Threading.Analyzers.targets" Condition="Exists('..\packages\Microsoft.VisualStudio.Threading.Analyzers.16.10.56\build\Microsoft.VisualStudio.Threading.Analyzers.targets')" />
+  <Import Project="..\packages\Microsoft.VisualStudio.SDK.Analyzers.16.10.10\build\Microsoft.VisualStudio.SDK.Analyzers.targets" Condition="Exists('..\packages\Microsoft.VisualStudio.SDK.Analyzers.16.10.10\build\Microsoft.VisualStudio.SDK.Analyzers.targets')" />
+  <Import Project="..\packages\Microsoft.VsSDK.CompatibilityAnalyzer.17.6.2164\build\Microsoft.VsSDK.CompatibilityAnalyzer.targets" Condition="Exists('..\packages\Microsoft.VsSDK.CompatibilityAnalyzer.17.6.2164\build\Microsoft.VsSDK.CompatibilityAnalyzer.targets')" />
+  <Import Project="..\packages\Microsoft.VSSDK.BuildTools.17.6.2164\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.17.6.2164\build\Microsoft.VSSDK.BuildTools.targets')" />
   <!-- 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/src/VSPackage.cs b/src/VSPackage.cs
index 6dd608e..5ec9311 100644
--- a/src/VSPackage.cs
+++ b/src/VSPackage.cs
@@ -6,7 +6,7 @@
 
 namespace AssemblyLoadDebugger
 {
-    [PackageRegistration(UseManagedResourcesOnly = true)]
+    [PackageRegistration(AllowsBackgroundLoading = true, UseManagedResourcesOnly = true)]
     [InstalledProductRegistration("#110", "#112", "1.0", IconResourceID = 400)]
     [ProvideMenuResource("Menus.ctmenu", 1)]
     [ProvideToolWindow(typeof(AssemblyLoadDebuggerToolWindow))]
diff --git a/src/app.config b/src/app.config
index 7dd55d0..abb37a1 100644
--- a/src/app.config
+++ b/src/app.config
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.VisualStudio.ImageCatalog" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-14.0.0.0" newVersion="14.0.0.0" />
+        <assemblyIdentity name="Microsoft.VisualStudio.ImageCatalog" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-14.0.0.0" newVersion="14.0.0.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
\ No newline at end of file
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/></startup></configuration>
diff --git a/src/packages.config b/src/packages.config
index 620bd24..367fa7e 100644
--- a/src/packages.config
+++ b/src/packages.config
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Microsoft.CodeAnalysis.BannedApiAnalyzers" version="3.3.2" targetFramework="net481" developmentDependency="true" />
   <package id="Microsoft.VisualStudio.CoreUtility" version="15.0.26109-RC3" targetFramework="net46" />
   <package id="Microsoft.VisualStudio.ImageCatalog" version="14.3.25407" targetFramework="net46" />
   <package id="Microsoft.VisualStudio.Imaging" version="15.0.26109-RC3" targetFramework="net46" />
   <package id="Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime" version="15.0.25726-Preview5" targetFramework="net46" />
   <package id="Microsoft.VisualStudio.OLE.Interop" version="7.10.6070" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.SDK.Analyzers" version="16.10.10" targetFramework="net481" developmentDependency="true" />
   <package id="Microsoft.VisualStudio.Shell.15.0" version="15.0.26109-RC3" targetFramework="net46" />
   <package id="Microsoft.VisualStudio.Shell.Framework" version="15.0.26109-RC3" targetFramework="net46" />
   <package id="Microsoft.VisualStudio.Shell.Interop" version="7.10.6071" targetFramework="net46" />
@@ -18,8 +20,10 @@
   <package id="Microsoft.VisualStudio.TextManager.Interop" version="7.10.6070" targetFramework="net46" />
   <package id="Microsoft.VisualStudio.TextManager.Interop.8.0" version="8.0.50727" targetFramework="net46" />
   <package id="Microsoft.VisualStudio.Threading" version="15.0.20-pre" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Threading.Analyzers" version="16.10.56" targetFramework="net481" developmentDependency="true" />
   <package id="Microsoft.VisualStudio.Utilities" version="15.0.26109-RC3" targetFramework="net46" />
   <package id="Microsoft.VisualStudio.Validation" version="15.0.11-pre" targetFramework="net46" />
-  <package id="Microsoft.VSSDK.BuildTools" version="15.0.26109-RC3" targetFramework="net46" developmentDependency="true" />
+  <package id="Microsoft.VSSDK.BuildTools" version="17.6.2164" targetFramework="net481" developmentDependency="true" />
+  <package id="Microsoft.VsSDK.CompatibilityAnalyzer" version="17.6.2164" targetFramework="net481" developmentDependency="true" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net46" />
 </packages>
\ No newline at end of file

From 063c4f7f6669bb9d1909e48566658da8ec4d2af5 Mon Sep 17 00:00:00 2001
From: Matthew McDonald <mmcdonald@themission.co.uk>
Date: Thu, 24 Aug 2023 20:51:08 +0100
Subject: [PATCH 2/8] 1.1 Migrate from packages.config to PackageReference.

---
 src/AssemblyLoadDebugger.csproj | 146 +++++---------------------------
 src/packages.config             |  29 -------
 2 files changed, 23 insertions(+), 152 deletions(-)
 delete mode 100644 src/packages.config

diff --git a/src/AssemblyLoadDebugger.csproj b/src/AssemblyLoadDebugger.csproj
index 3c8d46c..1525cd7 100644
--- a/src/AssemblyLoadDebugger.csproj
+++ b/src/AssemblyLoadDebugger.csproj
@@ -1,8 +1,5 @@
 <?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.17.6.2164\build\Microsoft.VSSDK.BuildTools.props" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.17.6.2164\build\Microsoft.VSSDK.BuildTools.props')" />
-  <Import Project="..\packages\Microsoft.VsSDK.CompatibilityAnalyzer.17.6.2164\build\Microsoft.VsSDK.CompatibilityAnalyzer.props" Condition="Exists('..\packages\Microsoft.VsSDK.CompatibilityAnalyzer.17.6.2164\build\Microsoft.VsSDK.CompatibilityAnalyzer.props')" />
-  <Import Project="..\packages\Microsoft.CodeAnalysis.BannedApiAnalyzers.3.3.2\build\Microsoft.CodeAnalysis.BannedApiAnalyzers.props" Condition="Exists('..\packages\Microsoft.CodeAnalysis.BannedApiAnalyzers.3.3.2\build\Microsoft.CodeAnalysis.BannedApiAnalyzers.props')" />
   <PropertyGroup>
     <MinimumVisualStudioVersion>16.0</MinimumVisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
@@ -91,9 +88,6 @@
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
     <None Include="app.config" />
-    <None Include="packages.config">
-      <SubType>Designer</SubType>
-    </None>
     <None Include="source.extension.vsixmanifest">
       <SubType>Designer</SubType>
       <Generator>VsixManifestGenerator</Generator>
@@ -136,95 +130,6 @@
     <Reference Include="Microsoft.VisualStudio.CommandBars, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <EmbedInteropTypes>False</EmbedInteropTypes>
     </Reference>
-    <Reference Include="Microsoft.VisualStudio.CoreUtility, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.VisualStudio.CoreUtility.15.0.26109-RC3\lib\net45\Microsoft.VisualStudio.CoreUtility.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Microsoft.VisualStudio.ImageCatalog, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.VisualStudio.ImageCatalog.14.3.25407\lib\net45\Microsoft.VisualStudio.ImageCatalog.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Microsoft.VisualStudio.Imaging, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.VisualStudio.Imaging.15.0.26109-RC3\lib\net45\Microsoft.VisualStudio.Imaging.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-      <HintPath>..\packages\Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime.15.0.25726-Preview5\lib\Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Microsoft.VisualStudio.OLE.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <HintPath>..\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6070\lib\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Microsoft.VisualStudio.Shell.15.0, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.VisualStudio.Shell.15.0.15.0.26109-RC3\lib\Microsoft.VisualStudio.Shell.15.0.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Microsoft.VisualStudio.Shell.Framework, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.VisualStudio.Shell.Framework.15.0.26109-RC3\lib\net45\Microsoft.VisualStudio.Shell.Framework.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Microsoft.VisualStudio.Shell.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.7.10.6071\lib\Microsoft.VisualStudio.Shell.Interop.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Microsoft.VisualStudio.Shell.Interop.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-      <HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.10.0.10.0.30319\lib\Microsoft.VisualStudio.Shell.Interop.10.0.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Microsoft.VisualStudio.Shell.Interop.11.0, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-      <HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.11.0.11.0.61030\lib\Microsoft.VisualStudio.Shell.Interop.11.0.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Microsoft.VisualStudio.Shell.Interop.12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-      <HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.12.0.12.0.30110\lib\Microsoft.VisualStudio.Shell.Interop.12.0.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-      <HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime.14.3.25407\lib\Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Microsoft.VisualStudio.Shell.Interop.15.0.DesignTime, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-      <HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.15.0.DesignTime.15.0.26105-RC3\lib\Microsoft.VisualStudio.Shell.Interop.15.0.DesignTime.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.Shell.Interop.8.0.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.9.0.9.0.30729\lib\Microsoft.VisualStudio.Shell.Interop.9.0.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Microsoft.VisualStudio.TextManager.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <HintPath>..\packages\Microsoft.VisualStudio.TextManager.Interop.7.10.6070\lib\Microsoft.VisualStudio.TextManager.Interop.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Microsoft.VisualStudio.TextManager.Interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <HintPath>..\packages\Microsoft.VisualStudio.TextManager.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.TextManager.Interop.8.0.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Microsoft.VisualStudio.Threading, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.VisualStudio.Threading.15.0.20-pre\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Microsoft.VisualStudio.Utilities, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.VisualStudio.Utilities.15.0.26109-RC3\lib\net45\Microsoft.VisualStudio.Utilities.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Microsoft.VisualStudio.Validation, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.VisualStudio.Validation.15.0.11-pre\lib\net45\Microsoft.VisualStudio.Validation.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="stdole, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -251,37 +156,32 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.BannedApiAnalyzers.3.3.2\analyzers\dotnet\cs\Microsoft.CodeAnalysis.BannedApiAnalyzers.dll" />
-    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.BannedApiAnalyzers.3.3.2\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.BannedApiAnalyzers.dll" />
-    <Analyzer Include="..\packages\Microsoft.VisualStudio.SDK.Analyzers.16.10.10\analyzers\cs\Microsoft.VisualStudio.SDK.Analyzers.CodeFixes.dll" />
-    <Analyzer Include="..\packages\Microsoft.VisualStudio.SDK.Analyzers.16.10.10\analyzers\cs\Microsoft.VisualStudio.SDK.Analyzers.dll" />
-    <Analyzer Include="..\packages\Microsoft.VisualStudio.Threading.Analyzers.16.10.56\analyzers\cs\Microsoft.VisualStudio.Threading.Analyzers.CodeFixes.dll" />
-    <Analyzer Include="..\packages\Microsoft.VisualStudio.Threading.Analyzers.16.10.56\analyzers\cs\Microsoft.VisualStudio.Threading.Analyzers.CSharp.dll" />
-    <Analyzer Include="..\packages\Microsoft.VisualStudio.Threading.Analyzers.16.10.56\analyzers\cs\Microsoft.VisualStudio.Threading.Analyzers.dll" />
-    <Analyzer Include="..\packages\Microsoft.VisualStudio.Threading.Analyzers.16.10.56\analyzers\vb\Microsoft.VisualStudio.Threading.Analyzers.CodeFixes.dll" />
-    <Analyzer Include="..\packages\Microsoft.VisualStudio.Threading.Analyzers.16.10.56\analyzers\vb\Microsoft.VisualStudio.Threading.Analyzers.dll" />
-    <Analyzer Include="..\packages\Microsoft.VisualStudio.Threading.Analyzers.16.10.56\analyzers\vb\Microsoft.VisualStudio.Threading.Analyzers.VisualBasic.dll" />
+    <PackageReference Include="Microsoft.VisualStudio.ImageCatalog">
+      <Version>14.3.25407</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime">
+      <Version>15.0.25726-Preview5</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.VisualStudio.Shell.15.0">
+      <Version>15.0.26109-RC3</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime">
+      <Version>14.3.25407</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.VisualStudio.Shell.Interop.15.0.DesignTime">
+      <Version>15.0.26105-RC3</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.VSSDK.BuildTools">
+      <Version>17.6.2164</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="Newtonsoft.Json">
+      <Version>9.0.1</Version>
+    </PackageReference>
   </ItemGroup>
   <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.CodeAnalysis.BannedApiAnalyzers.3.3.2\build\Microsoft.CodeAnalysis.BannedApiAnalyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.BannedApiAnalyzers.3.3.2\build\Microsoft.CodeAnalysis.BannedApiAnalyzers.props'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.BannedApiAnalyzers.3.3.2\build\Microsoft.CodeAnalysis.BannedApiAnalyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.BannedApiAnalyzers.3.3.2\build\Microsoft.CodeAnalysis.BannedApiAnalyzers.targets'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.VisualStudio.Threading.Analyzers.16.10.56\build\Microsoft.VisualStudio.Threading.Analyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VisualStudio.Threading.Analyzers.16.10.56\build\Microsoft.VisualStudio.Threading.Analyzers.targets'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.VisualStudio.SDK.Analyzers.16.10.10\build\Microsoft.VisualStudio.SDK.Analyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VisualStudio.SDK.Analyzers.16.10.10\build\Microsoft.VisualStudio.SDK.Analyzers.targets'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.VsSDK.CompatibilityAnalyzer.17.6.2164\build\Microsoft.VsSDK.CompatibilityAnalyzer.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VsSDK.CompatibilityAnalyzer.17.6.2164\build\Microsoft.VsSDK.CompatibilityAnalyzer.props'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.VsSDK.CompatibilityAnalyzer.17.6.2164\build\Microsoft.VsSDK.CompatibilityAnalyzer.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VsSDK.CompatibilityAnalyzer.17.6.2164\build\Microsoft.VsSDK.CompatibilityAnalyzer.targets'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.17.6.2164\build\Microsoft.VSSDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.17.6.2164\build\Microsoft.VSSDK.BuildTools.props'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.17.6.2164\build\Microsoft.VSSDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.17.6.2164\build\Microsoft.VSSDK.BuildTools.targets'))" />
-  </Target>
-  <Import Project="..\packages\Microsoft.CodeAnalysis.BannedApiAnalyzers.3.3.2\build\Microsoft.CodeAnalysis.BannedApiAnalyzers.targets" Condition="Exists('..\packages\Microsoft.CodeAnalysis.BannedApiAnalyzers.3.3.2\build\Microsoft.CodeAnalysis.BannedApiAnalyzers.targets')" />
-  <Import Project="..\packages\Microsoft.VisualStudio.Threading.Analyzers.16.10.56\build\Microsoft.VisualStudio.Threading.Analyzers.targets" Condition="Exists('..\packages\Microsoft.VisualStudio.Threading.Analyzers.16.10.56\build\Microsoft.VisualStudio.Threading.Analyzers.targets')" />
-  <Import Project="..\packages\Microsoft.VisualStudio.SDK.Analyzers.16.10.10\build\Microsoft.VisualStudio.SDK.Analyzers.targets" Condition="Exists('..\packages\Microsoft.VisualStudio.SDK.Analyzers.16.10.10\build\Microsoft.VisualStudio.SDK.Analyzers.targets')" />
-  <Import Project="..\packages\Microsoft.VsSDK.CompatibilityAnalyzer.17.6.2164\build\Microsoft.VsSDK.CompatibilityAnalyzer.targets" Condition="Exists('..\packages\Microsoft.VsSDK.CompatibilityAnalyzer.17.6.2164\build\Microsoft.VsSDK.CompatibilityAnalyzer.targets')" />
-  <Import Project="..\packages\Microsoft.VSSDK.BuildTools.17.6.2164\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.17.6.2164\build\Microsoft.VSSDK.BuildTools.targets')" />
   <!-- 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/src/packages.config b/src/packages.config
deleted file mode 100644
index 367fa7e..0000000
--- a/src/packages.config
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.CodeAnalysis.BannedApiAnalyzers" version="3.3.2" targetFramework="net481" developmentDependency="true" />
-  <package id="Microsoft.VisualStudio.CoreUtility" version="15.0.26109-RC3" targetFramework="net46" />
-  <package id="Microsoft.VisualStudio.ImageCatalog" version="14.3.25407" targetFramework="net46" />
-  <package id="Microsoft.VisualStudio.Imaging" version="15.0.26109-RC3" targetFramework="net46" />
-  <package id="Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime" version="15.0.25726-Preview5" targetFramework="net46" />
-  <package id="Microsoft.VisualStudio.OLE.Interop" version="7.10.6070" targetFramework="net46" />
-  <package id="Microsoft.VisualStudio.SDK.Analyzers" version="16.10.10" targetFramework="net481" developmentDependency="true" />
-  <package id="Microsoft.VisualStudio.Shell.15.0" version="15.0.26109-RC3" targetFramework="net46" />
-  <package id="Microsoft.VisualStudio.Shell.Framework" version="15.0.26109-RC3" targetFramework="net46" />
-  <package id="Microsoft.VisualStudio.Shell.Interop" version="7.10.6071" targetFramework="net46" />
-  <package id="Microsoft.VisualStudio.Shell.Interop.10.0" version="10.0.30319" targetFramework="net46" />
-  <package id="Microsoft.VisualStudio.Shell.Interop.11.0" version="11.0.61030" targetFramework="net46" />
-  <package id="Microsoft.VisualStudio.Shell.Interop.12.0" version="12.0.30110" targetFramework="net46" />
-  <package id="Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime" version="14.3.25407" targetFramework="net46" />
-  <package id="Microsoft.VisualStudio.Shell.Interop.15.0.DesignTime" version="15.0.26105-RC3" targetFramework="net46" />
-  <package id="Microsoft.VisualStudio.Shell.Interop.8.0" version="8.0.50727" targetFramework="net46" />
-  <package id="Microsoft.VisualStudio.Shell.Interop.9.0" version="9.0.30729" targetFramework="net46" />
-  <package id="Microsoft.VisualStudio.TextManager.Interop" version="7.10.6070" targetFramework="net46" />
-  <package id="Microsoft.VisualStudio.TextManager.Interop.8.0" version="8.0.50727" targetFramework="net46" />
-  <package id="Microsoft.VisualStudio.Threading" version="15.0.20-pre" targetFramework="net46" />
-  <package id="Microsoft.VisualStudio.Threading.Analyzers" version="16.10.56" targetFramework="net481" developmentDependency="true" />
-  <package id="Microsoft.VisualStudio.Utilities" version="15.0.26109-RC3" targetFramework="net46" />
-  <package id="Microsoft.VisualStudio.Validation" version="15.0.11-pre" targetFramework="net46" />
-  <package id="Microsoft.VSSDK.BuildTools" version="17.6.2164" targetFramework="net481" developmentDependency="true" />
-  <package id="Microsoft.VsSDK.CompatibilityAnalyzer" version="17.6.2164" targetFramework="net481" developmentDependency="true" />
-  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net46" />
-</packages>
\ No newline at end of file

From 0602e5c10b9cfbf2bc84516268dc92fe7665d024 Mon Sep 17 00:00:00 2001
From: Matthew McDonald <mmcdonald@themission.co.uk>
Date: Thu, 24 Aug 2023 20:59:07 +0100
Subject: [PATCH 3/8] 1.2 Replace any direct Visual Studio SDK assembly
 references with PackageReference items

---
 src/AssemblyLoadDebugger.csproj | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/AssemblyLoadDebugger.csproj b/src/AssemblyLoadDebugger.csproj
index 1525cd7..1769e48 100644
--- a/src/AssemblyLoadDebugger.csproj
+++ b/src/AssemblyLoadDebugger.csproj
@@ -127,9 +127,7 @@
       <EmbedInteropTypes>False</EmbedInteropTypes>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Microsoft.VisualStudio.CommandBars, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-    </Reference>
+	
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="stdole, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -179,6 +177,7 @@
     <PackageReference Include="Newtonsoft.Json">
       <Version>9.0.1</Version>
     </PackageReference>
+	<PackageReference Include="Microsoft.VisualStudio.CommandBars" Version="8.0.0.0" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />

From a049d55f24689305aba0040a5f9215f63f28ff8c Mon Sep 17 00:00:00 2001
From: Matthew McDonald <mmcdonald@themission.co.uk>
Date: Thu, 24 Aug 2023 21:09:45 +0100
Subject: [PATCH 4/8] 2.1 Create shared project

---
 AssemblyLoadDebugger.sln                            |  9 +++++++--
 .../AssemblyLoadDebuggerShared.projitems            | 13 +++++++++++++
 .../AssemblyLoadDebuggerShared.shproj               | 13 +++++++++++++
 src/AssemblyLoadDebugger.csproj                     |  4 ++--
 4 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100644 AssemblyLoadDebuggerShared/AssemblyLoadDebuggerShared.projitems
 create mode 100644 AssemblyLoadDebuggerShared/AssemblyLoadDebuggerShared.shproj

diff --git a/AssemblyLoadDebugger.sln b/AssemblyLoadDebugger.sln
index 3f5abe7..19de29a 100644
--- a/AssemblyLoadDebugger.sln
+++ b/AssemblyLoadDebugger.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.28304.4001
+# Visual Studio Version 17
+VisualStudioVersion = 17.6.33927.249
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{68D3525F-8495-4921-9B62-4F40860B8F35}"
 	ProjectSection(SolutionItems) = preProject
@@ -12,6 +12,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssemblyLoadDebugger", "src\AssemblyLoadDebugger.csproj", "{3C58ECA5-7983-4A86-AAF6-F98769343FBA}"
 EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "AssemblyLoadDebuggerShared", "AssemblyLoadDebuggerShared\AssemblyLoadDebuggerShared.shproj", "{A0C1B03A-E53A-460D-9D88-EBC6F9EE2C23}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -29,4 +31,7 @@ Global
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {39486E16-53D3-4D9D-A861-FA877B6ED9BC}
 	EndGlobalSection
+	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		AssemblyLoadDebuggerShared\AssemblyLoadDebuggerShared.projitems*{a0c1b03a-e53a-460d-9d88-ebc6f9ee2c23}*SharedItemsImports = 13
+	EndGlobalSection
 EndGlobal
diff --git a/AssemblyLoadDebuggerShared/AssemblyLoadDebuggerShared.projitems b/AssemblyLoadDebuggerShared/AssemblyLoadDebuggerShared.projitems
new file mode 100644
index 0000000..a3f47a4
--- /dev/null
+++ b/AssemblyLoadDebuggerShared/AssemblyLoadDebuggerShared.projitems
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <MSBuildAllProjects Condition="'$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0'">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <HasSharedItems>true</HasSharedItems>
+    <SharedGUID>a0c1b03a-e53a-460d-9d88-ebc6f9ee2c23</SharedGUID>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration">
+    <Import_RootNamespace>AssemblyLoadDebuggerShared</Import_RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+  </ItemGroup>
+</Project>
diff --git a/AssemblyLoadDebuggerShared/AssemblyLoadDebuggerShared.shproj b/AssemblyLoadDebuggerShared/AssemblyLoadDebuggerShared.shproj
new file mode 100644
index 0000000..08a7b48
--- /dev/null
+++ b/AssemblyLoadDebuggerShared/AssemblyLoadDebuggerShared.shproj
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>a0c1b03a-e53a-460d-9d88-ebc6f9ee2c23</ProjectGuid>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
+  <PropertyGroup />
+  <Import Project="AssemblyLoadDebuggerShared.projitems" Label="Shared" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
+</Project>
diff --git a/src/AssemblyLoadDebugger.csproj b/src/AssemblyLoadDebugger.csproj
index 1769e48..1b3ac2f 100644
--- a/src/AssemblyLoadDebugger.csproj
+++ b/src/AssemblyLoadDebugger.csproj
@@ -127,7 +127,6 @@
       <EmbedInteropTypes>False</EmbedInteropTypes>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
-	
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="stdole, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -177,8 +176,9 @@
     <PackageReference Include="Newtonsoft.Json">
       <Version>9.0.1</Version>
     </PackageReference>
-	<PackageReference Include="Microsoft.VisualStudio.CommandBars" Version="8.0.0.0" />
+    <PackageReference Include="Microsoft.VisualStudio.CommandBars" Version="8.0.0.0" />
   </ItemGroup>
+  <Import Project="..\AssemblyLoadDebuggerShared\AssemblyLoadDebuggerShared.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.

From d5ac80d8ad617c927daddcaf81a80a6f13719cf0 Mon Sep 17 00:00:00 2001
From: Matthew McDonald <mmcdonald@themission.co.uk>
Date: Thu, 24 Aug 2023 21:10:01 +0100
Subject: [PATCH 5/8] add shared project sln file

---
 AssemblyLoadDebugger.sln | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AssemblyLoadDebugger.sln b/AssemblyLoadDebugger.sln
index 19de29a..b52d05c 100644
--- a/AssemblyLoadDebugger.sln
+++ b/AssemblyLoadDebugger.sln
@@ -32,6 +32,7 @@ Global
 		SolutionGuid = {39486E16-53D3-4D9D-A861-FA877B6ED9BC}
 	EndGlobalSection
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		AssemblyLoadDebuggerShared\AssemblyLoadDebuggerShared.projitems*{3c58eca5-7983-4a86-aaf6-f98769343fba}*SharedItemsImports = 4
 		AssemblyLoadDebuggerShared\AssemblyLoadDebuggerShared.projitems*{a0c1b03a-e53a-460d-9d88-ebc6f9ee2c23}*SharedItemsImports = 13
 	EndGlobalSection
 EndGlobal

From 90c1a1cb4bb97a849a6812175d2707c432538646 Mon Sep 17 00:00:00 2001
From: Matthew McDonald <mmcdonald@themission.co.uk>
Date: Thu, 24 Aug 2023 21:25:09 +0100
Subject: [PATCH 6/8] move code to shared project

---
 .../AssemblyLoadDebuggerShared.projitems      |  28 ++++++++++++++-
 .../Commands/OpenToolWindowCommand.cs         |  10 +++---
 .../Resources/Icon.png                        | Bin
 .../ToolWindow/ActionCommand.cs               |   2 +-
 .../AssemblyLoadDebuggerControl.xaml          |   0
 .../AssemblyLoadDebuggerControl.xaml.cs       |   1 +
 .../AssemblyLoadDebuggerControlViewModel.cs   |   2 +-
 .../AssemblyLoadDebuggerToolWindow.cs         |  10 +++---
 .../ToolWindow/AssetCache.cs                  |   2 +-
 .../ToolWindow/Settings.cs                    |   2 +-
 .../ToolWindow/SharedVsTheme.cs               |   2 +-
 .../ToolWindow/WpfUtil.cs                     |   2 +-
 .../VSCommandTable.cs                         |   0
 .../VSCommandTable.vsct                       |   0
 AssemblyLoadDebuggerShared/VSPackage.cs       |  24 +++++++++++++
 src/AssemblyLoadDebugger.csproj               |  32 +-----------------
 src/VSPackage.cs                              |  24 -------------
 17 files changed, 70 insertions(+), 71 deletions(-)
 rename {src => AssemblyLoadDebuggerShared}/Commands/OpenToolWindowCommand.cs (92%)
 rename {src => AssemblyLoadDebuggerShared}/Resources/Icon.png (100%)
 rename {src => AssemblyLoadDebuggerShared}/ToolWindow/ActionCommand.cs (98%)
 rename {src => AssemblyLoadDebuggerShared}/ToolWindow/AssemblyLoadDebuggerControl.xaml (100%)
 rename {src => AssemblyLoadDebuggerShared}/ToolWindow/AssemblyLoadDebuggerControl.xaml.cs (94%)
 rename {src => AssemblyLoadDebuggerShared}/ToolWindow/AssemblyLoadDebuggerControlViewModel.cs (99%)
 rename {src => AssemblyLoadDebuggerShared}/ToolWindow/AssemblyLoadDebuggerToolWindow.cs (82%)
 rename {src => AssemblyLoadDebuggerShared}/ToolWindow/AssetCache.cs (98%)
 rename {src => AssemblyLoadDebuggerShared}/ToolWindow/Settings.cs (97%)
 rename {src => AssemblyLoadDebuggerShared}/ToolWindow/SharedVsTheme.cs (99%)
 rename {src => AssemblyLoadDebuggerShared}/ToolWindow/WpfUtil.cs (98%)
 rename {src => AssemblyLoadDebuggerShared}/VSCommandTable.cs (100%)
 rename {src => AssemblyLoadDebuggerShared}/VSCommandTable.vsct (100%)
 create mode 100644 AssemblyLoadDebuggerShared/VSPackage.cs
 delete mode 100644 src/VSPackage.cs

diff --git a/AssemblyLoadDebuggerShared/AssemblyLoadDebuggerShared.projitems b/AssemblyLoadDebuggerShared/AssemblyLoadDebuggerShared.projitems
index a3f47a4..2edd60b 100644
--- a/AssemblyLoadDebuggerShared/AssemblyLoadDebuggerShared.projitems
+++ b/AssemblyLoadDebuggerShared/AssemblyLoadDebuggerShared.projitems
@@ -9,5 +9,31 @@
     <Import_RootNamespace>AssemblyLoadDebuggerShared</Import_RootNamespace>
   </PropertyGroup>
   <ItemGroup>
+    <Content Include="$(MSBuildThisFileDirectory)Resources\Icon.png" />
   </ItemGroup>
-</Project>
+  <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)Commands\OpenToolWindowCommand.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ToolWindow\ActionCommand.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ToolWindow\AssemblyLoadDebuggerControl.xaml.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ToolWindow\AssemblyLoadDebuggerControlViewModel.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ToolWindow\AssemblyLoadDebuggerToolWindow.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ToolWindow\AssetCache.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ToolWindow\Settings.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ToolWindow\SharedVsTheme.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ToolWindow\WpfUtil.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)VSCommandTable.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+    </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)VSPackage.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Include="$(MSBuildThisFileDirectory)ToolWindow\AssemblyLoadDebuggerControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="$(MSBuildThisFileDirectory)VSCommandTable.vsct" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Commands/OpenToolWindowCommand.cs b/AssemblyLoadDebuggerShared/Commands/OpenToolWindowCommand.cs
similarity index 92%
rename from src/Commands/OpenToolWindowCommand.cs
rename to AssemblyLoadDebuggerShared/Commands/OpenToolWindowCommand.cs
index 1137867..a2ffb4b 100644
--- a/src/Commands/OpenToolWindowCommand.cs
+++ b/AssemblyLoadDebuggerShared/Commands/OpenToolWindowCommand.cs
@@ -1,9 +1,11 @@
-using Microsoft.VisualStudio.Shell;
-using Microsoft.VisualStudio.Shell.Interop;
-using System;
+using System;
 using System.ComponentModel.Design;
+using AssemblyLoadDebugger;
+using Microsoft.VisualStudio.Shell;
+using Microsoft.VisualStudio.Shell.Interop;
+using ToolWindow;
 
-namespace AssemblyLoadDebugger
+namespace Commands
 {
     internal sealed class OpenToolWindowCommand
     {
diff --git a/src/Resources/Icon.png b/AssemblyLoadDebuggerShared/Resources/Icon.png
similarity index 100%
rename from src/Resources/Icon.png
rename to AssemblyLoadDebuggerShared/Resources/Icon.png
diff --git a/src/ToolWindow/ActionCommand.cs b/AssemblyLoadDebuggerShared/ToolWindow/ActionCommand.cs
similarity index 98%
rename from src/ToolWindow/ActionCommand.cs
rename to AssemblyLoadDebuggerShared/ToolWindow/ActionCommand.cs
index e43f529..1a1a703 100644
--- a/src/ToolWindow/ActionCommand.cs
+++ b/AssemblyLoadDebuggerShared/ToolWindow/ActionCommand.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Windows.Input;
 
-namespace AssemblyLoadDebugger
+namespace ToolWindow
 {
     internal class ActionCommand<T> : ICommand
     {
diff --git a/src/ToolWindow/AssemblyLoadDebuggerControl.xaml b/AssemblyLoadDebuggerShared/ToolWindow/AssemblyLoadDebuggerControl.xaml
similarity index 100%
rename from src/ToolWindow/AssemblyLoadDebuggerControl.xaml
rename to AssemblyLoadDebuggerShared/ToolWindow/AssemblyLoadDebuggerControl.xaml
diff --git a/src/ToolWindow/AssemblyLoadDebuggerControl.xaml.cs b/AssemblyLoadDebuggerShared/ToolWindow/AssemblyLoadDebuggerControl.xaml.cs
similarity index 94%
rename from src/ToolWindow/AssemblyLoadDebuggerControl.xaml.cs
rename to AssemblyLoadDebuggerShared/ToolWindow/AssemblyLoadDebuggerControl.xaml.cs
index c8b6706..5fc3b93 100644
--- a/src/ToolWindow/AssemblyLoadDebuggerControl.xaml.cs
+++ b/AssemblyLoadDebuggerShared/ToolWindow/AssemblyLoadDebuggerControl.xaml.cs
@@ -1,4 +1,5 @@
 using System.Windows.Controls;
+using ToolWindow;
 
 namespace AssemblyLoadDebugger
 {
diff --git a/src/ToolWindow/AssemblyLoadDebuggerControlViewModel.cs b/AssemblyLoadDebuggerShared/ToolWindow/AssemblyLoadDebuggerControlViewModel.cs
similarity index 99%
rename from src/ToolWindow/AssemblyLoadDebuggerControlViewModel.cs
rename to AssemblyLoadDebuggerShared/ToolWindow/AssemblyLoadDebuggerControlViewModel.cs
index 729e23d..30d77cd 100644
--- a/src/ToolWindow/AssemblyLoadDebuggerControlViewModel.cs
+++ b/AssemblyLoadDebuggerShared/ToolWindow/AssemblyLoadDebuggerControlViewModel.cs
@@ -17,7 +17,7 @@
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
 
-namespace AssemblyLoadDebugger
+namespace ToolWindow
 {
     public class AssemblyLoadDebuggerControlViewModel : INotifyPropertyChanged
     {
diff --git a/src/ToolWindow/AssemblyLoadDebuggerToolWindow.cs b/AssemblyLoadDebuggerShared/ToolWindow/AssemblyLoadDebuggerToolWindow.cs
similarity index 82%
rename from src/ToolWindow/AssemblyLoadDebuggerToolWindow.cs
rename to AssemblyLoadDebuggerShared/ToolWindow/AssemblyLoadDebuggerToolWindow.cs
index ba16d5c..bd6ab21 100644
--- a/src/ToolWindow/AssemblyLoadDebuggerToolWindow.cs
+++ b/AssemblyLoadDebuggerShared/ToolWindow/AssemblyLoadDebuggerToolWindow.cs
@@ -1,9 +1,9 @@
-namespace AssemblyLoadDebugger
-{
-    using System;
-    using System.Runtime.InteropServices;
-    using Microsoft.VisualStudio.Shell;
+using System.Runtime.InteropServices;
+using AssemblyLoadDebugger;
+using Microsoft.VisualStudio.Shell;
 
+namespace ToolWindow
+{
     [Guid("71604717-b15d-4d1e-9fb4-03f5122e8858")]
     public class AssemblyLoadDebuggerToolWindow : ToolWindowPane
     {
diff --git a/src/ToolWindow/AssetCache.cs b/AssemblyLoadDebuggerShared/ToolWindow/AssetCache.cs
similarity index 98%
rename from src/ToolWindow/AssetCache.cs
rename to AssemblyLoadDebuggerShared/ToolWindow/AssetCache.cs
index 97c374a..250f638 100644
--- a/src/ToolWindow/AssetCache.cs
+++ b/AssemblyLoadDebuggerShared/ToolWindow/AssetCache.cs
@@ -9,7 +9,7 @@
 using Microsoft.VisualStudio.Shell.Interop;
 using ImageAttributes = Microsoft.VisualStudio.Imaging.Interop.ImageAttributes;
 
-namespace AssemblyLoadDebugger
+namespace ToolWindow
 {
     public static class AssetCache
     {
diff --git a/src/ToolWindow/Settings.cs b/AssemblyLoadDebuggerShared/ToolWindow/Settings.cs
similarity index 97%
rename from src/ToolWindow/Settings.cs
rename to AssemblyLoadDebuggerShared/ToolWindow/Settings.cs
index 42b829f..b438168 100644
--- a/src/ToolWindow/Settings.cs
+++ b/AssemblyLoadDebuggerShared/ToolWindow/Settings.cs
@@ -3,7 +3,7 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace AssemblyLoadDebugger
+namespace ToolWindow
 {
     [JsonObject(MemberSerialization.OptIn)]
     public class Settings
diff --git a/src/ToolWindow/SharedVsTheme.cs b/AssemblyLoadDebuggerShared/ToolWindow/SharedVsTheme.cs
similarity index 99%
rename from src/ToolWindow/SharedVsTheme.cs
rename to AssemblyLoadDebuggerShared/ToolWindow/SharedVsTheme.cs
index ea47c0b..01d40ad 100644
--- a/src/ToolWindow/SharedVsTheme.cs
+++ b/AssemblyLoadDebuggerShared/ToolWindow/SharedVsTheme.cs
@@ -1,6 +1,6 @@
 using Microsoft.VisualStudio.PlatformUI;
 
-namespace AssemblyLoadDebugger
+namespace ToolWindow
 {
     public static class SharedVsTheme
     {
diff --git a/src/ToolWindow/WpfUtil.cs b/AssemblyLoadDebuggerShared/ToolWindow/WpfUtil.cs
similarity index 98%
rename from src/ToolWindow/WpfUtil.cs
rename to AssemblyLoadDebuggerShared/ToolWindow/WpfUtil.cs
index 97e781f..311f152 100644
--- a/src/ToolWindow/WpfUtil.cs
+++ b/AssemblyLoadDebuggerShared/ToolWindow/WpfUtil.cs
@@ -3,7 +3,7 @@
 using System.Windows.Controls;
 using Microsoft.VisualStudio.Shell;
 
-namespace AssemblyLoadDebugger
+namespace ToolWindow
 {
     public static class ThemeUtils
     {
diff --git a/src/VSCommandTable.cs b/AssemblyLoadDebuggerShared/VSCommandTable.cs
similarity index 100%
rename from src/VSCommandTable.cs
rename to AssemblyLoadDebuggerShared/VSCommandTable.cs
diff --git a/src/VSCommandTable.vsct b/AssemblyLoadDebuggerShared/VSCommandTable.vsct
similarity index 100%
rename from src/VSCommandTable.vsct
rename to AssemblyLoadDebuggerShared/VSCommandTable.vsct
diff --git a/AssemblyLoadDebuggerShared/VSPackage.cs b/AssemblyLoadDebuggerShared/VSPackage.cs
new file mode 100644
index 0000000..981a597
--- /dev/null
+++ b/AssemblyLoadDebuggerShared/VSPackage.cs
@@ -0,0 +1,24 @@
+using System;
+using System.ComponentModel.Design;
+using System.Runtime.InteropServices;
+using System.Threading;
+using AssemblyLoadDebugger;
+using Commands;
+using Microsoft.VisualStudio.Shell;
+using ToolWindow;
+
+[PackageRegistration(AllowsBackgroundLoading = true, UseManagedResourcesOnly = true)]
+[InstalledProductRegistration("#110", "#112", "1.0", IconResourceID = 400)]
+[ProvideMenuResource("Menus.ctmenu", 1)]
+[ProvideToolWindow(typeof(AssemblyLoadDebuggerToolWindow))]
+[Guid(PackageGuids.guidAssemblyLoadDebuggerPackageString)]
+public sealed class VSPackage : AsyncPackage
+{
+    protected override async System.Threading.Tasks.Task InitializeAsync(CancellationToken cancellationToken, IProgress<ServiceProgressData> progress)
+    {
+        if (await GetServiceAsync(typeof(IMenuCommandService)) is OleMenuCommandService commandService)
+        {
+            OpenToolWindowCommand.Initialize(this, commandService);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/AssemblyLoadDebugger.csproj b/src/AssemblyLoadDebugger.csproj
index 1b3ac2f..09ea189 100644
--- a/src/AssemblyLoadDebugger.csproj
+++ b/src/AssemblyLoadDebugger.csproj
@@ -60,27 +60,10 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="ToolWindow\Settings.cs" />
-    <Compile Include="VSCommandTable.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>VSCommandTable.vsct</DependentUpon>
-    </Compile>
     <Compile Include="source.extension.cs">
       <DependentUpon>source.extension.vsixmanifest</DependentUpon>
     </Compile>
-    <Compile Include="ToolWindow\ActionCommand.cs" />
-    <Compile Include="ToolWindow\AssemblyLoadDebuggerControlViewModel.cs" />
-    <Compile Include="Commands\OpenToolWindowCommand.cs" />
-    <Compile Include="ToolWindow\AssemblyLoadDebuggerControl.xaml.cs">
-      <DependentUpon>AssemblyLoadDebuggerControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="VSPackage.cs" />
-    <Compile Include="ToolWindow\AssemblyLoadDebuggerToolWindow.cs" />
-    <Compile Include="ToolWindow\AssetCache.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ToolWindow\SharedVsTheme.cs" />
-    <Compile Include="ToolWindow\WpfUtil.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="..\LICENSE">
@@ -95,23 +78,9 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Resources\Icon.png">
-      <IncludeInVSIX>true</IncludeInVSIX>
-    </Content>
     <Content Include="source.extension.ico">
       <DependentUpon>source.extension.vsixmanifest</DependentUpon>
     </Content>
-    <VSCTCompile Include="VSCommandTable.vsct">
-      <ResourceName>Menus.ctmenu</ResourceName>
-      <Generator>VsctGenerator</Generator>
-      <LastGenOutput>VSCommandTable.cs</LastGenOutput>
-    </VSCTCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <Page Include="ToolWindow\AssemblyLoadDebuggerControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
   </ItemGroup>
   <ItemGroup>
     <Reference Include="EnvDTE, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -178,6 +147,7 @@
     </PackageReference>
     <PackageReference Include="Microsoft.VisualStudio.CommandBars" Version="8.0.0.0" />
   </ItemGroup>
+  <ItemGroup />
   <Import Project="..\AssemblyLoadDebuggerShared\AssemblyLoadDebuggerShared.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
diff --git a/src/VSPackage.cs b/src/VSPackage.cs
deleted file mode 100644
index 5ec9311..0000000
--- a/src/VSPackage.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using Microsoft.VisualStudio.Shell;
-using System;
-using System.ComponentModel.Design;
-using System.Runtime.InteropServices;
-using System.Threading;
-
-namespace AssemblyLoadDebugger
-{
-    [PackageRegistration(AllowsBackgroundLoading = true, UseManagedResourcesOnly = true)]
-    [InstalledProductRegistration("#110", "#112", "1.0", IconResourceID = 400)]
-    [ProvideMenuResource("Menus.ctmenu", 1)]
-    [ProvideToolWindow(typeof(AssemblyLoadDebuggerToolWindow))]
-    [Guid(PackageGuids.guidAssemblyLoadDebuggerPackageString)]
-    public sealed class VSPackage : AsyncPackage
-    {
-        protected override async System.Threading.Tasks.Task InitializeAsync(CancellationToken cancellationToken, IProgress<ServiceProgressData> progress)
-        {
-            if (await GetServiceAsync(typeof(IMenuCommandService)) is OleMenuCommandService commandService)
-            {
-                OpenToolWindowCommand.Initialize(this, commandService);
-            }
-        }
-    }
-}

From deef202e981fc95d7006f17d0595568d56f135dc Mon Sep 17 00:00:00 2001
From: Matthew McDonald <mmcdonald@themission.co.uk>
Date: Thu, 24 Aug 2023 21:31:16 +0100
Subject: [PATCH 7/8] move resources to shared folder and reference them

---
 .../AssemblyLoadDebuggerShared.projitems            |   5 +----
 .../Resources => SharedResources}/Icon.png          | Bin
 .../VSCommandTable.vsct                             |   0
 src/AssemblyLoadDebugger.csproj                     |   7 +++++++
 4 files changed, 8 insertions(+), 4 deletions(-)
 rename {AssemblyLoadDebuggerShared/Resources => SharedResources}/Icon.png (100%)
 rename {AssemblyLoadDebuggerShared => SharedResources}/VSCommandTable.vsct (100%)

diff --git a/AssemblyLoadDebuggerShared/AssemblyLoadDebuggerShared.projitems b/AssemblyLoadDebuggerShared/AssemblyLoadDebuggerShared.projitems
index 2edd60b..43afe66 100644
--- a/AssemblyLoadDebuggerShared/AssemblyLoadDebuggerShared.projitems
+++ b/AssemblyLoadDebuggerShared/AssemblyLoadDebuggerShared.projitems
@@ -8,9 +8,6 @@
   <PropertyGroup Label="Configuration">
     <Import_RootNamespace>AssemblyLoadDebuggerShared</Import_RootNamespace>
   </PropertyGroup>
-  <ItemGroup>
-    <Content Include="$(MSBuildThisFileDirectory)Resources\Icon.png" />
-  </ItemGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildThisFileDirectory)Commands\OpenToolWindowCommand.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ToolWindow\ActionCommand.cs" />
@@ -34,6 +31,6 @@
     </Page>
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(MSBuildThisFileDirectory)VSCommandTable.vsct" />
+    <Folder Include="$(MSBuildThisFileDirectory)Resources\" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/AssemblyLoadDebuggerShared/Resources/Icon.png b/SharedResources/Icon.png
similarity index 100%
rename from AssemblyLoadDebuggerShared/Resources/Icon.png
rename to SharedResources/Icon.png
diff --git a/AssemblyLoadDebuggerShared/VSCommandTable.vsct b/SharedResources/VSCommandTable.vsct
similarity index 100%
rename from AssemblyLoadDebuggerShared/VSCommandTable.vsct
rename to SharedResources/VSCommandTable.vsct
diff --git a/src/AssemblyLoadDebugger.csproj b/src/AssemblyLoadDebugger.csproj
index 09ea189..b4549ea 100644
--- a/src/AssemblyLoadDebugger.csproj
+++ b/src/AssemblyLoadDebugger.csproj
@@ -78,6 +78,13 @@
     </None>
   </ItemGroup>
   <ItemGroup>
+    <Content Include="..\SharedResources\Icon.png">
+      <Link>Resources\Icon.png</Link>
+      <IncludeInVSIX>true</IncludeInVSIX>
+    </Content>
+    <VSCTCompile Include="..\SharedResources\VSCommandTable.vsct">
+      <Link>VSCommandTable.vsct</Link>
+    </VSCTCompile>
     <Content Include="source.extension.ico">
       <DependentUpon>source.extension.vsixmanifest</DependentUpon>
     </Content>

From 4f120d3ff5a16ee5cf66d57618f65e803b1e2e0f Mon Sep 17 00:00:00 2001
From: Matthew McDonald <mmcdonald@themission.co.uk>
Date: Fri, 25 Aug 2023 08:14:59 +0100
Subject: [PATCH 8/8] sharing is caring

---
 AssemblyLoadDebugger.sln                      | 27 ++++++
 .../AssemblyLoadDebugger2022.csproj           | 85 +++++++++++++++++++
 .../Properties/AssemblyInfo.cs                | 33 +++++++
 .../source.extension.vsixmanifest             | 27 ++++++
 .../AssemblyLoadDebuggerToolWindow.cs         |  2 +-
 5 files changed, 173 insertions(+), 1 deletion(-)
 create mode 100644 AssemblyLoadDebugger2022/AssemblyLoadDebugger2022.csproj
 create mode 100644 AssemblyLoadDebugger2022/Properties/AssemblyInfo.cs
 create mode 100644 AssemblyLoadDebugger2022/source.extension.vsixmanifest

diff --git a/AssemblyLoadDebugger.sln b/AssemblyLoadDebugger.sln
index b52d05c..ddb7b75 100644
--- a/AssemblyLoadDebugger.sln
+++ b/AssemblyLoadDebugger.sln
@@ -14,16 +14,42 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssemblyLoadDebugger", "src
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "AssemblyLoadDebuggerShared", "AssemblyLoadDebuggerShared\AssemblyLoadDebuggerShared.shproj", "{A0C1B03A-E53A-460D-9D88-EBC6F9EE2C23}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssemblyLoadDebugger2022", "AssemblyLoadDebugger2022\AssemblyLoadDebugger2022.csproj", "{3FC3C2D7-320C-440E-B635-1EAB8FB440BB}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|arm64 = Debug|arm64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|arm64 = Release|arm64
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{3C58ECA5-7983-4A86-AAF6-F98769343FBA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3C58ECA5-7983-4A86-AAF6-F98769343FBA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3C58ECA5-7983-4A86-AAF6-F98769343FBA}.Debug|arm64.ActiveCfg = Debug|arm64
+		{3C58ECA5-7983-4A86-AAF6-F98769343FBA}.Debug|arm64.Build.0 = Debug|arm64
+		{3C58ECA5-7983-4A86-AAF6-F98769343FBA}.Debug|x86.ActiveCfg = Debug|x86
+		{3C58ECA5-7983-4A86-AAF6-F98769343FBA}.Debug|x86.Build.0 = Debug|x86
 		{3C58ECA5-7983-4A86-AAF6-F98769343FBA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3C58ECA5-7983-4A86-AAF6-F98769343FBA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3C58ECA5-7983-4A86-AAF6-F98769343FBA}.Release|arm64.ActiveCfg = Release|arm64
+		{3C58ECA5-7983-4A86-AAF6-F98769343FBA}.Release|arm64.Build.0 = Release|arm64
+		{3C58ECA5-7983-4A86-AAF6-F98769343FBA}.Release|x86.ActiveCfg = Release|x86
+		{3C58ECA5-7983-4A86-AAF6-F98769343FBA}.Release|x86.Build.0 = Release|x86
+		{3FC3C2D7-320C-440E-B635-1EAB8FB440BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3FC3C2D7-320C-440E-B635-1EAB8FB440BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3FC3C2D7-320C-440E-B635-1EAB8FB440BB}.Debug|arm64.ActiveCfg = Debug|arm64
+		{3FC3C2D7-320C-440E-B635-1EAB8FB440BB}.Debug|arm64.Build.0 = Debug|arm64
+		{3FC3C2D7-320C-440E-B635-1EAB8FB440BB}.Debug|x86.ActiveCfg = Debug|x86
+		{3FC3C2D7-320C-440E-B635-1EAB8FB440BB}.Debug|x86.Build.0 = Debug|x86
+		{3FC3C2D7-320C-440E-B635-1EAB8FB440BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3FC3C2D7-320C-440E-B635-1EAB8FB440BB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3FC3C2D7-320C-440E-B635-1EAB8FB440BB}.Release|arm64.ActiveCfg = Release|arm64
+		{3FC3C2D7-320C-440E-B635-1EAB8FB440BB}.Release|arm64.Build.0 = Release|arm64
+		{3FC3C2D7-320C-440E-B635-1EAB8FB440BB}.Release|x86.ActiveCfg = Release|x86
+		{3FC3C2D7-320C-440E-B635-1EAB8FB440BB}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -33,6 +59,7 @@ Global
 	EndGlobalSection
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		AssemblyLoadDebuggerShared\AssemblyLoadDebuggerShared.projitems*{3c58eca5-7983-4a86-aaf6-f98769343fba}*SharedItemsImports = 4
+		AssemblyLoadDebuggerShared\AssemblyLoadDebuggerShared.projitems*{3fc3c2d7-320c-440e-b635-1eab8fb440bb}*SharedItemsImports = 4
 		AssemblyLoadDebuggerShared\AssemblyLoadDebuggerShared.projitems*{a0c1b03a-e53a-460d-9d88-ebc6f9ee2c23}*SharedItemsImports = 13
 	EndGlobalSection
 EndGlobal
diff --git a/AssemblyLoadDebugger2022/AssemblyLoadDebugger2022.csproj b/AssemblyLoadDebugger2022/AssemblyLoadDebugger2022.csproj
new file mode 100644
index 0000000..ed05d9f
--- /dev/null
+++ b/AssemblyLoadDebugger2022/AssemblyLoadDebugger2022.csproj
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <MinimumVisualStudioVersion>17.0</MinimumVisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+  </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>{3FC3C2D7-320C-440E-B635-1EAB8FB440BB}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>AssemblyLoadDebugger2022</RootNamespace>
+    <AssemblyName>AssemblyLoadDebugger2022</AssemblyName>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <GeneratePkgDefFile>true</GeneratePkgDefFile>
+    <UseCodebase>true</UseCodebase>
+    <IncludeAssemblyInVSIXContainer>true</IncludeAssemblyInVSIXContainer>
+    <IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
+    <IncludeDebugSymbolsInLocalVSIXDeployment>false</IncludeDebugSymbolsInLocalVSIXDeployment>
+    <CopyBuildOutputToOutputDirectory>true</CopyBuildOutputToOutputDirectory>
+    <CopyOutputSymbolsToOutputDirectory>true</CopyOutputSymbolsToOutputDirectory>
+    <StartAction>Program</StartAction>
+    <StartProgram Condition="'$(DevEnvDir)' != ''">$(DevEnvDir)devenv.exe</StartProgram>
+    <StartArguments>/rootsuffix Exp</StartArguments>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\LICENSE">
+      <Link>Resources\LICENSE</Link>
+    </None>
+    <None Include="source.extension.vsixmanifest">
+      <SubType>Designer</SubType>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Design" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.IO.Compression.FileSystem" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xaml" />
+    <Reference Include="System.Xml" />
+    <Reference Include="WindowsBase" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.VisualStudio.SDK" Version="17.0.32112.339" ExcludeAssets="runtime" />
+  </ItemGroup>
+  <ItemGroup />
+  <ItemGroup>
+    <Content Include="..\SharedResources\Icon.png">
+      <Link>Resources\Icon.png</Link>
+    </Content>
+  </ItemGroup>
+  <Import Project="..\AssemblyLoadDebuggerShared\AssemblyLoadDebuggerShared.projitems" Label="Shared" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
+</Project>
\ No newline at end of file
diff --git a/AssemblyLoadDebugger2022/Properties/AssemblyInfo.cs b/AssemblyLoadDebugger2022/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..8c2af69
--- /dev/null
+++ b/AssemblyLoadDebugger2022/Properties/AssemblyInfo.cs
@@ -0,0 +1,33 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("AssemblyLoadDebugger2022")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("AssemblyLoadDebugger2022")]
+[assembly: AssemblyCopyright("")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/AssemblyLoadDebugger2022/source.extension.vsixmanifest b/AssemblyLoadDebugger2022/source.extension.vsixmanifest
new file mode 100644
index 0000000..39cf4fe
--- /dev/null
+++ b/AssemblyLoadDebugger2022/source.extension.vsixmanifest
@@ -0,0 +1,27 @@
+<?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="34f00824-cb6a-4bc1-a27d-7375239cdd2f" Version="1.2" Language="en-US" Publisher="Mike Lorbetske" />
+        <DisplayName>Assembly Load Debugger</DisplayName>
+        <Description xml:space="preserve">Shows what assemblies Visual Studio loads and what component caused it to load</Description>
+        <MoreInfo>https://github.com/mlorbetske/VSAssemblyLoadDebugger/</MoreInfo>
+        <ReleaseNotes>https://github.com/mlorbetske/VSAssemblyLoadDebugger/blob/master/CHANGELOG.md</ReleaseNotes>
+        <Icon>Resources\Icon.png</Icon>
+        <PreviewImage>Resources\Icon.png</PreviewImage>
+        <Tags>assembly, performance, assemblies</Tags>
+    </Metadata>
+    <Installation>
+        <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[17.0, 18.0)">
+            <ProductArchitecture>amd64</ProductArchitecture>
+        </InstallationTarget>
+    </Installation>
+    <Dependencies>
+        <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
+    </Dependencies>
+    <Prerequisites>
+        <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[17.0,18.0)" DisplayName="Visual Studio core editor" />
+    </Prerequisites>
+    <Assets>
+        <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
+    </Assets>
+</PackageManifest>
diff --git a/AssemblyLoadDebuggerShared/ToolWindow/AssemblyLoadDebuggerToolWindow.cs b/AssemblyLoadDebuggerShared/ToolWindow/AssemblyLoadDebuggerToolWindow.cs
index bd6ab21..1315413 100644
--- a/AssemblyLoadDebuggerShared/ToolWindow/AssemblyLoadDebuggerToolWindow.cs
+++ b/AssemblyLoadDebuggerShared/ToolWindow/AssemblyLoadDebuggerToolWindow.cs
@@ -9,7 +9,7 @@ public class AssemblyLoadDebuggerToolWindow : ToolWindowPane
     {
         public AssemblyLoadDebuggerToolWindow() : base(null)
         {
-            this.Caption = Vsix.Name;
+            this.Caption = "Assembly Load Debugger";
 
             AssemblyLoadDebuggerControl control = new AssemblyLoadDebuggerControl();
             control.DataContext = AssemblyLoadDebuggerControlViewModel.Instance;