Use Environment.CurrentManagedThreadId (#13803)

src/Microsoft.Management.Infrastructure.CimCmdlets/Utils.cs

@@ -357,7 +357,7 @@ namespace Microsoft.Management.Infrastructure.CimCmdlets
                     sourceInformation = string.Format(
                         CultureInfo.InvariantCulture,
                         "Thread {0}#{1}:{2}:{3} {4}",
-                        Thread.CurrentThread.ManagedThreadId,
+                        Environment.CurrentManagedThreadId,
                         DateTime.Now.Hour,
                         DateTime.Now.Minute,
                         DateTime.Now.Second,

src/System.Management.Automation/engine/InformationRecord.cs

@@ -29,7 +29,7 @@ namespace System.Management.Automation
 
             this.TimeGenerated = DateTime.Now;
             this.NativeThreadId = PsUtils.GetNativeThreadId();
-            this.ManagedThreadId = (uint)System.Threading.Thread.CurrentThread.ManagedThreadId;
+            this.ManagedThreadId = (uint)Environment.CurrentManagedThreadId;
         }
 
         private InformationRecord() { }

src/System.Management.Automation/engine/hostifaces/Connection.cs

@@ -574,7 +574,7 @@ namespace System.Management.Automation.Runspaces
                     {
                         return
                             (localPipeline.NestedPipelineExecutionThread.ManagedThreadId
-                            == Threading.Thread.CurrentThread.ManagedThreadId);
+                            == Environment.CurrentManagedThreadId);
                     }
                 }
 

src/System.Management.Automation/engine/hostifaces/PSTask.cs

@@ -539,7 +539,7 @@ namespace System.Management.Automation.PSTasks
         public PSTaskDataStreamWriter(PSCmdlet psCmdlet)
         {
             _cmdlet = psCmdlet;
-            _cmdletThreadId = Thread.CurrentThread.ManagedThreadId;
+            _cmdletThreadId = Environment.CurrentManagedThreadId;
             _dataStream = new PSDataCollection<PSStreamObject>();
         }
 
@@ -605,7 +605,7 @@ namespace System.Management.Automation.PSTasks
 
         private void CheckCmdletThread()
         {
-            if (Thread.CurrentThread.ManagedThreadId != _cmdletThreadId)
+            if (Environment.CurrentManagedThreadId != _cmdletThreadId)
             {
                 throw new PSInvalidOperationException(InternalCommandStrings.PSTaskStreamWriterWrongThread);
             }

src/System.Management.Automation/engine/interpreter/Utilities.cs

@@ -779,7 +779,7 @@ namespace System.Management.Automation.Interpreter
 
         private StorageInfo GetStorageInfo(StorageInfo[] curStorage)
         {
-            int threadId = Thread.CurrentThread.ManagedThreadId;
+            int threadId = Environment.CurrentManagedThreadId;
 
             // fast path if we already have a value in the array
             if (curStorage != null && curStorage.Length > threadId)
@@ -829,7 +829,7 @@ namespace System.Management.Automation.Interpreter
             StorageInfo[] curStorage = s_updating;
             try
             {
-                int threadId = Thread.CurrentThread.ManagedThreadId;
+                int threadId = Environment.CurrentManagedThreadId;
                 StorageInfo newInfo = new StorageInfo(Thread.CurrentThread);
 
                 // set to updating while potentially resizing/mutating, then we'll

src/System.Management.Automation/utils/tracing/SysLogProvider.cs

@@ -293,7 +293,7 @@ namespace System.Management.Automation.Tracing
         public void LogTransfer(Guid parentActivityId)
         {
             // NOTE: always log
-            int threadId = Thread.CurrentThread.ManagedThreadId;
+            int threadId = Environment.CurrentManagedThreadId;
             string message = string.Format(CultureInfo.InvariantCulture,
                                            "({0}:{1:X}:{2:X}) [Transfer]:{3} {4}",
                                            PSVersionInfo.GitCommitId, threadId, PSChannel.Operational,
@@ -309,7 +309,7 @@ namespace System.Management.Automation.Tracing
         /// <param name="activity">The Guid activity identifier.</param>
         public void SetActivity(Guid activity)
         {
-            int threadId = Thread.CurrentThread.ManagedThreadId;
+            int threadId = Environment.CurrentManagedThreadId;
             Activity = activity;
 
             // NOTE: always log
@@ -333,7 +333,7 @@ namespace System.Management.Automation.Tracing
         {
             if (ShouldLog(level, keyword, channel))
             {
-                int threadId = Thread.CurrentThread.ManagedThreadId;
+                int threadId = Environment.CurrentManagedThreadId;
 
                 StringBuilder sb = MessageBuilder;
                 sb.Clear();