From: Jan Kotas <jkotas@microsoft.com>
Date: Wed, 11 Apr 2018 14:13:34 +0000 (-0700)
Subject: Fix CoreRT build breaks
X-Git-Tag: accepted/tizen/unified/20190422.045933~2356
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=97d197293a77bf28236fa4f45ec796ff6f964b9c;p=platform%2Fupstream%2Fcoreclr.git

Fix CoreRT build breaks

Signed-off-by: dotnet-bot <dotnet-bot@microsoft.com>
---

diff --git a/src/mscorlib/shared/System/Gen2GcCallback.cs b/src/mscorlib/shared/System/Gen2GcCallback.cs
index 904fde7..2252681 100644
--- a/src/mscorlib/shared/System/Gen2GcCallback.cs
+++ b/src/mscorlib/shared/System/Gen2GcCallback.cs
@@ -67,7 +67,7 @@ namespace System
             }
 
             // Resurrect ourselves by re-registering for finalization.
-            if (!Environment.HasShutdownStarted && !AppDomain.CurrentDomain.IsFinalizingForUnload())
+            if (!Environment.HasShutdownStarted)
             {
                 GC.ReRegisterForFinalize(this);
             }
diff --git a/src/mscorlib/shared/System/Runtime/ConstrainedExecution/CriticalFinalizerObject.cs b/src/mscorlib/shared/System/Runtime/ConstrainedExecution/CriticalFinalizerObject.cs
index cbb9562..3f35f81 100644
--- a/src/mscorlib/shared/System/Runtime/ConstrainedExecution/CriticalFinalizerObject.cs
+++ b/src/mscorlib/shared/System/Runtime/ConstrainedExecution/CriticalFinalizerObject.cs
@@ -2,22 +2,16 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-//
 /*============================================================
 **
 **
-**
 ** Deriving from this class will cause any finalizer you define to be critical
 ** (i.e. the finalizer is guaranteed to run, won't be aborted by the host and is
 ** run after the finalizers of other objects collected at the same time).
 **
-**
 ** 
 ===========================================================*/
 
-using System;
-using System.Runtime.InteropServices;
-
 namespace System.Runtime.ConstrainedExecution
 {
     public abstract class CriticalFinalizerObject
@@ -26,6 +20,7 @@ namespace System.Runtime.ConstrainedExecution
         {
         }
 
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1821:RemoveEmptyFinalizers")]
         ~CriticalFinalizerObject()
         {
         }