Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update storj to 2.12 #5104

Closed
wants to merge 1 commit into from
Closed

update storj to 2.12 #5104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
32 changes: 30 additions & 2 deletions Duplicati/Library/Backend/Storj/Duplicati.Library.Backend.Storj.csproj
View file
Open in desktop
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Binary file removed Duplicati/Library/Backend/Storj/libstorj_uplink.dylib
View file
Open in desktop
Binary file not shown.
Binary file removed Duplicati/Library/Backend/Storj/libstorj_uplink.so
View file
Open in desktop
Binary file not shown.
5 changes: 4 additions & 1 deletion Duplicati/Library/Backend/Storj/packages.config
View file
Open in desktop
Expand Up @@ -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>
Binary file removed Duplicati/Library/Backend/Storj/win-x64/storj_uplink.dll
View file
Open in desktop
Binary file not shown.
Binary file removed Duplicati/Library/Backend/Storj/win-x86/storj_uplink.dll
View file
Open in desktop
Binary file not shown.
32 changes: 30 additions & 2 deletions Duplicati/Library/Backend/Tardigrade/Duplicati.Library.Backend.Tardigrade.csproj
View file
Open in desktop
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
5 changes: 4 additions & 1 deletion Duplicati/Library/Backend/Tardigrade/packages.config
View file
Open in desktop
Expand Up @@ -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>
4 changes: 4 additions & 0 deletions Installer/AssemblyRedirects.xml
View file
Open in desktop
Expand Up @@ -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>
Expand Down
3 changes: 3 additions & 0 deletions Installer/Makefile/Makefile
View file
Open in desktop
Expand Up @@ -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)"


Expand Down