Skip to content

Misc improvements - 15/08 #175

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

Merged
paul-fresquet merged 8 commits into from
Aug 17, 2025
Merged

Misc improvements - 15/08 #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6eadc18
chore: improve StatusItemDataTemplate textblock min width
paul-fresquet Aug 15, 2025
c5befd7
build: update nugets
paul-fresquet Aug 16, 2025
03dd462
build: update nugets
paul-fresquet Aug 16, 2025
ad00d0a
refactor: cleanup
paul-fresquet Aug 16, 2025
291fd2b
refactor: cleanup
paul-fresquet Aug 16, 2025
6380d96
Merge branch 'master' into feat/misc-improvements-1508
paul-fresquet Aug 16, 2025
a601a0e
Merge branch 'master' into feat/misc-improvements-1508
paul-fresquet Aug 16, 2025
8d56479
build: restore mediatr 12.5.0
paul-fresquet Aug 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions src/ByteSync.Client/ByteSync.Client.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,50 +51,50 @@
</None>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Autofac" Version="8.3.0" />
<PackageReference Include="Autofac" Version="8.4.0" />
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="10.0.0" />
<PackageReference Include="Avalonia" Version="11.3.0" />
<PackageReference Include="Avalonia.Controls.DataGrid" Version="11.3.0" />
<PackageReference Include="Avalonia.Desktop" Version="11.3.0" />
<PackageReference Include="Avalonia.Diagnostics" Version="11.3.0" />
<PackageReference Include="Avalonia.ReactiveUI" Version="11.3.0" />
<PackageReference Include="Avalonia" Version="11.3.4" />
<PackageReference Include="Avalonia.Controls.DataGrid" Version="11.3.4" />
<PackageReference Include="Avalonia.Desktop" Version="11.3.4" />
<PackageReference Include="Avalonia.Diagnostics" Version="11.3.4" />
<PackageReference Include="Avalonia.ReactiveUI" Version="11.3.4" />
<PackageReference Include="Avalonia.Svg.Skia" Version="11.3.0" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.0" />
<PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.3.0" />
<PackageReference Include="Avalonia.Markup.Xaml.Loader" Version="11.3.0" />
<PackageReference Include="Azure.Storage.Blobs" Version="12.24.0" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.4" />
<PackageReference Include="Avalonia.Markup.Xaml.Loader" Version="11.3.4" />
<PackageReference Include="Azure.Storage.Blobs" Version="12.25.0" />
<PackageReference Include="DynamicData" Version="9.4.1" />
<PackageReference Include="FastRsyncNet" Version="2.4.3" />
<PackageReference Include="LiveChartsCore.SkiaSharpView.Avalonia" Version="2.0.0-beta.700" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.15" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.19" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.15" />
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.19" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3" />
<PackageReference Include="Polly" Version="8.4.2" />
<PackageReference Include="Polly" Version="8.6.2" />
<PackageReference Include="ReactiveMarbles.ObservableEvents.SourceGenerator" Version="1.3.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="ReactiveUI.Fody" Version="19.5.41" />
<PackageReference Include="Serilog" Version="4.2.0" />
<PackageReference Include="Serilog" Version="4.3.0" />
<PackageReference Include="Serilog.Extensions.Autofac.DependencyInjection" Version="5.0.0" />
<PackageReference Include="Serilog.Sinks.Async" Version="2.1.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
<PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
<PackageReference Include="SharpZipLib" Version="1.4.2" />
<PackageReference Include="SkiaSharp" Version="3.119.0" />
<PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="3.119.0" />
<PackageReference Include="SkiaSharp.NativeAssets.macOS" Version="3.119.0" />
<PackageReference Include="SkiaSharp.NativeAssets.Win32" Version="3.119.0" />
<PackageReference Include="Splat.Autofac" Version="15.3.1" />
<PackageReference Include="Splat.Serilog" Version="15.3.1" />
<PackageReference Include="Splat.Autofac" Version="15.4.1" />
<PackageReference Include="Splat.Serilog" Version="15.4.1" />
<PackageReference Include="System.Reactive" Version="6.0.1" />
<PackageReference Include="System.Security.Cryptography.Cng" Version="5.0.0" />
<PackageReference Include="System.Security.Cryptography.OpenSsl" Version="5.0.0" />
<PackageReference Update="Packaging.Targets" Version="0.1.232" />
<PackageReference Include="Xaml.Behaviors.Avalonia" Version="11.3.2" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ByteSync.Common\ByteSync.Common.csproj" />
Expand Down
13 changes: 4 additions & 9 deletions src/ByteSync.Client/Repositories/SharedActionsGroupRepository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System.Threading.Tasks;
using ByteSync.Business.Actions.Shared;
using ByteSync.Business.Actions.Shared;
using ByteSync.Common.Business.Actions;
using ByteSync.Common.Business.Synchronizations;
using ByteSync.Interfaces.Repositories;
Expand All @@ -17,25 +16,21 @@ public SharedActionsGroupRepository(ISessionInvalidationCachePolicy<SharedAction
{
_logger = logger;

OrganizedSharedActionsGroups = new List<SharedActionsGroup>();
OrganizedSharedActionsGroups = [];

_sessionInvalidationCachePolicy = sessionInvalidationCachePolicy;
_sessionInvalidationCachePolicy.Initialize(SourceCache, true, true);
}

protected override string KeySelector(SharedActionsGroup sharedAtomicAction) => sharedAtomicAction.ActionsGroupId;

public IObservableCache<SharedActionsGroup, string> SharedActionsGroups => ObservableCache;

public IEnumerable<SharedActionsGroup> SharedActionsGroupsList => SourceCache.Items;

public List<SharedActionsGroup> OrganizedSharedActionsGroups { get; private set; }

public List<ActionsGroupDefinition> GetActionsGroupsDefinitions()
{
List<ActionsGroupDefinition> result = new List<ActionsGroupDefinition>();
List<ActionsGroupDefinition> result = [];

foreach (var sharedActionsGroup in SharedActionsGroupsList)
foreach (var sharedActionsGroup in SourceCache.Items)
{
result.Add(sharedActionsGroup.GetDefinition());
}
Expand Down
2 changes: 1 addition & 1 deletion src/ByteSync.Client/Views/Sessions/Comparisons/Results/ContentRepartitionView.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<Grid.ColumnDefinitions>
<ColumnDefinition SharedSizeGroup="StatusCell" />
</Grid.ColumnDefinitions>
<TextBlock Text="{Binding Letter}"
<TextBlock MinWidth="20" Text="{Binding Letter}" TextAlignment="Center"
HorizontalAlignment="Center" VerticalAlignment="Center"
Margin="2 0"
FontWeight="Bold" Foreground="{Binding ForeBrush}" />
Expand Down
4 changes: 2 additions & 2 deletions src/ByteSync.Common/ByteSync.Common.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3" />
<PackageReference Include="Serilog" Version="4.2.0" />
<PackageReference Include="System.IO.Abstractions" Version="22.0.14" />
<PackageReference Include="Serilog" Version="4.3.0" />
<PackageReference Include="System.IO.Abstractions" Version="22.0.15" />
</ItemGroup>

</Project>
12 changes: 6 additions & 6 deletions src/ByteSync.Functions/ByteSync.Functions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
<UserSecretsId>fad123b6-a5bb-4773-8a56-3af68f41292c</UserSecretsId>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Autofac" Version="8.3.0" />
<PackageReference Include="Autofac" Version="8.4.0" />
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="10.0.0" />
<PackageReference Include="Azure.Identity" Version="1.13.2" />
<PackageReference Include="Azure.Identity" Version="1.15.0" />
<PackageReference Include="MediatR" Version="12.5.0" />
<PackageReference Include="Microsoft.ApplicationInsights.WorkerService" Version="2.23.0" />
<PackageReference Include="Microsoft.Azure.Functions.Worker" Version="1.23.0" />
Expand All @@ -20,14 +20,14 @@
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Timer" Version="4.3.1" />
<PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.18.1" />
<PackageReference Include="Microsoft.Azure.AppConfiguration.AspNetCore" Version="8.1.2" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.15" />
<PackageReference Include="Microsoft.Azure.SignalR" Version="1.30.3" />
<PackageReference Include="Microsoft.Azure.SignalR.Management" Version="1.30.3" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.19" />
<PackageReference Include="Microsoft.Azure.SignalR" Version="1.31.0" />
<PackageReference Include="Microsoft.Azure.SignalR.Management" Version="1.31.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3" />
<PackageReference Include="RedLock.net" Version="2.3.2" />
<PackageReference Include="StackExchange.Redis" Version="2.8.37" />
<PackageReference Include="StackExchange.Redis" Version="2.8.58" />
</ItemGroup>
<ItemGroup>
<None Update="host.json">
Expand Down
16 changes: 8 additions & 8 deletions src/ByteSync.ServerCommon/ByteSync.ServerCommon.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,20 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AWSSDK.S3" Version="4.0.6.2" />
<PackageReference Include="Azure.Identity" Version="1.13.2" />
<PackageReference Include="Azure.Storage.Blobs" Version="12.24.0" />
<PackageReference Include="AWSSDK.S3" Version="4.0.6.6" />
<PackageReference Include="Azure.Identity" Version="1.15.0" />
<PackageReference Include="Azure.Storage.Blobs" Version="12.25.0" />
<PackageReference Include="MediatR" Version="12.5.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.15" />
<PackageReference Include="Microsoft.Azure.SignalR" Version="1.30.3" />
<PackageReference Include="Microsoft.Azure.SignalR.Management" Version="1.30.3" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.19" />
<PackageReference Include="Microsoft.Azure.SignalR" Version="1.31.0" />
<PackageReference Include="Microsoft.Azure.SignalR.Management" Version="1.31.0" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3" />
<PackageReference Include="Polly" Version="8.5.2" />
<PackageReference Include="Polly" Version="8.6.2" />
<PackageReference Include="RedLock.net" Version="2.3.2" />
<PackageReference Include="StackExchange.Redis" Version="2.8.37" />
<PackageReference Include="StackExchange.Redis" Version="2.8.58" />
</ItemGroup>

<ItemGroup>
Expand Down
10 changes: 5 additions & 5 deletions tests/ByteSync.Client.IntegrationTests/ByteSync.Client.IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,20 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Autofac" Version="8.3.0" />
<PackageReference Include="Autofac" Version="8.4.0" />
<PackageReference Include="coverlet.collector" Version="6.0.4">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="AwesomeAssertions" Version="8.0.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="NUnit" Version="4.3.2" />
<PackageReference Include="NUnit.Analyzers" Version="4.7.0">
<PackageReference Include="NUnit" Version="4.4.0" />
<PackageReference Include="NUnit.Analyzers" Version="4.10.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
<PackageReference Include="NUnit3TestAdapter" Version="5.1.0" />
</ItemGroup>

<ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions tests/ByteSync.Client.Tests/ByteSync.Client.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@
<ItemGroup>
<PackageReference Include="AwesomeAssertions" Version="8.0.1" />
<PackageReference Include="DynamicData" Version="9.4.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="NUnit" Version="4.3.2" />
<PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
<PackageReference Include="NUnit" Version="4.4.0" />
<PackageReference Include="NUnit3TestAdapter" Version="5.1.0" />
<PackageReference Include="coverlet.collector" Version="6.0.4">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="ReactiveUI.Testing" Version="20.1.63" />
<PackageReference Include="ReactiveUI.Testing" Version="20.4.1" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions tests/ByteSync.Common.Tests/ByteSync.Common.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@

<ItemGroup>
<PackageReference Include="AwesomeAssertions" Version="8.0.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="NUnit" Version="4.3.2" />
<PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
<PackageReference Include="NUnit" Version="4.4.0" />
<PackageReference Include="NUnit3TestAdapter" Version="5.1.0" />
</ItemGroup>

<ItemGroup>
Expand Down
10 changes: 5 additions & 5 deletions tests/ByteSync.Functions.IntegrationTests/ByteSync.Functions.IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Autofac" Version="8.3.0" />
<PackageReference Include="Autofac" Version="8.4.0" />
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="10.0.0" />
<PackageReference Include="FakeItEasy" Version="8.3.0" />
<PackageReference Include="AwesomeAssertions" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
<PackageReference Include="NUnit" Version="4.2.2" />
<PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
<PackageReference Include="NUnit.Analyzers" Version="4.7.0">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageReference Include="NUnit" Version="4.4.0" />
<PackageReference Include="NUnit3TestAdapter" Version="5.1.0" />
<PackageReference Include="NUnit.Analyzers" Version="4.10.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
11 changes: 6 additions & 5 deletions tests/ByteSync.Functions.UnitTests/ByteSync.Functions.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,17 @@

<ItemGroup>
<PackageReference Include="AwesomeAssertions" Version="8.0.1" />
<PackageReference Include="Microsoft.Azure.SignalR" Version="1.30.3" />
<PackageReference Include="Azure.Identity" Version="1.15.0" />
<PackageReference Include="Microsoft.Azure.SignalR" Version="1.31.0" />
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Timer" Version="4.3.1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="NUnit" Version="4.3.2" />
<PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
<PackageReference Include="NUnit.Analyzers" Version="4.7.0">
<PackageReference Include="NUnit" Version="4.4.0" />
<PackageReference Include="NUnit3TestAdapter" Version="5.1.0" />
<PackageReference Include="NUnit.Analyzers" Version="4.10.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
12 changes: 6 additions & 6 deletions tests/ByteSync.ServerCommon.Tests/ByteSync.ServerCommon.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AWSSDK.S3" Version="4.0.6.2" />
<PackageReference Include="Azure.Identity" Version="1.13.2" />
<PackageReference Include="AWSSDK.S3" Version="4.0.6.6" />
<PackageReference Include="Azure.Identity" Version="1.15.0" />
<PackageReference Include="FakeItEasy" Version="8.3.0" />
<PackageReference Include="AwesomeAssertions" Version="8.0.1" />
<PackageReference Include="Microsoft.Azure.AppConfiguration.AspNetCore" Version="8.1.2" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
<PackageReference Include="NUnit" Version="4.3.2" />
<PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
<PackageReference Include="NUnit.Analyzers" Version="4.7.0">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageReference Include="NUnit" Version="4.4.0" />
<PackageReference Include="NUnit3TestAdapter" Version="5.1.0" />
<PackageReference Include="NUnit.Analyzers" Version="4.10.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
6 changes: 3 additions & 3 deletions tests/ByteSync.TestsCommon/ByteSync.TestsCommon.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.15" />
<PackageReference Include="Autofac" Version="8.3.0" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.19" />
<PackageReference Include="Autofac" Version="8.4.0" />
<PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="NUnit" Version="4.3.2" />
<PackageReference Include="NUnit" Version="4.4.0" />
</ItemGroup>

</Project>
Loading