Commit Graph
104 Commits
Author SHA1 Message Date
Thomas Suckow acea2fe10f upstream
Update Telegram SharpAESCrypt dep
Update SystemIOWindows to split the difference

# Conflicts:
#	BuildTools/AutoUpdateBuilder/AutoUpdateBuilder.csproj
#	BuildTools/AutoUpdateBuilder/packages.config
#	BuildTools/DependencyFinder/DependencyFinder.csproj
#	BuildTools/DependencyFinder/packages.config
#	BuildTools/GnupgSigningTool/GnupgSigningTool.csproj
#	BuildTools/UpdateVersionStamp/UpdateVersionStamp.csproj
#	BuildTools/UpdateVersionStamp/app.config
#	Duplicati/CommandLine/BackendTester/Duplicati.CommandLine.BackendTester.csproj
#	Duplicati/CommandLine/BackendTester/app.config
#	Duplicati/CommandLine/BackendTool/Duplicati.CommandLine.BackendTool.csproj
#	Duplicati/CommandLine/BackendTool/app.config
#	Duplicati/CommandLine/ConfigurationImporter/Duplicati.CommandLine.ConfigurationImporter.csproj
#	Duplicati/CommandLine/Duplicati.CommandLine.csproj
#	Duplicati/CommandLine/RecoveryTool/Duplicati.CommandLine.RecoveryTool.csproj
#	Duplicati/CommandLine/RecoveryTool/packages.config
#	Duplicati/CommandLine/app.config
#	Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj
#	Duplicati/GUI/Duplicati.GUI.TrayIcon/app.config
#	Duplicati/GUI/Duplicati.GUI.TrayIcon/packages.config
#	Duplicati/Library/AutoUpdater/Duplicati.Library.AutoUpdater.csproj
#	Duplicati/Library/AutoUpdater/app.config
#	Duplicati/Library/AutoUpdater/packages.config
#	Duplicati/Library/Backend/AlternativeFTP/Duplicati.Library.Backend.AlternativeFTP.csproj
#	Duplicati/Library/Backend/AlternativeFTP/app.config
#	Duplicati/Library/Backend/AlternativeFTP/packages.config
#	Duplicati/Library/Backend/AzureBlob/Duplicati.Library.Backend.AzureBlob.csproj
#	Duplicati/Library/Backend/AzureBlob/packages.config
#	Duplicati/Library/Backend/Backblaze/Duplicati.Library.Backend.Backblaze.csproj
#	Duplicati/Library/Backend/Backblaze/packages.config
#	Duplicati/Library/Backend/Box/Duplicati.Library.Backend.Box.csproj
#	Duplicati/Library/Backend/Box/packages.config
#	Duplicati/Library/Backend/CloudFiles/Duplicati.Library.Backend.CloudFiles.csproj
#	Duplicati/Library/Backend/CloudFiles/app.config
#	Duplicati/Library/Backend/Dropbox/Duplicati.Library.Backend.Dropbox.csproj
#	Duplicati/Library/Backend/Dropbox/packages.config
#	Duplicati/Library/Backend/FTP/Duplicati.Library.Backend.FTP.csproj
#	Duplicati/Library/Backend/FTP/app.config
#	Duplicati/Library/Backend/File/Duplicati.Library.Backend.File.csproj
#	Duplicati/Library/Backend/File/app.config
#	Duplicati/Library/Backend/GoogleServices/Duplicati.Library.Backend.GoogleServices.csproj
#	Duplicati/Library/Backend/GoogleServices/packages.config
#	Duplicati/Library/Backend/HubiC/Duplicati.Library.Backend.HubiC.csproj
#	Duplicati/Library/Backend/Jottacloud/Duplicati.Library.Backend.Jottacloud.csproj
#	Duplicati/Library/Backend/Mega/Duplicati.Library.Backend.Mega.csproj
#	Duplicati/Library/Backend/Mega/packages.config
#	Duplicati/Library/Backend/OAuthHelper/Duplicati.Library.OAuthHelper.csproj
#	Duplicati/Library/Backend/OAuthHelper/packages.config
#	Duplicati/Library/Backend/OneDrive/Duplicati.Library.Backend.OneDrive.csproj
#	Duplicati/Library/Backend/OneDrive/packages.config
#	Duplicati/Library/Backend/OpenStack/Duplicati.Library.Backend.OpenStack.csproj
#	Duplicati/Library/Backend/OpenStack/packages.config
#	Duplicati/Library/Backend/Rclone/Duplicati.Library.Backend.Rclone.csproj
#	Duplicati/Library/Backend/Rclone/packages.config
#	Duplicati/Library/Backend/S3/Duplicati.Library.Backend.S3.csproj
#	Duplicati/Library/Backend/S3/app.config
#	Duplicati/Library/Backend/S3/packages.config
#	Duplicati/Library/Backend/SSHv2/Duplicati.Library.Backend.SSHv2.csproj
#	Duplicati/Library/Backend/SSHv2/packages.config
#	Duplicati/Library/Backend/SharePoint/Duplicati.Library.Backend.SharePoint.csproj
#	Duplicati/Library/Backend/SharePoint/app.config
#	Duplicati/Library/Backend/Sia/Duplicati.Library.Backend.Sia.csproj
#	Duplicati/Library/Backend/Sia/packages.config
#	Duplicati/Library/Backend/TahoeLAFS/Duplicati.Library.Backend.TahoeLAFS.csproj
#	Duplicati/Library/Backend/TahoeLAFS/packages.config
#	Duplicati/Library/Backend/Tardigrade/Duplicati.Library.Backend.Tardigrade.csproj
#	Duplicati/Library/Backend/Tardigrade/packages.config
#	Duplicati/Library/Backend/WEBDAV/Duplicati.Library.Backend.WEBDAV.csproj
#	Duplicati/Library/Backend/WEBDAV/app.config
#	Duplicati/Library/Common/Duplicati.Library.Common.csproj
#	Duplicati/Library/Common/IO/SystemIOWindows.cs
#	Duplicati/Library/Common/app.config
#	Duplicati/Library/Common/packages.config
#	Duplicati/Library/Compression/Duplicati.Library.Compression.csproj
#	Duplicati/Library/Compression/app.config
#	Duplicati/Library/Compression/packages.config
#	Duplicati/Library/DynamicLoader/Duplicati.Library.DynamicLoader.csproj
#	Duplicati/Library/DynamicLoader/app.config
#	Duplicati/Library/Encryption/Duplicati.Library.Encryption.csproj
#	Duplicati/Library/Encryption/packages.config
#	Duplicati/Library/Interface/Duplicati.Library.Interface.csproj
#	Duplicati/Library/Localization/Duplicati.Library.Localization.csproj
#	Duplicati/Library/Localization/packages.config
#	Duplicati/Library/Logging/Duplicati.Library.Logging.csproj
#	Duplicati/Library/Logging/app.config
#	Duplicati/Library/Main/Duplicati.Library.Main.csproj
#	Duplicati/Library/Main/app.config
#	Duplicati/Library/Main/packages.config
#	Duplicati/Library/Modules/Builtin/Duplicati.Library.Modules.Builtin.csproj
#	Duplicati/Library/Modules/Builtin/packages.config
#	Duplicati/Library/SQLiteHelper/Duplicati.Library.SQLiteHelper.csproj
#	Duplicati/Library/Snapshots/Duplicati.Library.Snapshots.csproj
#	Duplicati/Library/Snapshots/app.config
#	Duplicati/Library/Snapshots/packages.config
#	Duplicati/Library/UsageReporter/Duplicati.Library.UsageReporter.csproj
#	Duplicati/Library/UsageReporter/packages.config
#	Duplicati/Library/Utility/Duplicati.Library.Utility.csproj
#	Duplicati/Library/Utility/app.config
#	Duplicati/Library/Utility/packages.config
#	Duplicati/License/Duplicati.License.csproj
#	Duplicati/Server/Duplicati.Server.Serialization/Duplicati.Server.Serialization.csproj
#	Duplicati/Server/Duplicati.Server.Serialization/packages.config
#	Duplicati/Server/Duplicati.Server.csproj
#	Duplicati/Server/app.config
#	Duplicati/Server/packages.config
#	Duplicati/Service/Duplicati.Service.csproj
#	Duplicati/Service/app.config
#	Duplicati/Tools/Duplicati.Tools.csproj
#	Duplicati/UnitTest/Duplicati.UnitTest.csproj
#	Duplicati/UnitTest/RestoreHandlerTests.cs
#	Duplicati/UnitTest/app.config
#	Duplicati/UnitTest/packages.config
#	Duplicati/WindowsService/App.config
#	Duplicati/WindowsService/WindowsService.csproj
#	Tools/SQLiteTool/App.config
#	Tools/SQLiteTool/SQLiteTool.csproj
#	thirdparty/TlsTest/TlsTest.csproj
#	thirdparty/UnixSupport/UnixSupport.csproj
#	thirdparty/mozroots/mozroots.csproj
2020-12-29 09:59:42 -08:00
Kenneth Hsu e964072690 Target .NET Framework 4.7.1.
This updates all projects to target .NET Framework 4.7.1.  The
TencentCOS and Tardigrade backends depend on .NET Standard 2.0.  When a
.NET Framework prior to 4.7.1 is targeted, the system cannot be sure
that all the dependencies exist, so it copies all dependent assemblies
to the output directory.  This causes many assemblies from the System
namespace to become bundled in the release.

