5 files changed, 59 insertions, 22 deletions

diff --git a/src/ext/Msmq/test/WixToolsetTest.Msmq/MsmqExtensionFixture.cs b/src/ext/Msmq/test/WixToolsetTest.Msmq/MsmqExtensionFixture.cs
index 424d3d5b..c89d138a 100644
--- a/src/ext/Msmq/test/WixToolsetTest.Msmq/MsmqExtensionFixture.cs
+++ b/src/ext/Msmq/test/WixToolsetTest.Msmq/MsmqExtensionFixture.cs
@@ -2,7 +2,10 @@
 
 namespace WixToolsetTest.Msmq
 {
+    using System.Data;
+    using System.IO;
     using System.Linq;
+    using System.Xml.Linq;
     using WixInternal.TestSupport;
     using WixInternal.Core.TestPackage;
     using WixToolset.Msmq;
@@ -34,6 +37,29 @@ namespace WixToolsetTest.Msmq
             }, results);
         }
 
+        [Fact]
+        public void CanRoundtripMessageQueue()
+        {
+            var folder = TestData.Get(@"TestData\UsingMessageQueue");
+            var build = new Builder(folder, new[] { typeof(MsmqExtensionFactory), typeof(UtilExtensionFactory) }, new[] { folder });
+            var output = Path.Combine(folder, "MessageQueueDecompile.xml");
+
+            build.BuildAndDecompileAndBuild(Build, Decompile, output);
+
+            var doc = XDocument.Load(output);
+            var actual = doc.Descendants()
+                .Where(e => e.Name.Namespace == "http://wixtoolset.org/schemas/v4/wxs/msmq")
+                .Select(fe => new { Name = fe.Name.LocalName, Id = fe.Attributes().Where(a => a.Name == "Id").Select(a => a.Value).FirstOrDefault() })
+                .ToArray();
+
+            WixAssert.CompareLineByLine(new[]
+            {
+                "MessageQueue:TestMQ",
+                "MessageQueuePermission:TestMQ_TestUser",
+                "MessageQueuePermission:TestMQ_TestGroup",
+            }, actual.Select(a => $"{a.Name}:{a.Id}").ToArray());
+        }
+
         private static void Build(string[] args)
         {
             args = args.Concat(new[] { "-arch", "arm64" }).ToArray();
@@ -41,5 +67,11 @@ namespace WixToolsetTest.Msmq
             var result = WixRunner.Execute(args);
             result.AssertSuccess();
         }
+
+        private static void Decompile(string[] args)
+        {
+            var result = WixRunner.Execute(args);
+            result.AssertSuccess();
+        }
     }
 }
diff --git a/src/ext/Msmq/wixext/MsmqDecompiler.cs b/src/ext/Msmq/wixext/MsmqDecompiler.cs
index 53734e88..44bd8aba 100644
--- a/src/ext/Msmq/wixext/MsmqDecompiler.cs
+++ b/src/ext/Msmq/wixext/MsmqDecompiler.cs
@@ -144,17 +144,17 @@ namespace WixToolset.Msmq
 
                 if (0 != (attributes & (int)MsmqCompiler.MqiMessageQueueAttributes.Authenticate))
                 {
-                    messageQueue.Add(new XAttribute("Authenticate", YesNoType.Yes));
+                    messageQueue.Add(new XAttribute("Authenticate", "yes"));
                 }
 
                 if (0 != (attributes & (int)MsmqCompiler.MqiMessageQueueAttributes.Journal))
                 {
-                    messageQueue.Add(new XAttribute("Journal", YesNoType.Yes));
+                    messageQueue.Add(new XAttribute("Journal", "yes"));
                 }
 
                 if (0 != (attributes & (int)MsmqCompiler.MqiMessageQueueAttributes.Transactional))
                 {
-                    messageQueue.Add(new XAttribute("Transactional", YesNoType.Yes));
+                    messageQueue.Add(new XAttribute("Transactional", "yes"));
                 }
 
                 this.DecompilerHelper.IndexElement(row, messageQueue);
