diff options
Diffstat (limited to '')
-rw-r--r-- | src/WixToolset.Core.WindowsInstaller/Patch.cs (renamed from src/WixToolset.Core/Patch.cs) | 41 |
1 files changed, 1 insertions, 40 deletions
diff --git a/src/WixToolset.Core/Patch.cs b/src/WixToolset.Core.WindowsInstaller/Patch.cs index e3e6c27f..67150e32 100644 --- a/src/WixToolset.Core/Patch.cs +++ b/src/WixToolset.Core.WindowsInstaller/Patch.cs | |||
@@ -9,35 +9,8 @@ namespace WixToolset.Data | |||
9 | using System.Globalization; | 9 | using System.Globalization; |
10 | using WixToolset.Data.Rows; | 10 | using WixToolset.Data.Rows; |
11 | using WixToolset.Extensibility; | 11 | using WixToolset.Extensibility; |
12 | using WixToolset.Msi; | ||
13 | using WixToolset.Core.Native; | 12 | using WixToolset.Core.Native; |
14 | 13 | using WixToolset.Msi; | |
15 | /// <summary> | ||
16 | /// Values for the OptimizeCA MsiPatchMetdata property, which indicates whether custom actions can be skipped when applying the patch. | ||
17 | /// </summary> | ||
18 | [Flags] | ||
19 | internal enum OptimizeCA | ||
20 | { | ||
21 | /// <summary> | ||
22 | /// No custom actions are skipped. | ||
23 | /// </summary> | ||
24 | None = 0, | ||
25 | |||
26 | /// <summary> | ||
27 | /// Skip property (type 51) and directory (type 35) assignment custom actions. | ||
28 | /// </summary> | ||
29 | SkipAssignment = 1, | ||
30 | |||
31 | /// <summary> | ||
32 | /// Skip immediate custom actions that are not property or directory assignment custom actions. | ||
33 | /// </summary> | ||
34 | SkipImmediate = 2, | ||
35 | |||
36 | /// <summary> | ||
37 | /// Skip custom actions that run within the script. | ||
38 | /// </summary> | ||
39 | SkipDeferred = 4, | ||
40 | } | ||
41 | 14 | ||
42 | /// <summary> | 15 | /// <summary> |
43 | /// Contains output tables and logic for building an MSP package. | 16 | /// Contains output tables and logic for building an MSP package. |
@@ -80,8 +53,6 @@ namespace WixToolset.Data | |||
80 | [SuppressMessage("Microsoft.Globalization", "CA1303:DoNotPassLiteralsAsLocalizedParameters", MessageId = "System.InvalidOperationException.#ctor(System.String)")] | 53 | [SuppressMessage("Microsoft.Globalization", "CA1303:DoNotPassLiteralsAsLocalizedParameters", MessageId = "System.InvalidOperationException.#ctor(System.String)")] |
81 | public void AttachTransforms(List<PatchTransform> transforms) | 54 | public void AttachTransforms(List<PatchTransform> transforms) |
82 | { | 55 | { |
83 | InspectorCore inspectorCore = new InspectorCore(); | ||
84 | |||
85 | // Track if at least one transform gets attached. | 56 | // Track if at least one transform gets attached. |
86 | bool attachedTransform = false; | 57 | bool attachedTransform = false; |
87 | 58 | ||
@@ -429,16 +400,6 @@ namespace WixToolset.Data | |||
429 | Row savedbyRow = patchSummaryInfo.CreateRow(null); | 400 | Row savedbyRow = patchSummaryInfo.CreateRow(null); |
430 | savedbyRow[0] = (int)SummaryInformation.Patch.TransformNames; | 401 | savedbyRow[0] = (int)SummaryInformation.Patch.TransformNames; |
431 | savedbyRow[1] = String.Join(";", (string[])transformNames.ToArray(typeof(string))); | 402 | savedbyRow[1] = String.Join(";", (string[])transformNames.ToArray(typeof(string))); |
432 | |||
433 | // inspect the patch and filtered transforms | ||
434 | foreach (InspectorExtension inspectorExtension in this.inspectorExtensions) | ||
435 | { | ||
436 | inspectorExtension.Core = inspectorCore; | ||
437 | inspectorExtension.InspectOutput(this.patch); | ||
438 | |||
439 | // reset | ||
440 | inspectorExtension.Core = null; | ||
441 | } | ||
442 | } | 403 | } |
443 | 404 | ||
444 | /// <summary> | 405 | /// <summary> |