diff options
| -rw-r--r-- | src/test/WixToolsetTest.Firewall/FirewallExtensionFixture.cs | 2 | ||||
| -rw-r--r-- | src/wixlib/FirewallExtension_Platform.wxi | 23 |
2 files changed, 10 insertions, 15 deletions
diff --git a/src/test/WixToolsetTest.Firewall/FirewallExtensionFixture.cs b/src/test/WixToolsetTest.Firewall/FirewallExtensionFixture.cs index ceac4f26..dd7a4d67 100644 --- a/src/test/WixToolsetTest.Firewall/FirewallExtensionFixture.cs +++ b/src/test/WixToolsetTest.Firewall/FirewallExtensionFixture.cs | |||
| @@ -57,7 +57,7 @@ namespace WixToolsetTest.Firewall | |||
| 57 | var results = build.BuildAndQuery(Build, "WixFirewallException"); | 57 | var results = build.BuildAndQuery(Build, "WixFirewallException"); |
| 58 | Assert.Equal(new[] | 58 | Assert.Equal(new[] |
| 59 | { | 59 | { |
| 60 | "WixFirewallException:fexPv9RR1kBvP6gMgWyXMVQkVbopOA\texample\t*\t42\t6\t\t0\t2147483647\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\tAn example outbound firewall\t2", | 60 | "WixFirewallException:fex.5c8b_4C0THcQTvn8tpwhoRrgck\texample\t*\t42\t6\t\t0\t2147483647\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\tAn example outbound firewall\t2", |
| 61 | }, results); | 61 | }, results); |
| 62 | } | 62 | } |
| 63 | 63 | ||
diff --git a/src/wixlib/FirewallExtension_Platform.wxi b/src/wixlib/FirewallExtension_Platform.wxi index afd5f20b..4af785bb 100644 --- a/src/wixlib/FirewallExtension_Platform.wxi +++ b/src/wixlib/FirewallExtension_Platform.wxi | |||
| @@ -1,17 +1,16 @@ | |||
| 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 | <Include xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 3 | <Include xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
| 5 | <?include caDecor.wxi ?> | 4 | <?include caDecor.wxi ?> |
| 6 | <Fragment> | 5 | <Fragment> |
| 7 | <UIRef Id="WixFirewallErrors" /> | 6 | <UIRef Id="WixFirewallErrors" /> |
| 8 | <UI> | 7 | <UI> |
| 9 | <ProgressText Action="$(var.Prefix)SchedFirewallExceptionsInstall$(var.Suffix)">!(loc.WixSchedFirewallExceptionsInstall)</ProgressText> | 8 | <ProgressText Action="$(var.Prefix)SchedFirewallExceptionsInstall$(var.Suffix)" Message="!(loc.WixSchedFirewallExceptionsInstall)" /> |
| 10 | <ProgressText Action="$(var.Prefix)SchedFirewallExceptionsUninstall$(var.Suffix)">!(loc.WixSchedFirewallExceptionsUninstall)</ProgressText> | 9 | <ProgressText Action="$(var.Prefix)SchedFirewallExceptionsUninstall$(var.Suffix)" Message="!(loc.WixSchedFirewallExceptionsUninstall)" /> |
| 11 | <ProgressText Action="$(var.Prefix)RollbackFirewallExceptionsInstall$(var.Suffix)">!(loc.WixRollbackFirewallExceptionsInstall)</ProgressText> | 10 | <ProgressText Action="$(var.Prefix)RollbackFirewallExceptionsInstall$(var.Suffix)" Message="!(loc.WixRollbackFirewallExceptionsInstall)" /> |
| 12 | <ProgressText Action="$(var.Prefix)ExecFirewallExceptionsInstall$(var.Suffix)">!(loc.WixExecFirewallExceptionsInstall)</ProgressText> | 11 | <ProgressText Action="$(var.Prefix)ExecFirewallExceptionsInstall$(var.Suffix)" Message="!(loc.WixExecFirewallExceptionsInstall)" /> |
| 13 | <ProgressText Action="$(var.Prefix)RollbackFirewallExceptionsUninstall$(var.Suffix)">!(loc.WixRollbackFirewallExceptionsUninstall)</ProgressText> | 12 | <ProgressText Action="$(var.Prefix)RollbackFirewallExceptionsUninstall$(var.Suffix)" Message="!(loc.WixRollbackFirewallExceptionsUninstall)" /> |
| 14 | <ProgressText Action="$(var.Prefix)ExecFirewallExceptionsUninstall$(var.Suffix)">!(loc.WixExecFirewallExceptionsUninstall)</ProgressText> | 13 | <ProgressText Action="$(var.Prefix)ExecFirewallExceptionsUninstall$(var.Suffix)" Message="!(loc.WixExecFirewallExceptionsUninstall)" /> |
| 15 | </UI> | 14 | </UI> |
| 16 | 15 | ||
| 17 | <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)" BinaryKey="$(var.Prefix)FWCA$(var.Suffix)" DllEntry="SchedFirewallExceptionsInstall" Execute="immediate" Return="check" SuppressModularization="yes" /> |
| @@ -25,12 +24,8 @@ | |||
| 25 | We need the firewall on Windows XP SP2 or later. | 24 | We need the firewall on Windows XP SP2 or later. |
| 26 | --> | 25 | --> |
| 27 | <InstallExecuteSequence> | 26 | <InstallExecuteSequence> |
| 28 | <Custom Action="$(var.Prefix)SchedFirewallExceptionsUninstall$(var.Suffix)" Before="RemoveFiles" Overridable="yes"> | 27 | <Custom Action="$(var.Prefix)SchedFirewallExceptionsUninstall$(var.Suffix)" Before="RemoveFiles" Overridable="yes" Condition="VersionNT >= 600 OR (VersionNT >= 501 AND ((MsiNTProductType = 1 AND ServicePackLevel >= 2) OR (MsiNTProductType > 1 AND ServicePackLevel >= 1)))" /> |
| 29 | <![CDATA[ VersionNT >= 600 OR (VersionNT >= 501 AND ((MsiNTProductType = 1 AND ServicePackLevel >= 2) OR (MsiNTProductType > 1 AND ServicePackLevel >= 1))) ]]> | 28 | <Custom Action="$(var.Prefix)SchedFirewallExceptionsInstall$(var.Suffix)" After="InstallFiles" Overridable="yes" Condition="VersionNT >= 600 OR (VersionNT >= 501 AND ((MsiNTProductType = 1 AND ServicePackLevel >= 2) OR (MsiNTProductType > 1 AND ServicePackLevel >= 1)))" /> |
| 30 | </Custom> | ||
| 31 | <Custom Action="$(var.Prefix)SchedFirewallExceptionsInstall$(var.Suffix)" After="InstallFiles" Overridable="yes"> | ||
| 32 | <![CDATA[ VersionNT >= 600 OR (VersionNT >= 501 AND ((MsiNTProductType = 1 AND ServicePackLevel >= 2) OR (MsiNTProductType > 1 AND ServicePackLevel >= 1))) ]]> | ||
| 33 | </Custom> | ||
| 34 | </InstallExecuteSequence> | 29 | </InstallExecuteSequence> |
| 35 | </Fragment> | 30 | </Fragment> |
| 36 | 31 | ||