From 3ccd5e439da4296d6f2b66ce47075ab20d039676 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Sun, 14 Mar 2021 07:38:48 -0700 Subject: Minimize public surface area of Core Fixes wixtoolset/issues#6374 --- .../Bind/OptimizeFileFacadesOrderCommand.cs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/WixToolset.Core.WindowsInstaller/Bind/OptimizeFileFacadesOrderCommand.cs') diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/OptimizeFileFacadesOrderCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/OptimizeFileFacadesOrderCommand.cs index 67515154..5dd4d3ea 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/OptimizeFileFacadesOrderCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/OptimizeFileFacadesOrderCommand.cs @@ -5,7 +5,6 @@ namespace WixToolset.Core.WindowsInstaller.Bind using System; using System.Collections.Generic; using System.Linq; - using WixToolset.Core.Bind; using WixToolset.Data; using WixToolset.Data.Symbols; using WixToolset.Extensibility.Data; @@ -13,7 +12,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind internal class OptimizeFileFacadesOrderCommand { - public OptimizeFileFacadesOrderCommand(IBackendHelper helper, IPathResolver pathResolver, IntermediateSection section, Platform platform, List fileFacades) + public OptimizeFileFacadesOrderCommand(IBackendHelper helper, IPathResolver pathResolver, IntermediateSection section, Platform platform, List fileFacades) { this.BackendHelper = helper; this.PathResolver = pathResolver; @@ -22,7 +21,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind this.FileFacades = fileFacades; } - public List FileFacades { get; private set; } + public List FileFacades { get; private set; } private IBackendHelper BackendHelper { get; } @@ -32,7 +31,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind private Platform Platform { get; } - public List Execute() + public List Execute() { var canonicalComponentTargetPaths = this.ComponentTargetPaths(); @@ -69,7 +68,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind return targetPathsByDirectoryId; } - private class FileFacadeOptimizer : IComparer + private class FileFacadeOptimizer : IComparer { public FileFacadeOptimizer(Dictionary componentTargetPaths, bool optimizingMergeModule) { @@ -81,7 +80,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind private bool OptimizingMergeModule { get; } - public int Compare(FileFacade x, FileFacade y) + public int Compare(IFileFacade x, IFileFacade y) { // First group files by DiskId but ignore if processing a Merge Module // because Merge Modules don't have separate disks. -- cgit v1.2.3-55-g6feb