aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Arnson <bob@firegiant.com>2020-09-20 17:03:05 -0400
committerBob Arnson <bob@firegiant.com>2020-09-20 17:05:19 -0400
commit3087d9b18196882c212e9c76f9caa050bb366e97 (patch)
treeb179107e7d486b104e076b7905a04880e21d9eaf
parenteb25f452c1ca1afb53c102e2619148092829cfe5 (diff)
downloadwix-3087d9b18196882c212e9c76f9caa050bb366e97.tar.gz
wix-3087d9b18196882c212e9c76f9caa050bb366e97.tar.bz2
wix-3087d9b18196882c212e9c76f9caa050bb366e97.zip
Remove 32-bit ARM support.
Diffstat
-rw-r--r--global.json2
-rw-r--r--src/ca/httpca.vcxproj8
-rw-r--r--src/wixext/HttpCompiler.cs4
-rw-r--r--src/wixlib/HttpExtension.wxs3
-rw-r--r--src/wixlib/HttpExtension_Platform.wxi12
-rw-r--r--src/wixlib/HttpExtension_arm.wxs8
-rw-r--r--src/wixlib/HttpExtension_arm64.wxs3
-rw-r--r--src/wixlib/HttpExtension_x64.wxs3
-rw-r--r--src/wixlib/HttpExtension_x86.wxs3
-rw-r--r--src/wixlib/caDecor.wxi21
-rw-r--r--src/wixlib/caerr.wxi2
-rw-r--r--src/wixlib/en-us.wxl3
-rw-r--r--src/wixlib/http.wixproj7
13 files changed, 31 insertions, 48 deletions
diff --git a/global.json b/global.json
index 7a995d0a..4d9df50b 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
1{ 1{
2 "msbuild-sdks": { 2 "msbuild-sdks": {
3 "WixToolset.Sdk": "4.0.0-build-0143" 3 "WixToolset.Sdk": "4.0.0-build-0157"
4 } 4 }
5} 5}
diff --git a/src/ca/httpca.vcxproj b/src/ca/httpca.vcxproj
index bfec0950..eba0df68 100644
--- a/src/ca/httpca.vcxproj
+++ b/src/ca/httpca.vcxproj
@@ -21,14 +21,6 @@
21 <Configuration>Release</Configuration> 21 <Configuration>Release</Configuration>
22 <Platform>x64</Platform> 22 <Platform>x64</Platform>
23 </ProjectConfiguration> 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>
32 <ProjectConfiguration Include="Debug|ARM64"> 24 <ProjectConfiguration Include="Debug|ARM64">
33 <Configuration>Debug</Configuration> 25 <Configuration>Debug</Configuration>
34 <Platform>ARM64</Platform> 26 <Platform>ARM64</Platform>
diff --git a/src/wixext/HttpCompiler.cs b/src/wixext/HttpCompiler.cs
index a8c1bca8..135e6883 100644
--- a/src/wixext/HttpCompiler.cs
+++ b/src/wixext/HttpCompiler.cs
@@ -178,8 +178,8 @@ namespace WixToolset.Http
178 ComponentRef = componentId, 178 ComponentRef = componentId,
179 }); 179 });
180 180
181 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedHttpUrlReservationsInstall", 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.ARM | CustomActionPlatforms.ARM64); 182 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedHttpUrlReservationsUninstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
183 } 183 }
184 } 184 }
185 185
diff --git a/src/wixlib/HttpExtension.wxs b/src/wixlib/HttpExtension.wxs
index e2b3534d..e9717fc1 100644
--- a/src/wixlib/HttpExtension.wxs
+++ b/src/wixlib/HttpExtension.wxs
@@ -1,5 +1,4 @@
1<?xml version="1.0" encoding="UTF-8"?> 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<!-- 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 2
4 3
5<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
diff --git a/src/wixlib/HttpExtension_Platform.wxi b/src/wixlib/HttpExtension_Platform.wxi
index 9722e2e7..82d9eed4 100644
--- a/src/wixlib/HttpExtension_Platform.wxi
+++ b/src/wixlib/HttpExtension_Platform.wxi
@@ -15,12 +15,12 @@
15 <ProgressText Action="$(var.Prefix)ExecHttpUrlReservationsUninstall$(var.Suffix)" Message="!(loc.WixExecHttpUrlReservationsUninstall)" /> 15 <ProgressText Action="$(var.Prefix)ExecHttpUrlReservationsUninstall$(var.Suffix)" Message="!(loc.WixExecHttpUrlReservationsUninstall)" />
16 </UI> 16 </UI>
17 17
18 <CustomAction Id="$(var.Prefix)SchedHttpUrlReservationsInstall$(var.Suffix)" BinaryKey="HttpCA$(var.Suffix)" DllEntry="SchedHttpUrlReservationsInstall" Execute="immediate" 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)" BinaryKey="HttpCA$(var.Suffix)" DllEntry="SchedHttpUrlReservationsUninstall" Execute="immediate" Return="check" SuppressModularization="yes" /> 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)" BinaryKey="HttpCA$(var.Suffix)" DllEntry="ExecHttpUrlReservations" Execute="rollback" Impersonate="no" Return="check" SuppressModularization="yes" /> 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)" BinaryKey="HttpCA$(var.Suffix)" DllEntry="ExecHttpUrlReservations" Execute="deferred" Impersonate="no" Return="check" SuppressModularization="yes" /> 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)" BinaryKey="HttpCA$(var.Suffix)" DllEntry="ExecHttpUrlReservations" Execute="rollback" Impersonate="no" Return="check" SuppressModularization="yes" /> 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)" BinaryKey="HttpCA$(var.Suffix)" DllEntry="ExecHttpUrlReservations" Execute="deferred" Impersonate="no" Return="check" SuppressModularization="yes" /> 23 <CustomAction Id="$(var.Prefix)ExecHttpUrlReservationsUninstall$(var.Suffix)" DllEntry="ExecHttpUrlReservations" Execute="deferred" Impersonate="no" Return="check" SuppressModularization="yes" BinaryRef="HttpCA$(var.Suffix)" />
24 24
25 <!-- 25 <!--
26 We need the HTTP server on Windows XP SP2 or later. 26 We need the HTTP server on Windows XP SP2 or later.
diff --git a/src/wixlib/HttpExtension_arm.wxs b/src/wixlib/HttpExtension_arm.wxs
deleted file mode 100644
index 1f7669bb..00000000
--- a/src/wixlib/HttpExtension_arm.wxs
+++ /dev/null
@@ -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>
diff --git a/src/wixlib/HttpExtension_arm64.wxs b/src/wixlib/HttpExtension_arm64.wxs
index ac43a85b..3c69a644 100644
--- a/src/wixlib/HttpExtension_arm64.wxs
+++ b/src/wixlib/HttpExtension_arm64.wxs
@@ -1,5 +1,4 @@
1<?xml version="1.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<!-- 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 2
4 3
5<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
diff --git a/src/wixlib/HttpExtension_x64.wxs b/src/wixlib/HttpExtension_x64.wxs
index 1ba5e505..f66f0d6f 100644
--- a/src/wixlib/HttpExtension_x64.wxs
+++ b/src/wixlib/HttpExtension_x64.wxs
@@ -1,5 +1,4 @@
1<?xml version="1.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<!-- 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 2
4 3
5<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
diff --git a/src/wixlib/HttpExtension_x86.wxs b/src/wixlib/HttpExtension_x86.wxs
index 00a3dc18..f76df25f 100644
--- a/src/wixlib/HttpExtension_x86.wxs
+++ b/src/wixlib/HttpExtension_x86.wxs
@@ -1,5 +1,4 @@
1<?xml version="1.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<!-- 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 2
4 3
5<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
diff --git a/src/wixlib/caDecor.wxi b/src/wixlib/caDecor.wxi
index 1d00df8f..b1711518 100644
--- a/src/wixlib/caDecor.wxi
+++ b/src/wixlib/caDecor.wxi
@@ -1,40 +1,39 @@
1<?xml version="1.0" encoding="utf-8"?> 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<!-- 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 2
4 3
5<Include xmlns="http://schemas.microsoft.com/wix/2006/wi"> 4<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
6 <?ifdef Prefix ?> 5 <?ifdef Prefix ?>
7 <?undef Prefix ?> 6 <?undef Prefix ?>
8 <?endif ?> 7 <?endif?>
9 8
10 <?define Prefix="Wix4" ?> 9 <?define Prefix="Wix4" ?>
11 10
12 <?ifndef platform ?> 11 <?ifndef platform ?>
13 <?define platform="x86" ?> 12 <?define platform="x86" ?>
14 <?endif ?> 13 <?endif?>
15 14
16 <?if $(var.platform)="" ?> 15 <?if $(var.platform)="" ?>
17 <?undef platform ?> 16 <?undef platform ?>
18 <?define platform="x86" ?> 17 <?define platform="x86" ?>
19 <?endif ?> 18 <?endif?>
20 19
21 <?ifdef Suffix ?> 20 <?ifdef Suffix ?>
22 <?undef Suffix ?> 21 <?undef Suffix ?>
23 <?endif ?> 22 <?endif?>
24 23
25 <?if $(var.platform)~="x86" ?> 24 <?if $(var.platform)~="x86" ?>
26 <?define Suffix="_X86" ?> 25 <?define Suffix="_X86" ?>
27 <?endif ?> 26 <?endif?>
28 27
29 <?if $(var.platform)~="x64" ?> 28 <?if $(var.platform)~="x64" ?>
30 <?define Suffix="_X64" ?> 29 <?define Suffix="_X64" ?>
31 <?endif ?> 30 <?endif?>
32 31
33 <?if $(var.platform)~="arm" ?> 32 <?if $(var.platform)~="arm" ?>
34 <?define Suffix="_A32" ?> 33 <?define Suffix="_A32" ?>
35 <?endif ?> 34 <?endif?>
36 35
37 <?if $(var.platform)~="arm64" ?> 36 <?if $(var.platform)~="arm64" ?>
38 <?define Suffix="_A64" ?> 37 <?define Suffix="_A64" ?>
39 <?endif ?> 38 <?endif?>
40</Include> 39</Include>
diff --git a/src/wixlib/caerr.wxi b/src/wixlib/caerr.wxi
index 141942f2..ff7ec121 100644
--- a/src/wixlib/caerr.wxi
+++ b/src/wixlib/caerr.wxi
@@ -1,4 +1,4 @@
1<Include> 1<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
2 <?define msierrSecureObjectsFailedCreateSD = 25520?> 2 <?define msierrSecureObjectsFailedCreateSD = 25520?>
3 <?define msierrSecureObjectsFailedSet = 25521?> 3 <?define msierrSecureObjectsFailedSet = 25521?>
4 <?define msierrSecureObjectsUnknownType = 25522?> 4 <?define msierrSecureObjectsUnknownType = 25522?>
diff --git a/src/wixlib/en-us.wxl b/src/wixlib/en-us.wxl
index 2c43af06..b6c180ed 100644
--- a/src/wixlib/en-us.wxl
+++ b/src/wixlib/en-us.wxl
@@ -1,5 +1,4 @@
1<?xml version="1.0" encoding="utf-8"?> 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<!-- 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 2
4 3
5<WixLocalization Culture="en-us" xmlns="http://wixtoolset.org/schemas/v4/wxl"> 4<WixLocalization Culture="en-us" xmlns="http://wixtoolset.org/schemas/v4/wxl">
diff --git a/src/wixlib/http.wixproj b/src/wixlib/http.wixproj
index fdd8c99b..7a99fbb9 100644
--- a/src/wixlib/http.wixproj
+++ b/src/wixlib/http.wixproj
@@ -7,7 +7,12 @@
7 </PropertyGroup> 7 </PropertyGroup>
8 8
9 <ItemGroup> 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>
11 <ProjectReference Include="..\ca\httpca.vcxproj" Properties="Platform=ARM64" /> 16 <ProjectReference Include="..\ca\httpca.vcxproj" Properties="Platform=ARM64" />
12 <ProjectReference Include="..\ca\httpca.vcxproj" Properties="Platform=x86" /> 17 <ProjectReference Include="..\ca\httpca.vcxproj" Properties="Platform=x86" />
13 <ProjectReference Include="..\ca\httpca.vcxproj" Properties="Platform=x64" /> 18 <ProjectReference Include="..\ca\httpca.vcxproj" Properties="Platform=x64" />
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-22 11:37:34 +0000