summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Kotas <jkotas@microsoft.com>2018-04-11 07:13:34 -0700
committerStephen Toub <stoub@microsoft.com>2018-04-11 14:40:14 -0400
commit97d197293a77bf28236fa4f45ec796ff6f964b9c (patch)
treef7fcb2707760118adbbfb663564e580242b597c1
parent7ae64f0f38b3135b88de148ca3be0526068d45aa (diff)
downloadcoreclr-97d197293a77bf28236fa4f45ec796ff6f964b9c.tar.gz
coreclr-97d197293a77bf28236fa4f45ec796ff6f964b9c.tar.bz2
coreclr-97d197293a77bf28236fa4f45ec796ff6f964b9c.zip
Fix CoreRT build breaks
Signed-off-by: dotnet-bot <dotnet-bot@microsoft.com>
-rw-r--r--src/mscorlib/shared/System/Gen2GcCallback.cs2
-rw-r--r--src/mscorlib/shared/System/Runtime/ConstrainedExecution/CriticalFinalizerObject.cs7
2 files changed, 2 insertions, 7 deletions
diff --git a/src/mscorlib/shared/System/Gen2GcCallback.cs b/src/mscorlib/shared/System/Gen2GcCallback.cs
index 904fde72e9..2252681224 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 cbb9562148..3f35f816a3 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()
{
}