1 files changed, 52 insertions, 4 deletions

diff --git a/src/WixToolset.Core/Compiler_Module.cs b/src/WixToolset.Core/Compiler_Module.cs
index 2ecd9113..2f926d82 100644
--- a/src/WixToolset.Core/Compiler_Module.cs
+++ b/src/WixToolset.Core/Compiler_Module.cs
@@ -24,6 +24,12 @@ namespace WixToolset.Core
             var codepage = 0;
             string moduleId = null;
             string version = null;
+            var setCodepage = false;
+            var setPackageName = false;
+            var setKeywords = false;
+            var ignoredForMergeModules = false;
+
+            this.GetDefaultPlatformAndInstallerVersion(out var platform, out var msiVersion);
 
             this.activeName = null;
             this.activeLanguage = null;
@@ -50,7 +56,9 @@ namespace WixToolset.Core
                         break;
                     case "Guid":
                         moduleId = this.Core.GetAttributeGuidValue(sourceLineNumbers, attrib, false);
-                        this.Core.Write(WarningMessages.DeprecatedModuleGuidAttribute(sourceLineNumbers));
+                        break;
+                    case "InstallerVersion":
+                        msiVersion = this.Core.GetAttributeIntegerValue(sourceLineNumbers, attrib, 0, Int32.MaxValue);
                         break;
                     case "Language":
                         this.activeLanguage = this.Core.GetAttributeLocalizableIntegerValue(sourceLineNumbers, attrib, 0, Int16.MaxValue);
@@ -74,6 +82,11 @@ namespace WixToolset.Core
                 this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Id"));
             }
 
+            if (null == moduleId)
+            {
+                this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Guid"));
+            }
+
             if (null == this.activeLanguage)
             {
                 this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Language"));
@@ -174,9 +187,6 @@ namespace WixToolset.Core
                         case "IgnoreTable":
                             this.ParseIgnoreTableElement(child);
                             break;
-                        case "Package":
-                            this.ParsePackageElement(child, null, moduleId);
-                            break;
                         case "Property":
                             this.ParsePropertyElement(child);
                             break;
@@ -196,6 +206,9 @@ namespace WixToolset.Core
                         case "Substitution":
                             this.ParseSubstitutionElement(child);
                             break;
+                        case "SummaryInformation":
+                            this.ParseSummaryInformationElement(child, ref setCodepage, ref setPackageName, ref setKeywords, ref ignoredForMergeModules);
+                            break;
                         case "UI":
                             this.ParseUIElement(child);
                             break;
@@ -219,6 +232,33 @@ namespace WixToolset.Core
 
                 if (!this.Core.EncounteredError)
                 {
+                    if (!setCodepage)
+                    {
+                        this.Core.AddSymbol(new SummaryInformationSymbol(sourceLineNumbers)
+                        {
+                            PropertyId = SummaryInformationType.Codepage,
+                            Value = "1252"
+                        });
+                    }
+
+                    if (!setPackageName)
+                    {
+                        this.Core.AddSymbol(new SummaryInformationSymbol(sourceLineNumbers)
+                        {
+                            PropertyId = SummaryInformationType.Subject,
+                            Value = this.activeName
+                        });
+                    }
+
+                    if (!setKeywords)
+                    {
+                        this.Core.AddSymbol(new SummaryInformationSymbol(sourceLineNumbers)
+                        {
+                            PropertyId = SummaryInformationType.Keywords,
+                            Value = "Installer"
+                        });
+                    }
+
                     var symbol = this.Core.AddSymbol(new ModuleSignatureSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, this.activeName, this.activeLanguage))
                     {
                         ModuleID = this.activeName,
@@ -226,6 +266,14 @@ namespace WixToolset.Core
                     });
 
                     symbol.Set((int)ModuleSignatureSymbolFields.Language, this.activeLanguage);
+
+                    this.Core.AddSymbol(new SummaryInformationSymbol(sourceLineNumbers)
+                    {
+                        PropertyId = SummaryInformationType.PackageCode,
+                        Value = moduleId
+                    });
+
+                    this.ValidateAndAddCommonSummaryInformationSymbols(sourceLineNumbers, msiVersion, platform);
                 }
             }
             finally