Remove 32-bit ARM support.
Bob Arnson committed
Sep 20, 2020 at 16:20 UTC
25b074404a7069b7ad53ed61d902da436bc62dc7
6 files changed
+22
-48
src/be/utilbe.vcxproj
-8
@@ -8,14 +8,6 @@
8
<Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.33\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.33\build\WixToolset.BootstrapperCore.Native.props')" />
9
<Import Project="..\..\packages\WixToolset.DUtil.4.0.49\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.49\build\WixToolset.DUtil.props')" />
10
<ItemGroup Label="ProjectConfigurations">
11
- <ProjectConfiguration Include="Debug|ARM">
12
- <Configuration>Debug</Configuration>
13
- <Platform>ARM</Platform>
14
- </ProjectConfiguration>
15
- <ProjectConfiguration Include="Release|ARM">
16
- <Configuration>Release</Configuration>
17
- <Platform>ARM</Platform>
18
- </ProjectConfiguration>
11
<ProjectConfiguration Include="Debug|ARM64">
12
<Configuration>Debug</Configuration>
13
<Platform>ARM64</Platform>
src/ca/utilca.vcxproj
-8
@@ -9,14 +9,6 @@
9
<Import Project="..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props" Condition="Exists('..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props')" />
10
11
<ItemGroup Label="ProjectConfigurations">
12
- <ProjectConfiguration Include="Debug|ARM">
13
- <Configuration>Debug</Configuration>
14
- <Platform>ARM</Platform>
15
- </ProjectConfiguration>
16
- <ProjectConfiguration Include="Release|ARM">
17
- <Configuration>Release</Configuration>
18
- <Platform>ARM</Platform>
19
- </ProjectConfiguration>
12
<ProjectConfiguration Include="Debug|ARM64">
13
<Configuration>Debug</Configuration>
14
<Platform>ARM64</Platform>
src/wixext/UtilCompiler.cs
+22
-22
@@ -430,7 +430,7 @@ namespace WixToolset.Util
430
431
this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element);
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
}
435
436
/// <summary>
@@ -979,7 +979,7 @@ namespace WixToolset.Util
979
980
this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element);
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
984
if (!this.Messaging.EncounteredError)
985
{
@@ -1275,8 +1275,8 @@ namespace WixToolset.Util
1275
}
1276
}
1277
1278
- this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigureSmbInstall", 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.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.ARM64);
1280
1281
if (!this.Messaging.EncounteredError)
1282
{
@@ -1583,7 +1583,7 @@ namespace WixToolset.Util
1583
IconIndex = iconIndex,
1584
});
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
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");
@@ -1770,8 +1770,8 @@ namespace WixToolset.Util
1770
this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, RegistryRootType.LocalMachine, performanceKey, "Counter Types", sbCounterTypes.ToString(), componentId, false);
1771
}
1772
1773
- this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "InstallPerfCounterData", 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.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.ARM64);
1775
}
1776
1777
/// <summary>
@@ -2249,8 +2249,8 @@ namespace WixToolset.Util
2249
});
2250
}
2251
2252
- this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigurePerfmonInstall", 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.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.ARM64);
2254
}
2255
2256
@@ -2297,8 +2297,8 @@ namespace WixToolset.Util
2297
});
2298
}
2299
2300
- this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigurePerfmonManifestRegister", 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.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.ARM64);
2302
}
2303
2304
/// <summary>
@@ -2341,7 +2341,7 @@ namespace WixToolset.Util
2341
2342
if (!this.Messaging.EncounteredError)
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
2346
section.AddSymbol(new WixFormatFilesSymbol(sourceLineNumbers)
2347
{
@@ -2441,8 +2441,8 @@ namespace WixToolset.Util
2441
2442
}
2443
2444
- this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigureEventManifestRegister", 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.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.ARM64);
2446
2447
if (null != messageFile || null != parameterFile || null != resourceFile)
2448
{
@@ -2553,7 +2553,7 @@ namespace WixToolset.Util
2553
2554
if (!this.Messaging.EncounteredError)
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
2558
var id = this.ParseHelper.CreateIdentifier("sec", objectId, tableName, domain, user);
2559
section.AddSymbol(new SecureObjectsSymbol(sourceLineNumbers, id)
@@ -2876,7 +2876,7 @@ namespace WixToolset.Util
2876
2877
if (!this.Messaging.EncounteredError)
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
2881
section.AddSymbol(new WixRemoveFolderExSymbol(sourceLineNumbers, id)
2882
{
@@ -2952,7 +2952,7 @@ namespace WixToolset.Util
2952
2953
if (!this.Messaging.EncounteredError)
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
2957
section.AddSymbol(new WixRestartResourceSymbol(sourceLineNumbers, id)
2958
{
@@ -3044,7 +3044,7 @@ namespace WixToolset.Util
3044
3045
if (!this.Messaging.EncounteredError)
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
3049
section.AddSymbol(new ServiceConfigSymbol(sourceLineNumbers)
3050
{
@@ -3148,7 +3148,7 @@ namespace WixToolset.Util
3148
Attributes = attributes,
3149
});
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
}
3153
}
3154
@@ -3352,7 +3352,7 @@ namespace WixToolset.Util
3352
3353
if (null != componentId)
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
}
3357
3358
if (!this.Messaging.EncounteredError)
@@ -3719,7 +3719,7 @@ namespace WixToolset.Util
3719
}
3720
}
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
}
3724
3725
/// <summary>
@@ -3770,7 +3770,7 @@ namespace WixToolset.Util
3770
3771
private void AddReferenceToSchedXmlFile(SourceLineNumber sourceLineNumbers, IntermediateSection section)
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
}
3775
3776
/// <summary>
src/wixext/WixToolset.Util.wixext.nuspec
-1
@@ -19,7 +19,6 @@
19
20
<file src="netstandard2.0\$id$.dll" target="tools" />
21
22
- <file src="ARM\*.pdb" target="pdbs\ARM" />
22
<file src="ARM64\*.pdb" target="pdbs\ARM64" />
23
<file src="x86\*.pdb" target="pdbs\x86" />
24
<file src="x64\*.pdb" target="pdbs\x64" />
src/wixlib/UtilExtension_arm.wxs
deleted
-7
@@ -1,7 +0,0 @@
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">
5
- <?define platform=arm ?>
6
- <?include UtilExtension_Platform.wxi ?>
7
-</Wix>
src/wixlib/util.wixproj
-2
@@ -9,7 +9,6 @@
9
<ItemGroup>
10
<BindInputPaths Include="$(OutputPath)x86" BindName='x86' />
11
<BindInputPaths Include="$(OutputPath)x64" BindName='x64' />
12
- <BindInputPaths Include="$(OutputPath)arm" BindName='arm' />
12
<BindInputPaths Include="$(OutputPath)arm64" BindName='arm64' />
13
</ItemGroup>
14
@@ -17,7 +16,6 @@
16
<ProjectReference Include="..\be\utilbe.vcxproj" Properties="Platform=ARM64" />
17
<ProjectReference Include="..\be\utilbe.vcxproj" Properties="Platform=x86" />
18
<ProjectReference Include="..\be\utilbe.vcxproj" Properties="Platform=x64" />
20
- <ProjectReference Include="..\ca\utilca.vcxproj" Properties="Platform=ARM" />
19
<ProjectReference Include="..\ca\utilca.vcxproj" Properties="Platform=ARM64" />
20
<ProjectReference Include="..\ca\utilca.vcxproj" Properties="Platform=x86" />
21
<ProjectReference Include="..\ca\utilca.vcxproj" Properties="Platform=x64" />