diff options
author | Rob Mensching <rob@firegiant.com> | 2020-06-08 16:19:11 -0700 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2020-06-08 16:34:16 -0700 |
commit | 92f24ab5d534c8615bf223099e3c27b2a991a3c7 (patch) | |
tree | 44d9dff66ec2ea5cba0b5b22a9a6a422d0fb387f /src | |
parent | 3ad9ca681dceee849b7454cfa7f8f0a8e44bceea (diff) | |
download | wix-92f24ab5d534c8615bf223099e3c27b2a991a3c7.tar.gz wix-92f24ab5d534c8615bf223099e3c27b2a991a3c7.tar.bz2 wix-92f24ab5d534c8615bf223099e3c27b2a991a3c7.zip |
Support cancelling internal processes
Diffstat (limited to 'src')
7 files changed, 21 insertions, 7 deletions
diff --git a/src/WixToolset.Extensibility/Data/IBindContext.cs b/src/WixToolset.Extensibility/Data/IBindContext.cs index 3b8953e0..650e7fc1 100644 --- a/src/WixToolset.Extensibility/Data/IBindContext.cs +++ b/src/WixToolset.Extensibility/Data/IBindContext.cs | |||
@@ -2,8 +2,8 @@ | |||
2 | 2 | ||
3 | namespace WixToolset.Extensibility.Data | 3 | namespace WixToolset.Extensibility.Data |
4 | { | 4 | { |
5 | using System; | ||
6 | using System.Collections.Generic; | 5 | using System.Collections.Generic; |
6 | using System.Threading; | ||
7 | using WixToolset.Data; | 7 | using WixToolset.Data; |
8 | using WixToolset.Extensibility.Services; | 8 | using WixToolset.Extensibility.Services; |
9 | 9 | ||
@@ -44,5 +44,7 @@ namespace WixToolset.Extensibility.Data | |||
44 | bool SuppressValidation { get; set; } | 44 | bool SuppressValidation { get; set; } |
45 | 45 | ||
46 | bool SuppressLayout { get; set; } | 46 | bool SuppressLayout { get; set; } |
47 | |||
48 | CancellationToken CancellationToken { get; set; } | ||
47 | } | 49 | } |
48 | } | 50 | } |
diff --git a/src/WixToolset.Extensibility/Data/ICompileContext.cs b/src/WixToolset.Extensibility/Data/ICompileContext.cs index ef57f6d0..6ca990a2 100644 --- a/src/WixToolset.Extensibility/Data/ICompileContext.cs +++ b/src/WixToolset.Extensibility/Data/ICompileContext.cs | |||
@@ -2,8 +2,8 @@ | |||
2 | 2 | ||
3 | namespace WixToolset.Extensibility.Data | 3 | namespace WixToolset.Extensibility.Data |
4 | { | 4 | { |
5 | using System; | ||
6 | using System.Collections.Generic; | 5 | using System.Collections.Generic; |
6 | using System.Threading; | ||
7 | using System.Xml.Linq; | 7 | using System.Xml.Linq; |
8 | using WixToolset.Data; | 8 | using WixToolset.Data; |
9 | using WixToolset.Extensibility.Services; | 9 | using WixToolset.Extensibility.Services; |
@@ -25,5 +25,7 @@ namespace WixToolset.Extensibility.Data | |||
25 | Platform Platform { get; set; } | 25 | Platform Platform { get; set; } |
26 | 26 | ||
27 | XDocument Source { get; set; } | 27 | XDocument Source { get; set; } |
28 | |||
29 | CancellationToken CancellationToken { get; set; } | ||
28 | } | 30 | } |
29 | } | 31 | } |
diff --git a/src/WixToolset.Extensibility/Data/ILayoutContext.cs b/src/WixToolset.Extensibility/Data/ILayoutContext.cs index 721c5094..60e5cc8d 100644 --- a/src/WixToolset.Extensibility/Data/ILayoutContext.cs +++ b/src/WixToolset.Extensibility/Data/ILayoutContext.cs | |||
@@ -2,8 +2,8 @@ | |||
2 | 2 | ||
3 | namespace WixToolset.Extensibility.Data | 3 | namespace WixToolset.Extensibility.Data |
4 | { | 4 | { |
5 | using System; | ||
6 | using System.Collections.Generic; | 5 | using System.Collections.Generic; |
6 | using System.Threading; | ||
7 | using WixToolset.Extensibility.Services; | 7 | using WixToolset.Extensibility.Services; |
8 | 8 | ||
9 | public interface ILayoutContext | 9 | public interface ILayoutContext |
@@ -25,5 +25,7 @@ namespace WixToolset.Extensibility.Data | |||
25 | string BuiltOutputsFile { get; set; } | 25 | string BuiltOutputsFile { get; set; } |
26 | 26 | ||
27 | bool SuppressAclReset { get; set; } | 27 | bool SuppressAclReset { get; set; } |
28 | |||
29 | CancellationToken CancellationToken { get; set; } | ||
28 | } | 30 | } |
29 | } | 31 | } |
diff --git a/src/WixToolset.Extensibility/Data/ILibraryContext.cs b/src/WixToolset.Extensibility/Data/ILibraryContext.cs index 0371137b..12a400cd 100644 --- a/src/WixToolset.Extensibility/Data/ILibraryContext.cs +++ b/src/WixToolset.Extensibility/Data/ILibraryContext.cs | |||
@@ -2,8 +2,8 @@ | |||
2 | 2 | ||
3 | namespace WixToolset.Extensibility.Data | 3 | namespace WixToolset.Extensibility.Data |
4 | { | 4 | { |
5 | using System; | ||
6 | using System.Collections.Generic; | 5 | using System.Collections.Generic; |
6 | using System.Threading; | ||
7 | using WixToolset.Data; | 7 | using WixToolset.Data; |
8 | using WixToolset.Extensibility.Services; | 8 | using WixToolset.Extensibility.Services; |
9 | 9 | ||
@@ -22,5 +22,7 @@ namespace WixToolset.Extensibility.Data | |||
22 | IEnumerable<Localization> Localizations { get; set; } | 22 | IEnumerable<Localization> Localizations { get; set; } |
23 | 23 | ||
24 | IEnumerable<Intermediate> Intermediates { get; set; } | 24 | IEnumerable<Intermediate> Intermediates { get; set; } |
25 | |||
26 | CancellationToken CancellationToken { get; set; } | ||
25 | } | 27 | } |
26 | } | 28 | } |
diff --git a/src/WixToolset.Extensibility/Data/ILinkContext.cs b/src/WixToolset.Extensibility/Data/ILinkContext.cs index 4212339e..c12f6d12 100644 --- a/src/WixToolset.Extensibility/Data/ILinkContext.cs +++ b/src/WixToolset.Extensibility/Data/ILinkContext.cs | |||
@@ -2,8 +2,8 @@ | |||
2 | 2 | ||
3 | namespace WixToolset.Extensibility.Data | 3 | namespace WixToolset.Extensibility.Data |
4 | { | 4 | { |
5 | using System; | ||
6 | using System.Collections.Generic; | 5 | using System.Collections.Generic; |
6 | using System.Threading; | ||
7 | using WixToolset.Data; | 7 | using WixToolset.Data; |
8 | using WixToolset.Extensibility.Services; | 8 | using WixToolset.Extensibility.Services; |
9 | 9 | ||
@@ -20,5 +20,7 @@ namespace WixToolset.Extensibility.Data | |||
20 | IEnumerable<Intermediate> Intermediates { get; set; } | 20 | IEnumerable<Intermediate> Intermediates { get; set; } |
21 | 21 | ||
22 | ITupleDefinitionCreator TupleDefinitionCreator { get; set; } | 22 | ITupleDefinitionCreator TupleDefinitionCreator { get; set; } |
23 | |||
24 | CancellationToken CancellationToken { get; set; } | ||
23 | } | 25 | } |
24 | } | 26 | } |
diff --git a/src/WixToolset.Extensibility/Data/IPreprocessContext.cs b/src/WixToolset.Extensibility/Data/IPreprocessContext.cs index 89cbdd5d..3418242a 100644 --- a/src/WixToolset.Extensibility/Data/IPreprocessContext.cs +++ b/src/WixToolset.Extensibility/Data/IPreprocessContext.cs | |||
@@ -2,8 +2,8 @@ | |||
2 | 2 | ||
3 | namespace WixToolset.Extensibility.Data | 3 | namespace WixToolset.Extensibility.Data |
4 | { | 4 | { |
5 | using System; | ||
6 | using System.Collections.Generic; | 5 | using System.Collections.Generic; |
6 | using System.Threading; | ||
7 | using WixToolset.Data; | 7 | using WixToolset.Data; |
8 | using WixToolset.Extensibility.Services; | 8 | using WixToolset.Extensibility.Services; |
9 | 9 | ||
@@ -26,5 +26,7 @@ namespace WixToolset.Extensibility.Data | |||
26 | IDictionary<string, string> Variables { get; set; } | 26 | IDictionary<string, string> Variables { get; set; } |
27 | 27 | ||
28 | SourceLineNumber CurrentSourceLineNumber { get; set; } | 28 | SourceLineNumber CurrentSourceLineNumber { get; set; } |
29 | |||
30 | CancellationToken CancellationToken { get; set; } | ||
29 | } | 31 | } |
30 | } | 32 | } |
diff --git a/src/WixToolset.Extensibility/Data/IResolveContext.cs b/src/WixToolset.Extensibility/Data/IResolveContext.cs index 95845317..e84655b8 100644 --- a/src/WixToolset.Extensibility/Data/IResolveContext.cs +++ b/src/WixToolset.Extensibility/Data/IResolveContext.cs | |||
@@ -2,8 +2,8 @@ | |||
2 | 2 | ||
3 | namespace WixToolset.Extensibility.Data | 3 | namespace WixToolset.Extensibility.Data |
4 | { | 4 | { |
5 | using System; | ||
6 | using System.Collections.Generic; | 5 | using System.Collections.Generic; |
6 | using System.Threading; | ||
7 | using WixToolset.Data; | 7 | using WixToolset.Data; |
8 | using WixToolset.Extensibility.Services; | 8 | using WixToolset.Extensibility.Services; |
9 | 9 | ||
@@ -26,5 +26,7 @@ namespace WixToolset.Extensibility.Data | |||
26 | IEnumerable<Localization> Localizations { get; set; } | 26 | IEnumerable<Localization> Localizations { get; set; } |
27 | 27 | ||
28 | bool AllowUnresolvedVariables { get; set; } | 28 | bool AllowUnresolvedVariables { get; set; } |
29 | |||
30 | CancellationToken CancellationToken { get; set; } | ||
29 | } | 31 | } |
30 | } | 32 | } |