aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Data/Intermediate.cs
diff options
context:
space:
mode:
Diffstat (limited to 'src/WixToolset.Data/Intermediate.cs')
-rw-r--r--src/WixToolset.Data/Intermediate.cs15
1 files changed, 6 insertions, 9 deletions
diff --git a/src/WixToolset.Data/Intermediate.cs b/src/WixToolset.Data/Intermediate.cs
index 30a50120..f9d33839 100644
--- a/src/WixToolset.Data/Intermediate.cs
+++ b/src/WixToolset.Data/Intermediate.cs
@@ -121,7 +121,6 @@ namespace WixToolset.Data
121 /// Loads an intermediate from a WixOutput object. 121 /// Loads an intermediate from a WixOutput object.
122 /// </summary> 122 /// </summary>
123 /// <param name="wixOutput">WixOutput object.</param> 123 /// <param name="wixOutput">WixOutput object.</param>
124 /// <param name="creator">ISymbolDefinitionCreator to use when reconstituting the intermediate.</param>
125 /// <param name="suppressVersionCheck">Suppress checking for wix.dll version mismatches.</param> 124 /// <param name="suppressVersionCheck">Suppress checking for wix.dll version mismatches.</param>
126 /// <returns>Returns the loaded intermediate.</returns> 125 /// <returns>Returns the loaded intermediate.</returns>
127 public static Intermediate Load(WixOutput wixOutput, bool suppressVersionCheck = false) 126 public static Intermediate Load(WixOutput wixOutput, bool suppressVersionCheck = false)
@@ -146,7 +145,6 @@ namespace WixToolset.Data
146 /// Loads several intermediates from paths on disk using the same definitions. 145 /// Loads several intermediates from paths on disk using the same definitions.
147 /// </summary> 146 /// </summary>
148 /// <param name="intermediateFiles">Paths to intermediate files saved on disk.</param> 147 /// <param name="intermediateFiles">Paths to intermediate files saved on disk.</param>
149 /// <param name="suppressVersionCheck">Suppress checking for wix.dll version mismatches.</param>
150 /// <returns>Returns the loaded intermediates</returns> 148 /// <returns>Returns the loaded intermediates</returns>
151 public static IEnumerable<Intermediate> Load(IEnumerable<string> intermediateFiles) 149 public static IEnumerable<Intermediate> Load(IEnumerable<string> intermediateFiles)
152 { 150 {
@@ -225,9 +223,9 @@ namespace WixToolset.Data
225 } 223 }
226 224
227 /// <summary> 225 /// <summary>
228 /// Saves an intermediate to a path on disk. 226 /// Saves an intermediate to a WixOutput.
229 /// </summary> 227 /// </summary>
230 /// <param name="path">Path to save intermediate file to disk.</param> 228 /// <param name="wixout">Destination to save.</param>
231 public void Save(WixOutput wixout) 229 public void Save(WixOutput wixout)
232 { 230 {
233 this.SaveEmbedFiles(wixout); 231 this.SaveEmbedFiles(wixout);
@@ -236,10 +234,9 @@ namespace WixToolset.Data
236 } 234 }
237 235
238 /// <summary> 236 /// <summary>
239 /// Loads an intermediate from a path on disk. 237 /// Loads an intermediate from a WixOutput.
240 /// </summary> 238 /// </summary>
241 /// <param name="stream">Stream to intermediate file.</param> 239 /// <param name="wixout">Source to load from.</param>
242 /// <param name="baseUri">Path name of intermediate file.</param>
243 /// <param name="creator">ISymbolDefinitionCreator to use when reconstituting the intermediate.</param> 240 /// <param name="creator">ISymbolDefinitionCreator to use when reconstituting the intermediate.</param>
244 /// <param name="suppressVersionCheck">Suppress checking for wix.dll version mismatches.</param> 241 /// <param name="suppressVersionCheck">Suppress checking for wix.dll version mismatches.</param>
245 /// <returns>Returns the loaded intermediate.</returns> 242 /// <returns>Returns the loaded intermediate.</returns>
@@ -254,9 +251,9 @@ namespace WixToolset.Data
254 } 251 }
255 252
256 /// <summary> 253 /// <summary>
257 /// Loads json form of intermedaite from stream. 254 /// Loads json form of intermediate.
258 /// </summary> 255 /// </summary>
259 /// <param name="stream">Stream to intermediate file.</param> 256 /// <param name="json">Source to load from.</param>
260 /// <param name="baseUri">Path name of intermediate file.</param> 257 /// <param name="baseUri">Path name of intermediate file.</param>
261 /// <param name="suppressVersionCheck">Suppress checking for wix.dll version mismatches.</param> 258 /// <param name="suppressVersionCheck">Suppress checking for wix.dll version mismatches.</param>
262 /// <returns>Returns the loaded json.</returns> 259 /// <returns>Returns the loaded json.</returns>