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

Merge pull request #5119 from duplicati/feature/update-storj-2-12

Browse Source 
Feature/update Storj to 2.12
This commit is contained in:
Kenneth Skovhede
2024-03-08 11:04:21 +01:00
committed by GitHub
parent e264f72d31 1974b2e631
commit 1a1adebfa5
14 changed files with 76 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Duplicati/Library/Backend/Storj/Duplicati.Library.Backend.Storj.csproj
+30 -2
View File
@@ -71,8 +71,8 @@
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
<Reference Include="uplink.NET, Version=2.7.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\uplink.NET.2.7.1604\lib\netstandard2.0\uplink.NET.dll</HintPath>
<Reference Include="uplink.NET, Version=2.12.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\uplink.NET.2.12.3328\lib\netstandard2.0\uplink.NET.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@@ -124,5 +124,33 @@
</PropertyGroup>
<Error Condition="!Exists('..\..\..\..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.3\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.3\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets'))" />
</Target>
<Target Name="CopyStorjLinuxLibrary" BeforeTargets="PrepareForBuild">
<Message Text="Executing Storj Linux native library copy task" Importance="High" />
<Copy
SourceFiles="..\..\..\..\packages/uplink.NET.Linux.2.12.3328/runtimes/linux-x64/native/storj_uplink.so"
DestinationFiles="$(ProjectDir)libstorj_uplink.so" />
<Message Text="Copied Linux uplink native library" Importance="High" />
</Target>
<Target Name="CopyStorjMacLibrary" BeforeTargets="PrepareForBuild">
<Message Text="Executing Storj Linux native library copy task" Importance="High" />
<Copy
SourceFiles="..\..\..\..\packages/uplink.NET.Mac.2.12.3328/runtimes/osx-x64/native/libstorj_uplink.dylib"
DestinationFiles="$(ProjectDir)libstorj_uplink.dylib" />
<Message Text="Copied Mac uplink native library" Importance="High" />
</Target>
<Target Name="CopyStorjWinLibrary64" BeforeTargets="PrepareForBuild">
<Message Text="Executing Storj Windows native 64 library copy task" Importance="High" />
<Copy
SourceFiles="..\..\..\..\packages/uplink.NET.Win.2.12.3328/runtimes/win-x64/native/storj_uplink.dll"
DestinationFolder="$(ProjectDir)win-x64" />
<Message Text="Copied Windows uplink native 64 library" Importance="High" />
</Target>
<Target Name="CopyStorjWinLibrary32" BeforeTargets="PrepareForBuild">
<Message Text="Executing Storj Windows native 32 library copy task" Importance="High" />
<Copy
SourceFiles="..\..\..\..\packages/uplink.NET.Win.2.12.3328/runtimes/win-x86/native/storj_uplink.dll"
DestinationFolder="$(ProjectDir)win-x86" />
<Message Text="Copied Windows uplink native 32 library" Importance="High" />
</Target>
<Import Project="..\..\..\..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.3\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets" Condition="Exists('..\..\..\..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.3\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets')" />
</Project>
Duplicati/Library/Backend/Storj/libstorj_uplink.dylib
BIN
View File
Binary file not shown.
Duplicati/Library/Backend/Storj/libstorj_uplink.so
BIN
View File
Binary file not shown.
Duplicati/Library/Backend/Storj/packages.config
+4 -1
View File
@@ -9,5 +9,8 @@
<package id="System.Memory" version="4.5.5" targetFramework="net471" />
<package id="System.Numerics.Vectors" version="4.4.0" targetFramework="net471" />
<package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net471" />
<package id="uplink.NET" version="2.7.1604" targetFramework="net471" />
<package id="uplink.NET" version="2.12.3328" targetFramework="net471" />
<package id="uplink.NET.Win" version="2.12.3328" targetFramework="net471" />
<package id="uplink.NET.Linux" version="2.12.3328" targetFramework="net471" />
<package id="uplink.NET.Mac" version="2.12.3328" targetFramework="net471" />
</packages>
Duplicati/Library/Backend/Storj/win-x64/storj_uplink.dll
BIN
View File
Binary file not shown.
Duplicati/Library/Backend/Storj/win-x86/storj_uplink.dll
BIN
View File
Binary file not shown.
Duplicati/Library/Backend/Tardigrade/Duplicati.Library.Backend.Tardigrade.csproj
+30 -2
View File
@@ -71,8 +71,8 @@
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
<Reference Include="uplink.NET, Version=2.7.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\uplink.NET.2.7.1604\lib\netstandard2.0\uplink.NET.dll</HintPath>
<Reference Include="uplink.NET, Version=2.12.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\uplink.NET.2.12.3328\lib\netstandard2.0\uplink.NET.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@@ -112,5 +112,33 @@
</PropertyGroup>
<Error Condition="!Exists('..\..\..\..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.3\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.3\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets'))" />
</Target>
<Target Name="CopyTardigradeLinuxLibrary" BeforeTargets="PrepareForBuild">
<Message Text="Executing Tardigrade Linux native library copy task" Importance="High" />
<Copy
SourceFiles="..\..\..\..\packages/uplink.NET.Linux.2.12.3328/runtimes/linux-x64/native/storj_uplink.so"
DestinationFiles="$(ProjectDir)libstorj_uplink.so" />
<Message Text="Copied Linux uplink native library" Importance="High" />
</Target>
<Target Name="CopyTardigradeMacLibrary" BeforeTargets="PrepareForBuild">
<Message Text="Executing Tardigrade Linux native library copy task" Importance="High" />
<Copy
SourceFiles="..\..\..\..\packages/uplink.NET.Mac.2.12.3328/runtimes/osx-x64/native/libstorj_uplink.dylib"
DestinationFiles="$(ProjectDir)libstorj_uplink.dylib" />
<Message Text="Copied Mac uplink native library" Importance="High" />
</Target>
<Target Name="CopyTardigradeWinLibrary64" BeforeTargets="PrepareForBuild">
<Message Text="Executing Tardigrade Windows native 64 library copy task" Importance="High" />
<Copy
SourceFiles="..\..\..\..\packages/uplink.NET.Win.2.12.3328/runtimes/win-x64/native/storj_uplink.dll"
DestinationFolder="$(ProjectDir)win-x64" />
<Message Text="Copied Windows uplink native 64 library" Importance="High" />
</Target>
<Target Name="CopyTardigradeWinLibrary32" BeforeTargets="PrepareForBuild">
<Message Text="Executing Tardigrade Windows native 32 library copy task" Importance="High" />
<Copy
SourceFiles="..\..\..\..\packages/uplink.NET.Win.2.12.3328/runtimes/win-x86/native/storj_uplink.dll"
DestinationFolder="$(ProjectDir)win-x86" />
<Message Text="Copied Windows uplink native 32 library" Importance="High" />
</Target>
<Import Project="..\..\..\..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.3\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets" Condition="Exists('..\..\..\..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.3\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets')" />
</Project>
Duplicati/Library/Backend/Tardigrade/packages.config
+4 -1
View File
@@ -9,5 +9,8 @@
<package id="System.Memory" version="4.5.5" targetFramework="net471" />
<package id="System.Numerics.Vectors" version="4.4.0" targetFramework="net471" />
<package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net471" />
<package id="uplink.NET" version="2.7.1604" targetFramework="net471" />
<package id="uplink.NET" version="2.12.3328" targetFramework="net471" />
<package id="uplink.NET.Win" version="2.12.3328" targetFramework="net471" />
<package id="uplink.NET.Linux" version="2.12.3328" targetFramework="net471" />
<package id="uplink.NET.Mac" version="2.12.3328" targetFramework="net471" />
</packages>
Installer/AssemblyRedirects.xml
+4
View File
@@ -45,6 +45,10 @@
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion = "4.0.1.2"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion = "4.0.3.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
Installer/Makefile/Makefile
+3
View File
@@ -79,6 +79,9 @@ package: build
clean:
(find "$(SOURCE_DIR)" -type d -name bin -exec rm -rf "{}" \; &> /dev/null) || echo "bin cleaned"
(find "$(SOURCE_DIR)" -type d -name obj -exec rm -rf "{}" \; &> /dev/null) || echo "obj cleaned"
(find "$(SOURCE_DIR)/Duplicati/Library/Backend" -name libstorj_uplink.so -exec rm -rf "{}" \;) || echo "storj linux lib cleaned"
(find "$(SOURCE_DIR)/Duplicati/Library/Backend" -name libstorj_uplink.dylib -exec rm -rf "{}" \;) || echo "storj mac lib cleaned"
(find "$(SOURCE_DIR)/Duplicati" -type d -name win-x* -exec rm -rf "{}" \;) || echo "storj win lib cleaned"
rm -rf "$(PACKAGE_DIR)"
Installer/Synology/make-binary-package.sh
-1
View File
@@ -78,7 +78,6 @@ rm -rf ./licenses/MonoMac
rm -rf ./licenses/gpg
rm -rf ./win-x64/storj_uplink.dll
rm -rf ./win-x86/storj_uplink.dll
rm -rf ./storj_uplink.dll
rm -rf ./libstorj_uplink.dylib
# Install extra items for Synology
Installer/Windows/WixInstaller.wixproj
+1 -1
View File
@@ -67,7 +67,7 @@
</WixExtension>
</ItemGroup>
<ItemGroup>
<BinFiles Include="..\Duplicati\**" Exclude="..\**\*.pdb;..\**\SVGIcons\**\*.*;..\**\OSX Icons\**\*.*;..\**\lvm-scripts\**\*.*;..\**\libstorj_uplink.so;..\**\libstorj_uplink.dylib;..\**\storj_uplink.dll" />
<BinFiles Include="..\Duplicati\**" Exclude="..\**\*.pdb;..\**\SVGIcons\**\*.*;..\**\OSX Icons\**\*.*;..\**\lvm-scripts\**\*.*;..\**\libstorj_uplink.so;..\**\libstorj_uplink.dylib" />
</ItemGroup>
<Import Project="$(WixTargetsPath)" />
<Target Name="BeforeBuild">
Installer/debian/bin-rules.sh
-1
View File
@@ -61,7 +61,6 @@ override_dh_auto_install:
rm -rf build/lib/duplicati/licenses/gpg
rm -rf build/lib/duplicati/win-x64/storj_uplink.dll
rm -rf build/lib/duplicati/win-x86/storj_uplink.dll
rm -rf build/lib/duplicati/storj_uplink.dll
rm -rf build/lib/duplicati/libstorj_uplink.dylib
find build/lib/duplicati/* -type f | xargs chmod 644
find build/lib/duplicati/* -type d | xargs chmod 755
Installer/fedora/duplicati-binary.spec
-1
View File
@@ -102,7 +102,6 @@ rm -rf licenses/MonoMac
rm -rf licenses/gpg
rm -rf win-x64\storj_uplink.dll
rm -rf win-x86\storj_uplink.dll
rm -rf storj_uplink.dll
rm -rf libstorj_uplink.dylib