From 918dfb72bedefc753a85421d961546162d032ac5 Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Tue, 27 Oct 2020 16:18:50 -0400
Subject: Update project for Package/SummaryInformation change (and others).

---
 .../WixToolsetTest.UI/TestData/WixUI_Advanced/Package.wxs    | 12 ++++++------
 .../WixToolsetTest.UI/TestData/WixUI_FeatureTree/Package.wxs |  8 ++++----
 .../WixToolsetTest.UI/TestData/WixUI_InstallDir/Package.wxs  |  8 ++++----
 .../WixToolsetTest.UI/TestData/WixUI_Minimal/Package.wxs     |  8 ++++----
 src/test/WixToolsetTest.UI/TestData/WixUI_Mondo/Package.wxs  |  8 ++++----
 src/wixlib/Common_Platform.wxi                               |  4 ++--
 src/wixlib/ui.wixproj                                        |  1 -
 7 files changed, 24 insertions(+), 25 deletions(-)

(limited to 'src')

diff --git a/src/test/WixToolsetTest.UI/TestData/WixUI_Advanced/Package.wxs b/src/test/WixToolsetTest.UI/TestData/WixUI_Advanced/Package.wxs
index 2d383f70..2e416f0f 100644
--- a/src/test/WixToolsetTest.UI/TestData/WixUI_Advanced/Package.wxs
+++ b/src/test/WixToolsetTest.UI/TestData/WixUI_Advanced/Package.wxs
@@ -1,9 +1,9 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Product Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
-        <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
+    <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" InstallerVersion="200">
+        
 
         <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
-        <MediaTemplate />
+        
 
         <Feature Id="ProductFeature" Title="MsiPackage">
             <ComponentGroupRef Id="ProductComponents" />
@@ -16,9 +16,9 @@
         </ComponentGroup>
 
         <UIRef Id="WixUI_Advanced" />
-        <Property Id="ApplicationFolderName" Value="MyProgram"/>
-        <Property Id="WixAppFolder" Value="WixPerMachineFolder"/>
-    </Product>
+        <Property Id="ApplicationFolderName" Value="MyProgram" />
+        <Property Id="WixAppFolder" Value="WixPerMachineFolder" />
+    </Package>
 
     <Fragment>
         <Directory Id="TARGETDIR" Name="SourceDir">
diff --git a/src/test/WixToolsetTest.UI/TestData/WixUI_FeatureTree/Package.wxs b/src/test/WixToolsetTest.UI/TestData/WixUI_FeatureTree/Package.wxs
index dc0e990d..5f8cd07d 100644
--- a/src/test/WixToolsetTest.UI/TestData/WixUI_FeatureTree/Package.wxs
+++ b/src/test/WixToolsetTest.UI/TestData/WixUI_FeatureTree/Package.wxs
@@ -1,9 +1,9 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Product Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
-        <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
+    <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" InstallerVersion="200">
+        
 
         <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
-        <MediaTemplate />
+        
 
         <Feature Id="ProductFeature" Title="MsiPackage">
             <ComponentGroupRef Id="ProductComponents" />
@@ -16,7 +16,7 @@
         </ComponentGroup>
 
         <UIRef Id="WixUI_FeatureTree" />
-    </Product>
+    </Package>
 
     <Fragment>
         <Directory Id="TARGETDIR" Name="SourceDir">
diff --git a/src/test/WixToolsetTest.UI/TestData/WixUI_InstallDir/Package.wxs b/src/test/WixToolsetTest.UI/TestData/WixUI_InstallDir/Package.wxs
index 8ed3866e..4e873add 100644
--- a/src/test/WixToolsetTest.UI/TestData/WixUI_InstallDir/Package.wxs
+++ b/src/test/WixToolsetTest.UI/TestData/WixUI_InstallDir/Package.wxs
@@ -1,9 +1,9 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Product Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
-        <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
+    <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" InstallerVersion="200">
+        
 
         <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
-        <MediaTemplate />
+        
 
         <Feature Id="ProductFeature" Title="MsiPackage">
             <ComponentGroupRef Id="ProductComponents" />
@@ -16,7 +16,7 @@
         </ComponentGroup>
 
         <UIRef Id="WixUI_InstallDir" />
