2 files changed, 22 insertions, 14 deletions

diff --git a/src/ext/Firewall/wixext/FirewallDecompiler.cs b/src/ext/Firewall/wixext/FirewallDecompiler.cs
index 4fafc0a0..dbfc882e 100644
--- a/src/ext/Firewall/wixext/FirewallDecompiler.cs
+++ b/src/ext/Firewall/wixext/FirewallDecompiler.cs
@@ -4,8 +4,6 @@ namespace WixToolset.Firewall
 {
     using System;
     using System.Collections.Generic;
-    using System.Reflection;
-    using System.Security;
     using System.Xml.Linq;
     using WixToolset.Data;
     using WixToolset.Data.WindowsInstaller;
@@ -83,7 +81,7 @@ namespace WixToolset.Firewall
                     string[] addresses = ((string)row[2]).Split(',');
                     if (addresses.Length == 1)
                     {
-                        switch(addresses[0])
+                        switch (addresses[0])
                         {
                             case "*":
                                 firewallException.Add(new XAttribute("Scope", "any"));
@@ -482,20 +480,25 @@ namespace WixToolset.Firewall
         /// <param name="tables">Collection of all tables.</param>
         private void FinalizeFirewallExceptionTable(TableIndexedCollection tables)
         {
-            if (tables.TryGetTable("Wix5FirewallException", out var firewallExceptionTable))
+            var possibleTableNames = new List<string>() { "WixFirewallException", "Wix4FirewallException", "Wix5FirewallException", };
+
+            foreach (var tableName in possibleTableNames)
             {
-                foreach (var row in firewallExceptionTable.Rows)
+                if (tables.TryGetTable(tableName, out var firewallExceptionTable))
                 {
-                    var xmlConfig = this.DecompilerHelper.GetIndexedElement(row);
-
-                    var componentId = row.FieldAsString(8);
-                    if (this.DecompilerHelper.TryGetIndexedElement("Component", componentId, out var component))
-                    {
-                        component.Add(xmlConfig);
-                    }
-                    else
+                    foreach (var row in firewallExceptionTable.Rows)
                     {
-                        this.Messaging.Write(WarningMessages.ExpectedForeignRow(row.SourceLineNumbers, firewallExceptionTable.Name, row.GetPrimaryKey(), "Component_", componentId, "Component"));
+                        var xmlConfig = this.DecompilerHelper.GetIndexedElement(row);
+
+                        var componentId = row.FieldAsString(8);
+                        if (this.DecompilerHelper.TryGetIndexedElement("Component", componentId, out var component))
+                        {
+                            component.Add(xmlConfig);
+                        }
+                        else
+                        {
+                            this.Messaging.Write(WarningMessages.ExpectedForeignRow(row.SourceLineNumbers, firewallExceptionTable.Name, row.GetPrimaryKey(), "Component_", componentId, "Component"));
+                        }
                     }
                 }
             }
diff --git a/src/ext/Firewall/wixext/WixToolset.Firewall.wixext.csproj b/src/ext/Firewall/wixext/WixToolset.Firewall.wixext.csproj
index 25322dc4..f9032032 100644
--- a/src/ext/Firewall/wixext/WixToolset.Firewall.wixext.csproj
+++ b/src/ext/Firewall/wixext/WixToolset.Firewall.wixext.csproj
@@ -7,6 +7,7 @@
     <RootNamespace>WixToolset.Firewall</RootNamespace>
     <Description>WiX Toolset Firewall Extension</Description>
     <Title>WiX Toolset Firewall Extension</Title>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
     <DebugType>embedded</DebugType>
   </PropertyGroup>
 
@@ -16,6 +17,10 @@
     <EmbeddedResource Include="$(OutputPath)..\firewall.wixlib" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="..\README.md" Pack="true" PackagePath="\" />
+  </ItemGroup>
+
   <ItemGroup Condition=" '$(NCrunch)'=='' ">
     <ProjectReference Include="..\wixlib\firewall.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
   </ItemGroup>