Merge pull request #82 from gitextensions/feature/ge6

Update for Git Extensions 6

Author: maraf

Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
 
   <PropertyGroup>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <TargetFramework>net9.0-windows</TargetFramework>
     <LangVersion>latest</LangVersion>
     <NoWarn>$(NoWarn);1573;1591;1712</NoWarn>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>

Directory.Packages.props

@@ -2,15 +2,17 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <!-- To support GitExtensions.Extensibility 0.3.*, see https://learn.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu1011 -->
+    <!-- To support GitExtensions.Extensibility (eg. 0.3.*), see https://learn.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu1011 -->
     <CentralPackageFloatingVersionsEnabled>true</CentralPackageFloatingVersionsEnabled>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <NoWarn>$(NoWarn);NU1602;NU1604;NU1701</NoWarn>
   </PropertyGroup>
 
   <!-- Solution dependencies -->
   <ItemGroup>
     <PackageVersion Include="Microsoft.VisualStudio.Composition" Version="17.2.41" />
-    <PackageVersion Include="GitExtensions.Extensibility" Version="0.3.*" />
+    <PackageVersion Include="Microsoft.VisualStudio.Threading" Version="17.13.61" />
+    <PackageVersion Include="GitExtensions.Extensibility" Version="0.4.*" />
     <PackageVersion Include="Neptuo" Version="6.0.2" />
     <PackageVersion Include="Neptuo.Exceptions" Version="1.2.2" />
     <PackageVersion Include="Neptuo.Observables" Version="2.1.1" />
@@ -20,7 +22,7 @@
 
   <!-- Test-related -->
   <ItemGroup>
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
     <PackageVersion Include="Moq" Version="4.18.2" />
     <PackageVersion Include="MSTest.TestAdapter" Version="2.2.10" />
     <PackageVersion Include="MSTest.TestFramework" Version="2.2.10" />

appveyor.yml

@@ -1,5 +1,5 @@
 # version format
-version: 3.0.0.{build}
+version: 3.1.0.{build}
 
 matrix:
   fast_finish: true

src/GitExtensions.PluginManager/GitExtensions.PluginManager.csproj

@@ -9,13 +9,14 @@
     <PackageProjectUrl>https://github.com/gitextensions/gitextensions.pluginmanager</PackageProjectUrl>
     <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
     <NuspecFile>$(MSBuildThisFileDirectory)$(MSBuildProjectName).nuspec</NuspecFile>
-    <NoWarn>1701;1702;NU5100;NU5101;NU5103;NU5128</NoWarn>
+    <NoWarn>1701;1702;NU5100;NU5101;NU5103;NU5128;NU1604;NU1701</NoWarn>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="GitExtensions.Extensibility" />
     <PackageReference Include="Microsoft.VisualStudio.Composition" />
+    <PackageReference Include="Microsoft.VisualStudio.Threading" />
     <PackageReference Include="System.Resources.Extensions" />
   </ItemGroup>
 

src/GitExtensions.PluginManager/GitExtensions.PluginManager.nuspec

@@ -9,12 +9,13 @@
     <tags>$tags$</tags>
     <license type="file">LICENSE.md</license>
     <dependencies>
-      <dependency id="GitExtensions.Extensibility" version="[0.3.0, 1.0.0)" />
+      <dependency id="GitExtensions.Extensibility" version="[0.4.0, 0.5.0)" />
     </dependencies>
   </metadata>
   <files>
     <file src="../../LICENSE.md" target="/" />
-    <file src="bin/$configuration$/net8.0-windows/GitExtensions.PluginManager.dll" target="lib/" />
-    <file src="bin/$configuration$/net8.0-windows/PackageManager/PackageManager.UI.exe" target="lib/PackageManager/" />
+    <file src="bin/$configuration$/net9.0-windows/GitExtensions.PluginManager.dll" target="lib/" />
+    <file src="bin/$configuration$/net9.0-windows/PackageManager/PackageManager.UI.exe" target="lib/PackageManager/" />
   </files>
-</package>
+
+</package>

src/GitExtensions.PluginManager/Plugin.cs

@@ -7,7 +7,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.ComponentModel.Composition;
+using System.Composition;
 using System.Diagnostics;
 using System.IO;
 using System.Windows.Forms;
@@ -23,7 +23,7 @@ public class Plugin : GitPluginBase
         public const string PackageId = @"GitExtensions.PluginManager";
         public const string GitExtensionsRelativePath = @"GitExtensions.exe";
         public const string PluginManagerRelativePath = @"PackageManager\PackageManager.UI.exe";
-        public static readonly List<string> FrameworkMonikers = new List<string>() { "net5.0", "net6.0", "net7.0", "net8.0", "any", "netstandard2.0" };
+        public static readonly List<string> FrameworkMonikers = new List<string>() { "net5.0", "net6.0", "net7.0", "net8.0", "net9.0", "any", "netstandard2.0" };
 
         internal PluginSettings Configuration { get; private set; }
 
@@ -52,7 +52,7 @@ public override bool Execute(GitUIEventArgs gitUiCommands)
 
             Args args = new Args();
             args.Path = pluginsPath;
-            args.Dependencies = new List<Args.Dependency>() { new Args.Dependency("GitExtensions.Extensibility", "0.3.0") };
+            args.Dependencies = new List<Args.Dependency>() { new Args.Dependency("GitExtensions.Extensibility", "0.4.0") };
             args.Tags = "GitExtensions";
             args.Monikers = FrameworkMonikers;
             args.SelfPackageId = PackageId;