-    </Product>
+    </Package>
 
     <Fragment>
         <Directory Id="TARGETDIR" Name="SourceDir">
diff --git a/src/test/WixToolsetTest.UI/TestData/WixUI_Minimal/Package.wxs b/src/test/WixToolsetTest.UI/TestData/WixUI_Minimal/Package.wxs
index a1e9ed60..96ab46ff 100644
--- a/src/test/WixToolsetTest.UI/TestData/WixUI_Minimal/Package.wxs
+++ b/src/test/WixToolsetTest.UI/TestData/WixUI_Minimal/Package.wxs
@@ -1,9 +1,9 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Product Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
-        <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
+    <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" InstallerVersion="200">
+        
 
         <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
-        <MediaTemplate />
+        
 
         <Feature Id="ProductFeature" Title="MsiPackage">
             <ComponentGroupRef Id="ProductComponents" />
@@ -16,7 +16,7 @@
         </ComponentGroup>
 
         <UIRef Id="WixUI_Minimal" />
-    </Product>
+    </Package>
 
     <Fragment>
         <Directory Id="TARGETDIR" Name="SourceDir">
diff --git a/src/test/WixToolsetTest.UI/TestData/WixUI_Mondo/Package.wxs b/src/test/WixToolsetTest.UI/TestData/WixUI_Mondo/Package.wxs
index 03e4173d..9bbc4ba0 100644
--- a/src/test/WixToolsetTest.UI/TestData/WixUI_Mondo/Package.wxs
+++ b/src/test/WixToolsetTest.UI/TestData/WixUI_Mondo/Package.wxs
@@ -1,9 +1,9 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Product Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
-        <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
+    <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" InstallerVersion="200">
+        
 
         <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
-        <MediaTemplate />
+        
 
         <Feature Id="ProductFeature" Title="MsiPackage">
             <ComponentGroupRef Id="ProductComponents" />
@@ -16,7 +16,7 @@
         </ComponentGroup>
 
         <UIRef Id="WixUI_Mondo" />
-    </Product>
+    </Package>
 
     <Fragment>
         <Directory Id="TARGETDIR" Name="SourceDir">
diff --git a/src/wixlib/Common_Platform.wxi b/src/wixlib/Common_Platform.wxi
index 20cf8b86..ffaa7114 100644
--- a/src/wixlib/Common_Platform.wxi
+++ b/src/wixlib/Common_Platform.wxi
@@ -5,12 +5,12 @@
   <?include caSuffix.wxi ?>
     <Fragment>
     <!-- print EULA functionality -->
-        <CustomAction Id="WixUIPrintEula$(var.Suffix)" BinaryKey="WixUIWixca$(var.Suffix)" DllEntry="PrintEula" Return="ignore" Execute="immediate" />
+        <CustomAction Id="WixUIPrintEula$(var.Suffix)" DllEntry="PrintEula" Return="ignore" Execute="immediate" BinaryRef="WixUIWixca$(var.Suffix)" />
     </Fragment>
 
     <Fragment>
     <!-- Validate install directory -->
-        <CustomAction Id="WixUIValidatePath$(var.Suffix)" BinaryKey="WixUIWixca$(var.Suffix)" DllEntry="ValidatePath" Return="ignore" Execute="immediate" />
+        <CustomAction Id="WixUIValidatePath$(var.Suffix)" DllEntry="ValidatePath" Return="ignore" Execute="immediate" BinaryRef="WixUIWixca$(var.Suffix)" />
     </Fragment>
 
     <Fragment>
diff --git a/src/wixlib/ui.wixproj b/src/wixlib/ui.wixproj
index bf61e4ff..d2421be2 100644
--- a/src/wixlib/ui.wixproj
+++ b/src/wixlib/ui.wixproj
@@ -23,7 +23,6 @@
   <ItemGroup>
     <BindInputPaths Include="$(OutputPath)Win32" BindName='x86' />
     <BindInputPaths Include="$(OutputPath)x64" BindName='x64' />
-    <BindInputPaths Include="$(OutputPath)arm" BindName='arm' />
     <BindInputPaths Include="$(OutputPath)arm64" BindName='arm64' />
   </ItemGroup>
 
-- 
cgit v1.2.3-55-g6feb