Bump to .net6.0

btcpayserver · Jun 20, 2022 · 938e4c8 · 938e4c8
1 parent 05b37a2
commit 938e4c8
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 12 deletions.
diff --git a/BTCPayServer.Hwi/BTCPayServer.Hwi.csproj b/BTCPayServer.Hwi/BTCPayServer.Hwi.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="Version.csproj" Condition="Exists('Version.csproj')" />
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;net6.0</TargetFrameworks>
     <Company>BTCPay Server</Company>
     <Copyright>Copyright © BTCPay Server</Copyright>
     <Description>A wrapper library around the hwi bitcoin-core project</Description>

diff --git a/BTCPayServer.Vault.Tests/BTCPayServer.Vault.Tests.csproj b/BTCPayServer.Vault.Tests/BTCPayServer.Vault.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <LangVersion>8.0</LangVersion>
     <IsPackable>false</IsPackable>
   </PropertyGroup>

diff --git a/BTCPayServer.Vault/BTCPayServer.Vault.csproj b/BTCPayServer.Vault/BTCPayServer.Vault.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <OutputType Condition=" '$(Configuration)' == 'Release' ">WinExe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Company>The BTCPayServer Team</Company>
     <Title>BTCPayServer Vault</Title>
     <AssemblyTitle>$(Title)</AssemblyTitle>
@@ -22,7 +22,7 @@
   <ItemGroup>
     <PackageReference Include="Avalonia" Version="0.9.12" />
     <PackageReference Include="AvalonStudio.Shell" Version="0.9.9" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="3.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="6.0.0" />
     <PackageReference Include="NicolasDorier.RateLimits" Version="1.1.0" />
   </ItemGroup>
 

diff --git a/BTCPayServer.Vault/Version.csproj b/BTCPayServer.Vault/Version.csproj
@@ -1,5 +1,5 @@
 <Project>
   <PropertyGroup>
-    <Version>2.0.2</Version>
+    <Version>2.0.3</Version>
   </PropertyGroup>
 </Project>
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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: