Remove use of inner text conversions for Util.wixext
Also, convert all test code to modern expectation
Rob Mensching committed
Jun 26, 2020 at 14:55 UTC
cc20def99bbd0b28f19d90aee50d67f674738505
18 files changed
+121
-168
src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs
+1
-3
@@ -1,6 +1,4 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
3
- xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
1
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
2
<Bundle Name="!(loc.BundleName)" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
3
<BootstrapperApplication SourceFile="fakeba.dll" />
4
src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.wxs
+2
-4
@@ -1,7 +1,5 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
3
- xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
4
- <Product Id="*" Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
1
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
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" />
4
5
<MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
src/test/WixToolsetTest.Util/TestData/CloseApplication/PackageComponents.wxs
+1
-3
@@ -1,6 +1,4 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
3
- xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
1
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
2
<Fragment>
3
<ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
4
<Component>
src/test/WixToolsetTest.Util/TestData/EventManifest/Package.wxs
+2
-4
@@ -1,7 +1,5 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
3
- xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
4
- <Product Id="*" Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
1
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
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" />
4
5
<MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
src/test/WixToolsetTest.Util/TestData/EventManifest/PackageComponents.wxs
+1
-3
@@ -1,6 +1,4 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
3
- xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
1
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
2
<Fragment>
3
<ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
4
<Component>
src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.wxs
+2
-4
@@ -1,7 +1,5 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
3
- xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
4
- <Product Id="*" Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
1
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
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" />
4
5
<MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
src/test/WixToolsetTest.Util/TestData/InternetShortcut/PackageComponents.wxs
+1
-3
@@ -1,6 +1,4 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
3
- xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
1
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
2
<Fragment>
3
<ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
4
<Component>
src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.wxs
+2
-4
@@ -1,7 +1,5 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
3
- xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
4
- <Product Id="*" Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
1
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
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" />
4
5
<MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
src/test/WixToolsetTest.Util/TestData/PermissionEx/PackageComponents.wxs
+1
-3
@@ -1,6 +1,4 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
3
- xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
1
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
2
<Fragment>
3
<ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
4
<Component>
src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.wxs
+16
-18
@@ -1,22 +1,20 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
3
- <Product Id="*" Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
4
- <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
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" />
4
6
- <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
7
- <MediaTemplate />
5
+ <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
6
+ <MediaTemplate />
7
9
- <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
10
- <ComponentGroupRef Id="ProductComponents" />
11
- </Feature>
12
-
13
- </Product>
8
+ <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
9
+ <ComponentGroupRef Id="ProductComponents" />
10
+ </Feature>
11
+ </Product>
12
15
- <Fragment>
16
- <Directory Id="TARGETDIR" Name="SourceDir">
17
- <Directory Id="ProgramFilesFolder">
18
- <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
19
- </Directory>
20
- </Directory>
21
- </Fragment>
13
+ <Fragment>
14
+ <Directory Id="TARGETDIR" Name="SourceDir">
15
+ <Directory Id="ProgramFilesFolder">
16
+ <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
17
+ </Directory>
18
+ </Directory>
19
+ </Fragment>
20
</Wix>
src/test/WixToolsetTest.Util/TestData/UsingFileShare/PackageComponents.wxs
+12
-14
@@ -1,16 +1,14 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
3
- xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
4
- <Fragment>
5
- <util:User Id="Everyone" Name="Everyone" />
1
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
2
+ <Fragment>
3
+ <util:User Id="Everyone" Name="Everyone" />
4
7
- <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
8
- <Component>
9
- <File Source="example.txt" />
10
- <util:FileShare Id="ExampleFileShare" Description="An example file share" Name="example">
11
- <util:FileSharePermission User="Everyone" Read="yes" />
12
- </util:FileShare>
13
- </Component>
14
- </ComponentGroup>
15
- </Fragment>
5
+ <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
6
+ <Component>
7
+ <File Source="example.txt" />
8
+ <util:FileShare Id="ExampleFileShare" Description="An example file share" Name="example">
9
+ <util:FileSharePermission User="Everyone" Read="yes" />
10
+ </util:FileShare>
11
+ </Component>
12
+ </ComponentGroup>
13
+ </Fragment>
14
</Wix>
src/wixext/UtilCompiler.cs
+3
-20
@@ -761,6 +761,9 @@ namespace WixToolset.Util
761
case "Id":
762
id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib);
763
break;
764
+ case "Condition":
765
+ condition = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
766
+ break;
767
case "Description":
768
description = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
769
break;
@@ -870,9 +873,6 @@ namespace WixToolset.Util
873
this.Messaging.Write(ErrorMessages.IllegalAttributeWithOtherAttribute(sourceLineNumbers, element.Name.LocalName, "TerminateProcess", "RebootPrompt", "yes"));
874
}
875
873
- // get the condition from the inner text of the element
874
- condition = this.ParseHelper.GetConditionInnerText(element);
875
-
876
this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element);
877
878
this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "CloseApplications", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64);
@@ -3606,23 +3606,6 @@ namespace WixToolset.Util
3606
this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, UtilSymbolDefinitions.XmlConfig, elementId);
3607
}
3608
3609
- var innerText = this.ParseHelper.GetTrimmedInnerText(element);
3610
- if (null != value)
3611
- {
3612
- // cannot specify both the value attribute and inner text
3613
- if (!String.IsNullOrEmpty(innerText))
3614
- {
3615
- this.Messaging.Write(ErrorMessages.IllegalAttributeWithInnerText(sourceLineNumbers, element.Name.LocalName, "Value"));
3616
- }
3617
- }
3618
- else // value attribute not specified
3619
- {
3620
- if (!String.IsNullOrEmpty(innerText))
3621
- {
3622
- value = innerText;
3623
- }
3624
- }
3625
-
3609
// find unexpected child elements
3610
foreach (var child in element.Elements())
3611
{
src/wixext/util.xsd
+29
-27
@@ -26,12 +26,6 @@
26
<xs:complexType>
27
<xs:simpleContent>
28
<xs:extension base="xs:string">
29
- <xs:annotation>
30
- <xs:documentation>
31
- Condition that determines if the application should be closed. Must be blank or evaluate to true
32
- for the application to be scheduled for closing.
33
- </xs:documentation>
34
- </xs:annotation>
29
<xs:attribute name="Id" type="xs:string">
30
<xs:annotation>
31
<xs:documentation>Identifier for the close application (primary key). If the Id is not specified, one will be generated.</xs:documentation>
@@ -42,6 +36,14 @@
36
<xs:documentation>Name of the exectuable to be closed. This should only be the file name.</xs:documentation>
37
</xs:annotation>
38
</xs:attribute>
39
+ <xs:attribute name="Condition" type="xs:string">
40
+ <xs:annotation>
41
+ <xs:documentation>
42
+ Condition that determines if the application should be closed. Must be blank or evaluate to true
43
+ for the application to be scheduled for closing.
44
+ </xs:documentation>
45
+ </xs:annotation>
46
+ </xs:attribute>
47
<xs:attribute name="Description" type="xs:string">
48
<xs:annotation>
49
<xs:documentation>Description to show if application is running and needs to be closed.</xs:documentation>
@@ -562,7 +564,7 @@
564
<xs:attribute name="Name" type="xs:string" use="required">
565
<xs:annotation>
566
<xs:documentation>
565
- The name of the shortcut file, which is visible to the user. (The .lnk
567
+ The name of the shortcut file, which is visible to the user. (The .lnk
568
extension is added automatically and by default, is not shown to the user.)
569
</xs:documentation>
570
</xs:annotation>
@@ -571,9 +573,9 @@
573
<xs:annotation>
574
<xs:documentation>
575
URL that should be opened when the user selects the shortcut. Windows
574
- opens the URL in the appropriate handler for the protocol specified
575
- in the URL. Note that this is a formatted field, so you can use
576
- [#fileId] syntax to refer to a file being installed (using the file:
576
+ opens the URL in the appropriate handler for the protocol specified
577
+ in the URL. Note that this is a formatted field, so you can use
578
+ [#fileId] syntax to refer to a file being installed (using the file:
579
protocol).
580
</xs:documentation>
581
</xs:annotation>
@@ -958,11 +960,11 @@
960
<xse:remarks>
961
<html:p>The custom action that implements RemoveFolderEx does so by writing temporary rows to the RemoveFile table
962
for each subfolder of the root folder you specify. Because it might dramatically affect Windows Installer's
961
- <html:a href="http://msdn.microsoft.com/en-us/library/aa368593.aspx">File Costing</html:a>,
963
+ <html:a href="http://msdn.microsoft.com/en-us/library/aa368593.aspx">File Costing</html:a>,
964
the temporary rows must be written before the CostInitialize standard action. Unfortunately, MSI doesn't
965
create properties for the Directory hierarchy in your package until later, in the CostFinalize action.</html:p>
966
<html:p>An easy workaround for a typical use case of removing a folder during uninstall is to write the directory
965
- path to the registry and to load it during uninstall. See
967
+ path to the registry and to load it during uninstall. See
968
<html:a href="http://robmensching.com/blog/posts/2010/5/2/the-wix-toolsets-remember-property-pattern">The WiX toolset's "Remember Property" pattern</html:a>
969
for an example.</html:p>
970
<html:p>If you use custom actions to set properties, ensure that they are scheduled before the WixRemoveFoldersEx custom action.</html:p>
@@ -970,8 +972,8 @@
972
</xs:appinfo>
973
<xs:documentation>
974
Remove a folder and all contained files and folders if the parent component is selected for installation or removal.
973
- The folder must be specified in the Property attribute as the name of a property that will have a value that resolves
974
- to the full path of the folder before the CostInitialize action. Note that Directory ids cannot be used.
975
+ The folder must be specified in the Property attribute as the name of a property that will have a value that resolves
976
+ to the full path of the folder before the CostInitialize action. Note that Directory ids cannot be used.
977
For more details, see the Remarks.
978
</xs:documentation>
979
</xs:annotation>
@@ -987,8 +989,8 @@
989
<xs:documentation>
990
The id of a property that resolves to the full path of the source directory. The property does not have
991
to exist in the installer database at creation time; it could be created at installation time by a custom
990
- action, on the command line, etc. The property value can contain environment variables surrounded by
991
- percent signs such as from a REG_EXPAND_SZ registry value; environment variables will be expanded before
992
+ action, on the command line, etc. The property value can contain environment variables surrounded by
993
+ percent signs such as from a REG_EXPAND_SZ registry value; environment variables will be expanded before
994
being evaluated for a full path.
995
</xs:documentation>
996
</xs:annotation>
@@ -1390,8 +1392,8 @@
1392
<xs:element name="XmlFile">
1393
<xs:annotation>
1394
<xs:documentation>
1393
- Adds or removes .xml file entries. If you use the XmlFile element you must reference WixUtilExtension.dll as it contains the XmlFile custom actions.
1394
- </xs:documentation>
1395
+ Adds or removes .xml file entries. If you use the XmlFile element you must reference WixUtilExtension.dll as it contains the XmlFile custom actions.
1396
+ </xs:documentation>
1397
<xs:appinfo>
1398
<xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Component" />
1399
</xs:appinfo>
@@ -1420,8 +1422,8 @@
1422
<xs:attribute name="Value" type="xs:string">
1423
<xs:annotation>
1424
<xs:documentation>
1423
- The value to be written. See the <html:a href="http://msdn.microsoft.com/library/aa368609(VS.85).aspx" target="_blank">Formatted topic</html:a> for information how to escape square brackets in the value.
1424
- </xs:documentation>
1425
+ The value to be written. See the <html:a href="http://msdn.microsoft.com/library/aa368609(VS.85).aspx" target="_blank">Formatted topic</html:a> for information how to escape square brackets in the value.
1426
+ </xs:documentation>
1427
</xs:annotation>
1428
</xs:attribute>
1429
<xs:attribute name="Action" use="required">
@@ -1471,8 +1473,8 @@
1473
<xs:attribute name="SelectionLanguage">
1474
<xs:annotation>
1475
<xs:documentation>
1474
- Specify whether the DOM object should use XPath language or the old XSLPattern language (default) as the query language.
1475
- </xs:documentation>
1476
+ Specify whether the DOM object should use XPath language or the old XSLPattern language (default) as the query language.
1477
+ </xs:documentation>
1478
</xs:annotation>
1479
<xs:simpleType>
1480
<xs:restriction base="xs:NMTOKEN">
@@ -1486,13 +1488,13 @@
1488
<xs:element name="XmlConfig">
1489
<xs:annotation>
1490
<xs:documentation>
1489
- Adds or removes .xml file entries. If you use the XmlConfig element you must reference WixUtilExtension.dll as it contains the XmlConfig custom actions.
1490
- </xs:documentation>
1491
+ Adds or removes .xml file entries. If you use the XmlConfig element you must reference WixUtilExtension.dll as it contains the XmlConfig custom actions.
1492
+ </xs:documentation>
1493
<xs:appinfo>
1494
<xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Component" />
1495
</xs:appinfo>
1496
</xs:annotation>
1495
- <xs:complexType mixed="true">
1497
+ <xs:complexType>
1498
<xs:sequence>
1499
<xs:element ref="XmlConfig" minOccurs="0" maxOccurs="unbounded" />
1500
</xs:sequence>
@@ -1559,8 +1561,8 @@
1561
<xs:attribute name="Value" type="xs:string">
1562
<xs:annotation>
1563
<xs:documentation>
1562
- The value to be written. See the <html:a href="http://msdn.microsoft.com/library/aa368609(VS.85).aspx" target="_blank">Formatted topic</html:a> for information how to escape square brackets in the value.
1563
- </xs:documentation>
1564
+ The value to be written. See the <html:a href="https://docs.microsoft.com/en-us/windows/win32/msi/formatted" target="_blank">Formatted topic</html:a> for information how to escape square brackets in the value.
1565
+ </xs:documentation>
1566
</xs:annotation>
1567
</xs:attribute>
1568
<xs:attribute name="VerifyPath" type="xs:string">
src/wixlib/UtilExtension.wxs
+44
-50
@@ -1,5 +1,4 @@
1
-<?xml version="1.0" encoding="UTF-8"?>
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. -->
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
3
4
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -8,71 +7,69 @@
7
8
<Fragment>
9
<UI Id="ConfigureUsersErrorText">
11
- <Error Id="$(var.msierrUSRFailedUserCreate)">!(loc.msierrUSRFailedUserCreate)</Error>
12
- <Error Id="$(var.msierrUSRFailedUserCreatePswd)">!(loc.msierrUSRFailedUserCreatePswd)</Error>
13
- <Error Id="$(var.msierrUSRFailedUserGroupAdd)">!(loc.msierrUSRFailedUserGroupAdd)</Error>
14
- <Error Id="$(var.msierrUSRFailedGrantLogonAsService)">Failed to grant 'logon as service' rights to user. ([2] [3] [4] [5])</Error>
15
- <Error Id="$(var.msierrUSRFailedUserCreateExists)">!(loc.msierrUSRFailedUserCreateExists)</Error>
10
+ <Error Id="$(var.msierrUSRFailedUserCreate)" Message="!(loc.msierrUSRFailedUserCreate)" />
11
+ <Error Id="$(var.msierrUSRFailedUserCreatePswd)" Message="!(loc.msierrUSRFailedUserCreatePswd)" />
12
+ <Error Id="$(var.msierrUSRFailedUserGroupAdd)" Message="!(loc.msierrUSRFailedUserGroupAdd)" />
13
+ <Error Id="$(var.msierrUSRFailedGrantLogonAsService)" Message="Failed to grant 'logon as service' rights to user. ([2] [3] [4] [5])" />
14
+ <Error Id="$(var.msierrUSRFailedUserCreateExists)" Message="!(loc.msierrUSRFailedUserCreateExists)" />
15
</UI>
16
</Fragment>
17
18
<Fragment>
19
<UI Id="ConfigureSmbErrorsText">
21
- <Error Id="$(var.msierrSMBFailedCreate)">!(loc.msierrSMBFailedCreate)</Error>
22
- <Error Id="$(var.msierrSMBFailedDrop)">!(loc.msierrSMBFailedDrop)</Error>
20
+ <Error Id="$(var.msierrSMBFailedCreate)" Message="!(loc.msierrSMBFailedCreate)" />
21
+ <Error Id="$(var.msierrSMBFailedDrop)" Message="!(loc.msierrSMBFailedDrop)" />
22
</UI>
23
</Fragment>
24
25
<Fragment>
27
- <UI Id="PerCounterDataErrorsText">
28
- <Error Id="$(var.msierrInstallPerfCounterData)">!(loc.msierrInstallPerfCounterData)</Error>
29
- <Error Id="$(var.msierrUninstallPerfCounterData)">!(loc.msierrUninstallPerfCounterData)</Error>
26
+ <UI Id="PerCounterDataErrorsText">
27
+ <Error Id="$(var.msierrInstallPerfCounterData)" Message="!(loc.msierrInstallPerfCounterData)" />
28
+ <Error Id="$(var.msierrUninstallPerfCounterData)" Message="!(loc.msierrUninstallPerfCounterData)" />
29
</UI>
30
</Fragment>
31
32
<Fragment>
34
- <UI Id="ConfigurePerfmonErrorsText">
35
- <Error Id="$(var.msierrPERFMONFailedRegisterDLL)">!(loc.msierrPERFMONFailedRegisterDLL)</Error>
36
- <Error Id="$(var.msierrPERFMONFailedUnregisterDLL)">!(loc.msierrPERFMONFailedUnregisterDLL)</Error>
33
+ <UI Id="ConfigurePerfmonErrorsText">
34
+ <Error Id="$(var.msierrPERFMONFailedRegisterDLL)" Message="!(loc.msierrPERFMONFailedRegisterDLL)" />
35
+ <Error Id="$(var.msierrPERFMONFailedUnregisterDLL)" Message="!(loc.msierrPERFMONFailedUnregisterDLL)" />
36
</UI>
37
</Fragment>
38
39
<Fragment>
40
<UI Id="SecureObjectsErrors">
42
- <Error Id="$(var.msierrSecureObjectsFailedCreateSD)">!(loc.msierrSecureObjectsFailedCreateSD)</Error>
43
- <Error Id="$(var.msierrSecureObjectsFailedSet)">!(loc.msierrSecureObjectsFailedSet)</Error>
44
- <Error Id="$(var.msierrSecureObjectsUnknownType)">!(loc.msierrSecureObjectsUnknownType)</Error>
41
+ <Error Id="$(var.msierrSecureObjectsFailedCreateSD)" Message="!(loc.msierrSecureObjectsFailedCreateSD)" />
42
+ <Error Id="$(var.msierrSecureObjectsFailedSet)" Message="!(loc.msierrSecureObjectsFailedSet)" />
43
+ <Error Id="$(var.msierrSecureObjectsUnknownType)" Message="!(loc.msierrSecureObjectsUnknownType)" />
44
</UI>
45
</Fragment>
46
47
<Fragment>
49
- <UI Id="XmlFileErrorsText">
50
- <Error Id="$(var.msierrXmlFileFailedRead)">!(loc.msierrXmlFileFailedRead)</Error>
51
- <Error Id="$(var.msierrXmlFileFailedOpen)">!(loc.msierrXmlFileFailedOpen)</Error>
52
- <Error Id="$(var.msierrXmlFileFailedSelect)">!(loc.msierrXmlFileFailedSelect)</Error>
53
- <Error Id="$(var.msierrXmlFileFailedSave)">!(loc.msierrXmlFileFailedSave)</Error>
48
+ <UI Id="XmlFileErrorsText">
49
+ <Error Id="$(var.msierrXmlFileFailedRead)" Message="!(loc.msierrXmlFileFailedRead)" />
50
+ <Error Id="$(var.msierrXmlFileFailedOpen)" Message="!(loc.msierrXmlFileFailedOpen)" />
51
+ <Error Id="$(var.msierrXmlFileFailedSelect)" Message="!(loc.msierrXmlFileFailedSelect)" />
52
+ <Error Id="$(var.msierrXmlFileFailedSave)" Message="!(loc.msierrXmlFileFailedSave)" />
53
</UI>
54
</Fragment>
55
56
<Fragment>
58
- <UI Id="XmlConfigErrorsText">
59
- <Error Id="$(var.msierrXmlConfigFailedRead)">!(loc.msierrXmlConfigFailedRead)</Error>
60
- <Error Id="$(var.msierrXmlConfigFailedOpen)">!(loc.msierrXmlConfigFailedOpen)</Error>
61
- <Error Id="$(var.msierrXmlConfigFailedSelect)">!(loc.msierrXmlConfigFailedSelect)</Error>
62
- <Error Id="$(var.msierrXmlConfigFailedSave)">!(loc.msierrXmlConfigFailedSave)</Error>
57
+ <UI Id="XmlConfigErrorsText">
58
+ <Error Id="$(var.msierrXmlConfigFailedRead)" Message="!(loc.msierrXmlConfigFailedRead)" />
59
+ <Error Id="$(var.msierrXmlConfigFailedOpen)" Message="!(loc.msierrXmlConfigFailedOpen)" />
60
+ <Error Id="$(var.msierrXmlConfigFailedSelect)" Message="!(loc.msierrXmlConfigFailedSelect)" />
61
+ <Error Id="$(var.msierrXmlConfigFailedSave)" Message="!(loc.msierrXmlConfigFailedSave)" />
62
</UI>
63
</Fragment>
64
65
<!-- WiX OS-detection properties and custom action -->
66
<Fragment>
67
<CustomAction Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="WixQueryOsInfo" Execute="firstSequence" Return="check" SuppressModularization="yes" />
69
-
68
<InstallExecuteSequence>
71
- <Custom Action="$(var.Prefix)QueryOsInfo$(var.Suffix)" After="AppSearch" Overridable="yes">VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3)</Custom>
69
+ <Custom Action="$(var.Prefix)QueryOsInfo$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3)" />
70
</InstallExecuteSequence>
73
-
71
<InstallUISequence>
75
- <Custom Action="$(var.Prefix)QueryOsInfo$(var.Suffix)" After="AppSearch" Overridable="yes">VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3)</Custom>
72
+ <Custom Action="$(var.Prefix)QueryOsInfo$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3)" />
73
</InstallUISequence>
74
</Fragment>
75
@@ -159,13 +156,11 @@
156
157
<Fragment>
158
<CustomAction Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="WixQueryOsDirs" Execute="firstSequence" Return="check" SuppressModularization="yes" />
162
-
159
<InstallExecuteSequence>
164
- <Custom Action="$(var.Prefix)QueryOsDirs$(var.Suffix)" After="AppSearch" Overridable="yes">VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3)</Custom>
160
+ <Custom Action="$(var.Prefix)QueryOsDirs$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3)" />
161
</InstallExecuteSequence>
166
-
162
<InstallUISequence>
168
- <Custom Action="$(var.Prefix)QueryOsDirs$(var.Suffix)" After="AppSearch" Overridable="yes">VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3)</Custom>
163
+ <Custom Action="$(var.Prefix)QueryOsDirs$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3)" />
164
</InstallUISequence>
165
</Fragment>
166
@@ -266,14 +261,13 @@
261
<CustomAction Id="$(var.Prefix)QueryOsWellKnownSID$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="WixQueryOsWellKnownSID" Execute="firstSequence" Return="check" SuppressModularization="yes" />
262
263
<InstallExecuteSequence>
269
- <Custom Action="$(var.Prefix)QueryOsWellKnownSID$(var.Suffix)" After="AppSearch" Overridable="yes">VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3)</Custom>
264
+ <Custom Action="$(var.Prefix)QueryOsWellKnownSID$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3)" />
265
</InstallExecuteSequence>
266
267
<InstallUISequence>
273
- <Custom Action="$(var.Prefix)QueryOsWellKnownSID$(var.Suffix)" After="AppSearch" Overridable="yes">VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3)</Custom>
268
+ <Custom Action="$(var.Prefix)QueryOsWellKnownSID$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3)" />
269
</InstallUISequence>
270
</Fragment>
276
-
271
<Fragment>
272
<Property Id="WIX_ACCOUNT_LOCALSYSTEM" Secure="yes" />
273
<CustomActionRef Id="$(var.Prefix)QueryOsWellKnownSID$(var.Suffix)" />
@@ -305,25 +299,25 @@
299
</Fragment>
300
301
<Fragment>
308
- <CustomAction Id="$(var.Prefix)QueryOsDriverInfo$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="WixQueryOsDriverInfo" Execute="firstSequence" Return="check" SuppressModularization="yes" />
302
+ <CustomAction Id="$(var.Prefix)QueryOsDriverInfo$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="WixQueryOsDriverInfo" Execute="firstSequence" Return="check" SuppressModularization="yes" />
303
310
- <InstallExecuteSequence>
311
- <Custom Action="$(var.Prefix)QueryOsDriverInfo$(var.Suffix)" After="AppSearch" Overridable="yes">VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3)</Custom>
312
- </InstallExecuteSequence>
304
+ <InstallExecuteSequence>
305
+ <Custom Action="$(var.Prefix)QueryOsDriverInfo$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3)" />
306
+ </InstallExecuteSequence>
307
314
- <InstallUISequence>
315
- <Custom Action="$(var.Prefix)QueryOsDriverInfo$(var.Suffix)" After="AppSearch" Overridable="yes">VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3)</Custom>
316
- </InstallUISequence>
308
+ <InstallUISequence>
309
+ <Custom Action="$(var.Prefix)QueryOsDriverInfo$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3)" />
310
+ </InstallUISequence>
311
</Fragment>
312
313
<Fragment>
320
- <Property Id="WIX_WDDM_DRIVER_PRESENT" Secure="yes" />
321
- <CustomActionRef Id="$(var.Prefix)QueryOsDriverInfo$(var.Suffix)" />
314
+ <Property Id="WIX_WDDM_DRIVER_PRESENT" Secure="yes" />
315
+ <CustomActionRef Id="$(var.Prefix)QueryOsDriverInfo$(var.Suffix)" />
316
</Fragment>
317
318
<Fragment>
325
- <Property Id="WIX_DWM_COMPOSITION_ENABLED" Secure="yes" />
326
- <CustomActionRef Id="$(var.Prefix)QueryOsDriverInfo$(var.Suffix)" />
319
+ <Property Id="WIX_DWM_COMPOSITION_ENABLED" Secure="yes" />
320
+ <CustomActionRef Id="$(var.Prefix)QueryOsDriverInfo$(var.Suffix)" />
321
</Fragment>
322
323
<Fragment>
src/wixlib/UtilExtension_arm.wxs
+1
-2
@@ -1,5 +1,4 @@
1
-<?xml version="1.0"?>
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. -->
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
3
4
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
src/wixlib/UtilExtension_arm64.wxs
+1
-2
@@ -1,5 +1,4 @@
1
-<?xml version="1.0"?>
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. -->
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
3
4
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
src/wixlib/UtilExtension_x64.wxs
+1
-2
@@ -1,5 +1,4 @@
1
-<?xml version="1.0"?>
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. -->
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
3
4
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
src/wixlib/UtilExtension_x86.wxs
+1
-2
@@ -1,5 +1,4 @@
1
-<?xml version="1.0"?>
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. -->
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
3
4
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">