From 01f50dcfa54852b605bb7e89754da9dddd0f39d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Sim=C3=B5es?= <jose.simoes@eclo.solutions>
Date: Fri, 19 Mar 2021 04:42:20 +0000
Subject: [PATCH] Update mscorlib declaration

- Remove Console class.
- Update declarations.
---
 CMake/Modules/FindNF_CoreCLR.cmake            |  1 -
 src/CLR/CorLib/corlib_native.cpp              |  8 +++----
 src/CLR/CorLib/corlib_native.h                |  8 -------
 .../CorLib/corlib_native_System_Console.cpp   | 24 -------------------
 4 files changed, 3 insertions(+), 38 deletions(-)
 delete mode 100644 src/CLR/CorLib/corlib_native_System_Console.cpp

diff --git a/CMake/Modules/FindNF_CoreCLR.cmake b/CMake/Modules/FindNF_CoreCLR.cmake
index cddfae6a9a..9324b46d77 100644
--- a/CMake/Modules/FindNF_CoreCLR.cmake
+++ b/CMake/Modules/FindNF_CoreCLR.cmake
@@ -78,7 +78,6 @@ set(NF_CoreCLR_SRCS
     corlib_native_System_Attribute.cpp
     corlib_native_System_BitConverter.cpp
     corlib_native_System_Collections_ArrayList.cpp
-    corlib_native_System_Console.cpp
     corlib_native_System_Convert.cpp
     corlib_native_System_DateTime.cpp
     corlib_native_System_Delegate.cpp
diff --git a/src/CLR/CorLib/corlib_native.cpp b/src/CLR/CorLib/corlib_native.cpp
index 354a9f557e..fbff2912ce 100644
--- a/src/CLR/CorLib/corlib_native.cpp
+++ b/src/CLR/CorLib/corlib_native.cpp
@@ -309,7 +309,6 @@ static const CLR_RT_MethodHandler method_lookup[] =
     Library_corlib_native_System_Collections_ArrayList::SetCapacity___VOID__I4,
     NULL,
     NULL,
-    Library_corlib_native_System_Console::OutNative___STATIC__VOID__STRING__BOOLEAN,
     NULL,
     NULL,
     NULL,
@@ -1047,7 +1046,6 @@ static const CLR_RT_MethodHandler method_lookup[] =
     Library_corlib_native_System_Collections_ArrayList::SetCapacity___VOID__I4,
     NULL,
     NULL,
-    Library_corlib_native_System_Console::OutNative___STATIC__VOID__STRING__BOOLEAN,
     NULL,
     NULL,
     NULL,
@@ -1469,18 +1467,18 @@ const CLR_RT_NativeAssemblyData g_CLR_AssemblyNative_mscorlib =
 
 #if (NANOCLR_REFLECTION == TRUE)
 
-    0x859E7E8A,
+    0x7B586F51,
 
 #elif (NANOCLR_REFLECTION == FALSE)
 
-    0xD4D76535,
+    0x670A0475,
 
 #else
 #error "NANOCLR_REFLECTION has to be define either TRUE or FALSE. Check the build options."
 #endif
 
     method_lookup,
-    { 100, 5, 0, 5 }
+    { 100, 5, 0, 6 }
 };
 
 // clang-format on
diff --git a/src/CLR/CorLib/corlib_native.h b/src/CLR/CorLib/corlib_native.h
index a781809e5f..f29c47c036 100644
--- a/src/CLR/CorLib/corlib_native.h
+++ b/src/CLR/CorLib/corlib_native.h
@@ -463,14 +463,6 @@ struct Library_corlib_native_System_ComponentModel_EditorBrowsableState
     //--//
 };
 
-struct Library_corlib_native_System_Console
-{
-
-    NANOCLR_NATIVE_DECLARE(OutNative___STATIC__VOID__STRING__BOOLEAN);
-
-    //--//
-};
-
 struct Library_corlib_native_System_Int64
 {
 
diff --git a/src/CLR/CorLib/corlib_native_System_Console.cpp b/src/CLR/CorLib/corlib_native_System_Console.cpp
deleted file mode 100644
index ce29613f40..0000000000
--- a/src/CLR/CorLib/corlib_native_System_Console.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-// Copyright (c) .NET Foundation and Contributors
-// Portions Copyright (c) Microsoft Corporation.  All rights reserved.
-// See LICENSE file in the project root for full license information.
-//
-
-#include "CorLib.h"
-
-#if !defined(_WIN32)
-#include <nf_rt_native.h>
-#endif
-
-HRESULT Library_corlib_native_System_Console::OutNative___STATIC__VOID__STRING__BOOLEAN( CLR_RT_StackFrame& stack )
-{
-    NANOCLR_HEADER();
-
-#if defined(_WIN32)
-    return stack.NotImplementedStub();
-#else
-    NANOCLR_CHECK_HRESULT(Library_corlib_native_System_Diagnostics_Debug::WriteLineNative___STATIC__VOID__STRING__BOOLEAN( stack ));
-#endif
-
-    NANOCLR_NOCLEANUP();    
-}