aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Data/WixOutput.cs
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2020-04-18 21:15:24 +1000
committerSean Hall <r.sean.hall@gmail.com>2020-04-18 21:25:30 +1000
commit5a105b510c5f2a082e5b5ab7ae94adf2491b0416 (patch)
tree0b888203e45fa652d5376330d337c49aa901f63b /src/WixToolset.Data/WixOutput.cs
parent759166e0762d711bdea1b79e94678aba89a194e6 (diff)
downloadwix-5a105b510c5f2a082e5b5ab7ae94adf2491b0416.tar.gz
wix-5a105b510c5f2a082e5b5ab7ae94adf2491b0416.tar.bz2
wix-5a105b510c5f2a082e5b5ab7ae94adf2491b0416.zip
Update WixOutput's GetData to use StreamReader.
Diffstat (limited to '')
-rw-r--r--src/WixToolset.Data/WixOutput.cs8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/WixToolset.Data/WixOutput.cs b/src/WixToolset.Data/WixOutput.cs
index a3326b0b..27e7827a 100644
--- a/src/WixToolset.Data/WixOutput.cs
+++ b/src/WixToolset.Data/WixOutput.cs
@@ -222,14 +222,12 @@ namespace WixToolset.Data
222 { 222 {
223 var entry = this.archive.GetEntry(name); 223 var entry = this.archive.GetEntry(name);
224 224
225 var bytes = new byte[entry.Length]; 225 // Use StreamReader to "swallow" BOM if present.
226
227 using (var stream = entry.Open()) 226 using (var stream = entry.Open())
227 using (var streamReader = new StreamReader(stream, Encoding.UTF8))
228 { 228 {
229 stream.Read(bytes, 0, bytes.Length); 229 return streamReader.ReadToEnd();
230 } 230 }
231
232 return Encoding.UTF8.GetString(bytes);
233 } 231 }
234 232
235 /// <summary> 233 /// <summary>