aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--global.json2
-rw-r--r--src/ca/fwca.vcxproj9
-rw-r--r--src/wixext/FirewallCompiler.cs4
-rw-r--r--src/wixlib/FirewallExtension.wxs5
-rw-r--r--src/wixlib/FirewallExtension_Platform.wxi12
-rw-r--r--src/wixlib/FirewallExtension_arm.wxs8
-rw-r--r--src/wixlib/FirewallExtension_arm64.wxs3
-rw-r--r--src/wixlib/FirewallExtension_x64.wxs3
-rw-r--r--src/wixlib/FirewallExtension_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/es-es.wxl3
-rw-r--r--src/wixlib/firewall.wixproj7
-rw-r--r--src/wixlib/ja-jp.wxl3
-rw-r--r--src/wixlib/pl-pl.wxl3
16 files changed, 35 insertions, 56 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/fwca.vcxproj b/src/ca/fwca.vcxproj
index f35e7177..6e392b8f 100644
--- a/src/ca/fwca.vcxproj
+++ b/src/ca/fwca.vcxproj
@@ -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')" /> 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 7
8 <ItemGroup Label="ProjectConfigurations"> 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
18 <ProjectConfiguration Include="Debug|ARM64"> 9 <ProjectConfiguration Include="Debug|ARM64">
19 <Configuration>Debug</Configuration> 10 <Configuration>Debug</Configuration>
20 <Platform>ARM64</Platform> 11 <Platform>ARM64</Platform>
diff --git a/src/wixext/FirewallCompiler.cs b/src/wixext/FirewallCompiler.cs
index e3cf201b..8eef2fb2 100644
--- a/src/wixext/FirewallCompiler.cs
+++ b/src/wixext/FirewallCompiler.cs
@@ -300,8 +300,8 @@ namespace WixToolset.Firewall
300 symbol.Attributes = attributes; 300 symbol.Attributes = attributes;
301 } 301 }
302 302
303 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedFirewallExceptionsInstall", 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.ARM | CustomActionPlatforms.ARM64 | CustomActionPlatforms.X64 | CustomActionPlatforms.X86); 304 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedFirewallExceptionsUninstall", this.Context.Platform, CustomActionPlatforms.ARM64 | CustomActionPlatforms.X64 | CustomActionPlatforms.X86);
305 } 305 }
306 } 306 }
307 307
diff --git a/src/wixlib/FirewallExtension.wxs b/src/wixlib/FirewallExtension.wxs
index 271469e4..56ad693e 100644
--- a/src/wixlib/FirewallExtension.wxs
+++ b/src/wixlib/FirewallExtension.wxs
@@ -1,12 +1,11 @@
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">
6 <?include caerr.wxi ?> 5 <?include caerr.wxi ?>
7 <Fragment> 6 <Fragment>
8 <UI Id="WixFirewallErrors"> 7 <UI Id="WixFirewallErrors">
9 <Error Id="$(var.msierrFirewallCannotConnect)">!(loc.msierrFirewallCannotConnect)</Error> 8 <Error Id="$(var.msierrFirewallCannotConnect)" Message="!(loc.msierrFirewallCannotConnect)" />
10 </UI> 9 </UI>
11 </Fragment> 10 </Fragment>
12</Wix> 11</Wix>
diff --git a/src/wixlib/FirewallExtension_Platform.wxi b/src/wixlib/FirewallExtension_Platform.wxi
index 4af785bb..3861bd5d 100644
--- a/src/wixlib/FirewallExtension_Platform.wxi
+++ b/src/wixlib/FirewallExtension_Platform.wxi
@@ -13,12 +13,12 @@
13 <ProgressText Action="$(var.Prefix)ExecFirewallExceptionsUninstall$(var.Suffix)" Message="!(loc.WixExecFirewallExceptionsUninstall)" /> 13 <ProgressText Action="$(var.Prefix)ExecFirewallExceptionsUninstall$(var.Suffix)" Message="!(loc.WixExecFirewallExceptionsUninstall)" />
14 </UI> 14 </UI>
15 15
16 <CustomAction Id="$(var.Prefix)SchedFirewallExceptionsInstall$(var.Suffix)" BinaryKey="$(var.Prefix)FWCA$(var.Suffix)" DllEntry="SchedFirewallExceptionsInstall" Execute="immediate" 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)" BinaryKey="$(var.Prefix)FWCA$(var.Suffix)" DllEntry="SchedFirewallExceptionsUninstall" Execute="immediate" Return="check" SuppressModularization="yes" /> 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)" BinaryKey="$(var.Prefix)FWCA$(var.Suffix)" DllEntry="ExecFirewallExceptions" Execute="rollback" Impersonate="no" Return="check" SuppressModularization="yes" /> 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)" BinaryKey="$(var.Prefix)FWCA$(var.Suffix)" DllEntry="ExecFirewallExceptions" Execute="deferred" Impersonate="no" Return="check" SuppressModularization="yes" /> 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)" BinaryKey="$(var.Prefix)FWCA$(var.Suffix)" DllEntry="ExecFirewallExceptions" Execute="rollback" Impersonate="no" Return="check" SuppressModularization="yes" /> 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)" BinaryKey="$(var.Prefix)FWCA$(var.Suffix)" DllEntry="ExecFirewallExceptions" Execute="deferred" Impersonate="no" Return="check" SuppressModularization="yes" /> 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 22
23 <!-- 23 <!--
24 We need the firewall on Windows XP SP2 or later. 24 We need the firewall on Windows XP SP2 or later.
diff --git a/src/wixlib/FirewallExtension_arm.wxs b/src/wixlib/FirewallExtension_arm.wxs
deleted file mode 100644
index 8afe1589..00000000
--- a/src/wixlib/FirewallExtension_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 FirewallExtension_Platform.wxi ?>
8</Wix>
diff --git a/src/wixlib/FirewallExtension_arm64.wxs b/src/wixlib/FirewallExtension_arm64.wxs
index 4fc16b63..63cdd1e8 100644
--- a/src/wixlib/FirewallExtension_arm64.wxs
+++ b/src/wixlib/FirewallExtension_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/FirewallExtension_x64.wxs b/src/wixlib/FirewallExtension_x64.wxs
index 8317c20b..842aedf1 100644
--- a/src/wixlib/FirewallExtension_x64.wxs
+++ b/src/wixlib/FirewallExtension_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/FirewallExtension_x86.wxs b/src/wixlib/FirewallExtension_x86.wxs
index b43a4c5f..5867f791 100644
--- a/src/wixlib/FirewallExtension_x86.wxs
+++ b/src/wixlib/FirewallExtension_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 7db8a9c2..ab9ce8a0 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/es-es.wxl b/src/wixlib/es-es.wxl
index 45d5fd0e..0631b3a3 100644
--- a/src/wixlib/es-es.wxl
+++ b/src/wixlib/es-es.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<WixLocalization Culture="es-es" xmlns="http://wixtoolset.org/schemas/v4/wxl"> 3<WixLocalization Culture="es-es" xmlns="http://wixtoolset.org/schemas/v4/wxl">
5 <String Id="msierrFirewallCannotConnect" Overridable="yes">No se puede conectar al Firewall de Windows. ([2] [3] [4] [5])</String> 4 <String Id="msierrFirewallCannotConnect" Overridable="yes">No se puede conectar al Firewall de Windows. ([2] [3] [4] [5])</String>
diff --git a/src/wixlib/firewall.wixproj b/src/wixlib/firewall.wixproj
index 7e92bf1a..049b26b1 100644
--- a/src/wixlib/firewall.wixproj
+++ b/src/wixlib/firewall.wixproj
@@ -8,7 +8,12 @@
8 </PropertyGroup> 8 </PropertyGroup>
9 9
10 <ItemGroup> 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>
12 <ProjectReference Include="..\ca\fwca.vcxproj" Properties="Platform=ARM64" /> 17 <ProjectReference Include="..\ca\fwca.vcxproj" Properties="Platform=ARM64" />
13 <ProjectReference Include="..\ca\fwca.vcxproj" Properties="Platform=x86" /> 18 <ProjectReference Include="..\ca\fwca.vcxproj" Properties="Platform=x86" />
14 <ProjectReference Include="..\ca\fwca.vcxproj" Properties="Platform=x64" /> 19 <ProjectReference Include="..\ca\fwca.vcxproj" Properties="Platform=x64" />
diff --git a/src/wixlib/ja-jp.wxl b/src/wixlib/ja-jp.wxl
index b6c0b96e..a4036c7e 100644
--- a/src/wixlib/ja-jp.wxl
+++ b/src/wixlib/ja-jp.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="ja-jp" xmlns="http://wixtoolset.org/schemas/v4/wxl"> 4<WixLocalization Culture="ja-jp" xmlns="http://wixtoolset.org/schemas/v4/wxl">
diff --git a/src/wixlib/pl-pl.wxl b/src/wixlib/pl-pl.wxl
index a685917c..1b37460e 100644
--- a/src/wixlib/pl-pl.wxl
+++ b/src/wixlib/pl-pl.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="pl-pl" xmlns="http://wixtoolset.org/schemas/v4/wxl"> 4<WixLocalization Culture="pl-pl" xmlns="http://wixtoolset.org/schemas/v4/wxl">
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-22 13:46:31 +0000