1 files changed, 21 insertions, 17 deletions

diff --git a/src/WixToolset.Core/Bind/ExtractEmbeddedFiles.cs b/src/WixToolset.Core/Bind/ExtractEmbeddedFiles.cs
index 644e5c63..35c8a2f0 100644
--- a/src/WixToolset.Core/Bind/ExtractEmbeddedFiles.cs
+++ b/src/WixToolset.Core/Bind/ExtractEmbeddedFiles.cs
@@ -15,7 +15,7 @@ namespace WixToolset.Core.Bind
     /// </summary>
     internal class ExtractEmbeddedFiles
     {
-        private Dictionary<Uri, SortedList<int, string>> filesWithEmbeddedFiles = new Dictionary<Uri, SortedList<int, string>>();
+        private readonly Dictionary<Uri, SortedList<string, string>> filesWithEmbeddedFiles = new Dictionary<Uri, SortedList<string, string>>();
 
         public IEnumerable<Uri> Uris => this.filesWithEmbeddedFiles.Keys;
 
@@ -23,28 +23,28 @@ namespace WixToolset.Core.Bind
         /// Adds an embedded file index to track and returns the path where the embedded file will be extracted. Duplicates will return the same extract path.
         /// </summary>
         /// <param name="uri">Uri to file containing the embedded files.</param>
-        /// <param name="embeddedFileIndex">Index of the embedded file to extract.</param>
-        /// <param name="tempPath">Path where temporary files should be placed.</param>
+        /// <param name="embeddedFileId">Id of the embedded file to extract.</param>
+        /// <param name="extractFolder">Folder where extracted files should be placed.</param>
         /// <returns>The extract path for the embedded file.</returns>
-        public string AddEmbeddedFileIndex(Uri uri, int embeddedFileIndex, string tempPath)
+        public string AddEmbeddedFileToExtract(Uri uri, string embeddedFileId, string extractFolder)
         {
             // If the uri to the file that contains the embedded file does not already have embedded files
             // being extracted, create the dictionary to track that.
             if (!this.filesWithEmbeddedFiles.TryGetValue(uri, out var extracts))
             {
-                extracts = new SortedList<int, string>();
+                extracts = new SortedList<string, string>(StringComparer.OrdinalIgnoreCase);
                 this.filesWithEmbeddedFiles.Add(uri, extracts);
             }
 
             // If the embedded file is not already tracked in the dictionary of extracts, add it.
-            if (!extracts.TryGetValue(embeddedFileIndex, out var extractPath))
+            if (!extracts.TryGetValue(embeddedFileId, out var extractPath))
             {
-                string localFileNameWithoutExtension = Path.GetFileNameWithoutExtension(uri.LocalPath);
-                string unique = this.HashUri(uri.AbsoluteUri);
-                string extractedName = String.Format(CultureInfo.InvariantCulture, @"{0}_{1}\{2}", localFileNameWithoutExtension, unique, embeddedFileIndex);
+                var localFileNameWithoutExtension = Path.GetFileNameWithoutExtension(uri.LocalPath);
+                var unique = this.HashUri(uri.AbsoluteUri);
+                var extractedName = String.Format(CultureInfo.InvariantCulture, @"{0}_{1}\{2}", localFileNameWithoutExtension, unique, embeddedFileId);
 
-                extractPath = Path.Combine(tempPath, extractedName);
-                extracts.Add(embeddedFileIndex, extractPath);
+                extractPath = Path.GetFullPath(Path.Combine(extractFolder, extractedName));
+                extracts.Add(embeddedFileId, extractPath);
             }
 
             return extractPath;
@@ -52,35 +52,39 @@ namespace WixToolset.Core.Bind
 
         public IEnumerable<ExpectedExtractFile> GetExpectedEmbeddedFiles()
         {
+            var files = new List<ExpectedExtractFile>();
+
             foreach (var uriWithExtracts in this.filesWithEmbeddedFiles)
             {
                 foreach (var extracts in uriWithExtracts.Value)
                 {
-                    yield return new ExpectedExtractFile
+                    files.Add(new ExpectedExtractFile
                     {
                         Uri = uriWithExtracts.Key,
-                        EmbeddedFileIndex = extracts.Key,
+                        EmbeddedFileId = extracts.Key,
                         OutputPath = extracts.Value,
-                    };
+                    });
                 }
             }
+
+            return files;
         }
 
         public IEnumerable<ExpectedExtractFile> GetExtractFilesForUri(Uri uri)
         {
             if (!this.filesWithEmbeddedFiles.TryGetValue(uri, out var extracts))
             {
-                extracts = new SortedList<int, string>();
+                extracts = new SortedList<string, string>(StringComparer.OrdinalIgnoreCase);
             }
 
-            return extracts.Select(e => new ExpectedExtractFile() { Uri = uri, EmbeddedFileIndex = e.Key, OutputPath = e.Value });
+            return extracts.Select(e => new ExpectedExtractFile { Uri = uri, EmbeddedFileId = e.Key, OutputPath = e.Value });
         }
 
         private string HashUri(string uri)
         {
             using (SHA1 sha1 = new SHA1CryptoServiceProvider())
             {
-                byte[] hash = sha1.ComputeHash(Encoding.UTF8.GetBytes(uri));
+                var hash = sha1.ComputeHash(Encoding.UTF8.GetBytes(uri));
                 return Convert.ToBase64String(hash).TrimEnd('=').Replace('+', '-').Replace('/', '_');
             }
         }