diff options
| author | Rob Mensching <rob@firegiant.com> | 2021-01-06 15:15:35 -0800 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2021-01-06 15:24:56 -0800 |
| commit | 093e1dd144b260b58a0ae46d722d1dbc4019d9d5 (patch) | |
| tree | 6fd63241e2b196b040d26b3b1749d4c3ecbc531c /src/WixToolset.Core | |
| parent | bf30546113c5f1ffc4cf917b560c5a0451eda37d (diff) | |
| download | wix-093e1dd144b260b58a0ae46d722d1dbc4019d9d5.tar.gz wix-093e1dd144b260b58a0ae46d722d1dbc4019d9d5.tar.bz2 wix-093e1dd144b260b58a0ae46d722d1dbc4019d9d5.zip | |
Implement improved file sequence optimization
First ensures files are grouped by DiskId. Then files are sequenced by
target directory order to optimize MSI installation behavior. Finally,
files are alphabetized in the directory. Additional optimizations could
be considered in the future from here.
Fixes wixtoolset/issues#4409
Fixes wixtoolset/issues#4708
Diffstat (limited to 'src/WixToolset.Core')
| -rw-r--r-- | src/WixToolset.Core/Linker.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/WixToolset.Core/Linker.cs b/src/WixToolset.Core/Linker.cs index 431ba4c7..e0af89ba 100644 --- a/src/WixToolset.Core/Linker.cs +++ b/src/WixToolset.Core/Linker.cs | |||
| @@ -198,8 +198,10 @@ namespace WixToolset.Core | |||
| 198 | } | 198 | } |
| 199 | 199 | ||
| 200 | // Report duplicates that would ultimately end up being primary key collisions. | 200 | // Report duplicates that would ultimately end up being primary key collisions. |
| 201 | var reportDupes = new ReportConflictingSymbolsCommand(this.Messaging, find.PossibleConflicts, resolve.ResolvedSections); | 201 | { |
| 202 | reportDupes.Execute(); | 202 | var reportDupes = new ReportConflictingSymbolsCommand(this.Messaging, find.PossibleConflicts, resolve.ResolvedSections); |
| 203 | reportDupes.Execute(); | ||
| 204 | } | ||
| 203 | 205 | ||
| 204 | if (this.Messaging.EncounteredError) | 206 | if (this.Messaging.EncounteredError) |
| 205 | { | 207 | { |
