diff options
Diffstat (limited to 'src/WixToolset.Core/Compiler.cs')
-rw-r--r-- | src/WixToolset.Core/Compiler.cs | 9 |
1 files changed, 0 insertions, 9 deletions
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 | |||
5870 | } | 5870 | } |
5871 | } | 5871 | } |
5872 | 5872 | ||
5873 | |||
5874 | if (!this.Core.EncounteredError) | 5873 | if (!this.Core.EncounteredError) |
5875 | { | 5874 | { |
5876 | var patchAttributes = PatchAttributeType.None; | 5875 | var patchAttributes = PatchAttributeType.None; |
@@ -5957,8 +5956,6 @@ namespace WixToolset.Core | |||
5957 | } | 5956 | } |
5958 | } | 5957 | } |
5959 | 5958 | ||
5960 | this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.Media, diskId.ToString(CultureInfo.InvariantCulture.NumberFormat)); | ||
5961 | |||
5962 | // If this component does not have a companion file this file is a possible keypath. | 5959 | // If this component does not have a companion file this file is a possible keypath. |
5963 | possibleKeyPath = null; | 5960 | possibleKeyPath = null; |
5964 | if (null == companionFile) | 5961 | if (null == companionFile) |
@@ -7677,12 +7674,6 @@ namespace WixToolset.Core | |||
7677 | this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "SourceFile")); | 7674 | this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "SourceFile")); |
7678 | } | 7675 | } |
7679 | 7676 | ||
7680 | if (CompilerConstants.IntegerNotSet == diskId) | ||
7681 | { | ||
7682 | this.Core.Write(ErrorMessages.ExpectedAttributeInElementOrParent(sourceLineNumbers, node.Name.LocalName, "DiskId", "Directory")); | ||
7683 | diskId = CompilerConstants.IllegalInteger; | ||
7684 | } | ||
7685 | |||
7686 | foreach (var child in node.Elements()) | 7677 | foreach (var child in node.Elements()) |
7687 | { | 7678 | { |
7688 | if (CompilerCore.WixNamespace == child.Name.Namespace) | 7679 | if (CompilerCore.WixNamespace == child.Name.Namespace) |