Remove extension data after extensions get PreDecompileTables callback

Also update Util.wixext decompiler extension to handle the new
elements that compile into CustomActions with no additional table data.
These exposed the weakness in the decompiler where extension data was
removed before extensions got a chance to pre-decompile.

Fixes 7151

1 files changed, 5 insertions, 5 deletions

diff --git a/src/ext/Util/test/WixToolsetTest.Util/TestData/Queries/Package.wxs b/src/ext/Util/test/WixToolsetTest.Util/TestData/Queries/Package.wxs
index abf0dbb4..d85db478 100644
--- a/src/ext/Util/test/WixToolsetTest.Util/TestData/Queries/Package.wxs
+++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/Queries/Package.wxs
@@ -1,4 +1,4 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
     <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
         <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
 
@@ -13,10 +13,10 @@
     </Package>
 
     <Fragment><util:BroadcastSettingChange />
-        
-        
-    
-            <StandardDirectory Id="ProgramFilesFolder">
+        <util:QueryNativeMachine />
+
+
+        <StandardDirectory Id="ProgramFilesFolder">
                 <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
             </StandardDirectory>
         </Fragment>