From 461350c09839f1e59fb3dafe1a67e74bf152f803 Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Mon, 22 Jun 2020 19:35:34 -0400 Subject: If no Media or MediaTemplate is present, default to a MediaTemplate. --- src/WixToolset.Core/Compiler.cs | 9 --------- 1 file changed, 9 deletions(-) (limited to 'src/WixToolset.Core/Compiler.cs') diff --git a/src/WixToolset.Core/Compiler.cs b/src/WixToolset.Core/Compiler.cs index 9681cb3f..ae7f7624 100644 --- a/src/WixToolset.Core/Compiler.cs +++ b/src/WixToolset.Core/Compiler.cs @@ -5870,7 +5870,6 @@ namespace WixToolset.Core } } - if (!this.Core.EncounteredError) { var patchAttributes = PatchAttributeType.None; @@ -5957,8 +5956,6 @@ namespace WixToolset.Core } } - this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.Media, diskId.ToString(CultureInfo.InvariantCulture.NumberFormat)); - // If this component does not have a companion file this file is a possible keypath. possibleKeyPath = null; if (null == companionFile) @@ -7677,12 +7674,6 @@ namespace WixToolset.Core this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "SourceFile")); } - if (CompilerConstants.IntegerNotSet == diskId) - { - this.Core.Write(ErrorMessages.ExpectedAttributeInElementOrParent(sourceLineNumbers, node.Name.LocalName, "DiskId", "Directory")); - diskId = CompilerConstants.IllegalInteger; - } - foreach (var child in node.Elements()) { if (CompilerCore.WixNamespace == child.Name.Namespace) -- cgit v1.2.3-55-g6feb