aboutsummaryrefslogtreecommitdiff
path: root/src/ext/Util/wixext
diff options
context:
space:
mode:
Diffstat (limited to 'src/ext/Util/wixext')
-rw-r--r--src/ext/Util/wixext/UtilCompiler.cs9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/ext/Util/wixext/UtilCompiler.cs b/src/ext/Util/wixext/UtilCompiler.cs
index 919cc49b..1d11f37f 100644
--- a/src/ext/Util/wixext/UtilCompiler.cs
+++ b/src/ext/Util/wixext/UtilCompiler.cs
@@ -210,6 +210,7 @@ namespace WixToolset.Util
210 break; 210 break;
211 case "BroadcastEnvironmentChange": 211 case "BroadcastEnvironmentChange":
212 case "BroadcastSettingChange": 212 case "BroadcastSettingChange":
213 case "CancelWhenDeferred":
213 case "CheckRebootRequired": 214 case "CheckRebootRequired":
214 case "ExitEarlyWithSuccess": 215 case "ExitEarlyWithSuccess":
215 case "FailWhenDeferred": 216 case "FailWhenDeferred":
@@ -328,6 +329,7 @@ namespace WixToolset.Util
328 { 329 {
329 case "BroadcastEnvironmentChange": 330 case "BroadcastEnvironmentChange":
330 case "BroadcastSettingChange": 331 case "BroadcastSettingChange":
332 case "CancelWhenDeferred":
331 case "CheckRebootRequired": 333 case "CheckRebootRequired":
332 case "ExitEarlyWithSuccess": 334 case "ExitEarlyWithSuccess":
333 case "FailWhenDeferred": 335 case "FailWhenDeferred":
@@ -358,6 +360,7 @@ namespace WixToolset.Util
358 return; 360 return;
359 } 361 }
360 362
363 var prefix = "Wix4";
361 var customAction = element.Name.LocalName; 364 var customAction = element.Name.LocalName;
362 switch (element.Name.LocalName) 365 switch (element.Name.LocalName)
363 { 366 {
@@ -370,6 +373,10 @@ namespace WixToolset.Util
370 case "WaitForEventDeferred": 373 case "WaitForEventDeferred":
371 //default: customAction = element.Name.LocalName; 374 //default: customAction = element.Name.LocalName;
372 break; 375 break;
376 case "CancelWhenDeferred":
377 prefix = "Wix8";
378 //default: customAction = element.Name.LocalName;
379 break;
373 case "QueryWindowsDirectories": 380 case "QueryWindowsDirectories":
374 customAction = "QueryOsDirs"; 381 customAction = "QueryOsDirs";
375 break; 382 break;
@@ -400,7 +407,7 @@ namespace WixToolset.Util
400 407
401 this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); 408 this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element);
402 409
403 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4" + customAction, this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); 410 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, prefix + customAction, this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
404 } 411 }
405 412
406 /// <summary> 413 /// <summary>