diff --git a/data/NuGetFeed/GitExtensions.Extensibility.0.1.0.nupkg b/data/NuGetFeed/GitExtensions.Extensibility.0.1.0.nupkg new file mode 100644 index 0000000..026c1f3 Binary files /dev/null and b/data/NuGetFeed/GitExtensions.Extensibility.0.1.0.nupkg differ diff --git a/data/NuGetFeed/GitExtensions.Extensibility.0.2.0.nupkg b/data/NuGetFeed/GitExtensions.Extensibility.0.2.0.nupkg new file mode 100644 index 0000000..bd5721a Binary files /dev/null and b/data/NuGetFeed/GitExtensions.Extensibility.0.2.0.nupkg differ diff --git a/data/NuGetFeed/GitExtensions.Extensibility.2.51.0.nupkg b/data/NuGetFeed/GitExtensions.Extensibility.2.51.0.nupkg deleted file mode 100644 index ab46032..0000000 Binary files a/data/NuGetFeed/GitExtensions.Extensibility.2.51.0.nupkg and /dev/null differ diff --git a/data/NuGetFeed/GitExtensions.Extensibility.3.0.0.nupkg b/data/NuGetFeed/GitExtensions.Extensibility.3.0.0.nupkg deleted file mode 100644 index 08efb92..0000000 Binary files a/data/NuGetFeed/GitExtensions.Extensibility.3.0.0.nupkg and /dev/null differ diff --git a/data/NuGetFeed/PluginA.1.0.0.nupkg b/data/NuGetFeed/PluginA.1.0.0.nupkg index 9247d17..f5def59 100644 Binary files a/data/NuGetFeed/PluginA.1.0.0.nupkg and b/data/NuGetFeed/PluginA.1.0.0.nupkg differ diff --git a/data/NuGetFeed/PluginA.1.1.0.nupkg b/data/NuGetFeed/PluginA.1.1.0.nupkg index 204e1b1..5e19b39 100644 Binary files a/data/NuGetFeed/PluginA.1.1.0.nupkg and b/data/NuGetFeed/PluginA.1.1.0.nupkg differ diff --git a/data/NuGetFeed/PluginB.1.0.0.nupkg b/data/NuGetFeed/PluginB.1.0.0.nupkg index 9687ae8..e860e06 100644 Binary files a/data/NuGetFeed/PluginB.1.0.0.nupkg and b/data/NuGetFeed/PluginB.1.0.0.nupkg differ diff --git a/data/NuGetFeed/PluginB.2.0.0.nupkg b/data/NuGetFeed/PluginB.2.0.0.nupkg index ac91910..377f997 100644 Binary files a/data/NuGetFeed/PluginB.2.0.0.nupkg and b/data/NuGetFeed/PluginB.2.0.0.nupkg differ diff --git a/data/NuGetFeed/PluginC.1.0.0.nupkg b/data/NuGetFeed/PluginC.1.0.0.nupkg new file mode 100644 index 0000000..c3d3db1 Binary files /dev/null and b/data/NuGetFeed/PluginC.1.0.0.nupkg differ diff --git a/src/GitExtensions.PluginManager/Plugin.cs b/src/GitExtensions.PluginManager/Plugin.cs index 4fc5910..b0d0633 100644 --- a/src/GitExtensions.PluginManager/Plugin.cs +++ b/src/GitExtensions.PluginManager/Plugin.cs @@ -53,7 +53,7 @@ public override bool Execute(GitUIEventArgs gitUiCommands) Args args = new Args(); args.Path = pluginsPath; - args.Dependencies = new List() { new Args.Dependency("GitExtensions.Extensibility") }; + args.Dependencies = new List() { new Args.Dependency("GitExtensions.Extensibility", "0.2.0") }; args.Tags = "GitExtensions"; args.Monikers = FrameworkMonikers; args.SelfPackageId = PackageId; diff --git a/src/PackageManager.UI/Services/DependencyNuGetPackageFilter.cs b/src/PackageManager.UI/Services/DependencyNuGetPackageFilter.cs index 357363f..8e6da50 100644 --- a/src/PackageManager.UI/Services/DependencyNuGetPackageFilter.cs +++ b/src/PackageManager.UI/Services/DependencyNuGetPackageFilter.cs @@ -43,7 +43,6 @@ public async Task FilterAsync(SourceRepository reposit if (resource == null) return NuGetPackageFilterResult.NotCompatible; - NuGetPackageFilterResult result = NuGetPackageFilterResult.Ok; foreach (NuGetFramework framework in frameworks) { SourcePackageDependencyInfo dependencyInfo = await resource.ResolvePackage(package.Identity, framework, new SourceCacheContext(), nuGetLogger, cancellationToken); @@ -58,7 +57,7 @@ public async Task FilterAsync(SourceRepository reposit if (packageDependency == null) { log.Info($"Package '{package.Identity}' skipped: missing dependency '{dependency.Id}'."); - result = NuGetPackageFilterResult.NotCompatible; + return NuGetPackageFilterResult.NotCompatible; } if (dependency.Version != null && !packageDependency.VersionRange.Satisfies(new NuGetVersion(dependency.Version))) @@ -68,7 +67,7 @@ public async Task FilterAsync(SourceRepository reposit } } - return result; + return NuGetPackageFilterResult.Ok; } } diff --git a/test/PackageManager.NuGet.Tests/Services/SearchService.cs b/test/PackageManager.NuGet.Tests/Services/SearchService.cs index c3ec8e4..5821162 100644 --- a/test/PackageManager.NuGet.Tests/Services/SearchService.cs +++ b/test/PackageManager.NuGet.Tests/Services/SearchService.cs @@ -47,7 +47,7 @@ public static (ISearchService search, IPackageSourceCollection sources) Create(s ), new DependencyNuGetPackageFilter( new DefaultLog(), - new List() { new Args.Dependency("GitExtensions.Extensibility", null) }, + new List() { new Args.Dependency("GitExtensions.Extensibility", "0.2.0") }, frameworks ) );