Reorganize media assignment to correctly place facade order optimization

1 files changed, 2 insertions, 13 deletions

diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/UpdateMediaSequencesCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/UpdateMediaSequencesCommand.cs
index 9aab7b98..bf28b279 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/UpdateMediaSequencesCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/UpdateMediaSequencesCommand.cs
@@ -29,9 +29,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             {
                 var lastSequence = 0;
 
-                // Order by Component to group the files by directory.
-                var optimized = this.OptimizedFileFacades();
-                foreach (var facade in optimized)
+                foreach (var facade in this.FileFacades)
                 {
                     facade.Sequence = ++lastSequence;
                 }
@@ -43,8 +41,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                 var patchGroups = new Dictionary<int, List<FileFacade>>();
 
                 // sequence the non-patch-added files
-                var optimized = this.OptimizedFileFacades();
-                foreach (var facade in optimized)
+                foreach (var facade in this.FileFacades)
                 {
                     if (null == mediaTuple)
                     {
@@ -108,13 +105,5 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                 }
             }
         }
-
-        private IEnumerable<FileFacade> OptimizedFileFacades()
-        {
-            // TODO: Sort these facades even smarter by directory path and component id 
-            //       and maybe file size or file extension and other creative ideas to
-            //       get optimal install speed out of MSI.
-            return this.FileFacades.OrderBy(f => f.ComponentRef);
-        }
     }
 }