[master] Update dependencies from dotnet/arcade Microsoft/vstest (#19613

)

* Update dependencies from https://github.com/dotnet/arcade build 20200130.4

- Microsoft.DotNet.XUnitExtensions - 5.0.0-beta.20080.4
- Microsoft.DotNet.VersionTools.Tasks - 5.0.0-beta.20080.4
- Microsoft.DotNet.ApiCompat - 5.0.0-beta.20080.4
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20080.4
- Microsoft.DotNet.Build.Tasks.Configuration - 5.0.0-beta.20080.4
- Microsoft.DotNet.Build.Tasks.Feed - 5.0.0-beta.20080.4
- Microsoft.DotNet.Build.Tasks.Packaging - 5.0.0-beta.20080.4
- Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk - 5.0.0-beta.20080.4
- Microsoft.DotNet.CodeAnalysis - 5.0.0-beta.20080.4
- Microsoft.DotNet.GenAPI - 5.0.0-beta.20080.4
- Microsoft.DotNet.XUnitConsoleRunner - 2.5.1-beta.20080.4
- Microsoft.DotNet.GenFacades - 5.0.0-beta.20080.4
- Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20080.4
- Microsoft.DotNet.RemoteExecutor - 5.0.0-beta.20080.4

* Update dependencies from https://github.com/dotnet/arcade build 20200131.7

- Microsoft.DotNet.XUnitExtensions - 5.0.0-beta.20081.7
- Microsoft.DotNet.VersionTools.Tasks - 5.0.0-beta.20081.7
- Microsoft.DotNet.ApiCompat - 5.0.0-beta.20081.7
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20081.7
- Microsoft.DotNet.Build.Tasks.Configuration - 5.0.0-beta.20081.7
- Microsoft.DotNet.Build.Tasks.Feed - 5.0.0-beta.20081.7
- Microsoft.DotNet.Build.Tasks.Packaging - 5.0.0-beta.20081.7
- Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk - 5.0.0-beta.20081.7
- Microsoft.DotNet.CodeAnalysis - 5.0.0-beta.20081.7
- Microsoft.DotNet.GenAPI - 5.0.0-beta.20081.7
- Microsoft.DotNet.XUnitConsoleRunner - 2.5.1-beta.20081.7
- Microsoft.DotNet.GenFacades - 5.0.0-beta.20081.7
- Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20081.7
- Microsoft.DotNet.RemoteExecutor - 5.0.0-beta.20081.7

* Update dependencies from https://github.com/microsoft/vstest build 20200131-02

- Microsoft.NET.Test.Sdk - 16.5.0-preview-20200131-02

* Update dependencies from https://github.com/dotnet/arcade build 20200201.2

- Microsoft.DotNet.XUnitExtensions - 5.0.0-beta.20101.2
- Microsoft.DotNet.VersionTools.Tasks - 5.0.0-beta.20101.2
- Microsoft.DotNet.ApiCompat - 5.0.0-beta.20101.2
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20101.2
- Microsoft.DotNet.Build.Tasks.Configuration - 5.0.0-beta.20101.2
- Microsoft.DotNet.Build.Tasks.Feed - 5.0.0-beta.20101.2
- Microsoft.DotNet.Build.Tasks.Packaging - 5.0.0-beta.20101.2
- Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk - 5.0.0-beta.20101.2
- Microsoft.DotNet.CodeAnalysis - 5.0.0-beta.20101.2
- Microsoft.DotNet.GenAPI - 5.0.0-beta.20101.2
- Microsoft.DotNet.XUnitConsoleRunner - 2.5.1-beta.20101.2
- Microsoft.DotNet.GenFacades - 5.0.0-beta.20101.2
- Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20101.2
- Microsoft.DotNet.RemoteExecutor - 5.0.0-beta.20101.2

* Rename RuntimeStressTestModes

* Update dependencies from https://github.com/microsoft/vstest build 20200203-01

- Microsoft.NET.Test.Sdk - 16.5.0-preview-20200203-01

* Update dependencies from https://github.com/dotnet/arcade build 20200203.5

