diff options
Diffstat (limited to 'src/wix/WixToolset.Core.Burn/Bundles/BurnReader.cs')
-rw-r--r-- | src/wix/WixToolset.Core.Burn/Bundles/BurnReader.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/wix/WixToolset.Core.Burn/Bundles/BurnReader.cs b/src/wix/WixToolset.Core.Burn/Bundles/BurnReader.cs index acc76a3b..d8e49397 100644 --- a/src/wix/WixToolset.Core.Burn/Bundles/BurnReader.cs +++ b/src/wix/WixToolset.Core.Burn/Bundles/BurnReader.cs | |||
@@ -56,7 +56,7 @@ namespace WixToolset.Core.Burn.Bundles | |||
56 | /// <returns>Burn reader.</returns> | 56 | /// <returns>Burn reader.</returns> |
57 | public static BurnReader Open(IMessaging messaging, IFileSystem fileSystem, string fileExe) | 57 | public static BurnReader Open(IMessaging messaging, IFileSystem fileSystem, string fileExe) |
58 | { | 58 | { |
59 | var binaryReader = new BinaryReader(fileSystem.OpenFile(fileExe, FileMode.Open, FileAccess.Read, FileShare.Read | FileShare.Delete)); | 59 | var binaryReader = new BinaryReader(fileSystem.OpenFile(null, fileExe, FileMode.Open, FileAccess.Read, FileShare.Read | FileShare.Delete)); |
60 | var reader = new BurnReader(messaging, fileSystem, fileExe) | 60 | var reader = new BurnReader(messaging, fileSystem, fileExe) |
61 | { | 61 | { |
62 | binaryReader = binaryReader, | 62 | binaryReader = binaryReader, |
@@ -92,7 +92,7 @@ namespace WixToolset.Core.Burn.Bundles | |||
92 | var uxContainerSlot = this.AttachedContainers[0]; | 92 | var uxContainerSlot = this.AttachedContainers[0]; |
93 | 93 | ||
94 | this.binaryReader.BaseStream.Seek(this.UXAddress, SeekOrigin.Begin); | 94 | this.binaryReader.BaseStream.Seek(this.UXAddress, SeekOrigin.Begin); |
95 | using (Stream tempCab = this.fileSystem.OpenFile(tempCabPath, FileMode.Create, FileAccess.Write, FileShare.Read)) | 95 | using (Stream tempCab = this.fileSystem.OpenFile(null, tempCabPath, FileMode.Create, FileAccess.Write, FileShare.Read)) |
96 | { | 96 | { |
97 | BurnCommon.CopyStream(this.binaryReader.BaseStream, tempCab, (int)uxContainerSlot.Size); | 97 | BurnCommon.CopyStream(this.binaryReader.BaseStream, tempCab, (int)uxContainerSlot.Size); |
98 | } | 98 | } |
@@ -100,7 +100,7 @@ namespace WixToolset.Core.Burn.Bundles | |||
100 | var cabinet = new Cabinet(tempCabPath); | 100 | var cabinet = new Cabinet(tempCabPath); |
101 | cabinet.Extract(outputDirectory); | 101 | cabinet.Extract(outputDirectory); |
102 | 102 | ||
103 | this.fileSystem.MoveFile(manifestOriginalPath, manifestPath); | 103 | this.fileSystem.MoveFile(null, manifestOriginalPath, manifestPath); |
104 | 104 | ||
105 | var document = new XmlDocument(); | 105 | var document = new XmlDocument(); |
106 | document.Load(manifestPath); | 106 | document.Load(manifestPath); |
@@ -117,7 +117,7 @@ namespace WixToolset.Core.Burn.Bundles | |||
117 | var sourcePath = Path.Combine(outputDirectory, sourcePathNode.Value); | 117 | var sourcePath = Path.Combine(outputDirectory, sourcePathNode.Value); |
118 | var destinationPath = Path.Combine(outputDirectory, filePathNode.Value); | 118 | var destinationPath = Path.Combine(outputDirectory, filePathNode.Value); |
119 | 119 | ||
120 | this.fileSystem.MoveFile(sourcePath, destinationPath); | 120 | this.fileSystem.MoveFile(null, sourcePath, destinationPath); |
121 | } | 121 | } |
122 | 122 | ||
123 | foreach (XmlNode payload in payloads) | 123 | foreach (XmlNode payload in payloads) |
@@ -169,7 +169,7 @@ namespace WixToolset.Core.Burn.Bundles | |||
169 | var tempCabPath = Path.Combine(tempDirectory, $"a{i}.cab"); | 169 | var tempCabPath = Path.Combine(tempDirectory, $"a{i}.cab"); |
170 | 170 | ||
171 | this.binaryReader.BaseStream.Seek(nextAddress, SeekOrigin.Begin); | 171 | this.binaryReader.BaseStream.Seek(nextAddress, SeekOrigin.Begin); |
172 | using (Stream tempCab = this.fileSystem.OpenFile(tempCabPath, FileMode.Create, FileAccess.Write, FileShare.Read)) | 172 | using (Stream tempCab = this.fileSystem.OpenFile(null, tempCabPath, FileMode.Create, FileAccess.Write, FileShare.Read)) |
173 | { | 173 | { |
174 | BurnCommon.CopyStream(this.binaryReader.BaseStream, tempCab, (int)cntnr.Size); | 174 | BurnCommon.CopyStream(this.binaryReader.BaseStream, tempCab, (int)cntnr.Size); |
175 | } | 175 | } |
@@ -185,7 +185,7 @@ namespace WixToolset.Core.Burn.Bundles | |||
185 | var sourcePath = Path.Combine(outputDirectory, (string)entry.Key); | 185 | var sourcePath = Path.Combine(outputDirectory, (string)entry.Key); |
186 | var destinationPath = Path.Combine(outputDirectory, (string)entry.Value); | 186 | var destinationPath = Path.Combine(outputDirectory, (string)entry.Value); |
187 | 187 | ||
188 | this.fileSystem.MoveFile(sourcePath, destinationPath); | 188 | this.fileSystem.MoveFile(null, sourcePath, destinationPath); |
189 | } | 189 | } |
190 | 190 | ||
191 | return true; | 191 | return true; |