From 9d3eb2b8ccceeac6f3dc667cb7d7549fd03dec59 Mon Sep 17 00:00:00 2001 From: Kudzu Date: Sun, 6 Aug 2017 13:13:25 -0400 Subject: [PATCH] Initial plug move --- Kernel.sln | 2 +- Temp - Ignore me (or not, but dont goof me up)/Update G3.bat | 2 +- source/Cosmos.Build.MSBuild/Cosmos.targets | 2 +- .../{Cosmos.System_Plugs.csproj => Cosmos.Plugs.csproj} | 2 +- .../80-System/Cosmos.System_Plugs/System/ConsoleImpl.cs | 4 +--- .../80-System/Cosmos.System_Plugs/System/EnvironmentImpl.cs | 3 +-- 6 files changed, 6 insertions(+), 9 deletions(-) rename source/Kernel-X86/80-System/Cosmos.System_Plugs/{Cosmos.System_Plugs.csproj => Cosmos.Plugs.csproj} (88%) diff --git a/Kernel.sln b/Kernel.sln index a32f52bc8..09a94911b 100644 --- a/Kernel.sln +++ b/Kernel.sln @@ -78,7 +78,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Build.Common", "sour EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Debug.Symbols", "source\Cosmos.Debug.Symbols\Cosmos.Debug.Symbols.csproj", "{4E9B8F31-AEA0-402D-9B3A-223100F2156D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.System_Plugs", "source\Kernel-X86\80-System\Cosmos.System_Plugs\Cosmos.System_Plugs.csproj", "{BEEDA0BE-0105-40BF-BD8D-7F6A2BC3B05C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Plugs", "source\Kernel-X86\80-System\Cosmos.System_Plugs\Cosmos.Plugs.csproj", "{BEEDA0BE-0105-40BF-BD8D-7F6A2BC3B05C}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.CPU_Plugs", "source\Kernel-X86\00-CPU\Cosmos.CPU_Plugs\Cosmos.CPU_Plugs.csproj", "{365810FC-AFC2-4130-8A70-EF1F2C3FA5D6}" EndProject diff --git a/Temp - Ignore me (or not, but dont goof me up)/Update G3.bat b/Temp - Ignore me (or not, but dont goof me up)/Update G3.bat index 02010580b..791bae70f 100644 --- a/Temp - Ignore me (or not, but dont goof me up)/Update G3.bat +++ b/Temp - Ignore me (or not, but dont goof me up)/Update G3.bat @@ -8,7 +8,7 @@ cd ..\.. cd source\kernel-x86 copy "00-CPU\Cosmos.CPU_Plugs\bin\Debug\netstandard1.5\Cosmos.CPU_Plugs.dll" "%USERPROFILE%\AppData\Roaming\Cosmos User Kit\Kernel\" copy "00-CPU\Cosmos.CPU_Asm\bin\Debug\netstandard1.5\Cosmos.CPU_Asm.dll" "%USERPROFILE%\AppData\Roaming\Cosmos User Kit\Kernel\" -copy "80-System\Cosmos.System_Plugs\bin\Debug\netstandard1.5\Cosmos.System_Plugs.dll" "%USERPROFILE%\AppData\Roaming\Cosmos User Kit\Kernel\" +copy "80-System\Cosmos.System_Plugs\bin\Debug\netstandard1.5\Cosmos.Plugs.dll" "%USERPROFILE%\AppData\Roaming\Cosmos User Kit\Kernel\" cd ..\.. REM copy source\IL2CPU\bin\Debug\netcoreapp1.0 "%USERPROFILE%\AppData\Roaming\Cosmos User Kit\Build\IL2CPU" diff --git a/source/Cosmos.Build.MSBuild/Cosmos.targets b/source/Cosmos.Build.MSBuild/Cosmos.targets index 647e8e26d..b08a05d0b 100644 --- a/source/Cosmos.Build.MSBuild/Cosmos.targets +++ b/source/Cosmos.Build.MSBuild/Cosmos.targets @@ -31,7 +31,7 @@ - + diff --git a/source/Kernel-X86/80-System/Cosmos.System_Plugs/Cosmos.System_Plugs.csproj b/source/Kernel-X86/80-System/Cosmos.System_Plugs/Cosmos.Plugs.csproj similarity index 88% rename from source/Kernel-X86/80-System/Cosmos.System_Plugs/Cosmos.System_Plugs.csproj rename to source/Kernel-X86/80-System/Cosmos.System_Plugs/Cosmos.Plugs.csproj index db81d4587..ab64693ca 100644 --- a/source/Kernel-X86/80-System/Cosmos.System_Plugs/Cosmos.System_Plugs.csproj +++ b/source/Kernel-X86/80-System/Cosmos.System_Plugs/Cosmos.Plugs.csproj @@ -6,7 +6,7 @@ Cosmos.snk Cosmos Cosmos - Cosmos.System_Plugs + Cosmos.Plugs diff --git a/source/Kernel-X86/80-System/Cosmos.System_Plugs/System/ConsoleImpl.cs b/source/Kernel-X86/80-System/Cosmos.System_Plugs/System/ConsoleImpl.cs index 77eda7dbb..51e29adc1 100644 --- a/source/Kernel-X86/80-System/Cosmos.System_Plugs/System/ConsoleImpl.cs +++ b/source/Kernel-X86/80-System/Cosmos.System_Plugs/System/ConsoleImpl.cs @@ -1,10 +1,8 @@ using System; -using System.Collections.Generic; using System.Text; -using Cosmos.IL2CPU.API; using Cosmos.IL2CPU.API.Attribs; -namespace Cosmos.System_Plugs.System { +namespace Cosmos.Plugs.System { [Plug(Target = typeof(global::System.Console))] public static class ConsoleImpl { //private static ConsoleColor mForeground = ConsoleColor.White; diff --git a/source/Kernel-X86/80-System/Cosmos.System_Plugs/System/EnvironmentImpl.cs b/source/Kernel-X86/80-System/Cosmos.System_Plugs/System/EnvironmentImpl.cs index 07fc863e7..1634306bf 100644 --- a/source/Kernel-X86/80-System/Cosmos.System_Plugs/System/EnvironmentImpl.cs +++ b/source/Kernel-X86/80-System/Cosmos.System_Plugs/System/EnvironmentImpl.cs @@ -1,8 +1,7 @@ using System; -using Cosmos.IL2CPU.API; using Cosmos.IL2CPU.API.Attribs; -namespace Cosmos.System_Plugs.System { +namespace Cosmos.Plugs.System { [Plug(Target = typeof(Environment))] public static class EnvironmentImpl { // [PlugMethod(Signature = "System_Environment_OSName__System_Environment_get_OSInfo__")]