Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/duplicati/duplicati.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenneth Hsu <kennethhsu@gmail.com>2020-07-27 04:12:54 +0300
committerKenneth Hsu <kennethhsu@gmail.com>2020-07-27 05:46:01 +0300
commite9640726904710ffb476ade2608923061cc9db7a (patch)
tree746a67c31e1a2d17c265b81ff3377c7f33c20d78 /Duplicati/CommandLine
parente7daffcb3105c0c43770cc79084740016ba44170 (diff)
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.
Diffstat (limited to 'Duplicati/CommandLine')
-rw-r--r--Duplicati/CommandLine/BackendTester/Duplicati.CommandLine.BackendTester.csproj2
-rw-r--r--Duplicati/CommandLine/BackendTester/app.config2
-rw-r--r--Duplicati/CommandLine/BackendTool/Duplicati.CommandLine.BackendTool.csproj2
-rw-r--r--Duplicati/CommandLine/BackendTool/app.config2
-rw-r--r--Duplicati/CommandLine/ConfigurationImporter/Duplicati.CommandLine.ConfigurationImporter.csproj2
-rw-r--r--Duplicati/CommandLine/ConfigurationImporter/app.config2
-rw-r--r--Duplicati/CommandLine/Duplicati.CommandLine.csproj2
-rw-r--r--Duplicati/CommandLine/RecoveryTool/Duplicati.CommandLine.RecoveryTool.csproj2
-rw-r--r--Duplicati/CommandLine/RecoveryTool/app.config2
-rw-r--r--Duplicati/CommandLine/RecoveryTool/packages.config10
-rw-r--r--Duplicati/CommandLine/app.config2
-rw-r--r--Duplicati/CommandLine/packages.config18
12 files changed, 24 insertions, 24 deletions
diff --git a/Duplicati/CommandLine/BackendTester/Duplicati.CommandLine.BackendTester.csproj b/Duplicati/CommandLine/BackendTester/Duplicati.CommandLine.BackendTester.csproj
index 31491f349..721163ebb 100644
--- a/Duplicati/CommandLine/BackendTester/Duplicati.CommandLine.BackendTester.csproj
+++ b/Duplicati/CommandLine/BackendTester/Duplicati.CommandLine.BackendTester.csproj
@@ -15,7 +15,7 @@
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation />
<AssemblyOriginatorKeyFile>Duplicati.snk</AssemblyOriginatorKeyFile>
- <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<TargetFrameworkProfile />
<UseMSBuildEngine>false</UseMSBuildEngine>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
diff --git a/Duplicati/CommandLine/BackendTester/app.config b/Duplicati/CommandLine/BackendTester/app.config
index dd1b7be4b..85bf1086d 100644
--- a/Duplicati/CommandLine/BackendTester/app.config
+++ b/Duplicati/CommandLine/BackendTester/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/CommandLine/BackendTool/Duplicati.CommandLine.BackendTool.csproj b/Duplicati/CommandLine/BackendTool/Duplicati.CommandLine.BackendTool.csproj
index 52592753d..694439e22 100644
--- a/Duplicati/CommandLine/BackendTool/Duplicati.CommandLine.BackendTool.csproj
+++ b/Duplicati/CommandLine/BackendTool/Duplicati.CommandLine.BackendTool.csproj
@@ -9,7 +9,7 @@
<RootNamespace>Duplicati.CommandLine.BackendTool</RootNamespace>
<AssemblyName>Duplicati.CommandLine.BackendTool</AssemblyName>
<AssemblyOriginatorKeyFile>..\Duplicati.snk</AssemblyOriginatorKeyFile>
- <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<TargetFrameworkProfile />
<UseMSBuildEngine>false</UseMSBuildEngine>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
diff --git a/Duplicati/CommandLine/BackendTool/app.config b/Duplicati/CommandLine/BackendTool/app.config
index 8ce3e95a8..e79c0a8bf 100644
--- a/Duplicati/CommandLine/BackendTool/app.config
+++ b/Duplicati/CommandLine/BackendTool/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/CommandLine/ConfigurationImporter/Duplicati.CommandLine.ConfigurationImporter.csproj b/Duplicati/CommandLine/ConfigurationImporter/Duplicati.CommandLine.ConfigurationImporter.csproj
index f1e88e434..cf7c878e2 100644
--- a/Duplicati/CommandLine/ConfigurationImporter/Duplicati.CommandLine.ConfigurationImporter.csproj
+++ b/Duplicati/CommandLine/ConfigurationImporter/Duplicati.CommandLine.ConfigurationImporter.csproj
@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Duplicati.CommandLine.ConfigurationImporter</RootNamespace>
<AssemblyName>Duplicati.CommandLine.ConfigurationImporter</AssemblyName>
- <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
diff --git a/Duplicati/CommandLine/ConfigurationImporter/app.config b/Duplicati/CommandLine/ConfigurationImporter/app.config
index 5ab9ab477..fb8872460 100644
--- a/Duplicati/CommandLine/ConfigurationImporter/app.config
+++ b/Duplicati/CommandLine/ConfigurationImporter/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/CommandLine/Duplicati.CommandLine.csproj b/Duplicati/CommandLine/Duplicati.CommandLine.csproj
index feb0708da..83b3926dc 100644
--- a/Duplicati/CommandLine/Duplicati.CommandLine.csproj
+++ b/Duplicati/CommandLine/Duplicati.CommandLine.csproj
@@ -16,7 +16,7 @@
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
- <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<TargetFrameworkProfile />
<UseMSBuildEngine>false</UseMSBuildEngine>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
diff --git a/Duplicati/CommandLine/RecoveryTool/Duplicati.CommandLine.RecoveryTool.csproj b/Duplicati/CommandLine/RecoveryTool/Duplicati.CommandLine.RecoveryTool.csproj
index 12aa5f6ed..819aff870 100644
--- a/Duplicati/CommandLine/RecoveryTool/Duplicati.CommandLine.RecoveryTool.csproj
+++ b/Duplicati/CommandLine/RecoveryTool/Duplicati.CommandLine.RecoveryTool.csproj
@@ -9,7 +9,7 @@
<RootNamespace>Duplicati.CommandLine.RecoveryTool</RootNamespace>
<AssemblyName>Duplicati.CommandLine.RecoveryTool</AssemblyName>
<AssemblyOriginatorKeyFile>Duplicati.snk</AssemblyOriginatorKeyFile>
- <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<UseMSBuildEngine>false</UseMSBuildEngine>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<TargetFrameworkProfile />
diff --git a/Duplicati/CommandLine/RecoveryTool/app.config b/Duplicati/CommandLine/RecoveryTool/app.config
index dd1b7be4b..85bf1086d 100644
--- a/Duplicati/CommandLine/RecoveryTool/app.config
+++ b/Duplicati/CommandLine/RecoveryTool/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/CommandLine/RecoveryTool/packages.config b/Duplicati/CommandLine/RecoveryTool/packages.config
index 03d845d3b..74bd81b3e 100644
--- a/Duplicati/CommandLine/RecoveryTool/packages.config
+++ b/Duplicati/CommandLine/RecoveryTool/packages.config
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Microsoft.Azure.KeyVault.Core" version="3.0.4" 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" />
-</packages> \ No newline at end of file
+ <package id="Microsoft.Azure.KeyVault.Core" version="3.0.4" 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" />
+</packages>
diff --git a/Duplicati/CommandLine/app.config b/Duplicati/CommandLine/app.config
index 1eab5a6e8..74c0529e7 100644
--- a/Duplicati/CommandLine/app.config
+++ b/Duplicati/CommandLine/app.config
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup useLegacyV2RuntimeActivationPolicy="true">
- <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/CommandLine/packages.config b/Duplicati/CommandLine/packages.config
index bc2727bd9..ad61c9746 100644
--- a/Duplicati/CommandLine/packages.config
+++ b/Duplicati/CommandLine/packages.config
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Microsoft.Azure.KeyVault.Core" version="3.0.4" targetFramework="net462" />
- <package id="Microsoft.Data.Edm" version="5.8.4" targetFramework="net462" />
- <package id="Microsoft.Data.OData" version="5.8.4" targetFramework="net462" />
- <package id="Microsoft.Data.Services.Client" version="5.8.4" 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" />
-</packages> \ No newline at end of file
+ <package id="Microsoft.Azure.KeyVault.Core" version="3.0.4" targetFramework="net471" />
+ <package id="Microsoft.Data.Edm" version="5.8.4" targetFramework="net471" />
+ <package id="Microsoft.Data.OData" version="5.8.4" targetFramework="net471" />
+ <package id="Microsoft.Data.Services.Client" version="5.8.4" 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" />
+</packages>