Skip to content

Commit 91c5b32

Browse files
authored
Merge pull request #30 from maraf/SearchByTags
Search by tags
2 parents 982cd24 + 621020b commit 91c5b32

32 files changed

+397
-139
lines changed

src/GitExtensions.PluginManager/Plugin.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ public override bool Execute(GitUIEventArgs gitUiCommands)
5252
Args args = new Args();
5353
args.Path = pluginsPath;
5454
args.Dependencies = new List<Args.Dependency>() { new Args.Dependency("GitExtensions.Extensibility") };
55+
args.Tags = "GitExtensions";
5556
args.Monikers = FrameworkMonikers;
5657
args.SelfPackageId = PackageId;
5758
args.ProcessNamesToKillBeforeChange = new[] { Process.GetCurrentProcess().ProcessName };

src/GitExtensions.PluginManager/PluginSettings.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ internal class PluginSettings : IEnumerable<ISetting>
2020
/// <summary>
2121
/// Gets current value of <see cref="CloseInstancesProperty"/>.
2222
/// </summary>
23-
public bool CloseInstances => source.GetValue(CloseInstancesProperty.Name, CloseInstancesProperty.DefaultValue, t => Boolean.Parse(t));
23+
public bool CloseInstances => source.GetValue(CloseInstancesProperty.Name, CloseInstancesProperty.DefaultValue, t => bool.Parse(t));
2424

2525
public PluginSettings(ISettingsSource source)
2626
{

src/PackageManager.Cli/Args.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,16 +105,16 @@ public override string ToString()
105105
{
106106
StringBuilder result = new StringBuilder();
107107

108-
if (!String.IsNullOrEmpty(Path))
108+
if (!string.IsNullOrEmpty(Path))
109109
result.Append($"--path \"{Path}\"");
110110

111-
if (!String.IsNullOrEmpty(SelfPackageId))
111+
if (!string.IsNullOrEmpty(SelfPackageId))
112112
result.Append($" --selfpackageid {SelfPackageId}");
113113

114114
if (IsSelfUpdate)
115115
result.Append(" --selfupdate");
116116

117-
if (!String.IsNullOrEmpty(SelfOriginalPath))
117+
if (!string.IsNullOrEmpty(SelfOriginalPath))
118118
result.Append($" --selforiginalpath \"{SelfOriginalPath}\"");
119119

120120
return result.ToString();

src/PackageManager.Cli/Program.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public async Task MainAsync(string[] args)
4040
UpdatesViewModel viewModel = CreateUpdatesViewModel();
4141
await viewModel.Refresh.ExecuteAsync();
4242

43-
PackageUpdateViewModel packageModel = viewModel.Packages.FirstOrDefault(p => p.Target.Id == Args.PackageId);
43+
PackageUpdateViewModel packageModel = viewModel.Packages.FirstOrDefault(p => string.Equals(p.Target.Id, Args.PackageId, StringComparison.CurrentCultureIgnoreCase));
4444
if (packageModel != null && viewModel.Update.CanExecute(packageModel))
4545
{
4646
await viewModel.Update.ExecuteAsync(packageModel);

src/PackageManager.NuGet/Models/NuGetPackage.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public async Task<IPackageContent> GetContentAsync(CancellationToken cancellatio
4949
=> await contentService.DownloadAsync(repository, source, cancellationToken);
5050

5151
public async Task<IEnumerable<IPackage>> GetVersionsAsync(bool isPrereleaseIncluded, CancellationToken cancellationToken)
52-
=> await versionService.GetListAsync(Int32.MaxValue, source, repository, isPrereleaseIncluded: isPrereleaseIncluded, cancellationToken: cancellationToken);
52+
=> await versionService.GetListAsync(int.MaxValue, source, repository, isPrereleaseIncluded: isPrereleaseIncluded, cancellationToken: cancellationToken);
5353

5454
public bool Equals(IPackage other)
5555
=> Equals((IPackageIdentity)other);

src/PackageManager.NuGet/Models/NuGetPackageIdentity.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public bool Equals(IPackageIdentity other)
2626
if (other == null)
2727
return false;
2828

29-
return Id == other.Id && Version == other.Version;
29+
return string.Equals(Id, other.Id, StringComparison.CurrentCultureIgnoreCase) && string.Equals(Version, other.Version, StringComparison.CurrentCultureIgnoreCase);
3030
}
3131
}
3232
}

src/PackageManager.NuGet/Models/NuGetPackageSourceCollection.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public class NuGetPackageSourceCollection : DisposableBase, IPackageSourceCollec
1717

1818
public event Action Changed;
1919

20-
public IPackageSource Primary => Sources.FirstOrDefault(s => s.Name == Provider.ActivePackageSourceName);
20+
public IPackageSource Primary => Sources.FirstOrDefault(s => string.Equals(s.Name, Provider.ActivePackageSourceName, StringComparison.CurrentCultureIgnoreCase));
2121
public IReadOnlyCollection<IPackageSource> All => Sources;
2222

2323
public NuGetPackageSourceCollection(INuGetPackageSourceProvider provider)
@@ -66,7 +66,7 @@ public void Remove(IPackageSource source)
6666

6767
public void MarkAsPrimary(IPackageSource source)
6868
{
69-
if (Provider.ActivePackageSourceName == source?.Name)
69+
if (string.Equals(Provider.ActivePackageSourceName, source?.Name, StringComparison.CurrentCultureIgnoreCase))
7070
return;
7171

7272
if (source == null)
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.IO;
4+
using System.Linq;
5+
using System.Text;
6+
using System.Threading.Tasks;
7+
8+
namespace PackageManager.Services
9+
{
10+
public class EmptyNuGetSearchTermTransformer : INuGetSearchTermTransformer
11+
{
12+
public void Transform(NuGetSearchTerm searchTerm)
13+
{
14+
}
15+
16+
public readonly static EmptyNuGetSearchTermTransformer Instance = new EmptyNuGetSearchTermTransformer();
17+
}
18+
}

src/PackageManager.NuGet/Services/INuGetPackageFilter.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33
using System.Collections.Generic;
44
using System.Linq;
55
using System.Text;
6+
using System.Threading;
67
using System.Threading.Tasks;
78

89
namespace PackageManager.Services
910
{
1011
public interface INuGetPackageFilter
1112
{
12-
NuGetPackageFilterResult IsPassed(IPackageSearchMetadata package);
13+
Task<NuGetPackageFilterResult> FilterAsync(SourceRepository repository, IPackageSearchMetadata package, CancellationToken cancellationToken);
1314
}
1415
}
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.IO;
4+
using System.Linq;
5+
using System.Text;
6+
using System.Threading.Tasks;
7+
8+
namespace PackageManager.Services
9+
{
10+
public interface INuGetSearchTermTransformer
11+
{
12+
void Transform(NuGetSearchTerm searchTerm);
13+
}
14+
}

0 commit comments

Comments
 (0)