Update project for Package/SummaryInformation change (and others).
Bob Arnson committed
Oct 27, 2020 at 16:18 UTC
918dfb72bedefc753a85421d961546162d032ac5
8 files changed
+25
-26
global.json
+1
-1
@@ -1,6 +1,6 @@
1
{
2
"msbuild-sdks": {
3
- "WixToolset.Sdk": "4.0.0-build-0149"
3
+ "WixToolset.Sdk": "4.0.0-build-0162"
4
},
5
"sdk": {
6
"allowPrerelease": false
src/test/WixToolsetTest.UI/TestData/WixUI_Advanced/Package.wxs
+6
-6
@@ -1,9 +1,9 @@
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">
3
- <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
2
+ <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" InstallerVersion="200">
3
+
4
5
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
6
- <MediaTemplate />
6
+
7
8
<Feature Id="ProductFeature" Title="MsiPackage">
9
<ComponentGroupRef Id="ProductComponents" />
@@ -16,9 +16,9 @@
16
</ComponentGroup>
17
18
<UIRef Id="WixUI_Advanced" />
19
- <Property Id="ApplicationFolderName" Value="MyProgram"/>
20
- <Property Id="WixAppFolder" Value="WixPerMachineFolder"/>
21
- </Product>
19
+ <Property Id="ApplicationFolderName" Value="MyProgram" />
20
+ <Property Id="WixAppFolder" Value="WixPerMachineFolder" />
21
+ </Package>
22
23
<Fragment>
24
<Directory Id="TARGETDIR" Name="SourceDir">
src/test/WixToolsetTest.UI/TestData/WixUI_FeatureTree/Package.wxs
+4
-4
@@ -1,9 +1,9 @@
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">
3
- <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
2
+ <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" InstallerVersion="200">
3
+
4
5
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
6
- <MediaTemplate />
6
+
7
8
<Feature Id="ProductFeature" Title="MsiPackage">
9
<ComponentGroupRef Id="ProductComponents" />
@@ -16,7 +16,7 @@
16
</ComponentGroup>
17
18
<UIRef Id="WixUI_FeatureTree" />
19
- </Product>
19
+ </Package>
20
21
<Fragment>
22
<Directory Id="TARGETDIR" Name="SourceDir">
src/test/WixToolsetTest.UI/TestData/WixUI_InstallDir/Package.wxs
+4
-4
@@ -1,9 +1,9 @@
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">
3
- <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
2
+ <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" InstallerVersion="200">
3
+
4
5
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
6
- <MediaTemplate />
6
+
7
8
<Feature Id="ProductFeature" Title="MsiPackage">
9
<ComponentGroupRef Id="ProductComponents" />
@@ -16,7 +16,7 @@
16
</ComponentGroup>
17
18
<UIRef Id="WixUI_InstallDir" />
19
- </Product>
19
+ </Package>
20
21
<Fragment>
22
<Directory Id="TARGETDIR" Name="SourceDir">
src/test/WixToolsetTest.UI/TestData/WixUI_Minimal/Package.wxs
+4
-4
@@ -1,9 +1,9 @@
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">
3
- <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
2
+ <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" InstallerVersion="200">
3
+
4
5
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
6
- <MediaTemplate />
6
+
7
8
<Feature Id="ProductFeature" Title="MsiPackage">
9
<ComponentGroupRef Id="ProductComponents" />
@@ -16,7 +16,7 @@
16
</ComponentGroup>
17
18
<UIRef Id="WixUI_Minimal" />
19
- </Product>
19
+ </Package>
20
21
<Fragment>
22
<Directory Id="TARGETDIR" Name="SourceDir">
src/test/WixToolsetTest.UI/TestData/WixUI_Mondo/Package.wxs
+4
-4
@@ -1,9 +1,9 @@
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">
3
- <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
2
+ <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" InstallerVersion="200">
3
+
4
5
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
6
- <MediaTemplate />
6
+
7
8
<Feature Id="ProductFeature" Title="MsiPackage">
9
<ComponentGroupRef Id="ProductComponents" />
@@ -16,7 +16,7 @@
16
</ComponentGroup>
17
18
<UIRef Id="WixUI_Mondo" />
19
- </Product>
19
+ </Package>
20
21
<Fragment>
22
<Directory Id="TARGETDIR" Name="SourceDir">
src/wixlib/Common_Platform.wxi
+2
-2
@@ -5,12 +5,12 @@
5
<?include caSuffix.wxi ?>
6
<Fragment>
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>
10
11
<Fragment>
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>
15
16
<Fragment>
src/wixlib/ui.wixproj
-1
@@ -23,7 +23,6 @@
23
<ItemGroup>
24
<BindInputPaths Include="$(OutputPath)Win32" BindName='x86' />
25
<BindInputPaths Include="$(OutputPath)x64" BindName='x64' />
26
- <BindInputPaths Include="$(OutputPath)arm" BindName='arm' />
26
<BindInputPaths Include="$(OutputPath)arm64" BindName='arm64' />
27
</ItemGroup>
28