Remove 32-bit ARM support.
Bob Arnson committed
Sep 20, 2020 at 17:03 UTC
3087d9b18196882c212e9c76f9caa050bb366e97
13 files changed
+31
-48
global.json
+1
-1
@@ -1,5 +1,5 @@
1
{
2
"msbuild-sdks": {
3
- "WixToolset.Sdk": "4.0.0-build-0143"
3
+ "WixToolset.Sdk": "4.0.0-build-0157"
4
}
5
}
src/ca/httpca.vcxproj
-8
@@ -21,14 +21,6 @@
21
<Configuration>Release</Configuration>
22
<Platform>x64</Platform>
23
</ProjectConfiguration>
24
- <ProjectConfiguration Include="Debug|ARM">
25
- <Configuration>Debug</Configuration>
26
- <Platform>ARM</Platform>
27
- </ProjectConfiguration>
28
- <ProjectConfiguration Include="Release|ARM">
29
- <Configuration>Release</Configuration>
30
- <Platform>ARM</Platform>
31
- </ProjectConfiguration>
24
<ProjectConfiguration Include="Debug|ARM64">
25
<Configuration>Debug</Configuration>
26
<Platform>ARM64</Platform>
src/wixext/HttpCompiler.cs
+2
-2
@@ -178,8 +178,8 @@ namespace WixToolset.Http
178
ComponentRef = componentId,
179
});
180
181
- this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedHttpUrlReservationsInstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64);
182
- this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedHttpUrlReservationsUninstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64);
181
+ this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedHttpUrlReservationsInstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
182
+ this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedHttpUrlReservationsUninstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
183
}
184
}
185
src/wixlib/HttpExtension.wxs
+1
-2
@@ -1,5 +1,4 @@
1
-<?xml version="1.0" encoding="UTF-8"?>
2
-<!-- 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. -->
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">
src/wixlib/HttpExtension_Platform.wxi
+6
-6
@@ -15,12 +15,12 @@
15
<ProgressText Action="$(var.Prefix)ExecHttpUrlReservationsUninstall$(var.Suffix)" Message="!(loc.WixExecHttpUrlReservationsUninstall)" />
16
</UI>
17
18
- <CustomAction Id="$(var.Prefix)SchedHttpUrlReservationsInstall$(var.Suffix)" BinaryKey="HttpCA$(var.Suffix)" DllEntry="SchedHttpUrlReservationsInstall" Execute="immediate" Return="check" SuppressModularization="yes" />
19
- <CustomAction Id="$(var.Prefix)SchedHttpUrlReservationsUninstall$(var.Suffix)" BinaryKey="HttpCA$(var.Suffix)" DllEntry="SchedHttpUrlReservationsUninstall" Execute="immediate" Return="check" SuppressModularization="yes" />
20
- <CustomAction Id="$(var.Prefix)RollbackHttpUrlReservationsInstall$(var.Suffix)" BinaryKey="HttpCA$(var.Suffix)" DllEntry="ExecHttpUrlReservations" Execute="rollback" Impersonate="no" Return="check" SuppressModularization="yes" />
21
- <CustomAction Id="$(var.Prefix)ExecHttpUrlReservationsInstall$(var.Suffix)" BinaryKey="HttpCA$(var.Suffix)" DllEntry="ExecHttpUrlReservations" Execute="deferred" Impersonate="no" Return="check" SuppressModularization="yes" />
22
- <CustomAction Id="$(var.Prefix)RollbackHttpUrlReservationsUninstall$(var.Suffix)" BinaryKey="HttpCA$(var.Suffix)" DllEntry="ExecHttpUrlReservations" Execute="rollback" Impersonate="no" Return="check" SuppressModularization="yes" />
23
- <CustomAction Id="$(var.Prefix)ExecHttpUrlReservationsUninstall$(var.Suffix)" BinaryKey="HttpCA$(var.Suffix)" DllEntry="ExecHttpUrlReservations" Execute="deferred" Impersonate="no" Return="check" SuppressModularization="yes" />
18
+ <CustomAction Id="$(var.Prefix)SchedHttpUrlReservationsInstall$(var.Suffix)" DllEntry="SchedHttpUrlReservationsInstall" Execute="immediate" Return="check" SuppressModularization="yes" BinaryRef="HttpCA$(var.Suffix)" />
19
+ <CustomAction Id="$(var.Prefix)SchedHttpUrlReservationsUninstall$(var.Suffix)" DllEntry="SchedHttpUrlReservationsUninstall" Execute="immediate" Return="check" SuppressModularization="yes" BinaryRef="HttpCA$(var.Suffix)" />
20
+ <CustomAction Id="$(var.Prefix)RollbackHttpUrlReservationsInstall$(var.Suffix)" DllEntry="ExecHttpUrlReservations" Execute="rollback" Impersonate="no" Return="check" SuppressModularization="yes" BinaryRef="HttpCA$(var.Suffix)" />
21
+ <CustomAction Id="$(var.Prefix)ExecHttpUrlReservationsInstall$(var.Suffix)" DllEntry="ExecHttpUrlReservations" Execute="deferred" Impersonate="no" Return="check" SuppressModularization="yes" BinaryRef="HttpCA$(var.Suffix)" />
22
+ <CustomAction Id="$(var.Prefix)RollbackHttpUrlReservationsUninstall$(var.Suffix)" DllEntry="ExecHttpUrlReservations" Execute="rollback" Impersonate="no" Return="check" SuppressModularization="yes" BinaryRef="HttpCA$(var.Suffix)" />
23
+ <CustomAction Id="$(var.Prefix)ExecHttpUrlReservationsUninstall$(var.Suffix)" DllEntry="ExecHttpUrlReservations" Execute="deferred" Impersonate="no" Return="check" SuppressModularization="yes" BinaryRef="HttpCA$(var.Suffix)" />
24
25
<!--
26
We need the HTTP server on Windows XP SP2 or later.
src/wixlib/HttpExtension_arm.wxs
deleted
-8
@@ -1,8 +0,0 @@
1
-<?xml version="1.0"?>
2
-<!-- 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. -->
3
-
4
-
5
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
6
- <?define platform=arm ?>
7
- <?include HttpExtension_Platform.wxi ?>
8
-</Wix>
src/wixlib/HttpExtension_arm64.wxs
+1
-2
@@ -1,5 +1,4 @@
1
-<?xml version="1.0"?>
2
-<!-- 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. -->
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">
src/wixlib/HttpExtension_x64.wxs
+1
-2
@@ -1,5 +1,4 @@
1
-<?xml version="1.0"?>
2
-<!-- 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. -->
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">
src/wixlib/HttpExtension_x86.wxs
+1
-2
@@ -1,5 +1,4 @@
1
-<?xml version="1.0"?>
2
-<!-- 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. -->
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">
src/wixlib/caDecor.wxi
+10
-11
@@ -1,40 +1,39 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-<!-- 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. -->
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
5
-<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
4
+<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
5
<?ifdef Prefix ?>
6
<?undef Prefix ?>
8
- <?endif ?>
7
+ <?endif?>
8
9
<?define Prefix="Wix4" ?>
10
11
<?ifndef platform ?>
12
<?define platform="x86" ?>
14
- <?endif ?>
13
+ <?endif?>
14
15
<?if $(var.platform)="" ?>
16
<?undef platform ?>
17
<?define platform="x86" ?>
19
- <?endif ?>
18
+ <?endif?>
19
20
<?ifdef Suffix ?>
21
<?undef Suffix ?>
23
- <?endif ?>
22
+ <?endif?>
23
24
<?if $(var.platform)~="x86" ?>
25
<?define Suffix="_X86" ?>
27
- <?endif ?>
26
+ <?endif?>
27
28
<?if $(var.platform)~="x64" ?>
29
<?define Suffix="_X64" ?>
31
- <?endif ?>
30
+ <?endif?>
31
32
<?if $(var.platform)~="arm" ?>
33
<?define Suffix="_A32" ?>
35
- <?endif ?>
34
+ <?endif?>
35
36
<?if $(var.platform)~="arm64" ?>
37
<?define Suffix="_A64" ?>
39
- <?endif ?>
38
+ <?endif?>
39
</Include>
src/wixlib/caerr.wxi
+1
-1
@@ -1,4 +1,4 @@
1
-<Include>
1
+<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
2
<?define msierrSecureObjectsFailedCreateSD = 25520?>
3
<?define msierrSecureObjectsFailedSet = 25521?>
4
<?define msierrSecureObjectsUnknownType = 25522?>
src/wixlib/en-us.wxl
+1
-2
@@ -1,5 +1,4 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-<!-- 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. -->
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
<WixLocalization Culture="en-us" xmlns="http://wixtoolset.org/schemas/v4/wxl">
src/wixlib/http.wixproj
+6
-1
@@ -7,7 +7,12 @@
7
</PropertyGroup>
8
9
<ItemGroup>
10
- <ProjectReference Include="..\ca\httpca.vcxproj" Properties="Platform=ARM" />
10
+ <BindInputPaths Include="$(OutputPath)x86" BindName='x86' />
11
+ <BindInputPaths Include="$(OutputPath)x64" BindName='x64' />
12
+ <BindInputPaths Include="$(OutputPath)arm64" BindName='arm64' />
13
+ </ItemGroup>
14
+
15
+ <ItemGroup>
16
<ProjectReference Include="..\ca\httpca.vcxproj" Properties="Platform=ARM64" />
17
<ProjectReference Include="..\ca\httpca.vcxproj" Properties="Platform=x86" />
18
<ProjectReference Include="..\ca\httpca.vcxproj" Properties="Platform=x64" />