migrate to net5 + runnable

This commit is contained in:
Max
2020-06-03 00:00:38 +02:00
parent 3f2eb254c3
commit b008aed1f3
62 changed files with 67 additions and 64 deletions
@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.0</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<Version>2.0.0.7</Version>
<Copyright>LGPL, Copyright © Duplicati Team 2015</Copyright>
@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.0</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<Version>2.0.0.7</Version>
<Copyright>LGPL, Copyright © Duplicati Team 2015</Copyright>
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<Version>2.0.0.7</Version>
<Copyright>LGPL, Copyright © Duplicati Team 2015</Copyright>
@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.0</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<Version>2.0.0.7</Version>
<Copyright>LGPL, Copyright © Duplicati Team 2015</Copyright>
@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<Version>2.0.0.7</Version>
<Copyright>LGPL, Copyright ? Duplicati Team 2019</Copyright>
<Product>Duplicati.CommandLine.AutoUpdater</Product>
@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<Version>2.0.0.7</Version>
<Copyright>LGPL, Copyright ? Duplicati Team 2019</Copyright>
<Product>Duplicati.CommandLine.BackendTester</Product>
@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<Version>2.0.0.7</Version>
<Copyright>LGPL, Copyright ? Duplicati Team 2019</Copyright>
<Product>Duplicati.CommandLine.BackendTool</Product>
@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<Version>2.0.0.7</Version>
<Copyright>LGPL, Copyright ? Duplicati Team 2019</Copyright>
<Product>Duplicati.CommandLine.ConfigurationImporter</Product>
@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<Version>2.0.0.7</Version>
<Copyright>LGPL, Copyright ? Duplicati Team 2019</Copyright>
<Product>Duplicati.CommandLine</Product>
@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<Version>2.0.0.7</Version>
<Copyright>LGPL, Copyright ? Duplicati Team 2019</Copyright>
<Product>Duplicati.CommandLine.RecoveryTool</Product>
@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<Version>2.0.0.7</Version>
<Copyright>LGPL, Copyright ? Duplicati Team 2019</Copyright>
<Product>Duplicati.GUI.TrayIcon</Product>
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<Version>2.0.0.7</Version>
<OutputType>Library</OutputType>
<Copyright>LGPL, Copyright © Duplicati Team 2019</Copyright>
@@ -1099,7 +1099,7 @@ namespace Duplicati.Library.AutoUpdater
return r;
}
var app = Environment.GetCommandLineArgs().First();
var app = Environment.GetCommandLineArgs().First().Substring(0, Environment.GetCommandLineArgs().First().Length - 3) + "exe";
var args = Library.Utility.Utility.WrapAsCommandLine(Environment.GetCommandLineArgs().Skip(1), false);
if (!Path.IsPathRooted(app))
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<Version>2.0.0.7</Version>
<OutputType>Library</OutputType>
<Copyright>LGPL, Copyright © Duplicati Team 2015</Copyright>
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<Version>2.0.0.7</Version>
<Copyright>LGPL, Copyright © Duplicati Team 2015</Copyright>
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<Version>2.0.0.7</Version>
<Copyright>LGPL, Copyright � Duplicati Team 2015</Copyright>
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<Version>2.0.0.7</Version>
<Copyright>LGPL, Copyright � Duplicati Team 2015</Copyright>
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<Version>2.0.0.7</Version>
<Copyright>LGPL, Copyright � Duplicati Team 2015</Copyright>
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<Version>2.0.0.7</Version>
<Copyright>LGPL, Copyright © Duplicati Team 2015</Copyright>
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<Version>2.0.0.7</Version>
<Copyright>LGPL, Copyright © Duplicati Team 2015</Copyright>
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<Version>2.0.0.7</Version>
<Copyright>LGPL, Copyright � Duplicati Team 2015</Copyright>
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<Version>2.0.0.7</Version>
<Copyright>LGPL, Copyright � Duplicati Team 2015</Copyright>
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<Version>2.0.0.7</Version>
<Copyright>LGPL, Copyright � Duplicati Team 2015</Copyright>
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<Version>2.0.0.7</Version>
<Copyright>LGPL, Copyright © Duplicati Team 2015</Copyright>
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<Version>2.0.0.7</Version>
<Copyright>LGPL, Copyright � Duplicati Team 2015</Copyright>
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<Version>2.0.0.7</Version>
<Copyright>LGPL, Copyright � Duplicati Team 2015</Copyright>
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<Version>2.0.0.7</Version>
<Copyright>LGPL, Copyright © Duplicati Team 2015</Copyright>
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<Version>2.0.0.7</Version>
<Copyright>LGPL, Copyright � Duplicati Team 2015</Copyright>
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<Version>2.0.0.7</Version>
<Copyright>LGPL, Copyright © Duplicati Team 2015</Copyright>
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<Version>2.0.0.7</Version>
<Copyright>LGPL, Copyright � Duplicati Team 2015</Copyright>
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<Version>2.0.0.7</Version>
<Copyright>LGPL, Copyright © Duplicati Team 2015</Copyright>
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<Version>2.0.0.7</Version>
<Copyright>LGPL, Copyright © Duplicati Team 2015</Copyright>
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<Version>2.0.0.7</Version>
<Copyright>LGPL, Copyright © Duplicati Team 2015</Copyright>
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<Version>2.0.0.7</Version>
<Copyright>LGPL, Copyright © Duplicati Team 2015</Copyright>
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<Version>2.0.0.7</Version>
<Copyright>LGPL, Copyright © Duplicati Team 2015</Copyright>
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<Version>2.0.0.7</Version>
<Copyright>LGPL, Copyright � Duplicati Team 2015</Copyright>
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<Version>2.0.0.7</Version>
<Copyright>LGPL, Copyright © Duplicati Team 2015</Copyright>
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<Version>2.0.0.7</Version>
<Copyright>LGPL, Copyright © Duplicati Team 2015</Copyright>
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<Version>2.0.0.7</Version>
<Copyright>LGPL, Copyright ? Duplicati Team 2015</Copyright>
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<Version>2.0.0.7</Version>
<Copyright>LGPL, Copyright � Duplicati Team 2015</Copyright>
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<Version>2.0.0.7</Version>
<Copyright>LGPL, Copyright © Duplicati Team 2015</Copyright>
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<Version>2.0.0.7</Version>
<Copyright>LGPL, Copyright © Duplicati Team 2015</Copyright>
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<Version>2.0.0.7</Version>
<Copyright>LGPL, Copyright � Duplicati Team 2015</Copyright>
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<Version>2.0.0.7</Version>
<Copyright>LGPL, Copyright ? Duplicati Team 2015</Copyright>
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<Version>2.0.0.7</Version>
<Copyright>LGPL, Copyright ? Duplicati Team 2015</Copyright>
@@ -56,7 +56,7 @@ namespace Duplicati.Library.SQLiteHelper
public static class DatabaseUpgrader
{
//This is the "folder" where the embedded resources can be found
private const string FOLDER_NAME = "Duplicati.Library.Main.Database.Database_schema";
private const string FOLDER_NAME = "Database_schema";
//This is the name of the schema sql
private const string SCHEMA_NAME = "Schema.sql";
@@ -140,7 +140,7 @@ namespace Duplicati.Library.SQLiteHelper
var asm = eltype.Assembly;
string schema;
using (var rd = new System.IO.StreamReader(asm.GetManifestResourceStream($"{FOLDER_NAME}.{SCHEMA_NAME}")))
using (var rd = new System.IO.StreamReader(asm.GetManifestResourceStream(eltype, $"{FOLDER_NAME}.{SCHEMA_NAME}")))
schema = rd.ReadToEnd();
//Get updates, and sort them according to version
@@ -152,11 +152,12 @@ namespace Duplicati.Library.SQLiteHelper
{
//The resource name will be "Duplicati.Library.Main.Database.Database_schema.1.Sample upgrade.sql"
//The number indicates the version that will be upgraded to
if (s.StartsWith(prefix, StringComparison.Ordinal) && !s.Equals(prefix + SCHEMA_NAME))
//Could be ""Duplicati.Server.Database.Database_schema.1. Add Notifications.sql""
if (s.Contains(prefix, StringComparison.Ordinal) && !s.EndsWith(prefix + SCHEMA_NAME))
{
try
{
string version = s.Substring(prefix.Length, s.IndexOf(".", prefix.Length + 1, StringComparison.Ordinal) - prefix.Length);
string version = s.Substring(s.IndexOf(prefix) + prefix.Length, s.IndexOf(".", s.IndexOf(prefix) + prefix.Length + 1, StringComparison.Ordinal) - s.IndexOf(prefix) - prefix.Length);
int fileversion = int.Parse(version);
string prev;
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<Version>2.0.0.7</Version>
<Copyright>LGPL, Copyright ? Duplicati Team 2015</Copyright>
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<Version>2.0.0.7</Version>
<Copyright>LGPL, Copyright © Duplicati Team 2015</Copyright>
<Product>Duplicati.Library.Snapshots</Product>
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<Version>2.0.0.7</Version>
<Copyright>LGPL, Copyright � Duplicati Team 2015</Copyright>
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<Version>2.0.0.7</Version>
<Copyright>LGPL, Copyright © Duplicati Team 2015</Copyright>
+1 -1
View File
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<Version>2.0.0.7</Version>
<Copyright>LGPL, Copyright © Duplicati Team 2015</Copyright>
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<Version>2.0.0.7</Version>
<Copyright>LGPL, Copyright ? Duplicati Team 2015</Copyright>
+1 -1
View File
@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<Version>2.0.0.7</Version>
<Copyright>LGPL, Copyright ? Duplicati Team 2019</Copyright>
<Product>Duplicati.Server</Product>
+2
View File
@@ -177,6 +177,8 @@ namespace Duplicati.Server
public static int RealMain(string[] _args)
{
System.Diagnostics.Debugger.Launch();
//If we are on Windows, append the bundled "win-tools" programs to the search path
//We add it last, to allow the user to override with other versions
if (Platform.IsClientWindows)
+1 -1
View File
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<Version>2.0.0.7</Version>
<OutputType>Exe</OutputType>
<Copyright>LGPL, Copyright ? Duplicati Team 2019</Copyright>
+1 -1
View File
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<Version>2.0.0.7</Version>
<Copyright>LGPL, Copyright � Duplicati Team 2015</Copyright>
+1 -1
View File
@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<Version>2.0.0.7</Version>
<Copyright>LGPL, Copyright ? Duplicati Team 2019</Copyright>
<Product>Duplicati.UnitTest</Product>
@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<Version>2.0.0.7</Version>
<Copyright>LGPL, Copyright © Duplicati Team 2019</Copyright>
<Product>Duplicati.WindowsService</Product>
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<Version>2.0.0.7</Version>
<Copyright>LGPL, Copyright © Duplicati Team 2015</Copyright>
+1 -1
View File
@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.0</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<Version>2.0.0.7</Version>
<Copyright>LGPL, Copyright © Duplicati Team 2015</Copyright>
+1 -1
View File
@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.0</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<Version>2.0.0.7</Version>
<Copyright>LGPL, Copyright © Duplicati Team 2015</Copyright>
+1 -1
View File
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<Version>2.0.0.7</Version>
<OutputType>Exe</OutputType>
<Copyright>LGPL, Copyright © Duplicati Team 2015</Copyright>