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/Server
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/Server')
-rw-r--r--Duplicati/Server/Duplicati.Server.Serialization/Duplicati.Server.Serialization.csproj2
-rw-r--r--Duplicati/Server/Duplicati.Server.Serialization/packages.config4
-rw-r--r--Duplicati/Server/Duplicati.Server.csproj2
-rw-r--r--Duplicati/Server/app.config2
-rw-r--r--Duplicati/Server/packages.config6
5 files changed, 8 insertions, 8 deletions
diff --git a/Duplicati/Server/Duplicati.Server.Serialization/Duplicati.Server.Serialization.csproj b/Duplicati/Server/Duplicati.Server.Serialization/Duplicati.Server.Serialization.csproj
index 3d6de5dac..2f2a12fe4 100644
--- a/Duplicati/Server/Duplicati.Server.Serialization/Duplicati.Server.Serialization.csproj
+++ b/Duplicati/Server/Duplicati.Server.Serialization/Duplicati.Server.Serialization.csproj
@@ -9,7 +9,7 @@
<RootNamespace>Duplicati.Server.Serialization</RootNamespace>
<AssemblyName>Duplicati.Server.Serialization</AssemblyName>
<FileAlignment>512</FileAlignment>
- <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<TargetFrameworkProfile />
<UseMSBuildEngine>false</UseMSBuildEngine>
</PropertyGroup>
diff --git a/Duplicati/Server/Duplicati.Server.Serialization/packages.config b/Duplicati/Server/Duplicati.Server.Serialization/packages.config
index 1812e5207..5e9c8c41c 100644
--- a/Duplicati/Server/Duplicati.Server.Serialization/packages.config
+++ b/Duplicati/Server/Duplicati.Server.Serialization/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/Server/Duplicati.Server.csproj b/Duplicati/Server/Duplicati.Server.csproj
index ba166f028..4a81dbdad 100644
--- a/Duplicati/Server/Duplicati.Server.csproj
+++ b/Duplicati/Server/Duplicati.Server.csproj
@@ -10,7 +10,7 @@
<RootNamespace>Duplicati.Server</RootNamespace>
<AssemblyName>Duplicati.Server</AssemblyName>
<FileAlignment>512</FileAlignment>
- <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<TargetFrameworkProfile />
<UseMSBuildEngine>false</UseMSBuildEngine>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
diff --git a/Duplicati/Server/app.config b/Duplicati/Server/app.config
index eb94ba0f2..25008be6c 100644
--- a/Duplicati/Server/app.config
+++ b/Duplicati/Server/app.config
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
- <startup useLegacyV2RuntimeActivationPolicy="true"><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" /></startup>
+ <startup useLegacyV2RuntimeActivationPolicy="true"><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/Server/packages.config b/Duplicati/Server/packages.config
index 2f5d9f374..81a2c4f6c 100644
--- a/Duplicati/Server/packages.config
+++ b/Duplicati/Server/packages.config
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="BouncyCastle" version="1.8.5" 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="Newtonsoft.Json" version="12.0.2" targetFramework="net471" />
+</packages>