From 67465915d2ed4e9a3ef26a29ea171699a427e923 Mon Sep 17 00:00:00 2001 From: WizardBrony <66697209+WizardBrony@users.noreply.github.com> Date: Fri, 16 Jul 2021 12:42:51 -0400 Subject: [PATCH 1/2] Update Task.cs --- .../src/System/Threading/Tasks/Task.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libraries/System.Private.CoreLib/src/System/Threading/Tasks/Task.cs b/src/libraries/System.Private.CoreLib/src/System/Threading/Tasks/Task.cs index 89fab991d73488..458c914773cbcd 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Threading/Tasks/Task.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Threading/Tasks/Task.cs @@ -796,7 +796,7 @@ internal bool IsWaitNotificationEnabledOrNotRanToCompletion /// harmful). Derived implementations may choose to only conditionally call down to this base /// implementation. /// - internal virtual bool ShouldNotifyDebuggerOfWaitCompletion // ideally would be familyAndAssembly, but that can't be done in C# + private protected virtual bool ShouldNotifyDebuggerOfWaitCompletion { get { @@ -5889,7 +5889,7 @@ public void Invoke(Task completedTask) /// Returns whether we should notify the debugger of a wait completion. This returns /// true iff at least one constituent task has its bit set. /// - internal override bool ShouldNotifyDebuggerOfWaitCompletion => + private protected override bool ShouldNotifyDebuggerOfWaitCompletion => base.ShouldNotifyDebuggerOfWaitCompletion && AnyTaskRequiresNotifyDebuggerOfWaitCompletion(m_tasks); } @@ -6128,7 +6128,7 @@ public void Invoke(Task ignored) /// Returns whether we should notify the debugger of a wait completion. This returns true /// iff at least one constituent task has its bit set. /// - internal override bool ShouldNotifyDebuggerOfWaitCompletion => + private protected override bool ShouldNotifyDebuggerOfWaitCompletion => base.ShouldNotifyDebuggerOfWaitCompletion && AnyTaskRequiresNotifyDebuggerOfWaitCompletion(m_tasks); } From 831456727a98575617291e72b9487dc25a51f341 Mon Sep 17 00:00:00 2001 From: WizardBrony <66697209+WizardBrony@users.noreply.github.com> Date: Fri, 16 Jul 2021 12:44:30 -0400 Subject: [PATCH 2/2] Update TaskFactory.cs --- .../src/System/Threading/Tasks/TaskFactory.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libraries/System.Private.CoreLib/src/System/Threading/Tasks/TaskFactory.cs b/src/libraries/System.Private.CoreLib/src/System/Threading/Tasks/TaskFactory.cs index a9b1bf0afdf411..9156d4fcdb9a82 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Threading/Tasks/TaskFactory.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Threading/Tasks/TaskFactory.cs @@ -1587,7 +1587,7 @@ public void Invoke(Task completingTask) /// Returns whether we should notify the debugger of a wait completion. This returns /// true iff at least one constituent task has its bit set. /// - internal override bool ShouldNotifyDebuggerOfWaitCompletion => + private protected override bool ShouldNotifyDebuggerOfWaitCompletion => base.ShouldNotifyDebuggerOfWaitCompletion && AnyTaskRequiresNotifyDebuggerOfWaitCompletion(_tasks); } @@ -1657,7 +1657,7 @@ public void Invoke(Task completingTask) /// Returns whether we should notify the debugger of a wait completion. This returns /// true iff at least one constituent task has its bit set. /// - internal override bool ShouldNotifyDebuggerOfWaitCompletion => + private protected override bool ShouldNotifyDebuggerOfWaitCompletion => base.ShouldNotifyDebuggerOfWaitCompletion && AnyTaskRequiresNotifyDebuggerOfWaitCompletion(_tasks); }