haeaeae/duplicati
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use nuget posix library and fold UnixSupport into the normal build.

Browse Source
This commit is contained in:
Thomas Suckow
2021-01-03 08:07:00 -08:00
parent b1001fcfea
commit e74433aced
10 changed files with 15 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Duplicati.sln
+7 -1
View File
@@ -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
Duplicati/Library/Common/Duplicati.Library.Common.csproj
+1 -6
View File
@@ -24,16 +24,11 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\UnixSupport\UnixSupport.csproj" />
<ProjectReference Include="..\Interface\Duplicati.Library.Interface.csproj" />
<ProjectReference Include="..\Logging\Duplicati.Library.Logging.csproj" />
</ItemGroup>
<ItemGroup>
<Reference Include="UnixSupport">
<HintPath>..\..\..\thirdparty\UnixSupport\UnixSupport.dll</HintPath>
</Reference>
</ItemGroup>
<Import Project="..\..\..\packages\AlphaVSS.1.4.0\build\net45\AlphaVSS.targets" Condition="Exists('..\..\..\packages\AlphaVSS.1.4.0\build\net45\AlphaVSS.targets')" />
</Project>
Duplicati/Library/SQLiteHelper/Duplicati.Library.SQLiteHelper.csproj
+1 -7
View File
@@ -27,12 +27,6 @@
<ProjectReference Include="..\Interface\Duplicati.Library.Interface.csproj" />
<ProjectReference Include="..\Utility\Duplicati.Library.Utility.csproj" />
<ProjectReference Include="..\Localization\Duplicati.Library.Localization.csproj" />
<ProjectReference Include="..\..\UnixSupport\UnixSupport.csproj" />
</ItemGroup>
<ItemGroup>
<Reference Include="UnixSupport">
<HintPath>..\..\..\thirdparty\UnixSupport\UnixSupport.dll</HintPath>
</Reference>
</ItemGroup>
</Project>
Duplicati/Library/Snapshots/Duplicati.Library.Snapshots.csproj
+2 -7
View File
@@ -24,14 +24,9 @@
<ProjectReference Include="..\Common\Duplicati.Library.Common.csproj" />
<ProjectReference Include="..\Interface\Duplicati.Library.Interface.csproj" />
<ProjectReference Include="..\Localization\Duplicati.Library.Localization.csproj" />
<ProjectReference Include="..\Logging\Duplicati.Library.Logging.csproj" />
<ProjectReference Include="..\Logging\Duplicati.Library.Logging.csproj" />
<ProjectReference Include="..\Utility\Duplicati.Library.Utility.csproj" />
</ItemGroup>
<ItemGroup>
<Reference Include="UnixSupport">
<HintPath>..\..\..\thirdparty\UnixSupport\UnixSupport.dll</HintPath>
</Reference>
<ProjectReference Include="..\..\UnixSupport\UnixSupport.csproj" />
</ItemGroup>
<ItemGroup>
Duplicati/Server/Duplicati.Server.csproj
+1 -3
View File
@@ -115,12 +115,10 @@
</ProjectReference>
<ProjectReference Include="..\Tools\Duplicati.Tools.csproj">
</ProjectReference>
<ProjectReference Include="..\UnixSupport\UnixSupport.csproj" />
</ItemGroup>
<ItemGroup>
<Reference Include="UnixSupport">
<HintPath>..\..\thirdparty\UnixSupport\UnixSupport.dll</HintPath>
</Reference>
<Reference Include="HttpServer">
<HintPath>..\..\thirdparty\HttpServer\HttpServer.dll</HintPath>
</Reference>
Duplicati/UnixSupport/README.txt
-3
View File
@@ -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.
Duplicati/UnixSupport/UnixSupport.csproj
+3 -3
View File
@@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<Version>2.0.0.7</Version>
<OutputType>Exe</OutputType>
<OutputType>Library</OutputType>
<Copyright>LGPL, Copyright © Duplicati Team 2015</Copyright>
<Product>UnixSupport</Product>
<Company>Duplicati Team</Company>
@@ -14,7 +14,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Mono.Posix" />
<PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
</ItemGroup>
</Project>
Duplicati/UnixSupport/UnixSupport.dll
BIN
View File
Binary file not shown.
Installer/debian/debian/rules
-3
View File
@@ -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:
Installer/fedora/duplicati.spec
-3
View File
@@ -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