diff options
author | Kenneth Skovhede <kenneth@hexad.dk> | 2017-10-20 16:19:41 +0300 |
---|---|---|
committer | Kenneth Skovhede <kenneth@hexad.dk> | 2017-10-20 16:19:41 +0300 |
commit | d21ea66588202e020b1fe548006790d16ca19c56 (patch) | |
tree | e23b284107c10a19e3c54e7a3924e0ea9d2e122a | |
parent | 71b62625d0f7050bc71084873b1384fede0ca9e8 (diff) | |
parent | 6375211ec907d63ba61a071bf70279751572015c (diff) |
Merge branch 'master' of github.com:duplicati/duplicati
39 files changed, 11 insertions, 43 deletions
diff --git a/Duplicati/CommandLine/BackendTester/Duplicati.CommandLine.BackendTester.csproj b/Duplicati/CommandLine/BackendTester/Duplicati.CommandLine.BackendTester.csproj index 5d0066f67..f1960f082 100644 --- a/Duplicati/CommandLine/BackendTester/Duplicati.CommandLine.BackendTester.csproj +++ b/Duplicati/CommandLine/BackendTester/Duplicati.CommandLine.BackendTester.csproj @@ -14,7 +14,6 @@ </FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation />
- <SignAssembly>false</SignAssembly>
<AssemblyOriginatorKeyFile>Duplicati.snk</AssemblyOriginatorKeyFile>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkProfile />
diff --git a/Duplicati/CommandLine/BackendTool/Duplicati.CommandLine.BackendTool.csproj b/Duplicati/CommandLine/BackendTool/Duplicati.CommandLine.BackendTool.csproj index b992fdc8d..089ff1686 100644 --- a/Duplicati/CommandLine/BackendTool/Duplicati.CommandLine.BackendTool.csproj +++ b/Duplicati/CommandLine/BackendTool/Duplicati.CommandLine.BackendTool.csproj @@ -8,7 +8,6 @@ <Prefer32Bit>False</Prefer32Bit>
<RootNamespace>Duplicati.CommandLine.BackendTool</RootNamespace>
<AssemblyName>Duplicati.CommandLine.BackendTool</AssemblyName>
- <SignAssembly>false</SignAssembly>
<AssemblyOriginatorKeyFile>..\Duplicati.snk</AssemblyOriginatorKeyFile>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkProfile />
diff --git a/Duplicati/CommandLine/Duplicati.CommandLine.csproj b/Duplicati/CommandLine/Duplicati.CommandLine.csproj index c105aabb8..a873c0467 100644 --- a/Duplicati/CommandLine/Duplicati.CommandLine.csproj +++ b/Duplicati/CommandLine/Duplicati.CommandLine.csproj @@ -9,7 +9,6 @@ <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Duplicati.CommandLine</RootNamespace>
<AssemblyName>Duplicati.CommandLine</AssemblyName>
- <SignAssembly>false</SignAssembly>
<AssemblyOriginatorKeyFile>Duplicati.snk</AssemblyOriginatorKeyFile>
<ApplicationIcon>TrayWarning.ico</ApplicationIcon>
<FileUpgradeFlags>
diff --git a/Duplicati/CommandLine/RecoveryTool/Duplicati.CommandLine.RecoveryTool.csproj b/Duplicati/CommandLine/RecoveryTool/Duplicati.CommandLine.RecoveryTool.csproj index 565830a4a..892ed39f2 100644 --- a/Duplicati/CommandLine/RecoveryTool/Duplicati.CommandLine.RecoveryTool.csproj +++ b/Duplicati/CommandLine/RecoveryTool/Duplicati.CommandLine.RecoveryTool.csproj @@ -8,7 +8,6 @@ <Prefer32Bit>False</Prefer32Bit> <RootNamespace>Duplicati.CommandLine.RecoveryTool</RootNamespace> <AssemblyName>Duplicati.CommandLine.RecoveryTool</AssemblyName> - <SignAssembly>false</SignAssembly> <AssemblyOriginatorKeyFile>Duplicati.snk</AssemblyOriginatorKeyFile> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <UseMSBuildEngine>false</UseMSBuildEngine> diff --git a/Duplicati/Library/Backend/AmazonCloudDrive/Duplicati.Library.Backend.AmazonCloudDrive.csproj b/Duplicati/Library/Backend/AmazonCloudDrive/Duplicati.Library.Backend.AmazonCloudDrive.csproj index c8a3b4888..1acc64469 100644 --- a/Duplicati/Library/Backend/AmazonCloudDrive/Duplicati.Library.Backend.AmazonCloudDrive.csproj +++ b/Duplicati/Library/Backend/AmazonCloudDrive/Duplicati.Library.Backend.AmazonCloudDrive.csproj @@ -7,7 +7,6 @@ <OutputType>Library</OutputType> <RootNamespace>Duplicati.Library.Backend.AmazonCloudDrive</RootNamespace> <AssemblyName>Duplicati.Library.Backend.AmazonCloudDrive</AssemblyName> - <SignAssembly>true</SignAssembly> <AssemblyOriginatorKeyFile>Duplicati.snk</AssemblyOriginatorKeyFile> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <UseMSBuildEngine>false</UseMSBuildEngine> diff --git a/Duplicati/Library/Backend/AzureBlob/Duplicati.Library.Backend.AzureBlob.csproj b/Duplicati/Library/Backend/AzureBlob/Duplicati.Library.Backend.AzureBlob.csproj index 48e488838..e6a2c474c 100644 --- a/Duplicati/Library/Backend/AzureBlob/Duplicati.Library.Backend.AzureBlob.csproj +++ b/Duplicati/Library/Backend/AzureBlob/Duplicati.Library.Backend.AzureBlob.csproj @@ -33,7 +33,6 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <PropertyGroup> - <SignAssembly>true</SignAssembly> </PropertyGroup> <ItemGroup> <Reference Include="System" /> diff --git a/Duplicati/Library/Backend/Backblaze/Duplicati.Library.Backend.Backblaze.csproj b/Duplicati/Library/Backend/Backblaze/Duplicati.Library.Backend.Backblaze.csproj index 539d02496..a3addecf3 100644 --- a/Duplicati/Library/Backend/Backblaze/Duplicati.Library.Backend.Backblaze.csproj +++ b/Duplicati/Library/Backend/Backblaze/Duplicati.Library.Backend.Backblaze.csproj @@ -7,7 +7,6 @@ <OutputType>Library</OutputType> <RootNamespace>Duplicati.Library.Backend.Backblaze</RootNamespace> <AssemblyName>Duplicati.Library.Backend.Backblaze</AssemblyName> - <SignAssembly>true</SignAssembly> <AssemblyOriginatorKeyFile>Duplicati.snk</AssemblyOriginatorKeyFile> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <UseMSBuildEngine>false</UseMSBuildEngine> diff --git a/Duplicati/Library/Backend/Box/Duplicati.Library.Backend.Box.csproj b/Duplicati/Library/Backend/Box/Duplicati.Library.Backend.Box.csproj index 2a9d73501..05fde10ca 100644 --- a/Duplicati/Library/Backend/Box/Duplicati.Library.Backend.Box.csproj +++ b/Duplicati/Library/Backend/Box/Duplicati.Library.Backend.Box.csproj @@ -7,7 +7,6 @@ <OutputType>Library</OutputType> <RootNamespace>Duplicati.Library.Backend.Box</RootNamespace> <AssemblyName>Duplicati.Library.Backend.Box</AssemblyName> - <SignAssembly>true</SignAssembly> <AssemblyOriginatorKeyFile>Duplicati.snk</AssemblyOriginatorKeyFile> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <UseMSBuildEngine>false</UseMSBuildEngine> diff --git a/Duplicati/Library/Backend/CloudFiles/Duplicati.Library.Backend.CloudFiles.csproj b/Duplicati/Library/Backend/CloudFiles/Duplicati.Library.Backend.CloudFiles.csproj index e4987fe0f..b1151e757 100644 --- a/Duplicati/Library/Backend/CloudFiles/Duplicati.Library.Backend.CloudFiles.csproj +++ b/Duplicati/Library/Backend/CloudFiles/Duplicati.Library.Backend.CloudFiles.csproj @@ -15,7 +15,6 @@ <TargetFrameworkProfile />
<UpgradeBackupLocation>
</UpgradeBackupLocation>
- <SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>Duplicati.snk</AssemblyOriginatorKeyFile>
<UseMSBuildEngine>false</UseMSBuildEngine>
</PropertyGroup>
diff --git a/Duplicati/Library/Backend/FTP/FTPBackend.cs b/Duplicati/Library/Backend/FTP/FTPBackend.cs index 57efcf866..76bda999b 100644 --- a/Duplicati/Library/Backend/FTP/FTPBackend.cs +++ b/Duplicati/Library/Backend/FTP/FTPBackend.cs @@ -173,7 +173,8 @@ namespace Duplicati.Library.Backend private T HandleListExceptions<T>(Func<T> func, System.Net.FtpWebRequest req)
{
T ret = default(T);
- HandleListExceptions(() => ret = func(), req);
+ Action action = () => ret = func();
+ HandleListExceptions(action, req);
return ret;
}
diff --git a/Duplicati/Library/Backend/File/Duplicati.Library.Backend.File.csproj b/Duplicati/Library/Backend/File/Duplicati.Library.Backend.File.csproj index f843c2f3d..760a13579 100644 --- a/Duplicati/Library/Backend/File/Duplicati.Library.Backend.File.csproj +++ b/Duplicati/Library/Backend/File/Duplicati.Library.Backend.File.csproj @@ -8,7 +8,6 @@ <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Duplicati.Library.Backend</RootNamespace>
<AssemblyName>Duplicati.Library.Backend.File</AssemblyName>
- <SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>Duplicati.snk</AssemblyOriginatorKeyFile>
<FileUpgradeFlags>
</FileUpgradeFlags>
diff --git a/Duplicati/Library/Backend/GoogleServices/Duplicati.Library.Backend.GoogleServices.csproj b/Duplicati/Library/Backend/GoogleServices/Duplicati.Library.Backend.GoogleServices.csproj index 14fd2ea1c..817a57af5 100644 --- a/Duplicati/Library/Backend/GoogleServices/Duplicati.Library.Backend.GoogleServices.csproj +++ b/Duplicati/Library/Backend/GoogleServices/Duplicati.Library.Backend.GoogleServices.csproj @@ -7,7 +7,6 @@ <OutputType>Library</OutputType> <RootNamespace>Duplicati.Library.Backend.GoogleServices</RootNamespace> <AssemblyName>Duplicati.Library.Backend.GoogleServices</AssemblyName> - <SignAssembly>true</SignAssembly> <AssemblyOriginatorKeyFile>Duplicati.snk</AssemblyOriginatorKeyFile> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <UseMSBuildEngine>false</UseMSBuildEngine> diff --git a/Duplicati/Library/Backend/HubiC/Duplicati.Library.Backend.HubiC.csproj b/Duplicati/Library/Backend/HubiC/Duplicati.Library.Backend.HubiC.csproj index de4f144e9..e103c386b 100644 --- a/Duplicati/Library/Backend/HubiC/Duplicati.Library.Backend.HubiC.csproj +++ b/Duplicati/Library/Backend/HubiC/Duplicati.Library.Backend.HubiC.csproj @@ -7,7 +7,6 @@ <OutputType>Library</OutputType> <RootNamespace>Duplicati.Library.Backend.HubiC</RootNamespace> <AssemblyName>Duplicati.Library.Backend.HubiC</AssemblyName> - <SignAssembly>true</SignAssembly> <AssemblyOriginatorKeyFile>Duplicati.snk</AssemblyOriginatorKeyFile> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <UseMSBuildEngine>false</UseMSBuildEngine> diff --git a/Duplicati/Library/Backend/Mega/Duplicati.Library.Backend.Mega.csproj b/Duplicati/Library/Backend/Mega/Duplicati.Library.Backend.Mega.csproj index bbfaad3be..33e183279 100644 --- a/Duplicati/Library/Backend/Mega/Duplicati.Library.Backend.Mega.csproj +++ b/Duplicati/Library/Backend/Mega/Duplicati.Library.Backend.Mega.csproj @@ -7,7 +7,6 @@ <OutputType>Library</OutputType> <RootNamespace>Duplicati.Library.Backend.Mega</RootNamespace> <AssemblyName>Duplicati.Library.Backend.Mega</AssemblyName> - <SignAssembly>true</SignAssembly> <AssemblyOriginatorKeyFile>Duplicati.snk</AssemblyOriginatorKeyFile> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <UseMSBuildEngine>false</UseMSBuildEngine> diff --git a/Duplicati/Library/Backend/OAuthHelper/Duplicati.Library.OAuthHelper.csproj b/Duplicati/Library/Backend/OAuthHelper/Duplicati.Library.OAuthHelper.csproj index 7079ee68f..f3005f88e 100644 --- a/Duplicati/Library/Backend/OAuthHelper/Duplicati.Library.OAuthHelper.csproj +++ b/Duplicati/Library/Backend/OAuthHelper/Duplicati.Library.OAuthHelper.csproj @@ -7,7 +7,6 @@ <OutputType>Library</OutputType> <RootNamespace>Duplicati.Library.OAuthHelper</RootNamespace> <AssemblyName>Duplicati.Library.OAuthHelper</AssemblyName> - <SignAssembly>true</SignAssembly> <AssemblyOriginatorKeyFile>Duplicati.snk</AssemblyOriginatorKeyFile> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <UseMSBuildEngine>false</UseMSBuildEngine> diff --git a/Duplicati/Library/Backend/OneDrive/Duplicati.Library.Backend.OneDrive.csproj b/Duplicati/Library/Backend/OneDrive/Duplicati.Library.Backend.OneDrive.csproj index c03f0b385..03a475406 100644 --- a/Duplicati/Library/Backend/OneDrive/Duplicati.Library.Backend.OneDrive.csproj +++ b/Duplicati/Library/Backend/OneDrive/Duplicati.Library.Backend.OneDrive.csproj @@ -8,7 +8,6 @@ <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Duplicati.Library.Backend</RootNamespace>
<AssemblyName>Duplicati.Library.Backend.OneDrive</AssemblyName>
- <SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>Duplicati.snk</AssemblyOriginatorKeyFile>
<FileAlignment>512</FileAlignment>
<FileUpgradeFlags>
diff --git a/Duplicati/Library/Backend/OpenStack/Duplicati.Library.Backend.OpenStack.csproj b/Duplicati/Library/Backend/OpenStack/Duplicati.Library.Backend.OpenStack.csproj index 29289d27c..fa7d2332f 100644 --- a/Duplicati/Library/Backend/OpenStack/Duplicati.Library.Backend.OpenStack.csproj +++ b/Duplicati/Library/Backend/OpenStack/Duplicati.Library.Backend.OpenStack.csproj @@ -7,7 +7,6 @@ <OutputType>Library</OutputType> <RootNamespace>Duplicati.Library.Backend.OpenStack</RootNamespace> <AssemblyName>Duplicati.Library.Backend.OpenStack</AssemblyName> - <SignAssembly>true</SignAssembly> <AssemblyOriginatorKeyFile>Duplicati.snk</AssemblyOriginatorKeyFile> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <UseMSBuildEngine>false</UseMSBuildEngine> diff --git a/Duplicati/Library/Backend/S3/Duplicati.Library.Backend.S3.csproj b/Duplicati/Library/Backend/S3/Duplicati.Library.Backend.S3.csproj index 415e63aef..cbc7d57bd 100644 --- a/Duplicati/Library/Backend/S3/Duplicati.Library.Backend.S3.csproj +++ b/Duplicati/Library/Backend/S3/Duplicati.Library.Backend.S3.csproj @@ -8,7 +8,6 @@ <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Duplicati.Library.Backend</RootNamespace>
<AssemblyName>Duplicati.Library.Backend.S3</AssemblyName>
- <SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>Duplicati.snk</AssemblyOriginatorKeyFile>
<FileUpgradeFlags>
</FileUpgradeFlags>
diff --git a/Duplicati/Library/Backend/SSHv2/Duplicati.Library.Backend.SSHv2.csproj b/Duplicati/Library/Backend/SSHv2/Duplicati.Library.Backend.SSHv2.csproj index 96c3b453b..6974feb12 100644 --- a/Duplicati/Library/Backend/SSHv2/Duplicati.Library.Backend.SSHv2.csproj +++ b/Duplicati/Library/Backend/SSHv2/Duplicati.Library.Backend.SSHv2.csproj @@ -9,7 +9,6 @@ <RootNamespace>Duplicati.Library.Backend</RootNamespace>
<AssemblyName>Duplicati.Library.Backend.SSHv2</AssemblyName>
<FileAlignment>512</FileAlignment>
- <SignAssembly>false</SignAssembly>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkProfile />
<UseMSBuildEngine>false</UseMSBuildEngine>
diff --git a/Duplicati/Library/Backend/Sia/Duplicati.Library.Backend.Sia.csproj b/Duplicati/Library/Backend/Sia/Duplicati.Library.Backend.Sia.csproj index fefb04749..4c67ec09a 100644 --- a/Duplicati/Library/Backend/Sia/Duplicati.Library.Backend.Sia.csproj +++ b/Duplicati/Library/Backend/Sia/Duplicati.Library.Backend.Sia.csproj @@ -7,7 +7,6 @@ <OutputType>Library</OutputType> <RootNamespace>Duplicati.Library.Backend.Sia</RootNamespace> <AssemblyName>Duplicati.Library.Backend.Sia</AssemblyName> - <SignAssembly>true</SignAssembly> <AssemblyOriginatorKeyFile>Duplicati.snk</AssemblyOriginatorKeyFile> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <UseMSBuildEngine>false</UseMSBuildEngine> diff --git a/Duplicati/Library/DynamicLoader/Duplicati.Library.DynamicLoader.csproj b/Duplicati/Library/DynamicLoader/Duplicati.Library.DynamicLoader.csproj index 21c4d58df..7624b1424 100644 --- a/Duplicati/Library/DynamicLoader/Duplicati.Library.DynamicLoader.csproj +++ b/Duplicati/Library/DynamicLoader/Duplicati.Library.DynamicLoader.csproj @@ -8,7 +8,6 @@ <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Duplicati.Library.DynamicLoader</RootNamespace>
<AssemblyName>Duplicati.Library.DynamicLoader</AssemblyName>
- <SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>Duplicati.snk</AssemblyOriginatorKeyFile>
<FileUpgradeFlags>
</FileUpgradeFlags>
diff --git a/Duplicati/Library/Encryption/Duplicati.Library.Encryption.csproj b/Duplicati/Library/Encryption/Duplicati.Library.Encryption.csproj index 1db4e3674..82439179a 100644 --- a/Duplicati/Library/Encryption/Duplicati.Library.Encryption.csproj +++ b/Duplicati/Library/Encryption/Duplicati.Library.Encryption.csproj @@ -8,7 +8,6 @@ <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Duplicati.Library.Encryption</RootNamespace>
<AssemblyName>Duplicati.Library.Encryption</AssemblyName>
- <SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>Duplicati.snk</AssemblyOriginatorKeyFile>
<FileUpgradeFlags>
</FileUpgradeFlags>
diff --git a/Duplicati/Library/Interface/Duplicati.Library.Interface.csproj b/Duplicati/Library/Interface/Duplicati.Library.Interface.csproj index 8d9cd26f4..745e830ff 100644 --- a/Duplicati/Library/Interface/Duplicati.Library.Interface.csproj +++ b/Duplicati/Library/Interface/Duplicati.Library.Interface.csproj @@ -9,7 +9,6 @@ <RootNamespace>Duplicati.Library.Interface</RootNamespace>
<AssemblyName>Duplicati.Library.Interface</AssemblyName>
<FileAlignment>512</FileAlignment>
- <SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>Duplicati.snk</AssemblyOriginatorKeyFile>
<FileUpgradeFlags>
</FileUpgradeFlags>
diff --git a/Duplicati/Library/Localization/Duplicati.Library.Localization.csproj b/Duplicati/Library/Localization/Duplicati.Library.Localization.csproj index 1fff0eee3..119be4efc 100644 --- a/Duplicati/Library/Localization/Duplicati.Library.Localization.csproj +++ b/Duplicati/Library/Localization/Duplicati.Library.Localization.csproj @@ -7,7 +7,6 @@ <OutputType>Library</OutputType>
<RootNamespace>Duplicati.Library.Localization</RootNamespace>
<AssemblyName>Duplicati.Library.Localization</AssemblyName>
- <SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\Main\Duplicati.snk</AssemblyOriginatorKeyFile>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkProfile />
diff --git a/Duplicati/Library/Logging/Duplicati.Library.Logging.csproj b/Duplicati/Library/Logging/Duplicati.Library.Logging.csproj index 670f652fd..8075f2276 100644 --- a/Duplicati/Library/Logging/Duplicati.Library.Logging.csproj +++ b/Duplicati/Library/Logging/Duplicati.Library.Logging.csproj @@ -8,7 +8,6 @@ <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Duplicati.Library.Logging</RootNamespace>
<AssemblyName>Duplicati.Library.Logging</AssemblyName>
- <SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>Duplicati.snk</AssemblyOriginatorKeyFile>
<FileUpgradeFlags>
</FileUpgradeFlags>
diff --git a/Duplicati/Library/Main/Duplicati.Library.Main.csproj b/Duplicati/Library/Main/Duplicati.Library.Main.csproj index 3d3c9773a..892c33d1f 100644 --- a/Duplicati/Library/Main/Duplicati.Library.Main.csproj +++ b/Duplicati/Library/Main/Duplicati.Library.Main.csproj @@ -8,7 +8,6 @@ <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Duplicati.Library.Main</RootNamespace>
<AssemblyName>Duplicati.Library.Main</AssemblyName>
- <SignAssembly>false</SignAssembly>
<AssemblyOriginatorKeyFile>Duplicati.snk</AssemblyOriginatorKeyFile>
<FileUpgradeFlags>
</FileUpgradeFlags>
diff --git a/Duplicati/Library/Main/Operation/BackupHandler.cs b/Duplicati/Library/Main/Operation/BackupHandler.cs index d9c6fe934..226a9f5c5 100644 --- a/Duplicati/Library/Main/Operation/BackupHandler.cs +++ b/Duplicati/Library/Main/Operation/BackupHandler.cs @@ -857,13 +857,13 @@ namespace Duplicati.Library.Main.Operation }
}
- m_result.OperationProgressUpdater.UpdatePhase(OperationPhase.Backup_Complete);
m_database.WriteResults();
m_database.PurgeLogData(m_options.LogRetention);
if (m_options.AutoVacuum)
{
m_database.Vacuum();
}
+ m_result.OperationProgressUpdater.UpdatePhase(OperationPhase.Backup_Complete);
return;
}
}
diff --git a/Duplicati/Library/Main/Operation/RestoreHandlerMetadataStorage.cs b/Duplicati/Library/Main/Operation/RestoreHandlerMetadataStorage.cs index 131ed1f1b..32803c19b 100644 --- a/Duplicati/Library/Main/Operation/RestoreHandlerMetadataStorage.cs +++ b/Duplicati/Library/Main/Operation/RestoreHandlerMetadataStorage.cs @@ -38,7 +38,7 @@ namespace Duplicati.Library.Main.Operation var datalen = data.Length;
if (datalen > Int32.MaxValue)
- throw new ArgumentOutOfRangeException("Metadata is larger than int32");
+ throw new ArgumentOutOfRangeException(nameof(datalen), "Metadata is larger than int32");
var pathbytes = System.Text.Encoding.UTF8.GetBytes(path);
var pathlen = BitConverter.GetBytes(pathbytes.LongLength);
@@ -97,7 +97,7 @@ namespace Duplicati.Library.Main.Operation CheckedRead(bf, 0, bf.Length);
var datalen = BitConverter.ToInt64(bf, 0);
if (datalen > Int32.MaxValue)
- throw new ArgumentOutOfRangeException("Metadata is larger than int32");
+ throw new ArgumentOutOfRangeException(nameof(datalen), "Metadata is larger than int32");
var databuf = datalen > buf.Length ? new byte[datalen] : buf;
CheckedRead(databuf, 0, (int)datalen);
diff --git a/Duplicati/Library/Main/Options.cs b/Duplicati/Library/Main/Options.cs index bd93568fd..2ca2c7af9 100644 --- a/Duplicati/Library/Main/Options.cs +++ b/Duplicati/Library/Main/Options.cs @@ -1351,11 +1351,11 @@ namespace Duplicati.Library.Main if (!m_options.TryGetValue("blocksize", out tmp))
tmp = DEFAULT_BLOCKSIZE;
- long t = Library.Utility.Sizeparser.ParseSize(tmp, "kb");
- if (t > int.MaxValue || t < 1024)
- throw new ArgumentOutOfRangeException("blocksize", string.Format("The blocksize cannot be less than {0}, nor larger than {1}", 1024, int.MaxValue));
+ long blocksize = Library.Utility.Sizeparser.ParseSize(tmp, "kb");
+ if (blocksize > int.MaxValue || blocksize < 1024)
+ throw new ArgumentOutOfRangeException(nameof(blocksize), string.Format("The blocksize cannot be less than {0}, nor larger than {1}", 1024, int.MaxValue));
- return (int)t;
+ return (int)blocksize;
}
}
diff --git a/Duplicati/Library/SQLiteHelper/Duplicati.Library.SQLiteHelper.csproj b/Duplicati/Library/SQLiteHelper/Duplicati.Library.SQLiteHelper.csproj index 06d9deab3..f6f01f7d9 100644 --- a/Duplicati/Library/SQLiteHelper/Duplicati.Library.SQLiteHelper.csproj +++ b/Duplicati/Library/SQLiteHelper/Duplicati.Library.SQLiteHelper.csproj @@ -7,7 +7,6 @@ <OutputType>Library</OutputType>
<RootNamespace>Duplicati.Library.SQLiteHelper</RootNamespace>
<AssemblyName>SQLiteHelper</AssemblyName>
- <SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\GUI\Duplicati.GUI.TrayIcon\Duplicati.snk</AssemblyOriginatorKeyFile>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkProfile />
diff --git a/Duplicati/Library/Utility/DirectStreamLink.cs b/Duplicati/Library/Utility/DirectStreamLink.cs index 4cb2ffa35..e0fe8c1c6 100644 --- a/Duplicati/Library/Utility/DirectStreamLink.cs +++ b/Duplicati/Library/Utility/DirectStreamLink.cs @@ -103,7 +103,7 @@ namespace Duplicati.Library.Utility m_passWriteThrough = passWriteThrough; m_blockOnFlush = blockOnFlush; m_blockOnClose = blockOnClose; - if (bufsize <= 0) throw new ArgumentOutOfRangeException("bufsize"); + if (bufsize <= 0) throw new ArgumentOutOfRangeException(nameof(bufsize), "The size of the buffer must be positive."); m_buf = new byte[bufsize]; m_readerStream = new LinkedReaderStream(this); m_writerStream = new LinkedWriterStream(this); diff --git a/Duplicati/Library/Utility/Duplicati.Library.Utility.csproj b/Duplicati/Library/Utility/Duplicati.Library.Utility.csproj index 800734f22..07ba1b083 100644 --- a/Duplicati/Library/Utility/Duplicati.Library.Utility.csproj +++ b/Duplicati/Library/Utility/Duplicati.Library.Utility.csproj @@ -8,7 +8,6 @@ <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Duplicati.Library.Utility</RootNamespace>
<AssemblyName>Duplicati.Library.Utility</AssemblyName>
- <SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>Duplicati.snk</AssemblyOriginatorKeyFile>
<FileUpgradeFlags>
</FileUpgradeFlags>
diff --git a/Duplicati/License/Duplicati.License.csproj b/Duplicati/License/Duplicati.License.csproj index 9c347a076..3aff3525b 100644 --- a/Duplicati/License/Duplicati.License.csproj +++ b/Duplicati/License/Duplicati.License.csproj @@ -9,7 +9,6 @@ <RootNamespace>Duplicati.License</RootNamespace>
<AssemblyName>Duplicati.License</AssemblyName>
<FileAlignment>512</FileAlignment>
- <SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>Duplicati.snk</AssemblyOriginatorKeyFile>
<FileUpgradeFlags>
</FileUpgradeFlags>
diff --git a/Duplicati/Server/Duplicati.Server.Serialization/Duplicati.Server.Serialization.csproj b/Duplicati/Server/Duplicati.Server.Serialization/Duplicati.Server.Serialization.csproj index eade340a0..92daf6325 100644 --- a/Duplicati/Server/Duplicati.Server.Serialization/Duplicati.Server.Serialization.csproj +++ b/Duplicati/Server/Duplicati.Server.Serialization/Duplicati.Server.Serialization.csproj @@ -33,7 +33,6 @@ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup>
- <SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>Duplicati.snk</AssemblyOriginatorKeyFile>
diff --git a/Duplicati/Server/Duplicati.Server.csproj b/Duplicati/Server/Duplicati.Server.csproj index d8f9221b1..bc5c3a49f 100644 --- a/Duplicati/Server/Duplicati.Server.csproj +++ b/Duplicati/Server/Duplicati.Server.csproj @@ -12,7 +12,6 @@ <FileAlignment>512</FileAlignment>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkProfile />
- <SignAssembly>false</SignAssembly>
<UseMSBuildEngine>false</UseMSBuildEngine>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
diff --git a/Duplicati/Server/LogWriteHandler.cs b/Duplicati/Server/LogWriteHandler.cs index 48a122fab..0d7d264ba 100644 --- a/Duplicati/Server/LogWriteHandler.cs +++ b/Duplicati/Server/LogWriteHandler.cs @@ -116,7 +116,7 @@ namespace Duplicati.Server lock(m_lock)
{
if (m_length == 0)
- throw new ArgumentOutOfRangeException("Buffer is empty");
+ throw new ArgumentOutOfRangeException(nameof(m_length), "Buffer is empty");
m_key++;
var ix = m_tail;
diff --git a/Duplicati/Service/Duplicati.Service.csproj b/Duplicati/Service/Duplicati.Service.csproj index 20b63ea2d..53f6d2773 100644 --- a/Duplicati/Service/Duplicati.Service.csproj +++ b/Duplicati/Service/Duplicati.Service.csproj @@ -10,7 +10,6 @@ <AssemblyName>Duplicati.Service</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkProfile />
- <SignAssembly>true</SignAssembly>
<UseMSBuildEngine>false</UseMSBuildEngine>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/Duplicati/WindowsService/WindowsService.csproj b/Duplicati/WindowsService/WindowsService.csproj index 33a467803..984460417 100644 --- a/Duplicati/WindowsService/WindowsService.csproj +++ b/Duplicati/WindowsService/WindowsService.csproj @@ -14,7 +14,6 @@ <FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<TargetFrameworkProfile />
- <SignAssembly>true</SignAssembly>
<UseMSBuildEngine>false</UseMSBuildEngine>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/thirdparty/UnixSupport/UnixSupport.csproj b/thirdparty/UnixSupport/UnixSupport.csproj index 04faad067..5400fb0a8 100644 --- a/thirdparty/UnixSupport/UnixSupport.csproj +++ b/thirdparty/UnixSupport/UnixSupport.csproj @@ -10,7 +10,6 @@ <RootNamespace>UnixSupport</RootNamespace> <AssemblyName>UnixSupport</AssemblyName> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> - <SignAssembly>true</SignAssembly> <AssemblyOriginatorKeyFile>Duplicati.snk</AssemblyOriginatorKeyFile> <ReleaseVersion>1.0</ReleaseVersion> <SynchReleaseVersion>false</SynchReleaseVersion> |