From edfa3efaa3c96a1dba2f689fbe42e7f20300d480 Mon Sep 17 00:00:00 2001
From: Natalia Portillo <claunia@claunia.com>
Date: Thu, 29 Apr 2021 15:22:14 +0100
Subject: [PATCH] Migrate to .NET Core 3.1 and .NET 5.0

---
 .../Claunia.Encoding.Tests.csproj             | 50 ++-----------------
 Claunia.Encoding.Tests/packages.config        |  4 --
 Claunia.Encoding/Claunia.Encoding.csproj      | 12 ++---
 3 files changed, 10 insertions(+), 56 deletions(-)
 delete mode 100644 Claunia.Encoding.Tests/packages.config

diff --git a/Claunia.Encoding.Tests/Claunia.Encoding.Tests.csproj b/Claunia.Encoding.Tests/Claunia.Encoding.Tests.csproj
index 8813f15..51c8b34 100644
--- a/Claunia.Encoding.Tests/Claunia.Encoding.Tests.csproj
+++ b/Claunia.Encoding.Tests/Claunia.Encoding.Tests.csproj
@@ -1,47 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\NUnit.3.11.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.11.0\build\NUnit.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{94C931C5-EA3A-4AB2-80F5-1BE083C237C3}</ProjectGuid>
     <OutputType>Library</OutputType>
     <RootNamespace>Claunia.Encoding.Tests</RootNamespace>
     <AssemblyName>Claunia.Encoding.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <ReleaseVersion>1.7</ReleaseVersion>
+    <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
+    <ReleaseVersion>1.8</ReleaseVersion>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="nunit.framework, Version=3.11.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb">
-      <HintPath>..\packages\NUnit.3.11.0\lib\net45\nunit.framework.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="LisaRoman.cs" />
-    <Compile Include="ATASCII.cs" />
-    <Compile Include="AtariST.cs" />
-    <Compile Include="GetEncs.cs" />
-    <Compile Include="Radix50.cs" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Claunia.Encoding\Claunia.Encoding.csproj">
       <Project>{85DA90BC-9F49-4579-B4D1-4FF2D5925D7F}</Project>
@@ -49,13 +14,6 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
+    <PackageReference Include="NUnit" Version="3.13.2" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\NUnit.3.11.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.11.0\build\NUnit.props'))" />
-  </Target>
 </Project>
\ No newline at end of file
diff --git a/Claunia.Encoding.Tests/packages.config b/Claunia.Encoding.Tests/packages.config
deleted file mode 100644
index 2f6bc1e..0000000
--- a/Claunia.Encoding.Tests/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="NUnit" version="3.11.0" targetFramework="net45" />
-</packages>
\ No newline at end of file
diff --git a/Claunia.Encoding/Claunia.Encoding.csproj b/Claunia.Encoding/Claunia.Encoding.csproj
index 40f5e8f..4a0fc72 100644
--- a/Claunia.Encoding/Claunia.Encoding.csproj
+++ b/Claunia.Encoding/Claunia.Encoding.csproj
@@ -8,18 +8,18 @@
     <AssemblyName>Claunia.Encoding</AssemblyName>
     <PackOnBuild>true</PackOnBuild>
     <PackageId>Claunia.Encoding</PackageId>
-    <PackageVersion>1.7</PackageVersion>
+    <PackageVersion>1.8</PackageVersion>
     <Authors>Natalia Portillo</Authors>
     <Owners>Natalia Portillo</Owners>
     <PackageProjectUrl>https://github.com/claunia/Claunia.Encoding</PackageProjectUrl>
     <Summary>Library to provide codepage conversion to and from archaic and old computer systems and Unicode.</Summary>
     <Title>Claunia.Encoding</Title>
     <Description>Library to provide codepage conversion to and from archaic and old computer systems and Unicode.</Description>
-    <PackageLicenseUrl>https://raw.githubusercontent.com/claunia/Claunia.Encoding/master/LICENSE.MIT</PackageLicenseUrl>
-    <ReleaseVersion>1.7</ReleaseVersion>
-    <PackageReleaseNotes>Support .NET Core and .NET Framework 4.0.</PackageReleaseNotes>
-    <TargetFrameworks>net40;netstandard2.0</TargetFrameworks>
-    <VersionPrefix>1.7</VersionPrefix>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <ReleaseVersion>1.8</ReleaseVersion>
+    <PackageReleaseNotes>Support .NET Core 3.1 and .NET 5.0.</PackageReleaseNotes>
+    <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
+    <VersionPrefix>1.8</VersionPrefix>
     <Company>Claunia.com</Company>
     <Copyright>© 2016-2021 Natalia Portillo</Copyright>
     <PackageProjectUrl>https://www.github.com/claunia/Claunia.Encoding</PackageProjectUrl>