From 7efe694d59127b45e8fa135a6b1ef404d6d65ad3 Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Thu, 5 Dec 2019 21:45:51 +0900
Subject: [PATCH] bump the generator to 3.1

---
 docker-compose-generator/docker-compose-generator.sln     | 5 +++--
 docker-compose-generator/linuxamd64.Dockerfile            | 4 ++--
 docker-compose-generator/linuxarm32v7.Dockerfile          | 4 ++--
 docker-compose-generator/linuxarm64v8.Dockerfile          | 8 ++++----
 .../src/docker-compose-generator.csproj                   | 2 +-
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/docker-compose-generator/docker-compose-generator.sln b/docker-compose-generator/docker-compose-generator.sln
index 30e85e0..ff3f2a9 100644
--- a/docker-compose-generator/docker-compose-generator.sln
+++ b/docker-compose-generator/docker-compose-generator.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26124.0
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29519.181
 MinimumVisualStudioVersion = 15.0.26124.0
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "docker-compose-generator", "src\docker-compose-generator.csproj", "{0900AF35-48E8-46E2-85B3-BA3847EE0844}"
 EndProject
@@ -10,6 +10,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{8C1C711D-D
 		..\.circleci\config.yml = ..\.circleci\config.yml
 		linuxamd64.Dockerfile = linuxamd64.Dockerfile
 		linuxarm32v7.Dockerfile = linuxarm32v7.Dockerfile
+		linuxarm64v8.Dockerfile = linuxarm64v8.Dockerfile
 	EndProjectSection
 EndProject
 Global
diff --git a/docker-compose-generator/linuxamd64.Dockerfile b/docker-compose-generator/linuxamd64.Dockerfile
index 63cb6ac..feadb57 100644
--- a/docker-compose-generator/linuxamd64.Dockerfile
+++ b/docker-compose-generator/linuxamd64.Dockerfile
@@ -1,5 +1,5 @@
 #
-FROM mcr.microsoft.com/dotnet/core/sdk:2.1.505-alpine3.7 AS builder
+FROM mcr.microsoft.com/dotnet/core/sdk:3.1.100 AS builder
 WORKDIR /source
 COPY src/docker-compose-generator.csproj docker-compose-generator.csproj
 # Cache some dependencies
@@ -8,7 +8,7 @@ COPY src/. .
 RUN dotnet publish --output /app/ --configuration Release
 
 #
-FROM mcr.microsoft.com/dotnet/core/runtime:2.1.9-alpine3.7
+FROM mcr.microsoft.com/dotnet/core/runtime:3.1.0-buster-slim
 LABEL org.btcpayserver.image=docker-compose-generator
 WORKDIR /datadir
 WORKDIR /app
diff --git a/docker-compose-generator/linuxarm32v7.Dockerfile b/docker-compose-generator/linuxarm32v7.Dockerfile
index b91f0d9..597414a 100644
--- a/docker-compose-generator/linuxarm32v7.Dockerfile
+++ b/docker-compose-generator/linuxarm32v7.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/core/sdk:2.1.505 AS builder
+FROM mcr.microsoft.com/dotnet/core/sdk:3.1.100 AS builder
 WORKDIR /source
 COPY src/docker-compose-generator.csproj docker-compose-generator.csproj
 # Cache some dependencies
@@ -8,7 +8,7 @@ COPY src/. .
 RUN 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/runtime:2.1.9-stretch-slim-arm32v7
+FROM mcr.microsoft.com/dotnet/core/runtime:3.1.0-buster-slim-arm32v7
 LABEL org.btcpayserver.image=docker-compose-generator
 WORKDIR /datadir
 
diff --git a/docker-compose-generator/linuxarm64v8.Dockerfile b/docker-compose-generator/linuxarm64v8.Dockerfile
index 3b16bd7..a247d82 100644
--- a/docker-compose-generator/linuxarm64v8.Dockerfile
+++ b/docker-compose-generator/linuxarm64v8.Dockerfile
@@ -1,14 +1,14 @@
 # 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.1.100 AS builder
 WORKDIR /source
 COPY src/docker-compose-generator.csproj docker-compose-generator.csproj
 # Cache some dependencies
-RUN dotnet restore /p:TargetFrameworkOverride=netcoreapp3.0
+RUN dotnet restore
 COPY src/. .
-RUN dotnet publish --output /app/ --configuration Release /p:TargetFrameworkOverride=netcoreapp3.0
+RUN 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/runtime:3.0.0-preview7-buster-slim-arm64v8
+FROM mcr.microsoft.com/dotnet/core/runtime:3.1.0-buster-slim-arm64v8
 LABEL org.btcpayserver.image=docker-compose-generator
 WORKDIR /datadir
 
diff --git a/docker-compose-generator/src/docker-compose-generator.csproj b/docker-compose-generator/src/docker-compose-generator.csproj
index 2cbdedd..831e3b6 100644
--- a/docker-compose-generator/src/docker-compose-generator.csproj
+++ b/docker-compose-generator/src/docker-compose-generator.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <LangVersion>7.3</LangVersion>
-	<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.1</TargetFramework>
+	<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp3.1</TargetFramework>
   <TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">$(TargetFrameworkOverride)</TargetFramework>
 	<RootNamespace>DockerGenerator</RootNamespace>
   </PropertyGroup>