diff options
Diffstat (limited to 'Duplicati/Library')
83 files changed, 156 insertions, 143 deletions
diff --git a/Duplicati/Library/AutoUpdater/Duplicati.Library.AutoUpdater.csproj b/Duplicati/Library/AutoUpdater/Duplicati.Library.AutoUpdater.csproj index ea08912a2..cf665dda6 100644 --- a/Duplicati/Library/AutoUpdater/Duplicati.Library.AutoUpdater.csproj +++ b/Duplicati/Library/AutoUpdater/Duplicati.Library.AutoUpdater.csproj @@ -10,7 +10,7 @@ <AssemblyName>Duplicati.Library.AutoUpdater</AssemblyName>
<AssemblyOriginatorKeyFile>..\..\GUI\Duplicati.GUI.TrayIcon\Duplicati.snk</AssemblyOriginatorKeyFile>
<StartupObject>Duplicati.Library.AutoUpdater.Program</StartupObject>
- <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<TargetFrameworkProfile />
<UseMSBuildEngine>false</UseMSBuildEngine>
</PropertyGroup>
diff --git a/Duplicati/Library/AutoUpdater/app.config b/Duplicati/Library/AutoUpdater/app.config index 5c5a9267f..72546de59 100644 --- a/Duplicati/Library/AutoUpdater/app.config +++ b/Duplicati/Library/AutoUpdater/app.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
- <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1"/>
</startup>
</configuration>
diff --git a/Duplicati/Library/AutoUpdater/packages.config b/Duplicati/Library/AutoUpdater/packages.config index 1812e5207..5e9c8c41c 100644 --- a/Duplicati/Library/AutoUpdater/packages.config +++ b/Duplicati/Library/AutoUpdater/packages.config @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net462" /> -</packages>
\ No newline at end of file + <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net471" /> +</packages> diff --git a/Duplicati/Library/Backend/AlternativeFTP/Duplicati.Library.Backend.AlternativeFTP.csproj b/Duplicati/Library/Backend/AlternativeFTP/Duplicati.Library.Backend.AlternativeFTP.csproj index e3d06b0a1..a2042d478 100644 --- a/Duplicati/Library/Backend/AlternativeFTP/Duplicati.Library.Backend.AlternativeFTP.csproj +++ b/Duplicati/Library/Backend/AlternativeFTP/Duplicati.Library.Backend.AlternativeFTP.csproj @@ -9,7 +9,7 @@ <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Duplicati.Library.Backend.AlternativeFTP</RootNamespace>
<AssemblyName>Duplicati.Library.Backend.AlternativeFTP</AssemblyName>
- <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<UseMSBuildEngine>false</UseMSBuildEngine>
<TargetFrameworkProfile />
diff --git a/Duplicati/Library/Backend/AlternativeFTP/app.config b/Duplicati/Library/Backend/AlternativeFTP/app.config index c76c89bb8..ba98fc967 100644 --- a/Duplicati/Library/Backend/AlternativeFTP/app.config +++ b/Duplicati/Library/Backend/AlternativeFTP/app.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <configuration> <startup> - <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/> + <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1"/> </startup> </configuration> diff --git a/Duplicati/Library/Backend/AlternativeFTP/packages.config b/Duplicati/Library/Backend/AlternativeFTP/packages.config index 1e9b7c70e..e18a4b2da 100644 --- a/Duplicati/Library/Backend/AlternativeFTP/packages.config +++ b/Duplicati/Library/Backend/AlternativeFTP/packages.config @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="FluentFTP" version="27.1.1" targetFramework="net462" />
-</packages>
\ No newline at end of file + <package id="FluentFTP" version="27.1.1" targetFramework="net471" />
+</packages>
diff --git a/Duplicati/Library/Backend/AzureBlob/Duplicati.Library.Backend.AzureBlob.csproj b/Duplicati/Library/Backend/AzureBlob/Duplicati.Library.Backend.AzureBlob.csproj index b30ab9892..3856ada8c 100644 --- a/Duplicati/Library/Backend/AzureBlob/Duplicati.Library.Backend.AzureBlob.csproj +++ b/Duplicati/Library/Backend/AzureBlob/Duplicati.Library.Backend.AzureBlob.csproj @@ -13,7 +13,7 @@ <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>Duplicati.Library.Backend.AzureBlob</RootNamespace> <AssemblyName>Duplicati.Library.Backend.AzureBlob</AssemblyName> - <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> + <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion> <FileAlignment>512</FileAlignment> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> diff --git a/Duplicati/Library/Backend/AzureBlob/app.config b/Duplicati/Library/Backend/AzureBlob/app.config index acdba516e..39df99756 100644 --- a/Duplicati/Library/Backend/AzureBlob/app.config +++ b/Duplicati/Library/Backend/AzureBlob/app.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <configuration> -<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" /></startup> +<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1" /></startup> <runtime> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <dependentAssembly> diff --git a/Duplicati/Library/Backend/AzureBlob/packages.config b/Duplicati/Library/Backend/AzureBlob/packages.config index 653f10c34..1355301d9 100644 --- a/Duplicati/Library/Backend/AzureBlob/packages.config +++ b/Duplicati/Library/Backend/AzureBlob/packages.config @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="Microsoft.Azure.KeyVault.Core" version="3.0.4" targetFramework="net462" /> - <package id="Microsoft.Azure.KeyVault.WebKey" version="3.0.4" targetFramework="net462" /> - <package id="Microsoft.Azure.Storage.Blob" version="11.0.1" targetFramework="net462" /> - <package id="Microsoft.Azure.Storage.Common" version="11.0.1" targetFramework="net462" /> - <package id="Microsoft.Azure.Storage.File" version="11.0.1" targetFramework="net462" /> - <package id="Microsoft.Azure.Storage.Queue" version="11.0.1" targetFramework="net462" /> - <package id="Microsoft.Rest.ClientRuntime" version="2.3.20" targetFramework="net462" /> - <package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.19" targetFramework="net462" /> - <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net462" /> - <package id="System.Spatial" version="5.8.4" targetFramework="net462" /> - <package id="WindowsAzure.Storage" version="9.3.3" targetFramework="net462" /> -</packages>
\ No newline at end of file + <package id="Microsoft.Azure.KeyVault.Core" version="3.0.4" targetFramework="net471" /> + <package id="Microsoft.Azure.KeyVault.WebKey" version="3.0.4" targetFramework="net471" /> + <package id="Microsoft.Azure.Storage.Blob" version="11.0.1" targetFramework="net471" /> + <package id="Microsoft.Azure.Storage.Common" version="11.0.1" targetFramework="net471" /> + <package id="Microsoft.Azure.Storage.File" version="11.0.1" targetFramework="net471" /> + <package id="Microsoft.Azure.Storage.Queue" version="11.0.1" targetFramework="net471" /> + <package id="Microsoft.Rest.ClientRuntime" version="2.3.20" targetFramework="net471" /> + <package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.19" targetFramework="net471" /> + <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net471" /> + <package id="System.Spatial" version="5.8.4" targetFramework="net471" /> + <package id="WindowsAzure.Storage" version="9.3.3" targetFramework="net471" /> +</packages> diff --git a/Duplicati/Library/Backend/Backblaze/Duplicati.Library.Backend.Backblaze.csproj b/Duplicati/Library/Backend/Backblaze/Duplicati.Library.Backend.Backblaze.csproj index a1a516c3e..a2e187a6e 100644 --- a/Duplicati/Library/Backend/Backblaze/Duplicati.Library.Backend.Backblaze.csproj +++ b/Duplicati/Library/Backend/Backblaze/Duplicati.Library.Backend.Backblaze.csproj @@ -8,7 +8,7 @@ <RootNamespace>Duplicati.Library.Backend.Backblaze</RootNamespace> <AssemblyName>Duplicati.Library.Backend.Backblaze</AssemblyName> <AssemblyOriginatorKeyFile>Duplicati.snk</AssemblyOriginatorKeyFile> - <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> + <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion> <UseMSBuildEngine>false</UseMSBuildEngine> <TargetFrameworkProfile /> </PropertyGroup> diff --git a/Duplicati/Library/Backend/Backblaze/packages.config b/Duplicati/Library/Backend/Backblaze/packages.config index 1812e5207..5e9c8c41c 100644 --- a/Duplicati/Library/Backend/Backblaze/packages.config +++ b/Duplicati/Library/Backend/Backblaze/packages.config @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net462" /> -</packages>
\ No newline at end of file + <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net471" /> +</packages> diff --git a/Duplicati/Library/Backend/Box/Duplicati.Library.Backend.Box.csproj b/Duplicati/Library/Backend/Box/Duplicati.Library.Backend.Box.csproj index 9719ca7b7..3ff020f44 100644 --- a/Duplicati/Library/Backend/Box/Duplicati.Library.Backend.Box.csproj +++ b/Duplicati/Library/Backend/Box/Duplicati.Library.Backend.Box.csproj @@ -8,7 +8,7 @@ <RootNamespace>Duplicati.Library.Backend.Box</RootNamespace> <AssemblyName>Duplicati.Library.Backend.Box</AssemblyName> <AssemblyOriginatorKeyFile>Duplicati.snk</AssemblyOriginatorKeyFile> - <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> + <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion> <UseMSBuildEngine>false</UseMSBuildEngine> <TargetFrameworkProfile /> </PropertyGroup> diff --git a/Duplicati/Library/Backend/Box/packages.config b/Duplicati/Library/Backend/Box/packages.config index 1812e5207..5e9c8c41c 100644 --- a/Duplicati/Library/Backend/Box/packages.config +++ b/Duplicati/Library/Backend/Box/packages.config @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net462" /> -</packages>
\ No newline at end of file + <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net471" /> +</packages> diff --git a/Duplicati/Library/Backend/CloudFiles/Duplicati.Library.Backend.CloudFiles.csproj b/Duplicati/Library/Backend/CloudFiles/Duplicati.Library.Backend.CloudFiles.csproj index a554f1f80..7ce362973 100644 --- a/Duplicati/Library/Backend/CloudFiles/Duplicati.Library.Backend.CloudFiles.csproj +++ b/Duplicati/Library/Backend/CloudFiles/Duplicati.Library.Backend.CloudFiles.csproj @@ -11,7 +11,7 @@ <FileUpgradeFlags>
</FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion>
- <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<TargetFrameworkProfile />
<UpgradeBackupLocation>
</UpgradeBackupLocation>
diff --git a/Duplicati/Library/Backend/CloudFiles/app.config b/Duplicati/Library/Backend/CloudFiles/app.config index 5c5a9267f..72546de59 100644 --- a/Duplicati/Library/Backend/CloudFiles/app.config +++ b/Duplicati/Library/Backend/CloudFiles/app.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
- <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1"/>
</startup>
</configuration>
diff --git a/Duplicati/Library/Backend/Dropbox/Duplicati.Library.Backend.Dropbox.csproj b/Duplicati/Library/Backend/Dropbox/Duplicati.Library.Backend.Dropbox.csproj index 0ea238eee..0c8e7e6d3 100644 --- a/Duplicati/Library/Backend/Dropbox/Duplicati.Library.Backend.Dropbox.csproj +++ b/Duplicati/Library/Backend/Dropbox/Duplicati.Library.Backend.Dropbox.csproj @@ -9,7 +9,7 @@ <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>Duplicati.Library.Backend.Dropbox</RootNamespace> <AssemblyName>Duplicati.Library.Backend.Dropbox</AssemblyName> - <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> + <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion> <FileAlignment>512</FileAlignment> <UseMSBuildEngine>false</UseMSBuildEngine> <TargetFrameworkProfile /> diff --git a/Duplicati/Library/Backend/Dropbox/packages.config b/Duplicati/Library/Backend/Dropbox/packages.config index 1812e5207..5e9c8c41c 100644 --- a/Duplicati/Library/Backend/Dropbox/packages.config +++ b/Duplicati/Library/Backend/Dropbox/packages.config @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net462" /> -</packages>
\ No newline at end of file + <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net471" /> +</packages> diff --git a/Duplicati/Library/Backend/FTP/Duplicati.Library.Backend.FTP.csproj b/Duplicati/Library/Backend/FTP/Duplicati.Library.Backend.FTP.csproj index edc7ff04c..64f6e9b4a 100644 --- a/Duplicati/Library/Backend/FTP/Duplicati.Library.Backend.FTP.csproj +++ b/Duplicati/Library/Backend/FTP/Duplicati.Library.Backend.FTP.csproj @@ -12,7 +12,7 @@ <FileUpgradeFlags>
</FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion>
- <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<TargetFrameworkProfile />
<UpgradeBackupLocation>
</UpgradeBackupLocation>
diff --git a/Duplicati/Library/Backend/FTP/app.config b/Duplicati/Library/Backend/FTP/app.config index 5c5a9267f..72546de59 100644 --- a/Duplicati/Library/Backend/FTP/app.config +++ b/Duplicati/Library/Backend/FTP/app.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
- <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1"/>
</startup>
</configuration>
diff --git a/Duplicati/Library/Backend/File/Duplicati.Library.Backend.File.csproj b/Duplicati/Library/Backend/File/Duplicati.Library.Backend.File.csproj index 4d6388096..1fc3e5286 100644 --- a/Duplicati/Library/Backend/File/Duplicati.Library.Backend.File.csproj +++ b/Duplicati/Library/Backend/File/Duplicati.Library.Backend.File.csproj @@ -12,7 +12,7 @@ <FileUpgradeFlags>
</FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion>
- <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<TargetFrameworkProfile />
<UpgradeBackupLocation>
</UpgradeBackupLocation>
diff --git a/Duplicati/Library/Backend/File/app.config b/Duplicati/Library/Backend/File/app.config index 5c5a9267f..72546de59 100644 --- a/Duplicati/Library/Backend/File/app.config +++ b/Duplicati/Library/Backend/File/app.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
- <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1"/>
</startup>
</configuration>
diff --git a/Duplicati/Library/Backend/GoogleServices/Duplicati.Library.Backend.GoogleServices.csproj b/Duplicati/Library/Backend/GoogleServices/Duplicati.Library.Backend.GoogleServices.csproj index 489a6dac8..f36bdaff2 100644 --- a/Duplicati/Library/Backend/GoogleServices/Duplicati.Library.Backend.GoogleServices.csproj +++ b/Duplicati/Library/Backend/GoogleServices/Duplicati.Library.Backend.GoogleServices.csproj @@ -8,7 +8,7 @@ <RootNamespace>Duplicati.Library.Backend.GoogleServices</RootNamespace> <AssemblyName>Duplicati.Library.Backend.GoogleServices</AssemblyName> <AssemblyOriginatorKeyFile>Duplicati.snk</AssemblyOriginatorKeyFile> - <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> + <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion> <UseMSBuildEngine>false</UseMSBuildEngine> <TargetFrameworkProfile /> </PropertyGroup> diff --git a/Duplicati/Library/Backend/GoogleServices/packages.config b/Duplicati/Library/Backend/GoogleServices/packages.config index 1812e5207..5e9c8c41c 100644 --- a/Duplicati/Library/Backend/GoogleServices/packages.config +++ b/Duplicati/Library/Backend/GoogleServices/packages.config @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net462" /> -</packages>
\ No newline at end of file + <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net471" /> +</packages> diff --git a/Duplicati/Library/Backend/HubiC/Duplicati.Library.Backend.HubiC.csproj b/Duplicati/Library/Backend/HubiC/Duplicati.Library.Backend.HubiC.csproj index 359ab6841..e742a31f1 100644 --- a/Duplicati/Library/Backend/HubiC/Duplicati.Library.Backend.HubiC.csproj +++ b/Duplicati/Library/Backend/HubiC/Duplicati.Library.Backend.HubiC.csproj @@ -8,7 +8,7 @@ <RootNamespace>Duplicati.Library.Backend.HubiC</RootNamespace> <AssemblyName>Duplicati.Library.Backend.HubiC</AssemblyName> <AssemblyOriginatorKeyFile>Duplicati.snk</AssemblyOriginatorKeyFile> - <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> + <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion> <UseMSBuildEngine>false</UseMSBuildEngine> <TargetFrameworkProfile /> </PropertyGroup> diff --git a/Duplicati/Library/Backend/Jottacloud/Duplicati.Library.Backend.Jottacloud.csproj b/Duplicati/Library/Backend/Jottacloud/Duplicati.Library.Backend.Jottacloud.csproj index bc0d32be8..9cdfd56bf 100644 --- a/Duplicati/Library/Backend/Jottacloud/Duplicati.Library.Backend.Jottacloud.csproj +++ b/Duplicati/Library/Backend/Jottacloud/Duplicati.Library.Backend.Jottacloud.csproj @@ -11,7 +11,7 @@ <FileUpgradeFlags> </FileUpgradeFlags> <OldToolsVersion>3.5</OldToolsVersion> - <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> + <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion> <TargetFrameworkProfile /> <UpgradeBackupLocation> </UpgradeBackupLocation> diff --git a/Duplicati/Library/Backend/Mega/Duplicati.Library.Backend.Mega.csproj b/Duplicati/Library/Backend/Mega/Duplicati.Library.Backend.Mega.csproj index c51ee5d3a..c8871b0e0 100644 --- a/Duplicati/Library/Backend/Mega/Duplicati.Library.Backend.Mega.csproj +++ b/Duplicati/Library/Backend/Mega/Duplicati.Library.Backend.Mega.csproj @@ -8,7 +8,7 @@ <RootNamespace>Duplicati.Library.Backend.Mega</RootNamespace> <AssemblyName>Duplicati.Library.Backend.Mega</AssemblyName> <AssemblyOriginatorKeyFile>Duplicati.snk</AssemblyOriginatorKeyFile> - <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> + <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion> <UseMSBuildEngine>false</UseMSBuildEngine> <TargetFrameworkProfile /> </PropertyGroup> diff --git a/Duplicati/Library/Backend/Mega/app.config b/Duplicati/Library/Backend/Mega/app.config index 5616b953a..d720ad020 100644 --- a/Duplicati/Library/Backend/Mega/app.config +++ b/Duplicati/Library/Backend/Mega/app.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <configuration> <startup> - <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" /> + <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1" /> </startup> <runtime> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> diff --git a/Duplicati/Library/Backend/Mega/packages.config b/Duplicati/Library/Backend/Mega/packages.config index fed72d957..06ff32662 100644 --- a/Duplicati/Library/Backend/Mega/packages.config +++ b/Duplicati/Library/Backend/Mega/packages.config @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="MegaApiClient" version="1.7.1" targetFramework="net462" /> - <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net462" /> -</packages>
\ No newline at end of file + <package id="MegaApiClient" version="1.7.1" targetFramework="net471" /> + <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net471" /> +</packages> diff --git a/Duplicati/Library/Backend/OAuthHelper/Duplicati.Library.OAuthHelper.csproj b/Duplicati/Library/Backend/OAuthHelper/Duplicati.Library.OAuthHelper.csproj index 0370226e5..3d3d46406 100644 --- a/Duplicati/Library/Backend/OAuthHelper/Duplicati.Library.OAuthHelper.csproj +++ b/Duplicati/Library/Backend/OAuthHelper/Duplicati.Library.OAuthHelper.csproj @@ -8,7 +8,7 @@ <RootNamespace>Duplicati.Library.OAuthHelper</RootNamespace> <AssemblyName>Duplicati.Library.OAuthHelper</AssemblyName> <AssemblyOriginatorKeyFile>Duplicati.snk</AssemblyOriginatorKeyFile> - <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> + <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion> <UseMSBuildEngine>false</UseMSBuildEngine> <TargetFrameworkProfile /> </PropertyGroup> diff --git a/Duplicati/Library/Backend/OAuthHelper/packages.config b/Duplicati/Library/Backend/OAuthHelper/packages.config index 1812e5207..5e9c8c41c 100644 --- a/Duplicati/Library/Backend/OAuthHelper/packages.config +++ b/Duplicati/Library/Backend/OAuthHelper/packages.config @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net462" /> -</packages>
\ No newline at end of file + <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net471" /> +</packages> diff --git a/Duplicati/Library/Backend/OneDrive/Duplicati.Library.Backend.OneDrive.csproj b/Duplicati/Library/Backend/OneDrive/Duplicati.Library.Backend.OneDrive.csproj index 2fa5a5f1f..1e8d5f8e2 100644 --- a/Duplicati/Library/Backend/OneDrive/Duplicati.Library.Backend.OneDrive.csproj +++ b/Duplicati/Library/Backend/OneDrive/Duplicati.Library.Backend.OneDrive.csproj @@ -14,7 +14,7 @@ </FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation />
- <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<TargetFrameworkProfile />
<UseMSBuildEngine>false</UseMSBuildEngine>
</PropertyGroup>
diff --git a/Duplicati/Library/Backend/OneDrive/packages.config b/Duplicati/Library/Backend/OneDrive/packages.config index 1812e5207..5e9c8c41c 100644 --- a/Duplicati/Library/Backend/OneDrive/packages.config +++ b/Duplicati/Library/Backend/OneDrive/packages.config @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net462" /> -</packages>
\ No newline at end of file + <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net471" /> +</packages> diff --git a/Duplicati/Library/Backend/OpenStack/Duplicati.Library.Backend.OpenStack.csproj b/Duplicati/Library/Backend/OpenStack/Duplicati.Library.Backend.OpenStack.csproj index 2d2ae8bae..08b732f9a 100644 --- a/Duplicati/Library/Backend/OpenStack/Duplicati.Library.Backend.OpenStack.csproj +++ b/Duplicati/Library/Backend/OpenStack/Duplicati.Library.Backend.OpenStack.csproj @@ -8,7 +8,7 @@ <RootNamespace>Duplicati.Library.Backend.OpenStack</RootNamespace> <AssemblyName>Duplicati.Library.Backend.OpenStack</AssemblyName> <AssemblyOriginatorKeyFile>Duplicati.snk</AssemblyOriginatorKeyFile> - <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> + <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion> <UseMSBuildEngine>false</UseMSBuildEngine> <TargetFrameworkProfile /> </PropertyGroup> diff --git a/Duplicati/Library/Backend/OpenStack/packages.config b/Duplicati/Library/Backend/OpenStack/packages.config index 1812e5207..5e9c8c41c 100644 --- a/Duplicati/Library/Backend/OpenStack/packages.config +++ b/Duplicati/Library/Backend/OpenStack/packages.config @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net462" /> -</packages>
\ No newline at end of file + <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net471" /> +</packages> diff --git a/Duplicati/Library/Backend/Rclone/Duplicati.Library.Backend.Rclone.csproj b/Duplicati/Library/Backend/Rclone/Duplicati.Library.Backend.Rclone.csproj index a8c22c479..31d35c10f 100644 --- a/Duplicati/Library/Backend/Rclone/Duplicati.Library.Backend.Rclone.csproj +++ b/Duplicati/Library/Backend/Rclone/Duplicati.Library.Backend.Rclone.csproj @@ -8,7 +8,7 @@ <RootNamespace>Duplicati.Library.Backend.Rclone</RootNamespace> <AssemblyName>Duplicati.Library.Backend.Rclone</AssemblyName> <AssemblyOriginatorKeyFile>Duplicati.snk</AssemblyOriginatorKeyFile> - <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> + <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion> <UseMSBuildEngine>false</UseMSBuildEngine> <TargetFrameworkProfile /> </PropertyGroup> diff --git a/Duplicati/Library/Backend/Rclone/packages.config b/Duplicati/Library/Backend/Rclone/packages.config index 1812e5207..5e9c8c41c 100644 --- a/Duplicati/Library/Backend/Rclone/packages.config +++ b/Duplicati/Library/Backend/Rclone/packages.config @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net462" /> -</packages>
\ No newline at end of file + <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net471" /> +</packages> diff --git a/Duplicati/Library/Backend/S3/Duplicati.Library.Backend.S3.csproj b/Duplicati/Library/Backend/S3/Duplicati.Library.Backend.S3.csproj index f54e95d84..409baa125 100644 --- a/Duplicati/Library/Backend/S3/Duplicati.Library.Backend.S3.csproj +++ b/Duplicati/Library/Backend/S3/Duplicati.Library.Backend.S3.csproj @@ -11,7 +11,7 @@ <AssemblyOriginatorKeyFile>Duplicati.snk</AssemblyOriginatorKeyFile>
<FileUpgradeFlags>
</FileUpgradeFlags>
- <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<TargetFrameworkProfile />
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation>
diff --git a/Duplicati/Library/Backend/S3/app.config b/Duplicati/Library/Backend/S3/app.config index 5c5a9267f..72546de59 100644 --- a/Duplicati/Library/Backend/S3/app.config +++ b/Duplicati/Library/Backend/S3/app.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
- <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1"/>
</startup>
</configuration>
diff --git a/Duplicati/Library/Backend/S3/packages.config b/Duplicati/Library/Backend/S3/packages.config index 591f061ad..f4f64f963 100644 --- a/Duplicati/Library/Backend/S3/packages.config +++ b/Duplicati/Library/Backend/S3/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="AWSSDK.Core" version="3.3.103.37" targetFramework="net462" /> - <package id="AWSSDK.IdentityManagement" version="3.3.103.26" targetFramework="net462" /> - <package id="AWSSDK.S3" version="3.3.104.25" targetFramework="net462" /> - <package id="Minio" version="3.1.7" targetFramework="net462" /> - <package id="RestSharp" version="106.3.1" targetFramework="net462" /> - <package id="System.Reactive" version="4.0.0" targetFramework="net462" /> - <package id="System.Reactive.Linq" version="4.0.0" targetFramework="net462" /> -</packages>
\ No newline at end of file + <package id="AWSSDK.Core" version="3.3.103.37" targetFramework="net471" /> + <package id="AWSSDK.IdentityManagement" version="3.3.103.26" targetFramework="net471" /> + <package id="AWSSDK.S3" version="3.3.104.25" targetFramework="net471" /> + <package id="Minio" version="3.1.7" targetFramework="net471" /> + <package id="RestSharp" version="106.3.1" targetFramework="net471" /> + <package id="System.Reactive" version="4.0.0" targetFramework="net471" /> + <package id="System.Reactive.Linq" version="4.0.0" targetFramework="net471" /> +</packages> diff --git a/Duplicati/Library/Backend/SSHv2/Duplicati.Library.Backend.SSHv2.csproj b/Duplicati/Library/Backend/SSHv2/Duplicati.Library.Backend.SSHv2.csproj index f8631e733..06a2bf12e 100644 --- a/Duplicati/Library/Backend/SSHv2/Duplicati.Library.Backend.SSHv2.csproj +++ b/Duplicati/Library/Backend/SSHv2/Duplicati.Library.Backend.SSHv2.csproj @@ -9,7 +9,7 @@ <RootNamespace>Duplicati.Library.Backend</RootNamespace>
<AssemblyName>Duplicati.Library.Backend.SSHv2</AssemblyName>
<FileAlignment>512</FileAlignment>
- <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<TargetFrameworkProfile />
<UseMSBuildEngine>false</UseMSBuildEngine>
</PropertyGroup>
diff --git a/Duplicati/Library/Backend/SSHv2/packages.config b/Duplicati/Library/Backend/SSHv2/packages.config index 33cd1c514..1055d503b 100644 --- a/Duplicati/Library/Backend/SSHv2/packages.config +++ b/Duplicati/Library/Backend/SSHv2/packages.config @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="SSH.NET" version="2016.1.0" targetFramework="net462" /> -</packages>
\ No newline at end of file + <package id="SSH.NET" version="2016.1.0" targetFramework="net471" /> +</packages> diff --git a/Duplicati/Library/Backend/SharePoint/Duplicati.Library.Backend.SharePoint.csproj b/Duplicati/Library/Backend/SharePoint/Duplicati.Library.Backend.SharePoint.csproj index dfa9437fd..beafff9b3 100644 --- a/Duplicati/Library/Backend/SharePoint/Duplicati.Library.Backend.SharePoint.csproj +++ b/Duplicati/Library/Backend/SharePoint/Duplicati.Library.Backend.SharePoint.csproj @@ -9,7 +9,7 @@ <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Duplicati.Library.Backend</RootNamespace>
<AssemblyName>Duplicati.Library.Backend.SharePoint</AssemblyName>
- <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<UseMSBuildEngine>false</UseMSBuildEngine>
<TargetFrameworkProfile />
diff --git a/Duplicati/Library/Backend/SharePoint/app.config b/Duplicati/Library/Backend/SharePoint/app.config index c76c89bb8..ba98fc967 100644 --- a/Duplicati/Library/Backend/SharePoint/app.config +++ b/Duplicati/Library/Backend/SharePoint/app.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <configuration> <startup> - <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/> + <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1"/> </startup> </configuration> diff --git a/Duplicati/Library/Backend/Sia/Duplicati.Library.Backend.Sia.csproj b/Duplicati/Library/Backend/Sia/Duplicati.Library.Backend.Sia.csproj index 0b0692576..90768f98c 100644 --- a/Duplicati/Library/Backend/Sia/Duplicati.Library.Backend.Sia.csproj +++ b/Duplicati/Library/Backend/Sia/Duplicati.Library.Backend.Sia.csproj @@ -8,7 +8,7 @@ <RootNamespace>Duplicati.Library.Backend.Sia</RootNamespace> <AssemblyName>Duplicati.Library.Backend.Sia</AssemblyName> <AssemblyOriginatorKeyFile>Duplicati.snk</AssemblyOriginatorKeyFile> - <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> + <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion> <UseMSBuildEngine>false</UseMSBuildEngine> <TargetFrameworkProfile /> </PropertyGroup> diff --git a/Duplicati/Library/Backend/Sia/packages.config b/Duplicati/Library/Backend/Sia/packages.config index 1812e5207..5e9c8c41c 100644 --- a/Duplicati/Library/Backend/Sia/packages.config +++ b/Duplicati/Library/Backend/Sia/packages.config @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net462" /> -</packages>
\ No newline at end of file + <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net471" /> +</packages> diff --git a/Duplicati/Library/Backend/TahoeLAFS/Duplicati.Library.Backend.TahoeLAFS.csproj b/Duplicati/Library/Backend/TahoeLAFS/Duplicati.Library.Backend.TahoeLAFS.csproj index 0f95956af..0930629ad 100644 --- a/Duplicati/Library/Backend/TahoeLAFS/Duplicati.Library.Backend.TahoeLAFS.csproj +++ b/Duplicati/Library/Backend/TahoeLAFS/Duplicati.Library.Backend.TahoeLAFS.csproj @@ -14,7 +14,7 @@ </FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation />
- <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<TargetFrameworkProfile />
<UseMSBuildEngine>false</UseMSBuildEngine>
</PropertyGroup>
diff --git a/Duplicati/Library/Backend/TahoeLAFS/packages.config b/Duplicati/Library/Backend/TahoeLAFS/packages.config index 1812e5207..5e9c8c41c 100644 --- a/Duplicati/Library/Backend/TahoeLAFS/packages.config +++ b/Duplicati/Library/Backend/TahoeLAFS/packages.config @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net462" /> -</packages>
\ No newline at end of file + <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net471" /> +</packages> diff --git a/Duplicati/Library/Backend/TencentCOS/Duplicati.Library.Backend.TencentCOS.csproj b/Duplicati/Library/Backend/TencentCOS/Duplicati.Library.Backend.TencentCOS.csproj index a170c9759..f2c8a2eab 100644 --- a/Duplicati/Library/Backend/TencentCOS/Duplicati.Library.Backend.TencentCOS.csproj +++ b/Duplicati/Library/Backend/TencentCOS/Duplicati.Library.Backend.TencentCOS.csproj @@ -9,7 +9,7 @@ <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>Duplicati.Library.Backend.TencentCOS</RootNamespace> <AssemblyName>Duplicati.Library.Backend.TencentCOS</AssemblyName> - <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> + <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion> <FileAlignment>512</FileAlignment> <Deterministic>true</Deterministic> </PropertyGroup> diff --git a/Duplicati/Library/Backend/TencentCOS/packages.config b/Duplicati/Library/Backend/TencentCOS/packages.config index b3507ece3..2eb1e7058 100644 --- a/Duplicati/Library/Backend/TencentCOS/packages.config +++ b/Duplicati/Library/Backend/TencentCOS/packages.config @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net462" /> - <package id="Tencent.QCloud.Cos.Sdk" version="5.4.11" targetFramework="net462" /> -</packages>
\ No newline at end of file + <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net471" /> + <package id="Tencent.QCloud.Cos.Sdk" version="5.4.11" targetFramework="net471" /> +</packages> diff --git a/Duplicati/Library/Backend/WEBDAV/Duplicati.Library.Backend.WEBDAV.csproj b/Duplicati/Library/Backend/WEBDAV/Duplicati.Library.Backend.WEBDAV.csproj index cab04aa51..44399a730 100644 --- a/Duplicati/Library/Backend/WEBDAV/Duplicati.Library.Backend.WEBDAV.csproj +++ b/Duplicati/Library/Backend/WEBDAV/Duplicati.Library.Backend.WEBDAV.csproj @@ -11,7 +11,7 @@ <FileUpgradeFlags>
</FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion>
- <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<TargetFrameworkProfile />
<UpgradeBackupLocation>
</UpgradeBackupLocation>
diff --git a/Duplicati/Library/Backend/WEBDAV/app.config b/Duplicati/Library/Backend/WEBDAV/app.config index 5c5a9267f..72546de59 100644 --- a/Duplicati/Library/Backend/WEBDAV/app.config +++ b/Duplicati/Library/Backend/WEBDAV/app.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
- <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1"/>
</startup>
</configuration>
diff --git a/Duplicati/Library/Common/Duplicati.Library.Common.csproj b/Duplicati/Library/Common/Duplicati.Library.Common.csproj index f26985365..6fc16df6a 100644 --- a/Duplicati/Library/Common/Duplicati.Library.Common.csproj +++ b/Duplicati/Library/Common/Duplicati.Library.Common.csproj @@ -14,7 +14,7 @@ </FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation />
- <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<TargetFrameworkProfile />
<UseMSBuildEngine>false</UseMSBuildEngine>
<ProductVersion>8.0.30703</ProductVersion>
diff --git a/Duplicati/Library/Common/app.config b/Duplicati/Library/Common/app.config index 5c5a9267f..72546de59 100644 --- a/Duplicati/Library/Common/app.config +++ b/Duplicati/Library/Common/app.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
- <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1"/>
</startup>
</configuration>
diff --git a/Duplicati/Library/Common/packages.config b/Duplicati/Library/Common/packages.config index 0e8dd406b..9ce0bc539 100644 --- a/Duplicati/Library/Common/packages.config +++ b/Duplicati/Library/Common/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="AlphaFS" version="2.2.6" targetFramework="net462" />
- <package id="AlphaVSS" version="1.4.0" targetFramework="net462" />
- <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net462" />
-</packages>
\ No newline at end of file + <package id="AlphaFS" version="2.2.6" targetFramework="net471" />
+ <package id="AlphaVSS" version="1.4.0" targetFramework="net471" />
+ <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net471" />
+</packages>
diff --git a/Duplicati/Library/Compression/Duplicati.Library.Compression.csproj b/Duplicati/Library/Compression/Duplicati.Library.Compression.csproj index f5ebd0ab6..2cea10bfd 100644 --- a/Duplicati/Library/Compression/Duplicati.Library.Compression.csproj +++ b/Duplicati/Library/Compression/Duplicati.Library.Compression.csproj @@ -12,7 +12,7 @@ <FileUpgradeFlags>
</FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion>
- <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<TargetFrameworkProfile />
<UpgradeBackupLocation>
</UpgradeBackupLocation>
diff --git a/Duplicati/Library/Compression/app.config b/Duplicati/Library/Compression/app.config index 5c5a9267f..72546de59 100644 --- a/Duplicati/Library/Compression/app.config +++ b/Duplicati/Library/Compression/app.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
- <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1"/>
</startup>
</configuration>
diff --git a/Duplicati/Library/Compression/packages.config b/Duplicati/Library/Compression/packages.config index 381a30306..e3c080254 100644 --- a/Duplicati/Library/Compression/packages.config +++ b/Duplicati/Library/Compression/packages.config @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="SharpCompress" version="0.24.0" targetFramework="net462" /> -</packages>
\ No newline at end of file + <package id="SharpCompress" version="0.24.0" targetFramework="net471" /> +</packages> diff --git a/Duplicati/Library/DynamicLoader/Duplicati.Library.DynamicLoader.csproj b/Duplicati/Library/DynamicLoader/Duplicati.Library.DynamicLoader.csproj index bbfb15e7e..ee6d1b8e7 100644 --- a/Duplicati/Library/DynamicLoader/Duplicati.Library.DynamicLoader.csproj +++ b/Duplicati/Library/DynamicLoader/Duplicati.Library.DynamicLoader.csproj @@ -12,7 +12,7 @@ <FileUpgradeFlags>
</FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion>
- <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<TargetFrameworkProfile />
<UpgradeBackupLocation>
</UpgradeBackupLocation>
diff --git a/Duplicati/Library/DynamicLoader/app.config b/Duplicati/Library/DynamicLoader/app.config index 5c5a9267f..72546de59 100644 --- a/Duplicati/Library/DynamicLoader/app.config +++ b/Duplicati/Library/DynamicLoader/app.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
- <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1"/>
</startup>
</configuration>
diff --git a/Duplicati/Library/Encryption/Duplicati.Library.Encryption.csproj b/Duplicati/Library/Encryption/Duplicati.Library.Encryption.csproj index ff2989050..2acfde7a2 100644 --- a/Duplicati/Library/Encryption/Duplicati.Library.Encryption.csproj +++ b/Duplicati/Library/Encryption/Duplicati.Library.Encryption.csproj @@ -9,7 +9,7 @@ <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Encryption</RootNamespace>
<AssemblyName>Encryption</AssemblyName>
- <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic>
</PropertyGroup>
diff --git a/Duplicati/Library/Encryption/packages.config b/Duplicati/Library/Encryption/packages.config index 7caed6fb3..2d07b79ad 100644 --- a/Duplicati/Library/Encryption/packages.config +++ b/Duplicati/Library/Encryption/packages.config @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="SharpAESCrypt.dll" version="1.3.3" targetFramework="net462" /> - <package id="SharpAESCrypt.exe" version="1.3.3" targetFramework="net462" /> -</packages>
\ No newline at end of file + <package id="SharpAESCrypt.dll" version="1.3.3" targetFramework="net471" /> + <package id="SharpAESCrypt.exe" version="1.3.3" targetFramework="net471" /> +</packages> diff --git a/Duplicati/Library/Interface/Duplicati.Library.Interface.csproj b/Duplicati/Library/Interface/Duplicati.Library.Interface.csproj index be017eb6b..963c4c0a7 100644 --- a/Duplicati/Library/Interface/Duplicati.Library.Interface.csproj +++ b/Duplicati/Library/Interface/Duplicati.Library.Interface.csproj @@ -14,7 +14,7 @@ </FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation />
- <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<TargetFrameworkProfile />
<UseMSBuildEngine>false</UseMSBuildEngine>
</PropertyGroup>
diff --git a/Duplicati/Library/Localization/Duplicati.Library.Localization.csproj b/Duplicati/Library/Localization/Duplicati.Library.Localization.csproj index b93f02de8..5c7b07bff 100644 --- a/Duplicati/Library/Localization/Duplicati.Library.Localization.csproj +++ b/Duplicati/Library/Localization/Duplicati.Library.Localization.csproj @@ -8,7 +8,7 @@ <RootNamespace>Duplicati.Library.Localization</RootNamespace>
<AssemblyName>Duplicati.Library.Localization</AssemblyName>
<AssemblyOriginatorKeyFile>..\Main\Duplicati.snk</AssemblyOriginatorKeyFile>
- <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<TargetFrameworkProfile />
<UseMSBuildEngine>false</UseMSBuildEngine>
</PropertyGroup>
diff --git a/Duplicati/Library/Localization/packages.config b/Duplicati/Library/Localization/packages.config index 87e4f92bf..b0b6e6a22 100644 --- a/Duplicati/Library/Localization/packages.config +++ b/Duplicati/Library/Localization/packages.config @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="NGettext" version="0.6.4" targetFramework="net462" /> -</packages>
\ No newline at end of file + <package id="NGettext" version="0.6.4" targetFramework="net471" /> +</packages> diff --git a/Duplicati/Library/Logging/Duplicati.Library.Logging.csproj b/Duplicati/Library/Logging/Duplicati.Library.Logging.csproj index 4c6ea29c7..97c4317e1 100644 --- a/Duplicati/Library/Logging/Duplicati.Library.Logging.csproj +++ b/Duplicati/Library/Logging/Duplicati.Library.Logging.csproj @@ -12,7 +12,7 @@ <FileUpgradeFlags>
</FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion>
- <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<TargetFrameworkProfile />
<UpgradeBackupLocation>
</UpgradeBackupLocation>
diff --git a/Duplicati/Library/Logging/app.config b/Duplicati/Library/Logging/app.config index 5c5a9267f..72546de59 100644 --- a/Duplicati/Library/Logging/app.config +++ b/Duplicati/Library/Logging/app.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
- <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1"/>
</startup>
</configuration>
diff --git a/Duplicati/Library/Main/Controller.cs b/Duplicati/Library/Main/Controller.cs index ea2c93dce..18669a994 100644 --- a/Duplicati/Library/Main/Controller.cs +++ b/Duplicati/Library/Main/Controller.cs @@ -25,6 +25,7 @@ using Duplicati.Library.Utility; using Duplicati.Library.Common.IO;
using Duplicati.Library.Common;
using Duplicati.Library.Interface;
+using Duplicati.Library.Main.Database;
namespace Duplicati.Library.Main
{
@@ -205,8 +206,6 @@ namespace Duplicati.Library.Main return RunAction(new ListRemoteResults(), (result) =>
{
result.OperationProgressUpdater.UpdatePhase(OperationPhase.Delete_Listing);
- using (var tf = System.IO.File.Exists(m_options.Dbpath) ? null : new Library.Utility.TempFile())
- using (var db = new Database.LocalDatabase(((string)tf) ?? m_options.Dbpath, "list-remote", true))
using (var bk = new BackendManager(m_backend, m_options, result.BackendWriter, null))
{
// Only delete files that match the expected pattern and prefix
@@ -216,6 +215,20 @@ namespace Duplicati.Library.Main .Where(x => x.Prefix == m_options.Prefix)
.ToList();
+ // If the local database is available, we will use it to avoid deleting unrelated files
+ // from the backend. Otherwise, we may accidentally delete non-Duplicati files, or
+ // files from a different Duplicati configuration that points to the same backend location
+ // and uses the same prefix (see issues #2678, #3845, and #4244).
+ if (System.IO.File.Exists(m_options.Dbpath))
+ {
+ using (LocalDatabase db = new LocalDatabase(m_options.Dbpath, "list-remote", true))
+ {
+ IEnumerable<RemoteVolumeEntry> dbRemoteVolumes = db.GetRemoteVolumes();
+ HashSet<string> dbRemoteFiles = new HashSet<string>(dbRemoteVolumes.Select(x => x.Name));
+ list = list.Where(x => dbRemoteFiles.Contains(x.File.Name)).ToList();
+ }
+ }
+
result.OperationProgressUpdater.UpdatePhase(OperationPhase.Delete_Deleting);
result.OperationProgressUpdater.UpdateProgress(0);
for (var i = 0; i < list.Count; i++)
diff --git a/Duplicati/Library/Main/Duplicati.Library.Main.csproj b/Duplicati/Library/Main/Duplicati.Library.Main.csproj index 86d962a2f..ffc355847 100644 --- a/Duplicati/Library/Main/Duplicati.Library.Main.csproj +++ b/Duplicati/Library/Main/Duplicati.Library.Main.csproj @@ -12,7 +12,7 @@ <FileUpgradeFlags>
</FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion>
- <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<TargetFrameworkProfile />
<UpgradeBackupLocation>
</UpgradeBackupLocation>
diff --git a/Duplicati/Library/Main/app.config b/Duplicati/Library/Main/app.config index 4525b1700..7a1466b38 100644 --- a/Duplicati/Library/Main/app.config +++ b/Duplicati/Library/Main/app.config @@ -1,3 +1,3 @@ <?xml version="1.0"?>
<configuration>
- <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>
+ <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1"/></startup></configuration>
diff --git a/Duplicati/Library/Main/packages.config b/Duplicati/Library/Main/packages.config index 5898bba2c..23f151231 100644 --- a/Duplicati/Library/Main/packages.config +++ b/Duplicati/Library/Main/packages.config @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="CoCoL" version="1.7.1" targetFramework="net462" /> - <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net462" /> -</packages>
\ No newline at end of file + <package id="CoCoL" version="1.7.1" targetFramework="net471" /> + <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net471" /> +</packages> diff --git a/Duplicati/Library/Modules/Builtin/Duplicati.Library.Modules.Builtin.csproj b/Duplicati/Library/Modules/Builtin/Duplicati.Library.Modules.Builtin.csproj index 40cfda7d4..e6c962ce9 100644 --- a/Duplicati/Library/Modules/Builtin/Duplicati.Library.Modules.Builtin.csproj +++ b/Duplicati/Library/Modules/Builtin/Duplicati.Library.Modules.Builtin.csproj @@ -14,7 +14,7 @@ </FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation />
- <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<TargetFrameworkProfile />
<UseMSBuildEngine>false</UseMSBuildEngine>
</PropertyGroup>
diff --git a/Duplicati/Library/Modules/Builtin/app.config b/Duplicati/Library/Modules/Builtin/app.config index ba3677f42..3ec9d6a3d 100644 --- a/Duplicati/Library/Modules/Builtin/app.config +++ b/Duplicati/Library/Modules/Builtin/app.config @@ -12,4 +12,4 @@ </dependentAssembly> </assemblyBinding> </runtime> -<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration> +<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1"/></startup></configuration> diff --git a/Duplicati/Library/Modules/Builtin/packages.config b/Duplicati/Library/Modules/Builtin/packages.config index 3e43c2d98..5733784ee 100644 --- a/Duplicati/Library/Modules/Builtin/packages.config +++ b/Duplicati/Library/Modules/Builtin/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="BouncyCastle" version="1.8.5" targetFramework="net462" /> - <package id="MailKit" version="2.3.1.6" targetFramework="net462" /> - <package id="MimeKit" version="2.3.1" targetFramework="net462" /> - <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net462" /> -</packages>
\ No newline at end of file + <package id="BouncyCastle" version="1.8.5" targetFramework="net471" /> + <package id="MailKit" version="2.3.1.6" targetFramework="net471" /> + <package id="MimeKit" version="2.3.1" targetFramework="net471" /> + <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net471" /> +</packages> diff --git a/Duplicati/Library/SQLiteHelper/Duplicati.Library.SQLiteHelper.csproj b/Duplicati/Library/SQLiteHelper/Duplicati.Library.SQLiteHelper.csproj index 1f8724d96..41632b7fa 100644 --- a/Duplicati/Library/SQLiteHelper/Duplicati.Library.SQLiteHelper.csproj +++ b/Duplicati/Library/SQLiteHelper/Duplicati.Library.SQLiteHelper.csproj @@ -8,7 +8,7 @@ <RootNamespace>Duplicati.Library.SQLiteHelper</RootNamespace>
<AssemblyName>SQLiteHelper</AssemblyName>
<AssemblyOriginatorKeyFile>..\..\GUI\Duplicati.GUI.TrayIcon\Duplicati.snk</AssemblyOriginatorKeyFile>
- <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<TargetFrameworkProfile />
<UseMSBuildEngine>false</UseMSBuildEngine>
<NuGetPackageImportStamp>
diff --git a/Duplicati/Library/SQLiteHelper/packages.config b/Duplicati/Library/SQLiteHelper/packages.config index 6466e2794..e88fdce35 100644 --- a/Duplicati/Library/SQLiteHelper/packages.config +++ b/Duplicati/Library/SQLiteHelper/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="EntityFramework" version="6.2.0" targetFramework="net462" /> - <package id="System.Data.SQLite" version="1.0.111.0" targetFramework="net462" /> - <package id="System.Data.SQLite.Core" version="1.0.111.0" targetFramework="net462" /> - <package id="System.Data.SQLite.EF6" version="1.0.111.0" targetFramework="net462" /> - <package id="System.Data.SQLite.Linq" version="1.0.111.0" targetFramework="net462" /> -</packages>
\ No newline at end of file + <package id="EntityFramework" version="6.2.0" targetFramework="net471" /> + <package id="System.Data.SQLite" version="1.0.111.0" targetFramework="net471" /> + <package id="System.Data.SQLite.Core" version="1.0.111.0" targetFramework="net471" /> + <package id="System.Data.SQLite.EF6" version="1.0.111.0" targetFramework="net471" /> + <package id="System.Data.SQLite.Linq" version="1.0.111.0" targetFramework="net471" /> +</packages> diff --git a/Duplicati/Library/Snapshots/Duplicati.Library.Snapshots.csproj b/Duplicati/Library/Snapshots/Duplicati.Library.Snapshots.csproj index 36f6ebd24..2d7f03fb7 100644 --- a/Duplicati/Library/Snapshots/Duplicati.Library.Snapshots.csproj +++ b/Duplicati/Library/Snapshots/Duplicati.Library.Snapshots.csproj @@ -15,7 +15,7 @@ </FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation />
- <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<TargetFrameworkProfile />
<UseMSBuildEngine>false</UseMSBuildEngine>
<NuGetPackageImportStamp>
diff --git a/Duplicati/Library/Snapshots/app.config b/Duplicati/Library/Snapshots/app.config index a1d2c2556..92ad670ed 100644 --- a/Duplicati/Library/Snapshots/app.config +++ b/Duplicati/Library/Snapshots/app.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
- <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1"/>
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
diff --git a/Duplicati/Library/Snapshots/packages.config b/Duplicati/Library/Snapshots/packages.config index 0e8dd406b..9ce0bc539 100644 --- a/Duplicati/Library/Snapshots/packages.config +++ b/Duplicati/Library/Snapshots/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="AlphaFS" version="2.2.6" targetFramework="net462" />
- <package id="AlphaVSS" version="1.4.0" targetFramework="net462" />
- <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net462" />
-</packages>
\ No newline at end of file + <package id="AlphaFS" version="2.2.6" targetFramework="net471" />
+ <package id="AlphaVSS" version="1.4.0" targetFramework="net471" />
+ <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net471" />
+</packages>
diff --git a/Duplicati/Library/UsageReporter/Duplicati.Library.UsageReporter.csproj b/Duplicati/Library/UsageReporter/Duplicati.Library.UsageReporter.csproj index 92f12f15d..c05487d53 100644 --- a/Duplicati/Library/UsageReporter/Duplicati.Library.UsageReporter.csproj +++ b/Duplicati/Library/UsageReporter/Duplicati.Library.UsageReporter.csproj @@ -7,7 +7,7 @@ <OutputType>Library</OutputType> <RootNamespace>Duplicati.Library.UsageReporter</RootNamespace> <AssemblyName>Duplicati.Library.UsageReporter</AssemblyName> - <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> + <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion> <AssemblyOriginatorKeyFile>Duplicati.snk</AssemblyOriginatorKeyFile> <UseMSBuildEngine>false</UseMSBuildEngine> <TargetFrameworkProfile /> diff --git a/Duplicati/Library/UsageReporter/packages.config b/Duplicati/Library/UsageReporter/packages.config index 5898bba2c..23f151231 100644 --- a/Duplicati/Library/UsageReporter/packages.config +++ b/Duplicati/Library/UsageReporter/packages.config @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="CoCoL" version="1.7.1" targetFramework="net462" /> - <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net462" /> -</packages>
\ No newline at end of file + <package id="CoCoL" version="1.7.1" targetFramework="net471" /> + <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net471" /> +</packages> diff --git a/Duplicati/Library/Utility/Duplicati.Library.Utility.csproj b/Duplicati/Library/Utility/Duplicati.Library.Utility.csproj index 04c795270..9c3a14ef3 100644 --- a/Duplicati/Library/Utility/Duplicati.Library.Utility.csproj +++ b/Duplicati/Library/Utility/Duplicati.Library.Utility.csproj @@ -12,7 +12,7 @@ <FileUpgradeFlags>
</FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion>
- <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<TargetFrameworkProfile />
<UpgradeBackupLocation>
</UpgradeBackupLocation>
diff --git a/Duplicati/Library/Utility/app.config b/Duplicati/Library/Utility/app.config index a78d80b40..2b3edde71 100644 --- a/Duplicati/Library/Utility/app.config +++ b/Duplicati/Library/Utility/app.config @@ -1,4 +1,4 @@ <?xml version="1.0"?>
<configuration>
- <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup>
+ <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1"/></startup>
</configuration>
diff --git a/Duplicati/Library/Utility/packages.config b/Duplicati/Library/Utility/packages.config index 6a42a4b95..9f341f845 100644 --- a/Duplicati/Library/Utility/packages.config +++ b/Duplicati/Library/Utility/packages.config @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="FasterHashing" version="1.3.0" targetFramework="net462" />
-</packages>
\ No newline at end of file + <package id="FasterHashing" version="1.3.0" targetFramework="net471" />
+</packages>
|