Skip to content

Commit 931cb0e

Browse files
authored
Merge pull request #54 from pleonex/feature/upgrade-net6
Update dependencies to support .NET 6
2 parents e5855a0 + 90cf9a1 commit 931cb0e

10 files changed

+17
-20
lines changed

.devcontainer/Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM mcr.microsoft.com/vscode/devcontainers/dotnet:5.0
1+
FROM mcr.microsoft.com/vscode/devcontainers/dotnet:6.0
22

3-
# Install Mono (soon won't be necessary (.NET 6?))
4-
RUN apt install -y gnupg ca-certificates \
3+
# Install Mono (for DocFX)
4+
RUN apt install -y apt-transport-https dirmngr gnupg ca-certificates \
55
&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF \
6-
&& echo "deb https://download.mono-project.com/repo/ubuntu stable-focal main" >> /etc/apt/sources.list.d/mono-official-stable.list \
6+
&& echo "deb https://download.mono-project.com/repo/debian stable-buster main" >> /etc/apt/sources.list.d/mono-official-stable.list \
77
&& apt update \
88
&& export DEBIAN_FRONTEND=noninteractive \
99
&& apt install -y mono-devel

.devcontainer/devcontainer.json

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
{
2-
"name": "Dev (Ubuntu - .NET 5 and Mono)",
2+
"name": "Dev (.NET 6 and Mono)",
33
"build": {
44
"dockerfile": "Dockerfile",
55
},
66

7-
"settings": {
8-
"terminal.integrated.shell.linux": "/bin/bash"
9-
},
10-
117
"extensions": [
128
"ms-dotnettools.csharp",
139
"k--kato.docomment",

.github/workflows/build-and-release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
- published
1515

1616
env:
17-
NET_SDK: '5.0.402'
17+
NET_SDK: '6.0.100'
1818

1919
jobs:
2020
build:

README.md

+4-5
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@ pipeline in action!
1313

1414
## Requirements
1515

16-
- .NET 5 SDK
17-
- .NET Core 3.1 runtime
18-
- [Linux and MacOS only] Mono 6
16+
- .NET 6.0 SDK
17+
- [Linux and MacOS only] Mono 6 (for DocFX)
1918

2019
## Build system command
2120

@@ -44,8 +43,8 @@ information. For reference, this is the general build and release pipeline.
4443

4544
## Build
4645

47-
The project requires to build .NET 5 SDK (Linux and MacOS require also Mono). If
48-
you open the project with VS Code and you did install the
46+
The project requires to build .NET 6.0 SDK (Linux and MacOS require also Mono).
47+
If you open the project with VS Code and you did install the
4948
[VS Code Remote Containers](https://code.visualstudio.com/docs/remote/containers)
5049
extension, you can have an already pre-configured development environment with
5150
Docker or Podman.

docs/index.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ pipeline in action!
1515

1616
## Requirements
1717

18-
- .NET 5.0 SDK
19-
- .NET Core 3.1 runtime
18+
- .NET 6.0 SDK
19+
- [Linux and MacOS only] Mono 6 (for DocFX)
2020

2121
## Build system command
2222

src/Directory.Build.props

+1
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,6 @@
1212
<RepositoryUrl>https://github.com/pleonex/PleOps.Cake</RepositoryUrl>
1313
<PackageIcon>icon.png</PackageIcon>
1414
<PackageTags>netcore;csharp;devops;pipeline;github-actions</PackageTags>
15+
<PackageReadmeFile>README.md</PackageReadmeFile>
1516
</PropertyGroup>
1617
</Project>

src/PleOps.Cake/PleOps.Cake.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,6 @@
1313
<ItemGroup>
1414
<None Include="*.cake" Pack="true" PackagePath="build" />
1515
<None Include="../../docs/images/logo_128.png" Pack="true" PackagePath="$(PackageIcon)" Visible="false" />
16+
<None Include="../../README.md" Pack="true" PackagePath="$(PackageReadmeFile)"/>
1617
</ItemGroup>
1718
</Project>

src/PleOps.Cake/build.cake

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#load "setup.cake"
2-
#tool dotnet:?package=ThirdLicense&version=1.1.0
2+
#tool dotnet:?package=ThirdLicense&version=1.2.0
33

44
Task("Build")
55
.Description("Build the project")

src/PleOps.Cake/documentation.cake

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#load "setup.cake"
22

3-
#tool nuget:?package=docfx.console&version=2.58.4
3+
#tool nuget:?package=docfx.console&version=2.58.9
44
#addin nuget:?package=Cake.DocFx&version=1.0.0
55
#addin nuget:?package=Cake.Git&version=1.1.0
66

src/PleOps.Cake/setup.cake

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#addin nuget:?package=Cake.Git&version=1.1.0
2-
#tool dotnet:?package=GitVersion.Tool&version=5.7.0
2+
#tool dotnet:?package=GitVersion.Tool&version=5.8.1
33
using System.Collections.ObjectModel;
44
using System.Runtime.InteropServices;
55
using System.Reflection;

0 commit comments

Comments
 (0)