From 8e60e672e42202589f8827c06a69970b330d8d81 Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Thu, 28 Jan 2021 20:40:46 -0500
Subject: Fix Package/@Compressed for new (compressed) default.

---
 src/WixToolset.Converters/WixConverter.cs          | 10 +++-
 .../WixToolsetTest.Converters/ConditionFixture.cs  |  2 +-
 .../ProductPackageFixture.cs                       | 62 +++++++++++++++++++---
 .../Preprocessor/ConvertedPreprocessor.wxs         |  4 +-
 .../TestData/QtExec.bad/v4_expected.wxs            |  4 +-
 .../TestData/QtExec/v4_expected.wxs                |  4 +-
 .../TestData/SingleFile/ConvertedSingleFile.wxs    |  4 +-
 7 files changed, 72 insertions(+), 18 deletions(-)

(limited to 'src')

diff --git a/src/WixToolset.Converters/WixConverter.cs b/src/WixToolset.Converters/WixConverter.cs
index a7f08b88..c78e2245 100644
--- a/src/WixToolset.Converters/WixConverter.cs
+++ b/src/WixToolset.Converters/WixConverter.cs
@@ -964,9 +964,17 @@ namespace WixToolset.Converters
                         this.OnError(ConverterTestType.InstallerVersionBehaviorChange, element, "Breaking change: The default value for Package/@InstallerVersion has been changed to '500' regardless of build platform. If you need a lower version, set it manually in the Package element.");
                     }
 
+                    if (xSummaryInformation.Attribute("Compressed") == null)
+                    {
+                        xPackage.SetAttributeValue("Compressed", "no");
+                    }
+                    else
+                    {
+                        MoveAttribute(xSummaryInformation, "Compressed", xPackage, defaultValue: "yes");
+                    }
+
                     RemoveAttribute(xSummaryInformation, "AdminImage");
                     RemoveAttribute(xSummaryInformation, "Comments");
-                    MoveAttribute(xSummaryInformation, "Compressed", xPackage, defaultValue: "no");
                     RemoveAttribute(xSummaryInformation, "Id");
                     MoveAttribute(xSummaryInformation, "InstallerVersion", xPackage, defaultValue: "500");
                     MoveAttribute(xSummaryInformation, "InstallScope", xPackage, "Scope", defaultValue: "perMachine");
