Remove 32-bit ARM support.
Bob Arnson committed
Sep 20, 2020 at 16:58 UTC
4bcd57b4b7a9983b96a6c63522b35747e844cac3
16 files changed
+35
-56
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/fwca.vcxproj
-9
@@ -6,15 +6,6 @@
6
<Import Project="..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props" Condition="Exists('..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props')" />
7
8
<ItemGroup Label="ProjectConfigurations">
9
- <ProjectConfiguration Include="Debug|ARM">
10
- <Configuration>Debug</Configuration>
11
- <Platform>ARM</Platform>
12
- </ProjectConfiguration>
13
- <ProjectConfiguration Include="Release|ARM">
14
- <Configuration>Release</Configuration>
15
- <Platform>ARM</Platform>
16
- </ProjectConfiguration>
17
-
9
<ProjectConfiguration Include="Debug|ARM64">
10
<Configuration>Debug</Configuration>
11
<Platform>ARM64</Platform>
src/wixext/FirewallCompiler.cs
+2
-2
@@ -300,8 +300,8 @@ namespace WixToolset.Firewall
300
symbol.Attributes = attributes;
301
}
302
303
- this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedFirewallExceptionsInstall", this.Context.Platform, CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64 | CustomActionPlatforms.X64 | CustomActionPlatforms.X86);
304
- this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedFirewallExceptionsUninstall", this.Context.Platform, CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64 | CustomActionPlatforms.X64 | CustomActionPlatforms.X86);
303
+ this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedFirewallExceptionsInstall", this.Context.Platform, CustomActionPlatforms.ARM64 | CustomActionPlatforms.X64 | CustomActionPlatforms.X86);
304
+ this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedFirewallExceptionsUninstall", this.Context.Platform, CustomActionPlatforms.ARM64 | CustomActionPlatforms.X64 | CustomActionPlatforms.X86);
305
}
306
}
307
src/wixlib/FirewallExtension.wxs
+2
-3
@@ -1,12 +1,11 @@
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">
5
<?include caerr.wxi ?>
6
<Fragment>
7
<UI Id="WixFirewallErrors">
9
- <Error Id="$(var.msierrFirewallCannotConnect)">!(loc.msierrFirewallCannotConnect)</Error>
8
+ <Error Id="$(var.msierrFirewallCannotConnect)" Message="!(loc.msierrFirewallCannotConnect)" />
9
</UI>
10
</Fragment>
11
</Wix>
src/wixlib/FirewallExtension_Platform.wxi
+6
-6
@@ -13,12 +13,12 @@
13
<ProgressText Action="$(var.Prefix)ExecFirewallExceptionsUninstall$(var.Suffix)" Message="!(loc.WixExecFirewallExceptionsUninstall)" />
14
</UI>
15
16
- <CustomAction Id="$(var.Prefix)SchedFirewallExceptionsInstall$(var.Suffix)" BinaryKey="$(var.Prefix)FWCA$(var.Suffix)" DllEntry="SchedFirewallExceptionsInstall" Execute="immediate" Return="check" SuppressModularization="yes" />
17
- <CustomAction Id="$(var.Prefix)SchedFirewallExceptionsUninstall$(var.Suffix)" BinaryKey="$(var.Prefix)FWCA$(var.Suffix)" DllEntry="SchedFirewallExceptionsUninstall" Execute="immediate" Return="check" SuppressModularization="yes" />
18
- <CustomAction Id="$(var.Prefix)RollbackFirewallExceptionsInstall$(var.Suffix)" BinaryKey="$(var.Prefix)FWCA$(var.Suffix)" DllEntry="ExecFirewallExceptions" Execute="rollback" Impersonate="no" Return="check" SuppressModularization="yes" />
19
- <CustomAction Id="$(var.Prefix)ExecFirewallExceptionsInstall$(var.Suffix)" BinaryKey="$(var.Prefix)FWCA$(var.Suffix)" DllEntry="ExecFirewallExceptions" Execute="deferred" Impersonate="no" Return="check" SuppressModularization="yes" />
20
- <CustomAction Id="$(var.Prefix)RollbackFirewallExceptionsUninstall$(var.Suffix)" BinaryKey="$(var.Prefix)FWCA$(var.Suffix)" DllEntry="ExecFirewallExceptions" Execute="rollback" Impersonate="no" Return="check" SuppressModularization="yes" />
21
- <CustomAction Id="$(var.Prefix)ExecFirewallExceptionsUninstall$(var.Suffix)" BinaryKey="$(var.Prefix)FWCA$(var.Suffix)" DllEntry="ExecFirewallExceptions" Execute="deferred" Impersonate="no" Return="check" SuppressModularization="yes" />
16
+ <CustomAction Id="$(var.Prefix)SchedFirewallExceptionsInstall$(var.Suffix)" DllEntry="SchedFirewallExceptionsInstall" Execute="immediate" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix)FWCA$(var.Suffix)" />
17
+ <CustomAction Id="$(var.Prefix)SchedFirewallExceptionsUninstall$(var.Suffix)" DllEntry="SchedFirewallExceptionsUninstall" Execute="immediate" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix)FWCA$(var.Suffix)" />
18
+ <CustomAction Id="$(var.Prefix)RollbackFirewallExceptionsInstall$(var.Suffix)" DllEntry="ExecFirewallExceptions" Execute="rollback" Impersonate="no" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix)FWCA$(var.Suffix)" />
19
+ <CustomAction Id="$(var.Prefix)ExecFirewallExceptionsInstall$(var.Suffix)" DllEntry="ExecFirewallExceptions" Execute="deferred" Impersonate="no" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix)FWCA$(var.Suffix)" />
20
+ <CustomAction Id="$(var.Prefix)RollbackFirewallExceptionsUninstall$(var.Suffix)" DllEntry="ExecFirewallExceptions" Execute="rollback" Impersonate="no" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix)FWCA$(var.Suffix)" />
21
+ <CustomAction Id="$(var.Prefix)ExecFirewallExceptionsUninstall$(var.Suffix)" DllEntry="ExecFirewallExceptions" Execute="deferred" Impersonate="no" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix)FWCA$(var.Suffix)" />
22
23
<!--
24
We need the firewall on Windows XP SP2 or later.
src/wixlib/FirewallExtension_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 FirewallExtension_Platform.wxi ?>
8
-</Wix>
src/wixlib/FirewallExtension_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/FirewallExtension_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/FirewallExtension_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/es-es.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
<WixLocalization Culture="es-es" xmlns="http://wixtoolset.org/schemas/v4/wxl">
4
<String Id="msierrFirewallCannotConnect" Overridable="yes">No se puede conectar al Firewall de Windows. ([2] [3] [4] [5])</String>
src/wixlib/firewall.wixproj
+6
-1
@@ -8,7 +8,12 @@
8
</PropertyGroup>
9
10
<ItemGroup>
11
- <ProjectReference Include="..\ca\fwca.vcxproj" Properties="Platform=ARM" />
11
+ <BindInputPaths Include="$(OutputPath)x86" BindName='x86' />
12
+ <BindInputPaths Include="$(OutputPath)x64" BindName='x64' />
13
+ <BindInputPaths Include="$(OutputPath)arm64" BindName='arm64' />
14
+ </ItemGroup>
15
+
16
+ <ItemGroup>
17
<ProjectReference Include="..\ca\fwca.vcxproj" Properties="Platform=ARM64" />
18
<ProjectReference Include="..\ca\fwca.vcxproj" Properties="Platform=x86" />
19
<ProjectReference Include="..\ca\fwca.vcxproj" Properties="Platform=x64" />
src/wixlib/ja-jp.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="ja-jp" xmlns="http://wixtoolset.org/schemas/v4/wxl">
src/wixlib/pl-pl.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="pl-pl" xmlns="http://wixtoolset.org/schemas/v4/wxl">