diff --git a/.github/workflows/MSBuild.yml b/.github/workflows/MSBuild.yml
index d6e879ebc..f1e7c9d10 100644
--- a/.github/workflows/MSBuild.yml
+++ b/.github/workflows/MSBuild.yml
@@ -30,26 +30,6 @@ jobs:
       working-directory: build
       run: cmd.exe /C scripts\gh-version-setup ${{ github.run_number }}
 
-    - name: Build 2017-2019
-      working-directory: ${{env.GITHUB_WORKSPACE}}
-      run: msbuild /m /v:m /restore /p:UseVsSdkVersion=15.0 /p:Configuration=Release ${{env.SOLUTION_FILE_PATH}} @build\scripts\msbuild-version.rsp
-
-    - name: Package vsix 2017-2019
-      uses: actions/upload-artifact@v2
-      with:
-        name: Ankh-VSIX-2017-2019
-        path: build/src/Ankh.Package/bin/release/Ankh.Package.vsix
-
-    - name: Build 2019
-      working-directory: ${{env.GITHUB_WORKSPACE}}
-      run: msbuild /m /v:m /restore /t:rebuild /p:Configuration=Release ${{env.SOLUTION_FILE_PATH}} @build\scripts\msbuild-version.rsp
-
-    - name: Package vsix 2019
-      uses: actions/upload-artifact@v2
-      with:
-        name: Ankh-VSIX-2019-only
-        path: build/src/Ankh.Package/bin/release/Ankh.Package.vsix
-
     - name: Build 2022
       working-directory: ${{env.GITHUB_WORKSPACE}}
       run: msbuild /m /v:m /restore /t:rebuild /p:UseVsSdkVersion=17.0 /p:Configuration=Release ${{env.SOLUTION_FILE_PATH}} @build\scripts\msbuild-version.rsp
@@ -59,13 +39,3 @@ jobs:
       with:
         name: Ankh-VSIX-2022
         path: build/src/Ankh.Package/bin/release/Ankh.Package.vsix
-
-#    - name: Build 2012-2015
-#      working-directory: ${{env.GITHUB_WORKSPACE}}
-#      run: msbuild /m /v:m /restore /t:rebuild /p:UseVsSdkVersion=11.0 /p:Configuration=Release ${{env.SOLUTION_FILE_PATH}} @build\scripts\msbuild-version.rsp
-#
-#    - name: Package vsix 2012-2015
-#      uses: actions/upload-artifact@v2
-#      with:
-#        name: Ankh-VSIX-2012-2015
-#        path: build/src/Ankh.Package/bin/release/Ankh.Package.vsix
diff --git a/src/.editorconfig b/src/.editorconfig
index d0cb58a8c..aaeddf330 100644
--- a/src/.editorconfig
+++ b/src/.editorconfig
@@ -2,3 +2,6 @@
 
 # VSTHRD010: Invoke single-threaded types on Main thread
 dotnet_diagnostic.VSTHRD010.severity = none
+
+# IDE0052: Remove unread private members
+dotnet_diagnostic.IDE0052.severity = none
diff --git a/src/Ankh.Diff/Ankh.Diff.csproj b/src/Ankh.Diff/Ankh.Diff.csproj
index 69a9e5612..19c28f21f 100644
--- a/src/Ankh.Diff/Ankh.Diff.csproj
+++ b/src/Ankh.Diff/Ankh.Diff.csproj
@@ -39,7 +39,7 @@
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
     <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet>ExtendedCorrectnessRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
@@ -190,6 +190,16 @@
       <Name>Ankh.Services</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Update="Microsoft.VisualStudio.SDK">
+      <Version>17.5.33428.388</Version>
+    </PackageReference>
+    <PackageReference Update="Microsoft.VSSDK.BuildTools">
+      <Version>17.5.4072</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.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.
diff --git a/src/Ankh.ExtensionPoints/Ankh.ExtensionPoints.csproj b/src/Ankh.ExtensionPoints/Ankh.ExtensionPoints.csproj
index ec873aa70..2948110ec 100644
--- a/src/Ankh.ExtensionPoints/Ankh.ExtensionPoints.csproj
+++ b/src/Ankh.ExtensionPoints/Ankh.ExtensionPoints.csproj
@@ -34,7 +34,7 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>false</Prefer32Bit>
-	<PlatformTarget>AnyCPU</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
     <OutputPath>bin\Release\</OutputPath>
@@ -46,7 +46,7 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>false</Prefer32Bit>
-	<PlatformTarget>AnyCPU</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -69,6 +69,16 @@
   <ItemGroup>
     <None Include="Ankh.ExtensionPoints.snk" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Update="Microsoft.VisualStudio.SDK">
+      <Version>17.5.33428.388</Version>
+    </PackageReference>
+    <PackageReference Update="Microsoft.VSSDK.BuildTools">
+      <Version>17.5.4072</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.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.
diff --git a/src/Ankh.Ids/Ankh.Ids.csproj b/src/Ankh.Ids/Ankh.Ids.csproj
index a837f8698..1290037cf 100644
--- a/src/Ankh.Ids/Ankh.Ids.csproj
+++ b/src/Ankh.Ids/Ankh.Ids.csproj
@@ -56,6 +56,16 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="Ankh.Ids.snk" />
+  </ItemGroup>
+    <ItemGroup>
+    <PackageReference Update="Microsoft.VisualStudio.SDK">
+      <Version>17.5.33428.388</Version>
+    </PackageReference>
+    <PackageReference Update="Microsoft.VSSDK.BuildTools">
+      <Version>17.5.4072</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/Ankh.ImageCatalog/Ankh.ImageCatalog.csproj b/src/Ankh.ImageCatalog/Ankh.ImageCatalog.csproj
index 5089e61e7..35811c90d 100644
--- a/src/Ankh.ImageCatalog/Ankh.ImageCatalog.csproj
+++ b/src/Ankh.ImageCatalog/Ankh.ImageCatalog.csproj
@@ -62,7 +62,16 @@
     </Content>
     <EmbeddedResource Include="Imgs\RepositoryExplorer.png" />
   </ItemGroup>
-  <ItemGroup />
+    <ItemGroup>
+    <PackageReference Update="Microsoft.VisualStudio.SDK">
+      <Version>17.5.33428.388</Version>
+    </PackageReference>
+    <PackageReference Update="Microsoft.VSSDK.BuildTools">
+      <Version>17.5.4072</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="..\tools\turtletasks\QQn.TurtleTasks.targets" />
   <PropertyGroup>
diff --git a/src/Ankh.Package/Ankh.Package.csproj b/src/Ankh.Package/Ankh.Package.csproj
index a85d23811..5e23a0d6c 100644
--- a/src/Ankh.Package/Ankh.Package.csproj
+++ b/src/Ankh.Package/Ankh.Package.csproj
@@ -144,13 +144,13 @@
       <SubType>Component</SubType>
     </Compile>
     <Compile Include="AnkhSvnPackage.cs" />
-	<Compile Include="AnkhSvnPackage.AsyncPackage.cs" Condition="'$(UseVsSdkVersion)' &gt;= '15.0'">
-		<DependentUpon>AnkhSvnPackage.cs</DependentUpon>
-	</Compile>
-	<Compile Include="AnkhSvnPackage.LegacyPackage.cs" Condition="'$(UseVsSdkVersion)' &lt; '15.0'">
-		<DependentUpon>AnkhSvnPackage.cs</DependentUpon>
-	</Compile>
-	<Compile Include="AnkhSvnPackage.About.cs">
+    <Compile Include="AnkhSvnPackage.AsyncPackage.cs" Condition="'$(UseVsSdkVersion)' &gt;= '15.0'">
+      <DependentUpon>AnkhSvnPackage.cs</DependentUpon>
+    </Compile>
+    <Compile Include="AnkhSvnPackage.LegacyPackage.cs" Condition="'$(UseVsSdkVersion)' &lt; '15.0'">
+      <DependentUpon>AnkhSvnPackage.cs</DependentUpon>
+    </Compile>
+    <Compile Include="AnkhSvnPackage.About.cs">
       <DependentUpon>AnkhSvnPackage.cs</DependentUpon>
     </Compile>
     <Compile Include="AnkhSvnPackage.Commands.cs">
@@ -506,7 +506,16 @@
       <Name>Ankh</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
