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

buildable again

Browse Source
This commit is contained in:
Max
2020-05-31 14:38:14 +02:00
parent c882953fdd
commit 3f2eb254c3
11 changed files with 38 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Duplicati.sln
+4
View File
@@ -311,6 +311,10 @@ Global
{4D1B198B-F773-44F2-872B-2B283053323C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4D1B198B-F773-44F2-872B-2B283053323C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4D1B198B-F773-44F2-872B-2B283053323C}.Release|Any CPU.Build.0 = Release|Any CPU
{AE035E01-C917-4F13-A35E-78F21C1A2F17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AE035E01-C917-4F13-A35E-78F21C1A2F17}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AE035E01-C917-4F13-A35E-78F21C1A2F17}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AE035E01-C917-4F13-A35E-78F21C1A2F17}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Duplicati/CommandLine/BackendTool/Duplicati.CommandLine.BackendTool.csproj
+2 -8
View File
@@ -20,15 +20,9 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<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 Include="..\..\Library\Backend\Tardigrade\Duplicati.Library.Backend.Tardigrade.csproj">
</ProjectReference>
<ProjectReference Include="..\..\Library\Backend\CloudFiles\Duplicati.Library.Backend.CloudFiles.csproj">
</ProjectReference>
Duplicati/CommandLine/Duplicati.CommandLine.csproj
-2
View File
@@ -97,8 +97,6 @@
<ProjectReference Include="..\Tools\Duplicati.Tools.csproj">
</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>
</ItemGroup>
Duplicati/CommandLine/RecoveryTool/Duplicati.CommandLine.RecoveryTool.csproj
-2
View File
@@ -80,8 +80,6 @@
<ProjectReference Include="..\..\Library\Backend\Dropbox\Duplicati.Library.Backend.Dropbox.csproj">
</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>
</ItemGroup>
Duplicati/Library/Backend/Tardigrade/Duplicati.Library.Backend.Tardigrade.csproj
+24 -78
View File
@@ -1,85 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{AE035E01-C917-4F13-A35E-78F21C1A2F17}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Duplicati.Library.Backend.Tardigrade</RootNamespace>
<AssemblyName>Duplicati.Library.Backend.Tardigrade</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<TargetFramework>netstandard2.1</TargetFramework>
<Version>2.0.0.7</Version>
<Copyright>LGPL, Copyright © Duplicati Team 2015</Copyright>
<Product>Duplicati.Library.Backend.Tardigrade</Product>
<Company>Duplicati Team</Company>
<Authors>Duplicati Team</Authors>
<Description>Tardigrade backend for Duplicati</Description>
<PackageId>Tardigrade</PackageId>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
<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>
<PackageReference Include="Microsoft.DotNet.Analyzers.Compatibility" Version="0.2.12-alpha">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="uplink.NET" Version="2.1.5" />
</ItemGroup>
<ItemGroup>
<Compile Include="TardigradeFile.cs" />
<Compile Include="Strings.cs" />
<Compile Include="TardigradeBackend.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="TardigradeConfig.cs" />
<ProjectReference Include="..\..\Interface\Duplicati.Library.Interface.csproj" />
<ProjectReference Include="..\..\Common\Duplicati.Library.Common.csproj" />
<ProjectReference Include="..\..\Localization\Duplicati.Library.Localization.csproj" />
<ProjectReference Include="..\..\Utility\Duplicati.Library.Utility.csproj" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Common\Duplicati.Library.Common.csproj">
<Project>{d63e53e4-a458-4c2f-914d-92f715f58acf}</Project>
<Name>Duplicati.Library.Common</Name>
</ProjectReference>
<ProjectReference Include="..\..\Interface\Duplicati.Library.Interface.csproj">
<Project>{c5899f45-b0ff-483c-9d38-24a9fcaab237}</Project>
<Name>Duplicati.Library.Interface</Name>
</ProjectReference>
<ProjectReference Include="..\..\Localization\Duplicati.Library.Localization.csproj">
<Project>{b68f2214-951f-4f78-8488-66e1ed3f50bf}</Project>
<Name>Duplicati.Library.Localization</Name>
</ProjectReference>
<ProjectReference Include="..\..\Utility\Duplicati.Library.Utility.csproj">
<Project>{de3e5d4c-51ab-4e5e-bee8-e636cebfba65}</Project>
<Name>Duplicati.Library.Utility</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.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.5\build\net40\uplink.NET.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\uplink.NET.2.1.5\build\net40\uplink.NET.targets'))" />
</Target>
</Project>
Duplicati/Library/Backend/Tardigrade/Properties/AssemblyInfo.cs
-36
View File
@@ -1,36 +0,0 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// Allgemeine Informationen über eine Assembly werden über die folgenden
// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
// die einer Assembly zugeordnet sind.
[assembly: AssemblyTitle("Duplicati.Library.Backend.Tardigrade")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Duplicati.Library.Backend.Tardigrade")]
[assembly: AssemblyCopyright("Copyright © 2020")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Durch Festlegen von ComVisible auf FALSE werden die Typen in dieser Assembly
// für COM-Komponenten unsichtbar. Wenn Sie auf einen Typ in dieser Assembly von
// COM aus zugreifen müssen, sollten Sie das ComVisible-Attribut für diesen Typ auf "True" festlegen.
[assembly: ComVisible(false)]
// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird
[assembly: Guid("ae035e01-c917-4f13-a35e-78f21c1a2f17")]
// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
//
// Hauptversion
// Nebenversion
// Buildnummer
// Revision
//
// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
// indem Sie "*" wie unten gezeigt eingeben:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
Duplicati/Library/Backend/Tardigrade/packages.config
-4
View File
@@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="uplink.NET" version="2.1.5" targetFramework="net462" />
</packages>
Duplicati/Library/Main/BackendManager.cs
+3 -3
View File
@@ -654,10 +654,10 @@ namespace Duplicati.Library.Main
item.IndexfileUpdated = true;
}
var hashsize = HashAlgorithm.Create(m_options.BlockHashAlgorithm).HashSize / 8;
using (IndexVolumeWriter wr = new IndexVolumeWriter(m_options))
IndexVolumeWriter wr = null;
try
{
var hashsize = HashAlgorithmHelper.Create(m_options.BlockHashAlgorithm).HashSize / 8;
var hashsize = HashAlgorithm.Create(m_options.BlockHashAlgorithm).HashSize / 8;
wr = new IndexVolumeWriter(m_options);
using (var rd = new IndexVolumeReader(p.CompressionModule, item.Indexfile.Item2.LocalFilename, m_options, hashsize))
wr.CopyFrom(rd, x => x == oldname ? newname : x);
Duplicati/Library/Main/Duplicati.Library.Main.csproj
+1 -8
View File
@@ -59,14 +59,7 @@
<EmbeddedResource Include="Database\Database schema\10. Add IsFullBackup to Fileset table.sql" />
<EmbeddedResource Include="Database\Database schema\11. Add Block indices.sql" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<ItemGroup>
<Content Include="default_compressed_extensions.txt">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
Duplicati/Server/Duplicati.Server.csproj
+1 -3
View File
@@ -31,9 +31,7 @@
</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 Include="..\Library\Backend\Tardigrade\Duplicati.Library.Backend.Tardigrade.csproj">
</ProjectReference>
<ProjectReference Include="..\CommandLine\BackendTester\Duplicati.CommandLine.BackendTester.csproj">
</ProjectReference>
Duplicati/UnitTest/RestoreHandlerTests.cs
+3 -1
View File
@@ -4,6 +4,7 @@ using NUnit.Framework;
using System.Collections.Generic;
using System.IO;
using System.Security.AccessControl;
using Duplicati.Library.Common.IO;
namespace Duplicati.UnitTest
{
@@ -17,7 +18,7 @@ namespace Duplicati.UnitTest
{
return;
}
/* TODO-DNC
string folderPath = Path.Combine(this.DATAFOLDER, "folder");
Directory.CreateDirectory(folderPath);
string filePath = Path.Combine(folderPath, "file");
@@ -58,6 +59,7 @@ namespace Duplicati.UnitTest
FileSecurity restoredFileSecurity = File.GetAccessControl(restoredFilePath);
Assert.IsTrue(restoredFileSecurity.AreAccessRulesProtected);
}
*/
}
}
}