- Microsoft.DotNet.XUnitExtensions - 5.0.0-beta.20103.5
- Microsoft.DotNet.VersionTools.Tasks - 5.0.0-beta.20103.5
- Microsoft.DotNet.ApiCompat - 5.0.0-beta.20103.5
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20103.5
- Microsoft.DotNet.Build.Tasks.Configuration - 5.0.0-beta.20103.5
- Microsoft.DotNet.Build.Tasks.Feed - 5.0.0-beta.20103.5
- Microsoft.DotNet.Build.Tasks.Packaging - 5.0.0-beta.20103.5
- Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk - 5.0.0-beta.20103.5
- Microsoft.DotNet.CodeAnalysis - 5.0.0-beta.20103.5
- Microsoft.DotNet.GenAPI - 5.0.0-beta.20103.5
- Microsoft.DotNet.XUnitConsoleRunner - 2.5.1-beta.20103.5
- Microsoft.DotNet.GenFacades - 5.0.0-beta.20103.5
- Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20103.5
- Microsoft.DotNet.RemoteExecutor - 5.0.0-beta.20103.5

* Update SkipOnCoreClrAttributes to new parameters

* Update dependencies from https://github.com/dotnet/arcade build 20200204.2

- Microsoft.DotNet.XUnitExtensions - 5.0.0-beta.20104.2
- Microsoft.DotNet.VersionTools.Tasks - 5.0.0-beta.20104.2
- Microsoft.DotNet.ApiCompat - 5.0.0-beta.20104.2
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20104.2
- Microsoft.DotNet.Build.Tasks.Configuration - 5.0.0-beta.20104.2
- Microsoft.DotNet.Build.Tasks.Feed - 5.0.0-beta.20104.2
- Microsoft.DotNet.Build.Tasks.Packaging - 5.0.0-beta.20104.2
- Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk - 5.0.0-beta.20104.2
- Microsoft.DotNet.CodeAnalysis - 5.0.0-beta.20104.2
- Microsoft.DotNet.GenAPI - 5.0.0-beta.20104.2
- Microsoft.DotNet.XUnitConsoleRunner - 2.5.1-beta.20104.2
- Microsoft.DotNet.GenFacades - 5.0.0-beta.20104.2
- Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20104.2
- Microsoft.DotNet.RemoteExecutor - 5.0.0-beta.20104.2

* Update dependencies from https://github.com/microsoft/vstest build 20200205-01

- Microsoft.NET.Test.Sdk - 16.5.0

Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
Co-authored-by: Santiago Fernandez Madero <safern@microsoft.com>

eng/Version.Details.xml

