Migrate from .NET Core 3.1 to .NET 6 (#2)

Konamiman · web-flow · commit aef0dc84542f · 2023-01-01T12:50:09.000+01:00
And change program version to 1.2
diff --git a/L80/L80.csproj b/L80/L80.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>Konamiman.M80dotNet.L80</RootNamespace>
     <OutputType>Exe</OutputType>
     <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
diff --git a/LIB80/LIB80.csproj b/LIB80/LIB80.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <RootNamespace>Konamiman.M80dotNet.LIB80</RootNamespace>
     <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
diff --git a/M80/M80.csproj b/M80/M80.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>Konamiman.M80dotNet.M80</RootNamespace>
     <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
     <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
diff --git a/README.md b/README.md
@@ -25,8 +25,8 @@ The Z80 binaries used are slightly modified versions of the originals; the chang
 
 Download the latest release and choose the variant you want to use:
 
-* **Portable:** Consists of multiple `.dll` files and runs on any platform having [the .NET Core Runtime 3.1](https://dotnet.microsoft.com/download/dotnet-core/3.1) installed.
-* **Framework-dependant:** Single file, platform-specific applications that also require the .NET Core Runtime 3.1 to be installed. This is the perhaps the most convenient variant for frequent use.
+* **Portable:** Consists of multiple `.dll` files and runs on any platform having [the .NET Runtime 6.0](https://dotnet.microsoft.com/en-us/download/dotnet/6.0) installed.
+* **Framework-dependant:** Single file, platform-specific applications that also require the .NET Runtime 6.0 to be installed. This is the perhaps the most convenient variant for frequent use.
 * **Self-contained:** Single file, platform-specific applications that have the .NET Core Runtime built-in and thus have no dependencies (at the expense of much bigger file sizes). These may be convenient for casual usage, or if you just want to give it a try before installing the .NET Runtime.
 
 Place the chosen variant in a PATH-accessible directory and then run
@@ -123,9 +123,9 @@ The `WINBUILD.BAT` script will use `cpm.exe` and the original `M80.COM` and `L80
 
 ## Building the wrappers
 
-The `Shared` project has a `PublishProfiles` folder containing a `build.sh` script and several `.pubxml` files, each containing a publish profile for each of the variants. The script (for Linux, it works on Windows 10 with WSL too) uses the `dotnet` tool to generate all the variants in the `Release` folder in the root directory of the project, you can just run it to build all the variants or pass the name of a publish profile (filename without the `.pubxml`) as a single argument.
+To build the wrappers you'll need [the .NET 6 SDK](https://dotnet.microsoft.com/en-us/download/dotnet/6.0). The `Shared` project has a `PublishProfiles` folder containing a `build.sh` script and several `.pubxml` files, each containing a publish profile for each of the variants. The script (for Linux, it works on Windows 10 with WSL too) uses the `dotnet` tool (part of the .NET SDK) to generate all the variants in the `Release` folder in the root directory of the project, you can just run it to build all the variants or pass the name of a publish profile (filename without the `.pubxml`) as a single argument.
 
-If you prefer a more IDE-centric approach for compilation, you can copy all the `.pubxml` files to the `Properties/PublishProfiles` directory of each project, then right-click the project in Visual Studio and select "Publish".
+You can also use [Visual Studio 2022](https://visualstudio.microsoft.com) for compiling the wrappers: copy all the `.pubxml` files to the `Properties/PublishProfiles` directory of each project, then right-click the project in Visual Studio and select "Publish".
 
 
 # Last but not least...
diff --git a/Shared/AssemblyInfo.cs b/Shared/AssemblyInfo.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("1.1")]
-[assembly: AssemblyFileVersion("1.1")]
+[assembly: AssemblyVersion("1.2")]
+[assembly: AssemblyFileVersion("1.2")]
diff --git a/Shared/ProgramRunner.cs b/Shared/ProgramRunner.cs
@@ -261,7 +261,7 @@ private void ShowBanner()
 
             Console.WriteLine(
 @$"{ProgramName} .NET wrapper {version}
-By Konamiman, 2020");
+By Konamiman, 2023");
         }
 
         private void ShowUsageHelp()
diff --git a/Shared/PublishProfiles/FrameworkDependant__linux_arm.pubxml b/Shared/PublishProfiles/FrameworkDependant__linux_arm.pubxml
@@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <Platform>Any CPU</Platform>
     <PublishDir>..\Release\FrameworkDependant\linux_arm</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RuntimeIdentifier>linux-arm</RuntimeIdentifier>
     <SelfContained>false</SelfContained>
     <PublishSingleFile>True</PublishSingleFile>
diff --git a/Shared/PublishProfiles/FrameworkDependant__linux_x64.pubxml b/Shared/PublishProfiles/FrameworkDependant__linux_x64.pubxml
@@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <Platform>Any CPU</Platform>
     <PublishDir>..\Release\FrameworkDependant\linux_x64</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
     <SelfContained>false</SelfContained>
     <PublishSingleFile>True</PublishSingleFile>
diff --git a/Shared/PublishProfiles/FrameworkDependant__osx_x64.pubxml b/Shared/PublishProfiles/FrameworkDependant__osx_x64.pubxml
@@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <Platform>Any CPU</Platform>
     <PublishDir>..\Release\FrameworkDependant\osx_x64</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RuntimeIdentifier>osx-x64</RuntimeIdentifier>
     <SelfContained>false</SelfContained>
     <PublishSingleFile>True</PublishSingleFile>
diff --git a/Shared/PublishProfiles/FrameworkDependant__win_arm.pubxml b/Shared/PublishProfiles/FrameworkDependant__win_arm.pubxml
@@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <Platform>Any CPU</Platform>
     <PublishDir>..\Release\FrameworkDependant\win_arm</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RuntimeIdentifier>win-arm</RuntimeIdentifier>
     <SelfContained>false</SelfContained>
     <PublishSingleFile>True</PublishSingleFile>
diff --git a/Shared/PublishProfiles/FrameworkDependant__win_x64.pubxml b/Shared/PublishProfiles/FrameworkDependant__win_x64.pubxml
@@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <Platform>Any CPU</Platform>
     <PublishDir>..\Release\FrameworkDependant\win_x64</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <SelfContained>false</SelfContained>
     <PublishSingleFile>True</PublishSingleFile>
diff --git a/Shared/PublishProfiles/FrameworkDependant__win_x86.pubxml b/Shared/PublishProfiles/FrameworkDependant__win_x86.pubxml
@@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <Platform>Any CPU</Platform>
     <PublishDir>..\Release\FrameworkDependant\win_x86</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RuntimeIdentifier>win-x86</RuntimeIdentifier>
     <SelfContained>false</SelfContained>
     <PublishSingleFile>True</PublishSingleFile>
diff --git a/Shared/PublishProfiles/Portable.pubxml b/Shared/PublishProfiles/Portable.pubxml
@@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <Platform>Any CPU</Platform>
     <PublishDir>..\Release\Portable</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <SelfContained>false</SelfContained>
   </PropertyGroup>
 </Project>
diff --git a/Shared/PublishProfiles/SelfContained__linux_arm.pubxml b/Shared/PublishProfiles/SelfContained__linux_arm.pubxml
@@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <Platform>Any CPU</Platform>
     <PublishDir>..\Release\SelfContained\linux_arm</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RuntimeIdentifier>linux-arm</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>True</PublishSingleFile>
diff --git a/Shared/PublishProfiles/SelfContained__linux_x64.pubxml b/Shared/PublishProfiles/SelfContained__linux_x64.pubxml
@@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <Platform>Any CPU</Platform>
     <PublishDir>..\Release\SelfContained\linux_x64</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>True</PublishSingleFile>
diff --git a/Shared/PublishProfiles/SelfContained__osx_x64.pubxml b/Shared/PublishProfiles/SelfContained__osx_x64.pubxml
@@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <Platform>Any CPU</Platform>
     <PublishDir>..\Release\SelfContained\osx_x64</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RuntimeIdentifier>osx-x64</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>True</PublishSingleFile>
diff --git a/Shared/PublishProfiles/SelfContained__win_arm.pubxml b/Shared/PublishProfiles/SelfContained__win_arm.pubxml
@@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <Platform>Any CPU</Platform>
     <PublishDir>..\Release\SelfContained\win_arm</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RuntimeIdentifier>win-arm</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>True</PublishSingleFile>
diff --git a/Shared/PublishProfiles/SelfContained__win_x64.pubxml b/Shared/PublishProfiles/SelfContained__win_x64.pubxml
@@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <Platform>Any CPU</Platform>
     <PublishDir>..\Release\SelfContained\win_x64</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>True</PublishSingleFile>
diff --git a/Shared/PublishProfiles/SelfContained__win_x86.pubxml b/Shared/PublishProfiles/SelfContained__win_x86.pubxml
@@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <Platform>Any CPU</Platform>
     <PublishDir>..\Release\SelfContained\win_x86</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RuntimeIdentifier>win-x86</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>True</PublishSingleFile>
diff --git a/Shared/PublishProfiles/build.sh b/Shared/PublishProfiles/build.sh
@@ -25,8 +25,8 @@ banner() {
 
 set -e
 
-if [ -z "$(which dotnet > /dev/null && dotnet --list-sdks | grep ^3.1.)" ]; then
-	output 1 "*** .NET SDK 3.1 is not installed! See https://docs.microsoft.com/dotnet/core/install/linux"
+if [ -z "$(which dotnet > /dev/null && dotnet --list-sdks | grep ^6.0.)" ]; then
+	output 1 "*** .NET SDK 6.0 is not installed! See https://docs.microsoft.com/dotnet/core/install/linux"
 	exit 1
 fi
 
diff --git a/Shared/PublishProfiles/zip.sh b/Shared/PublishProfiles/zip.sh
diff --git a/Shared/Shared.csproj b/Shared/Shared.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>Konamiman.M80dotNet</RootNamespace>
     <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
     <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>

Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,7 @@ private void ShowBanner()`
`261`	`261`
`262`	`262`	`Console.WriteLine(`
`263`	`263`	`@$"{ProgramName} .NET wrapper {version}`
`264`		`-By Konamiman, 2020");`
	`264`	`+By Konamiman, 2023");`
`265`	`265`	`}`
`266`	`266`
`267`	`267`	`private void ShowUsageHelp()`