aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2021-04-02 14:00:05 -0700
committerRob Mensching <rob@firegiant.com>2021-04-02 14:48:18 -0700
commit4041669e1f3b3f094579e4f3368e6f57f46d7177 (patch)
treeb0be390b170db13b7cb5c4e6dfa242ca61684100 /src
parentf85e509dcb6da33c22f45ee27eff428398bbacf2 (diff)
downloadwix-4041669e1f3b3f094579e4f3368e6f57f46d7177.tar.gz
wix-4041669e1f3b3f094579e4f3368e6f57f46d7177.tar.bz2
wix-4041669e1f3b3f094579e4f3368e6f57f46d7177.zip
Add resolved codepage and LCID to bind context
Plus some XML documentation updates. Contributes to wixtoolset/issues#5801
Diffstat (limited to 'src')
-rw-r--r--src/WixToolset.Extensibility/Data/IBindContext.cs20
-rw-r--r--src/WixToolset.Extensibility/Data/IResolveContext.cs34
-rw-r--r--src/WixToolset.Extensibility/Data/IResolveResult.cs28
3 files changed, 74 insertions, 8 deletions
diff --git a/src/WixToolset.Extensibility/Data/IBindContext.cs b/src/WixToolset.Extensibility/Data/IBindContext.cs
index ee165671..f1977c01 100644
--- a/src/WixToolset.Extensibility/Data/IBindContext.cs
+++ b/src/WixToolset.Extensibility/Data/IBindContext.cs
@@ -28,11 +28,6 @@ namespace WixToolset.Extensibility.Data
28 string CabCachePath { get; set; } 28 string CabCachePath { get; set; }
29 29
30 /// <summary> 30 /// <summary>
31 /// Codepage for result.
32 /// </summary>
33 int Codepage { get; set; }
34
35 /// <summary>
36 /// Default compression level. 31 /// Default compression level.
37 /// </summary> 32 /// </summary>
38 CompressionLevel? DefaultCompressionLevel { get; set; } 33 CompressionLevel? DefaultCompressionLevel { get; set; }
@@ -88,6 +83,21 @@ namespace WixToolset.Extensibility.Data
88 string PdbPath { get; set; } 83 string PdbPath { get; set; }
89 84
90 /// <summary> 85 /// <summary>
86 /// Codepage from resolve.
87 /// </summary>
88 int? ResolvedCodepage { get; set; }
89
90 /// <summary>
91 /// Summary information codepage from resolve.
92 /// </summary>
93 int? ResolvedSummaryInformationCodepage { get; set; }
94
95 /// <summary>
96 /// LCID from resolve.
97 /// </summary>
98 int? ResolvedLcid { get; set; }
99
100 /// <summary>
91 /// Set of ICEs to skip. 101 /// Set of ICEs to skip.
92 /// </summary> 102 /// </summary>
93 IEnumerable<string> SuppressIces { get; set; } 103 IEnumerable<string> SuppressIces { get; set; }
diff --git a/src/WixToolset.Extensibility/Data/IResolveContext.cs b/src/WixToolset.Extensibility/Data/IResolveContext.cs
index 79191a15..6ab5b545 100644
--- a/src/WixToolset.Extensibility/Data/IResolveContext.cs
+++ b/src/WixToolset.Extensibility/Data/IResolveContext.cs
@@ -7,27 +7,59 @@ namespace WixToolset.Extensibility.Data
7 using System.Threading; 7 using System.Threading;
8 using WixToolset.Data; 8 using WixToolset.Data;
9 9
10#pragma warning disable 1591 // TODO: add documentation 10 /// <summary>
11 /// Context for resolve.
12 /// </summary>
11 public interface IResolveContext 13 public interface IResolveContext
12 { 14 {
15 /// <summary>
16 /// Service provider.
17 /// </summary>
13 IServiceProvider ServiceProvider { get; } 18 IServiceProvider ServiceProvider { get; }
14 19
20 /// <summary>
21 /// Bind paths used during resolution.
22 /// </summary>
15 IEnumerable<IBindPath> BindPaths { get; set; } 23 IEnumerable<IBindPath> BindPaths { get; set; }
16 24
25 /// <summary>
26 /// Resolve extensions.
27 /// </summary>
17 IEnumerable<IResolverExtension> Extensions { get; set; } 28 IEnumerable<IResolverExtension> Extensions { get; set; }
18 29
30 /// <summary>
31 /// Extension data.
32 /// </summary>
19 IEnumerable<IExtensionData> ExtensionData { get; set; } 33 IEnumerable<IExtensionData> ExtensionData { get; set; }
20 34
35 /// <summary>
36 /// List of cultures to filter the localizations.
37 /// </summary>
21 IEnumerable<string> FilterCultures { get; set; } 38 IEnumerable<string> FilterCultures { get; set; }
22 39
40 /// <summary>
41 /// Intermediate folder.
42 /// </summary>
23 string IntermediateFolder { get; set; } 43 string IntermediateFolder { get; set; }
24 44
45 /// <summary>
46 /// Intermediate to resolve.
47 /// </summary>
25 Intermediate IntermediateRepresentation { get; set; } 48 Intermediate IntermediateRepresentation { get; set; }
26 49
50 /// <summary>
51 /// Localizations used to resolve.
52 /// </summary>
27 IEnumerable<Localization> Localizations { get; set; } 53 IEnumerable<Localization> Localizations { get; set; }
28 54
55 /// <summary>
56 /// Indicates whether to allow localization and bind variables to remain unresolved.
57 /// </summary>
29 bool AllowUnresolvedVariables { get; set; } 58 bool AllowUnresolvedVariables { get; set; }
30 59
60 /// <summary>
61 /// Cancellation token.
62 /// </summary>
31 CancellationToken CancellationToken { get; set; } 63 CancellationToken CancellationToken { get; set; }
32 } 64 }
33} 65}
diff --git a/src/WixToolset.Extensibility/Data/IResolveResult.cs b/src/WixToolset.Extensibility/Data/IResolveResult.cs
index 7c3403d4..abffb415 100644
--- a/src/WixToolset.Extensibility/Data/IResolveResult.cs
+++ b/src/WixToolset.Extensibility/Data/IResolveResult.cs
@@ -5,15 +5,39 @@ namespace WixToolset.Extensibility.Data
5 using System.Collections.Generic; 5 using System.Collections.Generic;
6 using WixToolset.Data; 6 using WixToolset.Data;
7 7
8#pragma warning disable 1591 // TODO: add documentation 8 /// <summary>
9 /// Result of resolving localization and bind variables.
10 /// </summary>
9 public interface IResolveResult 11 public interface IResolveResult
10 { 12 {
11 int Codepage { get; set; } 13 /// <summary>
14 /// Resolved codepage, if provided.
15 /// </summary>
16 int? Codepage { get; set; }
12 17
18 /// <summary>
19 /// Resolved summary information codepage, if provided.
20 /// </summary>
21 int? SummaryInformationCodepage { get; set; }
22
23 /// <summary>
24 /// Resolved package language, if provided.
25 /// </summary>
26 int? PackageLcid { get; set; }
27
28 /// <summary>
29 /// Fields still requiring resolution.
30 /// </summary>
13 IEnumerable<IDelayedField> DelayedFields { get; set; } 31 IEnumerable<IDelayedField> DelayedFields { get; set; }
14 32
33 /// <summary>
34 /// Files to extract from embedded .wixlibs.
35 /// </summary>
15 IEnumerable<IExpectedExtractFile> ExpectedEmbeddedFiles { get; set; } 36 IEnumerable<IExpectedExtractFile> ExpectedEmbeddedFiles { get; set; }
16 37
38 /// <summary>
39 /// Resolved intermediate.
40 /// </summary>
17 Intermediate IntermediateRepresentation { get; set; } 41 Intermediate IntermediateRepresentation { get; set; }
18 } 42 }
19} 43}