Changes based on code-review.

- All package id and version are compared case-insensitive.
- Instead of String use string.
- Rename method of INuGetPackageFilter.

Author: maraf

src/GitExtensions.PluginManager/PluginSettings.cs

@@ -20,7 +20,7 @@ internal class PluginSettings : IEnumerable<ISetting>
         /// <summary>
         /// Gets current value of <see cref="CloseInstancesProperty"/>.
         /// </summary>
-        public bool CloseInstances => source.GetValue(CloseInstancesProperty.Name, CloseInstancesProperty.DefaultValue, t => Boolean.Parse(t));
+        public bool CloseInstances => source.GetValue(CloseInstancesProperty.Name, CloseInstancesProperty.DefaultValue, t => bool.Parse(t));
 
         public PluginSettings(ISettingsSource source)
         {

src/PackageManager.Cli/Args.cs

@@ -105,16 +105,16 @@ public override string ToString()
         {
             StringBuilder result = new StringBuilder();
 
-            if (!String.IsNullOrEmpty(Path))
+            if (!string.IsNullOrEmpty(Path))
                 result.Append($"--path \"{Path}\"");
 
-            if (!String.IsNullOrEmpty(SelfPackageId))
+            if (!string.IsNullOrEmpty(SelfPackageId))
                 result.Append($" --selfpackageid {SelfPackageId}");
 
             if (IsSelfUpdate)
                 result.Append(" --selfupdate");
 
-            if (!String.IsNullOrEmpty(SelfOriginalPath))
+            if (!string.IsNullOrEmpty(SelfOriginalPath))
                 result.Append($" --selforiginalpath \"{SelfOriginalPath}\"");
 
             return result.ToString();

src/PackageManager.Cli/Program.cs

@@ -40,7 +40,7 @@ public async Task MainAsync(string[] args)
                 UpdatesViewModel viewModel = CreateUpdatesViewModel();
                 await viewModel.Refresh.ExecuteAsync();
 
-                PackageUpdateViewModel packageModel = viewModel.Packages.FirstOrDefault(p => p.Target.Id == Args.PackageId);
+                PackageUpdateViewModel packageModel = viewModel.Packages.FirstOrDefault(p => string.Equals(p.Target.Id, Args.PackageId, StringComparison.CurrentCultureIgnoreCase));
                 if (packageModel != null && viewModel.Update.CanExecute(packageModel))
                 {
                     await viewModel.Update.ExecuteAsync(packageModel);

src/PackageManager.NuGet/Models/NuGetPackage.cs

@@ -49,7 +49,7 @@ public async Task<IPackageContent> GetContentAsync(CancellationToken cancellatio
             => await contentService.DownloadAsync(repository, source, cancellationToken);
 
         public async Task<IEnumerable<IPackage>> GetVersionsAsync(bool isPrereleaseIncluded, CancellationToken cancellationToken)
-            => await versionService.GetListAsync(Int32.MaxValue, source, repository, isPrereleaseIncluded: isPrereleaseIncluded, cancellationToken: cancellationToken);
+            => await versionService.GetListAsync(int.MaxValue, source, repository, isPrereleaseIncluded: isPrereleaseIncluded, cancellationToken: cancellationToken);
 
         public bool Equals(IPackage other)
             => Equals((IPackageIdentity)other);

src/PackageManager.NuGet/Models/NuGetPackageIdentity.cs

@@ -26,7 +26,7 @@ public bool Equals(IPackageIdentity other)
             if (other == null)
                 return false;
 
-            return Id == other.Id && Version == other.Version;
+            return string.Equals(Id, other.Id, StringComparison.CurrentCultureIgnoreCase) && string.Equals(Version, other.Version, StringComparison.CurrentCultureIgnoreCase);
         }
     }
 }

src/PackageManager.NuGet/Models/NuGetPackageSourceCollection.cs

@@ -17,7 +17,7 @@ public class NuGetPackageSourceCollection : DisposableBase, IPackageSourceCollec
 
         public event Action Changed;
 
-        public IPackageSource Primary => Sources.FirstOrDefault(s => s.Name == Provider.ActivePackageSourceName);
+        public IPackageSource Primary => Sources.FirstOrDefault(s => string.Equals(s.Name, Provider.ActivePackageSourceName, StringComparison.CurrentCultureIgnoreCase));
         public IReadOnlyCollection<IPackageSource> All => Sources;
 
         public NuGetPackageSourceCollection(INuGetPackageSourceProvider provider)
@@ -66,7 +66,7 @@ public void Remove(IPackageSource source)
 
         public void MarkAsPrimary(IPackageSource source)
         {
-            if (Provider.ActivePackageSourceName == source?.Name)
+            if (string.Equals(Provider.ActivePackageSourceName, source?.Name, StringComparison.CurrentCultureIgnoreCase))
                 return;
 
             if (source == null)

src/PackageManager.NuGet/Services/EmptyNuGetSearchTermTransformer.cs

@@ -13,28 +13,6 @@ public void Transform(NuGetSearchTerm searchTerm)
         {
         }
 
-        #region Singleton
-
-        private static EmptyNuGetSearchTermTransformer instance;
-        private static object instanceLock = new object();
-
-        public static EmptyNuGetSearchTermTransformer Instance
-        {
-            get
-            {
-                if (instance == null)
-                {
-                    lock (instanceLock)
-                    {
-                        if (instance == null)
-                            instance = new EmptyNuGetSearchTermTransformer();
-                    }
-                }
-
-                return instance;
-            }
-        }
-
-        #endregion
+        public readonly static EmptyNuGetSearchTermTransformer Instance = new EmptyNuGetSearchTermTransformer();
     }
 }

