* Updated NuGet packages

* DOOM Eternal: remove filter on "-BACKUP" file * Satisfactory: fix issue when more than 3 autosaves are kept (server)
HgAlexx · Oct 28, 2022 · 9f774ea · 9f774ea
1 parent c2539f3
commit 9f774ea
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 22 deletions.
diff --git a/Hg.SaveHistory/App.config b/Hg.SaveHistory/App.config
@@ -8,7 +8,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="KeraLua" publicKeyToken="6a194c04b9c89217" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.2.4.0" newVersion="1.2.4.0" />
+        <bindingRedirect oldVersion="0.0.0.0-1.3.3.0" newVersion="1.3.3.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

diff --git a/Hg.SaveHistory/Hg.SaveHistory.csproj b/Hg.SaveHistory/Hg.SaveHistory.csproj
@@ -65,30 +65,34 @@
     <StartupObject>Hg.SaveHistory.Program</StartupObject>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="AeroWizard, Version=2.2.9.0, Culture=neutral, PublicKeyToken=915e74f5d64b8f37, processorArchitecture=MSIL">
-      <HintPath>..\packages\AeroWizard.2.2.9\lib\net45\AeroWizard.dll</HintPath>
+    <Reference Include="AeroWizard, Version=2.3.1.0, Culture=neutral, PublicKeyToken=915e74f5d64b8f37, processorArchitecture=MSIL">
+      <HintPath>..\packages\AeroWizard.2.3.1\lib\net45\AeroWizard.dll</HintPath>
     </Reference>
     <Reference Include="BouncyCastle.Crypto, Version=1.8.9.0, Culture=neutral, PublicKeyToken=0e99375e54769942">
       <HintPath>..\packages\BouncyCastle.1.8.9\lib\BouncyCastle.Crypto.dll</HintPath>
     </Reference>
-    <Reference Include="FontAwesome.Sharp, Version=5.15.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\FontAwesome.Sharp.5.15.3\lib\net472\FontAwesome.Sharp.dll</HintPath>
+    <Reference Include="FontAwesome.Sharp, Version=6.1.1.0, Culture=neutral, PublicKeyToken=d16d1e4e568ec10f, processorArchitecture=MSIL">
+      <HintPath>..\packages\FontAwesome.Sharp.6.1.1\lib\net472\FontAwesome.Sharp.dll</HintPath>
     </Reference>
-    <Reference Include="KeraLua, Version=1.2.12.0, Culture=neutral, PublicKeyToken=6a194c04b9c89217, processorArchitecture=MSIL">
-      <HintPath>..\packages\KeraLua.1.2.12\lib\net46\KeraLua.dll</HintPath>
+    <Reference Include="KeraLua, Version=1.3.3.0, Culture=neutral, PublicKeyToken=6a194c04b9c89217, processorArchitecture=MSIL">
+      <HintPath>..\packages\KeraLua.1.3.3\lib\net46\KeraLua.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="NLua, Version=1.5.7.0, Culture=neutral, PublicKeyToken=6a194c04b9c89217, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLua.1.5.7\lib\net46\NLua.dll</HintPath>
+    <Reference Include="NLua, Version=1.6.0.0, Culture=neutral, PublicKeyToken=6a194c04b9c89217, processorArchitecture=MSIL">
+      <HintPath>..\packages\NLua.1.6.0\lib\net46\NLua.dll</HintPath>
     </Reference>
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Design" />
     <Reference Include="System.IO.Compression.FileSystem" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xaml" />
+    <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="API\ActionSource.cs" />
@@ -339,11 +343,11 @@
   <PropertyGroup>
     <PreBuildEvent>$(SolutionDir)\Hash\bin\Debug\Hash.exe $(ProjectDir)\Scripts $(ProjectDir)\ScriptsHash.cs</PreBuildEvent>
   </PropertyGroup>
-  <Import Project="..\packages\KeraLua.1.2.12\build\net46\KeraLua.targets" Condition="Exists('..\packages\KeraLua.1.2.12\build\net46\KeraLua.targets')" />
+  <Import Project="..\packages\KeraLua.1.3.3\build\net46\KeraLua.targets" Condition="Exists('..\packages\KeraLua.1.3.3\build\net46\KeraLua.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>Ce projet fait référence à des packages NuGet qui sont manquants sur cet ordinateur. Utilisez l'option de restauration des packages NuGet pour les télécharger. Pour plus d'informations, consultez http://go.microsoft.com/fwlink/?LinkID=322105. Le fichier manquant est : {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\KeraLua.1.2.12\build\net46\KeraLua.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\KeraLua.1.2.12\build\net46\KeraLua.targets'))" />
+    <Error Condition="!Exists('..\packages\KeraLua.1.3.3\build\net46\KeraLua.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\KeraLua.1.3.3\build\net46\KeraLua.targets'))" />
   </Target>
 </Project>
diff --git a/Hg.SaveHistory/Properties/AssemblyInfo.cs b/Hg.SaveHistory/Properties/AssemblyInfo.cs
@@ -14,5 +14,5 @@
 
 [assembly: Guid("fea44985-2a16-4626-87dd-cf9c5e27a686")]
 
