From bb5ea720416f22ce68aa07e0760c0ebb396ce59a Mon Sep 17 00:00:00 2001
From: JFronny <33260128+JFronny@users.noreply.github.com>
Date: Wed, 11 Nov 2020 16:37:36 +0100
Subject: [PATCH] .NET Standard 2.1 & .NET 5.0

---
 .gitlab-ci.yml                             |  2 +-
 .idea/.idea.CC-Functions/.idea/modules.xml |  2 +-
 CLITest/CLITest.csproj                     |  2 +-
 Commandline/TUI/Screen.cs                  | 11 +++++------
 Commandline/TUI/TextBox.cs                 |  1 -
 Core/Core.csproj                           |  2 +-
 Misc/Misc.csproj                           |  2 +-
 W32.Test/W32.Test.csproj                   |  2 +-
 W32/W32.csproj                             |  2 +-
 9 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 88384e9..12c3e69 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,7 @@
   tags:
   - windows
 
-image: mcr.microsoft.com/dotnet/core/sdk
+image: mcr.microsoft.com/dotnet/sdk
 
 uptool:
   extends:
diff --git a/.idea/.idea.CC-Functions/.idea/modules.xml b/.idea/.idea.CC-Functions/.idea/modules.xml
index 3eaf66f..6029ade 100644
--- a/.idea/.idea.CC-Functions/.idea/modules.xml
+++ b/.idea/.idea.CC-Functions/.idea/modules.xml
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/.idea.CC-Functions/riderModule.iml" filepath="$PROJECT_DIR$/.idea/.idea.CC-Functions/riderModule.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/.idea.CC-Functions/.idea/riderModule.iml" filepath="$PROJECT_DIR$/.idea/.idea.CC-Functions/.idea/riderModule.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/CLITest/CLITest.csproj b/CLITest/CLITest.csproj
index 86a92c3..fa14f65 100644
--- a/CLITest/CLITest.csproj
+++ b/CLITest/CLITest.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
         <LangVersion>8</LangVersion>
     </PropertyGroup>
 
diff --git a/Commandline/TUI/Screen.cs b/Commandline/TUI/Screen.cs
index 40ae61f..d2fcb0e 100644
--- a/Commandline/TUI/Screen.cs
+++ b/Commandline/TUI/Screen.cs
@@ -129,18 +129,17 @@ namespace CC_Functions.Commandline.TUI
                         break;
                     case ConsoleKey.Enter:
                         if (selectable.Any() && selectable.Length >= TabPoint && selectable[TabPoint].Enabled)
-                        {
                             selectable[TabPoint].InvokeClick(this);
-                            render = true;
-                        }
                         break;
                     case ConsoleKey.Escape:
                         Close?.Invoke(this, new EventArgs());
                         break;
+                    default:
+                        if (selectable.Any() && selectable.Length >= TabPoint && selectable[TabPoint].Enabled)
+                            selectable[TabPoint].InvokeInput(this, input);
+                        InvokeInput(this, input);
+                        break;
                 }
-                if (selectable.Any() && selectable.Length >= TabPoint && selectable[TabPoint].Enabled)
-                    selectable[TabPoint].InvokeInput(this, input);
-                InvokeInput(this, input);
                 render = true;
             }
             if (_wndWidth != Console.WindowWidth || _wndHeight != Console.WindowHeight)
diff --git a/Commandline/TUI/TextBox.cs b/Commandline/TUI/TextBox.cs
index ab67c83..fb87979 100644
--- a/Commandline/TUI/TextBox.cs
+++ b/Commandline/TUI/TextBox.cs
@@ -135,7 +135,6 @@ namespace CC_Functions.Commandline.TUI
                 case ConsoleKey.Enter:
                     if (lines.Length < Size.Height)
                     {
-                        tmp = lines.ToList();
                         lines[Cursor.Y] = lines[Cursor.Y].Insert(Math.Max(Cursor.X, 0), "\n");
                         Cursor.Y++;
                         Cursor.X = 0;
diff --git a/Core/Core.csproj b/Core/Core.csproj
index ad08b0b..75cf4d4 100644
--- a/Core/Core.csproj
+++ b/Core/Core.csproj
@@ -18,7 +18,7 @@
         <FileVersion>1.0.0.0</FileVersion>
         <VersionSuffix>0.0</VersionSuffix>
         <PackageVersion>1.1.$(VersionSuffix)</PackageVersion>
-        <TargetFramework>netstandard2.0</TargetFramework>
+        <TargetFramework>netstandard2.1</TargetFramework>
     </PropertyGroup>
     <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
         <DocumentationFile>bin\Debug\Core.xml</DocumentationFile>
diff --git a/Misc/Misc.csproj b/Misc/Misc.csproj
index 9aa0895..8d2e54c 100644
--- a/Misc/Misc.csproj
+++ b/Misc/Misc.csproj
@@ -17,7 +17,7 @@
     <FileVersion>1.0.0.0</FileVersion>
     <VersionSuffix>0.0</VersionSuffix>
     <PackageVersion>1.1.$(VersionSuffix)</PackageVersion>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DocumentationFile>bin\Debug\Misc.xml</DocumentationFile>
diff --git a/W32.Test/W32.Test.csproj b/W32.Test/W32.Test.csproj
index 7e7570a..5c6824f 100644
--- a/W32.Test/W32.Test.csproj
+++ b/W32.Test/W32.Test.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <OutputType>WinExe</OutputType>
     <RootNamespace>CC_Functions.W32.Test</RootNamespace>
     <AssemblyName>CC_Functions.W32.Test</AssemblyName>
diff --git a/W32/W32.csproj b/W32/W32.csproj
index 4bded92..7594dd8 100644
--- a/W32/W32.csproj
+++ b/W32/W32.csproj
@@ -5,7 +5,7 @@
     <AssemblyName>CC-Functions.W32</AssemblyName>
     <LangVersion>8</LangVersion>
     <UseWindowsForms>true</UseWindowsForms>
-    <TargetFrameworks>net461;netcoreapp3.1</TargetFrameworks>
+    <TargetFramework>net5.0</TargetFramework>
     <Deterministic>false</Deterministic>
     <Authors>JFronny</Authors>
     <Description>W32 Additions for CC-Functions</Description>