diff options
author | Rob Mensching <rob@firegiant.com> | 2018-11-02 23:40:47 -0700 |
---|---|---|
committer | Rob Mensching <rob@robmensching.com> | 2018-11-02 23:47:02 -0700 |
commit | 342fd42e7c6009e5d50a8a0a436d4ee4319ed3be (patch) | |
tree | 78aa23de2348676d6367d1557a0124524b6d4c14 /src | |
parent | 13ea8f9e17f0bae1158b4a0f3c37e995e9816027 (diff) | |
download | wix-342fd42e7c6009e5d50a8a0a436d4ee4319ed3be.tar.gz wix-342fd42e7c6009e5d50a8a0a436d4ee4319ed3be.tar.bz2 wix-342fd42e7c6009e5d50a8a0a436d4ee4319ed3be.zip |
Change DecompileResult document path to XDocument
Fixes wixtoolset/issues#5896
Diffstat (limited to 'src')
-rw-r--r-- | src/WixToolset.Extensibility/Data/DecompileResult.cs | 3 | ||||
-rw-r--r-- | src/WixToolset.Extensibility/IDecompilerCore.cs | 73 |
2 files changed, 2 insertions, 74 deletions
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 @@ | |||
3 | namespace WixToolset.Extensibility.Data | 3 | namespace WixToolset.Extensibility.Data |
4 | { | 4 | { |
5 | using System.Collections.Generic; | 5 | using System.Collections.Generic; |
6 | using System.Xml.Linq; | ||
6 | 7 | ||
7 | public class DecompileResult | 8 | public class DecompileResult |
8 | { | 9 | { |
9 | public string SourceDocumentPath { get; set; } | 10 | public XDocument Document { get; set; } |
10 | 11 | ||
11 | public IEnumerable<string> ExtractedFilePaths { get; set; } | 12 | public IEnumerable<string> ExtractedFilePaths { get; set; } |
12 | } | 13 | } |
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 @@ | |||
1 | // 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. | ||
2 | |||
3 | namespace WixToolset.Extensibility | ||
4 | { | ||
5 | using System; | ||
6 | using WixToolset.Data; | ||
7 | using Wix = WixToolset.Data.Serialize; | ||
8 | |||
9 | public interface IDecompilerCore | ||
10 | { | ||
11 | |||
12 | /// <summary> | ||
13 | /// Gets whether the decompiler core encountered an error while processing. | ||
14 | /// </summary> | ||
15 | /// <value>Flag if core encountered an error during processing.</value> | ||
16 | bool EncounteredError { get; } | ||
17 | |||
18 | /// <summary> | ||
19 | /// Gets the root element of the decompiled output. | ||
20 | /// </summary> | ||
21 | /// <value>The root element of the decompiled output.</value> | ||
22 | Wix.IParentElement RootElement { get; } | ||
23 | |||
24 | /// <summary> | ||
25 | /// Gets the UI element. | ||
26 | /// </summary> | ||
27 | /// <value>The UI element.</value> | ||
28 | Wix.UI UIElement { get; } | ||
29 | |||
30 | /// <summary> | ||
31 | /// Verifies if a filename is a valid short filename. | ||
32 | /// </summary> | ||
33 | /// <param name="filename">Filename to verify.</param> | ||
34 | /// <param name="allowWildcards">true if wildcards are allowed in the filename.</param> | ||
35 | /// <returns>True if the filename is a valid short filename</returns> | ||
36 | bool IsValidShortFilename(string filename, bool allowWildcards); | ||
37 | |||
38 | /// <summary> | ||
39 | /// Convert an Int32 into a DateTime. | ||
40 | /// </summary> | ||
41 | /// <param name="value">The Int32 value.</param> | ||
42 | /// <returns>The DateTime.</returns> | ||
43 | DateTime ConvertIntegerToDateTime(int value); | ||
44 | |||
45 | /// <summary> | ||
46 | /// Gets the element corresponding to the row it came from. | ||
47 | /// </summary> | ||
48 | /// <param name="row">The row corresponding to the element.</param> | ||
49 | /// <returns>The indexed element.</returns> | ||
50 | Wix.ISchemaElement GetIndexedElement(IntermediateTuple row); | ||
51 | |||
52 | /// <summary> | ||
53 | /// Gets the element corresponding to the primary key of the given table. | ||
54 | /// </summary> | ||
55 | /// <param name="table">The table corresponding to the element.</param> | ||
56 | /// <param name="primaryKey">The primary key corresponding to the element.</param> | ||
57 | /// <returns>The indexed element.</returns> | ||
58 | Wix.ISchemaElement GetIndexedElement(string table, params string[] primaryKey); | ||
59 | |||
60 | /// <summary> | ||
61 | /// Index an element by its corresponding row. | ||
62 | /// </summary> | ||
63 | /// <param name="row">The row corresponding to the element.</param> | ||
64 | /// <param name="element">The element to index.</param> | ||
65 | void IndexElement(IntermediateTuple row, Wix.ISchemaElement element); | ||
66 | |||
67 | /// <summary> | ||
68 | /// Indicates the decompiler encountered and unexpected table to decompile. | ||
69 | /// </summary> | ||
70 | /// <param name="table">Unknown decompiled table.</param> | ||
71 | void UnexpectedTable(string table); | ||
72 | } | ||
73 | } | ||