+    <ItemGroup>
+    <PackageReference Update="Microsoft.VisualStudio.SDK">
+      <Version>17.5.33428.388</Version>
+    </PackageReference>
+    <PackageReference Update="Microsoft.VSSDK.BuildTools">
+      <Version>17.5.4072</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
   <Target Name="RemoveUnneededPlatformTargets" BeforeTargets="FindSourceVsixManifest">
     <ItemGroup>
       <None Include="x86\*.VsixManifest" Condition="'$(UseVsSdkVersion)' &lt;  '17.0'" />
diff --git a/src/Ankh.Package/AnkhEditorFactories.cs b/src/Ankh.Package/AnkhEditorFactories.cs
index a712cb029..226d34b13 100644
--- a/src/Ankh.Package/AnkhEditorFactories.cs
+++ b/src/Ankh.Package/AnkhEditorFactories.cs
@@ -99,9 +99,15 @@ public int SetSite(IOleServiceProvider psp)
     sealed class AnkhDynamicEditorFactory : AnkhEditorFactory, IAnkhDynamicEditorFactory
     {
         readonly Stack<VSEditorControl> _forms = new Stack<VSEditorControl>();
+
+        [Obsolete]
         public AnkhDynamicEditorFactory(AnkhSvnPackage package)
             : base(package)
         {
+            if (package is null)
+            {
+                throw new ArgumentNullException(nameof(package));
+            }
         }
 
         protected override VSEditorControl CreateForm()
diff --git a/src/Ankh.Package/AnkhSvnPackage.About.cs b/src/Ankh.Package/AnkhSvnPackage.About.cs
index 6a00f8358..c6b57d68e 100644
--- a/src/Ankh.Package/AnkhSvnPackage.About.cs
+++ b/src/Ankh.Package/AnkhSvnPackage.About.cs
@@ -29,6 +29,7 @@ namespace Ankh.VSPackage
     // This attribute is used to register the informations needed to show the this package
     // in the Help/About dialog of Visual Studio.
     [InstalledProductRegistration(true, null, null, null)]
+    [Obsolete]
     public partial class AnkhSvnPackage : IVsInstalledProduct
     {
         Version _packageVersion;
diff --git a/src/Ankh.Package/AnkhSvnPackage.SolutionProperties.cs b/src/Ankh.Package/AnkhSvnPackage.SolutionProperties.cs
index 1fa4285c7..115db3fde 100644
--- a/src/Ankh.Package/AnkhSvnPackage.SolutionProperties.cs
+++ b/src/Ankh.Package/AnkhSvnPackage.SolutionProperties.cs
@@ -319,6 +319,7 @@ public int ReadUserOptions([In] IStream pOptionsStream, [In] string pszKey)
             }
             catch (Exception ex)
             {
+                string error = ex.Message;
 #if DEBUG
                 IAnkhErrorHandler handler = GetService<IAnkhErrorHandler>();
 
diff --git a/src/Ankh.Package/Properties/AssemblyInfo.cs b/src/Ankh.Package/Properties/AssemblyInfo.cs
index fb25a437f..8db814bb4 100644
--- a/src/Ankh.Package/Properties/AssemblyInfo.cs
+++ b/src/Ankh.Package/Properties/AssemblyInfo.cs
@@ -45,7 +45,7 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("2.9.*")]
+[assembly: AssemblyVersion("2.9.20")]
 
 // TODO: These should not be set in release code
 #if !FOR_MSI
diff --git a/src/Ankh.Package/x64/source.extension.VsixManifest b/src/Ankh.Package/x64/source.extension.VsixManifest
index 5760243e9..bc18ec05c 100644
--- a/src/Ankh.Package/x64/source.extension.VsixManifest
+++ b/src/Ankh.Package/x64/source.extension.VsixManifest
@@ -1,9 +1,9 @@
 <?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="AnkhSVN.2.9.417f85d8-1b5c-47ee-a8ae-b58359e79899" Version="2.8.0" Language="en-US" Publisher="AnkhSVN Team" />
+		<Identity Id="AnkhSVN.2.9.417f85d8-1b5c-47ee-a8ae-b58359e79899" Version="2.9.0" Language="en-US" Publisher="AnkhSVN Team" />
 		<DisplayName>AnkhSVN - Subversion Support for Visual Studio</DisplayName>
-		<Description xml:space="preserve">Opensource Subversion Support for Visual Studio 2017 and 2019.</Description>
+		<Description xml:space="preserve">Opensource Subversion Support for Visual Studio.</Description>
 		<MoreInfo>http://www.ankhsvn.net/</MoreInfo>
 		<License>LICENSE.rtf</License>
 		<ReleaseNotes>http://ankhsvn.net/releasenotes</ReleaseNotes>
diff --git a/src/Ankh.Package/x86/source.extension.VsixManifest b/src/Ankh.Package/x86/source.extension.VsixManifest
index 3e2f25b8a..25cd52922 100644
--- a/src/Ankh.Package/x86/source.extension.VsixManifest
+++ b/src/Ankh.Package/x86/source.extension.VsixManifest
@@ -1,9 +1,9 @@
 <?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="AnkhSVN.2.7.417f85d8-1b5c-47ee-a8ae-b58359e79899" Version="2.8.0" Language="en-US" Publisher="AnkhSVN Team" />
+		<Identity Id="AnkhSVN.2.7.417f85d8-1b5c-47ee-a8ae-b58359e79899" Version="2.9.0" Language="en-US" Publisher="AnkhSVN Team" />
 		<DisplayName>AnkhSVN - Subversion Support for Visual Studio</DisplayName>
-		<Description xml:space="preserve">Opensource Subversion Support for Visual Studio 2017 and 2019.</Description>
+		<Description xml:space="preserve">Opensource Subversion Support for Visual Studio.</Description>
 		<MoreInfo>http://www.ankhsvn.net/</MoreInfo>
 		<License>LICENSE.rtf</License>
 		<ReleaseNotes>http://ankhsvn.net/releasenotes</ReleaseNotes>
diff --git a/src/Ankh.Scc/Ankh.Scc.csproj b/src/Ankh.Scc/Ankh.Scc.csproj
index bdc441838..997588b08 100644
--- a/src/Ankh.Scc/Ankh.Scc.csproj
+++ b/src/Ankh.Scc/Ankh.Scc.csproj
@@ -227,6 +227,14 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Update="Microsoft.VisualStudio.SDK">
+      <Version>17.5.33428.388</Version>
+    </PackageReference>
+    <PackageReference Update="Microsoft.VSSDK.BuildTools">
+      <Version>17.5.4072</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/Ankh.Scc/OpenDocumentTracker.cs b/src/Ankh.Scc/OpenDocumentTracker.cs
index 0581b0262..48d7ed112 100644
--- a/src/Ankh.Scc/OpenDocumentTracker.cs
+++ b/src/Ankh.Scc/OpenDocumentTracker.cs
@@ -86,21 +86,18 @@ void LoadInitial()
             if (rdt == null)
                 return;
 
-            IEnumRunningDocuments docEnum;
-            if (!VSErr.Succeeded(rdt.GetRunningDocumentsEnum(out docEnum)))
+            if (!VSErr.Succeeded(rdt.GetRunningDocumentsEnum(out IEnumRunningDocuments docEnum)))
                 return;
 
             uint[] cookies = new uint[256];
-            uint nFetched;
-            while (VSErr.Succeeded(docEnum.Next((uint)cookies.Length, cookies, out nFetched)))
+            while (VSErr.Succeeded(docEnum.Next((uint)cookies.Length, cookies, out uint nFetched)))
             {
                 if (nFetched == 0)
                     break;
 
                 for (int i = 0; i < nFetched; i++)
                 {
-                    SccDocumentData data;
-                    if (TryGetDocument(cookies[i], out data))
+                    if (TryGetDocument(cookies[i], out SccDocumentData data))
                     {
                         data.OnCookieLoad(_poller);
                     }
@@ -155,13 +152,8 @@ bool TryGetDocument(uint cookie, bool create, out SccDocumentData data)
                 return false;
             }
 
-            string name;
-            uint flags;
-            IVsHierarchy hier;
-            uint itemId;
-            object document;
 
-            if (TryGetDocumentInfo(cookie, out name, out flags, out hier, out itemId, out document))
+            if (TryGetDocumentInfo(cookie, out string name, out uint flags, out IVsHierarchy hier, out uint itemId, out object document))
             {
                 if (!string.IsNullOrEmpty(name))
                 {
@@ -256,12 +248,8 @@ private bool TryGetDocumentInfo(uint cookie, out string name, out uint flags, ou
                 { }
             }
 
-            IntPtr ppunkDocData;
-            uint locks;
-            uint editLocks;
-
             if (VSErr.Succeeded(RunningDocumentTable.GetDocumentInfo(cookie,
-                out flags, out locks, out editLocks, out name, out hier, out itemId, out ppunkDocData)))
+                out flags, out _, out _, out name, out hier, out itemId, out IntPtr ppunkDocData)))
             {
                 if (ppunkDocData != IntPtr.Zero)
                 {
@@ -298,9 +286,9 @@ public int OnBeforeFirstDocumentLock(IVsHierarchy pHier, uint itemid, string psz
                 return VSErr.S_OK; // Can't be a valid path; don't monitor
             }
 
-            SccDocumentData data;
-            if (!_docMap.TryGetValue(pszMkDocument, out data))
+            if (!_docMap.TryGetValue(pszMkDocument, out _))
             {
+                SccDocumentData data;
                 _docMap.Add(pszMkDocument, data = new SccDocumentData(Context, pszMkDocument));
 
                 data.Hierarchy = pHier;
@@ -323,8 +311,7 @@ public int OnAfterLastDocumentUnlock(IVsHierarchy pHier, uint itemid, string psz
             if (string.IsNullOrEmpty(pszMkDocument))
                 return VSErr.S_OK;
 
-            SccDocumentData data;
-            if (_docMap.TryGetValue(pszMkDocument, out data))
+            if (_docMap.TryGetValue(pszMkDocument, out SccDocumentData data))
             {
                 data.OnClosed();
                 _docMap.Remove(data.Name);
@@ -338,8 +325,7 @@ public int OnAfterLastDocumentUnlock(IVsHierarchy pHier, uint itemid, string psz
 
         public int OnBeforeSave(uint docCookie)
         {
-            SccDocumentData data;
-            if (TryGetDocument(docCookie, out data))
+            if (TryGetDocument(docCookie, out SccDocumentData data))
             {
                 data.Saving = DateTime.Now;
             }
@@ -349,9 +335,8 @@ public int OnBeforeSave(uint docCookie)
 
         public int OnAfterSave(uint docCookie)
         {
-            SccDocumentData data;
 
-            if (TryGetDocument(docCookie, out data))
+            if (TryGetDocument(docCookie, out SccDocumentData data))
             {
                 data.OnSaved();
 
@@ -389,9 +374,8 @@ public int OnAfterAttributeChange(uint docCookie, uint grfAttribs)
             if ((grfAttribs & HandledRDTAttributes) == 0)
                 return VSErr.S_OK; // Not interested
 
-            SccDocumentData data;
 
-            if (TryGetDocument(docCookie, out data))
+            if (TryGetDocument(docCookie, out SccDocumentData data))
             {
                 __VSRDTATTRIB attribs = (__VSRDTATTRIB)grfAttribs;
 
@@ -415,8 +399,7 @@ public int OnAfterAttributeChangeEx(uint docCookie, uint grfAttribs, IVsHierarch
             if ((grfAttribs & TrackedRDTAttributes) == 0)
                 return VSErr.S_OK; // Not interested
 
-            SccDocumentData data;
-            if (!TryGetDocument(docCookie, true, out data))
+            if (!TryGetDocument(docCookie, true, out SccDocumentData data))
                 return VSErr.S_OK;
 
             __VSRDTATTRIB attribs = (__VSRDTATTRIB)grfAttribs;
@@ -453,9 +436,8 @@ public int OnAfterAttributeChangeEx(uint docCookie, uint grfAttribs, IVsHierarch
                 {
                     // The document changed names; Handle this as opening a new document
 
-                    SccDocumentData newData;
 
-                    if (!_docMap.TryGetValue(pszMkDocumentNew, out newData))
+                    if (!_docMap.TryGetValue(pszMkDocumentNew, out SccDocumentData newData))
                     {
                         newData = new SccDocumentData(Context, pszMkDocumentNew);
                         newData.CopyState(data);
@@ -470,7 +452,6 @@ public int OnAfterAttributeChangeEx(uint docCookie, uint grfAttribs, IVsHierarch
                     }
 
                     _cookieMap[newData.Cookie] = newData;
-                    data = newData;
                 }
 
                 if (!string.IsNullOrEmpty(pszMkDocumentOld) && pszMkDocumentNew != pszMkDocumentOld)
@@ -545,17 +526,12 @@ bool TryPollDirtyFallback(SccDocumentData data, out bool dirty)
             bool done = false;
 
             int dv;
-            IVsWindowFrame wf;
             object rawDoc = data.RawDocument;
 
             if (rawDoc != null)
             {
-                IVsPersistDocData pdd;
-                IPersistFileFormat pff;
-                IVsPersistHierarchyItem phi;
-
                 // Implemented by most editors
-                if (null != (pdd = rawDoc as IVsPersistDocData))
+                if (rawDoc is IVsPersistDocData pdd)
                 {
                     if (SafeSucceeded(pdd.IsDocDataDirty, out dv))
                     {
@@ -570,7 +546,7 @@ bool TryPollDirtyFallback(SccDocumentData data, out bool dirty)
                 }
 
                 // Implemented by the common project types (Microsoft Project Base)
-                if (!done && null != (pff = rawDoc as IPersistFileFormat))
+                if (!done && rawDoc is IPersistFileFormat pff)
                 {
                     if (SafeSucceeded(pff.IsDirty, out dv))
                     {
@@ -585,7 +561,7 @@ bool TryPollDirtyFallback(SccDocumentData data, out bool dirty)
                 }
 
                 // Project based documents will probably handle this
-                if (!done && null != (phi = data.Hierarchy as IVsPersistHierarchyItem) && rawDoc != null)
+                if (!done && data.Hierarchy is IVsPersistHierarchyItem phi && rawDoc != null)
                 {
                     IntPtr docHandle = Marshal.GetIUnknownForObject(rawDoc);
                     try
@@ -614,16 +590,15 @@ bool TryPollDirtyFallback(SccDocumentData data, out bool dirty)
             }
 
             // Literally look if the frame window has a modified *
-            if (!done && TryGetOpenDocumentFrame(data, out wf) && wf != null)
+            if (!done && TryGetOpenDocumentFrame(data, out IVsWindowFrame wf) && wf != null)
             {
-                object ok;
-                if (VSErr.Succeeded(wf.GetProperty((int)__VSFPROPID2.VSFPROPID_OverrideDirtyState, out ok)))
+                if (VSErr.Succeeded(wf.GetProperty((int)__VSFPROPID2.VSFPROPID_OverrideDirtyState, out object ok)))
                 {
                     if (ok == null)
                     { }
-                    else if (ok is bool) // Implemented by VS as bool
+                    else if (ok is bool boolean) // Implemented by VS as bool
                     {
-                        if ((bool)ok)
+                        if (boolean)
                         {
                             dirty = true;
                             return true;
@@ -646,10 +621,8 @@ private bool TryGetOpenDocumentFrame(SccDocumentData data, out IVsWindowFrame wf
                 return false;
             }
             Guid gV = Guid.Empty;
-            IVsUIHierarchy hier;
             uint[] openId = new uint[1];
 
-            int open;
 
             IVsUIShellOpenDocument so = GetService<IVsUIShellOpenDocument>(typeof(SVsUIShellOpenDocument));
             wf = null;
@@ -660,7 +633,7 @@ private bool TryGetOpenDocumentFrame(SccDocumentData data, out IVsWindowFrame wf
             try
             {
                 return VSErr.Succeeded(so.IsDocumentOpen(data.Hierarchy as IVsUIHierarchy, data.ItemId, data.Name, ref gV,
-                    (uint)__VSIDOFLAGS.IDO_IgnoreLogicalView, out hier, openId, out wf, out open))
+                    (uint)__VSIDOFLAGS.IDO_IgnoreLogicalView, out IVsUIHierarchy hier, openId, out wf, out int open))
                     && (open != 0)
                     && (wf != null);
             }
diff --git a/src/Ankh.Scc/PendingChangeManager.cs b/src/Ankh.Scc/PendingChangeManager.cs
index 12eb18ec2..8d5632461 100644
--- a/src/Ankh.Scc/PendingChangeManager.cs
+++ b/src/Ankh.Scc/PendingChangeManager.cs
@@ -127,8 +127,7 @@ internal void OnTickRefresh()
                 {
                     foreach (string path in toRefresh)
                     {
-                        if (br != null)
-                            br.Tick();
+                        br?.Tick();
                         ItemRefresh(path);
                     }
                 }
@@ -273,9 +272,8 @@ public PendingChange this[string fullPath]
         {
             get
             {
-                PendingChange pc;
 
-                if (_pendingChanges.TryGetValue(fullPath, out pc))
+                if (_pendingChanges.TryGetValue(fullPath, out PendingChange pc))
                 {
                     return pc;
                 }
@@ -296,8 +294,7 @@ void RaiseChanged(PendingChange pc)
 
         void OnBatchUpdateStarted(BatchStartedEventArgs e)
         {
-            if (BatchUpdateStarted != null)
-                BatchUpdateStarted(this, e);
+            BatchUpdateStarted?.Invoke(this, e);
         }
 
         /// <summary>
@@ -311,8 +308,7 @@ void OnBatchUpdateStarted(BatchStartedEventArgs e)
         /// <param name="e">The <see cref="Ankh.Scc.PendingChangeEventArgs"/> instance containing the event data.</param>
         private void OnIsActiveChanged(EventArgs e)
         {
-            if (IsActiveChanged != null)
-                IsActiveChanged(this, e);
+            IsActiveChanged?.Invoke(this, e);
         }
 
         #endregion
diff --git a/src/Ankh.Scc/SvnSccProvider.cs b/src/Ankh.Scc/SvnSccProvider.cs
index a76e4203b..7edde7cf5 100644
--- a/src/Ankh.Scc/SvnSccProvider.cs
+++ b/src/Ankh.Scc/SvnSccProvider.cs
@@ -169,7 +169,7 @@ internal void AddedToSolution(string path)
         }
 
 
-        protected override void OnUnpublishedCommitsUIClickedAsync(Point wr)
+        protected override void OnUnpublishedCommitsUIClicked(Point wr)
         {
             //throw new NotImplementedException();
         }
diff --git a/src/Ankh.Services/Ankh.Services.csproj b/src/Ankh.Services/Ankh.Services.csproj
index ad859afa4..e98904ef4 100644
--- a/src/Ankh.Services/Ankh.Services.csproj
+++ b/src/Ankh.Services/Ankh.Services.csproj
@@ -47,6 +47,7 @@
     <NoWarn>1574,1591</NoWarn>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="PresentationFramework" />
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
@@ -292,6 +293,16 @@
       <DependentUpon>VSEditorControl.cs</DependentUpon>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Update="Microsoft.VisualStudio.SDK">
+      <Version>17.5.33428.388</Version>
+    </PackageReference>
+    <PackageReference Update="Microsoft.VSSDK.BuildTools">
+      <Version>17.5.4072</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="..\tools\TurtleTasks\QQn.TurtleTasks.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/Ankh.Services/Scc/SccProviderThunk.cs b/src/Ankh.Services/Scc/SccProviderThunk.cs
index 2cde3cc5a..436234df6 100644
--- a/src/Ankh.Services/Scc/SccProviderThunk.cs
+++ b/src/Ankh.Services/Scc/SccProviderThunk.cs
@@ -41,7 +41,7 @@ protected virtual void OnPublishWorkflow()
         protected abstract void OnPendingChangesClicked(Point clickedElement);
         protected abstract void OnRepositoryUIClicked(Point clickedElement);
 
-        protected abstract void OnUnpublishedCommitsUIClickedAsync(Point wr);
+        protected abstract void OnUnpublishedCommitsUIClicked(Point wr);
 
         partial void CreateDummyTask(ref object task);
 
@@ -129,7 +129,7 @@ event PropertyChangedEventHandler INotifyPropertyChanged.PropertyChanged
             }
         }
 
-        public event EventHandler AdvertisePublish;
+        //public event EventHandler AdvertisePublish;
 
         protected virtual void RaisePropertyChanged(string propertyName)
         {
diff --git a/src/Ankh.Services/Scc/SccProviderThunk.v4.cs b/src/Ankh.Services/Scc/SccProviderThunk.v4.cs
index 1d68a43e7..bac7fec09 100644
--- a/src/Ankh.Services/Scc/SccProviderThunk.v4.cs
+++ b/src/Ankh.Services/Scc/SccProviderThunk.v4.cs
@@ -121,7 +121,7 @@ event EventHandler IVsSccUnpublishedCommits.AdvertisePublish
 
         public event EventHandler AddedToSourceControl;
 
-        protected Task RunAsyncOnMainThread(SccAction action)
+        protected Task RunOnMainThreadAsync(SccAction action)
         {
             return (Task)RunTaskOnMainThread(action);
         }
@@ -133,7 +133,7 @@ partial void CreateDummyTask(ref object task)
 
         System.Threading.Tasks.Task IVsSccPublish.BeginPublishWorkflowAsync(CancellationToken cancellationToken)
         {
-            return RunAsyncOnMainThread(OnPublishWorkflow);
+            return RunOnMainThreadAsync(OnPublishWorkflow);
         }
 
         System.Drawing.Point GetPoint(ISccUIClickedEventArgs args)
@@ -144,17 +144,17 @@ System.Drawing.Point GetPoint(ISccUIClickedEventArgs args)
 
         System.Threading.Tasks.Task IVsSccCurrentBranch.BranchUIClickedAsync(ISccUIClickedEventArgs args, CancellationToken cancellationToken)
         {
-            return RunAsyncOnMainThread(delegate { OnBranchUIClicked(GetPoint(args)); });
+            return RunOnMainThreadAsync(delegate { OnBranchUIClicked(GetPoint(args)); });
         }
 
         System.Threading.Tasks.Task IVsSccChanges.PendingChangesUIClickedAsync(ISccUIClickedEventArgs args, CancellationToken cancellationToken)
         {
-            return RunAsyncOnMainThread(delegate { OnPendingChangesClicked(GetPoint(args)); });
+            return RunOnMainThreadAsync(delegate { OnPendingChangesClicked(GetPoint(args)); });
         }
 
         System.Threading.Tasks.Task IVsSccCurrentRepository.RepositoryUIClickedAsync(ISccUIClickedEventArgs args, CancellationToken cancellationToken)
         {
-            return RunAsyncOnMainThread(delegate { OnRepositoryUIClicked(GetPoint(args)); });
+            return RunOnMainThreadAsync(delegate { OnRepositoryUIClicked(GetPoint(args)); });
         }
 
         //System.Threading.Tasks.Task IVsSccUnpublishedCommits.UnpublishedCommitsUIClickedAsync(ISccUIClickedEventArgs args, CancellationToken cancellationToken)
diff --git a/src/Ankh.Tests/Ankh.Tests.csproj b/src/Ankh.Tests/Ankh.Tests.csproj
index abf1be728..3dcb55653 100644
--- a/src/Ankh.Tests/Ankh.Tests.csproj
+++ b/src/Ankh.Tests/Ankh.Tests.csproj
@@ -100,7 +100,15 @@
     <EmbeddedResource Include="unversioned.zip" />
     <EmbeddedResource Include="wc.zip" />
   </ItemGroup>
-  <ItemGroup>
+    <ItemGroup>
+    <PackageReference Update="Microsoft.VisualStudio.SDK">
+      <Version>17.5.33428.388</Version>
+    </PackageReference>
+    <PackageReference Update="Microsoft.VSSDK.BuildTools">
+      <Version>17.5.4072</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
     <PackageReference Include="NUnit">
       <Version>3.13.3</Version>
     </PackageReference>
diff --git a/src/Ankh.UI/Ankh.UI.csproj b/src/Ankh.UI/Ankh.UI.csproj
index 17a4a18c5..20ee2bc1c 100644
--- a/src/Ankh.UI/Ankh.UI.csproj
+++ b/src/Ankh.UI/Ankh.UI.csproj
@@ -1315,7 +1315,16 @@
       <Install>true</Install>
     </BootstrapperPackage>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <PackageReference Update="Microsoft.VisualStudio.SDK">
+      <Version>17.5.33428.388</Version>
+    </PackageReference>
+    <PackageReference Update="Microsoft.VSSDK.BuildTools">
+      <Version>17.5.4072</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PreBuildEvent>
diff --git a/src/Ankh.UI/Annotate/AnnotateEditorControl.cs b/src/Ankh.UI/Annotate/AnnotateEditorControl.cs
index 678cd9bc5..bac2bcbac 100644
--- a/src/Ankh.UI/Annotate/AnnotateEditorControl.cs
+++ b/src/Ankh.UI/Annotate/AnnotateEditorControl.cs
@@ -31,7 +31,7 @@ namespace Ankh.UI.Annotate
 {
     public partial class AnnotateEditorControl : VSEditorControl, ISelectionMapOwner<IAnnotateSection>
     {
-        List<AnnotateRegion> blameSections = new List<AnnotateRegion>();
+        readonly List<AnnotateRegion> blameSections = new List<AnnotateRegion>();
         SelectionItemMap _map;
         SvnOrigin _origin;
 
diff --git a/src/Ankh.UI/Controls/StatusContainerDesigner.cs b/src/Ankh.UI/Controls/StatusContainerDesigner.cs
index 757f13f61..1729374c8 100644
--- a/src/Ankh.UI/Controls/StatusContainerDesigner.cs
+++ b/src/Ankh.UI/Controls/StatusContainerDesigner.cs
@@ -18,6 +18,7 @@
 using System.Windows.Forms.Design;
 using System.ComponentModel.Design;
 using System.Windows.Forms;
+using Microsoft;
 
 namespace Ankh.UI.Controls
 {
@@ -38,6 +39,8 @@ public override void Initialize(System.ComponentModel.IComponent component)
             _container.ControlRemoved += new System.Windows.Forms.ControlEventHandler(OnControlRemoved);
 
             _designerHost = (IDesignerHost)component.Site.GetService(typeof(IDesignerHost));
+            Assumes.Present(
+            _designerHost);
         }
 
 
diff --git a/src/Ankh.UI/PendingChanges/PendingCommitsPage.Designer.cs b/src/Ankh.UI/PendingChanges/PendingCommitsPage.Designer.cs
index 386cacf8f..404dc6868 100644
--- a/src/Ankh.UI/PendingChanges/PendingCommitsPage.Designer.cs
+++ b/src/Ankh.UI/PendingChanges/PendingCommitsPage.Designer.cs
@@ -119,8 +119,8 @@ private void InitializeComponent()
             this.issueNumberBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             resources.ApplyResources(this.issueNumberBox, "issueNumberBox");
             this.issueNumberBox.Name = "issueNumberBox";
-            this.issueNumberBox.TextChanged += new System.EventHandler(this.issueNumberBox_TextChanged);
-            this.issueNumberBox.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.issueNumberBox_KeyPress);
+            this.issueNumberBox.TextChanged += new System.EventHandler(this.IssueNumberBox_TextChanged);
+            this.issueNumberBox.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.IssueNumberBox_KeyPress);
             // 
             // lastRevLabel
             // 
diff --git a/src/Ankh.UI/PendingChanges/PendingCommitsPage.cs b/src/Ankh.UI/PendingChanges/PendingCommitsPage.cs
index eed3f3771..e463742c7 100644
--- a/src/Ankh.UI/PendingChanges/PendingCommitsPage.cs
+++ b/src/Ankh.UI/PendingChanges/PendingCommitsPage.cs
@@ -33,7 +33,7 @@ namespace Ankh.UI.PendingChanges
     partial class PendingCommitsPage : PendingChangesPage
     {
         PendingCommitsView pendingCommits;
-        IPendingChangeControl pendingChangeControl;
+        readonly IPendingChangeControl pendingChangeControl;
         IPendingChangeUI _ui;
 
         public PendingCommitsPage()
@@ -124,13 +124,13 @@ protected override void OnLoad(EventArgs e)
                 pendingCommits.Name = "pendingCommits";
                 pendingCommits.ShowItemToolTips = true;
                 pendingCommits.ShowSelectAllCheckBox = true;
-                pendingCommits.KeyUp += new System.Windows.Forms.KeyEventHandler(this.pendingCommits_KeyUp);
+                pendingCommits.KeyUp += new System.Windows.Forms.KeyEventHandler(this.PendingCommits_KeyUp);
 
                 pendingCommits.SelectionPublishServiceProvider = Context;
                 pendingCommits.Context = Context;
                 pendingCommits.OpenPendingChangeOnDoubleClick = true;
                 pendingCommits.HookCommands();
-                pendingCommits.ColumnWidthChanged += new ColumnWidthChangedEventHandler(pendingCommits_ColumnWidthChanged);
+                pendingCommits.ColumnWidthChanged += new ColumnWidthChangedEventHandler(PendingCommits_ColumnWidthChanged);
                 IDictionary<string, int> widths = ConfigurationService.GetColumnWidths(GetType());
                 pendingCommits.SetColumnWidths(widths);
 
@@ -163,7 +163,7 @@ private void OnOpenFolder(object sender, CommandEventArgs e)
             }
         }
 
-        protected void pendingCommits_ColumnWidthChanged(object sender, ColumnWidthChangedEventArgs e)
+        protected void PendingCommits_ColumnWidthChanged(object sender, ColumnWidthChangedEventArgs e)
         {
             IDictionary<string, int> widths = pendingCommits.GetColumnWidths();
             ConfigurationService.SaveColumnsWidths(GetType(), widths);
@@ -284,6 +284,7 @@ void OnPendingChangesChanged(object sender, ItemChangedEventArgs<PendingChange>
         }
 
         IAnkhSolutionSettings _settings;
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("CodeQuality", "IDE0051:Remove unused private members", Justification = "<Pending>")]
         IAnkhSolutionSettings Settings
         {
             get { return _settings ?? (_settings = Context.GetService<IAnkhSolutionSettings>()); }
@@ -300,20 +301,18 @@ public override void RefreshList()
 
             IAnkhOpenDocumentTracker dt = Context.GetService<IAnkhOpenDocumentTracker>();
 
-            if (dt != null)
-                dt.RefreshDirtyState();
+            dt?.RefreshDirtyState();
 
             Manager.FullRefresh(true);
         }
 
-        private void pendingCommits_KeyUp(object sender, KeyEventArgs e)
+        private void PendingCommits_KeyUp(object sender, KeyEventArgs e)
         {
             // TODO: Replace with VS command handling, instead of hooking it with Winforms
             if (e.KeyCode == Keys.Enter)
             {
                 // TODO: We should probably open just the focused file instead of the selection in the ItemOpenVisualStudio case to make it more deterministic what file is active after opening
-                if (CommandService != null)
-                    CommandService.ExecCommand(Config.PCDoubleClickShowsChanges
+                CommandService?.ExecCommand(Config.PCDoubleClickShowsChanges
                         ? AnkhCommand.ItemShowChanges : AnkhCommand.ItemOpenVisualStudio, true);
             }
         }
@@ -366,7 +365,8 @@ public void DoCommit(bool keepLocks)
 
             IPendingChangeHandler pch = Context.GetService<IPendingChangeHandler>();
 
-            PendingChangeCommitArgs a = new PendingChangeCommitArgs();
+            PendingChangeCommitArgs pendingChangeCommitArgs = new PendingChangeCommitArgs();
+            PendingChangeCommitArgs a = pendingChangeCommitArgs;
             a.LogMessage = logMessageEditor.Text;
             a.KeepLocks = keepLocks;
 
@@ -387,7 +387,8 @@ public void DoCreatePatch(string fileName)
                 return;
             }
 
-            PendingChangeCreatePatchArgs a = new PendingChangeCreatePatchArgs();
+            PendingChangeCreatePatchArgs pendingChangeCreatePatchArgs = new PendingChangeCreatePatchArgs();
+            PendingChangeCreatePatchArgs a = pendingChangeCreatePatchArgs;
             a.FileName = fileName;
 
             IAnkhSolutionSettings ss = Context.GetService<IAnkhSolutionSettings>();
@@ -451,7 +452,7 @@ internal void ApplyToWorkingCopy()
         }
 
         bool _issueNummeric;
-        private void issueNumberBox_KeyPress(object sender, KeyPressEventArgs e)
+        private void IssueNumberBox_KeyPress(object sender, KeyPressEventArgs e)
         {
             if (_issueNummeric)
             {
@@ -460,7 +461,7 @@ private void issueNumberBox_KeyPress(object sender, KeyPressEventArgs e)
             }
         }
 
-        private void issueNumberBox_TextChanged(object sender, EventArgs e)
+        private void IssueNumberBox_TextChanged(object sender, EventArgs e)
         {
             if (_issueNummeric)
             {
@@ -485,9 +486,7 @@ internal Microsoft.VisualStudio.TextManager.Interop.IVsTextView TextView
         {
             get
             {
-                IAnkhHasVsTextView tv = logMessageEditor.ActiveControl as IAnkhHasVsTextView;
-
-                if (tv != null)
+                if (logMessageEditor.ActiveControl is IAnkhHasVsTextView tv)
                     return tv.TextView;
 
                 return null;
@@ -498,9 +497,7 @@ internal Microsoft.VisualStudio.TextManager.Interop.IVsFindTarget FindTarget
         {
             get
             {
-                IAnkhHasVsTextView tv = logMessageEditor.ActiveControl as IAnkhHasVsTextView;
-
-                if (tv != null)
+                if (logMessageEditor.ActiveControl is IAnkhHasVsTextView tv)
                     return tv.FindTarget;
 
                 return null;
diff --git a/src/Ankh.UI/SccManagement/ProjectCommitDialog.Designer.cs b/src/Ankh.UI/SccManagement/ProjectCommitDialog.Designer.cs
index de88c5d4d..363fcc140 100644
--- a/src/Ankh.UI/SccManagement/ProjectCommitDialog.Designer.cs
+++ b/src/Ankh.UI/SccManagement/ProjectCommitDialog.Designer.cs
@@ -80,8 +80,8 @@ private void InitializeComponent()
             // 
             this.pendingList.AllowColumnReorder = true;
             this.pendingList.CheckBoxes = true;
-            resources.ApplyResources(this.pendingList, "pendingList");
             this.pendingList.HideSelection = false;
+            resources.ApplyResources(this.pendingList, "pendingList");
             this.pendingList.Name = "pendingList";
             this.pendingList.ShowSelectAllCheckBox = true;
             this.pendingList.ItemChecked += new System.Windows.Forms.ItemCheckedEventHandler(this.pendingList_ItemChecked);
@@ -100,8 +100,8 @@ private void InitializeComponent()
             // 
             // logMessage
             // 
-            resources.ApplyResources(this.logMessage, "logMessage");
             this.logMessage.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            resources.ApplyResources(this.logMessage, "logMessage");
             this.logMessage.Name = "logMessage";
             this.logMessage.PendingChangeUI = this.pendingList;
             // 
diff --git a/src/Ankh.UI/SccManagement/ProjectCommitDialog.resx b/src/Ankh.UI/SccManagement/ProjectCommitDialog.resx
index a198a3fcd..e6d8be4a7 100644
--- a/src/Ankh.UI/SccManagement/ProjectCommitDialog.resx
+++ b/src/Ankh.UI/SccManagement/ProjectCommitDialog.resx
@@ -112,32 +112,29 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="splitContainer1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Bottom, Left, Right</value>
   </data>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="splitContainer1.Location" type="System.Drawing.Point, System.Drawing">
     <value>12, 12</value>
   </data>
   <data name="splitContainer1.Orientation" type="System.Windows.Forms.Orientation, System.Windows.Forms">
     <value>Horizontal</value>
   </data>
-  <data name="pendingList.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Fill</value>
-  </data>
   <data name="pendingList.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
   <data name="pendingList.Size" type="System.Drawing.Size, System.Drawing">
     <value>600, 185</value>
   </data>
-  <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="pendingList.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
   </data>
@@ -145,7 +142,7 @@
     <value>pendingList</value>
   </data>
   <data name="&gt;&gt;pendingList.Type" xml:space="preserve">
-    <value>Ankh.UI.PendingChanges.Commits.PendingCommitsView, Ankh.UI, Version=2.5.5016.36573, Culture=neutral, PublicKeyToken=d0beed809dd9333a</value>
+    <value>Ankh.UI.PendingChanges.Commits.PendingCommitsView, Ankh.UI, Version=2.7.8495.39119, Culture=neutral, PublicKeyToken=d0beed809dd9333a</value>
   </data>
   <data name="&gt;&gt;pendingList.Parent" xml:space="preserve">
     <value>splitContainer1.Panel1</value>
@@ -157,7 +154,7 @@
     <value>splitContainer1.Panel1</value>
   </data>
   <data name="&gt;&gt;splitContainer1.Panel1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;splitContainer1.Panel1.Parent" xml:space="preserve">
     <value>splitContainer1</value>
@@ -172,10 +169,10 @@
     <value>False</value>
   </data>
   <data name="issueNumberBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>500, 0</value>
+    <value>503, 0</value>
   </data>
   <data name="issueNumberBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>100, 20</value>
+    <value>100, 22</value>
   </data>
   <data name="issueNumberBox.TabIndex" type="System.Int32, mscorlib">
     <value>3</value>
@@ -187,7 +184,7 @@
     <value>issueNumberBox</value>
   </data>
   <data name="&gt;&gt;issueNumberBox.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;issueNumberBox.Parent" xml:space="preserve">
     <value>splitContainer1.Panel2</value>
@@ -202,7 +199,7 @@
     <value>False</value>
   </data>
   <data name="issueLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>388, 3</value>
+    <value>391, 1</value>
   </data>
   <data name="issueLabel.Size" type="System.Drawing.Size, System.Drawing">
     <value>106, 17</value>
@@ -223,7 +220,7 @@
     <value>issueLabel</value>
   </data>
   <data name="&gt;&gt;issueLabel.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;issueLabel.Parent" xml:space="preserve">
     <value>splitContainer1.Panel2</value>
@@ -231,14 +228,11 @@
   <data name="&gt;&gt;issueLabel.ZOrder" xml:space="preserve">
     <value>1</value>
   </data>
-  <data name="logMessage.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
-    <value>Top, Bottom, Left, Right</value>
-  </data>
   <data name="logMessage.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 23</value>
   </data>
   <data name="logMessage.Size" type="System.Drawing.Size, System.Drawing">
-    <value>600, 124</value>
+    <value>600, 123</value>
   </data>
   <data name="logMessage.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -247,7 +241,7 @@
     <value>logMessage</value>
   </data>
   <data name="&gt;&gt;logMessage.Type" xml:space="preserve">
-    <value>Ankh.UI.PendingChanges.LogMessageEditor, Ankh.UI, Version=2.5.5016.36573, Culture=neutral, PublicKeyToken=d0beed809dd9333a</value>
+    <value>Ankh.UI.PendingChanges.LogMessageEditor, Ankh.UI, Version=2.7.8495.39119, Culture=neutral, PublicKeyToken=d0beed809dd9333a</value>
   </data>
   <data name="&gt;&gt;logMessage.Parent" xml:space="preserve">
     <value>splitContainer1.Panel2</value>
@@ -259,10 +253,10 @@
     <value>True</value>
   </data>
   <data name="label1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>-3, 7</value>
+    <value>-3, 3</value>
   </data>
   <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>74, 13</value>
+    <value>93, 16</value>
   </data>
   <data name="label1.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -274,7 +268,7 @@
     <value>label1</value>
   </data>
   <data name="&gt;&gt;label1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;label1.Parent" xml:space="preserve">
     <value>splitContainer1.Panel2</value>
@@ -286,7 +280,7 @@
     <value>splitContainer1.Panel2</value>
   </data>
   <data name="&gt;&gt;splitContainer1.Panel2.Type" xml:space="preserve">
-    <value>System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;splitContainer1.Panel2.Parent" xml:space="preserve">
     <value>splitContainer1</value>
@@ -295,7 +289,7 @@
     <value>1</value>
   </data>
   <data name="splitContainer1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>600, 336</value>
+    <value>603, 336</value>
   </data>
   <data name="splitContainer1.SplitterDistance" type="System.Int32, mscorlib">
     <value>185</value>
@@ -307,7 +301,7 @@
     <value>splitContainer1</value>
   </data>
   <data name="&gt;&gt;splitContainer1.Type" xml:space="preserve">
-    <value>Ankh.UI.VSSelectionControls.SmartSplitContainer, Ankh.UI, Version=2.5.5016.36573, Culture=neutral, PublicKeyToken=d0beed809dd9333a</value>
+    <value>Ankh.UI.VSSelectionControls.SmartSplitContainer, Ankh.UI, Version=2.7.8495.39119, Culture=neutral, PublicKeyToken=d0beed809dd9333a</value>
   </data>
   <data name="&gt;&gt;splitContainer1.Parent" xml:space="preserve">
     <value>$this</value>
@@ -322,10 +316,10 @@
     <value>True</value>
   </data>
   <data name="keepLocksBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 354</value>
+    <value>12, 369</value>
   </data>
   <data name="keepLocksBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>83, 17</value>
+    <value>100, 20</value>
   </data>
   <data name="keepLocksBox.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -337,7 +331,7 @@
     <value>keepLocksBox</value>
   </data>
   <data name="&gt;&gt;keepLocksBox.Type" xml:space="preserve">
-    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;keepLocksBox.Parent" xml:space="preserve">
     <value>$this</value>
@@ -352,10 +346,10 @@
     <value>True</value>
   </data>
   <data name="keepChangelistsBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 371</value>
+    <value>12, 395</value>
   </data>
   <data name="keepChangelistsBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>108, 17</value>
+    <value>134, 20</value>
   </data>
   <data name="keepChangelistsBox.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
@@ -367,7 +361,7 @@
     <value>keepChangelistsBox</value>
   </data>
   <data name="&gt;&gt;keepChangelistsBox.Type" xml:space="preserve">
-    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;keepChangelistsBox.Parent" xml:space="preserve">
     <value>$this</value>
@@ -379,7 +373,7 @@
     <value>Bottom, Right</value>
   </data>
   <data name="cancelButton.Location" type="System.Drawing.Point, System.Drawing">
-    <value>537, 365</value>
+    <value>540, 392</value>
   </data>
   <data name="cancelButton.Size" type="System.Drawing.Size, System.Drawing">
     <value>75, 23</value>
@@ -394,7 +388,7 @@
     <value>cancelButton</value>
   </data>
   <data name="&gt;&gt;cancelButton.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;cancelButton.Parent" xml:space="preserve">
     <value>$this</value>
@@ -409,7 +403,7 @@
     <value>False</value>
   </data>
   <data name="okButton.Location" type="System.Drawing.Point, System.Drawing">
-    <value>456, 365</value>
+    <value>459, 392</value>
   </data>
   <data name="okButton.Size" type="System.Drawing.Size, System.Drawing">
     <value>75, 23</value>
@@ -424,7 +418,7 @@
     <value>okButton</value>
   </data>
   <data name="&gt;&gt;okButton.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;okButton.Parent" xml:space="preserve">
     <value>$this</value>
@@ -432,14 +426,17 @@
   <data name="&gt;&gt;okButton.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
-  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
   <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
-    <value>6, 13</value>
+    <value>8, 16</value>
   </data>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>624, 400</value>
+    <value>835, 492</value>
+  </data>
+  <data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="$this.Text" xml:space="preserve">
     <value>Commit to Subversion</value>
@@ -448,6 +445,6 @@
     <value>ProjectCommitDialog</value>
   </data>
   <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>Ankh.UI.VSContainerForm, Ankh.Services, Version=2.5.5016.36451, Culture=neutral, PublicKeyToken=a8604ba8fc87eddd</value>
+    <value>Ankh.UI.VSContainerForm, Ankh.Services, Version=2.9.8495.39113, Culture=neutral, PublicKeyToken=a8604ba8fc87eddd</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/src/Ankh.VS.Interop/Ankh.VS.Interop.csproj b/src/Ankh.VS.Interop/Ankh.VS.Interop.csproj
index 2258ca1c9..d9570439c 100644
--- a/src/Ankh.VS.Interop/Ankh.VS.Interop.csproj
+++ b/src/Ankh.VS.Interop/Ankh.VS.Interop.csproj
@@ -23,7 +23,7 @@
     <DebugType>full</DebugType>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-	<PlatformTarget>AnyCPU</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
@@ -33,7 +33,7 @@
     <DebugType>pdbonly</DebugType>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-	<PlatformTarget>AnyCPU</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
@@ -62,6 +62,16 @@
   <ItemGroup>
     <Content Include="ReadMe.txt" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Update="Microsoft.VisualStudio.SDK">
+      <Version>17.5.33428.388</Version>
+    </PackageReference>
+    <PackageReference Update="Microsoft.VSSDK.BuildTools">
+      <Version>17.5.4072</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.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.
diff --git a/src/Ankh.VS.UnitTest/Ankh.VS.UnitTest.csproj b/src/Ankh.VS.UnitTest/Ankh.VS.UnitTest.csproj
index c7da41faf..9a9bb3eea 100644
--- a/src/Ankh.VS.UnitTest/Ankh.VS.UnitTest.csproj
+++ b/src/Ankh.VS.UnitTest/Ankh.VS.UnitTest.csproj
@@ -107,10 +107,18 @@
     <Folder Include="Stubs\" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Update="Microsoft.VisualStudio.SDK">
+      <Version>17.5.33428.388</Version>
+    </PackageReference>
+    <PackageReference Update="Microsoft.VSSDK.BuildTools">
+      <Version>17.5.4072</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
     <PackageReference Include="Microsoft.VSSDK.UnitTestLibrary" Version="14.3.25407" />
-    <PackageReference Include="Moq" Version="4.18.2" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
+    <PackageReference Include="Moq" Version="4.20.69" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
     <PackageReference Include="NUnit" Version="3.13.3" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/Ankh.VS.UnitTest/CommandRouting/CommandRoutingTest.cs b/src/Ankh.VS.UnitTest/CommandRouting/CommandRoutingTest.cs
index 32aa77860..1f7bcceb6 100644
--- a/src/Ankh.VS.UnitTest/CommandRouting/CommandRoutingTest.cs
+++ b/src/Ankh.VS.UnitTest/CommandRouting/CommandRoutingTest.cs
@@ -63,6 +63,7 @@ public static bool TestExecution(AnkhCommand commandEnum, object argument)
         }
 
         [SetUp]
+        [Obsolete]
         public void Initialize()
         {
             // Create the package
diff --git a/src/Ankh.VS.UnitTest/MenuItemTests/MenuItemCallback.cs b/src/Ankh.VS.UnitTest/MenuItemTests/MenuItemCallback.cs
index f1e793e55..3c6fa3972 100644
--- a/src/Ankh.VS.UnitTest/MenuItemTests/MenuItemCallback.cs
+++ b/src/Ankh.VS.UnitTest/MenuItemTests/MenuItemCallback.cs
@@ -47,9 +47,11 @@ namespace UnitTestProject.MenuItemTests
     [TestFixture]
     public class MenuItemTest
     {
+        [Obsolete]
         AnkhSvnPackage package;
 
         [SetUp]
+        [Obsolete]
         public void SetUp()
         {
             // Create the package
@@ -95,6 +97,7 @@ public void TearDown()
         /// This action takes place In the Initialize method of the Package object
         /// </summary>
         [Test]
+        [Obsolete]
         public void InitializeMenuCommand()
         {
             using (ServiceProviderHelper.SetSite(package))
diff --git a/src/Ankh.VS.UnitTest/PackageTest.cs b/src/Ankh.VS.UnitTest/PackageTest.cs
index 0e1d121aa..28cf595c5 100644
--- a/src/Ankh.VS.UnitTest/PackageTest.cs
+++ b/src/Ankh.VS.UnitTest/PackageTest.cs
@@ -46,12 +46,14 @@ namespace UnitTestProject
     public class PackageTest
     {
         [Test]
+        [Obsolete]
         public void CreateInstance()
         {
             AnkhSvnPackage package = new AnkhSvnPackage();
         }
 
         [Test]
+        [Obsolete]
         public void IsIVsPackage()
         {
             AnkhSvnPackage package = new AnkhSvnPackage();
@@ -59,6 +61,7 @@ public void IsIVsPackage()
         }
 
         [Test]
+        [Obsolete]
         public void SetSite()
         {
             // Create the package
diff --git a/src/Ankh.VS/Ankh.VS.csproj b/src/Ankh.VS/Ankh.VS.csproj
index bb01e8129..e9a169d0e 100644
--- a/src/Ankh.VS/Ankh.VS.csproj
+++ b/src/Ankh.VS/Ankh.VS.csproj
@@ -43,6 +43,7 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="PresentationFramework" />
     <Reference Include="System" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
@@ -141,6 +142,16 @@
   <ItemGroup>
     <Folder Include="Commands\" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Update="Microsoft.VisualStudio.SDK">
+      <Version>17.5.33428.388</Version>
+    </PackageReference>
+    <PackageReference Update="Microsoft.VSSDK.BuildTools">
+      <Version>17.5.4072</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.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.
diff --git a/src/Ankh.VS/OutputPane/OutputPaneManager.cs b/src/Ankh.VS/OutputPane/OutputPaneManager.cs
index 98814a97c..e0a5eadc3 100644
--- a/src/Ankh.VS/OutputPane/OutputPaneManager.cs
+++ b/src/Ankh.VS/OutputPane/OutputPaneManager.cs
@@ -35,9 +35,8 @@ IVsOutputWindow Window
         }
 
         public void WriteToPane(string s)
-        {           
-            IVsOutputWindowPane pane;
-            Marshal.ThrowExceptionForHR(Window.GetPane(ref g, out pane));            
+        {
+            Marshal.ThrowExceptionForHR(Window.GetPane(ref g, out IVsOutputWindowPane pane));
             Marshal.ThrowExceptionForHR(pane.OutputString(s));
         }
     }
diff --git a/src/Ankh.VS/Selection/AnkhCommandService.cs b/src/Ankh.VS/Selection/AnkhCommandService.cs
index 156d25dc2..f2e2007cd 100644
--- a/src/Ankh.VS/Selection/AnkhCommandService.cs
+++ b/src/Ankh.VS/Selection/AnkhCommandService.cs
@@ -318,6 +318,7 @@ SynchronizationContext SyncContext
         }
 
         readonly List<DelayDelegateCheck> _checks = new List<DelayDelegateCheck>();
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "VSTHRD001:Avoid legacy thread switching APIs", Justification = "<Pending>")]
         public void DelayPostCommands(DelayDelegateCheck check)
         {
             if (check == null)
@@ -340,6 +341,7 @@ void TryRelease(object v)
                 PostCheck();
         }
 
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "VSTHRD001:Avoid legacy thread switching APIs", Justification = "<Pending>")]
         void PostCheck()
         {
             AnkhAction pt = delegate()
@@ -410,16 +412,14 @@ public void UpdateCommandUI(bool performImmediately)
         {
             IVsUIShell shell = UIShell;
 
-            if (shell != null)
-                shell.UpdateCommandUI(performImmediately ? 1 : 0);
+            shell?.UpdateCommandUI(performImmediately ? 1 : 0);
         }
 
 
         public void ShowContextMenu(AnkhCommandMenu menu, int x, int y)
         {
             IMenuCommandService mcs = GetService<IMenuCommandService>();
-
-            IVsUIShell shell = GetService<IVsUIShell>();
+            _ = GetService<IVsUIShell>();
             if (mcs != null)
             {
                 try
@@ -469,8 +469,7 @@ public void OnIdle(AnkhIdleArgs e)
                 {
                     try
                     {
-                        if (action != null)
-                            action();
+                        action?.Invoke();
                     }
                     catch (Exception ex)
                     {
diff --git a/src/Ankh.VS/Selection/SelectionUtils.cs b/src/Ankh.VS/Selection/SelectionUtils.cs
index 03450535b..b39c47447 100644
--- a/src/Ankh.VS/Selection/SelectionUtils.cs
+++ b/src/Ankh.VS/Selection/SelectionUtils.cs
@@ -20,7 +20,7 @@
 using Microsoft.VisualStudio.OLE.Interop;
 using IServiceProvider = System.IServiceProvider;
 using System.Runtime.InteropServices;
-
+using Microsoft;
 
 namespace Ankh.VS.Selection
 {
@@ -395,6 +395,7 @@ public int SccGlyphChanged(int cAffectedNodes, uint[] rgitemidAffectedNodes, VsS
 
                 // Set the solution's glyph directly in the hierarchy
                 IVsHierarchy solHier = (IVsHierarchy)_context.GetService(typeof(SVsSolution));
+                Assumes.Present(solHier);
                 return solHier.SetProperty(VSItemId.Root, (int)__VSHPROPID.VSHPROPID_StateIconIndex, (int)rgsiGlyphs[0]);
             }
 
diff --git a/src/Ankh.VS/WpfServices/ThemingService.cs b/src/Ankh.VS/WpfServices/ThemingService.cs
index ee8d74f70..c0b633f94 100644
--- a/src/Ankh.VS/WpfServices/ThemingService.cs
+++ b/src/Ankh.VS/WpfServices/ThemingService.cs
@@ -70,13 +70,14 @@ bool VSThemeWindow(IntPtr hwnd, bool forDialog)
         delegate IVsUIObject GetIconForFileEx(string filename, __VSUIDATAFORMAT desiredFormat, out uint iconSource);
         GetIconForFileEx _giffEx;
 
+        [Obsolete]
         public bool TryGetIcon(string path, out IntPtr hIcon)
         {
             hIcon = IntPtr.Zero;
 
             if (_giff == null)
             {
-                var imgs = GetService<IVsImageService>(typeof(SVsImageService));
+                var imgs = GetService<IVsImageService2>(typeof(SVsImageService));
 
                 if (imgs != null)
                 {
diff --git a/src/Ankh/Ankh.csproj b/src/Ankh/Ankh.csproj
index d25b1c23f..005d445e5 100644
--- a/src/Ankh/Ankh.csproj
+++ b/src/Ankh/Ankh.csproj
@@ -215,7 +215,16 @@
       <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <PackageReference Update="Microsoft.VisualStudio.SDK">
+      <Version>17.4.33103.184</Version>
+    </PackageReference>
+    <PackageReference Update="Microsoft.VSSDK.BuildTools">
+      <Version>17.4.2119</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PreBuildEvent>
diff --git a/src/Ankh/Properties/AssemblyInfo.cs b/src/Ankh/Properties/AssemblyInfo.cs
index fea129414..dd0645413 100644
--- a/src/Ankh/Properties/AssemblyInfo.cs
+++ b/src/Ankh/Properties/AssemblyInfo.cs
@@ -48,4 +48,4 @@
 // You can specify all the value or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("2.9.*")]
+[assembly: AssemblyVersion("2.9.19")]
diff --git a/src/TestUtils/TestUtils.csproj b/src/TestUtils/TestUtils.csproj
index 83e2f6e0c..19e52883b 100644
--- a/src/TestUtils/TestUtils.csproj
+++ b/src/TestUtils/TestUtils.csproj
@@ -44,6 +44,16 @@
       <SubType>Code</SubType>
     </Compile>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Update="Microsoft.VisualStudio.SDK">
+      <Version>17.4.33103.184</Version>
+    </PackageReference>
+    <PackageReference Update="Microsoft.VSSDK.BuildTools">
+      <Version>17.4.2119</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PreBuildEvent>
diff --git a/src/tools/VS-17.0-imports.targets b/src/tools/VS-17.0-imports.targets
index 6bf617ae7..5d6e3b568 100644
--- a/src/tools/VS-17.0-imports.targets
+++ b/src/tools/VS-17.0-imports.targets
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Condition="'$(VisualStudioVersion)' &gt;= '16.0'">
-    <PackageReference Include="Microsoft.VisualStudio.SDK" Version="17.0.31902.203" />
-    <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="17.0.5232" />
+    <PackageReference Include="Microsoft.VisualStudio.SDK" Version="17.5.33428.388" />
+    <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="17.5.4072" />
   </ItemGroup>
 </Project>
diff --git a/src/tools/turtletasks/ICSharpCode.SharpZipLib.dll b/src/tools/turtletasks/ICSharpCode.SharpZipLib.dll
index bcdb00ea3..9b5fddf28 100644
Binary files a/src/tools/turtletasks/ICSharpCode.SharpZipLib.dll and b/src/tools/turtletasks/ICSharpCode.SharpZipLib.dll differ