From 461350c09839f1e59fb3dafe1a67e74bf152f803 Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@joyofsetup.com>
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 ---------
 src/WixToolset.Core/Linker.cs   | 1 -
 2 files changed, 10 deletions(-)

(limited to 'src/WixToolset.Core')

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)
diff --git a/src/WixToolset.Core/Linker.cs b/src/WixToolset.Core/Linker.cs
index fb1b2488..cbdb46d0 100644
--- a/src/WixToolset.Core/Linker.cs
+++ b/src/WixToolset.Core/Linker.cs
@@ -140,7 +140,6 @@ namespace WixToolset.Core
 #endif
 
                 // First find the entry section and while processing all sections load all the symbols from all of the sections.
-                // sections.FindEntrySectionAndLoadSymbols(false, this, expectedOutputType, out entrySection, out allSymbols);
                 var find = new FindEntrySectionAndLoadSymbolsCommand(this.Messaging, sections, this.Context.ExpectedOutputType);
                 find.Execute();
 
-- 
cgit v1.2.3-55-g6feb