Fixed bug in Microsoft.NETCore.Native.targets + Enabled MetricsTest for WindowsThreadPool

Author: eduardo-vp

src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets

@@ -256,7 +256,7 @@ The .NET Foundation licenses this file to you under the MIT license.
 
       <!-- The managed debugging support in libraries is unused - trim it -->
       <IlcArg Condition="'$(IlcKeepManagedDebuggerSupport)' != 'true'" Include="--feature:System.Diagnostics.Debugger.IsSupported=false" />
-      <IlcArg Condition="'$(UseWindowsThreadPool)' != '' and '$(_targetOS)' == 'win' and '$(IlcKeepManagedDebuggerSupport)' == 'true'" Include="--feature:System.Diagnostics.Debugger.IsSupported=$(UseWindowsThreadPool)" />
+      <IlcArg Condition="'$(UseWindowsThreadPool)' != '' and '$(_targetOS)' == 'win'" Include="--feature:System.Threading.ThreadPool.UseWindowsThreadPool=$(UseWindowsThreadPool)" />
     </ItemGroup>
 
     <MakeDir Directories="$(NativeIntermediateOutputPath)" />

src/libraries/System.Threading.ThreadPool/tests/ThreadPoolTests.cs

@@ -436,8 +436,7 @@ public void Execute() { }
 
         public static bool IsMetricsTestSupported => Environment.ProcessorCount >= 3 && IsThreadingAndRemoteExecutorSupported;
 
-        // Temporarily disabling for Windows Threadpool, it fails but still unsure why
-        [ConditionalFact(nameof(IsMetricsTestSupported), nameof(UsePortableThreadPool))]
+        [ConditionalFact(nameof(IsMetricsTestSupported))]
         public void MetricsTest()
         {
             RemoteExecutor.Invoke(() =>
@@ -541,7 +540,8 @@ public void MetricsTest()
                     Assert.True(totalWorkCountToQueue >= 1);
                     waitForWorkStart = true;
                     scheduleWork();
-                    Assert.True(ThreadPool.ThreadCount >= totalWorkCountToQueue);
+                    int threadCountLowerBound = UsePortableThreadPool ? totalWorkCountToQueue : 0;
+                    Assert.True(ThreadPool.ThreadCount >= threadCountLowerBound);
 
                     int runningWorkItemCount = queuedWorkCount;