Skip to content

Commit 8ea1467

Browse files
Bump dependencies (#494)
1 parent 4d81c23 commit 8ea1467

File tree

5 files changed

+12
-13
lines changed

5 files changed

+12
-13
lines changed

Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0.203-bookworm-slim AS builder
1+
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0.404-bookworm-slim AS builder
22
WORKDIR /source
33
COPY NBXplorer/NBXplorer.csproj NBXplorer/NBXplorer.csproj
44
COPY NBXplorer.Client/NBXplorer.Client.csproj NBXplorer.Client/NBXplorer.Client.csproj
@@ -8,7 +8,7 @@ COPY . .
88
RUN cd NBXplorer && \
99
dotnet publish --output /app/ --configuration Release
1010

11-
FROM mcr.microsoft.com/dotnet/aspnet:8.0.3-bookworm-slim
11+
FROM mcr.microsoft.com/dotnet/aspnet:8.0.11-bookworm-slim
1212
WORKDIR /app
1313

1414
RUN mkdir /datadir

NBXplorer.Tests/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/dotnet/sdk:8.0.100-bookworm-slim AS builder
1+
FROM mcr.microsoft.com/dotnet/sdk:8.0.404-bookworm-slim AS builder
22
WORKDIR /source
33
COPY . .
44
RUN cd NBXplorer.Tests && dotnet build

NBXplorer.Tests/NBXplorer.Tests.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
</ItemGroup>
1313
<ItemGroup>
1414
<PackageReference Include="NBitcoin.TestFramework" Version="3.0.31" />
15-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
16-
<PackageReference Include="xunit" Version="2.8.0" />
15+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
16+
<PackageReference Include="xunit" Version="2.9.2" />
1717
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.0">
1818
<PrivateAssets>all</PrivateAssets>
1919
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

NBXplorer.Tests/UnitTest1.cs

+4-5
Original file line numberDiff line numberDiff line change
@@ -850,7 +850,7 @@ private static void CanCreatePSBTCore(ServerTester tester, ScriptPubKeyType type
850850
});
851851
Assert.Equal(3, psbt2.PSBT.Outputs.Count);
852852
Assert.Equal(2, psbt2.PSBT.Outputs.Where(o => o.HDKeyPaths.Any()).Count());
853-
Assert.Single(psbt2.PSBT.Outputs.Where(o => o.HDKeyPaths.Any(h => h.Value.KeyPath == newAddress.KeyPath)));
853+
Assert.Single(psbt2.PSBT.Outputs, o => o.HDKeyPaths.Any(h => h.Value.KeyPath == newAddress.KeyPath));
854854
foreach (var input in psbt2.PSBT.GetGlobalTransaction().Inputs)
855855
{
856856
Assert.Equal(Sequence.Final, input.Sequence);
@@ -915,7 +915,7 @@ private static void CanCreatePSBTCore(ServerTester tester, ScriptPubKeyType type
915915

916916
Assert.Equal(3, psbt2.PSBT.Outputs.Count);
917917
Assert.Equal(2, psbt2.PSBT.Outputs.Where(o => o.HDKeyPaths.Any()).Count());
918-
var selfchange = Assert.Single(psbt2.PSBT.Outputs.Where(o => o.HDKeyPaths.Any(h => h.Key.GetAddress(type, tester.Network).ScriptPubKey == newAddress.ScriptPubKey)));
918+
var selfchange = Assert.Single(psbt2.PSBT.Outputs, o => o.HDKeyPaths.Any(h => h.Key.GetAddress(type, tester.Network).ScriptPubKey == newAddress.ScriptPubKey));
919919
Assert.All(psbt2.PSBT.Inputs.Concat<PSBTCoin>(new[] { selfchange }).SelectMany(i => i.HDKeyPaths), i =>
920920
{
921921
Assert.Equal(rootHD, i.Value.MasterFingerprint);
@@ -1151,8 +1151,7 @@ public async Task ShowRBFedTransaction4()
11511151
// Make sure there is no dups events on unconf txs
11521152
await Task.Delay(100);
11531153
var evts = await tester.Client.CreateLongPollingNotificationSession().GetEventsAsync();
1154-
Assert.Single(evts.OfType<NewTransactionEvent>()
1155-
.Where(t => t.BlockId is null && t.TransactionData.TransactionHash == bp.GetHash()));
1154+
Assert.Single(evts.OfType<NewTransactionEvent>(), t => t.BlockId is null && t.TransactionData.TransactionHash == bp.GetHash());
11561155
}
11571156

11581157
[TheoryWithTimeout]
@@ -3941,7 +3940,7 @@ public async Task ElementsTests()
39413940

39423941
var txInfos = tester.Client.GetTransactions(userDerivationScheme).UnconfirmedTransactions.Transactions;
39433942
var assetMoney2 = Assert.IsType<AssetMoney>(Assert.Single(Assert.IsType<MoneyBag>(txInfos[1].BalanceChange)));
3944-
Assert.Empty(Assert.IsType<MoneyBag>(txInfos[0].BalanceChange).Where(m => !m.IsUnknown()));
3943+
Assert.DoesNotContain(Assert.IsType<MoneyBag>(txInfos[0].BalanceChange), m => !m.IsUnknown());
39453944

39463945
Assert.Equal(assetMoney, assetMoney2);
39473946

NBXplorer/NBXplorer.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<OutputType>Exe</OutputType>
44
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">net8.0</TargetFramework>
55
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">$(TargetFrameworkOverride)</TargetFramework>
6-
<Version>2.5.14</Version>
6+
<Version>2.5.15</Version>
77
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\NBXplorer.xml</DocumentationFile>
88
<NoWarn>1701;1702;1705;1591;CS1591</NoWarn>
99
<LangVersion>12</LangVersion>
@@ -35,12 +35,12 @@
3535
<ItemGroup>
3636
<PackageReference Include="Dapper" Version="2.1.35" />
3737
<PackageReference Include="Microsoft.Azure.ServiceBus" Version="4.2.1" />
38-
<PackageReference Include="Npgsql" Version="8.0.3" />
38+
<PackageReference Include="Npgsql" Version="8.0.6" />
3939
<PackageReference Include="RabbitMQ.Client" Version="5.1.2" />
4040
<PackageReference Include="NicolasDorier.CommandLine" Version="2.0.0" />
4141
<PackageReference Include="NicolasDorier.CommandLine.Configuration" Version="2.0.0" />
4242
<PackageReference Include="NicolasDorier.StandardConfiguration" Version="2.0.0" />
43-
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.5"></PackageReference>
43+
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.11"></PackageReference>
4444
<ProjectReference Include="..\NBXplorer.Client\NBXplorer.Client.csproj" />
4545
</ItemGroup>
4646

0 commit comments

Comments
 (0)