Modernize package manager dialog

Bonsai.Configuration/Bootstrapper.cs

@@ -8,6 +8,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace Bonsai.Configuration
@@ -29,9 +30,9 @@ public LicenseAwarePackageManager PackageManager
             get { return packageManager; }
         }
 
-        protected virtual async Task RunPackageOperationAsync(Func<Task> operationFactory)
+        protected virtual async Task RunPackageOperationAsync(Func<CancellationToken, Task> operationFactory, CancellationToken cancellationToken)
         {
-            await operationFactory();
+            await operationFactory(cancellationToken);
         }
 
         static NuGetVersion ParseVersion(string version)
@@ -52,7 +53,8 @@ public async Task RunAsync(
             NuGetFramework projectFramework,
             PackageConfiguration packageConfiguration,
             string bootstrapperPath,
-            PackageIdentity bootstrapperPackage)
+            PackageIdentity bootstrapperPackage,
+            CancellationToken cancellationToken = default)
         {
             const string OldExtension = ".old";
             var backupExePath = bootstrapperPath + OldExtension;
@@ -65,7 +67,7 @@ public async Task RunAsync(
             var missingPackages = GetMissingPackages(packageConfiguration, packageManager.LocalRepository).ToList();
             if (missingPackages.Count > 0)
             {
-                async Task RestoreMissingPackages()
+                async Task RestoreMissingPackages(CancellationToken cancellationToken)
                 {
                     using var monitor = new PackageConfigurationUpdater(
                         projectFramework,
@@ -75,31 +77,39 @@ async Task RestoreMissingPackages()
                         bootstrapperPackage);
                     foreach (var package in missingPackages)
                     {
-                        await packageManager.StartRestorePackage(package.Id, ParseVersion(package.Version), projectFramework);
+                        await packageManager.RestorePackageAsync(
+                            package.Id,
+                            ParseVersion(package.Version),
+                            projectFramework,
+                            cancellationToken);
                     }
                 };
 
                 packageManager.RestorePackages = true;
-                try { await RunPackageOperationAsync(RestoreMissingPackages); }
+                try { await RunPackageOperationAsync(RestoreMissingPackages, cancellationToken); }
                 finally { packageManager.RestorePackages = false; }
             }
 
             var editorPackage = packageManager.LocalRepository.FindLocalPackage(bootstrapperPackage.Id);
             if (editorPackage == null || editorPackage.Identity.Version < bootstrapperPackage.Version)
             {
-                async Task RestoreEditorPackage()
+                async Task RestoreEditorPackage(CancellationToken cancellationToken)
                 {
                     using var monitor = new PackageConfigurationUpdater(
                         projectFramework,
                         packageConfiguration,
                         packageManager,
                         bootstrapperPath,
                         bootstrapperPackage);
-                    var package = await packageManager.StartInstallPackage(bootstrapperPackage.Id, bootstrapperPackage.Version, projectFramework);
+                    var package = await packageManager.InstallPackageAsync(
+                        bootstrapperPackage.Id,
+                        bootstrapperPackage.Version,
+                        projectFramework,
+                        cancellationToken);
                     editorPackage = packageManager.LocalRepository.GetLocalPackage(package.GetIdentity());
                 };
 
-                await RunPackageOperationAsync(RestoreEditorPackage);
+                await RunPackageOperationAsync(RestoreEditorPackage, cancellationToken);
             }
         }
 
@@ -112,7 +122,7 @@ public RestorePackageManager(PackageSourceProvider packageSourceProvider, string
 
             public bool RestorePackages { get; set; }
 
-            protected override bool AcceptLicenseAgreement(IEnumerable<IPackageSearchMetadata> licensePackages)
+            protected override bool AcceptLicenseAgreement(IEnumerable<RequiringLicenseAcceptancePackageInfo> licensePackages)
             {
                 if (RestorePackages) return true;
                 else return base.AcceptLicenseAgreement(licensePackages);

Bonsai.Configuration/PackageConfigurationUpdater.cs

@@ -19,12 +19,8 @@ namespace Bonsai.Configuration
 {
     public class PackageConfigurationUpdater : IDisposable
     {
-        const string PackageTagFilter = "Bonsai";
-        const string GalleryDirectory = "Gallery";
-        const string ExtensionsDirectory = "Extensions";
         const string BinDirectory = "bin";
         const string DebugDirectory = "debug";
-        const string BonsaiExtension = ".bonsai";
         const string AssemblyExtension = ".dll";
         const string OldExtension = ".old";
 
@@ -55,7 +51,7 @@ public PackageConfigurationUpdater(NuGetFramework projectFramework, PackageConfi
             configurationPlugin = new PackageConfigurationPlugin(this);
             packageManager.PackageManagerPlugins.Add(configurationPlugin);
 
-            var galleryPath = Path.Combine(bootstrapperDirectory, GalleryDirectory);
+            var galleryPath = Path.Combine(bootstrapperDirectory, Constants.GalleryDirectory);
             var galleryPackageSource = new PackageSource(galleryPath);
             galleryRepository = new SourceRepository(galleryPackageSource, Repository.Provider.GetCoreV3());
             NormalizePathSeparators(packageConfiguration);
@@ -92,12 +88,6 @@ static void NormalizePathSeparators(PackageConfiguration configuration)
             }
         }
 
-        static bool IsTaggedPackage(PackageReaderBase package)
-        {
-            var tags = package.NuspecReader.GetTags();
-            return tags != null && tags.Contains(PackageTagFilter);
-        }
-
         static ProcessorArchitecture ResolveArchitectureAlias(string name)
         {
             switch (name)
@@ -410,10 +400,7 @@ public PackageConfigurationPlugin(PackageConfigurationUpdater owner)
 
             public override async Task<bool> OnPackageInstallingAsync(PackageIdentity package, NuGetFramework projectFramework, PackageReaderBase packageReader, string installPath)
             {
-                var entryPoint = package.Id + BonsaiExtension;
-                var nearestFrameworkGroup = packageReader.GetContentItems().GetNearest(projectFramework);
-                var executablePackage = nearestFrameworkGroup?.Items.Any(file => PathUtility.GetRelativePath(ContentFolder, file) == entryPoint);
-                if (executablePackage.GetValueOrDefault())
+                if (packageReader.IsExecutablePackage(package, projectFramework))
                 {
                     var packageFolder = Path.GetDirectoryName(packageReader.GetNuspecFile());
                     var resolver = new VersionFolderPathResolver(packageFolder, isLowercase: false);
@@ -461,15 +448,15 @@ public override async Task<bool> OnPackageInstallingAsync(PackageIdentity packag
             public override Task OnPackageInstalledAsync(PackageIdentity package, NuGetFramework projectFramework, PackageReaderBase packageReader, string installPath)
             {
                 var packageConfiguration = Owner.packageConfiguration;
-                var taggedPackage = IsTaggedPackage(packageReader);
+                var addReferences = packageReader.IsLibraryPackage();
                 var relativePath = Owner.GetRelativePath(installPath);
                 if (!packageConfiguration.Packages.Contains(package.Id))
                 {
                     packageConfiguration.Packages.Add(package.Id, package.Version.ToString());
                 }
                 else packageConfiguration.Packages[package.Id].Version = package.Version.ToString();
 
-                Owner.AddContentFolders(installPath, ExtensionsDirectory);
+                Owner.AddContentFolders(installPath, Constants.ExtensionsDirectory);
                 Owner.RegisterLibraryFolders(packageReader, relativePath);
                 Owner.RegisterAssemblyLocations(packageReader, installPath, relativePath, false);
                 if (IsRunningOnMono) Owner.AddAssemblyConfigFiles(packageReader, installPath);
@@ -494,7 +481,7 @@ public override Task OnPackageInstalledAsync(PackageIdentity package, NuGetFrame
                 // resolution is OS-specific and architecture-specific and should not be versioned together
                 // with the package dependency graph.
                 var assemblyLocations = GetCompatibleAssemblyReferences(projectFramework, packageReader);
-                Owner.RegisterAssemblyLocations(assemblyLocations, installPath, relativePath, taggedPackage);
+                Owner.RegisterAssemblyLocations(assemblyLocations, installPath, relativePath, addReferences);
                 packageConfiguration.Save();
 
                 if (package.Id == Owner.bootstrapperPackageId && package.Version > Owner.bootstrapperVersion)
@@ -516,11 +503,11 @@ public override Task OnPackageInstalledAsync(PackageIdentity package, NuGetFrame
 
             public override async Task OnPackageUninstalledAsync(PackageIdentity package, NuGetFramework projectFramework, PackageReaderBase packageReader, string installPath)
             {
-                var taggedPackage = IsTaggedPackage(packageReader);
+                var removeReferences = packageReader.IsLibraryPackage();
                 var relativePath = Owner.GetRelativePath(installPath);
                 Owner.packageConfiguration.Packages.Remove(package.Id);
 
-                Owner.RemoveContentFolders(packageReader, installPath, ExtensionsDirectory);
+                Owner.RemoveContentFolders(packageReader, installPath, Constants.ExtensionsDirectory);
                 Owner.RemoveLibraryFolders(packageReader, relativePath);
                 Owner.RemoveAssemblyLocations(packageReader, relativePath, false);
                 if (IsRunningOnMono) Owner.RemoveAssemblyConfigFiles(packageReader, installPath);
@@ -541,7 +528,7 @@ public override async Task OnPackageUninstalledAsync(PackageIdentity package, Nu
                 }
 
                 var assemblyLocations = GetCompatibleAssemblyReferences(projectFramework, packageReader);
-                Owner.RemoveAssemblyLocations(assemblyLocations, relativePath, taggedPackage);
+                Owner.RemoveAssemblyLocations(assemblyLocations, relativePath, removeReferences);
                 Owner.packageConfiguration.Save();
 
                 if (pivots.Length > 0)

Bonsai.Editor/AboutBox.cs

@@ -16,7 +16,10 @@ public AboutBox()
             this.labelVersion.Text = $"Version {AssemblyVersion}";
             this.labelCopyright.Text = AssemblyCopyright;
             this.labelCompanyName.Text = AssemblyCompany;
-            this.textBoxDescription.Text = AssemblyDescription + Environment.NewLine + Resources.AttributionNotices;
+            this.textBoxDescription.Text = string.Format(
+                Resources.AttributionNotices,
+                AssemblyProduct,
+                AssemblyDescription);
         }
 
         internal static string BuildKindTitleSuffix

Bonsai.Editor/Properties/Resources.resx

@@ -170,8 +170,9 @@
 </value>
   </data>
   <data name="AttributionNotices" xml:space="preserve">
-    <value>
-The Bonsai framework includes software from the Reactive Extensions for .NET and the NuGet projects developed at the .NET Foundation (https://dotnetfoundation.org/).
+    <value>{1}
+
+{0} includes software and media content from the Reactive Extensions for .NET and the NuGet projects developed at the .NET Foundation (https://dotnetfoundation.org/).
 
 Copyright (c) .NET Foundation and Contributors</value>
   </data>

Bonsai.NuGet.Design/DrawingHelper.cs

@@ -0,0 +1,28 @@
+using System.Drawing;
+using System.Drawing.Drawing2D;
+
+namespace Bonsai.NuGet.Design
+{
+    static class DrawingHelper
+    {
+        public static SizeF GetImageSize(this Graphics graphics, Image image)
+        {
+            return new(
+                width: image.Width * graphics.DpiX / image.HorizontalResolution,
+                height: image.Height * graphics.DpiY / image.VerticalResolution);
+        }
+
+        public static Bitmap Resize(this Image image, Size newSize)
+        {
+            var result = new Bitmap(newSize.Width, newSize.Height);
+            using (var graphics = Graphics.FromImage(result))
+            {
+                graphics.SmoothingMode = SmoothingMode.HighQuality;
+                graphics.InterpolationMode = InterpolationMode.HighQualityBicubic;
+                graphics.PixelOffsetMode = PixelOffsetMode.HighQuality;
+                graphics.DrawImage(image, 0, 0, newSize.Width, newSize.Height);
+            }
+            return result;
+        }
+    }
+}

Bonsai.NuGet.Design/FormatHelper.cs

@@ -0,0 +1,18 @@
+using System.Globalization;
+
+namespace Bonsai.NuGet.Design
+{
+    internal static class FormatHelper
+    {
+        public static string ToLargeSuffix(long count)
+        {
+            return count switch
+            {
+                > 999999999 => count.ToString("0,,,.#B", CultureInfo.InvariantCulture),
+                > 999999 => count.ToString("0,,.#M", CultureInfo.InvariantCulture),
+                > 999 => count.ToString("0,.#K", CultureInfo.InvariantCulture),
+                _ => count.ToString(CultureInfo.InvariantCulture)
+            };
+        }
+    }
+}