From 7e1597b3d7600ed6d0437334e817b9202e6e8b30 Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Mon, 26 Oct 2020 21:51:00 -0400
Subject: Clean up MediaTemplate and tweak a bit.

---
 src/WixToolset.Converters/FixupCommandBase.cs |  3 ++-
 src/WixToolset.Converters/WixConverter.cs     | 15 ++++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/WixToolset.Converters/FixupCommandBase.cs b/src/WixToolset.Converters/FixupCommandBase.cs
index 0f58fbdb..14edf97b 100644
--- a/src/WixToolset.Converters/FixupCommandBase.cs
+++ b/src/WixToolset.Converters/FixupCommandBase.cs
@@ -69,7 +69,7 @@ namespace WixToolset.Converters
                     return true;
 
                 case "n":
-                case "--dry-run":
+                case "-dry-run":
                     this.DryRun = true;
                     return true;
 
@@ -81,6 +81,7 @@ namespace WixToolset.Converters
                 case "s":
                 case "r":
                 case "-recurse":
+                case "-recursive":
                     this.Recurse = true;
                     return true;
 
diff --git a/src/WixToolset.Converters/WixConverter.cs b/src/WixToolset.Converters/WixConverter.cs
index bfdaa31b..ac63f26b 100644
--- a/src/WixToolset.Converters/WixConverter.cs
+++ b/src/WixToolset.Converters/WixConverter.cs
@@ -88,6 +88,7 @@ namespace WixToolset.Converters
         private static readonly XName Include3ElementName = Wix3Namespace + "Include";
         private static readonly XName IncludeElementWithoutNamespaceName = XNamespace.None + "Include";
         private static readonly XName SummaryInformationElementName = WixNamespace + "SummaryInformation";
+        private static readonly XName MediaTemplateElementName = WixNamespace + "MediaTemplate";
 
         private static readonly Dictionary<string, XNamespace> OldToNewNamespaceMapping = new Dictionary<string, XNamespace>()
         {
@@ -730,6 +731,13 @@ namespace WixToolset.Converters
                 }
             }
 
+            var xMediaTemplate = element.Element(MediaTemplateElementName);
+            if (xMediaTemplate?.HasAttributes == false
+                && this.OnError(ConverterTestType.DefaultMediaTemplate, element, "A MediaTemplate with no attributes set is now provided by default. Remove the element."))
+            {
+                xMediaTemplate.Remove();
+            }
+
             if (this.OnError(ConverterTestType.ProductAndPackageRenamed, element, "The Product and Package elements have been renamed and reorganized for simplicity."))
             {
                 var xPackage = element;
@@ -742,7 +750,7 @@ namespace WixToolset.Converters
 
                     RemoveAttribute(xSummaryInformation, "AdminImage");
                     RemoveAttribute(xSummaryInformation, "Comments");
-                    MoveAttribute(xSummaryInformation, "Compressed", xPackage);
+                    MoveAttribute(xSummaryInformation, "Compressed", xPackage, defaultValue: "no");
                     RemoveAttribute(xSummaryInformation, "Id");
                     MoveAttribute(xSummaryInformation, "InstallerVersion", xPackage, defaultValue: "500");
                     MoveAttribute(xSummaryInformation, "InstallScope", xPackage, "Scope", defaultValue: "perMachine");
@@ -1409,6 +1417,11 @@ namespace WixToolset.Converters
             /// The Module and Package elements have been renamed and reorganized.
             /// </summary>
             ModuleAndPackageRenamed,
+
+            /// <summary>
+            /// A MediaTemplate with no attributes set is now provided by default.
+            /// </summary>
+            DefaultMediaTemplate,
         }
     }
 }
-- 
cgit v1.2.3-55-g6feb