diff options
| author | Bob Arnson <bob@firegiant.com> | 2021-12-12 17:35:18 -0500 |
|---|---|---|
| committer | Bob Arnson <github@bobs.org> | 2021-12-17 09:03:18 -0500 |
| commit | ee8b4f230241a00d8e3ed145e85fb5d8d3c75914 (patch) | |
| tree | ee3d67d9452d8e4776ccf024261e1fbb7583f19f /src/ext/Firewall/test/WixToolsetTest.Firewall/TestData | |
| parent | 3542ddd0b007673f3fc338bd53c3b807c3ed7308 (diff) | |
| download | wix-ee8b4f230241a00d8e3ed145e85fb5d8d3c75914.tar.gz wix-ee8b4f230241a00d8e3ed145e85fb5d8d3c75914.tar.bz2 wix-ee8b4f230241a00d8e3ed145e85fb5d8d3c75914.zip | |
Clean up Firewall extension (model for all).
Diffstat (limited to 'src/ext/Firewall/test/WixToolsetTest.Firewall/TestData')
5 files changed, 12 insertions, 51 deletions
diff --git a/src/ext/Firewall/test/WixToolsetTest.Firewall/TestData/UsingFirewall/PackageComponents.wxs b/src/ext/Firewall/test/WixToolsetTest.Firewall/TestData/UsingFirewall/PackageComponents.wxs index 53e75427..6e8e4ebf 100644 --- a/src/ext/Firewall/test/WixToolsetTest.Firewall/TestData/UsingFirewall/PackageComponents.wxs +++ b/src/ext/Firewall/test/WixToolsetTest.Firewall/TestData/UsingFirewall/PackageComponents.wxs | |||
| @@ -1,14 +1,16 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" | 2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" |
| 3 | xmlns:fw="http://wixtoolset.org/schemas/v4/wxs/firewall"> | 3 | xmlns:fw="http://wixtoolset.org/schemas/v4/wxs/firewall"> |
| 4 | <Fragment> | 4 | <Fragment> |
| 5 | <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER"> | 5 | <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER"> |
| 6 | <Component> | 6 | <Component> |
| 7 | <File Source="example.txt" /> | 7 | <File Name="fw.exe" Source="example.txt"> |
| 8 | <fw:FirewallException Id="ExampleFirewall" Description="An example firewall" Name="example" Port="42"> | 8 | <Shortcut Id="FwShortcut" Directory="INSTALLFOLDER" Name="Firewall" /> |
| 9 | <fw:RemoteAddress Value="*" /> | 9 | <fw:FirewallException Id="ExampleFirewall" Description="An example firewall" Name="example" Port="42" Outbound="true"> |
| 10 | </fw:FirewallException> | 10 | <fw:RemoteAddress Value="*" /> |
| 11 | </Component> | 11 | </fw:FirewallException> |
| 12 | </ComponentGroup> | 12 | </File> |
| 13 | </Fragment> | 13 | </Component> |
| 14 | </ComponentGroup> | ||
| 15 | </Fragment> | ||
| 14 | </Wix> | 16 | </Wix> |
diff --git a/src/ext/Firewall/test/WixToolsetTest.Firewall/TestData/UsingOutboundFirewall/Package.en-us.wxl b/src/ext/Firewall/test/WixToolsetTest.Firewall/TestData/UsingOutboundFirewall/Package.en-us.wxl deleted file mode 100644 index 38c12ac1..00000000 --- a/src/ext/Firewall/test/WixToolsetTest.Firewall/TestData/UsingOutboundFirewall/Package.en-us.wxl +++ /dev/null | |||
| @@ -1,11 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | |||
| 3 | <!-- | ||
| 4 | This file contains the declaration of all the localizable strings. | ||
| 5 | --> | ||
| 6 | <WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US"> | ||
| 7 | |||
| 8 | <String Id="DowngradeError">A newer version of [ProductName] is already installed.</String> | ||
| 9 | <String Id="FeatureTitle">MsiPackage</String> | ||
| 10 | |||
| 11 | </WixLocalization> | ||
diff --git a/src/ext/Firewall/test/WixToolsetTest.Firewall/TestData/UsingOutboundFirewall/Package.wxs b/src/ext/Firewall/test/WixToolsetTest.Firewall/TestData/UsingOutboundFirewall/Package.wxs deleted file mode 100644 index 411893bc..00000000 --- a/src/ext/Firewall/test/WixToolsetTest.Firewall/TestData/UsingOutboundFirewall/Package.wxs +++ /dev/null | |||
| @@ -1,15 +0,0 @@ | |||
| 1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | ||
| 2 | <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a"> | ||
| 3 | <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" /> | ||
| 4 | |||
| 5 | <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)"> | ||
| 6 | <ComponentGroupRef Id="ProductComponents" /> | ||
| 7 | </Feature> | ||
| 8 | </Package> | ||
| 9 | |||
| 10 | <Fragment> | ||
| 11 | <StandardDirectory Id="ProgramFilesFolder"> | ||
| 12 | <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> | ||
| 13 | </StandardDirectory> | ||
| 14 | </Fragment> | ||
| 15 | </Wix> | ||
diff --git a/src/ext/Firewall/test/WixToolsetTest.Firewall/TestData/UsingOutboundFirewall/PackageComponents.wxs b/src/ext/Firewall/test/WixToolsetTest.Firewall/TestData/UsingOutboundFirewall/PackageComponents.wxs deleted file mode 100644 index 8084706e..00000000 --- a/src/ext/Firewall/test/WixToolsetTest.Firewall/TestData/UsingOutboundFirewall/PackageComponents.wxs +++ /dev/null | |||
| @@ -1,14 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" | ||
| 3 | xmlns:fw="http://wixtoolset.org/schemas/v4/wxs/firewall"> | ||
| 4 | <Fragment> | ||
| 5 | <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER"> | ||
| 6 | <Component> | ||
| 7 | <File Source="example.txt" /> | ||
| 8 | <fw:FirewallException Description="An example outbound firewall" Name="example" Port="42" Outbound="yes"> | ||
| 9 | <fw:RemoteAddress Value="*" /> | ||
| 10 | </fw:FirewallException> | ||
| 11 | </Component> | ||
| 12 | </ComponentGroup> | ||
| 13 | </Fragment> | ||
| 14 | </Wix> | ||
diff --git a/src/ext/Firewall/test/WixToolsetTest.Firewall/TestData/UsingOutboundFirewall/example.txt b/src/ext/Firewall/test/WixToolsetTest.Firewall/TestData/UsingOutboundFirewall/example.txt deleted file mode 100644 index 1b4ffe8a..00000000 --- a/src/ext/Firewall/test/WixToolsetTest.Firewall/TestData/UsingOutboundFirewall/example.txt +++ /dev/null | |||
| @@ -1 +0,0 @@ | |||
| 1 | This is example.txt. \ No newline at end of file | ||