From 8061434bde1218edbad169d053f8e8995b8203c1 Mon Sep 17 00:00:00 2001
From: Benito Palacios Sanchez <benito356@gmail.com>
Date: Sat, 13 Mar 2021 17:26:09 +0000
Subject: [PATCH] :arrow_up: Update build system for Ubuntu 20.04

---
 .config/dotnet-tools.json               |  2 +-
 .devcontainer/Dockerfile                | 17 +++++++----------
 .github/workflows/build-and-release.yml |  8 ++++----
 build.cake                              |  2 +-
 4 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index e36740f7..6cf141eb 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "cake.tool": {
-      "version": "1.0.0-rc0001",
+      "version": "1.1.0",
       "commands": [
         "dotnet-cake"
       ]
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 75ecdf22..424b9cec 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,20 +1,17 @@
-# TODO: Move to latest image after PleOps.Cake support Ubuntu 20.04
-# https://github.com/pleonex/PleOps.Cake/issues/35
-FROM mcr.microsoft.com/vscode/devcontainers/dotnetcore:0.148.1-3.1
+FROM mcr.microsoft.com/vscode/devcontainers/dotnet:5.0
 
-# Install .NET 5.0
-RUN apt-get update \
-    && export DEBIAN_FRONTEND=noninteractive \
-    && apt-get install -y apt-transport-https \
-    && wget https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
+# Install .NET Core 3.1
+RUN wget https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
     && dpkg -i packages-microsoft-prod.deb \
     && apt-get update \
-    && apt-get install -y dotnet-sdk-5.0
+    && apt-get install -y apt-transport-https \
+    && apt-get update \
+    && apt-get install -y aspnetcore-runtime-3.1
 
 # Install Mono (soon won't be necessary (.NET 6?))
 RUN apt install gnupg ca-certificates \
     && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF \
-    && echo "deb https://download.mono-project.com/repo/ubuntu stable-bionic main" >> /etc/apt/sources.list.d/mono-official-stable.list \
+    && echo "deb https://download.mono-project.com/repo/ubuntu stable-focal main" >> /etc/apt/sources.list.d/mono-official-stable.list \
     && apt update \
     && export DEBIAN_FRONTEND=noninteractive \
     && apt install -y mono-devel
diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml
index ee1bb5e0..fa2e7d50 100644
--- a/.github/workflows/build-and-release.yml
+++ b/.github/workflows/build-and-release.yml
@@ -11,7 +11,7 @@ on:
     tags: [ "v*" ]
 
 env:
-  NET_SDK: '5.0.101'
+  NET_SDK: '5.0.201'
 
 jobs:
   build_main:
@@ -30,7 +30,7 @@ jobs:
       - name: "Setup .NET Core 3.1 for Cake dependencies"
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: '3.1.404'
+          dotnet-version: '3.1.407'
 
       - name: "Install build tools"
         run: dotnet tool restore
@@ -79,7 +79,7 @@ jobs:
       - name: "Setup .NET Core 3.1 for Cake dependencies"
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: '3.1.404'
+          dotnet-version: '3.1.407'
 
       - name: "Install build tools"
         run: dotnet tool restore
@@ -117,7 +117,7 @@ jobs:
       - name: "Setup .NET Core 3.1 for Cake dependencies"
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: '3.1.404'
+          dotnet-version: '3.1.407'
 
       - name: "Install build tools"
         run: dotnet tool restore
diff --git a/build.cake b/build.cake
index b8b1c9aa..be2c4639 100644
--- a/build.cake
+++ b/build.cake
@@ -1,4 +1,4 @@
-#load "nuget:?package=PleOps.Cake&version=0.4.0"
+#load "nuget:?package=PleOps.Cake&version=0.4.1"
 
 Task("Define-Project")
     .Description("Fill specific project information")