src/PackageManager.NuGet/Services/INuGetPackageFilter.cs

@@ -10,6 +10,6 @@ namespace PackageManager.Services
 {
     public interface INuGetPackageFilter
     {
-        Task<NuGetPackageFilterResult> IsPassedAsync(SourceRepository repository, IPackageSearchMetadata package, CancellationToken cancellationToken);
+        Task<NuGetPackageFilterResult> FilterAsync(SourceRepository repository, IPackageSearchMetadata package, CancellationToken cancellationToken);
     }
 }

src/PackageManager.NuGet/Services/NuGetInstallService.cs

@@ -63,7 +63,7 @@ public bool IsInstalled(string packageId)
             using (Stream fileContent = new FileStream(ConfigFilePath, FileMode.Open))
             {
                 PackagesConfigReader reader = new PackagesConfigReader(fileContent);
-                return reader.GetPackages().Any(p => p.PackageIdentity.Id == packageId);
+                return reader.GetPackages().Any(p => string.Equals(p.PackageIdentity.Id, packageId, StringComparison.CurrentCultureIgnoreCase));
             }
         }
 
@@ -77,7 +77,7 @@ public bool IsInstalled(IPackageIdentity package)
             using (Stream fileContent = new FileStream(ConfigFilePath, FileMode.Open))
             {
                 PackagesConfigReader reader = new PackagesConfigReader(fileContent);
-                return reader.GetPackages().Any(p => p.PackageIdentity.Id == package.Id && p.PackageIdentity.Version.ToFullString() == package.Version);
+                return reader.GetPackages().Any(p => string.Equals(p.PackageIdentity.Id, package.Id, StringComparison.CurrentCultureIgnoreCase) && string.Equals(p.PackageIdentity.Version.ToFullString(), package.Version, StringComparison.CurrentCultureIgnoreCase));
             }
         }
 
@@ -118,7 +118,7 @@ public void Uninstall(string packageId)
             ReadPackageConfig(
                 (p, cache) => 
                 {
-                    if (p.PackageIdentity.Id == packageId)
+                    if (string.Equals(p.PackageIdentity.Id, packageId, StringComparison.CurrentCultureIgnoreCase))
                     {
                         version = p.PackageIdentity.Version;
                         framework = p.TargetFramework;
@@ -182,7 +182,7 @@ await ReadPackageConfig(
                             {
                                 log.Debug($"Package '{package.PackageIdentity}' was found.");
 
-                                NuGetPackageFilterResult filterResult = await packageFilter.IsPassedAsync(repository, metadata, cancellationToken);
+                                NuGetPackageFilterResult filterResult = await packageFilter.FilterAsync(repository, metadata, cancellationToken);
                                 result.Add(new NuGetInstalledPackage(
                                     new NuGetPackage(metadata, repository, contentService, versionService),
                                     filterResult == NuGetPackageFilterResult.Ok
@@ -209,7 +209,7 @@ public async Task<IPackageIdentity> FindInstalledAsync(string packageId, Cancell
             await ReadPackageConfig(
                 (package, context) =>
                 {
-                    if (package.PackageIdentity.Id == packageId)
+                    if (string.Equals(package.PackageIdentity.Id, packageId, StringComparison.CurrentCultureIgnoreCase))
                     {
                         result = new NuGetPackageIdentity(package.PackageIdentity);
                         return Task.FromResult(true);

src/PackageManager.NuGet/Services/NuGetPackageContentService.cs

@@ -41,7 +41,7 @@ public async Task<IPackageContent> DownloadAsync(SourceRepository repository, IP
             using (var sourceCacheContext = new SourceCacheContext())
             {
                 var context = new PackageDownloadContext(sourceCacheContext, Path.GetTempPath(), true);
-                var result = await download.GetDownloadResourceResultAsync(package.Identity, context, String.Empty, nuGetLog, cancellationToken);
+                var result = await download.GetDownloadResourceResultAsync(package.Identity, context, string.Empty, nuGetLog, cancellationToken);
                 if (result.Status == DownloadResourceResultStatus.Cancelled)
                     throw new OperationCanceledException();
                 else if (result.Status == DownloadResourceResultStatus.NotFound)