Skip to content

Commit

Permalink
Merge pull request #167 from SceneGate/feature/update-build-ubuntu20
Browse files Browse the repository at this point in the history
Update build system for Ubuntu 20.04
  • Loading branch information
pleonex committed Mar 13, 2021
2 parents 1849bed + 8061434 commit 7d1b642
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"cake.tool": {
"version": "1.0.0-rc0001",
"version": "1.1.0",
"commands": [
"dotnet-cake"
]
Expand Down
17 changes: 7 additions & 10 deletions .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
8 changes: 4 additions & 4 deletions .github/workflows/build-and-release.yml
Expand Up @@ -11,7 +11,7 @@ on:
tags: [ "v*" ]

env:
NET_SDK: '5.0.101'
NET_SDK: '5.0.201'

jobs:
build_main:
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion 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")
Expand Down

0 comments on commit 7d1b642

Please sign in to comment.