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

Various updates after the upgrade

Browse Source
This commit is contained in:
Kenneth Skovhede
2025-11-14 15:45:19 +01:00
parent 1ea74a3c63
commit 46428936c4
25 changed files with 57 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Duplicati.slnx
+1 -1
View File
@@ -28,7 +28,7 @@
<Project Path="Duplicati/Library/Backend/TencentCOS/Duplicati.Library.Backend.TencentCOS.csproj" />
<Project Path="Duplicati/Library/Backend/WEBDAV/Duplicati.Library.Backend.WEBDAV.csproj" />
</Folder>
<Folder Name="/Executables/Implementation/">
<Folder Name="/Executables/Implementation/">
<Project Path="Duplicati/Agent/Duplicati.Agent.csproj" />
<Project Path="Duplicati/CommandLine/BackendTester/Duplicati.CommandLine.BackendTester.csproj" />
<Project Path="Duplicati/CommandLine/BackendTool/Duplicati.CommandLine.BackendTool.csproj" />
Duplicati/Library/Interface/Duplicati.Library.Interface.csproj
-4
View File
@@ -12,8 +12,4 @@
<ProjectReference Include="..\Localization\Duplicati.Library.Localization.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Linq.Async" Version="6.0.3" />
</ItemGroup>
</Project>
Duplicati/Library/Main/Operation/Backup/FileEnumerationProcess.cs
+11 -1
View File
@@ -119,7 +119,17 @@ namespace Duplicati.Library.Main.Operation.Backup
}
}
}
worklist = ExpandSources(changedfilelist).WhereAwait(FilterEntry);
async IAsyncEnumerable<ISourceProviderEntry> FilterExpandedSources(IAsyncEnumerable<ISourceProviderEntry> source)
{
await foreach (var entry in source.ConfigureAwait(false))
{
if (await FilterEntry(entry).ConfigureAwait(false))
yield return entry;
}
}
worklist = FilterExpandedSources(ExpandSources(changedfilelist));
}
else if (journalService != null)
{
Duplicati/Library/Main/Operation/BackupHandler.cs
+3 -3
View File
@@ -232,7 +232,7 @@ namespace Duplicati.Library.Main.Operation
// all of the local database classes handle this), as the constructor
// is not async and shouldn't be executing "heavy" code, such as
// database queries.
var journalData = m_database.GetChangeJournalData(lastfilesetid, m_taskReader.ProgressToken).ToEnumerable();
var journalData = m_database.GetChangeJournalData(lastfilesetid, m_taskReader.ProgressToken).ToBlockingEnumerable();
var service = new UsnJournalService(fileProvider.SnapshotService, filter, m_options.FileAttributeFilter, m_options.SkipFilesLargerThan,
journalData, cancellationTokenSource.Token);
@@ -586,11 +586,11 @@ namespace Duplicati.Library.Main.Operation
.ConfigureAwait(false);
// Calculate the number of samples to test, using the largest number of file of a given type
long remoteVolumeCount = await m_database
var remoteVolumeCount = await m_database
.GetRemoteVolumes(m_result.TaskControl.ProgressToken)
.Where(x => x.State == RemoteVolumeState.Verified)
.GroupBy(x => x.Type)
.SelectAwait(async x => await x.LongCountAsync())
.Select(x => x.LongCount())
.MaxAsync()
.ConfigureAwait(false);
Duplicati/Library/Main/Operation/FilelistProcessor.cs
+1 -1
View File
@@ -222,7 +222,7 @@ namespace Duplicati.Library.Main.Operation
s.Serialize(stream,
db.GetRemoteVolumes(cancellationToken)
.Where(x => x.State != RemoteVolumeState.Temporary)
.ToEnumerable()
.ToBlockingEnumerable()
.Cast<IRemoteVolume>()
.ToArray()
);
Duplicati/Library/Main/Operation/ListChangesHandler.cs
+1 -1
View File
@@ -188,7 +188,7 @@ namespace Duplicati.Library.Main.Operation
);
if (callback != null)
callback(m_result, lst.ToEnumerable());
callback(m_result, lst.ToBlockingEnumerable());
return;
}
Duplicati/Library/Main/Operation/ListFolderHandler.cs
+1 -1
View File
@@ -73,7 +73,7 @@ internal static class ListFolderHandler
{
result.Entries = await db
.ListFolder(
db.GetPrefixIds(folders, result.TaskControl.ProgressToken).ToEnumerable(),
db.GetPrefixIds(folders, result.TaskControl.ProgressToken).ToBlockingEnumerable(),
filesetIds[0],
offset,
limit,
Executables/Duplicati.Agent/Duplicati.Agent.csproj
+3 -3
View File
@@ -5,12 +5,12 @@
<TargetFramework>net10.0</TargetFramework>
<Description>The Duplicati Agent implementation</Description>
<Copyright>Copyright © 2025 Team Duplicati, MIT license</Copyright>
<ApplicationIcon>..\..\..\Duplicati\GUI\Duplicati.GUI.TrayIcon\Duplicati.ico</ApplicationIcon>
<ApplicationIcon>..\..\Duplicati\GUI\Duplicati.GUI.TrayIcon\Duplicati.ico</ApplicationIcon>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Duplicati\Agent\Duplicati.Agent.csproj" />
<ProjectReference Include="..\..\..\Duplicati\Library\Crashlog\Duplicati.Library.Crashlog.csproj" />
<ProjectReference Include="../../Duplicati/Agent/Duplicati.Agent.csproj" />
<ProjectReference Include="../../Duplicati/Library/Crashlog/Duplicati.Library.Crashlog.csproj" />
</ItemGroup>
</Project>
Executables/Duplicati.CommandLine.AutoUpdater/Duplicati.CommandLine.AutoUpdater.csproj
+2 -2
View File
@@ -8,8 +8,8 @@
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Duplicati\Library\AutoUpdater\Duplicati.Library.AutoUpdater.csproj" />
<ProjectReference Include="..\..\..\Duplicati\Library\Crashlog\Duplicati.Library.Crashlog.csproj" />
<ProjectReference Include="..\..\Duplicati\Library\AutoUpdater\Duplicati.Library.AutoUpdater.csproj" />
<ProjectReference Include="..\..\Duplicati\Library\Crashlog\Duplicati.Library.Crashlog.csproj" />
</ItemGroup>
</Project>
Executables/Duplicati.CommandLine.BackendTester/Duplicati.CommandLine.BackendTester.csproj
+2 -2
View File
@@ -8,8 +8,8 @@
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Duplicati\CommandLine\BackendTester\Duplicati.CommandLine.BackendTester.csproj" />
<ProjectReference Include="..\..\..\Duplicati\Library\Crashlog\Duplicati.Library.Crashlog.csproj" />
<ProjectReference Include="..\..\Duplicati\CommandLine\BackendTester\Duplicati.CommandLine.BackendTester.csproj" />
<ProjectReference Include="..\..\Duplicati\Library\Crashlog\Duplicati.Library.Crashlog.csproj" />
</ItemGroup>
</Project>
Executables/Duplicati.CommandLine.BackendTool/Duplicati.CommandLine.BackendTool.csproj
+2 -2
View File
@@ -8,8 +8,8 @@
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Duplicati\CommandLine\BackendTool\Duplicati.CommandLine.BackendTool.csproj" />
<ProjectReference Include="..\..\..\Duplicati\Library\Crashlog\Duplicati.Library.Crashlog.csproj" />
<ProjectReference Include="..\..\Duplicati\CommandLine\BackendTool\Duplicati.CommandLine.BackendTool.csproj" />
<ProjectReference Include="..\..\Duplicati\Library\Crashlog\Duplicati.Library.Crashlog.csproj" />
</ItemGroup>
</Project>
Executables/Duplicati.CommandLine.DatabaseTool/Duplicati.CommandLine.DatabaseTool.csproj
+2 -2
View File
@@ -8,8 +8,8 @@
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Duplicati\Library\Crashlog\Duplicati.Library.Crashlog.csproj" />
<ProjectReference Include="..\..\..\Duplicati\CommandLine\DatabaseTool\Duplicati.CommandLine.DatabaseTool.csproj" />
<ProjectReference Include="..\..\Duplicati\Library\Crashlog\Duplicati.Library.Crashlog.csproj" />
<ProjectReference Include="..\..\Duplicati\CommandLine\DatabaseTool\Duplicati.CommandLine.DatabaseTool.csproj" />
</ItemGroup>
</Project>
Executables/Duplicati.CommandLine.RecoveryTool/Duplicati.CommandLine.RecoveryTool.csproj
+2 -2
View File
@@ -8,8 +8,8 @@
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Duplicati\CommandLine\RecoveryTool\Duplicati.CommandLine.RecoveryTool.csproj" />
<ProjectReference Include="..\..\..\Duplicati\Library\Crashlog\Duplicati.Library.Crashlog.csproj" />
<ProjectReference Include="..\..\Duplicati\CommandLine\RecoveryTool\Duplicati.CommandLine.RecoveryTool.csproj" />
<ProjectReference Include="..\..\Duplicati\Library\Crashlog\Duplicati.Library.Crashlog.csproj" />
</ItemGroup>
</Project>
Executables/Duplicati.CommandLine.SecretTool/Duplicati.CommandLine.SecretTool.csproj
+2 -2
View File
@@ -8,8 +8,8 @@
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Duplicati\CommandLine\SecretTool\Duplicati.CommandLine.SecretTool.csproj" />
<ProjectReference Include="..\..\..\Duplicati\Library\Crashlog\Duplicati.Library.Crashlog.csproj" />
<ProjectReference Include="..\..\Duplicati\CommandLine\SecretTool\Duplicati.CommandLine.SecretTool.csproj" />
<ProjectReference Include="..\..\Duplicati\Library\Crashlog\Duplicati.Library.Crashlog.csproj" />
</ItemGroup>
</Project>
Executables/Duplicati.CommandLine.ServerUtil/Duplicati.CommandLine.ServerUtil.csproj
+2 -2
View File
@@ -8,8 +8,8 @@
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Duplicati\CommandLine\ServerUtil\Duplicati.CommandLine.ServerUtil.csproj" />
<ProjectReference Include="..\..\..\Duplicati\Library\Crashlog\Duplicati.Library.Crashlog.csproj" />
<ProjectReference Include="..\..\Duplicati\CommandLine\ServerUtil\Duplicati.CommandLine.ServerUtil.csproj" />
<ProjectReference Include="..\..\Duplicati\Library\Crashlog\Duplicati.Library.Crashlog.csproj" />
</ItemGroup>
</Project>
Executables/Duplicati.CommandLine.SharpAESCrypt/Duplicati.CommandLine.SharpAESCrypt.csproj
+2 -2
View File
@@ -9,8 +9,8 @@
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Duplicati\Library\Encryption\Duplicati.Library.Encryption.csproj" />
<ProjectReference Include="..\..\..\Duplicati\Library\Crashlog\Duplicati.Library.Crashlog.csproj" />
<ProjectReference Include="..\..\Duplicati\Library\Encryption\Duplicati.Library.Encryption.csproj" />
<ProjectReference Include="..\..\Duplicati\Library\Crashlog\Duplicati.Library.Crashlog.csproj" />
</ItemGroup>
</Project>
Executables/Duplicati.CommandLine.Snapshots/Duplicati.CommandLine.Snapshots.csproj
+2 -2
View File
@@ -9,8 +9,8 @@
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Duplicati\Library\Snapshots\Duplicati.Library.Snapshots.csproj" />
<ProjectReference Include="..\..\..\Duplicati\Library\Crashlog\Duplicati.Library.Crashlog.csproj" />
<ProjectReference Include="..\..\Duplicati\Library\Snapshots\Duplicati.Library.Snapshots.csproj" />
<ProjectReference Include="..\..\Duplicati\Library\Crashlog\Duplicati.Library.Crashlog.csproj" />
</ItemGroup>
</Project>
Executables/Duplicati.CommandLine.SourceTool/Duplicati.CommandLine.SourceTool.csproj
+2 -2
View File
@@ -8,8 +8,8 @@
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Duplicati\Library\Crashlog\Duplicati.Library.Crashlog.csproj" />
<ProjectReference Include="..\..\..\Duplicati\CommandLine\SourceTool\Duplicati.CommandLine.SourceTool.csproj" />
<ProjectReference Include="..\..\Duplicati\Library\Crashlog\Duplicati.Library.Crashlog.csproj" />
<ProjectReference Include="..\..\Duplicati\CommandLine\SourceTool\Duplicati.CommandLine.SourceTool.csproj" />
</ItemGroup>
</Project>
Executables/Duplicati.CommandLine.SyncTool/Duplicati.CommandLine.SyncTool.csproj
+2 -2
View File
@@ -8,8 +8,8 @@
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Duplicati\Library\Crashlog\Duplicati.Library.Crashlog.csproj" />
<ProjectReference Include="..\..\..\Tools\RemoteSynchronization\RemoteSynchronization.csproj" />
<ProjectReference Include="..\..\Duplicati\Library\Crashlog\Duplicati.Library.Crashlog.csproj" />
<ProjectReference Include="..\..\Tools\RemoteSynchronization\RemoteSynchronization.csproj" />
</ItemGroup>
</Project>
Executables/Duplicati.CommandLine/Duplicati.CommandLine.csproj
+2 -2
View File
@@ -8,8 +8,8 @@
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Duplicati\CommandLine\CLI\Duplicati.CommandLine.csproj" />
<ProjectReference Include="..\..\..\Duplicati\Library\Crashlog\Duplicati.Library.Crashlog.csproj" />
<ProjectReference Include="..\..\Duplicati\CommandLine\CLI\Duplicati.CommandLine.csproj" />
<ProjectReference Include="..\..\Duplicati\Library\Crashlog\Duplicati.Library.Crashlog.csproj" />
</ItemGroup>
</Project>
Executables/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj
+4 -4
View File
@@ -4,7 +4,7 @@
<OutputType>WinExe</OutputType>
<TargetFramework>net10.0</TargetFramework>
<Description>The Duplicati Tray implementation</Description>
<ApplicationIcon>..\..\..\Duplicati\GUI\Duplicati.GUI.TrayIcon\Duplicati.ico</ApplicationIcon>
<ApplicationIcon>..\..\Duplicati\GUI\Duplicati.GUI.TrayIcon\Duplicati.ico</ApplicationIcon>
<Copyright>Copyright © 2025 Team Duplicati, MIT license</Copyright>
</PropertyGroup>
@@ -23,15 +23,15 @@
<!-- Copy in WindowsModules for easier debug, or if we are targeting Windows -->
<Target Name="CopyWindowsModulesRuntime" AfterTargets="Build" Condition="'$(_CopyWinModules)' == 'True'">
<ItemGroup>
<_WinMods Include="..\..\..\Duplicati\Library\WindowsModules\bin\$(Configuration)\net10.0-windows7.0\**\*.dll" />
<_WinMods Include="..\..\Duplicati\Library\WindowsModules\bin\$(Configuration)\net10.0-windows7.0\**\*.dll" />
</ItemGroup>
<Copy SourceFiles="@(_WinMods)" DestinationFolder="$(OutDir)" SkipUnchangedFiles="true" />
</Target>
<ItemGroup>
<ProjectReference Include="..\..\..\Duplicati\GUI\Duplicati.GUI.TrayIcon\Duplicati.GUI.TrayIcon.csproj" />
<ProjectReference Include="..\..\..\Duplicati\Library\Crashlog\Duplicati.Library.Crashlog.csproj" />
<ProjectReference Include="..\..\Duplicati\GUI\Duplicati.GUI.TrayIcon\Duplicati.GUI.TrayIcon.csproj" />
<ProjectReference Include="..\..\Duplicati\Library\Crashlog\Duplicati.Library.Crashlog.csproj" />
</ItemGroup>
</Project>
Executables/Duplicati.Server/Duplicati.Server.csproj
+2 -2
View File
@@ -8,8 +8,8 @@
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Duplicati\Server\Duplicati.Server.csproj" />
<ProjectReference Include="..\..\..\Duplicati\Library\Crashlog\Duplicati.Library.Crashlog.csproj" />
<ProjectReference Include="..\..\Duplicati\Server\Duplicati.Server.csproj" />
<ProjectReference Include="..\..\Duplicati\Library\Crashlog\Duplicati.Library.Crashlog.csproj" />
</ItemGroup>
</Project>
Executables/Duplicati.Service/Duplicati.Service.csproj
+2 -2
View File
@@ -8,8 +8,8 @@
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Duplicati\Service\Duplicati.Service.csproj" />
<ProjectReference Include="..\..\..\Duplicati\Library\Crashlog\Duplicati.Library.Crashlog.csproj" />
<ProjectReference Include="..\..\Duplicati\Service\Duplicati.Service.csproj" />
<ProjectReference Include="..\..\Duplicati\Library\Crashlog\Duplicati.Library.Crashlog.csproj" />
</ItemGroup>
</Project>
Executables/Duplicati.WindowsModulesLoader/Duplicati.WindowsModulesLoader.csproj
+2 -2
View File
@@ -9,8 +9,8 @@
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Duplicati\Library\WindowsModules\Duplicati.Library.WindowsModules.csproj" />
<ProjectReference Include="..\..\..\Duplicati\Library\Snapshots\Duplicati.Library.Snapshots.csproj" />
<ProjectReference Include="..\..\Duplicati\Library\WindowsModules\Duplicati.Library.WindowsModules.csproj" />
<ProjectReference Include="..\..\Duplicati\Library\Snapshots\Duplicati.Library.Snapshots.csproj" />
</ItemGroup>
</Project>
Executables/Duplicati.WindowsService/Duplicati.WindowsService.csproj
+2 -2
View File
@@ -9,8 +9,8 @@
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Duplicati\WindowsService\Duplicati.WindowsService.csproj" />
<ProjectReference Include="..\..\..\Duplicati\Library\Crashlog\Duplicati.Library.Crashlog.csproj" />
<ProjectReference Include="..\..\Duplicati\WindowsService\Duplicati.WindowsService.csproj" />
<ProjectReference Include="..\..\Duplicati\Library\Crashlog\Duplicati.Library.Crashlog.csproj" />
</ItemGroup>
</Project>