Moved solution manifest lookup from ExportFeatureBase to ExportSolutionFeature

Author: loop8ack

src/ExtensionManager.UI/DialogService.cs

@@ -46,11 +46,11 @@ public DialogService(IVSThreads threads)
         }
     }
 
-    public Task ShowExportDialogAsync(IExportWorker worker, IManifest manifest, IReadOnlyCollection<IVSExtension> installedExtensions, IReadOnlyCollection<IVSExtension> selectedExtensions)
+    public Task ShowExportDialogAsync(IExportWorker worker, IManifest manifest, IReadOnlyCollection<IVSExtension> installedExtensions, IEnumerable<IVSExtension> selectedExtensions)
         => ShowExportDialogAsync(worker, manifest, installedExtensions, selectedExtensions, forSolution: false);
-    public Task ShowExportForSolutionDialogAsync(IExportWorker worker, IManifest manifest, IReadOnlyCollection<IVSExtension> installedExtensions, IReadOnlyCollection<IVSExtension> selectedExtensions)
+    public Task ShowExportForSolutionDialogAsync(IExportWorker worker, IManifest manifest, IReadOnlyCollection<IVSExtension> installedExtensions, IEnumerable<IVSExtension> selectedExtensions)
         => ShowExportDialogAsync(worker, manifest, installedExtensions, selectedExtensions, forSolution: true);
-    private async Task ShowExportDialogAsync(IExportWorker worker, IManifest manifest, IReadOnlyCollection<IVSExtension> installedExtensions, IReadOnlyCollection<IVSExtension> selectedExtensions, bool forSolution)
+    private async Task ShowExportDialogAsync(IExportWorker worker, IManifest manifest, IReadOnlyCollection<IVSExtension> installedExtensions, IEnumerable<IVSExtension> selectedExtensions, bool forSolution)
     {
         var vm = new ExportDialogViewModel(worker, manifest, forSolution);
 

src/ExtensionManager.UI/IDialogService.cs

@@ -9,8 +9,8 @@ public interface IDialogService
     Task<string?> ShowSaveVsextFileDialogAsync();
     Task<string?> ShowOpenVsextFileDialogAsync();
 
-    Task ShowExportDialogAsync(IExportWorker worker, IManifest manifest, IReadOnlyCollection<IVSExtension> installedExtensions, IReadOnlyCollection<IVSExtension> selectedExtensions);
-    Task ShowExportForSolutionDialogAsync(IExportWorker worker, IManifest manifest, IReadOnlyCollection<IVSExtension> installedExtensions, IReadOnlyCollection<IVSExtension> selectedExtensions);
+    Task ShowExportDialogAsync(IExportWorker worker, IManifest manifest, IReadOnlyCollection<IVSExtension> installedExtensions, IEnumerable<IVSExtension> selectedExtensions);
+    Task ShowExportForSolutionDialogAsync(IExportWorker worker, IManifest manifest, IReadOnlyCollection<IVSExtension> installedExtensions, IEnumerable<IVSExtension> selectedExtensions);
     Task ShowInstallDialogAsync(IInstallWorker worker, IManifest manifest, IReadOnlyCollection<VSExtensionToInstall> extensions);
     Task ShowInstallForSolutionDialogAsync(IInstallWorker worker, IManifest manifest, IReadOnlyCollection<VSExtensionToInstall> extensions);
 }

src/ExtensionManager/Features/Export/ExportFeature.cs

@@ -14,8 +14,8 @@ public ExportFeature(Args args)
     protected override async Task<string?> GetFilePathAsync()
         => await DialogService.ShowSaveVsextFileDialogAsync();
 
-    protected override async Task ShowExportDialogAsync(IManifest manifest, IExportWorker worker, IReadOnlyCollection<IVSExtension> extensions, IReadOnlyCollection<IVSExtension> selectedExtensions)
-        => await DialogService.ShowExportDialogAsync(worker, manifest, extensions, selectedExtensions);
+    protected override async Task ShowExportDialogAsync(IManifest manifest, IExportWorker worker, IReadOnlyCollection<IVSExtension> extensions)
+        => await DialogService.ShowExportDialogAsync(worker, manifest, extensions, []);
 
     protected override async Task OnManifestWrittenAsync(string filePath)
         => await Documents.OpenAsync(filePath);

src/ExtensionManager/Features/Export/ExportFeatureBase.cs

@@ -20,17 +20,15 @@ public sealed class Args
         public IVSExtensions Extensions { get; }
         public IDialogService DialogService { get; }
         public IManifestService ManifestService { get; }
-        public IVSSolutions Solutions { get; }
 
