From b62a7a0beb7ceb7987de28ec768c7814cadb83b9 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Tue, 21 Jul 2020 14:31:53 -0700
Subject: Support implicit standard directory reference and "3264" platform
 folders

Completes wixtoolset/issues#5798 and wixtoolset/issues#5835
---
 .../TestData/CustomAction/SimpleCustomAction.wxs          | 15 +++++++++++++++
 .../TestData/CustomTable/CustomTable-Expected.wxs         | 12 +++++++-----
 .../TestData/Directory/Empty.wxs                          |  6 ++++++
 .../TestData/ProductWithComponentGroupRef/Product.wxs     |  6 +-----
 4 files changed, 29 insertions(+), 10 deletions(-)
 create mode 100644 src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/SimpleCustomAction.wxs
 create mode 100644 src/test/WixToolsetTest.CoreIntegration/TestData/Directory/Empty.wxs

(limited to 'src/test/WixToolsetTest.CoreIntegration/TestData')

diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/SimpleCustomAction.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/SimpleCustomAction.wxs
new file mode 100644
index 00000000..72d5e4a5
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/SimpleCustomAction.wxs
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <Fragment>
+        <ComponentGroup Id="ProductComponents">
+            <ComponentGroupRef Id="MinimalComponentGroup" />
+        </ComponentGroup>
+
+        <Binary Id="Binary1" SourceFile="test.txt" />
+        <CustomAction Id="Action1" BinaryKey="Binary1" DllEntry="EntryPoint1" />
+
+        <InstallExecuteSequence>
+            <Custom Action="Action1" After="InstallFiles" />
+        </InstallExecuteSequence>
+    </Fragment>
+</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTable-Expected.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTable-Expected.wxs
index 68386612..c55f4ed0 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTable-Expected.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTable-Expected.wxs
@@ -15,11 +15,13 @@
       </Row>
     </CustomTable>
     <Directory Id="TARGETDIR" Name="SourceDir">
-      <Directory Id="ProgramFilesFolder">
-        <Directory Id="INSTALLFOLDER" Name="MsiPackage" ShortName="oekcr5lq">
-          <Component Id="filcV1yrx0x8wJWj4qMzcH21jwkPko" Guid="{E597A58A-03CB-50D8-93E3-DABA263F233A}" Win64="no">
-            <File Id="filcV1yrx0x8wJWj4qMzcH21jwkPko" Name="test.txt" KeyPath="yes" Source="SourceDir\\MsiPackage\test.txt" />
-          </Component>
+      <Directory Id="ProgramFilesFolder" Name="PFiles">
+        <Directory Id="ProgramFiles6432Folder">
+          <Directory Id="INSTALLFOLDER" Name="MsiPackage" ShortName="1egc1laj">
+            <Component Id="filcV1yrx0x8wJWj4qMzcH21jwkPko" Guid="{E597A58A-03CB-50D8-93E3-DABA263F233A}" Win64="no">
+              <File Id="filcV1yrx0x8wJWj4qMzcH21jwkPko" Name="test.txt" KeyPath="yes" Source="SourceDir\PFiles\\MsiPackage\test.txt" />
+            </Component>
+          </Directory>
         </Directory>
       </Directory>
     </Directory>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Directory/Empty.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Directory/Empty.wxs
new file mode 100644
index 00000000..50cf6850
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/Directory/Empty.wxs
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <Fragment>
+        <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER" />
+    </Fragment>
+</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ProductWithComponentGroupRef/Product.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/ProductWithComponentGroupRef/Product.wxs
index b2f22b7d..5b26091a 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ProductWithComponentGroupRef/Product.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/ProductWithComponentGroupRef/Product.wxs
@@ -11,10 +11,6 @@
     </Product>
 
     <Fragment>
-        <Directory Id="TARGETDIR" Name="SourceDir">
-            <Directory Id="ProgramFilesFolder">
-                <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
-            </Directory>
-        </Directory>
+        <Directory Id="INSTALLFOLDER" Name="ProgramFiles6432Folder:\MsiPackage" />
     </Fragment>
 </Wix>
-- 
cgit v1.2.3-55-g6feb