Support implicit standard directory reference and "3264" platform folders

Completes wixtoolset/issues#5798 and wixtoolset/issues#5835

1 files changed, 8 insertions, 1 deletions

diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
index 950fe1c1..93c617d9 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
@@ -133,6 +133,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             bool compressed;
             bool longNames;
             int installerVersion;
+            Platform platform;
             string modularizationSuffix;
             {
                 var command = new BindSummaryInfoCommand(section);
@@ -141,6 +142,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                 compressed = command.Compressed;
                 longNames = command.LongNames;
                 installerVersion = command.InstallerVersion;
+                platform = command.Platform;
                 modularizationSuffix = command.ModularizationSuffix;
             }
 
@@ -194,6 +196,11 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             }
 
             {
+                var command = new AddRequiredStandardDirectories(section, platform);
+                command.Execute();
+            }
+
+            {
                 var command = new CreateSpecialPropertiesCommand(section);
                 command.Execute();
             }
@@ -332,7 +339,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
             // Set generated component guids.
             {
-                var command = new CalculateComponentGuids(this.Messaging, this.BackendHelper, this.PathResolver, section);
+                var command = new CalculateComponentGuids(this.Messaging, this.BackendHelper, this.PathResolver, section, platform);
                 command.Execute();
             }