From 8a6e2e2281f36c753e17b9c03c5ba5e666dc4599 Mon Sep 17 00:00:00 2001 From: BlueBlock Date: Wed, 4 Sep 2019 11:59:46 -0400 Subject: [PATCH 1/5] revert wix back to InstallInitialize --- Installer/Windows/Duplicati.wxs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 @@ - + - + From 718a5c7fe8c1976b4a6720288dfe762a0be35a8b Mon Sep 17 00:00:00 2001 From: BlueBlock Date: Wed, 4 Sep 2019 12:00:11 -0400 Subject: [PATCH 2/5] update nuget cocol --- .../GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj | 4 ++-- .../GUI/Duplicati.GUI.TrayIcon/Properties/AssemblyInfo.cs | 4 ++-- Duplicati/GUI/Duplicati.GUI.TrayIcon/packages.config | 2 +- Duplicati/Library/Main/Duplicati.Library.Main.csproj | 4 ++-- Duplicati/Library/Main/packages.config | 2 +- .../UsageReporter/Duplicati.Library.UsageReporter.csproj | 4 ++-- Duplicati/Library/UsageReporter/packages.config | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj index 98d9b0b79..ea32a8023 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..ad32ae5db 100644 --- a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Properties/AssemblyInfo.cs +++ b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("2.0.0.7")] -[assembly: AssemblyVersion("2.0.0.7")] -[assembly: AssemblyFileVersion("2.0.0.7")] +[assembly: AssemblyVersion("2.0.4.28")] +[assembly: AssemblyFileVersion("2.0.4.28")] 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 From 310e5d70115401e2eeba9139ed6dab63ab0c55f6 Mon Sep 17 00:00:00 2001 From: BlueBlock Date: Wed, 4 Sep 2019 14:20:37 -0400 Subject: [PATCH 3/5] revert testing assembly version and update copyright --- .../GUI/Duplicati.GUI.TrayIcon/Properties/AssemblyInfo.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Properties/AssemblyInfo.cs b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Properties/AssemblyInfo.cs index ad32ae5db..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("")] @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("2.0.0.7")] -[assembly: AssemblyVersion("2.0.4.28")] -[assembly: AssemblyFileVersion("2.0.4.28")] +[assembly: AssemblyVersion("2.0.0.7")] +[assembly: AssemblyFileVersion("2.0.0.7")] From f29ab130f68185bae05a23b11a0cbd1d24c750df Mon Sep 17 00:00:00 2001 From: Kenneth Skovhede Date: Thu, 5 Sep 2019 12:45:31 +0200 Subject: [PATCH 4/5] Version bump to v2.0.4.28-2.0.4.28_canary_2019-09-05 You can download this build from: Binaries: https://updates.duplicati.com/canary/duplicati-2.0.4.28_canary_2019-09-05.zip Signature file: https://updates.duplicati.com/canary/duplicati-2.0.4.28_canary_2019-09-05.zip.sig ASCII signature file: https://updates.duplicati.com/canary/duplicati-2.0.4.28_canary_2019-09-05.zip.sig.asc MD5: 878a11fde63d4a3415dbb62aa73f423c SHA1: 78d79a383df85a50cf18b84ab68cf40e547f8e0f SHA256: 1bc4fa6bdd80b121711c7c665a715fd2048f136f864fe9b6d51b1a5775c26cc6 --- Updates/build_version.txt | 2 +- changelog.txt | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) 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 From 3608a36555a510b586684f12b52d3b11cf0ab105 Mon Sep 17 00:00:00 2001 From: Kenneth Skovhede Date: Thu, 5 Sep 2019 13:14:54 +0200 Subject: [PATCH 5/5] Ignoring build-spam --- .gitignore | 1 + 1 file changed, 1 insertion(+) 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