-[assembly: AssemblyVersion("0.7.4.0")]
-[assembly: AssemblyFileVersion("0.7.4.0")]
+[assembly: AssemblyVersion("0.7.5.0")]
+[assembly: AssemblyFileVersion("0.7.5.0")]
diff --git a/Hg.SaveHistory/Scripts/DOOMEternal/Engine.lua b/Hg.SaveHistory/Scripts/DOOMEternal/Engine.lua
@@ -304,17 +304,19 @@ local snapshotBackup = function(actionSouce)
             Logger.Debug("sourcePath=" .. slotPath)
             Logger.Debug("targetPath=" .. targetPath)
 
+            --[[
             local canCopy = function(filename, mode) -- canCopy callback
                 if mode == BackupHelperCanCopyMode.Copy then
                     return not ns.StringEndsWith(filename, "-BACKUP")
                 end
             end
+            --]]
 
             Logger.Debug("BackupHelper.CopyFiles: start")
             local copyFiles = BackupHelper.CopyFiles(
                 slotPath,
                 targetPath,
-                canCopy,
+                nil,
                 nil,
                 true,
                 false

diff --git a/Hg.SaveHistory/Scripts/Satisfactory/Engine.lua b/Hg.SaveHistory/Scripts/Satisfactory/Engine.lua
@@ -351,12 +351,12 @@ local watcherOnEvent = function(eventType, event)
 
     local isAutosave = false
 
-    if string.match(event.Name, "^.+_autosave_[012]?_BAK[0-9]+%.sav$") then
+    if string.match(event.Name, "^.+_autosave_[0-9]+_BAK[0-9]+%.sav$") then
         Logger.Debug("watcherOnEvent: excluded file")
         return
     end
 
-    if string.match(event.Name, "^.+_autosave_[012]?%.sav$") then
+    if string.match(event.Name, "^.+_autosave_[0-9]+%.sav$") then
         isAutosave = true
     end
 

diff --git a/Hg.SaveHistory/ScriptsHash.cs b/Hg.SaveHistory/ScriptsHash.cs
@@ -19,10 +19,10 @@ public class ScriptsHash
             {"DOOM2016\\Setup.lua","b876fa8241e9efc6e522116160ad8322dc3bd8f81e35947c6c65c181d3de7d90"},
             {"DOOM2016\\Utility.lua","3d1837390bb53c3e9459afc6a38289b1bc6443ae4c23be07eca53e7e8f38e758"},
             {"DOOMEternal\\DOOMEternal.toc","9ddd6726afedbe13a3e8966e86bbabcf034423228b44ac4d7a32ecfbe5b82ff7"},
-            {"DOOMEternal\\Engine.lua","a86f43da63f15ca897314b7212f10d6a19e2aab80b7f40c589b59c1fa62e872f"},
+            {"DOOMEternal\\Engine.lua","eedb73f29ed9f6f7ab689c84740b89e08e1b128e82869700234aff4ff8001830"},
             {"DOOMEternal\\Setup.lua","967c968598b0b83adfa838b056a8899dd6bee79fb8dc15408f1efe1497d0bc21"},
             {"DOOMEternal\\Utility.lua","3d1837390bb53c3e9459afc6a38289b1bc6443ae4c23be07eca53e7e8f38e758"},
-            {"Satisfactory\\Engine.lua","5468348d285a40cd5275b40f161c9daa486d87227fc8392b20e808869688ceaa"},
+            {"Satisfactory\\Engine.lua","eeaf27c9fafe1d2735d98a55f7373d51f0e8bb8dc89a89e71825b6a4a0763e6a"},
             {"Satisfactory\\Satisfactory.toc","f9935001bd02d9ecf0fd4bbd8d5810aaab87d261d1a3283d504615785eb6fb0e"},
             {"Satisfactory\\Setup.lua","476c33278d67696df8ddbb786a250c955a85d93fcfa6a2ea1f3dbb77eb02c14a"},
             {"Satisfactory\\Utility.lua","3d1837390bb53c3e9459afc6a38289b1bc6443ae4c23be07eca53e7e8f38e758"}

diff --git a/Hg.SaveHistory/packages.config b/Hg.SaveHistory/packages.config
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AeroWizard" version="2.2.9" targetFramework="net472" />
+  <package id="AeroWizard" version="2.3.1" targetFramework="net472" />
   <package id="BouncyCastle" version="1.8.9" targetFramework="net472" />
-  <package id="FontAwesome.Sharp" version="5.15.3" targetFramework="net472" />
-  <package id="KeraLua" version="1.2.12" targetFramework="net472" />
+  <package id="FontAwesome.Sharp" version="6.1.1" targetFramework="net472" />
+  <package id="KeraLua" version="1.3.3" targetFramework="net472" />
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net472" />
-  <package id="NLua" version="1.5.7" targetFramework="net472" />
+  <package id="NLua" version="1.6.0" targetFramework="net472" />
 </packages>
diff --git a/README.md b/README.md
@@ -165,6 +165,12 @@ The first beta tester was [RedW4rr10r](https://www.twitch.tv/redw4rr10r) who fou
 
 # Version History
 
+## v0.7.5
+
+- \* Updated NuGet packages
+- \* DOOM Eternal: remove filter on "-BACKUP" file
+- \* Satisfactory: fix issue when more than 3 autosaves are kept (server)
+
 ## v0.7.4
 
 - \* Satisfactory: add small sleep on autobackup event before processing the file