@@ -46,61 +46,61 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20079.8">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20104.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>8466781af43871ee0d4a1655acc008a305a62c0e</Sha>
+      <Sha>0b404cb7575c8addc5e10f3fac57e79c596db28e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20079.8">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20104.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>8466781af43871ee0d4a1655acc008a305a62c0e</Sha>
+      <Sha>0b404cb7575c8addc5e10f3fac57e79c596db28e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.20079.8">
+    <Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.20104.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>8466781af43871ee0d4a1655acc008a305a62c0e</Sha>
+      <Sha>0b404cb7575c8addc5e10f3fac57e79c596db28e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20079.8">
+    <Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20104.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>8466781af43871ee0d4a1655acc008a305a62c0e</Sha>
+      <Sha>0b404cb7575c8addc5e10f3fac57e79c596db28e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.20079.8">
+    <Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.20104.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>8466781af43871ee0d4a1655acc008a305a62c0e</Sha>
+      <Sha>0b404cb7575c8addc5e10f3fac57e79c596db28e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.20079.8">
+    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.20104.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>8466781af43871ee0d4a1655acc008a305a62c0e</Sha>
+      <Sha>0b404cb7575c8addc5e10f3fac57e79c596db28e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.20079.8">
+    <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.20104.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>8466781af43871ee0d4a1655acc008a305a62c0e</Sha>
+      <Sha>0b404cb7575c8addc5e10f3fac57e79c596db28e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="5.0.0-beta.20079.8">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="5.0.0-beta.20104.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>8466781af43871ee0d4a1655acc008a305a62c0e</Sha>
+      <Sha>0b404cb7575c8addc5e10f3fac57e79c596db28e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.20079.8">
+    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.20104.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>8466781af43871ee0d4a1655acc008a305a62c0e</Sha>
+      <Sha>0b404cb7575c8addc5e10f3fac57e79c596db28e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.20079.8">
+    <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.20104.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>8466781af43871ee0d4a1655acc008a305a62c0e</Sha>
+      <Sha>0b404cb7575c8addc5e10f3fac57e79c596db28e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Configuration" Version="5.0.0-beta.20079.8">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Configuration" Version="5.0.0-beta.20104.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>8466781af43871ee0d4a1655acc008a305a62c0e</Sha>
+      <Sha>0b404cb7575c8addc5e10f3fac57e79c596db28e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="5.0.0-beta.20079.8">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="5.0.0-beta.20104.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>8466781af43871ee0d4a1655acc008a305a62c0e</Sha>
+      <Sha>0b404cb7575c8addc5e10f3fac57e79c596db28e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="5.0.0-beta.20079.8">
+    <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="5.0.0-beta.20104.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>8466781af43871ee0d4a1655acc008a305a62c0e</Sha>
+      <Sha>0b404cb7575c8addc5e10f3fac57e79c596db28e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="5.0.0-beta.20079.8">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="5.0.0-beta.20104.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>8466781af43871ee0d4a1655acc008a305a62c0e</Sha>
+      <Sha>0b404cb7575c8addc5e10f3fac57e79c596db28e</Sha>
     </Dependency>
     <Dependency Name="optimization.windows_nt-x64.IBC.CoreFx" Version="99.99.99-master-20190716.1">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
@@ -122,9 +122,9 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
       <Sha>d0bb63d2ec7060714e63ee4082fac48f2e57f3e2</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Test.Sdk" Version="16.5.0-preview-20200130-01">
+    <Dependency Name="Microsoft.NET.Test.Sdk" Version="16.5.0">
       <Uri>https://github.com/microsoft/vstest</Uri>
-      <Sha>064dcc108f90955b756a77d0bdaf638dcd8eed21</Sha>
+      <Sha>fd0fe3df347a081b56c4da89f85a3e1ff463a4e7</Sha>
     </Dependency>
     <Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="5.0.0-beta.20072.1">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>

eng/Versions.props

@@ -8,7 +8,6 @@
     <PatchVersion>0</PatchVersion>
     <PreReleaseVersionLabel>alpha</PreReleaseVersionLabel>
     <PreReleaseVersionIteration>1</PreReleaseVersionIteration>
-
     <!-- Set assembly version to align with major and minor version,
          as for the patches and revisions should be manually updated per assembly if it is serviced. -->
     <AssemblyVersion>$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>
@@ -37,7 +36,6 @@
     -->
     <NETStandardPatchVersion>0</NETStandardPatchVersion>
   </PropertyGroup>
-
   <!--
     Servicing build settings for Setup/Installer packages. Instructions:
 
@@ -57,19 +55,18 @@
     <ProjectServicingConfiguration Include="Microsoft.NETCore.App.Ref" PatchVersion="0" />
     <ProjectServicingConfiguration Include="NETStandard.Library.Ref" PatchVersion="0" />
   </ItemGroup>
-
   <PropertyGroup>
     <!-- Arcade dependencies -->
