1 files changed, 40 insertions, 1 deletions

diff --git a/src/ext/Firewall/test/WixToolsetTest.Firewall/FirewallExtensionFixture.cs b/src/ext/Firewall/test/WixToolsetTest.Firewall/FirewallExtensionFixture.cs
index 4b9aecd7..3be8af0e 100644
--- a/src/ext/Firewall/test/WixToolsetTest.Firewall/FirewallExtensionFixture.cs
+++ b/src/ext/Firewall/test/WixToolsetTest.Firewall/FirewallExtensionFixture.cs
@@ -1,7 +1,12 @@
 // 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.
 
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+[assembly: Parallelize(Scope = ExecutionScope.MethodLevel)]
+
 namespace WixToolsetTest.Firewall
 {
+    using System;
     using System.Data;
     using System.IO;
     using System.Linq;
@@ -621,6 +626,39 @@ namespace WixToolsetTest.Firewall
             }, locals.ToArray());
         }
 
+        [TestMethod]
+        public void CanDecompileWix4FirewallPackage()
+        {
+            var folder = TestData.Get(@"TestData\DecompileWix4Firewall");
+            var output = Path.Combine(folder, "DecompiledWix4Firewall.xml");
+
+            var result = WixRunner.Execute(
+                "msi",
+                "decompile",
+                "-ext", Path.GetFullPath(typeof(FirewallExtensionFactory).Assembly.Location),
+                Path.Combine(folder, "Firewall4.msi"),
+                "-o", output
+                );
+            result.AssertSuccess();
+
+            var doc = XDocument.Load(output);
+            var actual = doc.Descendants()
+                .Where(e => e.Name.Namespace == "http://wixtoolset.org/schemas/v4/wxs/firewall")
+                .Select(fe => new { Name = fe.Name.LocalName, Attributes = fe.Attributes().Select(a => $"{a.Name.LocalName}={a.Value}").ToArray() })
+                .ToArray();
+
+            WixAssert.CompareLineByLine(new[]
+            {
+                "FirewallException",
+                "RemoteAddress",
+                "RemoteAddress",
+                "RemoteAddress",
+                "RemoteAddress",
+                "RemoteAddress",
+                "FirewallException",
+            }, actual.Select(a => a.Name).ToArray());
+        }
+
         private static void Build(string[] args)
         {
             var result = WixRunner.Execute(args);
@@ -654,8 +692,9 @@ namespace WixToolsetTest.Firewall
             var folder = TestData.Get(@"TestData", path);
             var build = new Builder(folder, typeof(FirewallExtensionFactory), new[] { folder });
             var output = Path.Combine(folder, $"Firewall{ruleName}.xml");
+            var isOfficialBuild = !String.IsNullOrEmpty(Environment.GetEnvironmentVariable("WixOfficialBuild"));
 
-            build.BuildAndDecompileAndBuild(Build, Decompile, output, validate: true);
+            build.BuildAndDecompileAndBuild(Build, Decompile, output, validate: isOfficialBuild);
 
             var doc = XDocument.Load(output);
             var actual = doc.Descendants()