@@ -337,82 +337,82 @@ namespace WixToolset.Msmq
 
             if (0 != (attributes & (int)MsmqCompiler.MqiMessageQueuePermission.DeleteMessage))
             {
-                element.Add("DeleteMessage", YesNoType.Yes);
+                element.Add(new XAttribute("DeleteMessage", "yes"));
             }
 
             if (0 != (attributes & (int)MsmqCompiler.MqiMessageQueuePermission.PeekMessage))
             {
-                element.Add("PeekMessage", YesNoType.Yes);
+                element.Add(new XAttribute("PeekMessage", "yes"));
             }
 
             if (0 != (attributes & (int)MsmqCompiler.MqiMessageQueuePermission.WriteMessage))
             {
-                element.Add("WriteMessage", YesNoType.Yes);
+                element.Add(new XAttribute("WriteMessage", "yes"));
             }
 
             if (0 != (attributes & (int)MsmqCompiler.MqiMessageQueuePermission.DeleteJournalMessage))
             {
-                element.Add("DeleteJournalMessage", YesNoType.Yes);
+                element.Add(new XAttribute("DeleteJournalMessage", "yes"));
             }
 
             if (0 != (attributes & (int)MsmqCompiler.MqiMessageQueuePermission.SetQueueProperties))
             {
-                element.Add("SetQueueProperties", YesNoType.Yes);
+                element.Add(new XAttribute("SetQueueProperties", "yes"));
             }
 
             if (0 != (attributes & (int)MsmqCompiler.MqiMessageQueuePermission.GetQueueProperties))
             {
-                element.Add("GetQueueProperties", YesNoType.Yes);
+                element.Add(new XAttribute("GetQueueProperties", "yes"));
             }
 
             if (0 != (attributes & (int)MsmqCompiler.MqiMessageQueuePermission.DeleteQueue))
             {
-                element.Add("DeleteQueue", YesNoType.Yes);
+                element.Add(new XAttribute("DeleteQueue", "yes"));
             }
 
             if (0 != (attributes & (int)MsmqCompiler.MqiMessageQueuePermission.GetQueuePermissions))
             {
-                element.Add("GetQueuePermissions", YesNoType.Yes);
+                element.Add(new XAttribute("GetQueuePermissions", "yes"));
             }
 
             if (0 != (attributes & (int)MsmqCompiler.MqiMessageQueuePermission.ChangeQueuePermissions))
             {
-                element.Add("ChangeQueuePermissions", YesNoType.Yes);
+                element.Add(new XAttribute("ChangeQueuePermissions", "yes"));
             }
 
             if (0 != (attributes & (int)MsmqCompiler.MqiMessageQueuePermission.TakeQueueOwnership))
             {
-                element.Add("TakeQueueOwnership", YesNoType.Yes);
+                element.Add(new XAttribute("TakeQueueOwnership", "yes"));
             }
 
             if (0 != (attributes & (int)MsmqCompiler.MqiMessageQueuePermission.ReceiveMessage))
             {
-                element.Add("ReceiveMessage", YesNoType.Yes);
+                element.Add(new XAttribute("ReceiveMessage", "yes"));
             }
 
             if (0 != (attributes & (int)MsmqCompiler.MqiMessageQueuePermission.ReceiveJournalMessage))
             {
-                element.Add("ReceiveJournalMessage", YesNoType.Yes);
+                element.Add(new XAttribute("ReceiveJournalMessage", "yes"));
             }
 
             if (0 != (attributes & (int)MsmqCompiler.MqiMessageQueuePermission.QueueGenericRead))
             {
-                element.Add("QueueGenericRead", YesNoType.Yes);
+                element.Add(new XAttribute("QueueGenericRead", "yes"));
             }
 
             if (0 != (attributes & (int)MsmqCompiler.MqiMessageQueuePermission.QueueGenericWrite))
             {
-                element.Add("QueueGenericWrite", YesNoType.Yes);
+                element.Add(new XAttribute("QueueGenericWrite", "yes"));
             }
 
             if (0 != (attributes & (int)MsmqCompiler.MqiMessageQueuePermission.QueueGenericExecute))
             {
-                element.Add("QueueGenericExecute", YesNoType.Yes);
+                element.Add(new XAttribute("QueueGenericExecute", "yes"));
             }
 
             if (0 != (attributes & (int)MsmqCompiler.MqiMessageQueuePermission.QueueGenericAll))
             {
-                element.Add("QueueGenericAll", YesNoType.Yes);
+                element.Add(new XAttribute("QueueGenericAll", "yes"));
             }
         }
     }
diff --git a/src/ext/Msmq/wixext/MsmqExtensionFactory.cs b/src/ext/Msmq/wixext/MsmqExtensionFactory.cs
index de9f786d..6bb3fb64 100644
--- a/src/ext/Msmq/wixext/MsmqExtensionFactory.cs
+++ b/src/ext/Msmq/wixext/MsmqExtensionFactory.cs
@@ -11,6 +11,7 @@ namespace WixToolset.Msmq
         protected override IReadOnlyCollection<Type> ExtensionTypes => new[]
         {
             typeof(MsmqCompiler),
+            typeof(MsmqDecompiler),
             typeof(MsmqExtensionData),
             typeof(MsmqWindowsInstallerBackendBinderExtension),
         };
diff --git a/src/ext/Msmq/wixext/MsmqTableDefinitions.cs b/src/ext/Msmq/wixext/MsmqTableDefinitions.cs
index 610e9409..0046c7ec 100644
--- a/src/ext/Msmq/wixext/MsmqTableDefinitions.cs
+++ b/src/ext/Msmq/wixext/MsmqTableDefinitions.cs
@@ -34,7 +34,7 @@ namespace WixToolset.Msmq
                 new ColumnDefinition("MessageQueueUserPermission", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("MessageQueue_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Wix4MessageQueue", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
-                new ColumnDefinition("User_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("User_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Wix4User", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("Permissions", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown),
             },
             symbolIdIsPrimaryKey: true
@@ -48,7 +48,7 @@ namespace WixToolset.Msmq
                 new ColumnDefinition("MessageQueueGroupPermission", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("MessageQueue_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Wix4MessageQueue", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
-                new ColumnDefinition("Group_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("Group_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Wix4Group", keyColumn: 1, modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("Permissions", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown),
             },
             symbolIdIsPrimaryKey: true
diff --git a/src/ext/Util/wixext/UtilDecompiler.cs b/src/ext/Util/wixext/UtilDecompiler.cs
index 1f3079d8..55323e15 100644
--- a/src/ext/Util/wixext/UtilDecompiler.cs
+++ b/src/ext/Util/wixext/UtilDecompiler.cs
@@ -435,11 +435,15 @@ namespace WixToolset.Util
         {
             foreach (var row in table.Rows)
             {
-                this.DecompilerHelper.AddElementToRoot(UtilConstants.GroupName,
+                var group = new XElement(UtilConstants.GroupName,
                     new XAttribute("Id", row.FieldAsString(0)),
                     new XAttribute("Name", row.FieldAsString(2)),
                     AttributeIfNotNull("Domain", row, 3)
                     );
+
+                this.DecompilerHelper.AddElementToRoot(group);
+
+                this.DecompilerHelper.IndexElement(row, group);
             }
         }
         /// <summary>