aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2020-06-22 23:12:04 -0700
committerRob Mensching <rob@firegiant.com>2020-06-23 02:10:31 -0700
commit7ed30050420916896f78841e35b80bb152bd38d1 (patch)
treea630bc5712da7571cf9a9b11a6e10d7caa48afbb /src
parent000b9b6bd037a5ddbf4743629fba43bd0c5b16ce (diff)
downloadwix-7ed30050420916896f78841e35b80bb152bd38d1.tar.gz
wix-7ed30050420916896f78841e35b80bb152bd38d1.tar.bz2
wix-7ed30050420916896f78841e35b80bb152bd38d1.zip
Move PermissionEx\Condition inner text to Condition attribute
Diffstat (limited to 'src')
-rw-r--r--src/WixToolset.Core/Compiler_2.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/WixToolset.Core/Compiler_2.cs b/src/WixToolset.Core/Compiler_2.cs
index 234c1ebc..df4c037d 100644
--- a/src/WixToolset.Core/Compiler_2.cs
+++ b/src/WixToolset.Core/Compiler_2.cs
@@ -1208,6 +1208,9 @@ namespace WixToolset.Core
1208 case "Id": 1208 case "Id":
1209 id = this.Core.GetAttributeIdentifier(sourceLineNumbers, attrib); 1209 id = this.Core.GetAttributeIdentifier(sourceLineNumbers, attrib);
1210 break; 1210 break;
1211 case "Condition":
1212 condition = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
1213 break;
1211 case "Sddl": 1214 case "Sddl":
1212 sddl = this.Core.GetAttributeValue(sourceLineNumbers, attrib); 1215 sddl = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
1213 break; 1216 break;
@@ -1264,7 +1267,7 @@ namespace WixToolset.Core
1264 { 1267 {
1265 LockObject = objectId, 1268 LockObject = objectId,
1266 Table = tableName, 1269 Table = tableName,
1267 SDDLText =sddl, 1270 SDDLText = sddl,
1268 Condition = condition 1271 Condition = condition
1269 }); 1272 });
1270 } 1273 }