btcpayserver/NBXplorer
btcpayserver/NBXplorer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bump all code to netcoreapp3.0

Browse Source
This commit is contained in:
nicolas.dorier 2019-09-28 13:29:08 +09:00
parent 5da254b803
commit 98afc2bf71
No known key found for this signature in database
GPG Key ID: 6618763EF09186FE
7 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -287,3 +287,4 @@ __pycache__/
*.btm.cs
*.odx.cs
*.xsd.cs
/NBXplorer.Tests/Properties/launchSettings.json

4
Dockerfile.linuxamd64
View File

@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/core/sdk:2.1.505-alpine3.7 AS builder
FROM mcr.microsoft.com/dotnet/core/sdk:3.0.100-alpine3.9 AS builder
WORKDIR /source
COPY NBXplorer/NBXplorer.csproj NBXplorer/NBXplorer.csproj
COPY NBXplorer.Client/NBXplorer.Client.csproj NBXplorer.Client/NBXplorer.Client.csproj
@ -8,7 +8,7 @@ COPY . .
RUN cd NBXplorer && \
dotnet publish --output /app/ --configuration Release
FROM mcr.microsoft.com/dotnet/core/aspnet:2.1.9-alpine3.7
FROM mcr.microsoft.com/dotnet/core/aspnet:3.0.0-buster-slim
WORKDIR /app
RUN mkdir /datadir

4
Dockerfile.linuxarm32v7
View File

@ -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/core/sdk:2.1.505 AS builder
FROM mcr.microsoft.com/dotnet/core/sdk:3.0.100 AS builder
WORKDIR /source
COPY NBXplorer/NBXplorer.csproj NBXplorer/NBXplorer.csproj
COPY NBXplorer.Client/NBXplorer.Client.csproj NBXplorer.Client/NBXplorer.Client.csproj
@ -10,7 +10,7 @@ RUN cd NBXplorer && \
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
FROM mcr.microsoft.com/dotnet/core/aspnet:2.1.9-stretch-slim-arm32v7
FROM mcr.microsoft.com/dotnet/core/aspnet:3.0.0-buster-slim-arm32v7
WORKDIR /datadir
WORKDIR /app

4
Dockerfile.linuxarm64v8
View File

@ -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/core/sdk:3.0.100-preview7 AS builder
FROM mcr.microsoft.com/dotnet/core/sdk:3.0.100 AS builder
WORKDIR /source
COPY NBXplorer/NBXplorer.csproj NBXplorer/NBXplorer.csproj
COPY NBXplorer.Client/NBXplorer.Client.csproj NBXplorer.Client/NBXplorer.Client.csproj
@ -10,7 +10,7 @@ RUN cd NBXplorer && \
dotnet publish --output /app/ --configuration Release /p:TargetFrameworkOverride=netcoreapp3.0
# 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/core/runtime:3.0.0-preview7-buster-slim-arm64v8
FROM mcr.microsoft.com/dotnet/core/aspnet:3.0.0-buster-slim-arm64v8
WORKDIR /datadir
WORKDIR /app

2
NBXplorer.Tests/NBXplorer.Tests.csproj
View File

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.1</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp3.0</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">$(TargetFrameworkOverride)</TargetFramework>
</PropertyGroup>
<ItemGroup>

5
NBXplorer.sln
View File

@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26730.3
# Visual Studio Version 16
VisualStudioVersion = 16.0.29318.209
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NBXplorer", "NBXplorer\NBXplorer.csproj", "{9C18B7C4-8FA8-4DBC-8E11-2C7C302D4CD9}"
EndProject
@ -14,6 +14,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionFiles", "SolutionFi
.circleci\config.yml = .circleci\config.yml
Dockerfile.linuxamd64 = Dockerfile.linuxamd64
Dockerfile.linuxarm32v7 = Dockerfile.linuxarm32v7
Dockerfile.linuxarm64v8 = Dockerfile.linuxarm64v8
EndProjectSection
EndProject
Global

4
NBXplorer/NBXplorer.csproj
View File

@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.1</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp3.0</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">$(TargetFrameworkOverride)</TargetFramework>
<Version>2.0.0.58</Version>
<Version>2.0.0.59</Version>
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\NBXplorer.xml</DocumentationFile>
<NoWarn>1701;1702;1705;1591;CS1591</NoWarn>
<LangVersion>7.3</LangVersion>