From 938e4c807295d9a3bc8e54bac4ef3dfd544143a7 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Mon, 20 Jun 2022 15:35:37 +0900 Subject: [PATCH] Bump to .net6.0 --- BTCPayServer.Hwi/BTCPayServer.Hwi.csproj | 2 +- BTCPayServer.Vault.Tests/BTCPayServer.Vault.Tests.csproj | 2 +- BTCPayServer.Vault/BTCPayServer.Vault.csproj | 4 ++-- BTCPayServer.Vault/Version.csproj | 2 +- Build/RELEASE.md | 3 ++- Build/common/export-variables.sh | 2 +- Build/debian-x64/Dockerfile | 2 +- Build/linux-x64/Dockerfile | 2 +- Build/osx-x64/Dockerfile | 2 +- Build/win-x64/Dockerfile | 2 +- README.md | 2 +- 11 files changed, 13 insertions(+), 12 deletions(-) diff --git a/BTCPayServer.Hwi/BTCPayServer.Hwi.csproj b/BTCPayServer.Hwi/BTCPayServer.Hwi.csproj index fccb3d8..f690e59 100644 --- a/BTCPayServer.Hwi/BTCPayServer.Hwi.csproj +++ b/BTCPayServer.Hwi/BTCPayServer.Hwi.csproj @@ -1,7 +1,7 @@  - netstandard2.1;netcoreapp2.1 + netstandard2.1;net6.0 BTCPay Server Copyright © BTCPay Server A wrapper library around the hwi bitcoin-core project diff --git a/BTCPayServer.Vault.Tests/BTCPayServer.Vault.Tests.csproj b/BTCPayServer.Vault.Tests/BTCPayServer.Vault.Tests.csproj index 7a35a59..748772c 100644 --- a/BTCPayServer.Vault.Tests/BTCPayServer.Vault.Tests.csproj +++ b/BTCPayServer.Vault.Tests/BTCPayServer.Vault.Tests.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net6.0 8.0 false diff --git a/BTCPayServer.Vault/BTCPayServer.Vault.csproj b/BTCPayServer.Vault/BTCPayServer.Vault.csproj index 9e82a98..58140e4 100644 --- a/BTCPayServer.Vault/BTCPayServer.Vault.csproj +++ b/BTCPayServer.Vault/BTCPayServer.Vault.csproj @@ -3,7 +3,7 @@ Exe WinExe - netcoreapp3.1 + net6.0 The BTCPayServer Team BTCPayServer Vault $(Title) @@ -22,7 +22,7 @@ - + diff --git a/BTCPayServer.Vault/Version.csproj b/BTCPayServer.Vault/Version.csproj index c7f5ff3..5ec3743 100644 --- a/BTCPayServer.Vault/Version.csproj +++ b/BTCPayServer.Vault/Version.csproj @@ -1,5 +1,5 @@  - 2.0.2 + 2.0.3 diff --git a/Build/RELEASE.md b/Build/RELEASE.md index 7cdad01..c0a0eed 100644 --- a/Build/RELEASE.md +++ b/Build/RELEASE.md @@ -1,5 +1,6 @@ ## Changelog -* Update HWI to 2.1.1 +* Fix: Running on Debian would result in error because dotnet runtime deps weren't installed (#45 #47) +* Bump from .net 3.1 to .net 6.0 You may want to follow the [documented](https://github.com/btcpayserver/BTCPayServer.Vault/blob/master/docs/HowToVerify.md) process to verify that the binaries are built by Nicolas Dorier. diff --git a/Build/common/export-variables.sh b/Build/common/export-variables.sh index 6a55121..7bb6a18 100644 --- a/Build/common/export-variables.sh +++ b/Build/common/export-variables.sh @@ -1,7 +1,7 @@ #!/bin/bash BUILD_ARGS="--runtime $RUNTIME -p:Configuration=Release -p:GithubDistrib=true" -FRAMEWORK="netcoreapp3.1" +FRAMEWORK="net6.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 46f104b..a47c79f 100644 --- a/Build/debian-x64/Dockerfile +++ b/Build/debian-x64/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/core/sdk:3.1.101 AS builder +FROM mcr.microsoft.com/dotnet/sdk:6.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 f40b4b3..9524050 100644 --- a/Build/linux-x64/Dockerfile +++ b/Build/linux-x64/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/core/sdk:3.1.101 AS builder +FROM mcr.microsoft.com/dotnet/sdk:6.0 AS builder RUN wget -qO /tmp/hwi.tar.gz https://github.com/bitcoin-core/HWI/releases/download/2.1.1/hwi-2.1.1-linux-amd64.tar.gz && \ tar -zxvf /tmp/hwi.tar.gz -C /tmp hwi && \ diff --git a/Build/osx-x64/Dockerfile b/Build/osx-x64/Dockerfile index 3cffebd..129d2e1 100644 --- a/Build/osx-x64/Dockerfile +++ b/Build/osx-x64/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/core/sdk:3.1.101 AS builder +FROM mcr.microsoft.com/dotnet/sdk:6.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 4a21c3f..7f4d7c1 100644 --- a/Build/win-x64/Dockerfile +++ b/Build/win-x64/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/core/sdk:3.1.101 AS builder +FROM mcr.microsoft.com/dotnet/sdk:6.0 AS builder # Optimize docker cache, do not make it one layer RUN apt-get update diff --git a/README.md b/README.md index 5e1b8b3..7ae3fad 100644 --- a/README.md +++ b/README.md @@ -59,7 +59,7 @@ This is why BTCPayServer Vault always ask permission to user first before allowi This is a two step process: -1. Install the latest version of the [.NET Core 3.1 SDK](https://dotnet.microsoft.com/download/dotnet-core/3.1) +1. Install the latest version of the [.NET Core 6.0 SDK](https://dotnet.microsoft.com/download/dotnet-core/6.0) 2. Run `dotnet build` If you want to run it for testing: