From e74433acedcc5ae637cbe48829d2e3531d5bf1ff Mon Sep 17 00:00:00 2001 From: Thomas Suckow Date: Sun, 3 Jan 2021 08:07:00 -0800 Subject: [PATCH] Use nuget posix library and fold UnixSupport into the normal build. --- Duplicati.sln | 8 +++++++- .../Common/Duplicati.Library.Common.csproj | 7 +------ .../Duplicati.Library.SQLiteHelper.csproj | 8 +------- .../Snapshots/Duplicati.Library.Snapshots.csproj | 9 ++------- Duplicati/Server/Duplicati.Server.csproj | 4 +--- Duplicati/UnixSupport/README.txt | 3 --- Duplicati/UnixSupport/UnixSupport.csproj | 6 +++--- Duplicati/UnixSupport/UnixSupport.dll | Bin 8192 -> 0 bytes Installer/debian/debian/rules | 3 --- Installer/fedora/duplicati.spec | 3 --- 10 files changed, 15 insertions(+), 36 deletions(-) delete mode 100644 Duplicati/UnixSupport/README.txt delete mode 100644 Duplicati/UnixSupport/UnixSupport.dll diff --git a/Duplicati.sln b/Duplicati.sln index 0344487ae..542e78004 100644 --- a/Duplicati.sln +++ b/Duplicati.sln @@ -105,10 +105,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Duplicati.CommandLine.AutoU EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Duplicati.Library.Backend.Tardigrade", "Duplicati\Library\Backend\Tardigrade\Duplicati.Library.Backend.Tardigrade.csproj", "{AE035E01-C917-4F13-A35E-78F21C1A2F17}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.Library.Backend.TencentCOS", "Duplicati\Library\Backend\TencentCOS\Duplicati.Library.Backend.TencentCOS.csproj", "{545DD6D4-9476-42D6-B51C-A28E000C489E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Duplicati.Library.Backend.TencentCOS", "Duplicati\Library\Backend\TencentCOS\Duplicati.Library.Backend.TencentCOS.csproj", "{545DD6D4-9476-42D6-B51C-A28E000C489E}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Duplicati.Library.Backend.Telegram", "Duplicati\Library\Backend\Telegram\Duplicati.Library.Backend.Telegram.csproj", "{B6BB37DE-1DCA-401B-B92F-202F341916EA}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnixSupport", "Duplicati\UnixSupport\UnixSupport.csproj", "{70AEA9C1-108D-447B-B53C-E4F8370B1C04}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -327,6 +329,10 @@ Global {B6BB37DE-1DCA-401B-B92F-202F341916EA}.Debug|Any CPU.Build.0 = Debug|Any CPU {B6BB37DE-1DCA-401B-B92F-202F341916EA}.Release|Any CPU.ActiveCfg = Release|Any CPU {B6BB37DE-1DCA-401B-B92F-202F341916EA}.Release|Any CPU.Build.0 = Release|Any CPU + {70AEA9C1-108D-447B-B53C-E4F8370B1C04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {70AEA9C1-108D-447B-B53C-E4F8370B1C04}.Debug|Any CPU.Build.0 = Debug|Any CPU + {70AEA9C1-108D-447B-B53C-E4F8370B1C04}.Release|Any CPU.ActiveCfg = Release|Any CPU + {70AEA9C1-108D-447B-B53C-E4F8370B1C04}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Duplicati/Library/Common/Duplicati.Library.Common.csproj b/Duplicati/Library/Common/Duplicati.Library.Common.csproj index 9dc3ebe9a..f29e24624 100644 --- a/Duplicati/Library/Common/Duplicati.Library.Common.csproj +++ b/Duplicati/Library/Common/Duplicati.Library.Common.csproj @@ -24,16 +24,11 @@ + - - - ..\..\..\thirdparty\UnixSupport\UnixSupport.dll - - - \ No newline at end of file diff --git a/Duplicati/Library/SQLiteHelper/Duplicati.Library.SQLiteHelper.csproj b/Duplicati/Library/SQLiteHelper/Duplicati.Library.SQLiteHelper.csproj index fe1103ea4..458bef8bf 100644 --- a/Duplicati/Library/SQLiteHelper/Duplicati.Library.SQLiteHelper.csproj +++ b/Duplicati/Library/SQLiteHelper/Duplicati.Library.SQLiteHelper.csproj @@ -27,12 +27,6 @@ + - - - - ..\..\..\thirdparty\UnixSupport\UnixSupport.dll - - - \ No newline at end of file diff --git a/Duplicati/Library/Snapshots/Duplicati.Library.Snapshots.csproj b/Duplicati/Library/Snapshots/Duplicati.Library.Snapshots.csproj index 12e3413ad..e20d5c200 100644 --- a/Duplicati/Library/Snapshots/Duplicati.Library.Snapshots.csproj +++ b/Duplicati/Library/Snapshots/Duplicati.Library.Snapshots.csproj @@ -24,14 +24,9 @@ - + - - - - - ..\..\..\thirdparty\UnixSupport\UnixSupport.dll - + diff --git a/Duplicati/Server/Duplicati.Server.csproj b/Duplicati/Server/Duplicati.Server.csproj index 3d69d2952..ed9b0873e 100644 --- a/Duplicati/Server/Duplicati.Server.csproj +++ b/Duplicati/Server/Duplicati.Server.csproj @@ -115,12 +115,10 @@ + - - ..\..\thirdparty\UnixSupport\UnixSupport.dll - ..\..\thirdparty\HttpServer\HttpServer.dll diff --git a/Duplicati/UnixSupport/README.txt b/Duplicati/UnixSupport/README.txt deleted file mode 100644 index b9345d996..000000000 --- a/Duplicati/UnixSupport/README.txt +++ /dev/null @@ -1,3 +0,0 @@ -This project is not really 3rd party. - -It was created solely for use with Duplicati, but it depends on the Mono.Posix.dll file, which is not found on the common Windows developer platform. By creating this mini project, it is possible to reference the functions from Mono.Posix during a Windows build without having access to the Mono.Posix.dll. As this dll is never invoked on Windows, it should have no interest to the Windows developer. diff --git a/Duplicati/UnixSupport/UnixSupport.csproj b/Duplicati/UnixSupport/UnixSupport.csproj index 791eb952e..899511bc0 100644 --- a/Duplicati/UnixSupport/UnixSupport.csproj +++ b/Duplicati/UnixSupport/UnixSupport.csproj @@ -1,9 +1,9 @@ - + net5.0 2.0.0.7 - Exe + Library LGPL, Copyright © Duplicati Team 2015 UnixSupport Duplicati Team @@ -14,7 +14,7 @@ - + \ No newline at end of file diff --git a/Duplicati/UnixSupport/UnixSupport.dll b/Duplicati/UnixSupport/UnixSupport.dll deleted file mode 100644 index 3d04df69f588d8145adba67c0dddf0525d2f3123..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8192 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 X6g5M@05WIj11bZlY3`_5Lm~tKDbwv2 diff --git a/Installer/debian/debian/rules b/Installer/debian/debian/rules index 6ba8bb314..d2b5e2037 100755 --- a/Installer/debian/debian/rules +++ b/Installer/debian/debian/rules @@ -35,9 +35,6 @@ override_dh_auto_build: xbuild /property:Configuration=Release BuildTools/UpdateVersionStamp/UpdateVersionStamp.csproj mono BuildTools/UpdateVersionStamp/bin/Release/UpdateVersionStamp.exe --version=$(VERSION) - xbuild /property:Configuration=Release thirdparty/UnixSupport/UnixSupport.csproj - cp thirdparty/UnixSupport/bin/Release/UnixSupport.dll thirdparty/UnixSupport/UnixSupport.dll - xbuild /property:Configuration=Release Duplicati.sln override_dh_auto_install: diff --git a/Installer/fedora/duplicati.spec b/Installer/fedora/duplicati.spec index aa659b911..393959e89 100755 --- a/Installer/fedora/duplicati.spec +++ b/Installer/fedora/duplicati.spec @@ -121,9 +121,6 @@ nuget restore Duplicati.sln xbuild /property:Configuration=Release BuildTools/UpdateVersionStamp/UpdateVersionStamp.csproj mono BuildTools/UpdateVersionStamp/bin/Release/UpdateVersionStamp.exe --version=%{_buildversion} -xbuild /property:Configuration=Release thirdparty/UnixSupport/UnixSupport.csproj -cp thirdparty/UnixSupport/bin/Release/UnixSupport.dll thirdparty/UnixSupport/UnixSupport.dll - xbuild /property:Configuration=Release Duplicati.sln # xbuild BuildTools/LocalizationTool/LocalizationTool.sln