From f3633a53561ae89b1acbc4ebae7b0f052405fadd Mon Sep 17 00:00:00 2001 From: fanoI Date: Sun, 10 Dec 2017 21:53:39 +0100 Subject: [PATCH] Cosmos.IL2CPU has changed name in simply IL2CPU --- .../System/Text/InternalEncoderBestFitFallback.cs | 2 +- source/Cosmos.Core_Plugs/System/Threading/TaskImpl.cs | 2 +- source/Cosmos.System2/FileSystem/VFS/VFSManager.cs | 10 ++++------ .../Cosmos.System2_Plugs/System/IO/CosmosFileSystem.cs | 4 ++-- .../System/IO/CosmosFileSystemInfo.cs | 2 +- .../System/IO/DirectoryInfoImpl.cs | 2 +- source/Cosmos.System2_Plugs/System/IO/FileInfoImpl.cs | 5 ++--- .../System/IO/FileLoadExceptionImpl.cs | 5 +---- .../System/IO/FileNotFoundExceptionImpl.cs | 6 ++---- .../Cosmos.System2_Plugs/System/IO/PathInternalImpl.cs | 2 +- .../Cosmos.System2_Plugs/System/IO/TextWriterImpl.cs | 4 +--- .../System/Runtime/CompilerServicesImpl.cs | 2 +- .../System/Text/DecoderExceptionFallbackBufferImpl.cs | 2 +- 13 files changed, 19 insertions(+), 29 deletions(-) diff --git a/source/Cosmos.Core_Plugs/System/Text/InternalEncoderBestFitFallback.cs b/source/Cosmos.Core_Plugs/System/Text/InternalEncoderBestFitFallback.cs index 81f8595dd..35289a064 100644 --- a/source/Cosmos.Core_Plugs/System/Text/InternalEncoderBestFitFallback.cs +++ b/source/Cosmos.Core_Plugs/System/Text/InternalEncoderBestFitFallback.cs @@ -1,4 +1,4 @@ -using Cosmos.IL2CPU.API.Attribs; +using IL2CPU.API.Attribs; using System.Text; namespace Cosmos.Core_Plugs.System.Text diff --git a/source/Cosmos.Core_Plugs/System/Threading/TaskImpl.cs b/source/Cosmos.Core_Plugs/System/Threading/TaskImpl.cs index 7de037824..623ef4bfd 100644 --- a/source/Cosmos.Core_Plugs/System/Threading/TaskImpl.cs +++ b/source/Cosmos.Core_Plugs/System/Threading/TaskImpl.cs @@ -1,5 +1,5 @@ using System.Threading; -using Cosmos.IL2CPU.API.Attribs; +using IL2CPU.API.Attribs; using System.Threading.Tasks; namespace Cosmos.Core_Plugs.System.Threading diff --git a/source/Cosmos.System2/FileSystem/VFS/VFSManager.cs b/source/Cosmos.System2/FileSystem/VFS/VFSManager.cs index 9eb878c4c..b4418ff5d 100644 --- a/source/Cosmos.System2/FileSystem/VFS/VFSManager.cs +++ b/source/Cosmos.System2/FileSystem/VFS/VFSManager.cs @@ -302,10 +302,9 @@ namespace Cosmos.System.FileSystem.VFS return GetFile(xPath) != null; } - catch (Exception e) + catch { - global::System.Console.Write("Exception occurred: "); - global::System.Console.WriteLine(e.Message); + /* Simply map any Exception to false as this method should return only bool */ return false; } } @@ -331,10 +330,9 @@ namespace Cosmos.System.FileSystem.VFS return GetDirectory(xPath) != null; } - catch (Exception e) + catch { - global::System.Console.Write("Exception occurred: "); - global::System.Console.WriteLine(e.Message); + /* Simply map any Exception to false as this method should return only bool */ return false; } } diff --git a/source/Cosmos.System2_Plugs/System/IO/CosmosFileSystem.cs b/source/Cosmos.System2_Plugs/System/IO/CosmosFileSystem.cs index ee4933027..93bdb05e0 100644 --- a/source/Cosmos.System2_Plugs/System/IO/CosmosFileSystem.cs +++ b/source/Cosmos.System2_Plugs/System/IO/CosmosFileSystem.cs @@ -3,8 +3,8 @@ using System; using System.IO; using System.Collections.Generic; using Cosmos.Debug.Kernel; -using Cosmos.IL2CPU.API; -using Cosmos.IL2CPU.API.Attribs; +using IL2CPU.API; +using IL2CPU.API.Attribs; using Cosmos.System; using Cosmos.System.FileSystem; using Cosmos.System.FileSystem.Listing; diff --git a/source/Cosmos.System2_Plugs/System/IO/CosmosFileSystemInfo.cs b/source/Cosmos.System2_Plugs/System/IO/CosmosFileSystemInfo.cs index 58068e905..5fc74c3b1 100644 --- a/source/Cosmos.System2_Plugs/System/IO/CosmosFileSystemInfo.cs +++ b/source/Cosmos.System2_Plugs/System/IO/CosmosFileSystemInfo.cs @@ -1,6 +1,6 @@ //#define COSMOSDEBUG using System.IO; -using Cosmos.IL2CPU.API.Attribs; +using IL2CPU.API.Attribs; using Cosmos.System; using Cosmos.System.FileSystem.VFS; diff --git a/source/Cosmos.System2_Plugs/System/IO/DirectoryInfoImpl.cs b/source/Cosmos.System2_Plugs/System/IO/DirectoryInfoImpl.cs index 02845bb28..f12ef7db8 100644 --- a/source/Cosmos.System2_Plugs/System/IO/DirectoryInfoImpl.cs +++ b/source/Cosmos.System2_Plugs/System/IO/DirectoryInfoImpl.cs @@ -1,6 +1,6 @@ #define COSMOSDEBUG using System.IO; -using Cosmos.IL2CPU.API.Attribs; +using IL2CPU.API.Attribs; using Cosmos.System; using Cosmos.System.FileSystem.Listing; using Cosmos.System.FileSystem.VFS; diff --git a/source/Cosmos.System2_Plugs/System/IO/FileInfoImpl.cs b/source/Cosmos.System2_Plugs/System/IO/FileInfoImpl.cs index d5be2dc13..da97e5669 100644 --- a/source/Cosmos.System2_Plugs/System/IO/FileInfoImpl.cs +++ b/source/Cosmos.System2_Plugs/System/IO/FileInfoImpl.cs @@ -1,8 +1,7 @@ -#define COSMOSDEBUG +//#define COSMOSDEBUG using System.IO; -using Cosmos.IL2CPU.API.Attribs; +using IL2CPU.API.Attribs; using Cosmos.System; -using Cosmos.System.FileSystem.Listing; using Cosmos.System.FileSystem.VFS; namespace Cosmos.System2_Plugs.System.IO diff --git a/source/Cosmos.System2_Plugs/System/IO/FileLoadExceptionImpl.cs b/source/Cosmos.System2_Plugs/System/IO/FileLoadExceptionImpl.cs index 76491351f..635190f1e 100644 --- a/source/Cosmos.System2_Plugs/System/IO/FileLoadExceptionImpl.cs +++ b/source/Cosmos.System2_Plugs/System/IO/FileLoadExceptionImpl.cs @@ -1,8 +1,5 @@ using System.IO; -using Cosmos.IL2CPU.API.Attribs; -using Cosmos.System; -using Cosmos.System.FileSystem.Listing; -using Cosmos.System.FileSystem.VFS; +using IL2CPU.API.Attribs; using System; namespace Cosmos.System2_Plugs.System.IO diff --git a/source/Cosmos.System2_Plugs/System/IO/FileNotFoundExceptionImpl.cs b/source/Cosmos.System2_Plugs/System/IO/FileNotFoundExceptionImpl.cs index 9ab48b97d..aa5299b9f 100644 --- a/source/Cosmos.System2_Plugs/System/IO/FileNotFoundExceptionImpl.cs +++ b/source/Cosmos.System2_Plugs/System/IO/FileNotFoundExceptionImpl.cs @@ -1,9 +1,7 @@ using System.IO; -using Cosmos.IL2CPU.API.Attribs; -using Cosmos.System; -using Cosmos.System.FileSystem.Listing; -using Cosmos.System.FileSystem.VFS; +using IL2CPU.API.Attribs; using System; + namespace Cosmos.System2_Plugs.System.IO { [Plug(Target = typeof(FileNotFoundException))] diff --git a/source/Cosmos.System2_Plugs/System/IO/PathInternalImpl.cs b/source/Cosmos.System2_Plugs/System/IO/PathInternalImpl.cs index 2bae1507e..f5278486f 100644 --- a/source/Cosmos.System2_Plugs/System/IO/PathInternalImpl.cs +++ b/source/Cosmos.System2_Plugs/System/IO/PathInternalImpl.cs @@ -1,5 +1,5 @@ //#define COSMOSDEBUG -using Cosmos.IL2CPU.API.Attribs; +using IL2CPU.API.Attribs; using Cosmos.System; namespace Cosmos.System_Plugs.System.IO diff --git a/source/Cosmos.System2_Plugs/System/IO/TextWriterImpl.cs b/source/Cosmos.System2_Plugs/System/IO/TextWriterImpl.cs index ea22911f3..87204c169 100644 --- a/source/Cosmos.System2_Plugs/System/IO/TextWriterImpl.cs +++ b/source/Cosmos.System2_Plugs/System/IO/TextWriterImpl.cs @@ -1,9 +1,7 @@ //#define COSMOSDEBUG using System; using System.IO; -using Cosmos.System; -using Cosmos.IL2CPU.API.Attribs; -using System.Text; +using IL2CPU.API.Attribs; namespace Cosmos.System_Plugs.System.IO { diff --git a/source/Cosmos.System2_Plugs/System/Runtime/CompilerServicesImpl.cs b/source/Cosmos.System2_Plugs/System/Runtime/CompilerServicesImpl.cs index 6ee1a6204..8fef80ec8 100644 --- a/source/Cosmos.System2_Plugs/System/Runtime/CompilerServicesImpl.cs +++ b/source/Cosmos.System2_Plugs/System/Runtime/CompilerServicesImpl.cs @@ -1,4 +1,4 @@ -using Cosmos.IL2CPU.API.Attribs; +using IL2CPU.API.Attribs; namespace Cosmos.System_Plugs.System.Runtime { diff --git a/source/Cosmos.System2_Plugs/System/Text/DecoderExceptionFallbackBufferImpl.cs b/source/Cosmos.System2_Plugs/System/Text/DecoderExceptionFallbackBufferImpl.cs index 8589f06cf..e51048993 100644 --- a/source/Cosmos.System2_Plugs/System/Text/DecoderExceptionFallbackBufferImpl.cs +++ b/source/Cosmos.System2_Plugs/System/Text/DecoderExceptionFallbackBufferImpl.cs @@ -1,6 +1,6 @@ using System; using System.Text; -using Cosmos.IL2CPU.API.Attribs; +using IL2CPU.API.Attribs; namespace Cosmos.System2_Plugs.System.Text {