From 9f8cb5374481b6c8a06eb2739858332350f72666 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Sat, 11 Nov 2017 01:45:59 -0800 Subject: Additional IR updates --- src/WixToolset.Core/Bind/ExtractEmbeddedFilesCommand.cs | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'src/WixToolset.Core/Bind/ExtractEmbeddedFilesCommand.cs') diff --git a/src/WixToolset.Core/Bind/ExtractEmbeddedFilesCommand.cs b/src/WixToolset.Core/Bind/ExtractEmbeddedFilesCommand.cs index 7de40fb8..7e7c21b1 100644 --- a/src/WixToolset.Core/Bind/ExtractEmbeddedFilesCommand.cs +++ b/src/WixToolset.Core/Bind/ExtractEmbeddedFilesCommand.cs @@ -11,7 +11,12 @@ namespace WixToolset.Core.Bind public class ExtractEmbeddedFilesCommand { - public IEnumerable FilesWithEmbeddedFiles { private get; set; } + public ExtractEmbeddedFilesCommand(IEnumerable embeddedFiles) + { + this.FilesWithEmbeddedFiles = embeddedFiles; + } + + private IEnumerable FilesWithEmbeddedFiles { get; } public void Execute() { @@ -28,10 +33,10 @@ namespace WixToolset.Core.Bind // a .wixlib embedded in a WixExtension). if ("embeddedresource" == baseUri.Scheme) { - string assemblyPath = Path.GetFullPath(baseUri.LocalPath); - string resourceName = baseUri.Fragment.TrimStart('#'); + var assemblyPath = Path.GetFullPath(baseUri.LocalPath); + var resourceName = baseUri.Fragment.TrimStart('#'); - Assembly assembly = Assembly.LoadFile(assemblyPath); + var assembly = Assembly.LoadFile(assemblyPath); stream = assembly.GetManifestResourceStream(resourceName); } else // normal file (usually a binary .wixlib on disk). @@ -39,7 +44,7 @@ namespace WixToolset.Core.Bind stream = File.OpenRead(baseUri.LocalPath); } - using (FileStructure fs = FileStructure.Read(stream)) + using (var fs = FileStructure.Read(stream)) { var uniqueIndicies = new SortedSet(); -- cgit v1.2.3-55-g6feb