https://stackoverflow.com/a/48875007

We had previously attempted to make individual projects target 4.7.1
(see pull request #4242), but this can cause compatibility issues when
4.6.2 projects depend on 4.7.1. projects.

This will require Mono 5.10.0 or greater (previously, we required 5.0.0
or greater).

https://www.mono-project.com/docs/about-mono/releases/5.10.0/#class-libraries

This fixes issue #4234.
2020-07-26 19:46:01 -07:00
Max b008aed1f3 migrate to net5 + runnable 2020-06-03 00:00:38 +02:00
Max 28793ef204 packages update 2019-12-25 18:21:24 +01:00
Max 41a5591532 upstream 2019-12-25 16:34:56 +01:00
Kenneth Skovhede 033e609ab1 Fixed the signing tool to use the updated GPG library 2019-10-19 20:51:03 +02:00
Max 62d64c3ab0 upstream 2019-09-05 15:34:09 +02:00
BlueBlock 6a9f605e43 Merge remote-tracking branch 'upstream/master' into gpg-update 2019-08-31 19:01:57 -04:00
BlueBlock 815e30b63b update csproj toolverion and nuget packages 2019-07-31 13:20:03 -04:00
BlueBlock bcd8880ac0 migrate GnupgSigningTool to 4.6.2 to keep consistent 2019-07-30 10:43:50 -04:00
BlueBlock 3303c45bbe update DependencyFinder nuget package and to net to 4.6.2 2019-07-30 10:13:24 -04:00
BlueBlock 08a1e9998a initial upgrade to framework 4.6.2
- no code changes except those noted below
- projects upgrade to 4.6.2
- wixinstaller project upgraded automatically by VisualStudio
- wixinstaller updated to require 4.6.2
- Library.Encryption changed to Standard2.0 so accommodate update to SharpAesCrypt
2019-07-26 09:18:16 -04:00
BlueBlock a0e02e38f0 Use gpg library method to determine gpg exe path 2019-07-20 15:04:16 -04:00
Michal Naiman 843b69136b convert UpdateVersion GnupgSigningTool 2019-04-28 15:21:43 +02:00
Michal Naiman 1bc1e58737 upstream 2019-04-28 13:45:26 +02:00
verhoek a80c0a653e Set outputfolder local var again. 2019-01-06 20:11:38 +01:00
verhoek 3237698aad Fix codacy issues. 2019-01-06 18:49:21 +01:00
verhoek 7df6403a4c Changed location of project files of gnupg signing tool. 2018-12-28 19:56:14 +01:00
verhoek 1486399a97 Extracted gpg signing from autoupdate builder. 2018-12-28 19:31:40 +01:00
verhoek 6a10cf0c11 Fixed string format options and fixed stdin commandline parsing for gpg2. 2018-12-27 21:34:26 +01:00
verhoek 8f3915fcab Removed duplicated gpg code. 2018-12-27 18:48:03 +01:00
verhoek f8ce5239f2 Pulled out loadkey method. 2018-12-24 12:01:10 +01:00
verhoek 14133457c6 Merge remote-tracking branch 'origin/master' into auto_updater/allow_for_new_key 2018-12-23 20:36:53 +01:00
verhoek ae5d6ffcc7 Added option to generate new priv/pub key pair without verifying the manifest. 2018-12-23 20:32:21 +01:00
Kenneth Skovhede 2c0ec9d147 Updated AutoStamp tool to use the new simpler API for enumerating files 2018-12-11 12:25:02 +01:00
Mikael Mello 4369bc14d5 Add cache-busting for html/js/css files at each new Duplicati version 2018-11-26 09:27:42 -02:00
Kenneth Skovhede 1efaf23042 Updated build tools to use the new Common library 2018-11-13 09:44:27 +01:00
Max d2ed5c6b27 UpdateVersionStamp converted 2018-09-09 16:29:24 +02:00
Max 478d4565af DependencyFinder converted 2018-09-09 16:25:52 +02:00
Max c2a7bed781 AutoUpdateBuilder converted 2018-09-09 16:19:14 +02:00
Max 860bbdd363 cleanup 2018-06-30 01:22:58 +02:00
Max f5672f69d9 upgrade .net to 4.6.2 2018-03-25 22:00:45 +02:00
Kenneth Skovhede 2c9b563671 Fixed autoupdater to use nuget 2017-06-23 23:12:13 +02:00
Kenneth Skovhede 2b2e495e15 Added the <Prefer32Bit>False</Prefer32Bit> option to all executables.
This fixes #2519
2017-06-02 09:42:29 +02:00
agrajaghh 35c46c4651 remove LocalizationTool[2] 2016-10-07 10:53:29 +02:00
agrajaghh 3ce9c58301 fix escaping of strings in .po
replace:
\'  with '
\ with \\ (if not \r or \n)
" with \"
2016-09-30 10:07:03 +02:00
agrajaghh 23f7cd25d1 replace \ with / in location 2016-09-30 10:05:50 +02:00
agrajaghh bf3d3ec100 use UTF8 without BOM for .po file 2016-09-30 10:04:56 +02:00
agrajaghh 2e88e82cae count the lines from the beginning not from the end 2016-09-30 10:04:11 +02:00
agrajaghh 93bbdf6db2 fix tab indent 2016-09-30 10:03:15 +02:00
Kenneth Skovhede 74b65e284b Various fixes for generating the localization files 2016-09-27 20:40:18 +02:00
Kenneth Skovhede 4191506187 Updated new localization tool to generate .po files 2016-09-26 21:14:37 +02:00
Kenneth Skovhede 47a62d7757 Added a new tool to extract translate-able strings from the project files 2016-09-20 15:34:05 +02:00
Kenneth Skovhede 5993210e28 Update for AssemblyInfo to avoid builds generating source changes 2016-05-02 20:27:59 +02:00
Kenneth Skovhede f652c4e8de Added DependencyFinder tool 2016-04-23 13:10:54 +02:00
Kenneth Skovhede 8f23061496 Implemented option to output gpg signature key as part of the build process 2015-12-01 13:24:37 +01:00
Kenneth Skovhede 8ff8be8905 Bugfix for build issues with AutoUpdateBuilder. 2015-12-01 13:23:36 +01:00
Kenneth Skovhede c4ae279a26 Fixed building the AutoUpdateBuilder 2015-11-30 21:55:53 +01:00
Kenneth Skovhede b68290b95a Follow up to the latest pull request, changed all references to HexaD to "Duplicati Team" 2015-05-17 11:06:07 +02:00
Fabian Trampusch 55a853463d update year to 2015 2015-05-16 21:15:39 +02:00