mirror of
https://github.com/tonytins/tomas.git
synced 2025-03-15 04:11:24 +00:00
Refreshed project to target .NET 6 and latest userkit
- Fixed a slight oversight
This commit is contained in:
parent
4f0863f429
commit
7c16857c9a
13 changed files with 182 additions and 16 deletions
|
@ -7,10 +7,10 @@ TOMAS (**To**ny's **Ma**naged Operating **S**ystem) is a operating system based
|
||||||
### Prerequisites
|
### Prerequisites
|
||||||
|
|
||||||
- Operating System
|
- Operating System
|
||||||
- Visual Studio 2019
|
- Visual Studio 2022
|
||||||
- COSMOS User Kit v20190508 or later
|
- COSMOS User Kit v2022 or later
|
||||||
- VMWare Workstation Player
|
- VMWare Workstation Player
|
||||||
- .NET Core 3.1 or later
|
- .NET 6 or later
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,10 +1,8 @@
|
||||||
|
|
||||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||||
# Visual Studio Version 16
|
# Visual Studio Version 17
|
||||||
VisualStudioVersion = 16.0.29709.97
|
VisualStudioVersion = 17.4.33205.214
|
||||||
MinimumVisualStudioVersion = 10.0.40219.1
|
MinimumVisualStudioVersion = 10.0.40219.1
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tomas.Kernel", "Tomas.Kernel\Tomas.Kernel.csproj", "{AF6338C3-342A-4A12-A25C-2D53C5568DA8}"
|
|
||||||
EndProject
|
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tomas.Common", "Tomas.Common\Tomas.Common.csproj", "{C50F3A6F-CFF4-4725-A1A5-21C5A2BC3321}"
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tomas.Common", "Tomas.Common\Tomas.Common.csproj", "{C50F3A6F-CFF4-4725-A1A5-21C5A2BC3321}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{59C9B3FC-B1EE-4C23-9BD9-D33074BF1334}"
|
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{59C9B3FC-B1EE-4C23-9BD9-D33074BF1334}"
|
||||||
|
@ -15,9 +13,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
|
||||||
TOMAS.sln.licenseheader = TOMAS.sln.licenseheader
|
TOMAS.sln.licenseheader = TOMAS.sln.licenseheader
|
||||||
EndProjectSection
|
EndProjectSection
|
||||||
EndProject
|
EndProject
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tomas.Interface", "Tomas.Interface\Tomas.Interface.csproj", "{DAA9EDF4-83C7-4271-9805-FD6CE29E1796}"
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tomas.Interface", "Tomas.Interface\Tomas.Interface.csproj", "{DAA9EDF4-83C7-4271-9805-FD6CE29E1796}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tomas.Terminal", "Tomas.Terminal\Tomas.Terminal.csproj", "{49E67E55-F9D2-419A-8097-38F39E98A95E}"
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tomas.Terminal", "Tomas.Terminal\Tomas.Terminal.csproj", "{49E67E55-F9D2-419A-8097-38F39E98A95E}"
|
||||||
|
EndProject
|
||||||
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tomas.Kernal", "Tomas.Kernal\Tomas.Kernal.csproj", "{20750C95-A3C7-4958-BA9F-56E4C3BD0293}"
|
||||||
EndProject
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
|
@ -25,10 +25,6 @@ Global
|
||||||
Release|Any CPU = Release|Any CPU
|
Release|Any CPU = Release|Any CPU
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||||
{AF6338C3-342A-4A12-A25C-2D53C5568DA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{AF6338C3-342A-4A12-A25C-2D53C5568DA8}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{AF6338C3-342A-4A12-A25C-2D53C5568DA8}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{AF6338C3-342A-4A12-A25C-2D53C5568DA8}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{C50F3A6F-CFF4-4725-A1A5-21C5A2BC3321}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{C50F3A6F-CFF4-4725-A1A5-21C5A2BC3321}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{C50F3A6F-CFF4-4725-A1A5-21C5A2BC3321}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{C50F3A6F-CFF4-4725-A1A5-21C5A2BC3321}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{C50F3A6F-CFF4-4725-A1A5-21C5A2BC3321}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{C50F3A6F-CFF4-4725-A1A5-21C5A2BC3321}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
@ -41,6 +37,10 @@ Global
|
||||||
{49E67E55-F9D2-419A-8097-38F39E98A95E}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{49E67E55-F9D2-419A-8097-38F39E98A95E}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{49E67E55-F9D2-419A-8097-38F39E98A95E}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{49E67E55-F9D2-419A-8097-38F39E98A95E}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{49E67E55-F9D2-419A-8097-38F39E98A95E}.Release|Any CPU.Build.0 = Release|Any CPU
|
{49E67E55-F9D2-419A-8097-38F39E98A95E}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{20750C95-A3C7-4958-BA9F-56E4C3BD0293}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{20750C95-A3C7-4958-BA9F-56E4C3BD0293}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{20750C95-A3C7-4958-BA9F-56E4C3BD0293}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{20750C95-A3C7-4958-BA9F-56E4C3BD0293}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
|
|
24
src/Tomas.Kernal/Kernel.cs
Normal file
24
src/Tomas.Kernal/Kernel.cs
Normal file
|
@ -0,0 +1,24 @@
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Text;
|
||||||
|
using Sys = Cosmos.System;
|
||||||
|
|
||||||
|
namespace Tomas.Kernal
|
||||||
|
{
|
||||||
|
public class Kernel : Sys.Kernel
|
||||||
|
{
|
||||||
|
|
||||||
|
protected override void BeforeRun()
|
||||||
|
{
|
||||||
|
Console.WriteLine("Cosmos booted successfully. Type a line of text to get it echoed back.");
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void Run()
|
||||||
|
{
|
||||||
|
Console.Write("Input: ");
|
||||||
|
var input = Console.ReadLine();
|
||||||
|
Console.Write("Text typed: ");
|
||||||
|
Console.WriteLine(input);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
52
src/Tomas.Kernal/TomFS.cs
Normal file
52
src/Tomas.Kernal/TomFS.cs
Normal file
|
@ -0,0 +1,52 @@
|
||||||
|
// I license this project under the GPL 3.0 license.
|
||||||
|
// See the LICENSE file in the project root for more information.
|
||||||
|
using System;
|
||||||
|
using System.IO;
|
||||||
|
using Cosmos.System.FileSystem;
|
||||||
|
using Cosmos.System.FileSystem.VFS;
|
||||||
|
using Tomas.Common;
|
||||||
|
|
||||||
|
namespace Tomas.Kernel
|
||||||
|
{
|
||||||
|
class TomFS
|
||||||
|
{
|
||||||
|
public const string ROOT_DIR = "0:\\";
|
||||||
|
public static string SYSTEM_DIR = $"{ROOT_DIR}\\SYSTEM\\";
|
||||||
|
|
||||||
|
public static void Initialize()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var fs = new CosmosVFS();
|
||||||
|
VFSManager.RegisterVFS(fs);
|
||||||
|
fs.CreateDirectory(SYSTEM_DIR);
|
||||||
|
Console.WriteLine("Creating system files.");
|
||||||
|
fs.CreateFile($"{SYSTEM_DIR}sysinfo.txt");
|
||||||
|
Console.WriteLine("Setting system preferences.");
|
||||||
|
File.WriteAllText($"{SYSTEM_DIR}sysinfo.txt", $"{ComConsts.NAME}, {ComConsts.VersionGit}");
|
||||||
|
Console.WriteLine("File system loaded sucesfully.");
|
||||||
|
var intro = File.ReadAllText($"{SYSTEM_DIR}sysinfo.txt");
|
||||||
|
Console.WriteLine(intro);
|
||||||
|
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
Console.WriteLine("File system failed to load! Not all functions will work.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static string[] ListDirectories(string path)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var dirs = Directory.GetDirectories(path);
|
||||||
|
return dirs;
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
Console.WriteLine("Failed to find any directories.");
|
||||||
|
throw;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
33
src/Tomas.Kernal/Tomas.Kernal.csproj
Normal file
33
src/Tomas.Kernal/Tomas.Kernal.csproj
Normal file
|
@ -0,0 +1,33 @@
|
||||||
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
|
<PropertyGroup>
|
||||||
|
<TargetFramework>net6.0</TargetFramework>
|
||||||
|
<!--<RuntimeIdentifier>cosmos</RuntimeIdentifier>-->
|
||||||
|
<Platform>cosmos</Platform>
|
||||||
|
<SupportsX86Intrinsics>false</SupportsX86Intrinsics>
|
||||||
|
<SelfContained>True</SelfContained>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<PropertyGroup>
|
||||||
|
<EnableGDB>False</EnableGDB>
|
||||||
|
<StartCosmosGDB>False</StartCosmosGDB>
|
||||||
|
<VisualStudioDebugPort>Pipe: Cosmos\Serial</VisualStudioDebugPort>
|
||||||
|
<CosmosDebugPort>Serial: COM1</CosmosDebugPort>
|
||||||
|
<Launch>VMware</Launch>
|
||||||
|
<Profile>VMware</Profile>
|
||||||
|
<Description>Use VMware Player or Workstation to deploy and debug.</Description>
|
||||||
|
<PxeInterface>192.168.0.8</PxeInterface>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Cosmos.Build" Version="0-*" NoWarn="NU1604" />
|
||||||
|
<PackageReference Include="Cosmos.Debug.Kernel" Version="0-*" NoWarn="NU1604" />
|
||||||
|
<PackageReference Include="Cosmos.System2" Version="0-*" NoWarn="NU1604" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<ProjectReference Include="..\Tomas.Common\Tomas.Common.csproj" />
|
||||||
|
<ProjectReference Include="..\Tomas.Interface\Tomas.Interface.csproj" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
</Project>
|
23
src/Tomas.Kernel.Legacy/Programs/About.cs
Normal file
23
src/Tomas.Kernel.Legacy/Programs/About.cs
Normal file
|
@ -0,0 +1,23 @@
|
||||||
|
// I license this project under the GPL 3.0 license.
|
||||||
|
// See the LICENSE file in the project root for more information.
|
||||||
|
|
||||||
|
using System;
|
||||||
|
using Tomas.Common;
|
||||||
|
using Tomas.Interface;
|
||||||
|
|
||||||
|
namespace Tomas.Kernel.Programs
|
||||||
|
{
|
||||||
|
public class About : IProgram
|
||||||
|
{
|
||||||
|
public bool Run(IShell shell)
|
||||||
|
{
|
||||||
|
Console.WriteLine($"{ComConsts.NAME} v{ComConsts.VersionGit}{Environment.NewLine}"
|
||||||
|
+ "TOMAS (Tony's Managed Operating System) is a operating system written in C# using the COSMOS framework.");
|
||||||
|
var progs = shell.Programs;
|
||||||
|
foreach (var commands in progs.Keys)
|
||||||
|
Console.WriteLine(commands);
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
34
src/Tomas.Kernel.Legacy/Shell.cs
Normal file
34
src/Tomas.Kernel.Legacy/Shell.cs
Normal file
|
@ -0,0 +1,34 @@
|
||||||
|
// I license this project under the GPL 3.0 license.
|
||||||
|
// See the LICENSE file in the project root for more information.
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using Tomas.Common.Programs;
|
||||||
|
using Tomas.Interface;
|
||||||
|
using Tomas.Kernel.Programs;
|
||||||
|
using Sys = Cosmos.System;
|
||||||
|
|
||||||
|
namespace Tomas.Kernel
|
||||||
|
{
|
||||||
|
public class Shell : IShell
|
||||||
|
{
|
||||||
|
const char SYMBOL = '$';
|
||||||
|
|
||||||
|
public Dictionary<string, IProgram> Programs => new Dictionary<string, IProgram>()
|
||||||
|
{
|
||||||
|
{"about", new About()},
|
||||||
|
{"fensay", new FenSay()},
|
||||||
|
{"clear", new Clear()},
|
||||||
|
{"commands", new Commands()}
|
||||||
|
};
|
||||||
|
|
||||||
|
public string ReadLine
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
Console.Write(SYMBOL);
|
||||||
|
var readl = Console.ReadLine();
|
||||||
|
return readl;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -22,7 +22,7 @@ namespace Tomas.Kernel
|
||||||
Console.WriteLine("Creating system files.");
|
Console.WriteLine("Creating system files.");
|
||||||
fs.CreateFile($"{SYSTEM_DIR}sysinfo.txt");
|
fs.CreateFile($"{SYSTEM_DIR}sysinfo.txt");
|
||||||
Console.WriteLine("Setting system preferences.");
|
Console.WriteLine("Setting system preferences.");
|
||||||
File.WriteAllText($"{SYSTEM_DIR}sysinfo.txt", $"{OSConsts.NAME}, {OSConsts.VersionGit}");
|
File.WriteAllText($"{SYSTEM_DIR}sysinfo.txt", $"{ComConsts.NAME}, {ComConsts.VersionGit}");
|
||||||
Console.WriteLine("File system loaded sucesfully.");
|
Console.WriteLine("File system loaded sucesfully.");
|
||||||
var intro = File.ReadAllText($"{SYSTEM_DIR}sysinfo.txt");
|
var intro = File.ReadAllText($"{SYSTEM_DIR}sysinfo.txt");
|
||||||
Console.WriteLine(intro);
|
Console.WriteLine(intro);
|
|
@ -1,7 +1,7 @@
|
||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>netcoreapp2.0</TargetFramework>
|
<TargetFramework>net6.0</TargetFramework>
|
||||||
<RuntimeIdentifier>cosmos</RuntimeIdentifier>
|
<RuntimeIdentifier>cosmos</RuntimeIdentifier>
|
||||||
<SelfContained>True</SelfContained>
|
<SelfContained>True</SelfContained>
|
||||||
<BinFormat>ELF</BinFormat>
|
<BinFormat>ELF</BinFormat>
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<OutputType>Exe</OutputType>
|
<OutputType>Exe</OutputType>
|
||||||
<TargetFramework>netcoreapp3.1</TargetFramework>
|
<TargetFramework>net6.0</TargetFramework>
|
||||||
<LangVersion>8</LangVersion>
|
<LangVersion>8</LangVersion>
|
||||||
<Nullable>warnings</Nullable>
|
<Nullable>warnings</Nullable>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
Loading…
Add table
Reference in a new issue