diff --git a/Gardiner.VsShowMissing.Shared/Options/BaseOptionPage.cs b/Gardiner.VsShowMissing.Shared/Options/BaseOptionPage.cs
index 84f18cb..5b675dc 100644
--- a/Gardiner.VsShowMissing.Shared/Options/BaseOptionPage.cs
+++ b/Gardiner.VsShowMissing.Shared/Options/BaseOptionPage.cs
@@ -1,10 +1,12 @@
 using Microsoft.VisualStudio.Shell;
+using System.Runtime.InteropServices;
 
 namespace Gardiner.VsShowMissing.Options
 {
     /// <summary>
     /// A base class for a DialogPage to show in Tools -> Options.
     /// </summary>
+    [ComVisible(true)]
     internal class BaseOptionPage<T> : DialogPage where T : BaseOptionModel<T>, new()
     {
         private readonly BaseOptionModel<T> _model;
diff --git a/Gardiner.VsShowMissing.Shared/Options/DialogPageProvider.cs b/Gardiner.VsShowMissing.Shared/Options/DialogPageProvider.cs
index a1b841b..3f8c600 100644
--- a/Gardiner.VsShowMissing.Shared/Options/DialogPageProvider.cs
+++ b/Gardiner.VsShowMissing.Shared/Options/DialogPageProvider.cs
@@ -1,12 +1,13 @@
-namespace Gardiner.VsShowMissing.Options
-{
-#pragma warning disable CA1812
+using System.Runtime.InteropServices;
 
+namespace Gardiner.VsShowMissing.Options
+{
     /// <summary>
-    /// A provider for custom <see cref="DialogPage" /> implementations.
+    /// A provider for custom <see cref="Microsoft.VisualStudio.Shell.DialogPage" /> implementations.
     /// </summary>
     internal class DialogPageProvider
     {
+        [ComVisible(true)]
         public class General : BaseOptionPage<GeneralOptions> { }
     }
 }
\ No newline at end of file
diff --git a/VS2019/VS2019.csproj b/VS2019/VS2019.csproj
index 8e66c5f..8d05307 100644
--- a/VS2019/VS2019.csproj
+++ b/VS2019/VS2019.csproj
@@ -94,7 +94,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Community.VisualStudio.Toolkit.16">
-      <Version>16.0.355</Version>
+      <Version>16.0.430</Version>
     </PackageReference>
     <PackageReference Include="Community.VisualStudio.VSCT">
       <Version>16.0.29.6</Version>
diff --git a/VS2019/packages.lock.json b/VS2019/packages.lock.json
index 2f1ad48..5ce77f2 100644
--- a/VS2019/packages.lock.json
+++ b/VS2019/packages.lock.json
@@ -4,11 +4,11 @@
     ".NETFramework,Version=v4.7.2": {
       "Community.VisualStudio.Toolkit.16": {
         "type": "Direct",
-        "requested": "[16.0.355, )",
-        "resolved": "16.0.355",
-        "contentHash": "+dCFLp5gRRIgDRYJKHfkMMTDUA7JYZq6J61MJHKrMWp82fYF+0kw0gCIstcjtnemKKcy01sedCfSdIrZsJp3uQ==",
+        "requested": "[16.0.430, )",
+        "resolved": "16.0.430",
+        "contentHash": "VqbfvBY9LXRGcQv0Ov/zfxd4pI1vF4uJDp3FS8yFMPVrTjiWbBqWgoTOAIRd3TvcOyV3OGKt99NHkgfVwBpZFQ==",
         "dependencies": {
-          "Community.VisualStudio.Toolkit.Analyzers": "1.0.355",
+          "Community.VisualStudio.Toolkit.Analyzers": "1.0.430",
           "Microsoft.VisualStudio.SDK": "16.0.206",
           "Microsoft.VisualStudio.Shell.Interop.12.1.DesignTime": "12.1.30329"
         }
@@ -64,8 +64,8 @@
       },
       "Community.VisualStudio.Toolkit.Analyzers": {
         "type": "Transitive",
-        "resolved": "1.0.355",
-        "contentHash": "XwzxoOoDE96ekgfT/7yzOsQy35fIyCHLF9f7t/NQgr9t4FvHD2zDPMddmcWj6xwdOMw6JbIyiTiUiYGqOKDrew=="
+        "resolved": "1.0.430",
+        "contentHash": "T34YABkVK5P3+gtxCq3n8wOfUR4yJBnlv6jYKu/3admm1P4E4kC+r0YH1KwTFemKTGjl8OEXZdL3xYfxNuot7Q=="
       },
       "EnvDTE": {
         "type": "Transitive",
diff --git a/VS2022/packages.lock.json b/VS2022/packages.lock.json
index 8350db9..942265e 100644
--- a/VS2022/packages.lock.json
+++ b/VS2022/packages.lock.json
@@ -42,11 +42,11 @@
       },
       "Microsoft.VSSDK.BuildTools": {
         "type": "Direct",
-        "requested": "[17.0.5232, )",
-        "resolved": "17.0.5232",
-        "contentHash": "k2+OBg4wxpOofGrEdsm9+vQXgghOusae4f2Vo7XLbEFWv6S9zWqQ5KQ6wy1Ygu845I82CbthEiubmxtVye1fsA==",
+        "requested": "[17.0.5234, )",
+        "resolved": "17.0.5234",
+        "contentHash": "dO1LHj+WrSyoK7x3GbOGsaMMHhSVmwQ52xjdOsFXPJyxLAYrpwRLOEOthPnFjsG0CrNCdkhaS9Kcq/G5ee/mKw==",
         "dependencies": {
-          "Microsoft.VisualStudio.SDK.Analyzers": "15.8.33"
+          "Microsoft.VisualStudio.SDK.Analyzers": "16.10.10"
         }
       },
       "Nerdbank.GitVersioning": {
@@ -139,6 +139,11 @@
         "resolved": "17.0.0",
         "contentHash": "XbFA0z+6Ws2pNeRXYcDF3lKlNgRoSGMm2Q5HKzZD+EbwYMKPKrl/BJnnkMuDJHU0KravYHfhzBnLLJpPeZ3E7A=="
       },
+      "Microsoft.CodeAnalysis.BannedApiAnalyzers": {
+        "type": "Transitive",
+        "resolved": "3.3.2",
+        "contentHash": "LlcsDRSYfkJFWOdDpysY/4Ph4llHc8DLOc3roFTz9+216vl+vwVGfbys2rcSmhZCTDv/0kxSs2oOdd9SX2NiVg=="
+      },
       "Microsoft.CSharp": {
         "type": "Transitive",
         "resolved": "4.7.0",
@@ -521,10 +526,11 @@
       },
       "Microsoft.VisualStudio.SDK.Analyzers": {
         "type": "Transitive",
-        "resolved": "15.8.33",
-        "contentHash": "5rP5FqdiHID6AtB7m8LNQKXnjTFCErAtazW8gqY4z27kTp+K6S6ZMzBME7hryOCSo2laogjjL1GWp2bUaJZqRw==",
+        "resolved": "16.10.10",
+        "contentHash": "LuhBHy7MJJ5SjpS7J2GuHqPyL1VeqXUwYc+mTagaUCzXbNwJmLcSUAioCyQyAzPIn6qtnzuM5Lz6ULOQS3ifUA==",
         "dependencies": {
-          "Microsoft.VisualStudio.Threading.Analyzers": "15.8.122"
+          "Microsoft.CodeAnalysis.BannedApiAnalyzers": "3.3.2",
+          "Microsoft.VisualStudio.Threading.Analyzers": "16.10.56"
         }
       },
       "Microsoft.VisualStudio.Setup.Configuration.Interop": {