diff --git a/BTCPayServer.Abstractions/BTCPayServer.Abstractions.csproj b/BTCPayServer.Abstractions/BTCPayServer.Abstractions.csproj index 945aece74..76d666677 100644 --- a/BTCPayServer.Abstractions/BTCPayServer.Abstractions.csproj +++ b/BTCPayServer.Abstractions/BTCPayServer.Abstractions.csproj @@ -32,10 +32,10 @@ - - - - + + + + diff --git a/BTCPayServer.Abstractions/Contracts/BaseDbContextFactory.cs b/BTCPayServer.Abstractions/Contracts/BaseDbContextFactory.cs index 767e5bc52..9acd84a77 100644 --- a/BTCPayServer.Abstractions/Contracts/BaseDbContextFactory.cs +++ b/BTCPayServer.Abstractions/Contracts/BaseDbContextFactory.cs @@ -25,7 +25,7 @@ namespace BTCPayServer.Abstractions.Contracts class CustomNpgsqlMigrationsSqlGenerator : NpgsqlMigrationsSqlGenerator { #pragma warning disable EF1001 // Internal EF Core API usage. - public CustomNpgsqlMigrationsSqlGenerator(MigrationsSqlGeneratorDependencies dependencies, Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure.Internal.INpgsqlOptions opts) : base(dependencies, opts) + public CustomNpgsqlMigrationsSqlGenerator(MigrationsSqlGeneratorDependencies dependencies, Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure.Internal.INpgsqlSingletonOptions opts) : base(dependencies, opts) #pragma warning restore EF1001 // Internal EF Core API usage. { } diff --git a/BTCPayServer.Client/BTCPayServer.Client.csproj b/BTCPayServer.Client/BTCPayServer.Client.csproj index 0971db316..6d81a153e 100644 --- a/BTCPayServer.Client/BTCPayServer.Client.csproj +++ b/BTCPayServer.Client/BTCPayServer.Client.csproj @@ -29,7 +29,7 @@ - + diff --git a/BTCPayServer.Data/BTCPayServer.Data.csproj b/BTCPayServer.Data/BTCPayServer.Data.csproj index fcb58a4b1..364abbce0 100644 --- a/BTCPayServer.Data/BTCPayServer.Data.csproj +++ b/BTCPayServer.Data/BTCPayServer.Data.csproj @@ -3,11 +3,11 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/BTCPayServer.Plugins.Test/BTCPayServer.Plugins.Test.csproj b/BTCPayServer.Plugins.Test/BTCPayServer.Plugins.Test.csproj index 5ab32db15..6bea4070c 100644 --- a/BTCPayServer.Plugins.Test/BTCPayServer.Plugins.Test.csproj +++ b/BTCPayServer.Plugins.Test/BTCPayServer.Plugins.Test.csproj @@ -13,7 +13,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/BTCPayServer.Rating/BTCPayServer.Rating.csproj b/BTCPayServer.Rating/BTCPayServer.Rating.csproj index d4f73e90b..812eb1ff9 100644 --- a/BTCPayServer.Rating/BTCPayServer.Rating.csproj +++ b/BTCPayServer.Rating/BTCPayServer.Rating.csproj @@ -4,9 +4,9 @@ - - - + + + diff --git a/BTCPayServer.Tests/BTCPayServer.Tests.csproj b/BTCPayServer.Tests/BTCPayServer.Tests.csproj index 1c5bbcbbe..7ed0c9e63 100644 --- a/BTCPayServer.Tests/BTCPayServer.Tests.csproj +++ b/BTCPayServer.Tests/BTCPayServer.Tests.csproj @@ -19,13 +19,13 @@ - + - + all runtime; build; native; contentfiles; analyzers diff --git a/BTCPayServer/BTCPayServer.csproj b/BTCPayServer/BTCPayServer.csproj index 5b7ddce0b..d8c2aad2a 100644 --- a/BTCPayServer/BTCPayServer.csproj +++ b/BTCPayServer/BTCPayServer.csproj @@ -1,4 +1,4 @@ - + @@ -54,8 +54,8 @@ - - + + @@ -66,7 +66,7 @@ runtime; build; native; contentfiles; analyzers - + diff --git a/amd64.Dockerfile b/amd64.Dockerfile index efcc41a40..a98c6a6e4 100644 --- a/amd64.Dockerfile +++ b/amd64.Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:6.0.101-bullseye-slim AS builder +FROM mcr.microsoft.com/dotnet/sdk:6.0.302-bullseye-slim AS builder ENV DOTNET_CLI_TELEMETRY_OPTOUT=1 WORKDIR /source COPY nuget.config nuget.config @@ -20,7 +20,7 @@ COPY Build/Version.csproj Build/Version.csproj ARG CONFIGURATION_NAME=Release RUN cd BTCPayServer && dotnet publish --output /app/ --configuration ${CONFIGURATION_NAME} -FROM mcr.microsoft.com/dotnet/aspnet:6.0.1-bullseye-slim +FROM mcr.microsoft.com/dotnet/aspnet:6.0.7-bullseye-slim RUN apt-get update && apt-get install -y --no-install-recommends iproute2 openssh-client \ && rm -rf /var/lib/apt/lists/* diff --git a/arm32v7.Dockerfile b/arm32v7.Dockerfile index 77ec48811..ceb3512d4 100644 --- a/arm32v7.Dockerfile +++ b/arm32v7.Dockerfile @@ -1,5 +1,5 @@ # Note that we are using buster rather than bullseye. Somehow, raspberry pi 4 doesn't like bullseye. -FROM mcr.microsoft.com/dotnet/sdk:6.0.101-bullseye-slim AS builder +FROM mcr.microsoft.com/dotnet/sdk:6.0.302-bullseye-slim AS builder ENV DOTNET_CLI_TELEMETRY_OPTOUT=1 RUN apt-get update \ && apt-get install -qq --no-install-recommends qemu qemu-user-static qemu-user binfmt-support @@ -25,7 +25,7 @@ ARG CONFIGURATION_NAME=Release RUN cd BTCPayServer && dotnet publish --output /app/ --configuration ${CONFIGURATION_NAME} # Note that we are using buster rather than bullseye. Somehow, raspberry pi 4 doesn't like bullseye. -FROM mcr.microsoft.com/dotnet/aspnet:6.0.1-bullseye-slim-arm32v7 +FROM mcr.microsoft.com/dotnet/aspnet:6.0.7-bullseye-slim-arm32v7 COPY --from=builder /usr/bin/qemu-arm-static /usr/bin/qemu-arm-static RUN apt-get update && apt-get install -y --no-install-recommends iproute2 openssh-client \ && rm -rf /var/lib/apt/lists/* diff --git a/arm64v8.Dockerfile b/arm64v8.Dockerfile index e8c8b68c8..db5db95ef 100644 --- a/arm64v8.Dockerfile +++ b/arm64v8.Dockerfile @@ -1,5 +1,5 @@ # This is a manifest image, will pull the image with the same arch as the builder machine -FROM mcr.microsoft.com/dotnet/sdk:6.0.101-bullseye-slim AS builder +FROM mcr.microsoft.com/dotnet/sdk:6.0.302-bullseye-slim AS builder ENV DOTNET_CLI_TELEMETRY_OPTOUT=1 ENV LC_ALL en_US.UTF-8 RUN apt-get update \ @@ -26,7 +26,7 @@ ARG CONFIGURATION_NAME=Release RUN cd BTCPayServer && dotnet publish --output /app/ --configuration ${CONFIGURATION_NAME} # Force the builder machine to take make an arm runtime image. This is fine as long as the builder does not run any program -FROM mcr.microsoft.com/dotnet/aspnet:6.0.1-bullseye-slim-arm64v8 +FROM mcr.microsoft.com/dotnet/aspnet:6.0.7-bullseye-slim-arm64v8 COPY --from=builder /usr/bin/qemu-aarch64-static /usr/bin/qemu-aarch64-static RUN apt-get update && apt-get install -y --no-install-recommends iproute2 openssh-client \ && rm -rf /var/lib/apt/lists/*