Merge pull request #407 from Intendu/master

bsdiff bug fix: If bsdiff is being used, the delta update fails.

Author: anaisbetts

src/SolutionAssemblyInfo.cs

@@ -25,4 +25,4 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("0.99.3")]
+[assembly: AssemblyVersion("0.99.3.1")]

src/Squirrel/DeltaPackage.cs

@@ -112,8 +112,10 @@ public ReleasePackage ApplyDeltaPackage(ReleasePackage basePackage, ReleasePacka
                 deltaPathRelativePaths
                     .Where(x => x.StartsWith("lib", StringComparison.InvariantCultureIgnoreCase))
                     .Where(x => !x.EndsWith(".shasum", StringComparison.InvariantCultureIgnoreCase))
+                    .Where(x => !x.EndsWith(".diff", StringComparison.InvariantCultureIgnoreCase) ||
+                                !deltaPathRelativePaths.Contains(x.Replace(".diff", ".bsdiff")))
                     .ForEach(file => {
-                        pathsVisited.Add(Regex.Replace(file, @".diff$", "").ToLowerInvariant());
+                        pathsVisited.Add(Regex.Replace(file, @"\.(bs)?diff$", "").ToLowerInvariant());
                         applyDiffToFile(deltaPath, file, workingPath);
                     });
 
@@ -254,7 +256,7 @@ void applyDiffToFile(string deltaPath, string relativeFilePath, string workingDi
 
         void verifyPatchedFile(string relativeFilePath, string inputFile, string tempTargetFile)
         {
-            var shaFile = Regex.Replace(inputFile, @"\.diff$", ".shasum");
+            var shaFile = Regex.Replace(inputFile, @"\.(bs)?diff$", ".shasum");
             var expectedReleaseEntry = ReleaseEntry.ParseReleaseEntry(File.ReadAllText(shaFile, Encoding.UTF8));
             var actualReleaseEntry = ReleaseEntry.GenerateFromFile(tempTargetFile);