diff --git a/BTCPayServer.Abstractions/BTCPayServer.Abstractions.csproj b/BTCPayServer.Abstractions/BTCPayServer.Abstractions.csproj index 76d666677..5a5f6721d 100644 --- a/BTCPayServer.Abstractions/BTCPayServer.Abstractions.csproj +++ b/BTCPayServer.Abstractions/BTCPayServer.Abstractions.csproj @@ -32,9 +32,9 @@ - - - + + + diff --git a/BTCPayServer.Client/BTCPayServer.Client.csproj b/BTCPayServer.Client/BTCPayServer.Client.csproj index 50eac5b93..ee873620e 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 364abbce0..856815148 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 6bea4070c..f20de0256 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 812eb1ff9..80bde067c 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 6f88d4733..c6b98b77c 100644 --- a/BTCPayServer.Tests/BTCPayServer.Tests.csproj +++ b/BTCPayServer.Tests/BTCPayServer.Tests.csproj @@ -1,4 +1,4 @@ - + false @@ -19,12 +19,12 @@ - + - + all runtime; build; native; contentfiles; analyzers diff --git a/BTCPayServer.Tests/Dockerfile b/BTCPayServer.Tests/Dockerfile index d9b86f45c..ec9cea303 100644 --- a/BTCPayServer.Tests/Dockerfile +++ b/BTCPayServer.Tests/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.401-bullseye-slim AS builder RUN apt-get update && apt-get install -y --no-install-recommends chromium-driver \ && rm -rf /var/lib/apt/lists/* diff --git a/BTCPayServer.Tests/GreenfieldAPITests.cs b/BTCPayServer.Tests/GreenfieldAPITests.cs index 684e28ebc..25de776e0 100644 --- a/BTCPayServer.Tests/GreenfieldAPITests.cs +++ b/BTCPayServer.Tests/GreenfieldAPITests.cs @@ -88,7 +88,7 @@ namespace BTCPayServer.Tests Assert.Equal("missing-permission", e.APIError.Code); Assert.NotNull(e.APIError.Message); GreenfieldPermissionAPIError permissionError = Assert.IsType(e.APIError); - Assert.Equal(permissionError.MissingPermission, Policies.CanModifyStoreSettings); + Assert.Equal(Policies.CanModifyStoreSettings, permissionError.MissingPermission); } [Fact(Timeout = TestTimeout)] diff --git a/BTCPayServer/BTCPayServer.csproj b/BTCPayServer/BTCPayServer.csproj index 65105432b..e07469b22 100644 --- a/BTCPayServer/BTCPayServer.csproj +++ b/BTCPayServer/BTCPayServer.csproj @@ -90,8 +90,8 @@ - - + + diff --git a/amd64.Dockerfile b/amd64.Dockerfile index a98c6a6e4..b198c85fb 100644 --- a/amd64.Dockerfile +++ b/amd64.Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:6.0.302-bullseye-slim AS builder +FROM mcr.microsoft.com/dotnet/sdk:6.0.401-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.7-bullseye-slim +FROM mcr.microsoft.com/dotnet/aspnet:6.0.9-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 ceb3512d4..b849f7fe9 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.302-bullseye-slim AS builder +FROM mcr.microsoft.com/dotnet/sdk:6.0.401-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.7-bullseye-slim-arm32v7 +FROM mcr.microsoft.com/dotnet/aspnet:6.0.9-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 db5db95ef..fe2ee1d66 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.302-bullseye-slim AS builder +FROM mcr.microsoft.com/dotnet/sdk:6.0.401-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.7-bullseye-slim-arm64v8 +FROM mcr.microsoft.com/dotnet/aspnet:6.0.9-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/*