aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBob Arnson <bob@firegiant.com>2020-10-27 16:10:11 -0400
committerBob Arnson <bob@firegiant.com>2020-10-27 16:13:16 -0400
commit2d4736040f155a0874d8c565540b64f7b0df2e49 (patch)
tree1b1d9fce267733a8ac13ed86ad5c2d0eba86b18c /src
parentf40f13e06e72b88e7d9602aa64494238a697d1a7 (diff)
downloadwix-2d4736040f155a0874d8c565540b64f7b0df2e49.tar.gz
wix-2d4736040f155a0874d8c565540b64f7b0df2e49.tar.bz2
wix-2d4736040f155a0874d8c565540b64f7b0df2e49.zip
Update project for Package/SummaryInformation change (and others).
Diffstat (limited to 'src')
-rw-r--r--src/test/WixToolsetTest.Msmq/TestData/UsingMessageQueue/Package.wxs11
-rw-r--r--src/wixlib/MsmqExtension.wxs25
-rw-r--r--src/wixlib/caerr.wxi2
3 files changed, 18 insertions, 20 deletions
diff --git a/src/test/WixToolsetTest.Msmq/TestData/UsingMessageQueue/Package.wxs b/src/test/WixToolsetTest.Msmq/TestData/UsingMessageQueue/Package.wxs
index 68ff98fd..44820bdd 100644
--- a/src/test/WixToolsetTest.Msmq/TestData/UsingMessageQueue/Package.wxs
+++ b/src/test/WixToolsetTest.Msmq/TestData/UsingMessageQueue/Package.wxs
@@ -1,16 +1,15 @@
1<?xml version="1.0" encoding="utf-8"?> 1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
2<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 2 <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" InstallerVersion="200">
3 <Product Id="*" Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a"> 3
4 <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
5 4
6 <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" /> 5 <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
7 <MediaTemplate /> 6
8 7
9 <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)"> 8 <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
10 <ComponentGroupRef Id="ProductComponents" /> 9 <ComponentGroupRef Id="ProductComponents" />
11 </Feature> 10 </Feature>
12 11
13 </Product> 12 </Package>
14 13
15 <Fragment> 14 <Fragment>
16 <Directory Id="TARGETDIR" Name="SourceDir"> 15 <Directory Id="TARGETDIR" Name="SourceDir">
diff --git a/src/wixlib/MsmqExtension.wxs b/src/wixlib/MsmqExtension.wxs
index eecdb22e..86239545 100644
--- a/src/wixlib/MsmqExtension.wxs
+++ b/src/wixlib/MsmqExtension.wxs
@@ -1,5 +1,4 @@
1<?xml version="1.0" encoding="utf-8"?> 1<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3 2
4 3
5<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -7,24 +6,24 @@
7 6
8 <Fragment> 7 <Fragment>
9 <UI> 8 <UI>
10 <ProgressText Action="MessageQueuingExecuteInstall" Template="!(loc.MessageQueuingExecuteInstallTemplate)">!(loc.MessageQueuingExecuteInstall)</ProgressText> 9 <ProgressText Action="MessageQueuingExecuteInstall" Template="!(loc.MessageQueuingExecuteInstallTemplate)" Message="!(loc.MessageQueuingExecuteInstall)" />
11 <ProgressText Action="MessageQueuingExecuteUninstall" Template="!(loc.MessageQueuingExecuteUninstallTemplate)">!(loc.MessageQueuingExecuteUninstall)</ProgressText> 10 <ProgressText Action="MessageQueuingExecuteUninstall" Template="!(loc.MessageQueuingExecuteUninstallTemplate)" Message="!(loc.MessageQueuingExecuteUninstall)" />
12 </UI> 11 </UI>
13 12
14 <CustomAction Id="MessageQueuingInstall" BinaryKey="MsmqCA" DllEntry="MessageQueuingInstall" Execute="immediate" Return="check" SuppressModularization="yes"/> 13 <CustomAction Id="MessageQueuingInstall" DllEntry="MessageQueuingInstall" Execute="immediate" Return="check" SuppressModularization="yes" BinaryRef="MsmqCA" />
15 <CustomAction Id="MessageQueuingUninstall" BinaryKey="MsmqCA" DllEntry="MessageQueuingUninstall" Execute="immediate" Return="check" SuppressModularization="yes"/> 14 <CustomAction Id="MessageQueuingUninstall" DllEntry="MessageQueuingUninstall" Execute="immediate" Return="check" SuppressModularization="yes" BinaryRef="MsmqCA" />
16 <CustomAction Id="MessageQueuingExecuteInstall" BinaryKey="MsmqCA" DllEntry="MessageQueuingExecuteInstall" Execute="deferred" Return="check" Impersonate="no" SuppressModularization="yes"/> 15 <CustomAction Id="MessageQueuingExecuteInstall" DllEntry="MessageQueuingExecuteInstall" Execute="deferred" Return="check" Impersonate="no" SuppressModularization="yes" BinaryRef="MsmqCA" />
17 <CustomAction Id="MessageQueuingRollbackInstall" BinaryKey="MsmqCA" DllEntry="MessageQueuingRollbackInstall" Execute="rollback" Return="check" Impersonate="no" SuppressModularization="yes"/> 16 <CustomAction Id="MessageQueuingRollbackInstall" DllEntry="MessageQueuingRollbackInstall" Execute="rollback" Return="check" Impersonate="no" SuppressModularization="yes" BinaryRef="MsmqCA" />
18 <CustomAction Id="MessageQueuingExecuteUninstall" BinaryKey="MsmqCA" DllEntry="MessageQueuingExecuteUninstall" Execute="deferred" Return="check" Impersonate="no" SuppressModularization="yes"/> 17 <CustomAction Id="MessageQueuingExecuteUninstall" DllEntry="MessageQueuingExecuteUninstall" Execute="deferred" Return="check" Impersonate="no" SuppressModularization="yes" BinaryRef="MsmqCA" />
19 <CustomAction Id="MessageQueuingRollbackUninstall" BinaryKey="MsmqCA" DllEntry="MessageQueuingRollbackUninstall" Execute="rollback" Return="check" Impersonate="no" SuppressModularization="yes"/> 18 <CustomAction Id="MessageQueuingRollbackUninstall" DllEntry="MessageQueuingRollbackUninstall" Execute="rollback" Return="check" Impersonate="no" SuppressModularization="yes" BinaryRef="MsmqCA" />
20 19
21 <InstallExecuteSequence> 20 <InstallExecuteSequence>
22 <Custom Action="MessageQueuingUninstall" After="DeleteServices" Overridable="yes">VersionNT >= 500</Custom> 21 <Custom Action="MessageQueuingUninstall" After="DeleteServices" Overridable="yes" Condition="VersionNT &gt;= 500" />
23 <Custom Action="MessageQueuingInstall" Before="InstallServices" Overridable="yes">VersionNT >= 500</Custom> 22 <Custom Action="MessageQueuingInstall" Before="InstallServices" Overridable="yes" Condition="VersionNT &gt;= 500" />
24 </InstallExecuteSequence> 23 </InstallExecuteSequence>
25 </Fragment> 24 </Fragment>
26 25
27 <Fragment> 26 <Fragment>
28 <Binary Id="MsmqCA" SourceFile="msmqca.dll"/> 27 <Binary Id="MsmqCA" SourceFile="msmqca.dll" />
29 </Fragment> 28 </Fragment>
30</Wix> 29</Wix>
diff --git a/src/wixlib/caerr.wxi b/src/wixlib/caerr.wxi
index 141942f2..ff7ec121 100644
--- a/src/wixlib/caerr.wxi
+++ b/src/wixlib/caerr.wxi
@@ -1,4 +1,4 @@
1<Include> 1<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
2 <?define msierrSecureObjectsFailedCreateSD = 25520?> 2 <?define msierrSecureObjectsFailedCreateSD = 25520?>
3 <?define msierrSecureObjectsFailedSet = 25521?> 3 <?define msierrSecureObjectsFailedSet = 25521?>
4 <?define msierrSecureObjectsUnknownType = 25522?> 4 <?define msierrSecureObjectsUnknownType = 25522?>
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-22 01:34:05 +0000