diff --git a/Duplicati.Library.RestAPI/Duplicati.Library.RestAPI.csproj b/Duplicati.Library.RestAPI/Duplicati.Library.RestAPI.csproj index f350e3e34..e10690aa5 100644 --- a/Duplicati.Library.RestAPI/Duplicati.Library.RestAPI.csproj +++ b/Duplicati.Library.RestAPI/Duplicati.Library.RestAPI.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 @@ -12,8 +12,8 @@ - - + + diff --git a/Duplicati.Library.RestAPI/RESTMethods/CommandLine.cs b/Duplicati.Library.RestAPI/RESTMethods/CommandLine.cs index f12abe25c..e4ff87db9 100644 --- a/Duplicati.Library.RestAPI/RESTMethods/CommandLine.cs +++ b/Duplicati.Library.RestAPI/RESTMethods/CommandLine.cs @@ -23,6 +23,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Text; +using Duplicati.Library.RestAPI; namespace Duplicati.Server.WebServer.RESTMethods { diff --git a/Duplicati.Library.RestAPI/Serializable/ServerStatus.cs b/Duplicati.Library.RestAPI/Serializable/ServerStatus.cs index e6930bd4a..c77ae6027 100644 --- a/Duplicati.Library.RestAPI/Serializable/ServerStatus.cs +++ b/Duplicati.Library.RestAPI/Serializable/ServerStatus.cs @@ -18,7 +18,6 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -#endregion using System; using System.Linq; using System.Collections.Generic; diff --git a/Duplicati.sln b/Duplicati.sln index 832185a9b..e7bcaec2c 100644 --- a/Duplicati.sln +++ b/Duplicati.sln @@ -30,9 +30,6 @@ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Duplicati.Library.DynamicLoader", "Duplicati\Library\DynamicLoader\Duplicati.Library.DynamicLoader.csproj", "{0CA86ECF-5BEC-4909-B4F6-110A03B30B92}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Duplicati.Library.Snapshots", "Duplicati\Library\Snapshots\Duplicati.Library.Snapshots.csproj", "{D63E53E4-A458-4C2F-914D-92F715F58ACE}" - ProjectSection(ProjectDependencies) = postProject - {2B605B81-353F-43CD-BF3A-29B3926A204F} = {2B605B81-353F-43CD-BF3A-29B3926A204F} - EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Duplicati.License", "Duplicati\License\Duplicati.License.csproj", "{4D012CB1-4B92-47F4-89B7-BF80A73A2E99}" EndProject @@ -113,31 +110,29 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Duplicati.Library.Backend.T EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Executables", "Executables", "{FA88A246-EF8E-46E3-90AF-539B8C0A6ADE}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "net5", "net5", "{6B46F6B1-1898-49B8-ADA7-5CAF68EB77E3}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "net8", "net8", "{6B46F6B1-1898-49B8-ADA7-5CAF68EB77E3}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Duplicati.CommandLine.AutoUpdater", "Executables\net5\Duplicati.CommandLine.AutoUpdater\Duplicati.CommandLine.AutoUpdater.csproj", "{95B7DD83-2C5A-4F1E-8EA7-39654B2B236A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Duplicati.CommandLine.AutoUpdater", "Executables\net8\Duplicati.CommandLine.AutoUpdater\Duplicati.CommandLine.AutoUpdater.csproj", "{95B7DD83-2C5A-4F1E-8EA7-39654B2B236A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Duplicati.Service", "Executables\net5\Duplicati_Service\Duplicati.Service.csproj", "{34149709-F3ED-4FB5-A087-43EB195C948B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Duplicati.Service", "Executables\net8\Duplicati_Service\Duplicati.Service.csproj", "{34149709-F3ED-4FB5-A087-43EB195C948B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Duplicati.CommandLine.BackendTester", "Executables\net5\Duplicati.CommandLine.BackendTester\Duplicati.CommandLine.BackendTester.csproj", "{2F1C0C8D-5C15-4BC0-811F-87F2C98D9790}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Duplicati.CommandLine.BackendTester", "Executables\net8\Duplicati.CommandLine.BackendTester\Duplicati.CommandLine.BackendTester.csproj", "{2F1C0C8D-5C15-4BC0-811F-87F2C98D9790}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Duplicati.CommandLine.BackendTool", "Executables\net5\Duplicati.CommandLine.BackendTool\Duplicati.CommandLine.BackendTool.csproj", "{31FA5B9B-4CD6-4BF3-B7A9-12C1E30DCAF6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Duplicati.CommandLine.BackendTool", "Executables\net8\Duplicati.CommandLine.BackendTool\Duplicati.CommandLine.BackendTool.csproj", "{31FA5B9B-4CD6-4BF3-B7A9-12C1E30DCAF6}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Duplicati.CommandLine.ConfigurationImporter", "Executables\net5\Duplicati.CommandLine.ConfigurationImporter\Duplicati.CommandLine.ConfigurationImporter.csproj", "{156B9B77-C2B7-4169-8FE7-1171D221446C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Duplicati.CommandLine.ConfigurationImporter", "Executables\net8\Duplicati.CommandLine.ConfigurationImporter\Duplicati.CommandLine.ConfigurationImporter.csproj", "{156B9B77-C2B7-4169-8FE7-1171D221446C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Duplicati.CommandLine.RecoveryTool", "Executables\net5\Duplicati.CommandLine.RecoveryTool\Duplicati.CommandLine.RecoveryTool.csproj", "{0FFC557E-1B84-46A2-B6E8-06064FA7EA58}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Duplicati.CommandLine.RecoveryTool", "Executables\net8\Duplicati.CommandLine.RecoveryTool\Duplicati.CommandLine.RecoveryTool.csproj", "{0FFC557E-1B84-46A2-B6E8-06064FA7EA58}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Duplicati.GUI.TrayIcon", "Executables\net5\Duplicati.GUI.TrayIcon\Duplicati.GUI.TrayIcon.csproj", "{AF32C621-30DC-40F5-8CE6-DD69053068E9}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Duplicati.GUI.TrayIcon", "Executables\net8\Duplicati.GUI.TrayIcon\Duplicati.GUI.TrayIcon.csproj", "{AF32C621-30DC-40F5-8CE6-DD69053068E9}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Duplicati.Server", "Executables\net5\Duplicati.Server\Duplicati.Server.csproj", "{55EEEBD2-CE45-45D6-9838-958F1C7354E4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Duplicati.Server", "Executables\net8\Duplicati.Server\Duplicati.Server.csproj", "{55EEEBD2-CE45-45D6-9838-958F1C7354E4}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WindowsService", "Duplicati\WindowsService\WindowsService.csproj", "{8A651E2D-A7C8-4EC7-B421-7A457654811D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Duplicati.WindowsService", "Executables\net5\Duplicati.WindowsService\Duplicati.WindowsService.csproj", "{5D20B150-C445-47BE-8CE8-C9F74F19A4F2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Duplicati.WindowsService", "Executables\net8\Duplicati.WindowsService\Duplicati.WindowsService.csproj", "{5D20B150-C445-47BE-8CE8-C9F74F19A4F2}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Duplicati.CommandLine", "Executables\net5\Duplicati.CommandLine\Duplicati.CommandLine.csproj", "{0F5A1F4E-25FA-4D02-920D-CA2138498081}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnixSupport", "Duplicati\UnixSupport\UnixSupport.csproj", "{2B605B81-353F-43CD-BF3A-29B3926A204F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Duplicati.CommandLine", "Executables\net8\Duplicati.CommandLine\Duplicati.CommandLine.csproj", "{0F5A1F4E-25FA-4D02-920D-CA2138498081}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Duplicati.Library.Backend.Idrivee2", "Duplicati\Library\Backend\Idrivee2\Duplicati.Library.Backend.Idrivee2.csproj", "{6B594D23-B629-465C-B799-70EE9E56C218}" ProjectSection(ProjectDependencies) = postProject @@ -410,10 +405,6 @@ Global {0F5A1F4E-25FA-4D02-920D-CA2138498081}.Debug|Any CPU.Build.0 = Debug|Any CPU {0F5A1F4E-25FA-4D02-920D-CA2138498081}.Release|Any CPU.ActiveCfg = Release|Any CPU {0F5A1F4E-25FA-4D02-920D-CA2138498081}.Release|Any CPU.Build.0 = Release|Any CPU - {2B605B81-353F-43CD-BF3A-29B3926A204F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2B605B81-353F-43CD-BF3A-29B3926A204F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2B605B81-353F-43CD-BF3A-29B3926A204F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2B605B81-353F-43CD-BF3A-29B3926A204F}.Release|Any CPU.Build.0 = Release|Any CPU {6B594D23-B629-465C-B799-70EE9E56C218}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6B594D23-B629-465C-B799-70EE9E56C218}.Debug|Any CPU.Build.0 = Debug|Any CPU {6B594D23-B629-465C-B799-70EE9E56C218}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -482,7 +473,6 @@ Global {8A651E2D-A7C8-4EC7-B421-7A457654811D} = {566EBBDA-19A4-4056-A615-D901D57D2439} {5D20B150-C445-47BE-8CE8-C9F74F19A4F2} = {6B46F6B1-1898-49B8-ADA7-5CAF68EB77E3} {0F5A1F4E-25FA-4D02-920D-CA2138498081} = {6B46F6B1-1898-49B8-ADA7-5CAF68EB77E3} - {2B605B81-353F-43CD-BF3A-29B3926A204F} = {566EBBDA-19A4-4056-A615-D901D57D2439} {6B594D23-B629-465C-B799-70EE9E56C218} = {E1A9B303-F281-45C5-A4F6-CADD9DE3F3C4} {D19A38DD-68F1-4EF5-BF5F-8966CE0D9A5B} = {FA88A246-EF8E-46E3-90AF-539B8C0A6ADE} EndGlobalSection diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj index a3734e3d5..df67436f1 100644 --- a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj +++ b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj @@ -34,7 +34,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/Duplicati/Library/AutoUpdater/Duplicati.Library.AutoUpdater.csproj b/Duplicati/Library/AutoUpdater/Duplicati.Library.AutoUpdater.csproj index b778d32e8..ff3a38146 100644 --- a/Duplicati/Library/AutoUpdater/Duplicati.Library.AutoUpdater.csproj +++ b/Duplicati/Library/AutoUpdater/Duplicati.Library.AutoUpdater.csproj @@ -2,7 +2,6 @@ net8.0 - Exe diff --git a/Duplicati/CommandLine/AutoUpdater/Program.cs b/Duplicati/Library/AutoUpdater/Program.cs similarity index 100% rename from Duplicati/CommandLine/AutoUpdater/Program.cs rename to Duplicati/Library/AutoUpdater/Program.cs diff --git a/Duplicati/Library/AutoUpdater/UpdaterManager.cs b/Duplicati/Library/AutoUpdater/UpdaterManager.cs index 593ced18e..6dc7c80d1 100644 --- a/Duplicati/Library/AutoUpdater/UpdaterManager.cs +++ b/Duplicati/Library/AutoUpdater/UpdaterManager.cs @@ -29,6 +29,7 @@ using Duplicati.Library.Interface; using Duplicati.Library.Common.IO; using Duplicati.Library.Common; using Duplicati.Library.Utility; +using System.Diagnostics; namespace Duplicati.Library.AutoUpdater { @@ -61,8 +62,7 @@ namespace Duplicati.Library.AutoUpdater ? System.IO.Path.GetDirectoryName(Duplicati.Library.Utility.Utility.getEntryAssembly().Location) : Environment.ExpandEnvironmentVariables(System.Environment.GetEnvironmentVariable(string.Format(BASEINSTALLDIR_ENVNAME_TEMPLATE, APPNAME))); - //FIXME: Auto Update doesn't work with the .net5 version - private static readonly bool DISABLE_UPDATE_DOMAIN = true;//Debugger.IsAttached || Utility.Utility.ParseBool(Environment.GetEnvironmentVariable(string.Format(SKIPUPDATE_ENVNAME_TEMPLATE, APPNAME)), false); + private static readonly bool DISABLE_UPDATE_DOMAIN = Debugger.IsAttached || Utility.Utility.ParseBool(Environment.GetEnvironmentVariable(string.Format(SKIPUPDATE_ENVNAME_TEMPLATE, APPNAME)), false); public static bool RequiresRespawn { get; set; } diff --git a/Duplicati/Library/Backend/Box/Duplicati.Library.Backend.Box.csproj b/Duplicati/Library/Backend/Box/Duplicati.Library.Backend.Box.csproj index e2062d2f5..641509398 100644 --- a/Duplicati/Library/Backend/Box/Duplicati.Library.Backend.Box.csproj +++ b/Duplicati/Library/Backend/Box/Duplicati.Library.Backend.Box.csproj @@ -6,7 +6,7 @@ - + diff --git a/Duplicati/Library/Backend/Jottacloud/Duplicati.Library.Backend.Jottacloud.csproj b/Duplicati/Library/Backend/Jottacloud/Duplicati.Library.Backend.Jottacloud.csproj index e7d7f37b9..eef24e2a6 100644 --- a/Duplicati/Library/Backend/Jottacloud/Duplicati.Library.Backend.Jottacloud.csproj +++ b/Duplicati/Library/Backend/Jottacloud/Duplicati.Library.Backend.Jottacloud.csproj @@ -18,6 +18,6 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/Duplicati/Library/Backend/Storj/Duplicati.Library.Backend.Storj.csproj b/Duplicati/Library/Backend/Storj/Duplicati.Library.Backend.Storj.csproj index 260f36447..df514fe5f 100644 --- a/Duplicati/Library/Backend/Storj/Duplicati.Library.Backend.Storj.csproj +++ b/Duplicati/Library/Backend/Storj/Duplicati.Library.Backend.Storj.csproj @@ -7,7 +7,7 @@ - + diff --git a/Duplicati/Library/Backend/Tardigrade/Duplicati.Library.Backend.Tardigrade.csproj b/Duplicati/Library/Backend/Tardigrade/Duplicati.Library.Backend.Tardigrade.csproj index 16612f306..0ee342868 100644 --- a/Duplicati/Library/Backend/Tardigrade/Duplicati.Library.Backend.Tardigrade.csproj +++ b/Duplicati/Library/Backend/Tardigrade/Duplicati.Library.Backend.Tardigrade.csproj @@ -6,7 +6,7 @@ - + diff --git a/Duplicati/Library/Common/Duplicati.Library.Common.csproj b/Duplicati/Library/Common/Duplicati.Library.Common.csproj index afb83a7ca..f97b0e18a 100644 --- a/Duplicati/Library/Common/Duplicati.Library.Common.csproj +++ b/Duplicati/Library/Common/Duplicati.Library.Common.csproj @@ -19,8 +19,9 @@ - + + diff --git a/Duplicati/Library/Modules/Builtin/Duplicati.Library.Modules.Builtin.csproj b/Duplicati/Library/Modules/Builtin/Duplicati.Library.Modules.Builtin.csproj index e0a6e618b..5a1c7978f 100644 --- a/Duplicati/Library/Modules/Builtin/Duplicati.Library.Modules.Builtin.csproj +++ b/Duplicati/Library/Modules/Builtin/Duplicati.Library.Modules.Builtin.csproj @@ -9,7 +9,7 @@ - + diff --git a/Duplicati/Library/SQLiteHelper/Duplicati.Library.SQLiteHelper.csproj b/Duplicati/Library/SQLiteHelper/Duplicati.Library.SQLiteHelper.csproj index cacc3d1ee..736fe91f7 100644 --- a/Duplicati/Library/SQLiteHelper/Duplicati.Library.SQLiteHelper.csproj +++ b/Duplicati/Library/SQLiteHelper/Duplicati.Library.SQLiteHelper.csproj @@ -8,7 +8,6 @@ - diff --git a/Duplicati/Library/Snapshots/Duplicati.Library.Snapshots.csproj b/Duplicati/Library/Snapshots/Duplicati.Library.Snapshots.csproj index 3668b576c..989b6a5ab 100644 --- a/Duplicati/Library/Snapshots/Duplicati.Library.Snapshots.csproj +++ b/Duplicati/Library/Snapshots/Duplicati.Library.Snapshots.csproj @@ -6,7 +6,7 @@ - + diff --git a/Duplicati/Library/Utility/Power/WindowsPowerSupplyState.cs b/Duplicati/Library/Utility/Power/WindowsPowerSupplyState.cs index 9b3ad30f8..ab7732c8f 100644 --- a/Duplicati/Library/Utility/Power/WindowsPowerSupplyState.cs +++ b/Duplicati/Library/Utility/Power/WindowsPowerSupplyState.cs @@ -1,4 +1,4 @@ -// Copyright (C) 2024, The Duplicati Team +// Copyright (C) 2024, The Duplicati Team // https://duplicati.com, hello@duplicati.com // // Permission is hereby granted, free of charge, to any person obtaining a @@ -18,7 +18,8 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -using System.Reflection; + +using System; namespace Duplicati.Library.Utility.Power { diff --git a/Duplicati/Server/Duplicati.Server.csproj b/Duplicati/Server/Duplicati.Server.csproj index 527243931..5e4637fd5 100644 --- a/Duplicati/Server/Duplicati.Server.csproj +++ b/Duplicati/Server/Duplicati.Server.csproj @@ -2,7 +2,7 @@ net8.0 - Exe + Duplicati.Server.Implementation @@ -10,9 +10,9 @@ - - - + + + @@ -43,7 +43,6 @@ - diff --git a/Duplicati/Service/Duplicati.Service.csproj b/Duplicati/Service/Duplicati.Service.csproj index 12cbea263..03cb14a81 100644 --- a/Duplicati/Service/Duplicati.Service.csproj +++ b/Duplicati/Service/Duplicati.Service.csproj @@ -2,7 +2,7 @@ net8.0 - Exe + Duplicati.Service.Implementation diff --git a/Duplicati/WebserverCore/Duplicati.WebserverCore.csproj b/Duplicati/WebserverCore/Duplicati.WebserverCore.csproj index e1ad23e45..d1f01272c 100644 --- a/Duplicati/WebserverCore/Duplicati.WebserverCore.csproj +++ b/Duplicati/WebserverCore/Duplicati.WebserverCore.csproj @@ -1,8 +1,8 @@  - net6.0 - Library + net8.0 + Library enable enable true diff --git a/Executables/net48/Duplicati.CommandLine.AutoUpdater/Program.cs b/Executables/net48/Duplicati.CommandLine.AutoUpdater/Program.cs deleted file mode 100644 index 4a1ef94a7..000000000 --- a/Executables/net48/Duplicati.CommandLine.AutoUpdater/Program.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace Duplicati.CommandLine.AutoUpdater.Net5 -{ - // Wrapper class to keep code independent - public static class Program - { - public static int Main(string[] args) - => Duplicati.CommandLine.AutoUpdater.Program.Main(args); - } -} \ No newline at end of file diff --git a/Executables/net48/Duplicati.CommandLine.BackendTester/Duplicati.CommandLine.BackendTester.csproj b/Executables/net48/Duplicati.CommandLine.BackendTester/Duplicati.CommandLine.BackendTester.csproj deleted file mode 100644 index 26b74761b..000000000 --- a/Executables/net48/Duplicati.CommandLine.BackendTester/Duplicati.CommandLine.BackendTester.csproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - Exe - net8.0 - A backend debugging tool for Duplicati - - - - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - \ No newline at end of file diff --git a/Executables/net48/Duplicati.CommandLine.BackendTester/Program.cs b/Executables/net48/Duplicati.CommandLine.BackendTester/Program.cs deleted file mode 100644 index b16773448..000000000 --- a/Executables/net48/Duplicati.CommandLine.BackendTester/Program.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace Duplicati.CommandLine.BackendTester.Net5 -{ - // Wrapper class to keep code independent - public static class Program - { - public static int Main(string[] args) - => Duplicati.CommandLine.BackendTester.Program.Main(args); - } -} \ No newline at end of file diff --git a/Executables/net48/Duplicati.CommandLine.BackendTool/Program.cs b/Executables/net48/Duplicati.CommandLine.BackendTool/Program.cs deleted file mode 100644 index aacea31c5..000000000 --- a/Executables/net48/Duplicati.CommandLine.BackendTool/Program.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace Duplicati.CommandLine.BackendTool.Net5 -{ - // Wrapper class to keep code independent - public static class Program - { - public static int Main(string[] args) - => Duplicati.CommandLine.BackendTool.Program.Main(args); - } -} \ No newline at end of file diff --git a/Executables/net48/Duplicati.CommandLine.ConfigurationImporter/Duplicati.CommandLine.ConfigurationImporter.csproj b/Executables/net48/Duplicati.CommandLine.ConfigurationImporter/Duplicati.CommandLine.ConfigurationImporter.csproj deleted file mode 100644 index 63d79520d..000000000 --- a/Executables/net48/Duplicati.CommandLine.ConfigurationImporter/Duplicati.CommandLine.ConfigurationImporter.csproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - Exe - net8.0 - Configuration Import Tool for Duplicati - - - - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - \ No newline at end of file diff --git a/Executables/net48/Duplicati.CommandLine.ConfigurationImporter/Program.cs b/Executables/net48/Duplicati.CommandLine.ConfigurationImporter/Program.cs deleted file mode 100644 index 2d9f8b5c7..000000000 --- a/Executables/net48/Duplicati.CommandLine.ConfigurationImporter/Program.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace Duplicati.CommandLine.ConfigurationImporter.Net5 -{ - // Wrapper class to keep code independent - public static class Program - { - public static int Main(string[] args) - => Duplicati.CommandLine.ConfigurationImporter.ConfigurationImporter.Main(args); - } -} \ No newline at end of file diff --git a/Executables/net48/Duplicati.CommandLine.RecoveryTool/Program.cs b/Executables/net48/Duplicati.CommandLine.RecoveryTool/Program.cs deleted file mode 100644 index 5c7e2848d..000000000 --- a/Executables/net48/Duplicati.CommandLine.RecoveryTool/Program.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace Duplicati.CommandLine.RecoveryTool.Net5 -{ - // Wrapper class to keep code independent - public static class Program - { - public static int Main(string[] args) - => Duplicati.CommandLine.RecoveryTool.Program.Main(args); - } -} \ No newline at end of file diff --git a/Executables/net48/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj b/Executables/net48/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj deleted file mode 100644 index ac1a6d2cb..000000000 --- a/Executables/net48/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - WinExe - net8.0 - The Duplicati Tray implementation - ..\..\..\Duplicati\GUI\Duplicati.GUI.TrayIcon\Duplicati.ico - - - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - \ No newline at end of file diff --git a/Executables/net48/Duplicati.WindowsService/Duplicati.WindowsService.csproj b/Executables/net48/Duplicati.WindowsService/Duplicati.WindowsService.csproj deleted file mode 100644 index b3c3f96bc..000000000 --- a/Executables/net48/Duplicati.WindowsService/Duplicati.WindowsService.csproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - Exe - net8.0 - WindowsService for Duplicati - Duplicati.WindowsService - - - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - \ No newline at end of file diff --git a/Executables/net48/Duplicati.WindowsService/Program.cs b/Executables/net48/Duplicati.WindowsService/Program.cs deleted file mode 100644 index c7ba47cbc..000000000 --- a/Executables/net48/Duplicati.WindowsService/Program.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace Duplicati.WindowsService.Net5 -{ - // Wrapper class to keep code independent - public static class Program - { - public static int Main(string[] args) - => Duplicati.WindowsService.Program.Main(args); - } -} \ No newline at end of file diff --git a/Executables/net48/Duplicati_Service/Duplicati.Service.csproj b/Executables/net48/Duplicati_Service/Duplicati.Service.csproj deleted file mode 100644 index 090650c3f..000000000 --- a/Executables/net48/Duplicati_Service/Duplicati.Service.csproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - Exe - net8.0 - Service controller for Duplicati - - - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - \ No newline at end of file diff --git a/Executables/net48/Duplicati_Service/Program.cs b/Executables/net48/Duplicati_Service/Program.cs deleted file mode 100644 index 53eeb44b6..000000000 --- a/Executables/net48/Duplicati_Service/Program.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace Duplicati.Service.Net5 -{ - // Wrapper class to keep code independent - public static class Program - { - public static int Main(string[] args) - => Duplicati.Service.Program.Main(args); - } -} \ No newline at end of file diff --git a/Executables/net5/Duplicati.CommandLine.AutoUpdater/Duplicati.CommandLine.AutoUpdater.csproj b/Executables/net5/Duplicati.CommandLine.AutoUpdater/Duplicati.CommandLine.AutoUpdater.csproj deleted file mode 100644 index 2526fcc2a..000000000 --- a/Executables/net5/Duplicati.CommandLine.AutoUpdater/Duplicati.CommandLine.AutoUpdater.csproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - Exe - net8.0 - AutoUpdater tool for Duplicati - - - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - \ No newline at end of file diff --git a/Executables/net5/Duplicati.CommandLine.AutoUpdater/Program.cs b/Executables/net5/Duplicati.CommandLine.AutoUpdater/Program.cs deleted file mode 100644 index 4a1ef94a7..000000000 --- a/Executables/net5/Duplicati.CommandLine.AutoUpdater/Program.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace Duplicati.CommandLine.AutoUpdater.Net5 -{ - // Wrapper class to keep code independent - public static class Program - { - public static int Main(string[] args) - => Duplicati.CommandLine.AutoUpdater.Program.Main(args); - } -} \ No newline at end of file diff --git a/Executables/net5/Duplicati.CommandLine.BackendTool/Duplicati.CommandLine.BackendTool.csproj b/Executables/net5/Duplicati.CommandLine.BackendTool/Duplicati.CommandLine.BackendTool.csproj deleted file mode 100644 index 3388efe5d..000000000 --- a/Executables/net5/Duplicati.CommandLine.BackendTool/Duplicati.CommandLine.BackendTool.csproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - Exe - net8.0 - Tool for file-level access to remote destinations - - - - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - \ No newline at end of file diff --git a/Executables/net5/Duplicati.CommandLine.RecoveryTool/Duplicati.CommandLine.RecoveryTool.csproj b/Executables/net5/Duplicati.CommandLine.RecoveryTool/Duplicati.CommandLine.RecoveryTool.csproj deleted file mode 100644 index 6909d652e..000000000 --- a/Executables/net5/Duplicati.CommandLine.RecoveryTool/Duplicati.CommandLine.RecoveryTool.csproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - Exe - net8.0 - RecoveryTool for Duplicati - - - - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - \ No newline at end of file diff --git a/Executables/net5/Duplicati.CommandLine/Duplicati.CommandLine.csproj b/Executables/net5/Duplicati.CommandLine/Duplicati.CommandLine.csproj deleted file mode 100644 index ffe763801..000000000 --- a/Executables/net5/Duplicati.CommandLine/Duplicati.CommandLine.csproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - Exe - net8.0 - Commandline implementation of Duplicati - - - - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - diff --git a/Executables/net5/Duplicati.GUI.TrayIcon/Program.cs b/Executables/net5/Duplicati.GUI.TrayIcon/Program.cs deleted file mode 100644 index 6e4552ba9..000000000 --- a/Executables/net5/Duplicati.GUI.TrayIcon/Program.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace Duplicati.GUI.TrayIcon.Net5 -{ - // Wrapper class to keep code independent - public static class Program - { - public static int Main(string[] args) - => Duplicati.GUI.TrayIcon.Program.Main(args); - } -} \ No newline at end of file diff --git a/Executables/net5/Duplicati.Server/Duplicati.Server.csproj b/Executables/net5/Duplicati.Server/Duplicati.Server.csproj deleted file mode 100644 index 10a157e5c..000000000 --- a/Executables/net5/Duplicati.Server/Duplicati.Server.csproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - Exe - net8.0 - The Server Duplicati implementation - Duplicati.Server - - - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - \ No newline at end of file diff --git a/Executables/net5/Duplicati.Server/Program.cs b/Executables/net5/Duplicati.Server/Program.cs deleted file mode 100644 index 834667b9e..000000000 --- a/Executables/net5/Duplicati.Server/Program.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace Duplicati.Server.Net5 -{ - // Wrapper class to keep code independent - public static class Program - { - public static int Main(string[] args) - => Duplicati.Server.Program.Main(args); - } -} \ No newline at end of file diff --git a/Executables/net48/Duplicati.CommandLine.AutoUpdater/Duplicati.CommandLine.AutoUpdater.csproj b/Executables/net8/Duplicati.CommandLine.AutoUpdater/Duplicati.CommandLine.AutoUpdater.csproj similarity index 100% rename from Executables/net48/Duplicati.CommandLine.AutoUpdater/Duplicati.CommandLine.AutoUpdater.csproj rename to Executables/net8/Duplicati.CommandLine.AutoUpdater/Duplicati.CommandLine.AutoUpdater.csproj diff --git a/Executables/net48/Duplicati.CommandLine/Program.cs b/Executables/net8/Duplicati.CommandLine.AutoUpdater/Program.cs similarity index 54% rename from Executables/net48/Duplicati.CommandLine/Program.cs rename to Executables/net8/Duplicati.CommandLine.AutoUpdater/Program.cs index beda17e05..c97a85a64 100644 --- a/Executables/net48/Duplicati.CommandLine/Program.cs +++ b/Executables/net8/Duplicati.CommandLine.AutoUpdater/Program.cs @@ -1,9 +1,9 @@ -namespace Duplicati.CommandLine.CLI.Net5 +namespace Duplicati.CommandLine.AutoUpdater.Net8 { // Wrapper class to keep code independent public static class Program { public static int Main(string[] args) - => Duplicati.CommandLine.Program.Main(args); + => Duplicati.Library.AutoUpdater.Program.Main(args); } } \ No newline at end of file diff --git a/Executables/net5/Duplicati.CommandLine.BackendTester/Duplicati.CommandLine.BackendTester.csproj b/Executables/net8/Duplicati.CommandLine.BackendTester/Duplicati.CommandLine.BackendTester.csproj similarity index 100% rename from Executables/net5/Duplicati.CommandLine.BackendTester/Duplicati.CommandLine.BackendTester.csproj rename to Executables/net8/Duplicati.CommandLine.BackendTester/Duplicati.CommandLine.BackendTester.csproj diff --git a/Executables/net5/Duplicati.CommandLine.BackendTester/Program.cs b/Executables/net8/Duplicati.CommandLine.BackendTester/Program.cs similarity index 80% rename from Executables/net5/Duplicati.CommandLine.BackendTester/Program.cs rename to Executables/net8/Duplicati.CommandLine.BackendTester/Program.cs index b16773448..9f4f7bcb5 100644 --- a/Executables/net5/Duplicati.CommandLine.BackendTester/Program.cs +++ b/Executables/net8/Duplicati.CommandLine.BackendTester/Program.cs @@ -1,4 +1,4 @@ -namespace Duplicati.CommandLine.BackendTester.Net5 +namespace Duplicati.CommandLine.BackendTester.Net8 { // Wrapper class to keep code independent public static class Program diff --git a/Executables/net48/Duplicati.CommandLine.BackendTool/Duplicati.CommandLine.BackendTool.csproj b/Executables/net8/Duplicati.CommandLine.BackendTool/Duplicati.CommandLine.BackendTool.csproj similarity index 100% rename from Executables/net48/Duplicati.CommandLine.BackendTool/Duplicati.CommandLine.BackendTool.csproj rename to Executables/net8/Duplicati.CommandLine.BackendTool/Duplicati.CommandLine.BackendTool.csproj diff --git a/Executables/net5/Duplicati.CommandLine.BackendTool/Program.cs b/Executables/net8/Duplicati.CommandLine.BackendTool/Program.cs similarity index 80% rename from Executables/net5/Duplicati.CommandLine.BackendTool/Program.cs rename to Executables/net8/Duplicati.CommandLine.BackendTool/Program.cs index aacea31c5..4987b2077 100644 --- a/Executables/net5/Duplicati.CommandLine.BackendTool/Program.cs +++ b/Executables/net8/Duplicati.CommandLine.BackendTool/Program.cs @@ -1,4 +1,4 @@ -namespace Duplicati.CommandLine.BackendTool.Net5 +namespace Duplicati.CommandLine.BackendTool.Net8 { // Wrapper class to keep code independent public static class Program diff --git a/Executables/net5/Duplicati.CommandLine.ConfigurationImporter/Duplicati.CommandLine.ConfigurationImporter.csproj b/Executables/net8/Duplicati.CommandLine.ConfigurationImporter/Duplicati.CommandLine.ConfigurationImporter.csproj similarity index 100% rename from Executables/net5/Duplicati.CommandLine.ConfigurationImporter/Duplicati.CommandLine.ConfigurationImporter.csproj rename to Executables/net8/Duplicati.CommandLine.ConfigurationImporter/Duplicati.CommandLine.ConfigurationImporter.csproj diff --git a/Executables/net5/Duplicati.CommandLine.ConfigurationImporter/Program.cs b/Executables/net8/Duplicati.CommandLine.ConfigurationImporter/Program.cs similarity index 79% rename from Executables/net5/Duplicati.CommandLine.ConfigurationImporter/Program.cs rename to Executables/net8/Duplicati.CommandLine.ConfigurationImporter/Program.cs index 2d9f8b5c7..cabafef94 100644 --- a/Executables/net5/Duplicati.CommandLine.ConfigurationImporter/Program.cs +++ b/Executables/net8/Duplicati.CommandLine.ConfigurationImporter/Program.cs @@ -1,4 +1,4 @@ -namespace Duplicati.CommandLine.ConfigurationImporter.Net5 +namespace Duplicati.CommandLine.ConfigurationImporter.Net8 { // Wrapper class to keep code independent public static class Program diff --git a/Executables/net48/Duplicati.CommandLine.RecoveryTool/Duplicati.CommandLine.RecoveryTool.csproj b/Executables/net8/Duplicati.CommandLine.RecoveryTool/Duplicati.CommandLine.RecoveryTool.csproj similarity index 100% rename from Executables/net48/Duplicati.CommandLine.RecoveryTool/Duplicati.CommandLine.RecoveryTool.csproj rename to Executables/net8/Duplicati.CommandLine.RecoveryTool/Duplicati.CommandLine.RecoveryTool.csproj diff --git a/Executables/net5/Duplicati.CommandLine.RecoveryTool/Program.cs b/Executables/net8/Duplicati.CommandLine.RecoveryTool/Program.cs similarity index 80% rename from Executables/net5/Duplicati.CommandLine.RecoveryTool/Program.cs rename to Executables/net8/Duplicati.CommandLine.RecoveryTool/Program.cs index 5c7e2848d..3f68ef5af 100644 --- a/Executables/net5/Duplicati.CommandLine.RecoveryTool/Program.cs +++ b/Executables/net8/Duplicati.CommandLine.RecoveryTool/Program.cs @@ -1,4 +1,4 @@ -namespace Duplicati.CommandLine.RecoveryTool.Net5 +namespace Duplicati.CommandLine.RecoveryTool.Net8 { // Wrapper class to keep code independent public static class Program diff --git a/Executables/net48/Duplicati.CommandLine/Duplicati.CommandLine.csproj b/Executables/net8/Duplicati.CommandLine/Duplicati.CommandLine.csproj similarity index 100% rename from Executables/net48/Duplicati.CommandLine/Duplicati.CommandLine.csproj rename to Executables/net8/Duplicati.CommandLine/Duplicati.CommandLine.csproj diff --git a/Executables/net5/Duplicati.CommandLine/Program.cs b/Executables/net8/Duplicati.CommandLine/Program.cs similarity index 82% rename from Executables/net5/Duplicati.CommandLine/Program.cs rename to Executables/net8/Duplicati.CommandLine/Program.cs index beda17e05..7c006a0c0 100644 --- a/Executables/net5/Duplicati.CommandLine/Program.cs +++ b/Executables/net8/Duplicati.CommandLine/Program.cs @@ -1,4 +1,4 @@ -namespace Duplicati.CommandLine.CLI.Net5 +namespace Duplicati.CommandLine.CLI.Net8 { // Wrapper class to keep code independent public static class Program diff --git a/Executables/net5/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj b/Executables/net8/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj similarity index 100% rename from Executables/net5/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj rename to Executables/net8/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj diff --git a/Executables/net48/Duplicati.GUI.TrayIcon/Program.cs b/Executables/net8/Duplicati.GUI.TrayIcon/Program.cs similarity index 83% rename from Executables/net48/Duplicati.GUI.TrayIcon/Program.cs rename to Executables/net8/Duplicati.GUI.TrayIcon/Program.cs index 6e4552ba9..4158deee8 100644 --- a/Executables/net48/Duplicati.GUI.TrayIcon/Program.cs +++ b/Executables/net8/Duplicati.GUI.TrayIcon/Program.cs @@ -1,4 +1,4 @@ -namespace Duplicati.GUI.TrayIcon.Net5 +namespace Duplicati.GUI.TrayIcon.Net8 { // Wrapper class to keep code independent public static class Program diff --git a/Executables/net48/Duplicati.Server/Duplicati.Server.csproj b/Executables/net8/Duplicati.Server/Duplicati.Server.csproj similarity index 100% rename from Executables/net48/Duplicati.Server/Duplicati.Server.csproj rename to Executables/net8/Duplicati.Server/Duplicati.Server.csproj diff --git a/Executables/net48/Duplicati.Server/Program.cs b/Executables/net8/Duplicati.Server/Program.cs similarity index 85% rename from Executables/net48/Duplicati.Server/Program.cs rename to Executables/net8/Duplicati.Server/Program.cs index 834667b9e..245111167 100644 --- a/Executables/net48/Duplicati.Server/Program.cs +++ b/Executables/net8/Duplicati.Server/Program.cs @@ -1,4 +1,4 @@ -namespace Duplicati.Server.Net5 +namespace Duplicati.Server.Net8 { // Wrapper class to keep code independent public static class Program diff --git a/Executables/net5/Duplicati.WindowsService/Duplicati.WindowsService.csproj b/Executables/net8/Duplicati.WindowsService/Duplicati.WindowsService.csproj similarity index 100% rename from Executables/net5/Duplicati.WindowsService/Duplicati.WindowsService.csproj rename to Executables/net8/Duplicati.WindowsService/Duplicati.WindowsService.csproj diff --git a/Executables/net5/Duplicati.WindowsService/Program.cs b/Executables/net8/Duplicati.WindowsService/Program.cs similarity index 83% rename from Executables/net5/Duplicati.WindowsService/Program.cs rename to Executables/net8/Duplicati.WindowsService/Program.cs index c7ba47cbc..61961d8e0 100644 --- a/Executables/net5/Duplicati.WindowsService/Program.cs +++ b/Executables/net8/Duplicati.WindowsService/Program.cs @@ -1,4 +1,4 @@ -namespace Duplicati.WindowsService.Net5 +namespace Duplicati.WindowsService.Net8 { // Wrapper class to keep code independent public static class Program diff --git a/Executables/net5/Duplicati_Service/Duplicati.Service.csproj b/Executables/net8/Duplicati_Service/Duplicati.Service.csproj similarity index 100% rename from Executables/net5/Duplicati_Service/Duplicati.Service.csproj rename to Executables/net8/Duplicati_Service/Duplicati.Service.csproj diff --git a/Executables/net5/Duplicati_Service/Program.cs b/Executables/net8/Duplicati_Service/Program.cs similarity index 85% rename from Executables/net5/Duplicati_Service/Program.cs rename to Executables/net8/Duplicati_Service/Program.cs index 53eeb44b6..33b210f93 100644 --- a/Executables/net5/Duplicati_Service/Program.cs +++ b/Executables/net8/Duplicati_Service/Program.cs @@ -1,4 +1,4 @@ -namespace Duplicati.Service.Net5 +namespace Duplicati.Service.Net8 { // Wrapper class to keep code independent public static class Program diff --git a/Installer/OSX/dmg/build.sh b/Installer/OSX/dmg/build.sh index 575089239..c6fa73b9a 100755 --- a/Installer/OSX/dmg/build.sh +++ b/Installer/OSX/dmg/build.sh @@ -3,7 +3,7 @@ SCRIPTDIR=$( cd "$(dirname "$0")" ; pwd -P ) -VERSION=`grep '' < $SCRIPTDIR/../../../Executables/net5/Duplicati.Server/Duplicati.Server.csproj | sed 's/.*\([^\.]*\.[^\.]*\.[^\.]*\).*<\/Version>.*/\1/'` +VERSION=`grep '' < $SCRIPTDIR/../../../Executables/net8/Duplicati.Server/Duplicati.Server.csproj | sed 's/.*\([^\.]*\.[^\.]*\.[^\.]*\).*<\/Version>.*/\1/'` VERSION=${VERSION//$'\r\n'} echo "Building version: ($VERSION)" export VERSION_NUMBER=$VERSION diff --git a/Installer/Windows/MSI/build.sh b/Installer/Windows/MSI/build.sh index a0498f4bd..f31e2de9b 100644 --- a/Installer/Windows/MSI/build.sh +++ b/Installer/Windows/MSI/build.sh @@ -3,7 +3,7 @@ SCRIPTDIR=$( cd "$(dirname "$0")" ; pwd -P ) -VERSION=`grep '' < $SCRIPTDIR/../../../Executables/net5/Duplicati.Server/Duplicati.Server.csproj | sed 's/.*\([^\.]*\.[^\.]*\.[^\.]*\).*<\/Version>.*/\1/'` +VERSION=`grep '' < $SCRIPTDIR/../../../Executables/net8/Duplicati.Server/Duplicati.Server.csproj | sed 's/.*\([^\.]*\.[^\.]*\.[^\.]*\).*<\/Version>.*/\1/'` VERSION=${VERSION//$'\r\n'} echo "Building version: ($VERSION)" diff --git a/Installer/debian/build.sh b/Installer/debian/build.sh index d4ce97805..8fabea0ca 100755 --- a/Installer/debian/build.sh +++ b/Installer/debian/build.sh @@ -5,7 +5,7 @@ SCRIPTDIR=$( cd "$(dirname "$0")" ; pwd -P ) docker build $SCRIPTDIR/docker -t duplicati-debian -VERSION=`grep '' < $SCRIPTDIR/../../Executables/net5/Duplicati.Server/Duplicati.Server.csproj | sed 's/.*\(.*\)<\/Version>.*/\1/'` +VERSION=`grep '' < $SCRIPTDIR/../../Executables/net8/Duplicati.Server/Duplicati.Server.csproj | sed 's/.*\(.*\)<\/Version>.*/\1/'` VERSION=${VERSION//$'\r\n'} echo "Building version: ($VERSION)" diff --git a/Installer/fedora/build.sh b/Installer/fedora/build.sh index 5a2b1549a..f4866025d 100755 --- a/Installer/fedora/build.sh +++ b/Installer/fedora/build.sh @@ -5,7 +5,7 @@ SCRIPTDIR=$( cd "$(dirname "$0")" ; pwd -P ) docker build $SCRIPTDIR/docker -t duplicati-fedora -VERSION=`grep '' < $SCRIPTDIR/../../Executables/net5/Duplicati.Server/Duplicati.Server.csproj | sed 's/.*\(.*\)<\/Version>.*/\1/'` +VERSION=`grep '' < $SCRIPTDIR/../../Executables/net8/Duplicati.Server/Duplicati.Server.csproj | sed 's/.*\(.*\)<\/Version>.*/\1/'` VERSION=${VERSION//$'\r\n'} echo "Building version: ($VERSION)"