Fix build breaks in internal .NET Native build

- NUTC respects NativeCallable exports in public types only for some reason
- Conditionally disable CoreRT specific workaround with CMake dependency

[tfs-changeset: 1558734]

2 files changed, 14 insertions, 4 deletions

diff --git a/src/Runtime.Base/src/System/Runtime/ExceptionHandling.cs b/src/Runtime.Base/src/System/Runtime/ExceptionHandling.cs
index cbfe6af9f..88090e747 100644
--- a/src/Runtime.Base/src/System/Runtime/ExceptionHandling.cs
+++ b/src/Runtime.Base/src/System/Runtime/ExceptionHandling.cs
@@ -85,7 +85,12 @@ namespace System.Runtime
         }
     }
 
+#if CORERT
     internal unsafe static class EH
+#else
+    // NUTC respects NativeCallable exports in public types only
+    public unsafe static class EH
+#endif
     {
         internal static UIntPtr MaxSP
         {
@@ -100,10 +105,10 @@ namespace System.Runtime
             RH_EH_CLAUSE_TYPED = 0,
             RH_EH_CLAUSE_FAULT = 1,
 
-            #region CLR Exceptions
+#region CLR Exceptions
             RH_EH_CLAUSE_FILTER = 2,
             RH_EH_CLAUSE_UNUSED = 3,
-            #endregion
+#endregion
         }
 
         private struct RhEHClause
@@ -321,7 +326,7 @@ namespace System.Runtime
         }
 
 #if !CORERT
-        #region ItWouldBeNiceToRemoveThese
+#region ItWouldBeNiceToRemoveThese
         // These four functions are used to implement the special THROW_* MDIL instructions.
         [MethodImpl(MethodImplOptions.NoInlining)]
         [RuntimeExport("RhExceptionHandling_ThrowClasslibOverflowException")]
@@ -386,7 +391,7 @@ namespace System.Runtime
             BinderIntrinsics.TailCall_RhpThrowEx(e);
             throw e;
         }
-        #endregion // ItWouldBeNiceToRemoveThese
+#endregion // ItWouldBeNiceToRemoveThese
 #endif
 
         // This function is used to throw exceptions out of our fast allocation helpers, implemented in asm. We tail-call
diff --git a/src/Runtime.Base/src/System/Runtime/__Finalizer.cs b/src/Runtime.Base/src/System/Runtime/__Finalizer.cs
index 174384be4..6167f4de8 100644
--- a/src/Runtime.Base/src/System/Runtime/__Finalizer.cs
+++ b/src/Runtime.Base/src/System/Runtime/__Finalizer.cs
@@ -14,7 +14,12 @@ using System.Runtime.CompilerServices;
 namespace System.Runtime
 {
     // We choose this name to avoid clashing with any future public class with the name Finalizer. 
+#if CORERT
     internal static class __Finalizer
+#else
+    // NUTC respects NativeCallable exports in public types only
+    public static class __Finalizer
+#endif
     {
         private static bool s_fHaveNewClasslibs /* = false */;