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 3d04df69f..000000000 Binary files a/Duplicati/UnixSupport/UnixSupport.dll and /dev/null differ 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