Merge remote-tracking branch 'gitextensions/master' into release/1.0

Author: mast-eu

src/GitExtensions.PluginManager/GitExtensions.PluginManager.csproj

@@ -13,7 +13,7 @@
   <PropertyGroup>
     <PackageManagerTargetPath>PackageManager\PackageManager.UI.exe</PackageManagerTargetPath>
     <PackageManagerSourcePath>..\PackageManager.UI\bin\$(Configuration)\$(TargetFramework)\PackageManager.UI.exe</PackageManagerSourcePath>
-    <GitExtensionsDebugPluginsPath>..\..\references\GitExtensions\UserPlugins\</GitExtensionsDebugPluginsPath>
+    <GitExtensionsDebugPluginsPath>..\..\references\GitExtensions\UserPlugins\GitExtensions.PluginManager\</GitExtensionsDebugPluginsPath>
     <GitExtensionsReferenceSource>appveyor</GitExtensionsReferenceSource>
     <GitExtensionsReferenceVersion>v3.2.0.5938</GitExtensionsReferenceVersion>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>

src/GitExtensions.PluginManager/Plugin.cs

@@ -52,13 +52,14 @@ public override bool Execute(GitUIEventArgs gitUiCommands)
             Args args = new Args();
             args.Path = pluginsPath;
             args.Dependencies = new List<Args.Dependency>() { new Args.Dependency("GitExtensions.Extensibility") };
+            args.Tags = "GitExtensions";
             args.Monikers = FrameworkMonikers;
             args.SelfPackageId = PackageId;
             args.ProcessNamesToKillBeforeChange = new[] { Process.GetCurrentProcess().ProcessName };
 
             ProcessStartInfo info = new ProcessStartInfo()
             {
-                FileName = Path.Combine(pluginsPath, PluginManagerRelativePath),
+                FileName = Path.Combine(pluginsPath, PackageId, PluginManagerRelativePath),
                 Arguments = args.ToString(),
                 UseShellExecute = false,
             };

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

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PackageManager.Services
+{
+    public class EmptyNuGetSearchTermTransformer : INuGetSearchTermTransformer
+    {
+        public void Transform(NuGetSearchTerm searchTerm)
+        {
+        }
+
+        public readonly static EmptyNuGetSearchTermTransformer Instance = new EmptyNuGetSearchTermTransformer();
+    }
+}

src/PackageManager.NuGet/Services/INuGetPackageFilter.cs

@@ -3,12 +3,13 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace PackageManager.Services
 {
     public interface INuGetPackageFilter
     {
-        NuGetPackageFilterResult IsPassed(IPackageSearchMetadata package);
+        Task<NuGetPackageFilterResult> FilterAsync(SourceRepository repository, IPackageSearchMetadata package, CancellationToken cancellationToken);
     }
 }