UpTool
/
CC-Functions
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

.NET Standard 2.1 & .NET 5.0

This commit is contained in:
JFronny 2020-11-11 16:37:36 +01:00
parent 454d902f04
commit bb5ea72041
9 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -2,7 +2,7 @@
tags: tags:
- windows - windows
image: mcr.microsoft.com/dotnet/core/sdk image: mcr.microsoft.com/dotnet/sdk
uptool: uptool:
extends: extends:

2
.idea/.idea.CC-Functions/.idea/modules.xml
View File

@ -2,7 +2,7 @@
<project version="4"> <project version="4">
<component name="ProjectModuleManager"> <component name="ProjectModuleManager">
<modules> <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> </modules>
</component> </component>
</project> </project>

2
CLITest/CLITest.csproj
View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<LangVersion>8</LangVersion> <LangVersion>8</LangVersion>
</PropertyGroup> </PropertyGroup>

11
Commandline/TUI/Screen.cs
View File

@ -129,18 +129,17 @@ namespace CC_Functions.Commandline.TUI
break; break;
case ConsoleKey.Enter: case ConsoleKey.Enter:
if (selectable.Any() && selectable.Length >= TabPoint && selectable[TabPoint].Enabled) if (selectable.Any() && selectable.Length >= TabPoint && selectable[TabPoint].Enabled)
{
selectable[TabPoint].InvokeClick(this); selectable[TabPoint].InvokeClick(this);
render = true;
}
break; break;
case ConsoleKey.Escape: case ConsoleKey.Escape:
Close?.Invoke(this, new EventArgs()); Close?.Invoke(this, new EventArgs());
break; 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; render = true;
} }
if (_wndWidth != Console.WindowWidth || _wndHeight != Console.WindowHeight) if (_wndWidth != Console.WindowWidth || _wndHeight != Console.WindowHeight)

1
Commandline/TUI/TextBox.cs
View File

@ -135,7 +135,6 @@ namespace CC_Functions.Commandline.TUI
case ConsoleKey.Enter: case ConsoleKey.Enter:
if (lines.Length < Size.Height) if (lines.Length < Size.Height)
{ {
tmp = lines.ToList();
lines[Cursor.Y] = lines[Cursor.Y].Insert(Math.Max(Cursor.X, 0), "\n"); lines[Cursor.Y] = lines[Cursor.Y].Insert(Math.Max(Cursor.X, 0), "\n");
Cursor.Y++; Cursor.Y++;
Cursor.X = 0; Cursor.X = 0;

2
Core/Core.csproj
View File

@ -18,7 +18,7 @@
<FileVersion>1.0.0.0</FileVersion> <FileVersion>1.0.0.0</FileVersion>
<VersionSuffix>0.0</VersionSuffix> <VersionSuffix>0.0</VersionSuffix>
<PackageVersion>1.1.$(VersionSuffix)</PackageVersion> <PackageVersion>1.1.$(VersionSuffix)</PackageVersion>
<TargetFramework>netstandard2.0</TargetFramework> <TargetFramework>netstandard2.1</TargetFramework>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DocumentationFile>bin\Debug\Core.xml</DocumentationFile> <DocumentationFile>bin\Debug\Core.xml</DocumentationFile>

2
Misc/Misc.csproj
View File

@ -17,7 +17,7 @@
<FileVersion>1.0.0.0</FileVersion> <FileVersion>1.0.0.0</FileVersion>
<VersionSuffix>0.0</VersionSuffix> <VersionSuffix>0.0</VersionSuffix>
<PackageVersion>1.1.$(VersionSuffix)</PackageVersion> <PackageVersion>1.1.$(VersionSuffix)</PackageVersion>
<TargetFramework>netstandard2.0</TargetFramework> <TargetFramework>netstandard2.1</TargetFramework>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DocumentationFile>bin\Debug\Misc.xml</DocumentationFile> <DocumentationFile>bin\Debug\Misc.xml</DocumentationFile>

2
W32.Test/W32.Test.csproj
View File

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop"> <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<OutputType>WinExe</OutputType> <OutputType>WinExe</OutputType>
<RootNamespace>CC_Functions.W32.Test</RootNamespace> <RootNamespace>CC_Functions.W32.Test</RootNamespace>
<AssemblyName>CC_Functions.W32.Test</AssemblyName> <AssemblyName>CC_Functions.W32.Test</AssemblyName>

2
W32/W32.csproj
View File

@ -5,7 +5,7 @@
<AssemblyName>CC-Functions.W32</AssemblyName> <AssemblyName>CC-Functions.W32</AssemblyName>
<LangVersion>8</LangVersion> <LangVersion>8</LangVersion>
<UseWindowsForms>true</UseWindowsForms> <UseWindowsForms>true</UseWindowsForms>
<TargetFrameworks>net461;netcoreapp3.1</TargetFrameworks> <TargetFramework>net5.0</TargetFramework>
<Deterministic>false</Deterministic> <Deterministic>false</Deterministic>
<Authors>JFronny</Authors> <Authors>JFronny</Authors>
<Description>W32 Additions for CC-Functions</Description> <Description>W32 Additions for CC-Functions</Description>