diff --git a/BTCPayServer.Common/BTCPayServer.Common.csproj b/BTCPayServer.Common/BTCPayServer.Common.csproj index cafcb6ed6..488f0f888 100644 --- a/BTCPayServer.Common/BTCPayServer.Common.csproj +++ b/BTCPayServer.Common/BTCPayServer.Common.csproj @@ -1,9 +1,6 @@  - - - netcoreapp2.1 - 7.3 - + + diff --git a/BTCPayServer.Rating/BTCPayServer.Rating.csproj b/BTCPayServer.Rating/BTCPayServer.Rating.csproj index 6b0a59c45..68b99d6bd 100644 --- a/BTCPayServer.Rating/BTCPayServer.Rating.csproj +++ b/BTCPayServer.Rating/BTCPayServer.Rating.csproj @@ -1,5 +1,6 @@  - + + netcoreapp2.1 7.3 diff --git a/BTCPayServer/BTCPayServer.csproj b/BTCPayServer/BTCPayServer.csproj index c89c2677e..228f98b46 100644 --- a/BTCPayServer/BTCPayServer.csproj +++ b/BTCPayServer/BTCPayServer.csproj @@ -1,12 +1,8 @@  + + Exe - netcoreapp2.1 - 1.0.3.106 - NU1701,CA1816,CA1308,CA1810,CA2208 - - - 7.3 diff --git a/Common.csproj b/Common.csproj new file mode 100644 index 000000000..b2d1d0669 --- /dev/null +++ b/Common.csproj @@ -0,0 +1,7 @@ + + + netcoreapp2.1 + NU1701,CA1816,CA1308,CA1810,CA2208 + 7.3 + + diff --git a/Dockerfile.linuxamd64 b/Dockerfile.linuxamd64 index 10430ca75..5d274244f 100644 --- a/Dockerfile.linuxamd64 +++ b/Dockerfile.linuxamd64 @@ -1,12 +1,14 @@ FROM mcr.microsoft.com/dotnet/core/sdk:2.1.505-alpine3.7 AS builder WORKDIR /source +COPY Common.csproj Common.csproj COPY BTCPayServer/BTCPayServer.csproj BTCPayServer/BTCPayServer.csproj COPY BTCPayServer.Common/BTCPayServer.Common.csproj BTCPayServer.Common/BTCPayServer.Common.csproj COPY BTCPayServer.Rating/BTCPayServer.Rating.csproj BTCPayServer.Rating/BTCPayServer.Rating.csproj RUN cd BTCPayServer && dotnet restore -COPY BTCPayServer/. . -COPY BTCPayServer.Rating/. . -COPY BTCPayServer.Common/. . +COPY Version.csproj Version.csproj +COPY BTCPayServer/. BTCPayServer/. +COPY BTCPayServer.Rating/. BTCPayServer.Rating/. +COPY BTCPayServer.Common/. BTCPayServer.Common/. RUN cd BTCPayServer && dotnet publish --output /app/ --configuration Release FROM mcr.microsoft.com/dotnet/core/aspnet:2.1.9-alpine3.7 diff --git a/Dockerfile.linuxarm32v7 b/Dockerfile.linuxarm32v7 index 1174a1f6f..16cef2393 100644 --- a/Dockerfile.linuxarm32v7 +++ b/Dockerfile.linuxarm32v7 @@ -4,13 +4,15 @@ RUN apt-get update \ && apt-get install -qq --no-install-recommends qemu qemu-user-static qemu-user binfmt-support WORKDIR /source +COPY Common.csproj Common.csproj COPY BTCPayServer/BTCPayServer.csproj BTCPayServer/BTCPayServer.csproj COPY BTCPayServer.Common/BTCPayServer.Common.csproj BTCPayServer.Common/BTCPayServer.Common.csproj COPY BTCPayServer.Rating/BTCPayServer.Rating.csproj BTCPayServer.Rating/BTCPayServer.Rating.csproj RUN dotnet restore -COPY BTCPayServer/. . -COPY BTCPayServer.Rating/. . -COPY BTCPayServer.Common/. . +COPY Version.csproj Version.csproj +COPY BTCPayServer/. BTCPayServer/. +COPY BTCPayServer.Rating/. BTCPayServer.Rating/. +COPY BTCPayServer.Common/. BTCPayServer.Common/. RUN cd BTCPayServer && dotnet publish --output /app/ --configuration Release # Force the builder machine to take make an arm runtime image. This is fine as long as the builder does not run any program diff --git a/Version.csproj b/Version.csproj new file mode 100644 index 000000000..942b4c01a --- /dev/null +++ b/Version.csproj @@ -0,0 +1,5 @@ + + + 1.0.3.106 + + diff --git a/publish-docker.ps1 b/publish-docker.ps1 index 54aee5894..e697e370d 100644 --- a/publish-docker.ps1 +++ b/publish-docker.ps1 @@ -1,4 +1,4 @@ -$ver = [regex]::Match((Get-Content BTCPayServer\BTCPayServer.csproj), '([^<]+)<').Groups[1].Value +$ver = [regex]::Match((Get-Content Version.csproj), '([^<]+)<').Groups[1].Value git tag -a "v$ver" -m "$ver" git checkout latest git merge master