diff --git a/BTCPayServer.Hwi/BTCPayServer.Hwi.csproj b/BTCPayServer.Hwi/BTCPayServer.Hwi.csproj index eca3173..83eeb6c 100644 --- a/BTCPayServer.Hwi/BTCPayServer.Hwi.csproj +++ b/BTCPayServer.Hwi/BTCPayServer.Hwi.csproj @@ -17,12 +17,12 @@ - + - + \ No newline at end of file diff --git a/BTCPayServer.Vault.Tests/BTCPayServer.Vault.Tests.csproj b/BTCPayServer.Vault.Tests/BTCPayServer.Vault.Tests.csproj index abf2a0b..f02b681 100644 --- a/BTCPayServer.Vault.Tests/BTCPayServer.Vault.Tests.csproj +++ b/BTCPayServer.Vault.Tests/BTCPayServer.Vault.Tests.csproj @@ -1,23 +1,15 @@  - net8.0 + net10.0 12 false - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - + + diff --git a/BTCPayServer.Vault.Tests/HwiTests.cs b/BTCPayServer.Vault.Tests/HwiTests.cs index a0e76b6..a104a50 100644 --- a/BTCPayServer.Vault.Tests/HwiTests.cs +++ b/BTCPayServer.Vault.Tests/HwiTests.cs @@ -5,15 +5,12 @@ using Microsoft.Extensions.Logging; using Microsoft.Extensions.DependencyInjection; using NBitcoin; using Xunit; -using Xunit.Abstractions; using BTCPayServer.Hwi; using BTCPayServer.Hwi.Transports; using System.Collections.Generic; using System.Net; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting.Server.Features; -using Microsoft.AspNetCore.Builder; -using BTCPayServer.Vault; namespace BTCPayServer.Vault.Tests { diff --git a/BTCPayServer.Vault.Tests/XUnitLogger.cs b/BTCPayServer.Vault.Tests/XUnitLogger.cs index 70af305..f714180 100644 --- a/BTCPayServer.Vault.Tests/XUnitLogger.cs +++ b/BTCPayServer.Vault.Tests/XUnitLogger.cs @@ -1,19 +1,12 @@ using System; -using System.Collections.Generic; -using System.Text; using Microsoft.Extensions.Logging; -using Xunit.Abstractions; +using Xunit; namespace BTCPayServer.Vault.Tests { - class XUnitLoggerFactory : ILoggerFactory + class XUnitLoggerFactory(ITestOutputHelper testOutput) : ILoggerFactory { - public XUnitLoggerFactory(ITestOutputHelper testOutput) - { - TestOutput = testOutput; - } - - public ITestOutputHelper TestOutput { get; } + public ITestOutputHelper TestOutput { get; } = testOutput; public void AddProvider(ILoggerProvider provider) { diff --git a/BTCPayServer.Vault/BTCPayServer.Vault.csproj b/BTCPayServer.Vault/BTCPayServer.Vault.csproj index 0448f52..a489a09 100644 --- a/BTCPayServer.Vault/BTCPayServer.Vault.csproj +++ b/BTCPayServer.Vault/BTCPayServer.Vault.csproj @@ -3,7 +3,7 @@ Exe WinExe - net8.0 + net10.0 12 The BTCPayServer Team BTCPayServer Vault @@ -17,15 +17,15 @@ - - + + - + - - + + diff --git a/Build/common/export-variables.sh b/Build/common/export-variables.sh index 181c115..b245780 100644 --- a/Build/common/export-variables.sh +++ b/Build/common/export-variables.sh @@ -2,7 +2,7 @@ DOTNET_RUNTIME=${DOTNET_RUNTIME:-$RUNTIME} BUILD_ARGS="--runtime $DOTNET_RUNTIME -p:Configuration=Release -p:GithubDistrib=true" -FRAMEWORK="net8.0" +FRAMEWORK="net10.0" DIST="/source/dist" RESOURCES="/source/Build/${RUNTIME}" RESOURCES_COMMON="/source/Build/common" diff --git a/Build/debian-x64/Dockerfile b/Build/debian-x64/Dockerfile index 7725ff7..233e516 100644 --- a/Build/debian-x64/Dockerfile +++ b/Build/debian-x64/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:8.0 AS builder +FROM mcr.microsoft.com/dotnet/sdk:10.0 AS builder # Optimize docker cache, do not make it one layer RUN apt-get update diff --git a/Build/linux-x64/Dockerfile b/Build/linux-x64/Dockerfile index 7c0df1a..e49934d 100644 --- a/Build/linux-x64/Dockerfile +++ b/Build/linux-x64/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:8.0 AS builder +FROM mcr.microsoft.com/dotnet/sdk:10.0 AS builder RUN wget -qO /tmp/hwi.tar.gz https://github.com/bitcoin-core/HWI/releases/download/3.1.0/hwi-3.1.0-linux-x86_64.tar.gz && \ tar -zxvf /tmp/hwi.tar.gz -C /tmp hwi && \ diff --git a/Build/osx-x64/Dockerfile b/Build/osx-x64/Dockerfile index d400000..046a03b 100644 --- a/Build/osx-x64/Dockerfile +++ b/Build/osx-x64/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:8.0 AS builder +FROM mcr.microsoft.com/dotnet/sdk:10.0 AS builder # Optimize docker cache, do not make it one layer RUN apt-get update diff --git a/Build/win-x64/Dockerfile b/Build/win-x64/Dockerfile index 42cc8c1..6b29bc3 100644 --- a/Build/win-x64/Dockerfile +++ b/Build/win-x64/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:8.0 AS builder +FROM mcr.microsoft.com/dotnet/sdk:10.0 AS builder # Optimize docker cache, do not make it one layer RUN apt-get update