Merge branch 'master' into release

Author: witcher112

Assets/PatchKit Patcher/Scripts/AppUpdater/AppUpdater.cs

@@ -55,7 +55,7 @@ public void Update(CancellationToken cancellationToken)
                 }
                 else
                 {
-                    DebugLogger.LogWarningFormat("Strategy caused exception, being handled by fallback: {0}, Trace: {1}", ex.Message, ex.StackTrace);
+                    DebugLogger.LogWarningFormat("Strategy caused exception, being handled by fallback: {0}, Trace: {1}", ex, ex.StackTrace);
 
                     if (!TryHandleFallback(cancellationToken))
                     {

Assets/PatchKit Patcher/Scripts/AppUpdater/Commands/InstallDiffCommand.cs

@@ -252,9 +252,9 @@ private void ProcessModifiedFiles(string packageDirPath, string suffix,
                 var entryName = _versionDiffSummary.ModifiedFiles[i];
 
                 if (!entryName.EndsWith("/"))
-                {                    
+                {
                     DebugLogger.LogFormat("Patching {0} -> {1}", packageDirPath, entryName);
-                    PatchFile(entryName + suffix, packageDirPath);
+                    PatchFile(entryName, suffix, packageDirPath);
 
                     _localMetaData.RegisterEntry(entryName, _versionId);
                 }
@@ -295,7 +295,7 @@ private void DeleteEmptyMacAppDirectories()
             }
         }
 
-        private void PatchFile(string fileName, string packageDirPath)
+        private void PatchFile(string fileName, string suffix, string packageDirPath)
         {
             string filePath = _localData.Path.PathCombine(fileName);
 
@@ -321,7 +321,7 @@ private void PatchFile(string fileName, string packageDirPath)
             try
             {
                 var filePatcher = new FilePatcher(filePath,
-                    Path.Combine(packageDirPath, fileName), newFilePath);
+                    Path.Combine(packageDirPath, fileName + suffix), newFilePath);
                 filePatcher.Patch();
 
                 FileOperations.Copy(newFilePath, filePath, true);