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
         string CabCachePath { get; set; }
 
         /// <summary>
-        /// Codepage for result.
-        /// </summary>
-        int Codepage { get; set; }
-
-        /// <summary>
         /// Default compression level.
         /// </summary>
         CompressionLevel? DefaultCompressionLevel { get; set; }
@@ -88,6 +83,21 @@ namespace WixToolset.Extensibility.Data
         string PdbPath { get; set; }
 
         /// <summary>
+        /// Codepage from resolve.
+        /// </summary>
+        int? ResolvedCodepage { get; set; }
+
+        /// <summary>
+        /// Summary information codepage from resolve.
+        /// </summary>
+        int? ResolvedSummaryInformationCodepage { get; set; }
+
+        /// <summary>
+        /// LCID from resolve.
+        /// </summary>
+        int? ResolvedLcid { get; set; }
+
+        /// <summary>
         /// Set of ICEs to skip.
         /// </summary>
         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
     using System.Threading;
     using WixToolset.Data;
 
-#pragma warning disable 1591 // TODO: add documentation
+    /// <summary>
+    /// Context for resolve.
+    /// </summary>
     public interface IResolveContext
     {
+        /// <summary>
+        /// Service provider.
+        /// </summary>
         IServiceProvider ServiceProvider { get; }
 
+        /// <summary>
+        /// Bind paths used during resolution.
+        /// </summary>
         IEnumerable<IBindPath> BindPaths { get; set; }
 
+        /// <summary>
+        /// Resolve extensions.
+        /// </summary>
         IEnumerable<IResolverExtension> Extensions { get; set; }
 
+        /// <summary>
+        /// Extension data.
+        /// </summary>
         IEnumerable<IExtensionData> ExtensionData { get; set; }
 
+        /// <summary>
+        /// List of cultures to filter the localizations.
+        /// </summary>
         IEnumerable<string> FilterCultures { get; set; }
 
+        /// <summary>
+        /// Intermediate folder.
+        /// </summary>
         string IntermediateFolder { get; set; }
 
+        /// <summary>
+        /// Intermediate to resolve.
+        /// </summary>
         Intermediate IntermediateRepresentation { get; set; }
 
+        /// <summary>
+        /// Localizations used to resolve.
+        /// </summary>
         IEnumerable<Localization> Localizations { get; set; }
 
+        /// <summary>
+        /// Indicates whether to allow localization and bind variables to remain unresolved.
+        /// </summary>
         bool AllowUnresolvedVariables { get; set; }
 
+        /// <summary>
+        /// Cancellation token.
+        /// </summary>
         CancellationToken CancellationToken { get; set; }
     }
 }
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
     using System.Collections.Generic;
     using WixToolset.Data;
 
-#pragma warning disable 1591 // TODO: add documentation
+    /// <summary>
+    /// Result of resolving localization and bind variables.
+    /// </summary>
     public interface IResolveResult
     {
-        int Codepage { get; set; }
+        /// <summary>
+        /// Resolved codepage, if provided.
+        /// </summary>
+        int? Codepage { get; set; }
 
+        /// <summary>
+        /// Resolved summary information codepage, if provided.
+        /// </summary>
+        int? SummaryInformationCodepage { get; set; }
+
+        /// <summary>
+        /// Resolved package language, if provided.
+        /// </summary>
+        int? PackageLcid { get; set; }
+
+        /// <summary>
+        /// Fields still requiring resolution.
+        /// </summary>
         IEnumerable<IDelayedField> DelayedFields { get; set; }
 
+        /// <summary>
+        /// Files to extract from embedded .wixlibs.
+        /// </summary>
         IEnumerable<IExpectedExtractFile> ExpectedEmbeddedFiles { get; set; }
 
+        /// <summary>
+        /// Resolved intermediate.
+        /// </summary>
         Intermediate IntermediateRepresentation { get; set; }
     }
 }