aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBob Arnson <bob@firegiant.com>2020-10-27 16:18:50 -0400
committerBob Arnson <bob@firegiant.com>2020-10-27 16:21:26 -0400
commit918dfb72bedefc753a85421d961546162d032ac5 (patch)
tree1ed47ec2d3feec0605795d99bcaff5d3d5f5f98f /src
parenta261b7b528444f6f7e6e8277a4533dc54a8c4f0b (diff)
downloadwix-918dfb72bedefc753a85421d961546162d032ac5.tar.gz
wix-918dfb72bedefc753a85421d961546162d032ac5.tar.bz2
wix-918dfb72bedefc753a85421d961546162d032ac5.zip
Update project for Package/SummaryInformation change (and others).
Diffstat (limited to 'src')
-rw-r--r--src/test/WixToolsetTest.UI/TestData/WixUI_Advanced/Package.wxs12
-rw-r--r--src/test/WixToolsetTest.UI/TestData/WixUI_FeatureTree/Package.wxs8
-rw-r--r--src/test/WixToolsetTest.UI/TestData/WixUI_InstallDir/Package.wxs8
-rw-r--r--src/test/WixToolsetTest.UI/TestData/WixUI_Minimal/Package.wxs8
-rw-r--r--src/test/WixToolsetTest.UI/TestData/WixUI_Mondo/Package.wxs8
-rw-r--r--src/wixlib/Common_Platform.wxi4
-rw-r--r--src/wixlib/ui.wixproj1
7 files changed, 24 insertions, 25 deletions
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 @@
1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
2 <Product Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a"> 2 <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" InstallerVersion="200">
3 <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" /> 3
4 4
5 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> 5 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
6 <MediaTemplate /> 6
7 7
8 <Feature Id="ProductFeature" Title="MsiPackage"> 8 <Feature Id="ProductFeature" Title="MsiPackage">
9 <ComponentGroupRef Id="ProductComponents" /> 9 <ComponentGroupRef Id="ProductComponents" />
@@ -16,9 +16,9 @@
16 </ComponentGroup> 16 </ComponentGroup>
17 17
18 <UIRef Id="WixUI_Advanced" /> 18 <UIRef Id="WixUI_Advanced" />
19 <Property Id="ApplicationFolderName" Value="MyProgram"/> 19 <Property Id="ApplicationFolderName" Value="MyProgram" />
20 <Property Id="WixAppFolder" Value="WixPerMachineFolder"/> 20 <Property Id="WixAppFolder" Value="WixPerMachineFolder" />
21 </Product> 21 </Package>
22 22
23 <Fragment> 23 <Fragment>
24 <Directory Id="TARGETDIR" Name="SourceDir"> 24 <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 @@
1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
2 <Product Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a"> 2 <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" InstallerVersion="200">
3 <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" /> 3
4 4
5 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> 5 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
6 <MediaTemplate /> 6
7 7
8 <Feature Id="ProductFeature" Title="MsiPackage"> 8 <Feature Id="ProductFeature" Title="MsiPackage">
9 <ComponentGroupRef Id="ProductComponents" /> 9 <ComponentGroupRef Id="ProductComponents" />
@@ -16,7 +16,7 @@
16 </ComponentGroup> 16 </ComponentGroup>
17 17
18 <UIRef Id="WixUI_FeatureTree" /> 18 <UIRef Id="WixUI_FeatureTree" />
19 </Product> 19 </Package>
20 20
21 <Fragment> 21 <Fragment>
22 <Directory Id="TARGETDIR" Name="SourceDir"> 22 <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 @@
1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
2 <Product Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a"> 2 <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" InstallerVersion="200">
3 <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" /> 3
4 4
5 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> 5 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
6 <MediaTemplate /> 6
7 7
8 <Feature Id="ProductFeature" Title="MsiPackage"> 8 <Feature Id="ProductFeature" Title="MsiPackage">
9 <ComponentGroupRef Id="ProductComponents" /> 9 <ComponentGroupRef Id="ProductComponents" />
@@ -16,7 +16,7 @@
16 </ComponentGroup> 16 </ComponentGroup>
17 17
18 <UIRef Id="WixUI_InstallDir" /> 18 <UIRef Id="WixUI_InstallDir" />
19 </Product> 19 </Package>
20 20
21 <Fragment> 21 <Fragment>
22 <Directory Id="TARGETDIR" Name="SourceDir"> 22 <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 @@
1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
2 <Product Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a"> 2 <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" InstallerVersion="200">
3 <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" /> 3
4 4
5 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> 5 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
6 <MediaTemplate /> 6
7 7
8 <Feature Id="ProductFeature" Title="MsiPackage"> 8 <Feature Id="ProductFeature" Title="MsiPackage">
9 <ComponentGroupRef Id="ProductComponents" /> 9 <ComponentGroupRef Id="ProductComponents" />
@@ -16,7 +16,7 @@
16 </ComponentGroup> 16 </ComponentGroup>
17 17
18 <UIRef Id="WixUI_Minimal" /> 18 <UIRef Id="WixUI_Minimal" />
19 </Product> 19 </Package>
20 20
21 <Fragment> 21 <Fragment>
22 <Directory Id="TARGETDIR" Name="SourceDir"> 22 <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 @@
1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
2 <Product Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a"> 2 <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" InstallerVersion="200">
3 <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" /> 3
4 4
5 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> 5 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
6 <MediaTemplate /> 6
7 7
8 <Feature Id="ProductFeature" Title="MsiPackage"> 8 <Feature Id="ProductFeature" Title="MsiPackage">
9 <ComponentGroupRef Id="ProductComponents" /> 9 <ComponentGroupRef Id="ProductComponents" />
@@ -16,7 +16,7 @@
16 </ComponentGroup> 16 </ComponentGroup>
17 17
18 <UIRef Id="WixUI_Mondo" /> 18 <UIRef Id="WixUI_Mondo" />
19 </Product> 19 </Package>
20 20
21 <Fragment> 21 <Fragment>
22 <Directory Id="TARGETDIR" Name="SourceDir"> 22 <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 @@
5 <?include caSuffix.wxi ?> 5 <?include caSuffix.wxi ?>
6 <Fragment> 6 <Fragment>
7 <!-- print EULA functionality --> 7 <!-- print EULA functionality -->
8 <CustomAction Id="WixUIPrintEula$(var.Suffix)" BinaryKey="WixUIWixca$(var.Suffix)" DllEntry="PrintEula" Return="ignore" Execute="immediate" /> 8 <CustomAction Id="WixUIPrintEula$(var.Suffix)" DllEntry="PrintEula" Return="ignore" Execute="immediate" BinaryRef="WixUIWixca$(var.Suffix)" />
9 </Fragment> 9 </Fragment>
10 10
11 <Fragment> 11 <Fragment>
12 <!-- Validate install directory --> 12 <!-- Validate install directory -->
13 <CustomAction Id="WixUIValidatePath$(var.Suffix)" BinaryKey="WixUIWixca$(var.Suffix)" DllEntry="ValidatePath" Return="ignore" Execute="immediate" /> 13 <CustomAction Id="WixUIValidatePath$(var.Suffix)" DllEntry="ValidatePath" Return="ignore" Execute="immediate" BinaryRef="WixUIWixca$(var.Suffix)" />
14 </Fragment> 14 </Fragment>
15 15
16 <Fragment> 16 <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 @@
23 <ItemGroup> 23 <ItemGroup>
24 <BindInputPaths Include="$(OutputPath)Win32" BindName='x86' /> 24 <BindInputPaths Include="$(OutputPath)Win32" BindName='x86' />
25 <BindInputPaths Include="$(OutputPath)x64" BindName='x64' /> 25 <BindInputPaths Include="$(OutputPath)x64" BindName='x64' />
26 <BindInputPaths Include="$(OutputPath)arm" BindName='arm' />
27 <BindInputPaths Include="$(OutputPath)arm64" BindName='arm64' /> 26 <BindInputPaths Include="$(OutputPath)arm64" BindName='arm64' />
28 </ItemGroup> 27 </ItemGroup>
29 28
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-24 06:09:28 +0000