From f1741c04f59f2e47846584a0e92e72d3297099ab Mon Sep 17 00:00:00 2001
From: Andrew Schwartzmeyer <andschwa@microsoft.com>
Date: Thu, 2 Jun 2016 13:45:14 -0700
Subject: [PATCH] Use Dispose() instead of Close() for CORECLR

---
 .../commands/utility/trace/MshHostTraceListener.cs          | 6 ++++++
 .../commands/utility/trace/TraceExpressionCommand.cs        | 2 +-
 .../commands/utility/trace/TraceListenerCommandBase.cs      | 4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/MshHostTraceListener.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/MshHostTraceListener.cs
index b5ee7f8c1b..1ddda4afad 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/MshHostTraceListener.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/MshHostTraceListener.cs
@@ -68,6 +68,9 @@ namespace Microsoft.PowerShell.Commands
         [SecurityPermission(SecurityAction.LinkDemand)]
         protected override void Dispose(bool disposing)
         {
+#if CORECLR
+            base.Dispose(disposing);
+#else
             try
             {
                 if (disposing) 
@@ -79,8 +82,10 @@ namespace Microsoft.PowerShell.Commands
             {
                 base.Dispose(disposing);
             }
+#endif
         }                
 
+#if !CORECLR
         /// <summary>
         /// Closes the dialog and then calls the base class Close
         /// </summary>
@@ -91,6 +96,7 @@ namespace Microsoft.PowerShell.Commands
 
             base.Close();
         }
+#endif
 
         #endregion TraceListener constructors and disposer
 
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/TraceExpressionCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/TraceExpressionCommand.cs
index 81487e13d0..c303bddfd1 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/TraceExpressionCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/TraceExpressionCommand.cs
@@ -333,7 +333,7 @@ namespace Microsoft.PowerShell.Commands
                     foreach (FileStream fileStream in this.FileStreams)
                     {
                         fileStream.Flush();
-                        fileStream.Close();
+                        fileStream.Dispose();
                     }
                 }
                 GC.SuppressFinalize(this);
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/TraceListenerCommandBase.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/TraceListenerCommandBase.cs
index a661e01fa5..7615b910b7 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/TraceListenerCommandBase.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/TraceListenerCommandBase.cs
@@ -460,7 +460,7 @@ namespace Microsoft.PowerShell.Commands
                             true))
                     {
                         listenerToRemove.Flush();
-                        listenerToRemove.Close();
+                        listenerToRemove.Dispose();
                         source.Listeners.RemoveAt(index);
                     }
                 }
@@ -619,7 +619,7 @@ namespace Microsoft.PowerShell.Commands
                 foreach (TraceListener listener in pair.Value)
                 {
                     listener.Flush();
-                    listener.Close();
+                    listener.Dispose();
                 }
             }
             storedTraceSourceState.Clear ();