aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/wixext/UtilCompiler.cs44
1 files changed, 22 insertions, 22 deletions
diff --git a/src/wixext/UtilCompiler.cs b/src/wixext/UtilCompiler.cs
index 183f286b..2909fbb4 100644
--- a/src/wixext/UtilCompiler.cs
+++ b/src/wixext/UtilCompiler.cs
@@ -430,7 +430,7 @@ namespace WixToolset.Util
430 430
431 this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); 431 this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element);
432 432
433 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, customAction, this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); 433 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4" + customAction, this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
434 } 434 }
435 435
436 /// <summary> 436 /// <summary>
@@ -979,7 +979,7 @@ namespace WixToolset.Util
979 979
980 this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); 980 this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element);
981 981
982 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "CloseApplications", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); 982 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4CloseApplications", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
983 983
984 if (!this.Messaging.EncounteredError) 984 if (!this.Messaging.EncounteredError)
985 { 985 {
@@ -1275,8 +1275,8 @@ namespace WixToolset.Util
1275 } 1275 }
1276 } 1276 }
1277 1277
1278 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigureSmbInstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); 1278 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4ConfigureSmbInstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
1279 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigureSmbUninstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); 1279 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4ConfigureSmbUninstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
1280 1280
1281 if (!this.Messaging.EncounteredError) 1281 if (!this.Messaging.EncounteredError)
1282 { 1282 {
@@ -1583,7 +1583,7 @@ namespace WixToolset.Util
1583 IconIndex = iconIndex, 1583 IconIndex = iconIndex,
1584 }); 1584 });
1585 1585
1586 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedInternetShortcuts", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); 1586 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4SchedInternetShortcuts", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
1587 1587
1588 // make sure we have a CreateFolder table so that the immediate CA can add temporary rows to handle installation and uninstallation 1588 // make sure we have a CreateFolder table so that the immediate CA can add temporary rows to handle installation and uninstallation
1589 this.ParseHelper.EnsureTable(section, sourceLineNumbers, "CreateFolder"); 1589 this.ParseHelper.EnsureTable(section, sourceLineNumbers, "CreateFolder");
@@ -1770,8 +1770,8 @@ namespace WixToolset.Util
1770 this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Counter Types", sbCounterTypes.ToString(), componentId, false); 1770 this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Counter Types", sbCounterTypes.ToString(), componentId, false);
1771 } 1771 }
1772 1772
1773 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "InstallPerfCounterData", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); 1773 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4InstallPerfCounterData", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
1774 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "UninstallPerfCounterData", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); 1774 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4UninstallPerfCounterData", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
1775 } 1775 }
1776 1776
1777 /// <summary> 1777 /// <summary>
@@ -2249,8 +2249,8 @@ namespace WixToolset.Util
2249 }); 2249 });
2250 } 2250 }
2251 2251
2252 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigurePerfmonInstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); 2252 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4ConfigurePerfmonInstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
2253 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigurePerfmonUninstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); 2253 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4ConfigurePerfmonUninstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
2254 } 2254 }
2255 2255
2256 2256
@@ -2297,8 +2297,8 @@ namespace WixToolset.Util
2297 }); 2297 });
2298 } 2298 }
2299 2299
2300 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigurePerfmonManifestRegister", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); 2300 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4ConfigurePerfmonManifestRegister", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
2301 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigurePerfmonManifestUnregister", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); 2301 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4ConfigurePerfmonManifestUnregister", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
2302 } 2302 }
2303 2303
2304 /// <summary> 2304 /// <summary>
@@ -2341,7 +2341,7 @@ namespace WixToolset.Util
2341 2341
2342 if (!this.Messaging.EncounteredError) 2342 if (!this.Messaging.EncounteredError)
2343 { 2343 {
2344 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedFormatFiles", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); 2344 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4SchedFormatFiles", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
2345 2345
2346 section.AddSymbol(new WixFormatFilesSymbol(sourceLineNumbers) 2346 section.AddSymbol(new WixFormatFilesSymbol(sourceLineNumbers)
2347 { 2347 {
@@ -2441,8 +2441,8 @@ namespace WixToolset.Util
2441 2441
2442 } 2442 }
2443 2443
2444 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigureEventManifestRegister", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); 2444 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4ConfigureEventManifestRegister", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
2445 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigureEventManifestUnregister", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); 2445 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4ConfigureEventManifestUnregister", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
2446 2446
2447 if (null != messageFile || null != parameterFile || null != resourceFile) 2447 if (null != messageFile || null != parameterFile || null != resourceFile)
2448 { 2448 {
@@ -2553,7 +2553,7 @@ namespace WixToolset.Util
2553 2553
2554 if (!this.Messaging.EncounteredError) 2554 if (!this.Messaging.EncounteredError)
2555 { 2555 {
2556 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedSecureObjects", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); 2556 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4SchedSecureObjects", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
2557 2557
2558 var id = this.ParseHelper.CreateIdentifier("sec", objectId, tableName, domain, user); 2558 var id = this.ParseHelper.CreateIdentifier("sec", objectId, tableName, domain, user);
2559 section.AddSymbol(new SecureObjectsSymbol(sourceLineNumbers, id) 2559 section.AddSymbol(new SecureObjectsSymbol(sourceLineNumbers, id)
@@ -2891,7 +2891,7 @@ namespace WixToolset.Util
2891 2891
2892 if (!this.Messaging.EncounteredError) 2892 if (!this.Messaging.EncounteredError)
2893 { 2893 {
2894 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "RemoveFoldersEx", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); 2894 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4RemoveFoldersEx", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
2895 2895
2896 section.AddSymbol(new WixRemoveFolderExSymbol(sourceLineNumbers, id) 2896 section.AddSymbol(new WixRemoveFolderExSymbol(sourceLineNumbers, id)
2897 { 2897 {
@@ -2967,7 +2967,7 @@ namespace WixToolset.Util
2967 2967
2968 if (!this.Messaging.EncounteredError) 2968 if (!this.Messaging.EncounteredError)
2969 { 2969 {
2970 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "RegisterRestartResources", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); 2970 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4RegisterRestartResources", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
2971 2971
2972 section.AddSymbol(new WixRestartResourceSymbol(sourceLineNumbers, id) 2972 section.AddSymbol(new WixRestartResourceSymbol(sourceLineNumbers, id)
2973 { 2973 {
@@ -3059,7 +3059,7 @@ namespace WixToolset.Util
3059 3059
3060 if (!this.Messaging.EncounteredError) 3060 if (!this.Messaging.EncounteredError)
3061 { 3061 {
3062 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedServiceConfig", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); 3062 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4SchedServiceConfig", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
3063 3063
3064 section.AddSymbol(new ServiceConfigSymbol(sourceLineNumbers) 3064 section.AddSymbol(new ServiceConfigSymbol(sourceLineNumbers)
3065 { 3065 {
@@ -3163,7 +3163,7 @@ namespace WixToolset.Util
3163 Attributes = attributes, 3163 Attributes = attributes,
3164 }); 3164 });
3165 3165
3166 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "TouchFileDuringInstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); 3166 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4TouchFileDuringInstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
3167 } 3167 }
3168 } 3168 }
3169 3169
@@ -3367,7 +3367,7 @@ namespace WixToolset.Util
3367 3367
3368 if (null != componentId) 3368 if (null != componentId)
3369 { 3369 {
3370 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigureUsers", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); 3370 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4ConfigureUsers", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
3371 } 3371 }
3372 3372
3373 if (!this.Messaging.EncounteredError) 3373 if (!this.Messaging.EncounteredError)
@@ -3736,7 +3736,7 @@ namespace WixToolset.Util
3736 } 3736 }
3737 } 3737 }
3738 3738
3739 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedXmlConfig", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); 3739 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4SchedXmlConfig", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
3740 } 3740 }
3741 3741
3742 /// <summary> 3742 /// <summary>
@@ -3787,7 +3787,7 @@ namespace WixToolset.Util
3787 3787
3788 private void AddReferenceToSchedXmlFile(SourceLineNumber sourceLineNumbers, IntermediateSection section) 3788 private void AddReferenceToSchedXmlFile(SourceLineNumber sourceLineNumbers, IntermediateSection section)
3789 { 3789 {
3790 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedXmlFile", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); 3790 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4SchedXmlFile", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
3791 } 3791 }
3792 3792
3793 /// <summary> 3793 /// <summary>
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-04-05 04:00:51 +0000