aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Core.WindowsInstaller/Bind/OptimizeFileFacadesOrderCommand.cs
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2021-03-14 07:38:48 -0700
committerRob Mensching <rob@firegiant.com>2021-03-14 07:47:48 -0700
commit3ccd5e439da4296d6f2b66ce47075ab20d039676 (patch)
treeb5546552613b869367d09f444492a0bbcfadcfe0 /src/WixToolset.Core.WindowsInstaller/Bind/OptimizeFileFacadesOrderCommand.cs
parent574785ab1421c9b67336c13ade5c2263e665ca07 (diff)
downloadwix-3ccd5e439da4296d6f2b66ce47075ab20d039676.tar.gz
wix-3ccd5e439da4296d6f2b66ce47075ab20d039676.tar.bz2
wix-3ccd5e439da4296d6f2b66ce47075ab20d039676.zip
Minimize public surface area of Core
Fixes wixtoolset/issues#6374
Diffstat (limited to 'src/WixToolset.Core.WindowsInstaller/Bind/OptimizeFileFacadesOrderCommand.cs')
-rw-r--r--src/WixToolset.Core.WindowsInstaller/Bind/OptimizeFileFacadesOrderCommand.cs11
1 files changed, 5 insertions, 6 deletions
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
5 using System; 5 using System;
6 using System.Collections.Generic; 6 using System.Collections.Generic;
7 using System.Linq; 7 using System.Linq;
8 using WixToolset.Core.Bind;
9 using WixToolset.Data; 8 using WixToolset.Data;
10 using WixToolset.Data.Symbols; 9 using WixToolset.Data.Symbols;
11 using WixToolset.Extensibility.Data; 10 using WixToolset.Extensibility.Data;
@@ -13,7 +12,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
13 12
14 internal class OptimizeFileFacadesOrderCommand 13 internal class OptimizeFileFacadesOrderCommand
15 { 14 {
16 public OptimizeFileFacadesOrderCommand(IBackendHelper helper, IPathResolver pathResolver, IntermediateSection section, Platform platform, List<FileFacade> fileFacades) 15 public OptimizeFileFacadesOrderCommand(IBackendHelper helper, IPathResolver pathResolver, IntermediateSection section, Platform platform, List<IFileFacade> fileFacades)
17 { 16 {
18 this.BackendHelper = helper; 17 this.BackendHelper = helper;
19 this.PathResolver = pathResolver; 18 this.PathResolver = pathResolver;
@@ -22,7 +21,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
22 this.FileFacades = fileFacades; 21 this.FileFacades = fileFacades;
23 } 22 }
24 23
25 public List<FileFacade> FileFacades { get; private set; } 24 public List<IFileFacade> FileFacades { get; private set; }
26 25
27 private IBackendHelper BackendHelper { get; } 26 private IBackendHelper BackendHelper { get; }
28 27
@@ -32,7 +31,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
32 31
33 private Platform Platform { get; } 32 private Platform Platform { get; }
34 33
35 public List<FileFacade> Execute() 34 public List<IFileFacade> Execute()
36 { 35 {
37 var canonicalComponentTargetPaths = this.ComponentTargetPaths(); 36 var canonicalComponentTargetPaths = this.ComponentTargetPaths();
38 37
@@ -69,7 +68,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
69 return targetPathsByDirectoryId; 68 return targetPathsByDirectoryId;
70 } 69 }
71 70
72 private class FileFacadeOptimizer : IComparer<FileFacade> 71 private class FileFacadeOptimizer : IComparer<IFileFacade>
73 { 72 {
74 public FileFacadeOptimizer(Dictionary<string, string> componentTargetPaths, bool optimizingMergeModule) 73 public FileFacadeOptimizer(Dictionary<string, string> componentTargetPaths, bool optimizingMergeModule)
75 { 74 {
@@ -81,7 +80,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
81 80
82 private bool OptimizingMergeModule { get; } 81 private bool OptimizingMergeModule { get; }
83 82
84 public int Compare(FileFacade x, FileFacade y) 83 public int Compare(IFileFacade x, IFileFacade y)
85 { 84 {
86 // First group files by DiskId but ignore if processing a Merge Module 85 // First group files by DiskId but ignore if processing a Merge Module
87 // because Merge Modules don't have separate disks. 86 // because Merge Modules don't have separate disks.