diff --git a/Directory.Build.props b/Directory.Build.props index 467a37d..430c115 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,7 +1,7 @@ - net8.0-windows + net9.0-windows latest $(NoWarn);1573;1591;1712 true diff --git a/Directory.Packages.props b/Directory.Packages.props index 1843833..fa69f3b 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -2,15 +2,17 @@ - + true true + $(NoWarn);NU1602;NU1604;NU1701 - + + @@ -20,7 +22,7 @@ - + diff --git a/appveyor.yml b/appveyor.yml index a76e794..0cd9921 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,5 +1,5 @@ # version format -version: 3.0.0.{build} +version: 3.1.0.{build} matrix: fast_finish: true diff --git a/src/GitExtensions.PluginManager/GitExtensions.PluginManager.csproj b/src/GitExtensions.PluginManager/GitExtensions.PluginManager.csproj index 1d3cada..bfbf6b9 100644 --- a/src/GitExtensions.PluginManager/GitExtensions.PluginManager.csproj +++ b/src/GitExtensions.PluginManager/GitExtensions.PluginManager.csproj @@ -9,13 +9,14 @@ https://github.com/gitextensions/gitextensions.pluginmanager OnOutputUpdated $(MSBuildThisFileDirectory)$(MSBuildProjectName).nuspec - 1701;1702;NU5100;NU5101;NU5103;NU5128 + 1701;1702;NU5100;NU5101;NU5103;NU5128;NU1604;NU1701 false + diff --git a/src/GitExtensions.PluginManager/GitExtensions.PluginManager.nuspec b/src/GitExtensions.PluginManager/GitExtensions.PluginManager.nuspec index d6a7d5c..be019f5 100644 --- a/src/GitExtensions.PluginManager/GitExtensions.PluginManager.nuspec +++ b/src/GitExtensions.PluginManager/GitExtensions.PluginManager.nuspec @@ -9,12 +9,13 @@ $tags$ LICENSE.md - + - - + + - \ No newline at end of file + + diff --git a/src/GitExtensions.PluginManager/Plugin.cs b/src/GitExtensions.PluginManager/Plugin.cs index ce70878..d02813c 100644 --- a/src/GitExtensions.PluginManager/Plugin.cs +++ b/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 FrameworkMonikers = new List() { "net5.0", "net6.0", "net7.0", "net8.0", "any", "netstandard2.0" }; + public static readonly List FrameworkMonikers = new List() { "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() { new Args.Dependency("GitExtensions.Extensibility", "0.3.0") }; + args.Dependencies = new List() { new Args.Dependency("GitExtensions.Extensibility", "0.4.0") }; args.Tags = "GitExtensions"; args.Monikers = FrameworkMonikers; args.SelfPackageId = PackageId;