diff --git a/src/test/WixToolsetTest.Converters/ConditionFixture.cs b/src/test/WixToolsetTest.Converters/ConditionFixture.cs
index e5f33b04..d3f65aeb 100644
--- a/src/test/WixToolsetTest.Converters/ConditionFixture.cs
+++ b/src/test/WixToolsetTest.Converters/ConditionFixture.cs
@@ -233,7 +233,7 @@ namespace WixToolsetTest.Converters
             var expected = new[]
             {
                 "<Wix xmlns=\"http://wixtoolset.org/schemas/v4/wxs\">",
-                "  <Package>",
+                "  <Package Compressed=\"no\">",
                 "  ",
                 "    <Launch Condition=\"1&lt;2\" Message=\"Stop the install\" />",
                 "    <Launch Condition=\"1=2\" Message=\"Do not stop\" />",
diff --git a/src/test/WixToolsetTest.Converters/ProductPackageFixture.cs b/src/test/WixToolsetTest.Converters/ProductPackageFixture.cs
index 94681a4c..e01b9789 100644
--- a/src/test/WixToolsetTest.Converters/ProductPackageFixture.cs
+++ b/src/test/WixToolsetTest.Converters/ProductPackageFixture.cs
@@ -14,7 +14,7 @@ namespace WixToolsetTest.Converters
     public class ProductPackageFixture : BaseConverterFixture
     {
         [Fact]
-        public void FixesCompressed()
+        public void FixesCompressedWhenYes()
         {
             var parse = String.Join(Environment.NewLine,
                 "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
@@ -27,7 +27,53 @@ namespace WixToolsetTest.Converters
             var expected = new[]
             {
                 "<Wix xmlns=\"http://wixtoolset.org/schemas/v4/wxs\">",
-                "  <Package Compressed=\"yes\">",
+                "  <Package>",
+                "    ",
+                "  </Package>",
+                "</Wix>"
+            };
+
+            AssertSuccess(parse, 4, expected);
+        }
+
+        [Fact]
+        public void FixesCompressedWhenNo()
+        {
+            var parse = String.Join(Environment.NewLine,
+                "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
+                "<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>",
+                "  <Product>",
+                "    <Package Compressed='no' />",
+                "  </Product>",
+                "</Wix>");
+
+            var expected = new[]
+            {
+                "<Wix xmlns=\"http://wixtoolset.org/schemas/v4/wxs\">",
+                "  <Package Compressed=\"no\">",
+                "    ",
+                "  </Package>",
+                "</Wix>"
+            };
+
+            AssertSuccess(parse, 4, expected);
+        }
+
+        [Fact]
+        public void FixesCompressedWhenOmitted()
+        {
+            var parse = String.Join(Environment.NewLine,
+                "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
+                "<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>",
+                "  <Product>",
+                "    <Package />",
+                "  </Product>",
+                "</Wix>");
+
+            var expected = new[]
+            {
+                "<Wix xmlns=\"http://wixtoolset.org/schemas/v4/wxs\">",
+                "  <Package Compressed=\"no\">",
                 "    ",
                 "  </Package>",
                 "</Wix>"
@@ -64,7 +110,7 @@ namespace WixToolsetTest.Converters
             var expected = new[]
             {
                 "<Wix xmlns=\"http://wixtoolset.org/schemas/v4/wxs\">",
-                "  <Package InstallerVersion=\"666\">",
+                "  <Package Compressed=\"no\" InstallerVersion=\"666\">",
                 "    ",
                 "  </Package>",
                 "</Wix>"
@@ -87,7 +133,7 @@ namespace WixToolsetTest.Converters
             var expected = new[]
             {
                 "<Wix xmlns=\"http://wixtoolset.org/schemas/v4/wxs\">",
-                "  <Package>",
+                "  <Package Compressed=\"no\">",
                 "    ",
                 "  </Package>",
                 "</Wix>"
@@ -110,7 +156,7 @@ namespace WixToolsetTest.Converters
             var expected = new[]
             {
                 "<Wix xmlns=\"http://wixtoolset.org/schemas/v4/wxs\">",
-                "  <Package>",
+                "  <Package Compressed=\"no\">",
                 "    ",
                 "  </Package>",
                 "</Wix>"
@@ -133,7 +179,7 @@ namespace WixToolsetTest.Converters
             var expected = new[]
             {
                 "<Wix xmlns=\"http://wixtoolset.org/schemas/v4/wxs\">",
-                "  <Package InstallerVersion=\"200\">",
+                "  <Package Compressed=\"no\" InstallerVersion=\"200\">",
                 "    ",
                 "  </Package>",
                 "</Wix>"
@@ -156,7 +202,7 @@ namespace WixToolsetTest.Converters
             var expected = new[]
             {
                 "<Wix xmlns=\"http://wixtoolset.org/schemas/v4/wxs\">",
-                "  <Package Scope=\"perUser\">",
+                "  <Package Compressed=\"no\" Scope=\"perUser\">",
                 "    ",
                 "  </Package>",
                 "</Wix>"
@@ -180,7 +226,7 @@ namespace WixToolsetTest.Converters
             var expected = new[]
             {
                 "<Wix xmlns=\"http://wixtoolset.org/schemas/v4/wxs\">",
-                "  <Package>",
+                "  <Package Compressed=\"no\">",
                 "    ",
                 "    ",
                 "  </Package>",
diff --git a/src/test/WixToolsetTest.Converters/TestData/Preprocessor/ConvertedPreprocessor.wxs b/src/test/WixToolsetTest.Converters/TestData/Preprocessor/ConvertedPreprocessor.wxs
index e601ae2a..b2302b4c 100644
--- a/src/test/WixToolsetTest.Converters/TestData/Preprocessor/ConvertedPreprocessor.wxs
+++ b/src/test/WixToolsetTest.Converters/TestData/Preprocessor/ConvertedPreprocessor.wxs
@@ -1,11 +1,11 @@
-<!-- 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. -->
+<!-- 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. -->
 
 
 
 <?include WixVer.wxi ?>
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:swid="http://wixtoolset.org/schemas/v4/wxs/tag" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
-    <Package Name="!(loc.ShortProduct) v$(var.WixMajorMinor) Core" Language="1033" Manufacturer="!(loc.Company)" Version="$(var.WixMsiProductVersion)" UpgradeCode="3618724B-2523-44F9-A908-866AA619504D" Compressed="yes" InstallerVersion="200">
+    <Package Name="!(loc.ShortProduct) v$(var.WixMajorMinor) Core" Language="1033" Manufacturer="!(loc.Company)" Version="$(var.WixMsiProductVersion)" UpgradeCode="3618724B-2523-44F9-A908-866AA619504D" InstallerVersion="200">
         
         <swid:Tag Regid="!(loc.Regid)" InstallDirectory="INSTALLFOLDER" />
 
diff --git a/src/test/WixToolsetTest.Converters/TestData/QtExec.bad/v4_expected.wxs b/src/test/WixToolsetTest.Converters/TestData/QtExec.bad/v4_expected.wxs
index 169eb07e..f26b5d1a 100644
--- a/src/test/WixToolsetTest.Converters/TestData/QtExec.bad/v4_expected.wxs
+++ b/src/test/WixToolsetTest.Converters/TestData/QtExec.bad/v4_expected.wxs
@@ -1,11 +1,11 @@
-<!-- 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. -->
+<!-- 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. -->
 
 
 
 <?include WixVer.wxi ?>
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:swid="http://wixtoolset.org/schemas/v4/wxs/tag" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
-    <Package Name="!(loc.ShortProduct) v$(var.WixMajorMinor) Core" Language="1033" Manufacturer="!(loc.Company)" Version="$(var.WixMsiProductVersion)" UpgradeCode="3618724B-2523-44F9-A908-866AA619504D" Compressed="yes" InstallerVersion="200">
+    <Package Name="!(loc.ShortProduct) v$(var.WixMajorMinor) Core" Language="1033" Manufacturer="!(loc.Company)" Version="$(var.WixMsiProductVersion)" UpgradeCode="3618724B-2523-44F9-A908-866AA619504D" InstallerVersion="200">
         
         <swid:Tag Regid="!(loc.Regid)" InstallDirectory="INSTALLFOLDER" />
 
diff --git a/src/test/WixToolsetTest.Converters/TestData/QtExec/v4_expected.wxs b/src/test/WixToolsetTest.Converters/TestData/QtExec/v4_expected.wxs
index 71df9fd9..f5a02e2b 100644
--- a/src/test/WixToolsetTest.Converters/TestData/QtExec/v4_expected.wxs
+++ b/src/test/WixToolsetTest.Converters/TestData/QtExec/v4_expected.wxs
@@ -1,11 +1,11 @@
-<!-- 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. -->
+<!-- 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. -->
 
 
 
 <?include WixVer.wxi ?>
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:swid="http://wixtoolset.org/schemas/v4/wxs/tag" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
-    <Package Name="!(loc.ShortProduct) v$(var.WixMajorMinor) Core" Language="1033" Manufacturer="!(loc.Company)" Version="$(var.WixMsiProductVersion)" UpgradeCode="3618724B-2523-44F9-A908-866AA619504D" Compressed="yes" InstallerVersion="200">
+    <Package Name="!(loc.ShortProduct) v$(var.WixMajorMinor) Core" Language="1033" Manufacturer="!(loc.Company)" Version="$(var.WixMsiProductVersion)" UpgradeCode="3618724B-2523-44F9-A908-866AA619504D" InstallerVersion="200">
         
         <swid:Tag Regid="!(loc.Regid)" InstallDirectory="INSTALLFOLDER" />
 
diff --git a/src/test/WixToolsetTest.Converters/TestData/SingleFile/ConvertedSingleFile.wxs b/src/test/WixToolsetTest.Converters/TestData/SingleFile/ConvertedSingleFile.wxs
index b52f5855..9a83c237 100644
--- a/src/test/WixToolsetTest.Converters/TestData/SingleFile/ConvertedSingleFile.wxs
+++ b/src/test/WixToolsetTest.Converters/TestData/SingleFile/ConvertedSingleFile.wxs
@@ -1,11 +1,11 @@
-<!-- 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. -->
+<!-- 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. -->
 
 
 
 <?include WixVer.wxi ?>
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:swid="http://wixtoolset.org/schemas/v4/wxs/tag" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
-    <Package Name="!(loc.ShortProduct) v$(var.WixMajorMinor) Core" Language="1033" Manufacturer="!(loc.Company)" Version="$(var.WixMsiProductVersion)" UpgradeCode="3618724B-2523-44F9-A908-866AA619504D" Compressed="yes" InstallerVersion="200">
+    <Package Name="!(loc.ShortProduct) v$(var.WixMajorMinor) Core" Language="1033" Manufacturer="!(loc.Company)" Version="$(var.WixMsiProductVersion)" UpgradeCode="3618724B-2523-44F9-A908-866AA619504D" InstallerVersion="200">
         
         <swid:Tag Regid="!(loc.Regid)" InstallDirectory="INSTALLFOLDER" />
 
-- 
cgit v1.2.3-55-g6feb