diff options
| author | TopperDEL <github_com@tparth.de> | 2020-06-20 15:23:40 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-20 15:23:40 +0300 |
| commit | 424407668025185f237ac820c645f3ef69caa6a6 (patch) | |
| tree | af943d8606773a802496b371a91d6bdfe061ba6f /Duplicati/Library/Backend/Tardigrade | |
| parent | d14ab54fd6fbba81c93fa45d780f8778f928af97 (diff) | |
| parent | ebf7346960b0d93d2ee74570c2f6d3adffe68bab (diff) | |
Merge branch 'master' into tardigrade-installer
Diffstat (limited to 'Duplicati/Library/Backend/Tardigrade')
3 files changed, 8 insertions, 6 deletions
diff --git a/Duplicati/Library/Backend/Tardigrade/Duplicati.Library.Backend.Tardigrade.csproj b/Duplicati/Library/Backend/Tardigrade/Duplicati.Library.Backend.Tardigrade.csproj index fbfd14757..dd777e6b0 100644 --- a/Duplicati/Library/Backend/Tardigrade/Duplicati.Library.Backend.Tardigrade.csproj +++ b/Duplicati/Library/Backend/Tardigrade/Duplicati.Library.Backend.Tardigrade.csproj @@ -42,8 +42,8 @@ <Reference Include="System.Data" /> <Reference Include="System.Net.Http" /> <Reference Include="System.Xml" /> - <Reference Include="uplink.NET, Version=2.2.2.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\..\..\..\packages\uplink.NET.2.2.2\lib\netstandard2.0\uplink.NET.dll</HintPath> + <Reference Include="uplink.NET, Version=2.3.1.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\..\..\..\packages\uplink.NET.2.3.1\lib\netstandard2.0\uplink.NET.dll</HintPath> </Reference> </ItemGroup> <ItemGroup> @@ -89,11 +89,11 @@ </Content> </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> - <Import Project="..\..\..\..\packages\uplink.NET.2.2.2\build\net40\uplink.NET.targets" Condition="Exists('..\..\..\..\packages\uplink.NET.2.2.2\build\net40\uplink.NET.targets')" /> + <Import Project="..\..\..\..\packages\uplink.NET.2.3.1\build\net40\uplink.NET.targets" Condition="Exists('..\..\..\..\packages\uplink.NET.2.3.1\build\net40\uplink.NET.targets')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> <ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\packages\uplink.NET.2.2.2\build\net40\uplink.NET.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\uplink.NET.2.2.2\build\net40\uplink.NET.targets'))" /> + <Error Condition="!Exists('..\..\..\..\packages\uplink.NET.2.3.1\build\net40\uplink.NET.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\uplink.NET.2.3.1\build\net40\uplink.NET.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/Duplicati/Library/Backend/Tardigrade/TardigradeBackend.cs b/Duplicati/Library/Backend/Tardigrade/TardigradeBackend.cs index 4e33fe585..c74092344 100644 --- a/Duplicati/Library/Backend/Tardigrade/TardigradeBackend.cs +++ b/Duplicati/Library/Backend/Tardigrade/TardigradeBackend.cs @@ -267,7 +267,9 @@ namespace Duplicati.Library.Backend.Tardigrade foreach (var obj in objects.Items) { TardigradeFile file = new TardigradeFile(obj); - file.Name = file.Name.Replace(GetBasePath(), ""); + var basePath = GetBasePath(); + if (basePath != "") + file.Name = file.Name.Replace(basePath, ""); files.Add(file); } diff --git a/Duplicati/Library/Backend/Tardigrade/packages.config b/Duplicati/Library/Backend/Tardigrade/packages.config index b0460fc91..1f22522a3 100644 --- a/Duplicati/Library/Backend/Tardigrade/packages.config +++ b/Duplicati/Library/Backend/Tardigrade/packages.config @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="uplink.NET" version="2.2.2" targetFramework="net462" /> + <package id="uplink.NET" version="2.3.1" targetFramework="net462" /> </packages>
\ No newline at end of file |