acea2fe10fdff125dc84f4cfd37bd0fa1b265ff2
4
Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
|
|
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 |
||
|
|
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. |
||
|
|
e06a2dfc3b | remove cos config | ||
|
|
cc9080e533 | add tencent cos |