-        public Args(IThisVsixInfo vsixInfo, IVSDocuments documents, IVSMessageBox messageBox, IVSExtensions extensions, IDialogService dialogService, IManifestService manifestService, IVSSolutions solutions)
+        public Args(IThisVsixInfo vsixInfo, IVSDocuments documents, IVSMessageBox messageBox, IVSExtensions extensions, IDialogService dialogService, IManifestService manifestService)
         {
             VsixInfo = vsixInfo;
             Documents = documents;
             MessageBox = messageBox;
             Extensions = extensions;
             DialogService = dialogService;
             ManifestService = manifestService;
-            Solutions = solutions;
         }
     }
 
@@ -42,7 +40,6 @@ public Args(IThisVsixInfo vsixInfo, IVSDocuments documents, IVSMessageBox messag
     protected IVSExtensions Extensions => _args.Extensions;
     protected IDialogService DialogService => _args.DialogService;
     protected IManifestService ManifestService => _args.ManifestService;
-    protected IVSSolutions Solutions => _args.Solutions;
 
     protected ExportFeatureBase(Args args)
     {
@@ -51,31 +48,15 @@ protected ExportFeatureBase(Args args)
 
     public async Task ExecuteAsync()
     {
-        IManifest manifest;
-
-        var vsextFile = await Solutions.GetCurrentSolutionExtensionsManifestFilePathAsync(MessageBox).ConfigureAwait(false);
-
-        if (vsextFile != null && !string.IsNullOrEmpty(vsextFile))
-        {
-            // Attempt to read manifest from the found .vsext file
-            manifest = await ManifestService.ReadAsync(vsextFile).ConfigureAwait(false);
-        }
-        else
-        {
-            // No .vsext found: create new manifest
-            manifest = ManifestService.CreateNew();
-        }
-
+        var manifest = ManifestService.CreateNew();
         var installedExtensions = await Extensions.GetInstalledExtensionsAsync().ConfigureAwait(false);
 
         var installedExtensionsList = installedExtensions as List<IVSExtension>
             ?? installedExtensions.ToList();
 
         installedExtensionsList.RemoveAll(vsix => vsix.Id == VsixInfo.Id);
 
-        var selectedExtensions = manifest.Extensions;
-
-        await ShowExportDialogAsync(manifest, this, installedExtensions, new ReadOnlyCollection<IVSExtension>(selectedExtensions));
+        await ShowExportDialogAsync(manifest, this, installedExtensions);
     }
 
     async Task IExportWorker.ExportAsync(IManifest manifest, IProgress<ProgressStep<ExportStep>> progress, CancellationToken cancellationToken)
@@ -93,7 +74,6 @@ async Task IExportWorker.ExportAsync(IManifest manifest, IProgress<ProgressStep<
     }
 
     protected abstract Task<string?> GetFilePathAsync();
-    protected abstract Task ShowExportDialogAsync(IManifest manifest, IExportWorker worker, IReadOnlyCollection<IVSExtension> installedExtensions, IReadOnlyCollection<IVSExtension> selectedExtensions);
+    protected abstract Task ShowExportDialogAsync(IManifest manifest, IExportWorker worker, IReadOnlyCollection<IVSExtension> installedExtensions);
     protected abstract Task OnManifestWrittenAsync(string filePath);
 }
-

src/ExtensionManager/Features/Export/ExportSolutionFeature.cs

@@ -18,8 +18,16 @@ public ExportSolutionFeature(Args args, IVSSolutions solutions)
     protected override async Task<string?> GetFilePathAsync()
         => await _solutions.GetCurrentSolutionExtensionsManifestFilePathAsync(MessageBox);
 
-    protected override async Task ShowExportDialogAsync(IManifest manifest, IExportWorker worker, IReadOnlyCollection<IVSExtension> installedExtensions, IReadOnlyCollection<IVSExtension> selectedExtensions)
-        => await DialogService.ShowExportForSolutionDialogAsync(worker, manifest, installedExtensions, selectedExtensions);
+    protected override async Task ShowExportDialogAsync(IManifest manifest, IExportWorker worker, IReadOnlyCollection<IVSExtension> installedExtensions)
+    {
+        var existingManifestFile = await _solutions.GetCurrentSolutionExtensionsManifestFilePathAsync(MessageBox).ConfigureAwait(false);
+
+        var existingManifest = existingManifestFile?.Length > 0
+            ? await ManifestService.ReadAsync(existingManifestFile).ConfigureAwait(false)
+            : null;
+
+        await DialogService.ShowExportForSolutionDialogAsync(worker, manifest, installedExtensions, existingManifest?.Extensions ?? []);
+    }
 
     protected override async Task OnManifestWrittenAsync(string filePath)
     {