-    <MicrosoftDotNetApiCompatVersion>5.0.0-beta.20079.8</MicrosoftDotNetApiCompatVersion>
-    <MicrosoftDotNetBuildTasksFeedVersion>5.0.0-beta.20079.8</MicrosoftDotNetBuildTasksFeedVersion>
-    <MicrosoftDotNetCodeAnalysisVersion>5.0.0-beta.20079.8</MicrosoftDotNetCodeAnalysisVersion>
-    <MicrosoftDotNetGenAPIVersion>5.0.0-beta.20079.8</MicrosoftDotNetGenAPIVersion>
-    <MicrosoftDotNetGenFacadesVersion>5.0.0-beta.20079.8</MicrosoftDotNetGenFacadesVersion>
-    <MicrosoftDotNetXUnitExtensionsVersion>5.0.0-beta.20079.8</MicrosoftDotNetXUnitExtensionsVersion>
-    <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.20079.8</MicrosoftDotNetXUnitConsoleRunnerVersion>
-    <MicrosoftDotNetBuildTasksPackagingVersion>5.0.0-beta.20079.8</MicrosoftDotNetBuildTasksPackagingVersion>
-    <MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.20079.8</MicrosoftDotNetRemoteExecutorVersion>
-    <MicrosoftDotNetVersionToolsTasksVersion>5.0.0-beta.20079.8</MicrosoftDotNetVersionToolsTasksVersion>
+    <MicrosoftDotNetApiCompatVersion>5.0.0-beta.20104.2</MicrosoftDotNetApiCompatVersion>
+    <MicrosoftDotNetBuildTasksFeedVersion>5.0.0-beta.20104.2</MicrosoftDotNetBuildTasksFeedVersion>
+    <MicrosoftDotNetCodeAnalysisVersion>5.0.0-beta.20104.2</MicrosoftDotNetCodeAnalysisVersion>
+    <MicrosoftDotNetGenAPIVersion>5.0.0-beta.20104.2</MicrosoftDotNetGenAPIVersion>
+    <MicrosoftDotNetGenFacadesVersion>5.0.0-beta.20104.2</MicrosoftDotNetGenFacadesVersion>
+    <MicrosoftDotNetXUnitExtensionsVersion>5.0.0-beta.20104.2</MicrosoftDotNetXUnitExtensionsVersion>
+    <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.20104.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
+    <MicrosoftDotNetBuildTasksPackagingVersion>5.0.0-beta.20104.2</MicrosoftDotNetBuildTasksPackagingVersion>
+    <MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.20104.2</MicrosoftDotNetRemoteExecutorVersion>
+    <MicrosoftDotNetVersionToolsTasksVersion>5.0.0-beta.20104.2</MicrosoftDotNetVersionToolsTasksVersion>
     <!-- Installer dependencies -->
     <MicrosoftNETCoreAppVersion>5.0.0-alpha.1.20080.9</MicrosoftNETCoreAppVersion>
     <MicrosoftNETCoreDotNetHostVersion>5.0.0-alpha.1.20080.9</MicrosoftNETCoreDotNetHostVersion>
@@ -116,7 +113,7 @@
     <!-- sni -->
     <RuntimeWinX64RuntimeNativeSystemDataSqlClientSniVersion>4.4.0</RuntimeWinX64RuntimeNativeSystemDataSqlClientSniVersion>
     <!-- Testing -->
-    <MicrosoftNETTestSdkVersion>16.5.0-preview-20200130-01</MicrosoftNETTestSdkVersion>
+    <MicrosoftNETTestSdkVersion>16.5.0</MicrosoftNETTestSdkVersion>
     <XUnitVersion>2.4.1</XUnitVersion>
     <TraceEventVersion>2.0.5</TraceEventVersion>
     <NewtonsoftJsonVersion>12.0.3</NewtonsoftJsonVersion>

eng/common/performance/performance-setup.ps1

