diff --git a/.gitignore b/.gitignore index 2577fafa1..7ba91052e 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ binfiles.wxs .idea/ .vs/ +Installer/debian/*.buildinfo diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj index c84af5e6a..662be0619 100644 --- a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj +++ b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj @@ -69,8 +69,8 @@ app.manifest - - ..\..\..\packages\CoCoL.1.6.1\lib\net45\CoCoL.dll + + ..\..\..\packages\CoCoL.1.6.2\lib\net45\CoCoL.dll ..\..\..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Properties/AssemblyInfo.cs b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Properties/AssemblyInfo.cs index 9e1a1180a..a1360e670 100644 --- a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Properties/AssemblyInfo.cs +++ b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Duplicati Team")] [assembly: AssemblyProduct("Duplicati.GUI.TrayIcon")] -[assembly: AssemblyCopyright("LGPL, Copyright © Duplicati Team 2015")] +[assembly: AssemblyCopyright("LGPL, Copyright © Duplicati Team 2019")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/packages.config b/Duplicati/GUI/Duplicati.GUI.TrayIcon/packages.config index b9e1d2970..2150f07f7 100644 --- a/Duplicati/GUI/Duplicati.GUI.TrayIcon/packages.config +++ b/Duplicati/GUI/Duplicati.GUI.TrayIcon/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/Duplicati/Library/Main/Duplicati.Library.Main.csproj b/Duplicati/Library/Main/Duplicati.Library.Main.csproj index 3daa9b088..4b3762ac8 100644 --- a/Duplicati/Library/Main/Duplicati.Library.Main.csproj +++ b/Duplicati/Library/Main/Duplicati.Library.Main.csproj @@ -36,8 +36,8 @@ 4 - - ..\..\..\packages\CoCoL.1.6.1\lib\net45\CoCoL.dll + + ..\..\..\packages\CoCoL.1.6.2\lib\net45\CoCoL.dll ..\..\..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll diff --git a/Duplicati/Library/Main/packages.config b/Duplicati/Library/Main/packages.config index b9e1d2970..2150f07f7 100644 --- a/Duplicati/Library/Main/packages.config +++ b/Duplicati/Library/Main/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/Duplicati/Library/UsageReporter/Duplicati.Library.UsageReporter.csproj b/Duplicati/Library/UsageReporter/Duplicati.Library.UsageReporter.csproj index 416734f7d..d304c5adf 100644 --- a/Duplicati/Library/UsageReporter/Duplicati.Library.UsageReporter.csproj +++ b/Duplicati/Library/UsageReporter/Duplicati.Library.UsageReporter.csproj @@ -31,8 +31,8 @@ false - - ..\..\..\packages\CoCoL.1.6.1\lib\net45\CoCoL.dll + + ..\..\..\packages\CoCoL.1.6.2\lib\net45\CoCoL.dll ..\..\..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll diff --git a/Duplicati/Library/UsageReporter/packages.config b/Duplicati/Library/UsageReporter/packages.config index b9e1d2970..2150f07f7 100644 --- a/Duplicati/Library/UsageReporter/packages.config +++ b/Duplicati/Library/UsageReporter/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/Installer/Windows/Duplicati.wxs b/Installer/Windows/Duplicati.wxs index d305ee47a..06f68b91d 100644 --- a/Installer/Windows/Duplicati.wxs +++ b/Installer/Windows/Duplicati.wxs @@ -84,13 +84,13 @@ - + - + diff --git a/Updates/build_version.txt b/Updates/build_version.txt index f64f5d8d8..9902f1784 100644 --- a/Updates/build_version.txt +++ b/Updates/build_version.txt @@ -1 +1 @@ -27 +28 diff --git a/changelog.txt b/changelog.txt index ea133a4bc..167ecc513 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,7 @@ +2019-09-05 - 2.0.4.28_canary_2019-09-05 +========== +* Updated CoCoL and WiX to fix rollback and upgrade errors, thanks @BlueBlock + 2019-09-03 - 2.0.4.27_canary_2019-09-03 ========== * Fixed issues with the MSI packages not upgrading correctly, thanks @BlueBlock