AmpScm · ARMoir · Dec 1, 2022 · Dec 1, 2022 · Dec 1, 2022 · Dec 1, 2022
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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.