Merge pull request #4203 from TopperDEL/tardigrade-path-correction
Move the tardigrad-library to the correct location
This commit is contained in:
warwickmm
+1
-1
@@ -101,7 +101,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.CommandLine.Confi
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.Library.Encryption", "Duplicati\Library\Encryption\Duplicati.Library.Encryption.csproj", "{2CF2D90E-C25B-47AD-91E0-98451BAB8058}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.Library.Backend.Tardigrade", "Duplicati.Library.Backend.Tardigrade\Duplicati.Library.Backend.Tardigrade.csproj", "{AE035E01-C917-4F13-A35E-78F21C1A2F17}"
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.Library.Backend.Tardigrade", "Duplicati\Library\Backend\Tardigrade\Duplicati.Library.Backend.Tardigrade.csproj", "{AE035E01-C917-4F13-A35E-78F21C1A2F17}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
|
||||
@@ -62,10 +62,6 @@
|
||||
</None>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\..\Duplicati.Library.Backend.Tardigrade\Duplicati.Library.Backend.Tardigrade.csproj">
|
||||
<Project>{ae035e01-c917-4f13-a35e-78f21c1a2f17}</Project>
|
||||
<Name>Duplicati.Library.Backend.Tardigrade</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\..\Library\Backend\AzureBlob\Duplicati.Library.Backend.AzureBlob.csproj">
|
||||
<Project>{8E4CECFB-0413-4B00-AB93-78D1C3902BD5}</Project>
|
||||
<Name>Duplicati.Library.Backend.AzureBlob</Name>
|
||||
@@ -90,6 +86,10 @@
|
||||
<Project>{32a74526-3e5f-413a-8cb4-1efdad4c8b91}</Project>
|
||||
<Name>Duplicati.Library.Backend.Sia</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\..\Library\Backend\Tardigrade\Duplicati.Library.Backend.Tardigrade.csproj">
|
||||
<Project>{ae035e01-c917-4f13-a35e-78f21c1a2f17}</Project>
|
||||
<Name>Duplicati.Library.Backend.Tardigrade</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\..\Library\Utility\Duplicati.Library.Utility.csproj">
|
||||
<Project>{DE3E5D4C-51AB-4E5E-BEE8-E636CEBFBA65}</Project>
|
||||
<Name>Duplicati.Library.Utility</Name>
|
||||
|
||||
@@ -169,10 +169,6 @@
|
||||
<EmbeddedResource Include="Resources\context_menu_quit.ico" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\..\Duplicati.Library.Backend.Tardigrade\Duplicati.Library.Backend.Tardigrade.csproj">
|
||||
<Project>{ae035e01-c917-4f13-a35e-78f21c1a2f17}</Project>
|
||||
<Name>Duplicati.Library.Backend.Tardigrade</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\..\CommandLine\ConfigurationImporter\Duplicati.CommandLine.ConfigurationImporter.csproj">
|
||||
<Project>{b93e3bf0-daa7-49b7-b07d-0559c5816735}</Project>
|
||||
<Name>Duplicati.CommandLine.ConfigurationImporter</Name>
|
||||
@@ -221,6 +217,10 @@
|
||||
<Project>{C0270709-2A40-43B5-8CF1-69581B9FA2A1}</Project>
|
||||
<Name>Duplicati.Library.Backend.TahoeLAFS</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\..\Library\Backend\Tardigrade\Duplicati.Library.Backend.Tardigrade.csproj">
|
||||
<Project>{ae035e01-c917-4f13-a35e-78f21c1a2f17}</Project>
|
||||
<Name>Duplicati.Library.Backend.Tardigrade</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\..\Library\Backend\WEBDAV\Duplicati.Library.Backend.WEBDAV.csproj">
|
||||
<Project>{BAE27510-8B5D-44B2-B33E-372A98908041}</Project>
|
||||
<Name>Duplicati.Library.Backend.WEBDAV</Name>
|
||||
|
||||
+8
-8
@@ -42,8 +42,8 @@
|
||||
<Reference Include="System.Data" />
|
||||
<Reference Include="System.Net.Http" />
|
||||
<Reference Include="System.Xml" />
|
||||
<Reference Include="uplink.NET, Version=2.1.3.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\uplink.NET.2.1.3\lib\netstandard2.0\uplink.NET.dll</HintPath>
|
||||
<Reference Include="uplink.NET, Version=2.1.5.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\..\..\packages\uplink.NET.2.1.5\lib\netstandard2.0\uplink.NET.dll</HintPath>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
@@ -54,19 +54,19 @@
|
||||
<Compile Include="TardigradeConfig.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Duplicati\Library\Common\Duplicati.Library.Common.csproj">
|
||||
<ProjectReference Include="..\..\Common\Duplicati.Library.Common.csproj">
|
||||
<Project>{d63e53e4-a458-4c2f-914d-92f715f58acf}</Project>
|
||||
<Name>Duplicati.Library.Common</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\Duplicati\Library\Interface\Duplicati.Library.Interface.csproj">
|
||||
<ProjectReference Include="..\..\Interface\Duplicati.Library.Interface.csproj">
|
||||
<Project>{c5899f45-b0ff-483c-9d38-24a9fcaab237}</Project>
|
||||
<Name>Duplicati.Library.Interface</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\Duplicati\Library\Localization\Duplicati.Library.Localization.csproj">
|
||||
<ProjectReference Include="..\..\Localization\Duplicati.Library.Localization.csproj">
|
||||
<Project>{b68f2214-951f-4f78-8488-66e1ed3f50bf}</Project>
|
||||
<Name>Duplicati.Library.Localization</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\Duplicati\Library\Utility\Duplicati.Library.Utility.csproj">
|
||||
<ProjectReference Include="..\..\Utility\Duplicati.Library.Utility.csproj">
|
||||
<Project>{de3e5d4c-51ab-4e5e-bee8-e636cebfba65}</Project>
|
||||
<Name>Duplicati.Library.Utility</Name>
|
||||
</ProjectReference>
|
||||
@@ -75,11 +75,11 @@
|
||||
<None Include="packages.config" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<Import Project="..\packages\uplink.NET.2.1.3\build\net40\uplink.NET.targets" Condition="Exists('..\packages\uplink.NET.2.1.3\build\net40\uplink.NET.targets')" />
|
||||
<Import Project="..\..\..\..\packages\uplink.NET.2.1.5\build\net40\uplink.NET.targets" Condition="Exists('..\..\..\..\packages\uplink.NET.2.1.5\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.1.3\build\net40\uplink.NET.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\uplink.NET.2.1.3\build\net40\uplink.NET.targets'))" />
|
||||
<Error Condition="!Exists('..\..\..\..\packages\uplink.NET.2.1.5\build\net40\uplink.NET.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\uplink.NET.2.1.5\build\net40\uplink.NET.targets'))" />
|
||||
</Target>
|
||||
</Project>
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="uplink.NET" version="2.1.3" targetFramework="net462" />
|
||||
<package id="uplink.NET" version="2.1.5" targetFramework="net462" />
|
||||
</packages>
|
||||
Reference in New Issue
Block a user