@@ -2,7 +2,7 @@ Param(
     [string] $SourceDirectory=$env:BUILD_SOURCESDIRECTORY,
     [string] $CoreRootDirectory,
     [string] $BaselineCoreRootDirectory,
-    [string] $Architecture="x64",
+    [string] $Architecture=$env:archType,
     [string] $Framework="netcoreapp5.0",
     [string] $CompilationMode="Tiered",
     [string] $Repository=$env:BUILD_REPOSITORY_NAME,

eng/common/performance/performance-setup.sh

@@ -3,7 +3,7 @@
 source_directory=$BUILD_SOURCESDIRECTORY
 core_root_directory=
 baseline_core_root_directory=
-architecture=x64
+architecture=$archType
 framework=netcoreapp5.0
 compilation_mode=tiered
 repository=$BUILD_REPOSITORY_NAME

eng/common/tools.ps1

@@ -655,9 +655,6 @@ Write-PipelineSetVariable -Name 'Artifacts.Log' -Value $LogDir
 Write-PipelineSetVariable -Name 'TEMP' -Value $TempDir
 Write-PipelineSetVariable -Name 'TMP' -Value $TempDir
 
-$env:TEMP=$TempDir
-$env:TMP=$TempDir
-
 # Import custom tools configuration, if present in the repo.
 # Note: Import in global scope so that the script set top-level variables without qualification.
 if (!$disableConfigureToolsetImport) {

global.json

@@ -12,10 +12,10 @@
     "python": "2.7.15"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20079.8",
-    "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20079.8",
-    "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20079.8",
-    "Microsoft.DotNet.Build.Tasks.Configuration": "5.0.0-beta.20079.8",
+    "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20104.2",
+    "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20104.2",
+    "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20104.2",
+    "Microsoft.DotNet.Build.Tasks.Configuration": "5.0.0-beta.20104.2",
     "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
     "Microsoft.NET.Sdk.IL": "5.0.0-alpha.1.20076.2",
     "Microsoft.Build.NoTargets": "1.0.53",

src/libraries/System.ComponentModel.Composition.Registration/tests/System/ComponentModel/Composition/Registration/RegistrationBuilderAttributedOverrideUnitTests.cs

@@ -11,7 +11,7 @@
 
 namespace System.ComponentModel.Composition.Registration.Tests
 {
-    [SkipOnCoreClr("Test failures on stress tests")]
+    [SkipOnCoreClr("Test failures on stress tests", RuntimeTestModes.CheckedRuntime)]
     [SkipOnMono("Test failures on stress tests")]
     public class RegistrationBuilderAttributedOverrideUnitTests
     {

src/libraries/System.Data.SqlClient/tests/FunctionalTests/AssemblyInfo.cs

@@ -4,5 +4,5 @@
 
 using Xunit;
 
-[assembly: SkipOnCoreClr("Timeout in stress tests on Linux/arm32", TestPlatforms.Linux)]
+[assembly: SkipOnCoreClr("Timeout in stress tests on Linux/arm32", TestPlatforms.Linux, RuntimeTestModes.CheckedRuntime)]
 [assembly: SkipOnMono("Timeout in stress tests on Linux/arm32", TestPlatforms.Linux)]

src/libraries/System.Linq.Expressions/tests/AssemblyInfo.cs

@@ -4,4 +4,4 @@
 
 using Xunit;
 
-[assembly: SkipOnCoreClr("Long running tests: https://github.com/dotnet/coreclr/issues/25269", RuntimeStressTestModes.CheckedRuntime)]
+[assembly: SkipOnCoreClr("Long running tests: https://github.com/dotnet/coreclr/issues/25269", RuntimeTestModes.CheckedRuntime)]

src/libraries/System.Net.Http/tests/FunctionalTests/AssemblyInfo.cs

@@ -4,5 +4,5 @@
 
 using Xunit;
 
-[assembly: SkipOnCoreClr("System.Net.Tests are flaky and/or long running: https://github.com/dotnet/runtime/issues/131")]
+[assembly: SkipOnCoreClr("System.Net.Tests are flaky and/or long running: https://github.com/dotnet/runtime/issues/131", RuntimeTestModes.CheckedRuntime)]
 [assembly: SkipOnMono("System.Net.Tests are flaky and/or long running: https://github.com/dotnet/runtime/issues/131")]

src/libraries/System.Net.HttpListener/tests/HttpListenerAuthenticationTests.cs

@@ -13,7 +13,7 @@
 
 namespace System.Net.Tests
 {
-    [SkipOnCoreClr("System.Net.Tests may timeout in stress configurations")]
+    [SkipOnCoreClr("System.Net.Tests may timeout in stress configurations", RuntimeTestModes.CheckedRuntime)]
     [ActiveIssue("https://github.com/dotnet/runtime/issues/2391", TargetFrameworkMonikers.Mono)]
     [ConditionalClass(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))] // httpsys component missing in Nano.
     public class HttpListenerAuthenticationTests : IDisposable

src/libraries/System.Net.HttpListener/tests/HttpListenerContextTests.cs

@@ -14,7 +14,7 @@
 
 namespace System.Net.Tests
 {
-    [SkipOnCoreClr("System.Net.Tests may timeout in stress configurations")]
+    [SkipOnCoreClr("System.Net.Tests may timeout in stress configurations", RuntimeTestModes.CheckedRuntime)]
     [ActiveIssue("https://github.com/dotnet/runtime/issues/2391", TargetFrameworkMonikers.Mono)]
     [ConditionalClass(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))] // httpsys component missing in Nano.
     public class HttpListenerContextTests : IDisposable

src/libraries/System.Net.HttpListener/tests/HttpListenerResponseTests.Cookies.cs

@@ -9,7 +9,7 @@
 
 namespace System.Net.Tests
 {
-    [SkipOnCoreClr("System.Net.Tests may timeout in stress configurations")]
+    [SkipOnCoreClr("System.Net.Tests may timeout in stress configurations", RuntimeTestModes.CheckedRuntime)]
     [ActiveIssue("https://github.com/dotnet/runtime/issues/2391", TargetFrameworkMonikers.Mono)]
     [ConditionalClass(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))] // httpsys component missing in Nano.
     public class HttpListenerResponseCookiesTests : HttpListenerResponseTestBase

src/libraries/System.Net.HttpListener/tests/HttpListenerResponseTests.cs

@@ -57,7 +57,7 @@ protected async Task<HttpListenerResponse> GetResponse(string httpVersion = "1.1
         }
     }
 
-    [SkipOnCoreClr("System.Net.Tests may timeout in stress configurations")]
+    [SkipOnCoreClr("System.Net.Tests may timeout in stress configurations", RuntimeTestModes.CheckedRuntime)]
     [ActiveIssue("https://github.com/dotnet/runtime/issues/2391", TargetFrameworkMonikers.Mono)]
     [ConditionalClass(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))] // httpsys component missing in Nano.
     public class HttpListenerResponseTests : HttpListenerResponseTestBase

src/libraries/System.Net.Mail/tests/Functional/SmtpClientTest.cs

@@ -339,7 +339,7 @@ public void TestZeroTimeout()
         [InlineData("howdydoo")]
         [InlineData("")]
         [InlineData(null)]
-        [SkipOnCoreClr("System.Net.Tests are flaky and/or long running: https://github.com/dotnet/runtime/issues/131")]
+        [SkipOnCoreClr("System.Net.Tests are flaky and/or long running: https://github.com/dotnet/runtime/issues/131", RuntimeTestModes.CheckedRuntime)]
         [SkipOnMono("System.Net.Tests are flaky and/or long running: https://github.com/dotnet/runtime/issues/131")]
         public async Task TestMailDeliveryAsync(string body)
         {
@@ -358,7 +358,7 @@ public async Task TestMailDeliveryAsync(string body)
 
         [Fact]
         [PlatformSpecific(TestPlatforms.Windows)] // NTLM support required, see https://github.com/dotnet/corefx/issues/28961
-        [SkipOnCoreClr("System.Net.Tests are flaky and/or long running: https://github.com/dotnet/runtime/issues/131")]
+        [SkipOnCoreClr("System.Net.Tests are flaky and/or long running: https://github.com/dotnet/runtime/issues/131", RuntimeTestModes.CheckedRuntime)]
         [SkipOnMono("System.Net.Tests are flaky and/or long running: https://github.com/dotnet/runtime/issues/131")]
         public async Task TestCredentialsCopyInAsyncContext()
         {

src/libraries/System.Net.Requests/tests/LoggingTest.cs

@@ -11,8 +11,7 @@ public class LoggingTest
     {
         [Fact]
         [SkipOnTargetFramework(TargetFrameworkMonikers.Mono, "NetEventSource is only part of .NET Core.")]
-        [SkipOnCoreClr("System.Net.Tests are flaky")]
-        [SkipOnMono("System.Net.Tests are flaky")]
+        [SkipOnCoreClr("System.Net.Tests are flaky", RuntimeTestModes.CheckedRuntime)]
         public void EventSource_ExistsWithCorrectId()
         {
             Type esType = typeof(WebRequest).Assembly.GetType("System.Net.NetEventSource", throwOnError: true, ignoreCase: false);

src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamSniTest.cs

@@ -137,7 +137,7 @@ public async Task SslStream_ServerCallbackNotSet_UsesLocalCertificateSelection(s
         }
 
         [Fact]
-        [SkipOnCoreClr("System.Net.Tests are flaky and/or long running: https://github.com/dotnet/runtime/issues/131")]
+        [SkipOnCoreClr("System.Net.Tests are flaky and/or long running: https://github.com/dotnet/runtime/issues/131", RuntimeTestModes.CheckedRuntime)]
         [SkipOnMono("System.Net.Tests are flaky and/or long running: https://github.com/dotnet/runtime/issues/131")]
         public async Task SslStream_NoSniFromClient_CallbackReturnsNull()
         {

src/libraries/System.Net.Sockets/tests/FunctionalTests/AssemblyInfo.cs

@@ -4,5 +4,5 @@
 
 using Xunit;
 
-[assembly: SkipOnCoreClr("System.Net.Tests are flaky and/or long running: https://github.com/dotnet/runtime/issues/131")]
+[assembly: SkipOnCoreClr("System.Net.Tests are flaky and/or long running: https://github.com/dotnet/runtime/issues/131", RuntimeTestModes.CheckedRuntime)]
 [assembly: SkipOnMono("System.Net.Tests are flaky and/or long running: https://github.com/dotnet/runtime/issues/131")]

src/libraries/System.Runtime.Numerics/tests/BigInteger/BigIntegerToStringTests.cs

@@ -188,7 +188,7 @@ public static void RunStandardFormatToStringTests()
         }
 
         [Fact]
-        [SkipOnCoreClr("Long running tests: https://github.com/dotnet/coreclr/issues/22414", TestPlatforms.Linux, RuntimeStressTestModes.CheckedRuntime)]
+        [SkipOnCoreClr("Long running tests: https://github.com/dotnet/coreclr/issues/22414", TestPlatforms.Linux, RuntimeTestModes.CheckedRuntime)]
         public static void RunRegionSpecificStandardFormatToStringTests()
         {
             CultureInfo[] cultures = new CultureInfo[] { new CultureInfo("en-US"), new CultureInfo("en-GB"), new CultureInfo("fr-CA"),

src/libraries/System.Runtime.Serialization.Formatters/tests/BinaryFormatterTests.cs

@@ -23,7 +23,7 @@ public partial class BinaryFormatterTests : FileCleanupTestBase
     {
         // On 32-bit we can't test these high inputs as they cause OutOfMemoryExceptions.
         [ConditionalTheory(typeof(Environment), nameof(Environment.Is64BitProcess))]
-        [SkipOnCoreClr("Long running tests: https://github.com/dotnet/coreclr/issues/20246", RuntimeStressTestModes.CheckedRuntime)]
+        [SkipOnCoreClr("Long running tests: https://github.com/dotnet/coreclr/issues/20246", RuntimeTestModes.CheckedRuntime)]
         [InlineData(2 * 6_584_983 - 2)] // previous limit
         [InlineData(2 * 7_199_369 - 2)] // last pre-computed prime number
         public void SerializeHugeObjectGraphs(int limit)

src/libraries/System.Text.RegularExpressions/tests/Regex.Match.Tests.cs

@@ -919,7 +919,7 @@ public void Match_SpecialUnicodeCharacters_Invariant()
         [InlineData(RegexOptions.None)]
         [InlineData(RegexOptions.Compiled)]
         [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, ".NET Framework does not have fix for https://github.com/dotnet/corefx/issues/26484")]
-        [SkipOnCoreClr("Long running tests: https://github.com/dotnet/coreclr/issues/18912", RuntimeStressTestModes.JitMinOpts)]
+        [SkipOnCoreClr("Long running tests: https://github.com/dotnet/coreclr/issues/18912", RuntimeTestModes.JitMinOpts)]
         public void Match_ExcessPrefix(RegexOptions options)
         {
             RemoteExecutor.Invoke(optionsString =>