⬆️ Migrate to .NET 6

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "cake.tool": {
-      "version": "1.1.0",
+      "version": "2.1.0",
       "commands": [
         "dotnet-cake"
       ]

.devcontainer/Dockerfile

@@ -1,17 +1,9 @@
-FROM mcr.microsoft.com/vscode/devcontainers/dotnet:5.0
+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 (soon won't be necessary (.NET 6?))
-RUN apt install 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" >> /etc/apt/sources.list.d/mono-official-stable.list \
     && apt update \
     && export DEBIAN_FRONTEND=noninteractive \
     && apt install -y mono-devel

.devcontainer/devcontainer.json

@@ -1,11 +1,7 @@
 {
-    "name": "Dev (Ubuntu - .NET 5, 3.1 and Mono)",
+    "name": "Dev (.NET 6 and Mono)",
     "build": {
-        "dockerfile": "Dockerfile"
-    },
-
-    "settings": {
-        "terminal.integrated.shell.linux": "/bin/bash"
+        "dockerfile": "Dockerfile",
     },
 
     "extensions": [

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

@@ -14,7 +14,7 @@ on:
       - published
 
 env:
-  NET_SDK: '5.0.203'
+  NET_SDK: '6.0.200'
 
 jobs:
   build_main:
@@ -31,10 +31,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: '3.1.409'
 
       - name: "Install build tools"
         run: dotnet tool restore
@@ -81,10 +77,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: '3.1.409'
 
       - name: "Install build tools"
         run: dotnet tool restore
@@ -119,10 +111,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: '3.1.409'
 
       - name: "Install build tools"
         run: dotnet tool restore

README.md

@@ -3,7 +3,7 @@
 [Yarhl](https://github.com/SceneGate/yarhl) plugin for Nintendo DS common
 formats.
 
-The library supports .NET 5.0 and above on Linux, Window and MacOS.
+The library supports .NET 6.0 and above on Linux, Window and MacOS.
 
 <!-- prettier-ignore -->
 | Release | Package                                                           |
@@ -26,9 +26,8 @@ Check our on-line [API documentation](https://scenegate.github.io/Ekona/).
 
 ## 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.

build.cake

@@ -1,4 +1,4 @@
-#load "nuget:?package=PleOps.Cake&version=0.4.2"
+#load "nuget:?package=PleOps.Cake&version=0.7.0"
 
 Task("Define-Project")
     .Description("Fill specific project information")

docs/docfx.json

@@ -4,7 +4,7 @@
         "src": [
           {
             "files": [
-              "Ekona/Ekona.csproj"
+              "Ekona/bin/**/SceneGate.Ekona.dll"
             ],
             "src": "../src"
           }

src/Directory.Build.props

@@ -6,13 +6,15 @@
         <Copyright>Copyright (C) 2021 SceneGate</Copyright>
 
         <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+        <NoWarn>NETSDK1179</NoWarn>
     </PropertyGroup>
 
     <PropertyGroup>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <PackageProjectUrl>https://github.com/SceneGate/Ekona</PackageProjectUrl>
         <RepositoryUrl>https://github.com/SceneGate/Ekona</RepositoryUrl>
         <!--<PackageIcon>icon.png</PackageIcon>-->
+        <PackageReadmeFile>README.md</PackageReadmeFile>
         <PackageTags>reverse-engineering;scenegate;nds</PackageTags>
     </PropertyGroup>
 

src/Directory.Packages.props

@@ -1,21 +1,21 @@
 <Project>
     <!-- Centralize dependency management -->
     <ItemGroup>
-        <PackageVersion Include="Yarhl" Version="3.1.1-preview.28" />
-        <PackageVersion Include="Texim" Version="0.1.0-preview.103" />
+        <PackageVersion Include="Yarhl" Version="4.0.0-preview.153" />
+        <PackageVersion Include="Texim" Version="0.1.0-preview.113" />
         <PackageVersion Include="System.Data.HashFunction.CRC" Version="2.0.0" />
 
-        <PackageVersion Include="YamlDotNet" Version="11.1.1" />
-        <PackageVersion Include="FluentAssertions" Version="5.10.3" />
+        <PackageVersion Include="YamlDotNet" Version="11.2.1" />
+        <PackageVersion Include="FluentAssertions" Version="6.5.1" />
         <PackageVersion Include="nunit" Version="3.13.2" />
-        <PackageVersion Include="NUnit3TestAdapter" Version="3.17.0" />
-        <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="16.9.4"/>
-        <PackageVersion Include="coverlet.collector" Version="3.0.3" />
+        <PackageVersion Include="NUnit3TestAdapter" Version="4.2.1" />
+        <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.1.0"/>
+        <PackageVersion Include="coverlet.collector" Version="3.1.2" />
 
-        <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.0.0" />
+        <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
 
         <PackageVersion Include="StyleCop.Analyzers" Version="1.1.118" />
-        <PackageVersion Include="SonarAnalyzer.CSharp" Version="8.23.0.32424" />
-        <PackageVersion Include="Roslynator.Analyzers" Version="3.1.0" />
+        <PackageVersion Include="SonarAnalyzer.CSharp" Version="8.36.1.44192" />
+        <PackageVersion Include="Roslynator.Analyzers" Version="4.0.2" />
     </ItemGroup>
 </Project>

src/Ekona.Tests/Ekona.Tests.csproj

@@ -4,7 +4,7 @@
     <AssemblyName>SceneGate.Ekona.Tests</AssemblyName>
     <RootNamespace>SceneGate.Ekona.Tests</RootNamespace>
     <Description>Tests for Ekona.</Description>
-    <TargetFrameworks>net5.0</TargetFrameworks>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -18,8 +18,8 @@
     <PackageReference Include="coverlet.collector" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Content Include="Resources\**\*" CopyToOutputDirectory="PreserveNewest" />
+  <ItemGroup>
+    <Content Include="Resources\**\*" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
 </Project>

src/Ekona.Tests/Resources/.gitignore

@@ -1 +1,3 @@
-*/
+*.nds
+*.banner
+*.png

src/Ekona.Tests/Resources/Containers/banner.txt

@@ -0,0 +1,3 @@
+PSL_VPYJ2P_00.banner
+METALMAX3_BM9JQC_00.banner
+NINOKUNI_B2KJHF_00.banner

src/Ekona.Tests/Resources/Containers/header.txt

@@ -0,0 +1,3 @@
+PSL_VPYJ2P_00.header.yml,PSL_VPYJ2P_00.nds
+NINOKUNI_B2KJHF_00.header.yml,NINOKUNI_B2KJHF_00.nds
+METALMAX3_BM9JQC_00.header.yml,METALMAX3_BM9JQC_00.nds

src/Ekona.Tests/Resources/Containers/rom.txt

@@ -0,0 +1,3 @@
+#PSL_VPYJ2P_00.yml,PSL_VPYJ2P_00.nds
+METALMAX3_BM9JQC_00.yml,METALMAX3_BM9JQC_00.nds
+#NINOKUNI_B2KJHF_00.yml,NINOKUNI_B2KJHF_00.nds

src/Ekona/Ekona.csproj

@@ -4,9 +4,13 @@
     <AssemblyName>SceneGate.Ekona</AssemblyName>
     <RootNamespace>SceneGate.Ekona</RootNamespace>
     <Description>Library for NDS file formats.</Description>
-    <TargetFrameworks>net5.0</TargetFrameworks>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Include="../../README.md" Pack="true" PackagePath="$(PackageReadmeFile)" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Yarhl" />
     <PackageReference Include="Texim" />