aboutsummaryrefslogtreecommitdiff
path: root/src/wixext
diff options
context:
space:
mode:
authorBob Arnson <bob@firegiant.com>2020-09-20 16:20:21 -0400
committerBob Arnson <bob@firegiant.com>2020-09-20 16:22:55 -0400
commit25b074404a7069b7ad53ed61d902da436bc62dc7 (patch)
tree87c772c4be4568fd8db95f451832945a05935142 /src/wixext
parentd672d9e0eaee21f354cbeaa177ddf074edeb665d (diff)
downloadwix-25b074404a7069b7ad53ed61d902da436bc62dc7.tar.gz
wix-25b074404a7069b7ad53ed61d902da436bc62dc7.tar.bz2
wix-25b074404a7069b7ad53ed61d902da436bc62dc7.zip
Remove 32-bit ARM support.
Diffstat (limited to 'src/wixext')
-rw-r--r--src/wixext/UtilCompiler.cs44
-rw-r--r--src/wixext/WixToolset.Util.wixext.nuspec1
2 files changed, 22 insertions, 23 deletions
diff --git a/src/wixext/UtilCompiler.cs b/src/wixext/UtilCompiler.cs
index 8953cfcd..4aec9be9 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.ARM | CustomActionPlatforms.ARM64); 433 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, 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.ARM | CustomActionPlatforms.ARM64); 982 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "CloseApplications", 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.ARM | CustomActionPlatforms.ARM64); 1278 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigureSmbInstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
1279 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigureSmbUninstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); 1279 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigureSmbUninstall", 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.ARM | CustomActionPlatforms.ARM64); 1586 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedInternetShortcuts", 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.ARM | CustomActionPlatforms.ARM64); 1773 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "InstallPerfCounterData", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
1774 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "UninstallPerfCounterData", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); 1774 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "UninstallPerfCounterData", 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.ARM | CustomActionPlatforms.ARM64); 2252 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigurePerfmonInstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
2253 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigurePerfmonUninstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); 2253 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigurePerfmonUninstall", 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.ARM | CustomActionPlatforms.ARM64); 2300 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigurePerfmonManifestRegister", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
2301 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigurePerfmonManifestUnregister", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); 2301 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigurePerfmonManifestUnregister", 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.ARM | CustomActionPlatforms.ARM64); 2344 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedFormatFiles", 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.ARM | CustomActionPlatforms.ARM64); 2444 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigureEventManifestRegister", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
2445 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigureEventManifestUnregister", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); 2445 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigureEventManifestUnregister", 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.ARM | CustomActionPlatforms.ARM64); 2556 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedSecureObjects", 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)
@@ -2876,7 +2876,7 @@ namespace WixToolset.Util
2876 2876
2877 if (!this.Messaging.EncounteredError) 2877 if (!this.Messaging.EncounteredError)
2878 { 2878 {
2879 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "RemoveFoldersEx", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); 2879 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "RemoveFoldersEx", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
2880 2880
2881 section.AddSymbol(new WixRemoveFolderExSymbol(sourceLineNumbers, id) 2881 section.AddSymbol(new WixRemoveFolderExSymbol(sourceLineNumbers, id)
2882 { 2882 {
@@ -2952,7 +2952,7 @@ namespace WixToolset.Util
2952 2952
2953 if (!this.Messaging.EncounteredError) 2953 if (!this.Messaging.EncounteredError)
2954 { 2954 {
2955 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "RegisterRestartResources", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); 2955 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "RegisterRestartResources", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
2956 2956
2957 section.AddSymbol(new WixRestartResourceSymbol(sourceLineNumbers, id) 2957 section.AddSymbol(new WixRestartResourceSymbol(sourceLineNumbers, id)
2958 { 2958 {
@@ -3044,7 +3044,7 @@ namespace WixToolset.Util
3044 3044
3045 if (!this.Messaging.EncounteredError) 3045 if (!this.Messaging.EncounteredError)
3046 { 3046 {
3047 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedServiceConfig", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); 3047 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedServiceConfig", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
3048 3048
3049 section.AddSymbol(new ServiceConfigSymbol(sourceLineNumbers) 3049 section.AddSymbol(new ServiceConfigSymbol(sourceLineNumbers)
3050 { 3050 {
@@ -3148,7 +3148,7 @@ namespace WixToolset.Util
3148 Attributes = attributes, 3148 Attributes = attributes,
3149 }); 3149 });
3150 3150
3151 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "TouchFileDuringInstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); 3151 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "TouchFileDuringInstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
3152 } 3152 }
3153 } 3153 }
3154 3154
@@ -3352,7 +3352,7 @@ namespace WixToolset.Util
3352 3352
3353 if (null != componentId) 3353 if (null != componentId)
3354 { 3354 {
3355 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigureUsers", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); 3355 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigureUsers", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
3356 } 3356 }
3357 3357
3358 if (!this.Messaging.EncounteredError) 3358 if (!this.Messaging.EncounteredError)
@@ -3719,7 +3719,7 @@ namespace WixToolset.Util
3719 } 3719 }
3720 } 3720 }
3721 3721
3722 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedXmlConfig", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); 3722 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedXmlConfig", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
3723 } 3723 }
3724 3724
3725 /// <summary> 3725 /// <summary>
@@ -3770,7 +3770,7 @@ namespace WixToolset.Util
3770 3770
3771 private void AddReferenceToSchedXmlFile(SourceLineNumber sourceLineNumbers, IntermediateSection section) 3771 private void AddReferenceToSchedXmlFile(SourceLineNumber sourceLineNumbers, IntermediateSection section)
3772 { 3772 {
3773 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedXmlFile", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); 3773 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedXmlFile", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
3774 } 3774 }
3775 3775
3776 /// <summary> 3776 /// <summary>
diff --git a/src/wixext/WixToolset.Util.wixext.nuspec b/src/wixext/WixToolset.Util.wixext.nuspec
index 0db3f613..bf9e6fc2 100644
--- a/src/wixext/WixToolset.Util.wixext.nuspec
+++ b/src/wixext/WixToolset.Util.wixext.nuspec
@@ -19,7 +19,6 @@
19 19
20 <file src="netstandard2.0\$id$.dll" target="tools" /> 20 <file src="netstandard2.0\$id$.dll" target="tools" />
21 21
22 <file src="ARM\*.pdb" target="pdbs\ARM" />
23 <file src="ARM64\*.pdb" target="pdbs\ARM64" /> 22 <file src="ARM64\*.pdb" target="pdbs\ARM64" />
24 <file src="x86\*.pdb" target="pdbs\x86" /> 23 <file src="x86\*.pdb" target="pdbs\x86" />
25 <file src="x64\*.pdb" target="pdbs\x64" /> 24 <file src="x64\*.pdb" target="pdbs\x64" />
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-25 06:50:11 +0000