diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index e9f29173..c0df60ac 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,17 +1,9 @@ FROM mcr.microsoft.com/vscode/devcontainers/dotnet:6.0 -# 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 apt-transport-https \ - && apt-get update \ - && apt-get install -y aspnetcore-runtime-3.1 - -# Install Mono -RUN apt install -y gnupg ca-certificates \ +# Install Mono (for DocFX) +RUN apt install -y apt-transport-https dirmngr 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-focal main" >> /etc/apt/sources.list.d/mono-official-stable.list \ + && echo "deb https://download.mono-project.com/repo/debian stable-buster main" >> tee /etc/apt/sources.list.d/mono-official-stable.list \ && apt update \ && export DEBIAN_FRONTEND=noninteractive \ && apt install -y mono-devel diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index de5a6541..77f5949d 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,5 +1,5 @@ { - "name": "Dev (Ubuntu - .NET 6, 3.1 and Mono)", + "name": "Dev (.NET 6 and Mono)", "build": { "dockerfile": "Dockerfile", }, @@ -18,7 +18,7 @@ "remoteUser": "vscode", - // Required for Podman (Docker alternative) + // PODMAN ONLY. You may need to remove this line for Docker. // SELinux issues: https://github.com/containers/podman/issues/3683 "runArgs": [ "--security-opt", "label=disable", "--userns=keep-id" ], @@ -26,4 +26,4 @@ "containerEnv": { "HOME": "/home/vscode" } -} +} \ No newline at end of file diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml index ade4b966..230ad410 100644 --- a/.github/workflows/build-and-release.yml +++ b/.github/workflows/build-and-release.yml @@ -12,7 +12,6 @@ on: env: NET_SDK: '6.0.100' - NET31_SDK: '3.1.415' jobs: build_main: @@ -28,10 +27,6 @@ jobs: uses: actions/setup-dotnet@v1 with: dotnet-version: ${{ env.NET_SDK }} - - name: "Setup .NET Core 3.1 for Cake dependencies" - uses: actions/setup-dotnet@v1 - with: - dotnet-version: ${{ env.NET31_SDK }} - name: "Install build tools" run: dotnet tool restore @@ -77,10 +72,6 @@ jobs: uses: actions/setup-dotnet@v1 with: dotnet-version: ${{ env.NET_SDK }} - - name: "Setup .NET Core 3.1 for Cake dependencies" - uses: actions/setup-dotnet@v1 - with: - dotnet-version: ${{ env.NET31_SDK }} - name: "Install build tools" run: dotnet tool restore @@ -115,10 +106,6 @@ jobs: uses: actions/setup-dotnet@v1 with: dotnet-version: ${{ env.NET_SDK }} - - name: "Setup .NET Core 3.1 for Cake dependencies" - uses: actions/setup-dotnet@v1 - with: - dotnet-version: ${{ env.NET31_SDK }} - name: "Install build tools" run: dotnet tool restore diff --git a/.vscode/launch.json b/.vscode/launch.json index 8fed6033..5af176fe 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -6,7 +6,7 @@ "type": "coreclr", "request": "launch", "preLaunchTask": "Cake: Run Build for release", - "program": "${workspaceFolder}/src/Yarhl.PerformanceTests/bin/Release/net5.0/Yarhl.PerformanceTests.dll", + "program": "${workspaceFolder}/src/Yarhl.PerformanceTests/bin/Release/net6.0/Yarhl.PerformanceTests.dll", "args": [ "auto" ], "cwd": "${workspaceFolder}", "stopAtEntry": false, diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a6cbb112..1b80709a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -14,7 +14,7 @@ provide an small snippet of code that reproduces the issue. Try to provide also the following information: - OS: Linux / Windows / Mac OS -- Runtime: .NET Framework, Mono, .NET Core, .NET 5 +- Runtime: .NET Framework, Mono, .NET 6 - Version of Yarhl - Stacktrace if any - What's happening and what you expect to happen diff --git a/README.md b/README.md index 7ed0a289..7d048de6 100644 --- a/README.md +++ b/README.md @@ -33,8 +33,7 @@ Stable releases are available from nuget.org: The libraries target .NET Standard 2.0. The tests (so the library) runs with the supported runtimes: -- .NET 5.0 -- .NET Core 3.1 +- .NET 6.0 - .NET Framework 4.8 or Mono (latest on CI) Preview releases can be found in this @@ -53,9 +52,8 @@ your solution (.sln) file with the following content: ## Build -The project requires to build .NET 5.0 SDK, .NET Core 3.1 runtime and .NET -Framework 4.8 or latest Mono. If you open the project with VS Code and you did -install the +The project requires to build .NET 6.0 SDK and .NET Framework 4.8 or latest +Mono. If you open the project with VS Code and you did install the [VS Code Remote Containers](https://code.visualstudio.com/docs/remote/containers) extension, you can have an already pre-configured development environment with Docker or Podman. diff --git a/build.cake b/build.cake index 524ef67b..5d1fd3d2 100644 --- a/build.cake +++ b/build.cake @@ -1,4 +1,4 @@ -#load "nuget:?package=PleOps.Cake&version=0.5.1" +#load "nuget:?package=PleOps.Cake&version=0.6.1" Task("Define-Project") .Description("Fill specific project information") diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 29d2c5b7..2cb8a764 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -5,6 +5,7 @@ Copyright (C) 2019 SceneGate true + NETSDK1179 @@ -13,6 +14,7 @@ https://github.com/SceneGate/Yarhl icon.png translation;localization;romhacking;fan-translation + README.md diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 40aeda6b..66eadff5 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -17,7 +17,7 @@ - - + + diff --git a/src/Yarhl.IntegrationTests/Yarhl.IntegrationTests.csproj b/src/Yarhl.IntegrationTests/Yarhl.IntegrationTests.csproj index 7c6a6e62..651a5861 100644 --- a/src/Yarhl.IntegrationTests/Yarhl.IntegrationTests.csproj +++ b/src/Yarhl.IntegrationTests/Yarhl.IntegrationTests.csproj @@ -3,7 +3,7 @@ Plugin integration tests for Yarhl. - netcoreapp3.1;net48;net6.0 + net48;net6.0 diff --git a/src/Yarhl.UnitTests/Yarhl.UnitTests.csproj b/src/Yarhl.UnitTests/Yarhl.UnitTests.csproj index e64fde5e..14aec40f 100644 --- a/src/Yarhl.UnitTests/Yarhl.UnitTests.csproj +++ b/src/Yarhl.UnitTests/Yarhl.UnitTests.csproj @@ -3,7 +3,7 @@ Yarhl unit tests. - netcoreapp3.1;net48;net6.0 + net48;net6.0 9.0 diff --git a/src/Yarhl/Yarhl.csproj b/src/Yarhl/Yarhl.csproj index ac4a9dd9..dc7b51d2 100644 --- a/src/Yarhl/Yarhl.csproj +++ b/src/Yarhl/Yarhl.csproj @@ -9,7 +9,7 @@ - +