Skip to content

Commit 8da5fcb

Browse files
paul-fresquetpaul-fresquet
authored
[chore] Upgrade nugets 29-11-25 (#245)
1 parent 505c125 commit 8da5fcb

File tree

12 files changed

+88
-81
lines changed

12 files changed

+88
-81
lines changed

‎src/ByteSync.Client/ByteSync.Client.csproj‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -53,26 +53,26 @@
5353
<ItemGroup>
5454
<PackageReference Include="Autofac" Version="8.4.0" />
5555
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="10.0.0" />
56-
<PackageReference Include="Avalonia" Version="11.3.6"/>
57-
<PackageReference Include="Avalonia.Controls.DataGrid" Version="11.3.6"/>
58-
<PackageReference Include="Avalonia.Desktop" Version="11.3.6"/>
59-
<PackageReference Include="Avalonia.Diagnostics" Version="11.3.6"/>
60-
<PackageReference Include="Avalonia.ReactiveUI" Version="11.3.6"/>
56+
<PackageReference Include="Avalonia" Version="11.3.9"/>
57+
<PackageReference Include="Avalonia.Controls.DataGrid" Version="11.3.9"/>
58+
<PackageReference Include="Avalonia.Desktop" Version="11.3.9"/>
59+
<PackageReference Include="Avalonia.Diagnostics" Version="11.3.9"/>
60+
<PackageReference Include="Avalonia.ReactiveUI" Version="11.3.8"/>
6161
<PackageReference Include="Avalonia.Svg.Skia" Version="11.3.0" />
62-
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.6"/>
63-
<PackageReference Include="Avalonia.Markup.Xaml.Loader" Version="11.3.6"/>
64-
<PackageReference Include="Azure.Storage.Blobs" Version="12.25.0" />
62+
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.9"/>
63+
<PackageReference Include="Avalonia.Markup.Xaml.Loader" Version="11.3.9"/>
64+
<PackageReference Include="Azure.Storage.Blobs" Version="12.26.0"/>
6565
<PackageReference Include="DynamicData" Version="9.4.1" />
6666
<PackageReference Include="FastRsyncNet" Version="2.4.4"/>
6767
<PackageReference Include="LiveChartsCore.SkiaSharpView.Avalonia" Version="2.0.0-beta.700" />
68-
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.20"/>
68+
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.22"/>
6969
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
7070
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
7171
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
7272
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1" />
73-
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.20"/>
73+
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.22"/>
7474
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3" />
75-
<PackageReference Include="Polly" Version="8.6.2" />
75+
<PackageReference Include="Polly" Version="8.6.5"/>
7676
<PackageReference Include="ReactiveMarbles.ObservableEvents.SourceGenerator" Version="1.3.1">
7777
<PrivateAssets>all</PrivateAssets>
7878
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -81,20 +81,21 @@
8181
<PackageReference Include="Serilog" Version="4.3.0" />
8282
<PackageReference Include="Serilog.Extensions.Autofac.DependencyInjection" Version="5.0.0" />
8383
<PackageReference Include="Serilog.Sinks.Async" Version="2.1.0" />
84-
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
84+
<PackageReference Include="Serilog.Sinks.Console" Version="6.1.1"/>
8585
<PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
8686
<PackageReference Include="SharpZipLib" Version="1.4.2" />
87-
<PackageReference Include="SkiaSharp" Version="3.119.0" />
88-
<PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="3.119.0" />
89-
<PackageReference Include="SkiaSharp.NativeAssets.macOS" Version="3.119.0" />
90-
<PackageReference Include="SkiaSharp.NativeAssets.Win32" Version="3.119.0" />
87+
<PackageReference Include="SkiaSharp" Version="3.119.1"/>
88+
<PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="3.119.1"/>
89+
<PackageReference Include="SkiaSharp.NativeAssets.macOS" Version="3.119.1"/>
90+
<PackageReference Include="SkiaSharp.NativeAssets.Win32" Version="3.119.1"/>
91+
<PackageReference Include="Splat" Version="15.4.1"/>
9192
<PackageReference Include="Splat.Autofac" Version="15.4.1" />
92-
<PackageReference Include="Splat.Serilog" Version="17.1.1"/>
93-
<PackageReference Include="System.Reactive" Version="6.0.2"/>
93+
<PackageReference Include="Splat.Serilog" Version="15.4.1"/>
94+
<PackageReference Include="System.Reactive" Version="6.1.0"/>
9495
<PackageReference Include="System.Security.Cryptography.Cng" Version="5.0.0" />
9596
<PackageReference Include="System.Security.Cryptography.OpenSsl" Version="5.0.0" />
9697
<PackageReference Update="Packaging.Targets" Version="0.1.232" />
97-
<PackageReference Include="Xaml.Behaviors.Avalonia" Version="11.3.6.2"/>
98+
<PackageReference Include="Xaml.Behaviors.Avalonia" Version="11.3.9"/>
9899
</ItemGroup>
99100
<ItemGroup>
100101
<ProjectReference Include="..\ByteSync.Common\ByteSync.Common.csproj" />

‎src/ByteSync.Common/ByteSync.Common.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<ItemGroup>
1717
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3" />
1818
<PackageReference Include="Serilog" Version="4.3.0" />
19-
<PackageReference Include="System.IO.Abstractions" Version="22.0.16"/>
19+
<PackageReference Include="System.IO.Abstractions" Version="22.1.0"/>
2020
</ItemGroup>
2121

2222
</Project>

‎src/ByteSync.Functions/ByteSync.Functions.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<ItemGroup>
1111
<PackageReference Include="Autofac" Version="8.4.0" />
1212
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="10.0.0" />
13-
<PackageReference Include="Azure.Identity" Version="1.16.0"/>
13+
<PackageReference Include="Azure.Identity" Version="1.17.1"/>
1414
<PackageReference Include="MediatR" Version="12.5.0" />
1515
<PackageReference Include="Microsoft.ApplicationInsights.WorkerService" Version="2.23.0" />
1616
<PackageReference Include="Microsoft.Azure.Functions.Worker" Version="1.23.0" />
@@ -20,14 +20,14 @@
2020
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Timer" Version="4.3.1" />
2121
<PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.18.1" />
2222
<PackageReference Include="Microsoft.Azure.AppConfiguration.AspNetCore" Version="8.1.2" />
23-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.20"/>
23+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.22"/>
2424
<PackageReference Include="Microsoft.Azure.SignalR" Version="1.32.0"/>
2525
<PackageReference Include="Microsoft.Azure.SignalR.Management" Version="1.32.0"/>
2626
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
2727
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1" />
2828
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3" />
2929
<PackageReference Include="RedLock.net" Version="2.3.2" />
30-
<PackageReference Include="StackExchange.Redis" Version="2.9.17"/>
30+
<PackageReference Include="StackExchange.Redis" Version="2.10.1"/>
3131
</ItemGroup>
3232
<ItemGroup>
3333
<None Update="host.json">

‎src/ByteSync.ServerCommon/ByteSync.ServerCommon.csproj‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,24 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="AWSSDK.S3" Version="4.0.7.4"/>
12-
<PackageReference Include="Azure.Identity" Version="1.16.0"/>
13-
<PackageReference Include="Azure.Storage.Blobs" Version="12.25.0" />
14-
<PackageReference Include="MediatR" Version="12.5.0" />
15-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.20"/>
11+
<PackageReference Include="AWSSDK.S3" Version="4.0.13.1"/>
12+
<PackageReference Include="Azure.Identity" Version="1.17.1"/>
13+
<PackageReference Include="Azure.Storage.Blobs" Version="12.26.0"/>
14+
<PackageReference Include="MediatR" Version="12.5.0"/>
15+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.22"/>
1616
<PackageReference Include="Microsoft.Azure.SignalR" Version="1.32.0"/>
1717
<PackageReference Include="Microsoft.Azure.SignalR.Management" Version="1.32.0"/>
18-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
19-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
20-
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1" />
21-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3" />
22-
<PackageReference Include="Polly" Version="8.6.3"/>
23-
<PackageReference Include="RedLock.net" Version="2.3.2" />
24-
<PackageReference Include="StackExchange.Redis" Version="2.9.17"/>
18+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0"/>
19+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1"/>
20+
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1"/>
21+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3"/>
22+
<PackageReference Include="Polly" Version="8.6.5"/>
23+
<PackageReference Include="RedLock.net" Version="2.3.2"/>
24+
<PackageReference Include="StackExchange.Redis" Version="2.10.1"/>
2525
</ItemGroup>
2626

2727
<ItemGroup>
28-
<ProjectReference Include="..\ByteSync.Common\ByteSync.Common.csproj" />
28+
<ProjectReference Include="..\ByteSync.Common\ByteSync.Common.csproj"/>
2929
</ItemGroup>
3030

3131
</Project>

‎tests/ByteSync.Client.IntegrationTests/ByteSync.Client.IntegrationTests.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,16 @@
2020
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
2121
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
2222
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
23-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
23+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1"/>
2424
<PackageReference Include="Moq" Version="4.20.72" />
2525
<PackageReference Include="NUnit" Version="4.4.0" />
26-
<PackageReference Include="NUnit.Analyzers" Version="4.10.0">
26+
<PackageReference Include="NUnit.Analyzers" Version="4.11.2">
2727
<PrivateAssets>all</PrivateAssets>
2828
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2929
</PackageReference>
30-
<PackageReference Include="NUnit3TestAdapter" Version="5.1.0" />
31-
<PackageReference Include="Avalonia.Headless" Version="11.3.6"/>
32-
<PackageReference Include="Avalonia.Headless.NUnit" Version="11.3.6"/>
30+
<PackageReference Include="NUnit3TestAdapter" Version="5.2.0"/>
31+
<PackageReference Include="Avalonia.Headless" Version="11.3.9"/>
32+
<PackageReference Include="Avalonia.Headless.NUnit" Version="11.3.9"/>
3333
</ItemGroup>
3434

3535
<ItemGroup>

‎tests/ByteSync.Client.UnitTests/ByteSync.Client.UnitTests.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
<ItemGroup>
1414
<PackageReference Include="AwesomeAssertions" Version="8.0.1"/>
1515
<PackageReference Include="DynamicData" Version="9.4.1"/>
16-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1"/>
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1"/>
1717
<PackageReference Include="Moq" Version="4.20.72"/>
1818
<PackageReference Include="NUnit" Version="4.4.0"/>
19-
<PackageReference Include="NUnit3TestAdapter" Version="5.1.0"/>
19+
<PackageReference Include="NUnit3TestAdapter" Version="5.2.0"/>
2020
<PackageReference Include="coverlet.collector" Version="6.0.4">
2121
<PrivateAssets>all</PrivateAssets>
2222
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2323
</PackageReference>
24-
<PackageReference Include="ReactiveUI.Testing" Version="21.0.1"/>
24+
<PackageReference Include="ReactiveUI.Testing" Version="19.5.41"/>
2525
</ItemGroup>
2626

2727
<ItemGroup>

‎tests/ByteSync.Common.Tests/ByteSync.Common.Tests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99

1010
<ItemGroup>
1111
<PackageReference Include="AwesomeAssertions" Version="8.0.1" />
12-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1"/>
1313
<PackageReference Include="Moq" Version="4.20.72" />
1414
<PackageReference Include="NUnit" Version="4.4.0" />
15-
<PackageReference Include="NUnit3TestAdapter" Version="5.1.0" />
15+
<PackageReference Include="NUnit3TestAdapter" Version="5.2.0"/>
1616
<PackageReference Include="coverlet.collector" Version="6.0.4">
1717
<PrivateAssets>all</PrivateAssets>
1818
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

‎tests/ByteSync.Functions.IntegrationTests/ByteSync.Functions.IntegrationTests.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,18 @@
1818
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
1919
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
2020
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
21-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
21+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1"/>
2222
<PackageReference Include="NUnit" Version="4.4.0" />
23-
<PackageReference Include="NUnit3TestAdapter" Version="5.1.0" />
24-
<PackageReference Include="NUnit.Analyzers" Version="4.10.0">
23+
<PackageReference Include="NUnit3TestAdapter" Version="5.2.0"/>
24+
<PackageReference Include="NUnit.Analyzers" Version="4.11.2">
2525
<PrivateAssets>all</PrivateAssets>
2626
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2727
</PackageReference>
2828
<PackageReference Include="coverlet.collector" Version="6.0.4">
2929
<PrivateAssets>all</PrivateAssets>
3030
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3131
</PackageReference>
32-
<PackageReference Include="Testcontainers" Version="4.7.0"/>
32+
<PackageReference Include="Testcontainers" Version="4.9.0"/>
3333
</ItemGroup>
3434

3535
<ItemGroup>

‎tests/ByteSync.Functions.IntegrationTests/End2End/E2E_Environment_Setup.cs‎

Lines changed: 27 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
using System.Diagnostics;
22
using DotNet.Testcontainers.Builders;
3+
using FluentAssertions;
34
using ContainerBuilder = DotNet.Testcontainers.Builders.ContainerBuilder;
45
using IContainer = DotNet.Testcontainers.Containers.IContainer;
5-
using FluentAssertions;
66

77
namespace ByteSync.Functions.IntegrationTests.End2End;
88

99
public class E2E_Environment_Setup
1010
{
1111
public IContainer Azurite { get; private set; } = null!;
12+
1213
public IContainer Functions { get; private set; } = null!;
14+
1315
public HttpClient Http { get; private set; } = null!;
14-
16+
1517
public async Task InitializeAsync()
1618
{
1719
Azurite = new ContainerBuilder()
@@ -20,29 +22,34 @@ public async Task InitializeAsync()
2022
.WithPortBinding(10000, 10000)
2123
.WithPortBinding(10001, 10001)
2224
.WithPortBinding(10002, 10002)
23-
.WithWaitStrategy(Wait.ForUnixContainer().UntilPortIsAvailable(10000))
25+
.WithWaitStrategy(Wait.ForUnixContainer().UntilInternalTcpPortIsAvailable(10000))
2426
.Build();
25-
27+
2628
using (var azuriteCts = new CancellationTokenSource(TimeSpan.FromSeconds(90)))
2729
{
2830
await Azurite.StartAsync(azuriteCts.Token);
2931
}
30-
32+
3133
string ResolveFunctionsProjectRoot()
3234
{
3335
var dir = new DirectoryInfo(TestContext.CurrentContext.TestDirectory);
3436
while (dir != null && !File.Exists(Path.Combine(dir.FullName, "ByteSync.sln")))
3537
{
3638
dir = dir.Parent;
3739
}
40+
3841
if (dir != null)
3942
{
4043
var candidate = Path.Combine(dir.FullName, "src", "ByteSync.Functions");
41-
if (Directory.Exists(candidate)) return candidate;
44+
if (Directory.Exists(candidate))
45+
{
46+
return candidate;
47+
}
4248
}
49+
4350
return Path.GetFullPath(Path.Combine(TestContext.CurrentContext.TestDirectory, @"..\..\..\..\..\src\ByteSync.Functions"));
4451
}
45-
52+
4653
var projectRoot = ResolveFunctionsProjectRoot();
4754
var publishDir = Path.Combine(Path.GetTempPath(), $"bytesync-func-pub-{Guid.NewGuid():N}");
4855
Directory.CreateDirectory(publishDir);
@@ -52,44 +59,43 @@ string ResolveFunctionsProjectRoot()
5259
Arguments = $"publish \"{projectRoot}\" -c Release -o \"{publishDir}\"",
5360
UseShellExecute = false
5461
};
55-
56-
using var publish = new Process { StartInfo = startInfo };
62+
63+
using var publish = new Process();
64+
publish.StartInfo = startInfo;
5765
publish.Start();
5866
await publish.WaitForExitAsync();
5967
publish.ExitCode.Should().Be(0);
60-
68+
6169
var cfg = GlobalTestSetup.Configuration;
6270
var env = new Dictionary<string, string>
6371
{
6472
["AzureWebJobsStorage"] = cfg["AzureWebJobsStorage"]!,
65-
["AppSettings__SkipClientsVersionCheck"] = "True" ,
73+
["AppSettings__SkipClientsVersionCheck"] = "True",
6674
["Redis__ConnectionString"] = cfg["Redis:ConnectionString"]!,
6775
["SignalR__ConnectionString"] = cfg["SignalR:ConnectionString"]!,
6876
["AppSettings__Secret"] = cfg["AppSettings:Secret"]!,
6977
["AzureBlobStorage__Endpoint"] = cfg["AzureBlobStorage:Endpoint"]!,
7078
["AzureBlobStorage__AccountName"] = cfg["AzureBlobStorage:AccountName"]!,
7179
["AzureBlobStorage__AccountKey"] = cfg["AzureBlobStorage:AccountKey"]!,
72-
["AzureBlobStorage__Container"] = cfg["AzureBlobStorage:Container"]!
80+
["AzureBlobStorage__Container"] = cfg["AzureBlobStorage:Container"]!
7381
};
74-
82+
7583
var functionsBuilder = new ContainerBuilder()
7684
.WithImage("mcr.microsoft.com/azure-functions/dotnet-isolated:4-dotnet-isolated8.0")
7785
.WithName($"bytesync-functions-e2e-{Guid.NewGuid():N}")
7886
.WithPortBinding(7071, 80)
7987
.WithBindMount(publishDir, "/home/site/wwwroot")
8088
.WithEnvironment(env)
81-
.WithWaitStrategy(Wait.ForUnixContainer().UntilHttpRequestIsSucceeded(
82-
req => req
83-
.ForPort(80)
84-
.ForPath("/api/announcements")));
85-
89+
.WithWaitStrategy(Wait.ForUnixContainer().UntilHttpRequestIsSucceeded(req => req
90+
.ForPort(80)
91+
.ForPath("/api/announcements")));
92+
8693
Functions = functionsBuilder.Build();
8794
using var funcCts = new CancellationTokenSource(TimeSpan.FromMinutes(5));
8895
await Functions.StartAsync(funcCts.Token);
89-
96+
9097
Http = new HttpClient { BaseAddress = new Uri("http://localhost:7071/api/") };
9198
Http.DefaultRequestHeaders.Add("User-Agent", "ByteSync-E2E-Test");
9299
await Task.Delay(1000, funcCts.Token);
93100
}
94-
95-
}
101+
}

0 commit comments

Comments
 (0)