Updated VsixPackage to normalize names when finding zip entries to su…

…pport backslash.
garrettpauls · Dec 15, 2015 · d223692 · d223692
1 parent 51c0d97
commit d223692
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/VSGallery.AtomGenerator/Vsix/VsixPackage.cs b/VSGallery.AtomGenerator/Vsix/VsixPackage.cs
@@ -2,6 +2,7 @@
 using System.IO;
 using System.IO.Compression;
 using System.Linq;
+using System.Text.RegularExpressions;
 
 namespace VSGallery.AtomGenerator.Vsix
 {
@@ -38,16 +39,25 @@ public Uri TrySavePreviewImage(string destinationFolder)
             return _SaveEntry(destinationFolder, PreviewImageName);
         }
 
+        private static string _NormalizeZipEntryName(string value)
+        {
+            value = value.Replace('\\', '/');
+            value = Regex.Replace(value, "[/]{2,}", "/");
+            return value;
+        }
+
         private Uri _SaveEntry(string destinationFolder, string entryName)
         {
             if (string.IsNullOrEmpty(entryName))
             {
                 return null;
             }
 
+            entryName = _NormalizeZipEntryName(entryName);
+
             using (var zip = ZipFile.OpenRead(File))
             {
-                var entry = zip.Entries.FirstOrDefault(x => x.FullName == entryName);
+                var entry = zip.GetEntry(entryName);
                 if (entry == null)
                 {
                     return null;