From 342fd42e7c6009e5d50a8a0a436d4ee4319ed3be Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Fri, 2 Nov 2018 23:40:47 -0700 Subject: Change DecompileResult document path to XDocument Fixes wixtoolset/issues#5896 --- .../Data/DecompileResult.cs | 3 +- src/WixToolset.Extensibility/IDecompilerCore.cs | 73 ---------------------- 2 files changed, 2 insertions(+), 74 deletions(-) delete mode 100644 src/WixToolset.Extensibility/IDecompilerCore.cs (limited to 'src') diff --git a/src/WixToolset.Extensibility/Data/DecompileResult.cs b/src/WixToolset.Extensibility/Data/DecompileResult.cs index 29da4887..27706b2c 100644 --- a/src/WixToolset.Extensibility/Data/DecompileResult.cs +++ b/src/WixToolset.Extensibility/Data/DecompileResult.cs @@ -3,10 +3,11 @@ namespace WixToolset.Extensibility.Data { using System.Collections.Generic; + using System.Xml.Linq; public class DecompileResult { - public string SourceDocumentPath { get; set; } + public XDocument Document { get; set; } public IEnumerable ExtractedFilePaths { get; set; } } diff --git a/src/WixToolset.Extensibility/IDecompilerCore.cs b/src/WixToolset.Extensibility/IDecompilerCore.cs deleted file mode 100644 index 2133829a..00000000 --- a/src/WixToolset.Extensibility/IDecompilerCore.cs +++ /dev/null @@ -1,73 +0,0 @@ -// 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. - -namespace WixToolset.Extensibility -{ - using System; - using WixToolset.Data; - using Wix = WixToolset.Data.Serialize; - - public interface IDecompilerCore - { - - /// - /// Gets whether the decompiler core encountered an error while processing. - /// - /// Flag if core encountered an error during processing. - bool EncounteredError { get; } - - /// - /// Gets the root element of the decompiled output. - /// - /// The root element of the decompiled output. - Wix.IParentElement RootElement { get; } - - /// - /// Gets the UI element. - /// - /// The UI element. - Wix.UI UIElement { get; } - - /// - /// Verifies if a filename is a valid short filename. - /// - /// Filename to verify. - /// true if wildcards are allowed in the filename. - /// True if the filename is a valid short filename - bool IsValidShortFilename(string filename, bool allowWildcards); - - /// - /// Convert an Int32 into a DateTime. - /// - /// The Int32 value. - /// The DateTime. - DateTime ConvertIntegerToDateTime(int value); - - /// - /// Gets the element corresponding to the row it came from. - /// - /// The row corresponding to the element. - /// The indexed element. - Wix.ISchemaElement GetIndexedElement(IntermediateTuple row); - - /// - /// Gets the element corresponding to the primary key of the given table. - /// - /// The table corresponding to the element. - /// The primary key corresponding to the element. - /// The indexed element. - Wix.ISchemaElement GetIndexedElement(string table, params string[] primaryKey); - - /// - /// Index an element by its corresponding row. - /// - /// The row corresponding to the element. - /// The element to index. - void IndexElement(IntermediateTuple row, Wix.ISchemaElement element); - - /// - /// Indicates the decompiler encountered and unexpected table to decompile. - /// - /// Unknown decompiled table. - void UnexpectedTable(string table); -} -} -- cgit v1.2.3-55-g6feb