[main] Update dependencies from devdiv/DevDiv/vs-code-coverage, dotnet/arcade (#7154)

dotnet-maestro[bot] · web-flow · commit 84aebcbf97a7 · 2026-01-15T17:45:34.000Z
[main] Update dependencies from devdiv/DevDiv/vs-code-coverage, dotnet/arcade


 - Fix warning

 - Add dotnet11 feed

 - dotnet11

 - Fix analyzer warning

 - Fix warning

 - dotnet11

 - Combine consecutive Path.Combine

 - Fix test

 - Fix test

 - Update to 11.0.100-alpha.1.26062.101

 - Fix warnings

 - Fix more warnings

 - Disable annoying analyzer

 - Merge branch 'main' into darc-main-e5b7fb88-ffc6-4df2-9bbc-7a22a08ca40a

 - Merge branch 'main' into darc-main-e5b7fb88-ffc6-4df2-9bbc-7a22a08ca40a

 - Latest main
diff --git a/.editorconfig b/.editorconfig
@@ -343,7 +343,7 @@ dotnet_diagnostic.IDE0270.severity = warning
 dotnet_diagnostic.IDE0280.severity = warning
 
 # IDE0370: Remove unnecessary suppression
-dotnet_diagnostic.IDE0370.severity = warning
+dotnet_diagnostic.IDE0370.severity = none
 
 # IDE1005: Use conditional delegate call
 dotnet_diagnostic.IDE1005.severity = warning
diff --git a/NuGet.config b/NuGet.config
@@ -17,6 +17,7 @@
     <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
     <add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
     <add key="dotnet10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10/nuget/v3/index.json" />
+    <add key="dotnet11" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet11/nuget/v3/index.json" />
   </packageSources>
   <activePackageSource>
     <add key="All" value="(Aggregate source)" />
@@ -47,5 +48,8 @@
     <packageSource key="dotnet10">
       <package pattern="*" />
     </packageSource>
+    <packageSource key="dotnet11">
+      <package pattern="*" />
+    </packageSource>
   </packageSourceMapping>
 </configuration>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25617.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26064.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>47a8a69721dfea57b82121ac1458d2f5bba6abd2</Sha>
+      <Sha>24b29186c16793fff7079515483f26585e5b2881</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.25617.1">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.26064.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>47a8a69721dfea57b82121ac1458d2f5bba6abd2</Sha>
+      <Sha>24b29186c16793fff7079515483f26585e5b2881</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XliffTasks" Version="11.0.0-beta.25617.1">
+    <Dependency Name="Microsoft.DotNet.XliffTasks" Version="11.0.0-beta.26064.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>47a8a69721dfea57b82121ac1458d2f5bba6abd2</Sha>
+      <Sha>24b29186c16793fff7079515483f26585e5b2881</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Testing.Extensions.CodeCoverage" Version="18.4.0-preview.26062.2">
+    <Dependency Name="Microsoft.Testing.Extensions.CodeCoverage" Version="18.4.0-preview.26064.4">
       <Uri>https://dev.azure.com/devdiv/DevDiv/_git/vs-code-coverage</Uri>
-      <Sha>74ce4948abff2b900d035bf7fd3a09f4b76f4e62</Sha>
+      <Sha>227c65aeacd58d1e2549c990f78d185fa811e879</Sha>
     </Dependency>
     <Dependency Name="MSTest" Version="4.1.0-preview.26064.3">
       <Uri>https://github.com/microsoft/testfx</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -7,8 +7,8 @@
     <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
   </PropertyGroup>
   <PropertyGroup Label="MSTest prod dependencies - darc updated">
-    <MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.25617.1</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
-    <MicrosoftTestingExtensionsCodeCoverageVersion>18.4.0-preview.26062.2</MicrosoftTestingExtensionsCodeCoverageVersion>
+    <MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.26064.2</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
+    <MicrosoftTestingExtensionsCodeCoverageVersion>18.4.0-preview.26064.4</MicrosoftTestingExtensionsCodeCoverageVersion>
     <!-- empty line to avoid merge conflicts for darc PRs to update CC and MSTest+MTP -->
     <MSTestVersion>4.1.0-preview.26064.3</MSTestVersion>
     <MicrosoftTestingPlatformVersion>2.1.0-preview.26064.3</MicrosoftTestingPlatformVersion>
diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml
@@ -80,7 +80,7 @@ jobs:
     # If it's not devdiv, it's dnceng
     ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
       name: NetCore1ESPool-Publishing-Internal
-      image: windows.vs2019.amd64
+      image: windows.vs2022.amd64
       os: windows
   steps:
   - ${{ if eq(parameters.is1ESPipeline, '') }}:
diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml
@@ -293,11 +293,11 @@ stages:
         ${{ else }}:
           ${{ if eq(parameters.is1ESPipeline, true) }}:
             name: NetCore1ESPool-Publishing-Internal
-            image: windows.vs2019.amd64
+            image: windows.vs2022.amd64
             os: windows
           ${{ else }}:
             name: NetCore1ESPool-Publishing-Internal
-            demands: ImageOverride -equals windows.vs2019.amd64
+            demands: ImageOverride -equals windows.vs2022.amd64
       steps:
       - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
         parameters:
diff --git a/eng/common/core-templates/steps/install-microbuild-impl.yml b/eng/common/core-templates/steps/install-microbuild-impl.yml
@@ -18,7 +18,7 @@ parameters:
     type: boolean
 
 steps:
-- ${{ if eq(parameters.enablePreviewMicrobuild, 'true') }}:
+- ${{ if eq(parameters.enablePreviewMicrobuild, true) }}:
     - task: MicroBuildSigningPluginPreview@4
       displayName: Install Preview MicroBuild plugin
       inputs: ${{ parameters.microbuildTaskInputs }}
diff --git a/eng/common/core-templates/steps/source-index-stage1-publish.yml b/eng/common/core-templates/steps/source-index-stage1-publish.yml
@@ -14,8 +14,8 @@ steps:
     workingDirectory: $(Agent.TempDirectory)
 
 - script: |
-    $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version ${{parameters.sourceIndexProcessBinlogPackageVersion}} --source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools
-    $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version ${{parameters.sourceIndexUploadPackageVersion}} --source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools
+    $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version ${{parameters.sourceIndexProcessBinlogPackageVersion}} --source ${{parameters.sourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools
+    $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version ${{parameters.sourceIndexUploadPackageVersion}} --source ${{parameters.sourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools
   displayName: "Source Index: Download netsourceindex Tools"
   # Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk.
   workingDirectory: $(Agent.TempDirectory)
diff --git a/eng/common/native/install-dependencies.sh b/eng/common/native/install-dependencies.sh
@@ -27,7 +27,7 @@ case "$os" in
                 libssl-dev libkrb5-dev pigz cpio
 
             localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
-        elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ] || [ "$ID" = "azurelinux" ] || [ "$ID" = "centos"]; then
+        elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ] || [ "$ID" = "azurelinux" ] || [ "$ID" = "centos" ]; then
             pkg_mgr="$(command -v tdnf 2>/dev/null || command -v dnf)"
             $pkg_mgr install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel lttng-ust-devel pigz cpio
         elif [ "$ID" = "amzn" ]; then
diff --git a/eng/common/templates/variables/pool-providers.yml b/eng/common/templates/variables/pool-providers.yml
@@ -23,7 +23,7 @@
 #
 #        pool:
 #           name: $(DncEngInternalBuildPool)
-#           demands: ImageOverride -equals windows.vs2019.amd64
+#           demands: ImageOverride -equals windows.vs2022.amd64
 variables:
   - ${{ if eq(variables['System.TeamProject'], 'internal') }}:
     - template: /eng/common/templates-official/variables/pool-providers.yml
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "10.0.102",
+    "dotnet": "11.0.100-alpha.1.26064.120",
     "runtimes": {
       "dotnet": [
         "8.0.18",
@@ -24,7 +24,7 @@
     }
   },
   "sdk": {
-    "version": "10.0.102",
+    "version": "11.0.100-alpha.1.26064.120",
     "paths": [
       ".dotnet",
       "$host$"
@@ -37,7 +37,7 @@
     "runner": "Microsoft.Testing.Platform"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25617.1",
+    "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26064.2",
     "MSBuild.Sdk.Extras": "3.0.44"
   }
 }
diff --git a/src/Adapter/MSTest.Engine/Engine/TestArgumentsManager.cs b/src/Adapter/MSTest.Engine/Engine/TestArgumentsManager.cs
@@ -110,7 +110,7 @@ static void ExpandNodeWithArguments(TestNode testNode, object arguments, ref int
             if (arguments is not ITestArgumentsEntry testArgumentsEntry)
             {
                 shouldWrapInParenthesis = !isIndexArgumentPropertiesProvider;
-                testArgumentsEntry = argumentPropertiesProvider(new(arguments, testNode))!;
+                testArgumentsEntry = argumentPropertiesProvider(new(arguments, testNode));
             }
 
             string argumentFragmentUid = GetArgumentFragmentUid(testArgumentsEntry, shouldWrapInParenthesis);
diff --git a/src/Adapter/MSTestAdapter.PlatformServices/Utilities/AssemblyUtility.cs b/src/Adapter/MSTestAdapter.PlatformServices/Utilities/AssemblyUtility.cs
@@ -143,7 +143,7 @@ internal virtual List<string> GetSatelliteAssemblies(string assemblyPath)
             {
                 // extension contains leading dot.
                 string satellite = Path.ChangeExtension(assemblyFileName, "resources" + extension);
-                string satellitePath = Path.Combine(assemblyDir, Path.Combine(dir, satellite));
+                string satellitePath = Path.Combine(assemblyDir, dir, satellite);
 
                 // We don't use Assembly.LoadFrom/Assembly.GetSatelliteAssemblies because this is rather slow
                 // (1620ms for 266 cultures when directories do not exist).
diff --git a/src/Analyzers/MSTest.Analyzers.CodeFixes/UseExecuteAsyncOverrideFixer.cs b/src/Analyzers/MSTest.Analyzers.CodeFixes/UseExecuteAsyncOverrideFixer.cs
@@ -127,7 +127,7 @@ private static BlockSyntax TransformMethodBody(BlockSyntax body)
     {
         // Transform all return statements to return Task.FromResult<TestResult[]>(...)
         var transformer = new ReturnStatementTransformer();
-        return (BlockSyntax)transformer.Visit(body)!;
+        return (BlockSyntax)transformer.Visit(body);
     }
 
     private static ArrowExpressionClauseSyntax TransformExpressionBody(ArrowExpressionClauseSyntax expressionBody)
diff --git a/src/Analyzers/MSTest.Analyzers/RoslynAnalyzerHelpers/DiagnosticExtensions.cs b/src/Analyzers/MSTest.Analyzers/RoslynAnalyzerHelpers/DiagnosticExtensions.cs
@@ -214,7 +214,7 @@ public static void ReportNoLocationDiagnostic(
                 else
                 {
                     RoslynDebug.Assert(s_syntaxTreeDiagnosticOptionsProperty != null);
-                    var options = (ImmutableDictionary<string, ReportDiagnostic>)s_syntaxTreeDiagnosticOptionsProperty.GetValue(tree)!;
+                    var options = (ImmutableDictionary<string, ReportDiagnostic>)s_syntaxTreeDiagnosticOptionsProperty.GetValue(tree);
                     if (options.TryGetValue(rule.Id, out ReportDiagnostic value))
                     {
                         configuredValue = value;
diff --git a/src/Platform/Microsoft.Testing.Extensions.AzureFoundry/OpenAIChatClientProvider.cs b/src/Platform/Microsoft.Testing.Extensions.AzureFoundry/OpenAIChatClientProvider.cs
@@ -62,8 +62,8 @@ public Task<IChatClient> CreateChatClientAsync(CancellationToken cancellationTok
         }
 
         var client = new AzureOpenAIClient(
-            new Uri(endpoint!),
-            new ApiKeyCredential(apiKey!));
+            new Uri(endpoint),
+            new ApiKeyCredential(apiKey));
 
         return Task.FromResult(client.GetChatClient(deploymentName).AsIChatClient());
     }
diff --git a/src/Platform/Microsoft.Testing.Extensions.HotReload/HotReloadHandler.cs b/src/Platform/Microsoft.Testing.Extensions.HotReload/HotReloadHandler.cs
@@ -86,7 +86,7 @@ public async Task<bool> ShouldRunAsync(Task? waitExecutionCompletion, Cancellati
         if (waitExecutionCompletion is not null)
         {
             await waitExecutionCompletion.ConfigureAwait(false);
-            await _outputDevice!.DisplayAsync(_outputDeviceDataProducer, new TextOutputDeviceData(ExtensionResources.HotReloadSessionCompleted), cancellationToken).ConfigureAwait(false);
+            await _outputDevice.DisplayAsync(_outputDeviceDataProducer, new TextOutputDeviceData(ExtensionResources.HotReloadSessionCompleted), cancellationToken).ConfigureAwait(false);
         }
 
         try
@@ -100,7 +100,7 @@ public async Task<bool> ShouldRunAsync(Task? waitExecutionCompletion, Cancellati
 
         if (!IsClearNotSupported())
         {
-            _console!.Clear();
+            _console.Clear();
         }
 
         await _outputDevice.DisplayAsync(_outputDeviceDataProducer, new TextOutputDeviceData(ExtensionResources.HotReloadSessionStarted), cancellationToken).ConfigureAwait(false);
diff --git a/src/Platform/Microsoft.Testing.Extensions.OpenTelemetry/OpenTelemetryPlatformService.cs b/src/Platform/Microsoft.Testing.Extensions.OpenTelemetry/OpenTelemetryPlatformService.cs
@@ -24,7 +24,7 @@ internal sealed class OpenTelemetryPlatformService : IPlatformOpenTelemetryServi
 
     public ICounter<T> CreateCounter<T>(string name, string? unit = null, string? description = null, IEnumerable<KeyValuePair<string, object?>>? tags = null)
         where T : struct
-        => new CounterWrapper<T>(_meter.CreateCounter<T>(name, unit, description, tags!));
+        => new CounterWrapper<T>(_meter.CreateCounter<T>(name, unit, description, tags));
 
     public IHistogram<T> CreateHistogram<T>(string name, string? unit = null, string? description = null, IEnumerable<KeyValuePair<string, object?>>? tags = null)
         where T : struct
diff --git a/src/Platform/Microsoft.Testing.Extensions.VSTestBridge/ObjectModel/FastFilter.cs b/src/Platform/Microsoft.Testing.Extensions.VSTestBridge/ObjectModel/FastFilter.cs
@@ -83,15 +83,15 @@ internal bool Evaluate(Func<string, object?> propertyValueProvider)
         string? result = null;
         if (PropertyValueRegexReplacement == null)
         {
-            Match match = PropertyValueRegex!.Match(value);
+            Match match = PropertyValueRegex.Match(value);
             if (match.Success)
             {
                 result = match.Value;
             }
         }
         else
         {
-            result = PropertyValueRegex!.Replace(value, PropertyValueRegexReplacement);
+            result = PropertyValueRegex.Replace(value, PropertyValueRegexReplacement);
         }
 
         return result;
diff --git a/src/Platform/Microsoft.Testing.Platform.MSBuild/Tasks/InvokeTestingPlatformTask.cs b/src/Platform/Microsoft.Testing.Platform.MSBuild/Tasks/InvokeTestingPlatformTask.cs
@@ -292,9 +292,9 @@ protected override string GenerateCommandLineCommands()
         // If we are not "dotnet.exe" and not "mono", then we are given an executable from user and we are running on Windows.
         builder.AppendSwitchIfNotNull($"--{MSBuildConstants.MSBuildNodeOptionKey} ", _pipeNameDescription.Name);
 
-        if (!string.IsNullOrEmpty(TestingPlatformCommandLineArguments?.ItemSpec))
+        if (!RoslynString.IsNullOrEmpty(TestingPlatformCommandLineArguments?.ItemSpec))
         {
-            builder.AppendTextUnquoted($" {TestingPlatformCommandLineArguments!.ItemSpec} ");
+            builder.AppendTextUnquoted($" {TestingPlatformCommandLineArguments.ItemSpec} ");
         }
 
         if (VSTestCLIRunSettings?.Length > 0)
diff --git a/src/Platform/Microsoft.Testing.Platform/Messages/PropertyBag.cs b/src/Platform/Microsoft.Testing.Platform/Messages/PropertyBag.cs
@@ -203,7 +203,7 @@ public bool Any<TProperty>()
             return default;
         }
 
-        TProperty property = enumerator.Current!;
+        TProperty property = enumerator.Current;
         return enumerator.MoveNext()
             ? throw new InvalidOperationException($"Found multiple properties of type '{typeof(TProperty)}'.")
             : property;
diff --git a/src/Platform/Microsoft.Testing.Platform/OutputDevice/Terminal/TestProgressState.cs b/src/Platform/Microsoft.Testing.Platform/OutputDevice/Terminal/TestProgressState.cs
@@ -14,7 +14,7 @@ public TestProgressState(long id, string assembly, string? targetFramework, stri
         TargetFramework = targetFramework;
         Architecture = architecture;
         Stopwatch = stopwatch;
-        AssemblyName = Path.GetFileName(assembly)!;
+        AssemblyName = Path.GetFileName(assembly);
         IsDiscovery = isDiscovery;
     }
 
diff --git a/src/Platform/Microsoft.Testing.Platform/ServerMode/JsonRpc/PassiveNode.cs b/src/Platform/Microsoft.Testing.Platform/ServerMode/JsonRpc/PassiveNode.cs
@@ -56,7 +56,7 @@ public async Task<bool> ConnectAsync()
         // Log the message
         if (_logger.IsEnabled(LogLevel.Trace))
         {
-            await _logger.LogTraceAsync(message!.ToString()).ConfigureAwait(false);
+            await _logger.LogTraceAsync(message.ToString()).ConfigureAwait(false);
         }
 
         var requestMessage = (RequestMessage)message;
diff --git a/src/TestFramework/TestFramework/Assertions/Assert.IsExactInstanceOfType.cs b/src/TestFramework/TestFramework/Assertions/Assert.IsExactInstanceOfType.cs
@@ -311,7 +311,7 @@ public static void IsExactInstanceOfType([NotNull] object? value, [NotNull] Type
     public static T IsExactInstanceOfType<T>([NotNull] object? value, string? message = "", [CallerArgumentExpression(nameof(value))] string valueExpression = "")
     {
         IsExactInstanceOfType(value, typeof(T), message, valueExpression);
-        return (T)value!;
+        return (T)value;
     }
 
     /// <inheritdoc cref="IsExactInstanceOfType{T}(object?, string, string)" />
diff --git a/src/TestFramework/TestFramework/Assertions/Assert.That.cs b/src/TestFramework/TestFramework/Assertions/Assert.That.cs
@@ -56,7 +56,9 @@ public static void That(Expression<Func<bool>> condition, string? message = null
         }
     }
 
+#pragma warning disable IDE0051 // Remove unused private members - false positive
     private static string ExtractDetails(Expression expr)
+#pragma warning restore IDE0051 // Remove unused private members
     {
         var details = new Dictionary<string, object?>();
         ExtractVariablesFromExpression(expr, details);
@@ -691,7 +693,7 @@ private static string CleanExcessiveParentheses(string input)
 
                 // Keep at most 2 consecutive parentheses
                 int keepCount = Math.Min(count, 2);
-                result.Append(new string(currentChar, keepCount));
+                result.Append(currentChar, keepCount);
                 i += count;
             }
             else
diff --git a/src/TestFramework/TestFramework/Attributes/DataSource/DynamicDataOperations.cs b/src/TestFramework/TestFramework/Attributes/DataSource/DynamicDataOperations.cs
@@ -155,7 +155,7 @@ private static bool TryGetData(object dataSource, [NotNullWhen(true)] out IEnume
             List<object[]> objects = [];
             foreach (object? entry in enumerable)
             {
-                objects.Add([entry!]);
+                objects.Add([entry]);
             }
 
             data = objects;
diff --git a/src/TestFramework/TestFramework/Logger.cs b/src/TestFramework/TestFramework/Logger.cs
@@ -46,7 +46,7 @@ public static void LogMessage(string format, params object?[] args)
         {
             try
             {
-                invoker.GetMethodInfo()!.Invoke(invoker.Target, parameters);
+                invoker.GetMethodInfo().Invoke(invoker.Target, parameters);
             }
             catch (Exception)
             {
diff --git a/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/HangDumpTests.cs b/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/HangDumpTests.cs
@@ -42,8 +42,7 @@ public async Task HangDump_WithDotnetTest_CreateDump()
             failIfReturnValueIsNotZero: false,
             cancellationToken: TestContext.CancellationToken);
 
-        // This should be TestHostProcessExitedNonGracefully instead of GenericFailure. This will likely be fixed by https://github.com/dotnet/sdk/pull/51857
-        testResult.AssertExitCodeIs(ExitCodes.GenericFailure);
+        testResult.AssertExitCodeIs(ExitCodes.TestHostProcessExitedNonGracefully);
         string[] dumpFiles = Directory.GetFiles(resultDirectory, "HangDump*.dmp", SearchOption.AllDirectories);
         Assert.ContainsSingle(dumpFiles, $"Expected single dump file. Found: {Environment.NewLine}{string.Join(Environment.NewLine, dumpFiles)}{Environment.NewLine}{testResult}");
     }
diff --git a/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/TrxTests.cs b/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/TrxTests.cs
@@ -69,8 +69,7 @@ public async Task Trx_WhenTestHostCrash_RunningUnderDotnetTest_ErrorIsDisplayedI
             failIfReturnValueIsNotZero: false,
             cancellationToken: TestContext.CancellationToken);
 
-        // This should be TestHostProcessExitedNonGracefully instead of GenericFailure. This will likely be fixed by https://github.com/dotnet/sdk/pull/51857
-        result.AssertExitCodeIs(ExitCodes.GenericFailure);
+        result.AssertExitCodeIs(ExitCodes.TestHostProcessExitedNonGracefully);
 
         string trxFile = Directory.GetFiles(testResultsPath, $"{fileName}.trx", SearchOption.AllDirectories).Single();
         string trxContent = File.ReadAllText(trxFile);
diff --git a/test/IntegrationTests/PlatformServices.Desktop.IntegrationTests/ReflectionUtilityTests.cs b/test/IntegrationTests/PlatformServices.Desktop.IntegrationTests/ReflectionUtilityTests.cs
diff --git a/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Utilities/DeploymentUtilityTests.cs b/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Utilities/DeploymentUtilityTests.cs
diff --git a/test/Utilities/Microsoft.Testing.TestInfrastructure/TestAsset.cs b/test/Utilities/Microsoft.Testing.TestInfrastructure/TestAsset.cs

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`#`
`24`	`24`	`# pool:`
`25`	`25`	`# name: $(DncEngInternalBuildPool)`
`26`		`-# demands: ImageOverride -equals windows.vs2019.amd64`
	`26`	`+# demands: ImageOverride -equals windows.vs2022.amd64`
`27`	`27`	`variables:`
`28`	`28`	`- ${{ if eq(variables['System.TeamProject'], 'internal') }}:`
`29`	`29`	`- template: /eng/common/templates-official/variables/pool-providers.yml`