From 19fde51a109a49f694c8a2e4b1625c34cabe823a Mon Sep 17 00:00:00 2001
From: Kirill Osenkov <github@osenkov.com>
Date: Sat, 5 Oct 2024 20:26:12 -0700
Subject: [PATCH 01/11] Support hidden severity for analyzers and code fixes

Without this, you can't fix diagnostics such as --diagnostics VSTHRD111 --severity hidden
---
 src/BuiltInTools/dotnet-format/Commands/FormatCommandCommon.cs | 3 ++-
 src/BuiltInTools/dotnet-format/FixSeverity.cs                  | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/BuiltInTools/dotnet-format/Commands/FormatCommandCommon.cs b/src/BuiltInTools/dotnet-format/Commands/FormatCommandCommon.cs
index 64548392e484..9814c416fba3 100644
--- a/src/BuiltInTools/dotnet-format/Commands/FormatCommandCommon.cs
+++ b/src/BuiltInTools/dotnet-format/Commands/FormatCommandCommon.cs
@@ -17,7 +17,7 @@ internal static class FormatCommandCommon
         internal const int UnableToLocateMSBuildExitCode = 3;
 
         private static string[] VerbosityLevels => new[] { "q", "quiet", "m", "minimal", "n", "normal", "d", "detailed", "diag", "diagnostic" };
-        private static string[] SeverityLevels => new[] { "info", "warn", "error" };
+        private static string[] SeverityLevels => new[] { "info", "warn", "error", "hidden" };
 
         public static readonly Argument<string> SlnOrProjectArgument = new Argument<string>(Resources.SolutionOrProjectArgumentName)
         {
@@ -290,6 +290,7 @@ internal static DiagnosticSeverity GetSeverity(string? severity)
                 FixSeverity.Error => DiagnosticSeverity.Error,
                 FixSeverity.Warn => DiagnosticSeverity.Warning,
                 FixSeverity.Info => DiagnosticSeverity.Info,
+                FixSeverity.Hidden => DiagnosticSeverity.Hidden,
                 _ => throw new ArgumentOutOfRangeException(nameof(severity)),
             };
         }
diff --git a/src/BuiltInTools/dotnet-format/FixSeverity.cs b/src/BuiltInTools/dotnet-format/FixSeverity.cs
index 47b719bda074..8ea9fc094a36 100644
--- a/src/BuiltInTools/dotnet-format/FixSeverity.cs
+++ b/src/BuiltInTools/dotnet-format/FixSeverity.cs
@@ -7,5 +7,6 @@ public static class FixSeverity
         public const string Error = "error";
         public const string Warn = "warn";
         public const string Info = "info";
+        public const string Hidden = "hidden";
     }
 }

From 50dcf2df81fe55e5d5cd2745649fa9b450b73f17 Mon Sep 17 00:00:00 2001
From: Jacques Eloff <joeloff@users.noreply.github.com>
Date: Tue, 9 Sep 2025 21:21:04 -0700
Subject: [PATCH 02/11] Accessibility: Select header by default

---
 src/Layout/pkg/windows/bundles/sdk/bundle.thm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Layout/pkg/windows/bundles/sdk/bundle.thm b/src/Layout/pkg/windows/bundles/sdk/bundle.thm
index 0b8a551e1168..a9ed6a319c7d 100644
--- a/src/Layout/pkg/windows/bundles/sdk/bundle.thm
+++ b/src/Layout/pkg/windows/bundles/sdk/bundle.thm
@@ -81,7 +81,7 @@
       </Button>
     </Page>
     <Page Name="Success">
-      <Label Name="SuccessHeader" X="148" Y="80" Width="-12" Height="32" HexStyle="00000000" FontId="PageHeaderFont">
+      <Label Name="SuccessHeader" X="148" Y="80" Width="-12" Height="32" HexStyle="00000000" FontId="PageHeaderFont" TabStop="yes">
         <!-- Default text to display if none of the conditions are true. -->
         <Text>#(loc.SuccessHeader)</Text>
         <Text Condition="WixBundleAction = 2">#(loc.SuccessLayoutHeader)</Text>
@@ -116,7 +116,7 @@
       </Button>
     </Page>
     <Page Name="Failure">
-      <Label Name="FailureHeader" X="148" Y="80" Width="-12" Height="32" HexStyle="00000000" FontId="PageHeaderFont">
+      <Label Name="FailureHeader" X="148" Y="80" Width="-12" Height="32" HexStyle="00000000" FontId="PageHeaderFont" TabStop="yes">
         <Text>#(loc.FailureHeader)</Text>
         <Text Condition="WixBundleAction = 2">#(loc.FailureLayoutHeader)</Text>
         <Text Condition="WixBundleAction = 3">#(loc.FailureUnsafeUninstallHeader)</Text>

From d030bbc562be338018fe26574cf0b4f070dd02c4 Mon Sep 17 00:00:00 2001
From: Youssef Victor <youssefvictor00@gmail.com>
Date: Wed, 10 Sep 2025 08:58:42 +0200
Subject: [PATCH 03/11] FailFast in UnknownMessageSerializer.Serialize (#50704)

---
 .../Test/MTP/IPC/Serializers/UnknownMessageSerializer.cs      | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Cli/dotnet/Commands/Test/MTP/IPC/Serializers/UnknownMessageSerializer.cs b/src/Cli/dotnet/Commands/Test/MTP/IPC/Serializers/UnknownMessageSerializer.cs
index 3ebc6f1802be..f1e3331f333b 100644
--- a/src/Cli/dotnet/Commands/Test/MTP/IPC/Serializers/UnknownMessageSerializer.cs
+++ b/src/Cli/dotnet/Commands/Test/MTP/IPC/Serializers/UnknownMessageSerializer.cs
@@ -17,7 +17,5 @@ public object Deserialize(Stream _)
     }
 
     public void Serialize(object _, Stream stream)
-    {
-        WriteInt(stream, Id);
-    }
+        => Environment.FailFast("SDK never serializes UnknownMessage. This should never be hit.");
 }

From 7dafa7960bd97d0eea84a3dfa1867bc0dabfe8c0 Mon Sep 17 00:00:00 2001
From: Youssef Victor <youssefvictor00@gmail.com>
Date: Wed, 10 Sep 2025 09:23:42 +0200
Subject: [PATCH 04/11] Stricter implementation of test session events for MTP
 (#50703)

---
 .../dotnet/Commands/CliCommandStrings.resx    | 24 ++++++--
 .../Commands/Test/MTP/CustomEventArgs.cs      | 13 -----
 ...icrosoftTestingPlatformTestCommand.Help.cs | 31 ++++------
 .../MicrosoftTestingPlatformTestCommand.cs    | 12 ++--
 src/Cli/dotnet/Commands/Test/MTP/Models.cs    |  2 -
 src/Cli/dotnet/Commands/Test/MTP/Options.cs   |  2 +-
 .../Test/MTP/Terminal/TerminalTestReporter.cs |  9 +--
 .../Commands/Test/MTP/TestApplication.cs      | 50 ++++++++--------
 .../Test/MTP/TestApplicationActionQueue.cs    | 30 ++++++----
 .../Test/MTP/TestApplicationHandler.cs        | 57 ++++++++++++++++---
 .../Commands/xlf/CliCommandStrings.cs.xlf     | 25 ++++++++
 .../Commands/xlf/CliCommandStrings.de.xlf     | 25 ++++++++
 .../Commands/xlf/CliCommandStrings.es.xlf     | 25 ++++++++
 .../Commands/xlf/CliCommandStrings.fr.xlf     | 25 ++++++++
 .../Commands/xlf/CliCommandStrings.it.xlf     | 25 ++++++++
 .../Commands/xlf/CliCommandStrings.ja.xlf     | 25 ++++++++
 .../Commands/xlf/CliCommandStrings.ko.xlf     | 25 ++++++++
 .../Commands/xlf/CliCommandStrings.pl.xlf     | 25 ++++++++
 .../Commands/xlf/CliCommandStrings.pt-BR.xlf  | 25 ++++++++
 .../Commands/xlf/CliCommandStrings.ru.xlf     | 25 ++++++++
 .../Commands/xlf/CliCommandStrings.tr.xlf     | 25 ++++++++
 .../xlf/CliCommandStrings.zh-Hans.xlf         | 25 ++++++++
 .../xlf/CliCommandStrings.zh-Hant.xlf         | 25 ++++++++
 23 files changed, 460 insertions(+), 95 deletions(-)
 delete mode 100644 src/Cli/dotnet/Commands/Test/MTP/CustomEventArgs.cs

diff --git a/src/Cli/dotnet/Commands/CliCommandStrings.resx b/src/Cli/dotnet/Commands/CliCommandStrings.resx
index 0f0c8283f41b..03d5475f2099 100644
--- a/src/Cli/dotnet/Commands/CliCommandStrings.resx
+++ b/src/Cli/dotnet/Commands/CliCommandStrings.resx
@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="Aborted" xml:space="preserve">
-    <value>Aborted</value>
-  </data>
   <data name="ActiveTestsRunning_FullTestsCount" xml:space="preserve">
     <value>{0} tests running</value>
   </data>
@@ -2666,4 +2663,23 @@ Proceed?</value>
   <data name="DotnetTestIncompatibleHandshakeVersion" xml:space="preserve">
     <value>Supported protocol versions sent by Microsoft.Testing.Platform are '{0}'. The SDK supports '{1}', which is incompatible.</value>
   </data>
-</root>
+  <data name="ErrorRunningTestModule" xml:space="preserve">
+    <value>The following exception occurred when running the test module with RunCommand '{0}' and RunArguments '{1}':
+
+{2}</value>
+    <comment>{Locked="RunCommand"}{Locked="RunArguments"}
+{2} is the exception that occurred.</comment>
+  </data>
+  <data name="UnexpectedTestSessionEnd" xml:space="preserve">
+    <value>A test session end event was received without a corresponding test session start.</value>
+  </data>
+  <data name="MissingTestSessionEnd" xml:space="preserve">
+    <value>A test session start event was received without a corresponding test session end.</value>
+  </data>
+  <data name="Aborted" xml:space="preserve">
+    <value>Aborted</value>
+  </data>
+  <data name="UnexpectedHelpMessage" xml:space="preserve">
+    <value>An unexpected help-related message was received when `--help` wasn't used.</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/src/Cli/dotnet/Commands/Test/MTP/CustomEventArgs.cs b/src/Cli/dotnet/Commands/Test/MTP/CustomEventArgs.cs
deleted file mode 100644
index 731bf3557f76..000000000000
--- a/src/Cli/dotnet/Commands/Test/MTP/CustomEventArgs.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-#nullable disable
-
-namespace Microsoft.DotNet.Cli.Commands.Test;
-
-internal sealed class HelpEventArgs : EventArgs
-{
-    public string ModulePath { get; set; }
-
-    public CommandLineOption[] CommandLineOptions { get; set; }
-}
diff --git a/src/Cli/dotnet/Commands/Test/MTP/MicrosoftTestingPlatformTestCommand.Help.cs b/src/Cli/dotnet/Commands/Test/MTP/MicrosoftTestingPlatformTestCommand.Help.cs
index ee551e4b6d47..b21ee35ff933 100644
--- a/src/Cli/dotnet/Commands/Test/MTP/MicrosoftTestingPlatformTestCommand.Help.cs
+++ b/src/Cli/dotnet/Commands/Test/MTP/MicrosoftTestingPlatformTestCommand.Help.cs
@@ -5,13 +5,14 @@
 
 using System.Collections.Concurrent;
 using System.CommandLine;
+using Microsoft.DotNet.Cli.Commands.Test.IPC.Models;
 using Microsoft.TemplateEngine.Cli.Help;
 
 namespace Microsoft.DotNet.Cli.Commands.Test;
 
 internal partial class MicrosoftTestingPlatformTestCommand
 {
-    private readonly ConcurrentDictionary<string, CommandLineOption> _commandLineOptionNameToModuleNames = [];
+    private readonly ConcurrentDictionary<string, CommandLineOptionMessage> _commandLineOptionNameToModuleNames = [];
     private readonly ConcurrentDictionary<bool, List<(string, string[])>> _moduleNamesToCommandLineOptions = [];
     private static readonly string Indent = "  ";
 
@@ -29,9 +30,9 @@ public IEnumerable<Action<HelpContext>> CustomHelpLayout()
                 return;
             }
 
-            Dictionary<bool, List<CommandLineOption>> allOptions = GetAllOptions(context.Command.Options);
-            allOptions.TryGetValue(true, out List<CommandLineOption> builtInOptions);
-            allOptions.TryGetValue(false, out List<CommandLineOption> nonBuiltInOptions);
+            Dictionary<bool, List<CommandLineOptionMessage>> allOptions = GetAllOptions(context.Command.Options);
+            allOptions.TryGetValue(true, out List<CommandLineOptionMessage> builtInOptions);
+            allOptions.TryGetValue(false, out List<CommandLineOptionMessage> nonBuiltInOptions);
 
             Dictionary<bool, List<(string[], string[])>> moduleToMissingOptions = GetModulesToMissingOptions(_moduleNamesToCommandLineOptions, builtInOptions.Select(option => option.Name), nonBuiltInOptions.Select(option => option.Name));
 
@@ -92,22 +93,14 @@ private static string FormatHelpOption(string option)
         return $"[{option.Trim(':').ToLower()}]";
     }
 
-    private void OnHelpRequested(object sender, HelpEventArgs args)
+    private void OnHelpRequested(CommandLineOptionMessages commandLineOptionMessages)
     {
-        var testApp = (TestApplication)sender;
-        if (!testApp.TestOptions.IsHelp)
-        {
-            // TODO: Better to throw exception?
-            return;
-        }
-        
-        CommandLineOption[] commandLineOptionMessages = args.CommandLineOptions;
-        string moduleName = args.ModulePath;
+        string moduleName = commandLineOptionMessages.ModulePath;
 
         List<string> builtInOptions = [];
         List<string> nonBuiltInOptions = [];
 
-        foreach (CommandLineOption commandLineOption in commandLineOptionMessages)
+        foreach (CommandLineOptionMessage commandLineOption in commandLineOptionMessages.CommandLineOptionMessageList)
         {
             if (commandLineOption.IsHidden.HasValue && commandLineOption.IsHidden.Value) continue;
 
@@ -135,19 +128,19 @@ private void OnHelpRequested(object sender, HelpEventArgs args)
            (isBuiltIn, value) => [.. value, (moduleName, nonBuiltInOptions.ToArray())]);
     }
 
-    private Dictionary<bool, List<CommandLineOption>> GetAllOptions(IList<Option> commandOptions)
+    private Dictionary<bool, List<CommandLineOptionMessage>> GetAllOptions(IList<Option> commandOptions)
     {
-        Dictionary<bool, List<CommandLineOption>> filteredOptions = [];
+        Dictionary<bool, List<CommandLineOptionMessage>> filteredOptions = [];
 
         // Create a set of option names from the command's options for efficient lookup
         var commandOptionNames = commandOptions.Select(o => o.Name.TrimStart('-')).ToHashSet(StringComparer.OrdinalIgnoreCase);
 
-        foreach (KeyValuePair<string, CommandLineOption> option in _commandLineOptionNameToModuleNames)
+        foreach (KeyValuePair<string, CommandLineOptionMessage> option in _commandLineOptionNameToModuleNames)
         {
             // Only include options that are NOT already present in the command's options
             if (!commandOptionNames.Contains(option.Value.Name))
             {
-                if (!filteredOptions.TryGetValue(option.Value.IsBuiltIn.Value, out List<CommandLineOption> value))
+                if (!filteredOptions.TryGetValue(option.Value.IsBuiltIn.Value, out List<CommandLineOptionMessage> value))
                 {
                     filteredOptions.Add(option.Value.IsBuiltIn.Value, [option.Value]);
                 }
diff --git a/src/Cli/dotnet/Commands/Test/MTP/MicrosoftTestingPlatformTestCommand.cs b/src/Cli/dotnet/Commands/Test/MTP/MicrosoftTestingPlatformTestCommand.cs
index df9f47365e92..485e3b49c7ef 100644
--- a/src/Cli/dotnet/Commands/Test/MTP/MicrosoftTestingPlatformTestCommand.cs
+++ b/src/Cli/dotnet/Commands/Test/MTP/MicrosoftTestingPlatformTestCommand.cs
@@ -42,8 +42,7 @@ private int RunInternal(ParseResult parseResult, bool isHelp)
         ValidationUtility.ValidateSolutionOrProjectOrDirectoryOrModulesArePassedCorrectly(parseResult);
 
         int degreeOfParallelism = GetDegreeOfParallelism(parseResult);
-        bool filterModeEnabled = parseResult.HasOption(MicrosoftTestingPlatformOptions.TestModulesFilterOption);
-        var testOptions = new TestOptions(filterModeEnabled, IsHelp: isHelp, IsDiscovery: parseResult.HasOption(MicrosoftTestingPlatformOptions.ListTestsOption));
+        var testOptions = new TestOptions(IsHelp: isHelp, IsDiscovery: parseResult.HasOption(MicrosoftTestingPlatformOptions.ListTestsOption));
 
         InitializeOutput(degreeOfParallelism, parseResult, testOptions);
 
@@ -55,7 +54,8 @@ private int RunInternal(ParseResult parseResult, bool isHelp)
 
         var msBuildHandler = new MSBuildHandler(buildOptions, actionQueue, _output);
 
-        if (testOptions.HasFilterMode)
+        bool filterModeEnabled = parseResult.HasOption(MicrosoftTestingPlatformOptions.TestModulesFilterOption);
+        if (filterModeEnabled)
         {
             var testModulesFilterHandler = new TestModulesFilterHandler(actionQueue, _output);
             if (!testModulesFilterHandler.RunWithTestModulesFilter(parseResult))
@@ -93,11 +93,7 @@ private int RunInternal(ParseResult parseResult, bool isHelp)
 
     private TestApplicationActionQueue InitializeActionQueue(int degreeOfParallelism, TestOptions testOptions, BuildOptions buildOptions)
     {
-        return new TestApplicationActionQueue(degreeOfParallelism, buildOptions, testOptions, _output, async (TestApplication testApp) =>
-        {
-            testApp.HelpRequested += OnHelpRequested;
-            return await testApp.RunAsync();
-        });
+        return new TestApplicationActionQueue(degreeOfParallelism, buildOptions, testOptions, _output, OnHelpRequested);
     }
 
     private void SetupCancelKeyPressHandler()
diff --git a/src/Cli/dotnet/Commands/Test/MTP/Models.cs b/src/Cli/dotnet/Commands/Test/MTP/Models.cs
index 941413f930ed..5ae3e71b2c63 100644
--- a/src/Cli/dotnet/Commands/Test/MTP/Models.cs
+++ b/src/Cli/dotnet/Commands/Test/MTP/Models.cs
@@ -113,5 +113,3 @@ public bool MoveNext()
 
 
 internal sealed record TestModule(RunProperties RunProperties, string? ProjectFullPath, string? TargetFramework, bool IsTestingPlatformApplication, bool IsTestProject, ProjectLaunchSettingsModel? LaunchSettings, string TargetPath, string? DotnetRootArchVariableName);
-
-internal sealed record CommandLineOption(string Name, string Description, bool? IsHidden, bool? IsBuiltIn);
diff --git a/src/Cli/dotnet/Commands/Test/MTP/Options.cs b/src/Cli/dotnet/Commands/Test/MTP/Options.cs
index 88d55069f7cc..21277304d1b9 100644
--- a/src/Cli/dotnet/Commands/Test/MTP/Options.cs
+++ b/src/Cli/dotnet/Commands/Test/MTP/Options.cs
@@ -3,7 +3,7 @@
 
 namespace Microsoft.DotNet.Cli.Commands.Test;
 
-internal record TestOptions(bool HasFilterMode, bool IsHelp, bool IsDiscovery);
+internal record TestOptions(bool IsHelp, bool IsDiscovery);
 
 internal record PathOptions(string? ProjectPath, string? SolutionPath, string? ResultsDirectoryPath, string? ConfigFilePath, string? DiagnosticOutputDirectoryPath);
 
diff --git a/src/Cli/dotnet/Commands/Test/MTP/Terminal/TerminalTestReporter.cs b/src/Cli/dotnet/Commands/Test/MTP/Terminal/TerminalTestReporter.cs
index 7b27aba48796..b6f92548e34f 100644
--- a/src/Cli/dotnet/Commands/Test/MTP/Terminal/TerminalTestReporter.cs
+++ b/src/Cli/dotnet/Commands/Test/MTP/Terminal/TerminalTestReporter.cs
@@ -6,6 +6,7 @@
 using System.Text.RegularExpressions;
 using Microsoft.CodeAnalysis;
 using Microsoft.Testing.Platform.OutputDevice.Terminal;
+using Microsoft.DotNet.Cli.Commands.Test.IPC.Models;
 
 namespace Microsoft.DotNet.Cli.Commands.Test.Terminal;
 
@@ -999,8 +1000,8 @@ public void TestInProgress(
     }
 
     public void WritePlatformAndExtensionOptions(HelpContext context,
-        IEnumerable<CommandLineOption> builtInOptions,
-        IEnumerable<CommandLineOption> nonBuiltInOptions,
+        IEnumerable<CommandLineOptionMessage> builtInOptions,
+        IEnumerable<CommandLineOptionMessage> nonBuiltInOptions,
         Dictionary<bool, List<(string[], string[])>> moduleToMissingOptions)
     {
         if (_wasCancelled)
@@ -1022,7 +1023,7 @@ public void WritePlatformAndExtensionOptions(HelpContext context,
         WriteModulesToMissingOptionsToConsole(moduleToMissingOptions);
     }
 
-    private void WriteOtherOptionsSection(HelpContext context, string title, IEnumerable<CommandLineOption> options)
+    private void WriteOtherOptionsSection(HelpContext context, string title, IEnumerable<CommandLineOptionMessage> options)
     {
         List<TwoColumnHelpRow> optionRows = [];
 
@@ -1030,7 +1031,7 @@ private void WriteOtherOptionsSection(HelpContext context, string title, IEnumer
         {
             if (option.IsHidden != true)
             {
-                optionRows.Add(new TwoColumnHelpRow($"--{option.Name}", option.Description));
+                optionRows.Add(new TwoColumnHelpRow($"--{option.Name}", option.Description ?? string.Empty));
             }
         }
 
diff --git a/src/Cli/dotnet/Commands/Test/MTP/TestApplication.cs b/src/Cli/dotnet/Commands/Test/MTP/TestApplication.cs
index f830f3896f2c..b46eeb8159b1 100644
--- a/src/Cli/dotnet/Commands/Test/MTP/TestApplication.cs
+++ b/src/Cli/dotnet/Commands/Test/MTP/TestApplication.cs
@@ -18,9 +18,11 @@ internal sealed class TestApplication(
     TestModule module,
     BuildOptions buildOptions,
     TestOptions testOptions,
-    TerminalTestReporter output) : IDisposable
+    TerminalTestReporter output,
+    Action<CommandLineOptionMessages> onHelpRequested) : IDisposable
 {
     private readonly BuildOptions _buildOptions = buildOptions;
+    private readonly Action<CommandLineOptionMessages> _onHelpRequested = onHelpRequested;
     private readonly TestApplicationHandler _handler = new(output, module, testOptions);
 
     private readonly List<string> _outputData = [];
@@ -32,8 +34,6 @@ internal sealed class TestApplication(
     private readonly List<NamedPipeServer> _testAppPipeConnections = [];
     private readonly Dictionary<NamedPipeServer, HandshakeMessage> _handshakes = new();
 
-    public event EventHandler<HelpEventArgs> HelpRequested;
-
     public TestModule Module { get; } = module;
     public TestOptions TestOptions { get; } = testOptions;
 
@@ -43,19 +43,19 @@ public async Task<int> RunAsync()
     {
         // TODO: RunAsync is probably expected to be executed exactly once on each TestApplication instance.
         // Consider throwing an exception if it's called more than once.
-        if (TestOptions.HasFilterMode && !ModulePathExists())
-        {
-            return ExitCode.GenericFailure;
-        }
-
         var processStartInfo = CreateProcessStartInfo();
 
         _testAppPipeConnectionLoop = Task.Run(async () => await WaitConnectionAsync(_cancellationToken.Token), _cancellationToken.Token);
-        var testProcessResult = await StartProcess(processStartInfo);
+        var testProcessExitCode = await StartProcess(processStartInfo);
 
         WaitOnTestApplicationPipeConnectionLoop();
 
-        return testProcessResult;
+        if (_handler.HasMismatchingTestSessionEventCount())
+        {
+            throw new InvalidOperationException(CliCommandStrings.MissingTestSessionEnd);
+        }
+
+        return testProcessExitCode;
     }
 
     private ProcessStartInfo CreateProcessStartInfo()
@@ -221,6 +221,15 @@ private Task<IResponse> OnRequest(NamedPipeServer server, IRequest request)
         }
         catch (Exception ex)
         {
+            // BE CAREFUL:
+            // When handling some of the messages, we may throw an exception in unexpected state.
+            // (e.g, OnSessionEvent may throw if we receive TestSessionEnd without TestSessionStart).
+            // (or if we receive help-related messages when not in help mode)
+            // In that case, we FailFast.
+            // The lack of FailFast *might* have unintended consequences, such as breaking the internal loop of pipe server.
+            // In that case, maybe MTP app will continue waiting for response, but we don't send the response and are waiting for
+            // MTP app process exit (which doesn't happen).
+            // So, we explicitly FailFast here.
             string exAsString = ex.ToString();
             Logger.LogTrace(exAsString);
             Environment.FailFast(exAsString);
@@ -298,24 +307,17 @@ private void StoreOutputAndErrorData(Process process)
         process.BeginErrorReadLine();
     }
 
-    private bool ModulePathExists()
-    {
-        if (!File.Exists(Module.RunProperties.Command))
-        {
-            // TODO: The error should be shown to the user, not just logged to trace.
-            Logger.LogTrace($"Test module '{Module.RunProperties.Command}' not found. Build the test application before or run 'dotnet test'.");
-
-            return false;
-        }
-        return true;
-    }
-
     public void OnHandshakeMessage(HandshakeMessage handshakeMessage, bool gotSupportedVersion)
         => _handler.OnHandshakeReceived(handshakeMessage, gotSupportedVersion);
 
     private void OnCommandLineOptionMessages(CommandLineOptionMessages commandLineOptionMessages)
     {
-        HelpRequested?.Invoke(this, new HelpEventArgs { ModulePath = commandLineOptionMessages.ModulePath, CommandLineOptions = [.. commandLineOptionMessages.CommandLineOptionMessageList.Select(message => new CommandLineOption(message.Name, message.Description, message.IsHidden, message.IsBuiltIn))] });
+        if (!TestOptions.IsHelp)
+        {
+            throw new InvalidOperationException(CliCommandStrings.UnexpectedHelpMessage);
+        }
+
+        _onHelpRequested(commandLineOptionMessages);
     }
 
     private void OnDiscoveredTestMessages(DiscoveredTestMessages discoveredTestMessages)
@@ -324,7 +326,7 @@ private void OnDiscoveredTestMessages(DiscoveredTestMessages discoveredTestMessa
     private void OnTestResultMessages(TestResultMessages testResultMessage)
         => _handler.OnTestResultsReceived(testResultMessage);
 
-    internal void OnFileArtifactMessages(FileArtifactMessages fileArtifactMessages)
+    private void OnFileArtifactMessages(FileArtifactMessages fileArtifactMessages)
         => _handler.OnFileArtifactsReceived(fileArtifactMessages);
 
     private void OnSessionEvent(TestSessionEvent sessionEvent)
diff --git a/src/Cli/dotnet/Commands/Test/MTP/TestApplicationActionQueue.cs b/src/Cli/dotnet/Commands/Test/MTP/TestApplicationActionQueue.cs
index a5f6e438512b..afd7de71573b 100644
--- a/src/Cli/dotnet/Commands/Test/MTP/TestApplicationActionQueue.cs
+++ b/src/Cli/dotnet/Commands/Test/MTP/TestApplicationActionQueue.cs
@@ -4,7 +4,9 @@
 #nullable disable
 
 using System.Threading.Channels;
+using Microsoft.DotNet.Cli.Commands.Test.IPC.Models;
 using Microsoft.DotNet.Cli.Commands.Test.Terminal;
+using Microsoft.DotNet.Cli.Utils;
 
 namespace Microsoft.DotNet.Cli.Commands.Test;
 
@@ -17,14 +19,14 @@ internal class TestApplicationActionQueue
 
     private static readonly Lock _lock = new();
 
-    public TestApplicationActionQueue(int degreeOfParallelism, BuildOptions buildOptions, TestOptions testOptions, TerminalTestReporter output, Func<TestApplication, Task<int>> action)
+    public TestApplicationActionQueue(int degreeOfParallelism, BuildOptions buildOptions, TestOptions testOptions, TerminalTestReporter output, Action<CommandLineOptionMessages> onHelpRequested)
     {
         _channel = Channel.CreateUnbounded<ParallelizableTestModuleGroupWithSequentialInnerModules>(new UnboundedChannelOptions { SingleReader = false, SingleWriter = false });
         _readers = new Task[degreeOfParallelism];
 
         for (int i = 0; i < degreeOfParallelism; i++)
         {
-            _readers[i] = Task.Run(async () => await Read(action, buildOptions, testOptions, output));
+            _readers[i] = Task.Run(async () => await Read(buildOptions, testOptions, output, onHelpRequested));
         }
     }
 
@@ -51,23 +53,27 @@ public void EnqueueCompleted()
         _channel.Writer.Complete();
     }
 
-    private async Task Read(Func<TestApplication, Task<int>> action, BuildOptions buildOptions, TestOptions testOptions, TerminalTestReporter output)
+    private async Task Read(BuildOptions buildOptions, TestOptions testOptions, TerminalTestReporter output, Action<CommandLineOptionMessages> onHelpRequested)
     {
         await foreach (var nonParallelizedGroup in _channel.Reader.ReadAllAsync())
         {
             foreach (var module in nonParallelizedGroup)
             {
                 int result = ExitCode.GenericFailure;
-                var testApp = new TestApplication(module, buildOptions, testOptions, output);
-                using (testApp)
+                var testApp = new TestApplication(module, buildOptions, testOptions, output, onHelpRequested);
+                try
                 {
-                    // TODO: If this throws, we will loose "one" degree of parallelism.
-                    // Then, if we ended up losing all degree of parallelisms, we will not be able to process all test apps.
-                    // At the end, WaitAllActions will likely just throw this exception wrapped in AggregateException, and
-                    // it will bubble up to CLI Main and crash the process.
-                    // We should try to work on a better handling for this, and better understand what are the possibilities for this to throw.
-                    // e.g, RunCommand pointing out to some file that doesn't exist? Process.Start failing for some reason?
-                    result = await action(testApp);
+                    using (testApp)
+                    {
+                        result = await testApp.RunAsync();
+                    }
+                }
+                catch (Exception ex)
+                {
+                    var exAsString = ex.ToString();
+                    Logger.LogTrace($"Exception running test module {module.RunProperties?.Command} {module.RunProperties?.Arguments}: {exAsString}");
+                    Reporter.Error.WriteLine(string.Format(CliCommandStrings.ErrorRunningTestModule, module.RunProperties?.Command, module.RunProperties?.Arguments, exAsString));
+                    result = ExitCode.GenericFailure;
                 }
 
                 if (result == ExitCode.Success && testApp.HasFailureDuringDispose)
diff --git a/src/Cli/dotnet/Commands/Test/MTP/TestApplicationHandler.cs b/src/Cli/dotnet/Commands/Test/MTP/TestApplicationHandler.cs
index 6d2272ffac4e..d8aa6c9557eb 100644
--- a/src/Cli/dotnet/Commands/Test/MTP/TestApplicationHandler.cs
+++ b/src/Cli/dotnet/Commands/Test/MTP/TestApplicationHandler.cs
@@ -3,8 +3,6 @@
 
 #nullable disable
 
-using System.Diagnostics;
-using System.Reflection;
 using Microsoft.DotNet.Cli.Commands.Test.IPC.Models;
 using Microsoft.DotNet.Cli.Commands.Test.Terminal;
 
@@ -15,6 +13,8 @@ internal sealed class TestApplicationHandler
     private readonly TerminalTestReporter _output;
     private readonly TestModule _module;
     private readonly TestOptions _options;
+    private readonly Lock _lock = new();
+    private readonly Dictionary<string, (int TestSessionStartCount, int TestSessionEndCount)> _testSessionEventCountPerSessionUid = new();
 
     private (string TargetFramework, string Architecture, string ExecutionId)? _handshakeInfo;
 
@@ -179,14 +179,55 @@ internal void OnFileArtifactsReceived(FileArtifactMessages fileArtifactMessages)
 
     internal void OnSessionEventReceived(TestSessionEvent sessionEvent)
     {
-        LogSessionEvent(sessionEvent);
+        lock (_lock)
+        {
+            LogSessionEvent(sessionEvent);
+
+            // TODO: If _handshakeInfo is null, we should error.
+            // We shouldn't be getting any session event messages without a previous handshake.
+
+            if (sessionEvent.SessionType == SessionEventTypes.TestSessionStart)
+            {
+                IncreaseTestSessionStart(sessionEvent.SessionUid);
+            }
+            else if (sessionEvent.SessionType == SessionEventTypes.TestSessionEnd)
+            {
+                var (testSessionStartCount, testSessionEndCount) = IncreaseTestSessionEnd(sessionEvent.SessionUid);
+                if (testSessionEndCount > testSessionStartCount)
+                {
+                    throw new InvalidOperationException(CliCommandStrings.UnexpectedTestSessionEnd);
+                }
+            }
+        }
+    }
 
-        // TODO: If _handshakeInfo is null, we should error.
-        // We shouldn't be getting any session event messages without a previous handshake.
+    private (int TestSessionStartCount, int TestSessionEndCount) IncreaseTestSessionStart(string sessionUid)
+    {
+        _ = _testSessionEventCountPerSessionUid.TryGetValue(sessionUid, out var count);
+        count = (count.TestSessionStartCount + 1, count.TestSessionEndCount);
+        _testSessionEventCountPerSessionUid[sessionUid] = count;
+        return count;
+    }
+
+    private (int TestSessionStartCount, int TestSessionEndCount) IncreaseTestSessionEnd(string sessionUid)
+    {
+        _ = _testSessionEventCountPerSessionUid.TryGetValue(sessionUid, out var count);
+        count = (count.TestSessionStartCount, count.TestSessionEndCount + 1);
+        _testSessionEventCountPerSessionUid[sessionUid] = count;
+        return count;
+    }
+
+    internal bool HasMismatchingTestSessionEventCount()
+    {
+        foreach (var (testSessionStartCount, testSessionEndCount) in _testSessionEventCountPerSessionUid.Values)
+        {
+            if (testSessionStartCount != testSessionEndCount)
+            {
+                return true;
+            }
+        }
 
-        // TODO: We shouldn't only log here!
-        // We should use it in a more meaningful way. e.g, ensure we received session start/end events.
-        Logger.LogTrace($"TestSessionEvent: {sessionEvent.SessionType}, {sessionEvent.SessionUid}, {sessionEvent.ExecutionId}");
+        return false;
     }
 
     internal void OnTestProcessExited(int exitCode, List<string> outputData, List<string> errorData)
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.cs.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.cs.xlf
index a21b7b9d9abf..af8707f4683f 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.cs.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.cs.xlf
@@ -1222,6 +1222,16 @@ Nastavte odlišné názvy profilů.</target>
         <target state="translated">Duplicitní direktivy nejsou podporovány: {0} v {1}</target>
         <note>{0} is the directive type and name. {1} is the file path and line number.</note>
       </trans-unit>
+      <trans-unit id="ErrorRunningTestModule">
+        <source>The following exception occurred when running the test module with RunCommand '{0}' and RunArguments '{1}':
+
+{2}</source>
+        <target state="new">The following exception occurred when running the test module with RunCommand '{0}' and RunArguments '{1}':
+
+{2}</target>
+        <note>{Locked="RunCommand"}{Locked="RunArguments"}
+{2} is the exception that occurred.</note>
+      </trans-unit>
       <trans-unit id="Error_restore">
         <source>Restore failed. Run `dotnet restore` for more details on the issue.</source>
         <target state="translated">Obnovení neproběhlo úspěšně. Další podrobnosti o problému získáte spuštěním příkazu dotnet restore.</target>
@@ -1714,6 +1724,11 @@ Nástroj {1} (verze {2}) se úspěšně nainstaloval. Do souboru manifestu {3} s
         <target state="translated">Chybí název pro {0} v {1}.</target>
         <note>{0} is the directive name like 'package' or 'sdk', {1} is the file path and line number.</note>
       </trans-unit>
+      <trans-unit id="MissingTestSessionEnd">
+        <source>A test session start event was received without a corresponding test session end.</source>
+        <target state="new">A test session start event was received without a corresponding test session end.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="MsBuildDefinition">
         <source>Run Microsoft Build Engine (MSBuild) commands.</source>
         <target state="translated">Spustí příkazy MSBuild (Microsoft Build Engine).</target>
@@ -3528,6 +3543,16 @@ příkazu „dotnet tool list“.</target>
         <target state="translated">{0} pokus</target>
         <note>number or tries of the current test assembly when test assembly is being retried. {0} is number that starts at 1</note>
       </trans-unit>
+      <trans-unit id="UnexpectedHelpMessage">
+        <source>An unexpected help-related message was received when `--help` wasn't used.</source>
+        <target state="new">An unexpected help-related message was received when `--help` wasn't used.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnexpectedTestSessionEnd">
+        <source>A test session end event was received without a corresponding test session start.</source>
+        <target state="new">A test session end event was received without a corresponding test session start.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="UninstallLocalToolSucceeded">
         <source>Tool '{0}' was successfully uninstalled and removed from manifest file {1}.</source>
         <target state="translated">Nástroj {0} se úspěšně odinstaloval a odebral ze souboru manifestu {1}.</target>
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.de.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.de.xlf
index 46c9610ab7ff..5a6a288f9b72 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.de.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.de.xlf
@@ -1222,6 +1222,16 @@ Erstellen Sie eindeutige Profilnamen.</target>
         <target state="translated">Doppelte Direktiven werden nicht unterstützt: {0} bei {1}.</target>
         <note>{0} is the directive type and name. {1} is the file path and line number.</note>
       </trans-unit>
+      <trans-unit id="ErrorRunningTestModule">
+        <source>The following exception occurred when running the test module with RunCommand '{0}' and RunArguments '{1}':
+
+{2}</source>
+        <target state="new">The following exception occurred when running the test module with RunCommand '{0}' and RunArguments '{1}':
+
+{2}</target>
+        <note>{Locked="RunCommand"}{Locked="RunArguments"}
+{2} is the exception that occurred.</note>
+      </trans-unit>
       <trans-unit id="Error_restore">
         <source>Restore failed. Run `dotnet restore` for more details on the issue.</source>
         <target state="translated">Fehler beim Wiederherstellen. Führen Sie "dotnet restore" aus, um weitere Informationen zum Problem zu erhalten.</target>
@@ -1714,6 +1724,11 @@ Das Tool "{1}" (Version {2}) wurde erfolgreich installiert. Der Eintrag wird der
         <target state="translated">Fehlender Name von "{0}" bei "{1}".</target>
         <note>{0} is the directive name like 'package' or 'sdk', {1} is the file path and line number.</note>
       </trans-unit>
+      <trans-unit id="MissingTestSessionEnd">
+        <source>A test session start event was received without a corresponding test session end.</source>
+        <target state="new">A test session start event was received without a corresponding test session end.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="MsBuildDefinition">
         <source>Run Microsoft Build Engine (MSBuild) commands.</source>
         <target state="translated">Hiermit werden Befehle der Microsoft-Build-Engine (MSBuild) ausgeführt.</target>
@@ -3528,6 +3543,16 @@ und die zugehörigen Paket-IDs für installierte Tools über den Befehl
         <target state="translated">{0} testen</target>
         <note>number or tries of the current test assembly when test assembly is being retried. {0} is number that starts at 1</note>
       </trans-unit>
+      <trans-unit id="UnexpectedHelpMessage">
+        <source>An unexpected help-related message was received when `--help` wasn't used.</source>
+        <target state="new">An unexpected help-related message was received when `--help` wasn't used.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnexpectedTestSessionEnd">
+        <source>A test session end event was received without a corresponding test session start.</source>
+        <target state="new">A test session end event was received without a corresponding test session start.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="UninstallLocalToolSucceeded">
         <source>Tool '{0}' was successfully uninstalled and removed from manifest file {1}.</source>
         <target state="translated">Das Tool "{0}" wurde erfolgreich deinstalliert und aus der Manifestdatei "{1}" entfernt.</target>
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.es.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.es.xlf
index cdc2991a52ec..64360be1d9bd 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.es.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.es.xlf
@@ -1222,6 +1222,16 @@ Defina nombres de perfiles distintos.</target>
         <target state="translated">No se admiten directivas duplicadas: {0} en {1}</target>
         <note>{0} is the directive type and name. {1} is the file path and line number.</note>
       </trans-unit>
+      <trans-unit id="ErrorRunningTestModule">
+        <source>The following exception occurred when running the test module with RunCommand '{0}' and RunArguments '{1}':
+
+{2}</source>
+        <target state="new">The following exception occurred when running the test module with RunCommand '{0}' and RunArguments '{1}':
+
+{2}</target>
+        <note>{Locked="RunCommand"}{Locked="RunArguments"}
+{2} is the exception that occurred.</note>
+      </trans-unit>
       <trans-unit id="Error_restore">
         <source>Restore failed. Run `dotnet restore` for more details on the issue.</source>
         <target state="translated">Error en la restauración. Ejecute "dotnet restore" para obtener más detalles sobre el problema.</target>
@@ -1714,6 +1724,11 @@ La herramienta "{1}" (versión "{2}") se instaló correctamente. Se ha agregado
         <target state="translated">Falta el nombre de "{0}" en {1}.</target>
         <note>{0} is the directive name like 'package' or 'sdk', {1} is the file path and line number.</note>
       </trans-unit>
+      <trans-unit id="MissingTestSessionEnd">
+        <source>A test session start event was received without a corresponding test session end.</source>
+        <target state="new">A test session start event was received without a corresponding test session end.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="MsBuildDefinition">
         <source>Run Microsoft Build Engine (MSBuild) commands.</source>
         <target state="translated">Ejecuta comandos de Microsoft Build Engine (MSBuild).</target>
@@ -3528,6 +3543,16 @@ y los identificadores de los paquetes correspondientes a las herramientas instal
         <target state="translated">intento {0}</target>
         <note>number or tries of the current test assembly when test assembly is being retried. {0} is number that starts at 1</note>
       </trans-unit>
+      <trans-unit id="UnexpectedHelpMessage">
+        <source>An unexpected help-related message was received when `--help` wasn't used.</source>
+        <target state="new">An unexpected help-related message was received when `--help` wasn't used.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnexpectedTestSessionEnd">
+        <source>A test session end event was received without a corresponding test session start.</source>
+        <target state="new">A test session end event was received without a corresponding test session start.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="UninstallLocalToolSucceeded">
         <source>Tool '{0}' was successfully uninstalled and removed from manifest file {1}.</source>
         <target state="translated">La herramienta "{0}" se desinstaló y quitó correctamente del archivo de manifiesto {1}.</target>
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.fr.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.fr.xlf
index d5a42c18dff0..5d617c717df4 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.fr.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.fr.xlf
@@ -1222,6 +1222,16 @@ Faites en sorte que les noms de profil soient distincts.</target>
         <target state="translated">Les directives dupliquées ne sont pas prises en charge : {0} au {1}</target>
         <note>{0} is the directive type and name. {1} is the file path and line number.</note>
       </trans-unit>
+      <trans-unit id="ErrorRunningTestModule">
+        <source>The following exception occurred when running the test module with RunCommand '{0}' and RunArguments '{1}':
+
+{2}</source>
+        <target state="new">The following exception occurred when running the test module with RunCommand '{0}' and RunArguments '{1}':
+
+{2}</target>
+        <note>{Locked="RunCommand"}{Locked="RunArguments"}
+{2} is the exception that occurred.</note>
+      </trans-unit>
       <trans-unit id="Error_restore">
         <source>Restore failed. Run `dotnet restore` for more details on the issue.</source>
         <target state="translated">Échec de la restauration. Exécutez « dotnet restore » pour plus de détails sur le problème.</target>
@@ -1714,6 +1724,11 @@ L'outil '{1}' (version '{2}') a été correctement installé. L'entrée est ajou
         <target state="translated">Nom manquant pour « {0} » à {1}.</target>
         <note>{0} is the directive name like 'package' or 'sdk', {1} is the file path and line number.</note>
       </trans-unit>
+      <trans-unit id="MissingTestSessionEnd">
+        <source>A test session start event was received without a corresponding test session end.</source>
+        <target state="new">A test session start event was received without a corresponding test session end.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="MsBuildDefinition">
         <source>Run Microsoft Build Engine (MSBuild) commands.</source>
         <target state="translated">Exécutez des commandes MSBuild (Microsoft Build Engine).</target>
@@ -3528,6 +3543,16 @@ et les ID de package correspondants aux outils installés, utilisez la commande
         <target state="translated">essayer {0}</target>
         <note>number or tries of the current test assembly when test assembly is being retried. {0} is number that starts at 1</note>
       </trans-unit>
+      <trans-unit id="UnexpectedHelpMessage">
+        <source>An unexpected help-related message was received when `--help` wasn't used.</source>
+        <target state="new">An unexpected help-related message was received when `--help` wasn't used.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnexpectedTestSessionEnd">
+        <source>A test session end event was received without a corresponding test session start.</source>
+        <target state="new">A test session end event was received without a corresponding test session start.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="UninstallLocalToolSucceeded">
         <source>Tool '{0}' was successfully uninstalled and removed from manifest file {1}.</source>
         <target state="translated">L'outil '{0}' a été désinstallé et supprimé correctement du fichier manifeste {1}.</target>
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.it.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.it.xlf
index 26b1ec468d8a..dbec0ada6e3b 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.it.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.it.xlf
@@ -1222,6 +1222,16 @@ Rendi distinti i nomi profilo.</target>
         <target state="translated">Direttive duplicate non supportate: {0} in {1}</target>
         <note>{0} is the directive type and name. {1} is the file path and line number.</note>
       </trans-unit>
+      <trans-unit id="ErrorRunningTestModule">
+        <source>The following exception occurred when running the test module with RunCommand '{0}' and RunArguments '{1}':
+
+{2}</source>
+        <target state="new">The following exception occurred when running the test module with RunCommand '{0}' and RunArguments '{1}':
+
+{2}</target>
+        <note>{Locked="RunCommand"}{Locked="RunArguments"}
+{2} is the exception that occurred.</note>
+      </trans-unit>
       <trans-unit id="Error_restore">
         <source>Restore failed. Run `dotnet restore` for more details on the issue.</source>
         <target state="translated">Ripristino non riuscito. Esegui 'dotnet restore' per altri dettagli sul problema.</target>
@@ -1714,6 +1724,11 @@ Lo strumento '{1}' versione '{2}' è stato installato. La voce è stata aggiunta
         <target state="translated">Nome mancante di '{0}' in {1}.</target>
         <note>{0} is the directive name like 'package' or 'sdk', {1} is the file path and line number.</note>
       </trans-unit>
+      <trans-unit id="MissingTestSessionEnd">
+        <source>A test session start event was received without a corresponding test session end.</source>
+        <target state="new">A test session start event was received without a corresponding test session end.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="MsBuildDefinition">
         <source>Run Microsoft Build Engine (MSBuild) commands.</source>
         <target state="translated">Esegue i comandi di Microsoft Build Engine (MSBuild).</target>
@@ -3528,6 +3543,16 @@ e gli ID pacchetto corrispondenti per gli strumenti installati usando il comando
         <target state="translated">prova {0}</target>
         <note>number or tries of the current test assembly when test assembly is being retried. {0} is number that starts at 1</note>
       </trans-unit>
+      <trans-unit id="UnexpectedHelpMessage">
+        <source>An unexpected help-related message was received when `--help` wasn't used.</source>
+        <target state="new">An unexpected help-related message was received when `--help` wasn't used.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnexpectedTestSessionEnd">
+        <source>A test session end event was received without a corresponding test session start.</source>
+        <target state="new">A test session end event was received without a corresponding test session start.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="UninstallLocalToolSucceeded">
         <source>Tool '{0}' was successfully uninstalled and removed from manifest file {1}.</source>
         <target state="translated">Lo strumento '{0}' è stato disinstallato e rimosso dal file manifesto {1}.</target>
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ja.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ja.xlf
index 7202a2a3b49a..0879c292c757 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ja.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ja.xlf
@@ -1222,6 +1222,16 @@ Make the profile names distinct.</source>
         <target state="translated">重複するディレクティブはサポートされていません: {1} の {0}</target>
         <note>{0} is the directive type and name. {1} is the file path and line number.</note>
       </trans-unit>
+      <trans-unit id="ErrorRunningTestModule">
+        <source>The following exception occurred when running the test module with RunCommand '{0}' and RunArguments '{1}':
+
+{2}</source>
+        <target state="new">The following exception occurred when running the test module with RunCommand '{0}' and RunArguments '{1}':
+
+{2}</target>
+        <note>{Locked="RunCommand"}{Locked="RunArguments"}
+{2} is the exception that occurred.</note>
+      </trans-unit>
       <trans-unit id="Error_restore">
         <source>Restore failed. Run `dotnet restore` for more details on the issue.</source>
         <target state="translated">復元に失敗しました。問題の詳細については、'dotnet restore' を実行してください。</target>
@@ -1714,6 +1724,11 @@ Tool '{1}' (version '{2}') was successfully installed. Entry is added to the man
         <target state="translated">{1} に ' {0}' の名前がありません。</target>
         <note>{0} is the directive name like 'package' or 'sdk', {1} is the file path and line number.</note>
       </trans-unit>
+      <trans-unit id="MissingTestSessionEnd">
+        <source>A test session start event was received without a corresponding test session end.</source>
+        <target state="new">A test session start event was received without a corresponding test session end.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="MsBuildDefinition">
         <source>Run Microsoft Build Engine (MSBuild) commands.</source>
         <target state="translated">Microsoft Build Engine (MSBuild) コマンドを実行します。</target>
@@ -3528,6 +3543,16 @@ and the corresponding package Ids for installed tools using the command
         <target state="translated">{0} を試す</target>
         <note>number or tries of the current test assembly when test assembly is being retried. {0} is number that starts at 1</note>
       </trans-unit>
+      <trans-unit id="UnexpectedHelpMessage">
+        <source>An unexpected help-related message was received when `--help` wasn't used.</source>
+        <target state="new">An unexpected help-related message was received when `--help` wasn't used.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnexpectedTestSessionEnd">
+        <source>A test session end event was received without a corresponding test session start.</source>
+        <target state="new">A test session end event was received without a corresponding test session start.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="UninstallLocalToolSucceeded">
         <source>Tool '{0}' was successfully uninstalled and removed from manifest file {1}.</source>
         <target state="translated">ツール '{0}' が正常にアンインストールされ、マニフェスト ファイル {1} から削除されました。</target>
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ko.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ko.xlf
index 0e6df35b1774..b9dce47a1ad9 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ko.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ko.xlf
@@ -1222,6 +1222,16 @@ Make the profile names distinct.</source>
         <target state="translated">중복된 지시문은 지원되지 않습니다. {1}의 {0}.</target>
         <note>{0} is the directive type and name. {1} is the file path and line number.</note>
       </trans-unit>
+      <trans-unit id="ErrorRunningTestModule">
+        <source>The following exception occurred when running the test module with RunCommand '{0}' and RunArguments '{1}':
+
+{2}</source>
+        <target state="new">The following exception occurred when running the test module with RunCommand '{0}' and RunArguments '{1}':
+
+{2}</target>
+        <note>{Locked="RunCommand"}{Locked="RunArguments"}
+{2} is the exception that occurred.</note>
+      </trans-unit>
       <trans-unit id="Error_restore">
         <source>Restore failed. Run `dotnet restore` for more details on the issue.</source>
         <target state="translated">복원하지 못했습니다. 문제에 대한 자세한 내용을 보려면 'dotnet restore'를 실행하세요.</target>
@@ -1714,6 +1724,11 @@ Tool '{1}' (version '{2}') was successfully installed. Entry is added to the man
         <target state="translated">{1}에 ' {0}'의 이름이 없습니다.</target>
         <note>{0} is the directive name like 'package' or 'sdk', {1} is the file path and line number.</note>
       </trans-unit>
+      <trans-unit id="MissingTestSessionEnd">
+        <source>A test session start event was received without a corresponding test session end.</source>
+        <target state="new">A test session start event was received without a corresponding test session end.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="MsBuildDefinition">
         <source>Run Microsoft Build Engine (MSBuild) commands.</source>
         <target state="translated">Microsoft Build Engine(MSBuild) 명령을 실행합니다.</target>
@@ -3528,6 +3543,16 @@ and the corresponding package Ids for installed tools using the command
         <target state="translated">{0} 시도</target>
         <note>number or tries of the current test assembly when test assembly is being retried. {0} is number that starts at 1</note>
       </trans-unit>
+      <trans-unit id="UnexpectedHelpMessage">
+        <source>An unexpected help-related message was received when `--help` wasn't used.</source>
+        <target state="new">An unexpected help-related message was received when `--help` wasn't used.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnexpectedTestSessionEnd">
+        <source>A test session end event was received without a corresponding test session start.</source>
+        <target state="new">A test session end event was received without a corresponding test session start.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="UninstallLocalToolSucceeded">
         <source>Tool '{0}' was successfully uninstalled and removed from manifest file {1}.</source>
         <target state="translated">'{0}' 도구가 제거되었으며 매니페스트 파일 {1}에서 제거되었습니다.</target>
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pl.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pl.xlf
index 723d6dc516c6..5732724b2418 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pl.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pl.xlf
@@ -1222,6 +1222,16 @@ Rozróżnij nazwy profilów.</target>
         <target state="translated">Zduplikowane dyrektywy nie są obsługiwane: {0} w lokalizacji {1}</target>
         <note>{0} is the directive type and name. {1} is the file path and line number.</note>
       </trans-unit>
+      <trans-unit id="ErrorRunningTestModule">
+        <source>The following exception occurred when running the test module with RunCommand '{0}' and RunArguments '{1}':
+
+{2}</source>
+        <target state="new">The following exception occurred when running the test module with RunCommand '{0}' and RunArguments '{1}':
+
+{2}</target>
+        <note>{Locked="RunCommand"}{Locked="RunArguments"}
+{2} is the exception that occurred.</note>
+      </trans-unit>
       <trans-unit id="Error_restore">
         <source>Restore failed. Run `dotnet restore` for more details on the issue.</source>
         <target state="translated">Błąd przywracania. Uruchom polecenie `dotnet restore`, aby uzyskać więcej informacji na temat problemu.</target>
@@ -1714,6 +1724,11 @@ Narzędzie „{1}” (wersja „{2}”) zostało pomyślnie zainstalowane. Wpis
         <target state="translated">Brak nazwy „{0}” w {1}.</target>
         <note>{0} is the directive name like 'package' or 'sdk', {1} is the file path and line number.</note>
       </trans-unit>
+      <trans-unit id="MissingTestSessionEnd">
+        <source>A test session start event was received without a corresponding test session end.</source>
+        <target state="new">A test session start event was received without a corresponding test session end.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="MsBuildDefinition">
         <source>Run Microsoft Build Engine (MSBuild) commands.</source>
         <target state="translated">Uruchom polecenia aparatu Microsoft Build Engine (MSBuild).</target>
@@ -3528,6 +3543,16 @@ i odpowiednie identyfikatory pakietów zainstalowanych narzędzi można znaleź
         <target state="translated">wypróbuj {0}</target>
         <note>number or tries of the current test assembly when test assembly is being retried. {0} is number that starts at 1</note>
       </trans-unit>
+      <trans-unit id="UnexpectedHelpMessage">
+        <source>An unexpected help-related message was received when `--help` wasn't used.</source>
+        <target state="new">An unexpected help-related message was received when `--help` wasn't used.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnexpectedTestSessionEnd">
+        <source>A test session end event was received without a corresponding test session start.</source>
+        <target state="new">A test session end event was received without a corresponding test session start.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="UninstallLocalToolSucceeded">
         <source>Tool '{0}' was successfully uninstalled and removed from manifest file {1}.</source>
         <target state="translated">Narzędzie „{0}” zostało pomyślnie odinstalowane i usunięte z pliku manifestu {1}.</target>
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pt-BR.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pt-BR.xlf
index 7a6bf7079b19..7eb80549cb97 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pt-BR.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pt-BR.xlf
@@ -1222,6 +1222,16 @@ Diferencie os nomes dos perfis.</target>
         <target state="translated">Não há suporte para diretivas duplicadas: {0} em {1}</target>
         <note>{0} is the directive type and name. {1} is the file path and line number.</note>
       </trans-unit>
+      <trans-unit id="ErrorRunningTestModule">
+        <source>The following exception occurred when running the test module with RunCommand '{0}' and RunArguments '{1}':
+
+{2}</source>
+        <target state="new">The following exception occurred when running the test module with RunCommand '{0}' and RunArguments '{1}':
+
+{2}</target>
+        <note>{Locked="RunCommand"}{Locked="RunArguments"}
+{2} is the exception that occurred.</note>
+      </trans-unit>
       <trans-unit id="Error_restore">
         <source>Restore failed. Run `dotnet restore` for more details on the issue.</source>
         <target state="translated">Falha na restauração. Execute "dotnet restore" para obter mais detalhes sobre o problema.</target>
@@ -1714,6 +1724,11 @@ A ferramenta '{1}' (versão '{2}') foi instalada com êxito. A entrada foi adici
         <target state="translated">Nome de "{0}" ausente em {1}.</target>
         <note>{0} is the directive name like 'package' or 'sdk', {1} is the file path and line number.</note>
       </trans-unit>
+      <trans-unit id="MissingTestSessionEnd">
+        <source>A test session start event was received without a corresponding test session end.</source>
+        <target state="new">A test session start event was received without a corresponding test session end.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="MsBuildDefinition">
         <source>Run Microsoft Build Engine (MSBuild) commands.</source>
         <target state="translated">Executar comandos do MSBuild (Microsoft Build Engine).</target>
@@ -3528,6 +3543,16 @@ e as Ids de pacote correspondentes para as ferramentas instaladas usando o coman
         <target state="translated">experimente {0}</target>
         <note>number or tries of the current test assembly when test assembly is being retried. {0} is number that starts at 1</note>
       </trans-unit>
+      <trans-unit id="UnexpectedHelpMessage">
+        <source>An unexpected help-related message was received when `--help` wasn't used.</source>
+        <target state="new">An unexpected help-related message was received when `--help` wasn't used.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnexpectedTestSessionEnd">
+        <source>A test session end event was received without a corresponding test session start.</source>
+        <target state="new">A test session end event was received without a corresponding test session start.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="UninstallLocalToolSucceeded">
         <source>Tool '{0}' was successfully uninstalled and removed from manifest file {1}.</source>
         <target state="translated">A ferramenta '{0}' foi desinstalada com êxito e removida do arquivo de manifesto {1}.</target>
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ru.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ru.xlf
index 5f5c104311c4..e3cc884fa557 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ru.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ru.xlf
@@ -1222,6 +1222,16 @@ Make the profile names distinct.</source>
         <target state="translated">Повторяющиеся директивы не поддерживаются: {0} (файл, строка: {1})</target>
         <note>{0} is the directive type and name. {1} is the file path and line number.</note>
       </trans-unit>
+      <trans-unit id="ErrorRunningTestModule">
+        <source>The following exception occurred when running the test module with RunCommand '{0}' and RunArguments '{1}':
+
+{2}</source>
+        <target state="new">The following exception occurred when running the test module with RunCommand '{0}' and RunArguments '{1}':
+
+{2}</target>
+        <note>{Locked="RunCommand"}{Locked="RunArguments"}
+{2} is the exception that occurred.</note>
+      </trans-unit>
       <trans-unit id="Error_restore">
         <source>Restore failed. Run `dotnet restore` for more details on the issue.</source>
         <target state="translated">Провести восстановление не удалось. Для получения дополнительных сведений о проблеме выполните команду "dotnet restore".</target>
@@ -1714,6 +1724,11 @@ Tool '{1}' (version '{2}') was successfully installed. Entry is added to the man
         <target state="translated">В {1} отсутствует имя "{0}".</target>
         <note>{0} is the directive name like 'package' or 'sdk', {1} is the file path and line number.</note>
       </trans-unit>
+      <trans-unit id="MissingTestSessionEnd">
+        <source>A test session start event was received without a corresponding test session end.</source>
+        <target state="new">A test session start event was received without a corresponding test session end.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="MsBuildDefinition">
         <source>Run Microsoft Build Engine (MSBuild) commands.</source>
         <target state="translated">Выполнение команд Microsoft Build Engine (MSBuild).</target>
@@ -3529,6 +3544,16 @@ and the corresponding package Ids for installed tools using the command
         <target state="translated">попробуйте {0}</target>
         <note>number or tries of the current test assembly when test assembly is being retried. {0} is number that starts at 1</note>
       </trans-unit>
+      <trans-unit id="UnexpectedHelpMessage">
+        <source>An unexpected help-related message was received when `--help` wasn't used.</source>
+        <target state="new">An unexpected help-related message was received when `--help` wasn't used.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnexpectedTestSessionEnd">
+        <source>A test session end event was received without a corresponding test session start.</source>
+        <target state="new">A test session end event was received without a corresponding test session start.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="UninstallLocalToolSucceeded">
         <source>Tool '{0}' was successfully uninstalled and removed from manifest file {1}.</source>
         <target state="translated">Средство "{0}" успешно удалено и исключено из файла манифеста {1}.</target>
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.tr.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.tr.xlf
index f97c5d52bea2..48408db28746 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.tr.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.tr.xlf
@@ -1222,6 +1222,16 @@ Lütfen profil adlarını değiştirin.</target>
         <target state="translated">Yinelenen yönergeler desteklenmez: {1} konumunda {0}</target>
         <note>{0} is the directive type and name. {1} is the file path and line number.</note>
       </trans-unit>
+      <trans-unit id="ErrorRunningTestModule">
+        <source>The following exception occurred when running the test module with RunCommand '{0}' and RunArguments '{1}':
+
+{2}</source>
+        <target state="new">The following exception occurred when running the test module with RunCommand '{0}' and RunArguments '{1}':
+
+{2}</target>
+        <note>{Locked="RunCommand"}{Locked="RunArguments"}
+{2} is the exception that occurred.</note>
+      </trans-unit>
       <trans-unit id="Error_restore">
         <source>Restore failed. Run `dotnet restore` for more details on the issue.</source>
         <target state="translated">Geri yükleme başarısız oldu. Sorunla ilgili daha fazla bilgi için 'dotnet restore' çalıştırın.</target>
@@ -1714,6 +1724,11 @@ Tool '{1}' (version '{2}') was successfully installed. Entry is added to the man
         <target state="translated">{1} konumunda '{0}' paketinin adı eksik.</target>
         <note>{0} is the directive name like 'package' or 'sdk', {1} is the file path and line number.</note>
       </trans-unit>
+      <trans-unit id="MissingTestSessionEnd">
+        <source>A test session start event was received without a corresponding test session end.</source>
+        <target state="new">A test session start event was received without a corresponding test session end.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="MsBuildDefinition">
         <source>Run Microsoft Build Engine (MSBuild) commands.</source>
         <target state="translated">Microsoft Build Engine (MSBuild) komutlarını çalıştırır.</target>
@@ -3528,6 +3543,16 @@ karşılık gelen paket kimliklerini bulmak için
         <target state="translated">Şunu deneyin: {0}</target>
         <note>number or tries of the current test assembly when test assembly is being retried. {0} is number that starts at 1</note>
       </trans-unit>
+      <trans-unit id="UnexpectedHelpMessage">
+        <source>An unexpected help-related message was received when `--help` wasn't used.</source>
+        <target state="new">An unexpected help-related message was received when `--help` wasn't used.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnexpectedTestSessionEnd">
+        <source>A test session end event was received without a corresponding test session start.</source>
+        <target state="new">A test session end event was received without a corresponding test session start.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="UninstallLocalToolSucceeded">
         <source>Tool '{0}' was successfully uninstalled and removed from manifest file {1}.</source>
         <target state="translated">'{0}' aracı başarıyla kaldırıldı ve {1} bildirim dosyasından çıkarıldı.</target>
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hans.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hans.xlf
index f07d2645da16..d92ef0210eb9 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hans.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hans.xlf
@@ -1222,6 +1222,16 @@ Make the profile names distinct.</source>
         <target state="translated">不支持重复指令: {1} 处的 {0}</target>
         <note>{0} is the directive type and name. {1} is the file path and line number.</note>
       </trans-unit>
+      <trans-unit id="ErrorRunningTestModule">
+        <source>The following exception occurred when running the test module with RunCommand '{0}' and RunArguments '{1}':
+
+{2}</source>
+        <target state="new">The following exception occurred when running the test module with RunCommand '{0}' and RunArguments '{1}':
+
+{2}</target>
+        <note>{Locked="RunCommand"}{Locked="RunArguments"}
+{2} is the exception that occurred.</note>
+      </trans-unit>
       <trans-unit id="Error_restore">
         <source>Restore failed. Run `dotnet restore` for more details on the issue.</source>
         <target state="translated">还原失败。运行 `dotnet restore` 以了解有关问题的更多详细信息。</target>
@@ -1714,6 +1724,11 @@ Tool '{1}' (version '{2}') was successfully installed. Entry is added to the man
         <target state="translated">缺少 {1} 处 ‘{0}’ 的名称。</target>
         <note>{0} is the directive name like 'package' or 'sdk', {1} is the file path and line number.</note>
       </trans-unit>
+      <trans-unit id="MissingTestSessionEnd">
+        <source>A test session start event was received without a corresponding test session end.</source>
+        <target state="new">A test session start event was received without a corresponding test session end.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="MsBuildDefinition">
         <source>Run Microsoft Build Engine (MSBuild) commands.</source>
         <target state="translated">运行 Microsoft 生成引擎(MSBuild)命令。</target>
@@ -3528,6 +3543,16 @@ and the corresponding package Ids for installed tools using the command
         <target state="translated">尝试 {0}</target>
         <note>number or tries of the current test assembly when test assembly is being retried. {0} is number that starts at 1</note>
       </trans-unit>
+      <trans-unit id="UnexpectedHelpMessage">
+        <source>An unexpected help-related message was received when `--help` wasn't used.</source>
+        <target state="new">An unexpected help-related message was received when `--help` wasn't used.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnexpectedTestSessionEnd">
+        <source>A test session end event was received without a corresponding test session start.</source>
+        <target state="new">A test session end event was received without a corresponding test session start.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="UninstallLocalToolSucceeded">
         <source>Tool '{0}' was successfully uninstalled and removed from manifest file {1}.</source>
         <target state="translated">工具“{0}”已成功卸载并从清单文件 {1} 中移除。</target>
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hant.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hant.xlf
index 92fea63b2c08..1d62894be1bb 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hant.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hant.xlf
@@ -1222,6 +1222,16 @@ Make the profile names distinct.</source>
         <target state="translated">不支援重複的指示詞: {0} 位於 {1}</target>
         <note>{0} is the directive type and name. {1} is the file path and line number.</note>
       </trans-unit>
+      <trans-unit id="ErrorRunningTestModule">
+        <source>The following exception occurred when running the test module with RunCommand '{0}' and RunArguments '{1}':
+
+{2}</source>
+        <target state="new">The following exception occurred when running the test module with RunCommand '{0}' and RunArguments '{1}':
+
+{2}</target>
+        <note>{Locked="RunCommand"}{Locked="RunArguments"}
+{2} is the exception that occurred.</note>
+      </trans-unit>
       <trans-unit id="Error_restore">
         <source>Restore failed. Run `dotnet restore` for more details on the issue.</source>
         <target state="translated">還原失敗。如需問題的詳細資料，請執行 'dotnet restore'。</target>
@@ -1714,6 +1724,11 @@ Tool '{1}' (version '{2}') was successfully installed. Entry is added to the man
         <target state="translated">缺少位於 {1} 的 '{0}' 名稱。</target>
         <note>{0} is the directive name like 'package' or 'sdk', {1} is the file path and line number.</note>
       </trans-unit>
+      <trans-unit id="MissingTestSessionEnd">
+        <source>A test session start event was received without a corresponding test session end.</source>
+        <target state="new">A test session start event was received without a corresponding test session end.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="MsBuildDefinition">
         <source>Run Microsoft Build Engine (MSBuild) commands.</source>
         <target state="translated">執行 Microsoft Build Engine (MSBuild) 命令。</target>
@@ -3528,6 +3543,16 @@ and the corresponding package Ids for installed tools using the command
         <target state="translated">嘗試 {0}</target>
         <note>number or tries of the current test assembly when test assembly is being retried. {0} is number that starts at 1</note>
       </trans-unit>
+      <trans-unit id="UnexpectedHelpMessage">
+        <source>An unexpected help-related message was received when `--help` wasn't used.</source>
+        <target state="new">An unexpected help-related message was received when `--help` wasn't used.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnexpectedTestSessionEnd">
+        <source>A test session end event was received without a corresponding test session start.</source>
+        <target state="new">A test session end event was received without a corresponding test session start.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="UninstallLocalToolSucceeded">
         <source>Tool '{0}' was successfully uninstalled and removed from manifest file {1}.</source>
         <target state="translated">已成功解除安裝工具 '{0}'，且已將其從資訊清單檔 {1} 中移除。</target>

From 409937de7e2096edf62fdfd445813eca97a09944 Mon Sep 17 00:00:00 2001
From: Youssef Victor <youssefvictor00@gmail.com>
Date: Wed, 10 Sep 2025 13:07:52 +0200
Subject: [PATCH 05/11] Add test for crashing test process with exit code 0
 (#50726)

---
 .../Commands/Test/MTP/TestApplication.cs      |  4 +-
 .../TestProject1/Program.cs                   | 47 +++++++++++++++++++
 .../TestProject1/TestProject1.csproj          | 17 +++++++
 .../TestProjectMTPCrash.sln                   | 34 ++++++++++++++
 .../TestProjectMTPCrash/dotnet.config         |  2 +
 .../Test/GivenDotnetTestBuildsAndRunsTests.cs | 46 ++++++++++++++++--
 6 files changed, 145 insertions(+), 5 deletions(-)
 create mode 100644 test/TestAssets/TestProjects/TestProjectMTPCrash/TestProject1/Program.cs
 create mode 100644 test/TestAssets/TestProjects/TestProjectMTPCrash/TestProject1/TestProject1.csproj
 create mode 100644 test/TestAssets/TestProjects/TestProjectMTPCrash/TestProjectMTPCrash.sln
 create mode 100644 test/TestAssets/TestProjects/TestProjectMTPCrash/dotnet.config

diff --git a/src/Cli/dotnet/Commands/Test/MTP/TestApplication.cs b/src/Cli/dotnet/Commands/Test/MTP/TestApplication.cs
index b46eeb8159b1..8c16b7961002 100644
--- a/src/Cli/dotnet/Commands/Test/MTP/TestApplication.cs
+++ b/src/Cli/dotnet/Commands/Test/MTP/TestApplication.cs
@@ -69,6 +69,8 @@ private ProcessStartInfo CreateProcessStartInfo()
             Arguments = GetArguments(),
             RedirectStandardOutput = true,
             RedirectStandardError = true,
+            // False is already the default on .NET Core, but prefer to be explicit.
+            UseShellExecute = false,
         };
 
         if (!string.IsNullOrEmpty(Module.RunProperties.WorkingDirectory))
@@ -274,7 +276,7 @@ private static HandshakeMessage CreateHandshakeMessage(string version) =>
 
     private async Task<int> StartProcess(ProcessStartInfo processStartInfo)
     {
-        Logger.LogTrace($"Test application arguments: {processStartInfo.Arguments}");
+        Logger.LogTrace($"Starting test process with command '{processStartInfo.FileName}' and arguments '{processStartInfo.Arguments}'.");
 
         using var process = Process.Start(processStartInfo);
         StoreOutputAndErrorData(process);
diff --git a/test/TestAssets/TestProjects/TestProjectMTPCrash/TestProject1/Program.cs b/test/TestAssets/TestProjects/TestProjectMTPCrash/TestProject1/Program.cs
new file mode 100644
index 000000000000..5e36b81a7a0c
--- /dev/null
+++ b/test/TestAssets/TestProjects/TestProjectMTPCrash/TestProject1/Program.cs
@@ -0,0 +1,47 @@
+using Microsoft.Testing.Platform.Builder;
+using Microsoft.Testing.Platform.Capabilities.TestFramework;
+using Microsoft.Testing.Platform.Extensions.Messages;
+using Microsoft.Testing.Platform.Extensions.TestFramework;
+
+var testApplicationBuilder = await TestApplication.CreateBuilderAsync(args);
+
+testApplicationBuilder.RegisterTestFramework(_ => new TestFrameworkCapabilities(), (_, __) => new DummyTestAdapter());
+
+using var testApplication = await testApplicationBuilder.BuildAsync();
+return await testApplication.RunAsync();
+
+public class DummyTestAdapter : ITestFramework, IDataProducer
+{
+	public string Uid => nameof(DummyTestAdapter);
+
+	public string Version => "2.0.0";
+
+	public string DisplayName => nameof(DummyTestAdapter);
+
+	public string Description => nameof(DummyTestAdapter);
+
+	public Task<bool> IsEnabledAsync() => Task.FromResult(true);
+
+	public Type[] DataTypesProduced => [typeof(TestNodeUpdateMessage)];
+	public Task<CreateTestSessionResult> CreateTestSessionAsync(CreateTestSessionContext context)
+		=> Task.FromResult(new CreateTestSessionResult() { IsSuccess = true });
+
+	public Task<CloseTestSessionResult> CloseTestSessionAsync(CloseTestSessionContext context)
+		=> Task.FromResult(new CloseTestSessionResult() { IsSuccess = true });
+
+	public async Task ExecuteRequestAsync(ExecuteRequestContext context)
+	{
+		await context.MessageBus.PublishAsync(this, new TestNodeUpdateMessage(context.Request.Session.SessionUid, new TestNode()
+		{
+			Uid = $"Test1",
+			DisplayName = $"Test1",
+			Properties = new PropertyBag(PassedTestNodeStateProperty.CachedInstance),
+		}));
+
+		await Task.Delay(1000);
+
+		Environment.Exit(0);
+
+		context.Complete();
+	}
+}
\ No newline at end of file
diff --git a/test/TestAssets/TestProjects/TestProjectMTPCrash/TestProject1/TestProject1.csproj b/test/TestAssets/TestProjects/TestProjectMTPCrash/TestProject1/TestProject1.csproj
new file mode 100644
index 000000000000..9857918867b1
--- /dev/null
+++ b/test/TestAssets/TestProjects/TestProjectMTPCrash/TestProject1/TestProject1.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), testAsset.props))\testAsset.props" />
+
+	<PropertyGroup>
+		<TargetFramework>$(CurrentTargetFramework)</TargetFramework>
+		<OutputType>Exe</OutputType>
+
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
+
+		<ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<PackageReference Include="Microsoft.Testing.Platform" Version="$(MicrosoftTestingPlatformVersion)" />
+	</ItemGroup>
+</Project>
diff --git a/test/TestAssets/TestProjects/TestProjectMTPCrash/TestProjectMTPCrash.sln b/test/TestAssets/TestProjects/TestProjectMTPCrash/TestProjectMTPCrash.sln
new file mode 100644
index 000000000000..aaee5bd7dc36
--- /dev/null
+++ b/test/TestAssets/TestProjects/TestProjectMTPCrash/TestProjectMTPCrash.sln
@@ -0,0 +1,34 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31903.59
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestProject1", "TestProject1\TestProject1.csproj", "{3E834ED1-92D9-4454-BBB4-B1A2463E5726}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{3E834ED1-92D9-4454-BBB4-B1A2463E5726}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3E834ED1-92D9-4454-BBB4-B1A2463E5726}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3E834ED1-92D9-4454-BBB4-B1A2463E5726}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3E834ED1-92D9-4454-BBB4-B1A2463E5726}.Debug|x64.Build.0 = Debug|Any CPU
+		{3E834ED1-92D9-4454-BBB4-B1A2463E5726}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3E834ED1-92D9-4454-BBB4-B1A2463E5726}.Debug|x86.Build.0 = Debug|Any CPU
+		{3E834ED1-92D9-4454-BBB4-B1A2463E5726}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3E834ED1-92D9-4454-BBB4-B1A2463E5726}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3E834ED1-92D9-4454-BBB4-B1A2463E5726}.Release|x64.ActiveCfg = Release|Any CPU
+		{3E834ED1-92D9-4454-BBB4-B1A2463E5726}.Release|x64.Build.0 = Release|Any CPU
+		{3E834ED1-92D9-4454-BBB4-B1A2463E5726}.Release|x86.ActiveCfg = Release|Any CPU
+		{3E834ED1-92D9-4454-BBB4-B1A2463E5726}.Release|x86.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/test/TestAssets/TestProjects/TestProjectMTPCrash/dotnet.config b/test/TestAssets/TestProjects/TestProjectMTPCrash/dotnet.config
new file mode 100644
index 000000000000..28daa0a28213
--- /dev/null
+++ b/test/TestAssets/TestProjects/TestProjectMTPCrash/dotnet.config
@@ -0,0 +1,2 @@
+[dotnet.test.runner]
+name= "Microsoft.Testing.Platform"
\ No newline at end of file
diff --git a/test/dotnet.Tests/CommandTests/Test/GivenDotnetTestBuildsAndRunsTests.cs b/test/dotnet.Tests/CommandTests/Test/GivenDotnetTestBuildsAndRunsTests.cs
index 279751a643fa..e867e29311aa 100644
--- a/test/dotnet.Tests/CommandTests/Test/GivenDotnetTestBuildsAndRunsTests.cs
+++ b/test/dotnet.Tests/CommandTests/Test/GivenDotnetTestBuildsAndRunsTests.cs
@@ -17,7 +17,7 @@ public GivenDotnetTestBuildsAndRunsTests(ITestOutputHelper log) : base(log)
         [InlineData(TestingConstants.Debug)]
         [InlineData(TestingConstants.Release)]
         [Theory]
-        public void RunTestProjectWithNoTests_ShouldReturnExitCodeGenericFailure(string configuration)
+        public void RunTestProjectWithNoTests_ShouldReturnExitCodeZeroTests(string configuration)
         {
             TestAsset testInstance = _testAssetsManager.CopyTestAsset("TestProjectSolution", Guid.NewGuid().ToString())
                 .WithSource();
@@ -69,7 +69,7 @@ public void RunTestProjectWithWithRetryFeature_ShouldSucceed(string configuratio
         [InlineData(TestingConstants.Debug)]
         [InlineData(TestingConstants.Release)]
         [Theory]
-        public void RunMultipleTestProjectsWithNoTests_ShouldReturnExitCodeGenericFailure(string configuration)
+        public void RunMultipleTestProjectsWithNoTests_ShouldReturnExitCodeZeroTests(string configuration)
         {
             TestAsset testInstance = _testAssetsManager.CopyTestAsset("MultipleTestProjectSolution", Guid.NewGuid().ToString())
                 .WithSource();
@@ -192,7 +192,7 @@ public void RunTestProjectWithTestsAndNoLaunchSettingsArguments_ShouldReturnExit
         [InlineData(TestingConstants.Debug)]
         [InlineData(TestingConstants.Release)]
         [Theory]
-        public void RunMultipleTestProjectsWithFailingTests_ShouldReturnExitCodeGenericFailure(string configuration)
+        public void RunMultipleTestProjectsWithFailingTests_ShouldReturnExitCodeAtLeastOneTestFailed(string configuration)
         {
             TestAsset testInstance = _testAssetsManager.CopyTestAsset("MultiTestProjectSolutionWithTests", Guid.NewGuid().ToString())
                 .WithSource();
@@ -418,7 +418,7 @@ public void RunMTPProjectWithUseAppHostFalse_ShouldWork()
                 .Execute();
 
             // Verify the test runs successfully with UseAppHost=false
-            result.ExitCode.Should().Be(0);
+            result.ExitCode.Should().Be(ExitCodes.Success);
         }
 
         [Theory]
@@ -439,5 +439,43 @@ public void RunMTPSolutionWithMinimumExpectedTests(string value, int expectedExi
 
             result.ExitCode.Should().Be(expectedExitCode);
         }
+
+        [Fact]
+        public void RunMTPProjectThatCrashesWithExitCodeZero_ShouldFail()
+        {
+            // The solution has two test projects. Each reports 5 tests. So, total 10 tests.
+            TestAsset testInstance = _testAssetsManager.CopyTestAsset("TestProjectMTPCrash", Guid.NewGuid().ToString())
+                .WithSource();
+
+            CommandResult result = new DotnetTestCommand(Log, disableNewOutput: false)
+                .WithWorkingDirectory(testInstance.Path)
+                .Execute();
+
+            result.ExitCode.Should().NotBe(ExitCodes.Success);
+            if (!TestContext.IsLocalized())
+            {
+                /*
+                The following exception occurred when running the test module with RunCommand 'C:\Users\ygerges\Desktop\sdk\artifacts\tmp\Debug\testing\19cefafa-91c4---0D0799BD\TestProject1\bin\Debug\net10.0\TestProject1.exe' and RunArguments ' ':
+                System.InvalidOperationException: A test session start event was received without a corresponding test session end.
+                   at Microsoft.DotNet.Cli.Commands.Test.TestApplication.RunAsync() in C:\Users\ygerges\Desktop\sdk\src\Cli\dotnet\Commands\Test\MTP\TestApplication.cs:line 55
+                   at Microsoft.DotNet.Cli.Commands.Test.TestApplicationActionQueue.Read(BuildOptions buildOptions, TestOptions testOptions, TerminalTestReporter output, Action`1 onHelpRequested) in C:\Users\ygerges\Desktop\sdk\src\Cli\dotnet\Commands\Test\MTP\TestApplicationActionQueue.cs:line 68
+                 */
+                result.StdErr.Should().MatchRegex("""
+                    The following exception occurred when running the test module with RunCommand '.+?TestProject1(\..+?)?' and RunArguments ' ':
+                    """);
+
+                result.StdErr.Should().Contain("System.InvalidOperationException: A test session start event was received without a corresponding test session end.");
+
+                // TODO: It's much better to introduce a new kind of "summary" indicating
+                // that the test app exited with zero exit code before sending test session end event
+                result.StdOut.Should().Contain("Test run summary: Passed!")
+                    .And.Contain("total: 1")
+                    .And.Contain("succeeded: 1")
+                    .And.Contain("failed: 0")
+                    .And.Contain("skipped: 0");
+
+                result.StdOut.Contains("Test run completed with non-success exit code: 1 (see: https://aka.ms/testingplatform/exitcodes)");
+            }
+        }
     }
 }

From 6a4321bb586990bd2fc792127e12b9887b410e9a Mon Sep 17 00:00:00 2001
From: Youssef Victor <youssefvictor00@gmail.com>
Date: Wed, 10 Sep 2025 13:29:39 +0200
Subject: [PATCH 06/11] [dotnet test MTP]: Pipe cleanup and add tests (#50723)

---
 .../Commands/Test/MTP/IPC/NamedPipeServer.cs  |  93 ++++---
 .../CommandTests/Test/IPCTests.cs             | 255 ++++++++++++++++++
 .../CommandTests/Test/NamedPipeClient.cs      | 190 +++++++++++++
 3 files changed, 506 insertions(+), 32 deletions(-)
 create mode 100644 test/dotnet.Tests/CommandTests/Test/IPCTests.cs
 create mode 100644 test/dotnet.Tests/CommandTests/Test/NamedPipeClient.cs

diff --git a/src/Cli/dotnet/Commands/Test/MTP/IPC/NamedPipeServer.cs b/src/Cli/dotnet/Commands/Test/MTP/IPC/NamedPipeServer.cs
index b06261dde858..ba9c04f6fe76 100644
--- a/src/Cli/dotnet/Commands/Test/MTP/IPC/NamedPipeServer.cs
+++ b/src/Cli/dotnet/Commands/Test/MTP/IPC/NamedPipeServer.cs
@@ -32,7 +32,15 @@ public NamedPipeServer(
         CancellationToken cancellationToken,
         bool skipUnknownMessages)
     {
-        _namedPipeServerStream = new(pipeName, PipeDirection.InOut, maxNumberOfServerInstances, PipeTransmissionMode.Byte, PipeOptions.Asynchronous | PipeOptions.CurrentUserOnly);
+        _namedPipeServerStream = new NamedPipeServerStream(
+            pipeName,
+            PipeDirection.InOut,
+            maxNumberOfServerInstances,
+            PipeTransmissionMode.Byte,
+            PipeOptions.Asynchronous | PipeOptions.CurrentUserOnly,
+            inBufferSize: 0,
+            outBufferSize: 0);
+
         _callback = callback;
         _cancellationToken = cancellationToken;
         _skipUnknownMessages = skipUnknownMessages;
@@ -67,51 +75,69 @@ public async Task WaitConnectionAsync(CancellationToken cancellationToken)
     /// </summary>
     private async Task InternalLoopAsync(CancellationToken cancellationToken)
     {
-        int currentMessageSize = 0;
-        int missingBytesToReadOfWholeMessage = 0;
+        // This is an indicator when reading from the pipe whether we are at the start of a new message (i.e, we should read 4 bytes as message size)
+        // Note that the implementation assumes no overlapping messages in the pipe.
+        // The flow goes like:
+        // 1. MTP sends a request (and acquires lock).
+        // 2. SDK reads the request.
+        // 3. SDK sends a response.
+        // 4. MTP reads the response (and releases lock).
+        // This means that no two requests can be in the pipe at the same time.
+        bool isStartOfNewMessage = true;
+        int remainingBytesToReadOfWholeMessage = 0;
         while (!cancellationToken.IsCancellationRequested)
         {
-            int missingBytesToReadOfCurrentChunk = 0;
-            int currentReadIndex = 0;
-            int currentReadBytes = await _namedPipeServerStream.ReadAsync(_readBuffer.AsMemory(currentReadIndex, _readBuffer.Length), cancellationToken);
-            if (currentReadBytes == 0)
+            // If we are at the start of a new message, we need to read at least the message size.
+            int currentReadBytes = isStartOfNewMessage
+                ? await _namedPipeServerStream.ReadAtLeastAsync(_readBuffer, minimumBytes: sizeof(int), throwOnEndOfStream: false, cancellationToken)
+                : await _namedPipeServerStream.ReadAsync(_readBuffer, cancellationToken);
+
+            if (currentReadBytes == 0 || (isStartOfNewMessage && currentReadBytes < sizeof(int)))
             {
                 // The client has disconnected
                 return;
             }
 
-            // Reset the current chunk size
-            missingBytesToReadOfCurrentChunk = currentReadBytes;
+            // The local remainingBytesToProcess tracks the remaining bytes of what we have read from the pipe but not yet processed.
+            // At the beginning here, it contains everything we have read from the pipe.
+            // As we are processing the data in it, we continue to slice it.
+            Memory<byte> remainingBytesToProcess = _readBuffer.AsMemory(0, currentReadBytes);
 
-            // If currentRequestSize is 0, we need to read the message size
-            if (currentMessageSize == 0)
+            // If the current read is the start of a new message, we need to read the message size first.
+            if (isStartOfNewMessage)
             {
                 // We need to read the message size, first 4 bytes
-                if (currentReadBytes < sizeof(int))
-                {
-                    throw new UnreachableException(CliCommandStrings.DotnetTestPipeIncompleteSize);
-                }
+                remainingBytesToReadOfWholeMessage = BitConverter.ToInt32(remainingBytesToProcess.Span);
+
+                // Now that we have read the size, we slice the remainingBytesToProcess.
+                remainingBytesToProcess = remainingBytesToProcess.Slice(sizeof(int));
 
-                currentMessageSize = BitConverter.ToInt32(_readBuffer, 0);
-                missingBytesToReadOfCurrentChunk = currentReadBytes - sizeof(int);
-                missingBytesToReadOfWholeMessage = currentMessageSize;
-                currentReadIndex = sizeof(int);
+                // Now that we have read the size, we are no longer at the start of a new message.
+                // If the current chunk ended up to be the full message, we will set this back to true later.
+                isStartOfNewMessage = false;
             }
 
-            if (missingBytesToReadOfCurrentChunk > 0)
+            // We read the rest of the message.
+            // Note that this assumes that no messages are overlapping in the pipe.
+            if (remainingBytesToProcess.Length > 0)
             {
                 // We need to read the rest of the message
-                await _messageBuffer.WriteAsync(_readBuffer.AsMemory(currentReadIndex, missingBytesToReadOfCurrentChunk), cancellationToken);
-                missingBytesToReadOfWholeMessage -= missingBytesToReadOfCurrentChunk;
+                await _messageBuffer.WriteAsync(remainingBytesToProcess, cancellationToken);
+                remainingBytesToReadOfWholeMessage -= remainingBytesToProcess.Length;
+
+                // At this point, we have read everything in the remainingBytesToProcess.
+                // Note that while remainingBytesToProcess isn't accessed after this point, we still maintain the
+                // invariant that it tracks what we have read from the pipe but not yet processed.
+                remainingBytesToProcess = Memory<byte>.Empty;
             }
 
-            if (missingBytesToReadOfWholeMessage < 0)
+            if (remainingBytesToReadOfWholeMessage < 0)
             {
                 throw new UnreachableException(CliCommandStrings.DotnetTestPipeOverlapping);
             }
 
             // If we have read all the message, we can deserialize it
-            if (missingBytesToReadOfWholeMessage == 0)
+            if (remainingBytesToReadOfWholeMessage == 0)
             {
                 // Deserialize the message
                 _messageBuffer.Position = 0;
@@ -147,12 +173,19 @@ private async Task InternalLoopAsync(CancellationToken cancellationToken)
 
                 // Write the message size
                 byte[] bytes = _sizeOfIntArray;
-                BitConverter.TryWriteBytes(bytes, sizeOfTheWholeMessage);
+                if (!BitConverter.TryWriteBytes(bytes, sizeOfTheWholeMessage))
+                {
+                    throw new UnreachableException();
+                }
+
                 await _messageBuffer.WriteAsync(bytes, cancellationToken);
 
                 // Write the serializer id
                 bytes = _sizeOfIntArray;
-                BitConverter.TryWriteBytes(bytes, responseNamedPipeSerializer.Id);
+                if (!BitConverter.TryWriteBytes(bytes, responseNamedPipeSerializer.Id))
+                {
+                    throw new UnreachableException();
+                }
 
                 await _messageBuffer.WriteAsync(bytes.AsMemory(0, sizeof(int)), cancellationToken);
 
@@ -164,10 +197,6 @@ private async Task InternalLoopAsync(CancellationToken cancellationToken)
                 {
                     await _namedPipeServerStream.WriteAsync(_messageBuffer.GetBuffer().AsMemory(0, (int)_messageBuffer.Position), cancellationToken);
                     await _namedPipeServerStream.FlushAsync(cancellationToken);
-                    if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-                    {
-                        _namedPipeServerStream.WaitForPipeDrain();
-                    }
                 }
                 finally
                 {
@@ -177,8 +206,8 @@ private async Task InternalLoopAsync(CancellationToken cancellationToken)
                 }
 
                 // Reset the control variables
-                currentMessageSize = 0;
-                missingBytesToReadOfWholeMessage = 0;
+                isStartOfNewMessage = true;
+                remainingBytesToReadOfWholeMessage = 0;
             }
         }
     }
diff --git a/test/dotnet.Tests/CommandTests/Test/IPCTests.cs b/test/dotnet.Tests/CommandTests/Test/IPCTests.cs
new file mode 100644
index 000000000000..124580f0f64f
--- /dev/null
+++ b/test/dotnet.Tests/CommandTests/Test/IPCTests.cs
@@ -0,0 +1,255 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.IO.Pipes;
+using Microsoft.DotNet.Cli.Commands.Test.IPC;
+using Microsoft.DotNet.Cli.Commands.Test.IPC.Models;
+using Microsoft.DotNet.Cli.Commands.Test.IPC.Serializers;
+
+namespace dotnet.Tests.CommandTests.Test;
+
+public class IPCTests
+{
+    [Fact]
+    public async Task SingleConnectionNamedPipeServer_MultipleConnection_Fails()
+    {
+        string pipeName = NamedPipeServer.GetPipeName(Guid.NewGuid().ToString("N"));
+
+        List<NamedPipeServer> openedPipes = [];
+        List<Exception> exceptions = [];
+
+        ManualResetEventSlim waitException = new(false);
+        var waitTask = Task.Run(
+            async () =>
+            {
+                try
+                {
+                    while (true)
+                    {
+                        var singleConnectionNamedPipeServer = new NamedPipeServer(
+                            pipeName,
+                            (_, _) => Task.FromResult<IResponse>(VoidResponse.CachedInstance),
+                            maxNumberOfServerInstances: 1,
+                            CancellationToken.None,
+                            skipUnknownMessages: false);
+
+                        await singleConnectionNamedPipeServer.WaitConnectionAsync(CancellationToken.None);
+                        openedPipes.Add(singleConnectionNamedPipeServer);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    exceptions.Add(ex);
+                    waitException.Set();
+                }
+            });
+
+        var namedPipeClient1 = new NamedPipeClient(pipeName);
+        await namedPipeClient1.ConnectAsync(CancellationToken.None);
+        waitException.Wait();
+
+        var openedPipe = Assert.Single(openedPipes);
+        var exception = Assert.Single(exceptions);
+        Assert.Equal(typeof(IOException), exception.GetType());
+        Assert.Contains("All pipe instances are busy.", exception.Message);
+
+        await waitTask;
+        namedPipeClient1.Dispose();
+        openedPipe.Dispose();
+
+        // Verify double dispose
+        namedPipeClient1.Dispose();
+        openedPipe.Dispose();
+    }
+
+    // CAREFUL: This test produces random test cases.
+    // So, flakiness in this test might be an indicator to a serious product bug.
+    [Fact]
+    public async Task SingleConnectionNamedPipeServer_RequestReplySerialization_Succeeded()
+    {
+        Queue<BaseMessage> receivedMessages = new();
+        string pipeName = NamedPipeServer.GetPipeName(Guid.NewGuid().ToString("N"));
+        NamedPipeClient namedPipeClient = new(pipeName);
+        namedPipeClient.RegisterSerializer(new VoidResponseSerializer(), typeof(VoidResponse));
+        namedPipeClient.RegisterSerializer(new TextMessageSerializer(), typeof(TextMessage));
+        namedPipeClient.RegisterSerializer(new IntMessageSerializer(), typeof(IntMessage));
+        namedPipeClient.RegisterSerializer(new LongMessageSerializer(), typeof(LongMessage));
+
+        ManualResetEventSlim manualResetEventSlim = new(false);
+        var clientConnected = Task.Run(
+            async () =>
+            {
+                while (true)
+                {
+                    try
+                    {
+                        await namedPipeClient.ConnectAsync(CancellationToken.None);
+                        manualResetEventSlim.Set();
+                        break;
+                    }
+                    catch (OperationCanceledException)
+                    {
+                        throw new OperationCanceledException("SingleConnectionNamedPipeServer_RequestReplySerialization_Succeeded cancellation during connect");
+                    }
+                    catch (Exception)
+                    {
+                    }
+                }
+            }, CancellationToken.None);
+        NamedPipeServer singleConnectionNamedPipeServer = new(
+            pipeName,
+            (_, request) =>
+            {
+                receivedMessages.Enqueue((BaseMessage)request);
+                return Task.FromResult<IResponse>(VoidResponse.CachedInstance);
+            },
+            NamedPipeServerStream.MaxAllowedServerInstances,
+            CancellationToken.None,
+            skipUnknownMessages: false);
+        singleConnectionNamedPipeServer.RegisterSerializer(new VoidResponseSerializer(), typeof(VoidResponse));
+        singleConnectionNamedPipeServer.RegisterSerializer(new TextMessageSerializer(), typeof(TextMessage));
+        singleConnectionNamedPipeServer.RegisterSerializer(new IntMessageSerializer(), typeof(IntMessage));
+        singleConnectionNamedPipeServer.RegisterSerializer(new LongMessageSerializer(), typeof(LongMessage));
+        await singleConnectionNamedPipeServer.WaitConnectionAsync(CancellationToken.None);
+        manualResetEventSlim.Wait();
+
+        await clientConnected;
+
+        await namedPipeClient.RequestReplyAsync<IntMessage, VoidResponse>(new IntMessage(10), CancellationToken.None);
+        Assert.Equal(new IntMessage(10), receivedMessages.Dequeue());
+
+        await namedPipeClient.RequestReplyAsync<LongMessage, VoidResponse>(new LongMessage(11), CancellationToken.None);
+        Assert.Equal(new LongMessage(11), receivedMessages.Dequeue());
+
+        for (int i = 0; i < 100; i++)
+        {
+            await AssertWithLengthAsync(Random.Shared.Next(1024, 1024 * 1024 * 2));
+        }
+
+        // NOTE: 250000 is the buffer size of NamedPipeServer.
+        // We explicitly test around this size (and multiple of it) as most potential bugs can be around it.
+        for (int multiple = 1; multiple <= 3; multiple++)
+        {
+            const int namedPipeServerBufferSize = 250000;
+            int minLength = namedPipeServerBufferSize * multiple - 1000;
+            int maxLength = namedPipeServerBufferSize * multiple + 1000;
+            for (int randomLength = minLength; randomLength <= maxLength; randomLength++)
+            {
+                await AssertWithLengthAsync(randomLength);
+            }
+        }
+
+        namedPipeClient.Dispose();
+        singleConnectionNamedPipeServer.Dispose();
+
+        async Task AssertWithLengthAsync(int length)
+        {
+            string currentString = RandomString(length);
+            await namedPipeClient.RequestReplyAsync<TextMessage, VoidResponse>(new TextMessage(currentString), CancellationToken.None);
+            Assert.Single(receivedMessages);
+            Assert.Equal(new TextMessage(currentString), receivedMessages.Dequeue());
+        }
+    }
+
+    [Fact]
+    public async Task ConnectionNamedPipeServer_MultipleConnection_Succeeds()
+    {
+        string pipeName = NamedPipeServer.GetPipeName(Guid.NewGuid().ToString("N"));
+
+        List<NamedPipeServer> pipes = [];
+        for (int i = 0; i < 3; i++)
+        {
+            pipes.Add(new NamedPipeServer(
+                pipeName,
+                (_, _) => Task.FromResult<IResponse>(VoidResponse.CachedInstance),
+                maxNumberOfServerInstances: 3,
+                CancellationToken.None,
+                skipUnknownMessages: false));
+        }
+
+        IOException exception = Assert.Throws<IOException>(() =>
+             new NamedPipeServer(
+                pipeName,
+                (_, _) => Task.FromResult<IResponse>(VoidResponse.CachedInstance),
+                maxNumberOfServerInstances: 3,
+                CancellationToken.None,
+                skipUnknownMessages: false));
+        Assert.Contains("All pipe instances are busy.", exception.Message);
+
+        List<Task> waitConnectionTask = [];
+        int connectionCompleted = 0;
+        foreach (NamedPipeServer namedPipeServer in pipes)
+        {
+            waitConnectionTask.Add(Task.Run(
+                async () =>
+                {
+                    await namedPipeServer.WaitConnectionAsync(CancellationToken.None);
+                    Interlocked.Increment(ref connectionCompleted);
+                }, CancellationToken.None));
+        }
+
+        List<NamedPipeClient> connectedClients = [];
+        for (int i = 0; i < waitConnectionTask.Count; i++)
+        {
+            var namedPipeClient = new NamedPipeClient(pipeName);
+            connectedClients.Add(namedPipeClient);
+            await namedPipeClient.ConnectAsync(CancellationToken.None);
+        }
+
+        await Task.WhenAll([.. waitConnectionTask]);
+
+        Assert.Equal(3, connectionCompleted);
+
+        foreach (NamedPipeClient namedPipeClient in connectedClients)
+        {
+            namedPipeClient.Dispose();
+        }
+
+        foreach (NamedPipeServer namedPipeServer in pipes)
+        {
+            namedPipeServer.Dispose();
+        }
+    }
+
+    private static string RandomString(int length)
+    {
+        const string chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+        return new string([.. Enumerable.Repeat(chars, length).Select(s => s[Random.Shared.Next(s.Length)])]);
+    }
+
+    private abstract record BaseMessage : IRequest;
+
+    private sealed record TextMessage(string Text) : BaseMessage;
+
+    private sealed class TextMessageSerializer : BaseSerializer, INamedPipeSerializer
+    {
+        public int Id => 2;
+
+        public object Deserialize(Stream stream) => new TextMessage(ReadString(stream));
+
+        public void Serialize(object objectToSerialize, Stream stream) => WriteString(stream, ((TextMessage)objectToSerialize).Text);
+    }
+
+    private sealed record IntMessage(int Integer) : BaseMessage;
+
+    private sealed class IntMessageSerializer : BaseSerializer, INamedPipeSerializer
+    {
+        public int Id => 3;
+
+        public object Deserialize(Stream stream) => new IntMessage(ReadInt(stream));
+
+        public void Serialize(object objectToSerialize, Stream stream) => WriteInt(stream, ((IntMessage)objectToSerialize).Integer);
+    }
+
+    private sealed record LongMessage(long Long) : BaseMessage;
+
+    private sealed class LongMessageSerializer : BaseSerializer, INamedPipeSerializer
+    {
+        public int Id => 4;
+
+        public object Deserialize(Stream stream) => new LongMessage(ReadInt(stream));
+
+        public void Serialize(object objectToSerialize, Stream stream) => WriteLong(stream, ((LongMessage)objectToSerialize).Long);
+    }
+
+}
diff --git a/test/dotnet.Tests/CommandTests/Test/NamedPipeClient.cs b/test/dotnet.Tests/CommandTests/Test/NamedPipeClient.cs
new file mode 100644
index 000000000000..531ba8d08163
--- /dev/null
+++ b/test/dotnet.Tests/CommandTests/Test/NamedPipeClient.cs
@@ -0,0 +1,190 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace dotnet.Tests.CommandTests.Test;
+
+using System.Buffers;
+using System.IO.Pipes;
+using Microsoft.DotNet.Cli.Commands.Test.IPC;
+
+internal sealed class NamedPipeClient : NamedPipeBase
+{
+    private readonly NamedPipeClientStream _namedPipeClientStream;
+    private readonly SemaphoreSlim _lock = new(1, 1);
+
+    private readonly MemoryStream _serializationBuffer = new();
+    private readonly MemoryStream _messageBuffer = new();
+    private readonly byte[] _readBuffer = new byte[250000];
+
+    private bool _disposed;
+
+    public NamedPipeClient(string name)
+    {
+        _namedPipeClientStream = new(".", name, PipeDirection.InOut, PipeOptions.CurrentUserOnly);
+        PipeName = name;
+    }
+
+    public string PipeName { get; }
+
+    public async Task ConnectAsync(CancellationToken cancellationToken)
+        => await _namedPipeClientStream.ConnectAsync(cancellationToken).ConfigureAwait(false);
+
+    public async Task<TResponse> RequestReplyAsync<TRequest, TResponse>(TRequest request, CancellationToken cancellationToken)
+       where TRequest : IRequest
+       where TResponse : IResponse
+    {
+        await _lock.WaitAsync(cancellationToken).ConfigureAwait(false);
+        try
+        {
+            INamedPipeSerializer requestNamedPipeSerializer = GetSerializer(typeof(TRequest));
+
+            // Ask to serialize the body
+            _serializationBuffer.Position = 0;
+            requestNamedPipeSerializer.Serialize(request, _serializationBuffer);
+
+            // Write the message size
+            _messageBuffer.Position = 0;
+
+            // The length of the message is the size of the message plus one byte to store the serializer id
+            // Space for the message
+            int sizeOfTheWholeMessage = (int)_serializationBuffer.Position;
+
+            // Space for the serializer id
+            sizeOfTheWholeMessage += sizeof(int);
+
+            // Write the message size
+            byte[] bytes = ArrayPool<byte>.Shared.Rent(sizeof(int));
+            try
+            {
+                BitConverter.TryWriteBytes(bytes, sizeOfTheWholeMessage);
+                await _messageBuffer.WriteAsync(bytes.AsMemory(0, sizeof(int)), cancellationToken).ConfigureAwait(false);
+            }
+            finally
+            {
+                ArrayPool<byte>.Shared.Return(bytes);
+            }
+
+            // Write the serializer id
+            bytes = ArrayPool<byte>.Shared.Rent(sizeof(int));
+            try
+            {
+                BitConverter.TryWriteBytes(bytes, requestNamedPipeSerializer.Id);
+                await _messageBuffer.WriteAsync(bytes.AsMemory(0, sizeof(int)), cancellationToken).ConfigureAwait(false);
+            }
+            finally
+            {
+                ArrayPool<byte>.Shared.Return(bytes);
+            }
+
+            try
+            {
+                // Write the message
+                await _messageBuffer.WriteAsync(_serializationBuffer.GetBuffer().AsMemory(0, (int)_serializationBuffer.Position), cancellationToken).ConfigureAwait(false);
+            }
+            finally
+            {
+                // Reset the serialization buffer
+                _serializationBuffer.Position = 0;
+            }
+
+            // Send the message
+            try
+            {
+                await _namedPipeClientStream.WriteAsync(_messageBuffer.GetBuffer().AsMemory(0, (int)_messageBuffer.Position), cancellationToken).ConfigureAwait(false);
+                await _namedPipeClientStream.FlushAsync(cancellationToken).ConfigureAwait(false);
+                if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+                {
+                    _namedPipeClientStream.WaitForPipeDrain();
+                }
+            }
+            finally
+            {
+                // Reset the buffers
+                _messageBuffer.Position = 0;
+                _serializationBuffer.Position = 0;
+            }
+
+            // Read the response
+            int currentMessageSize = 0;
+            int missingBytesToReadOfWholeMessage = 0;
+            while (true)
+            {
+                int currentReadIndex = 0;
+                int currentReadBytes = await _namedPipeClientStream.ReadAsync(_readBuffer.AsMemory(currentReadIndex, _readBuffer.Length), cancellationToken).ConfigureAwait(false);
+
+                if (currentReadBytes == 0)
+                {
+                    // We are reading a message response.
+                    // If we cannot get a response, there is no way we can recover and continue executing.
+                    // This can happen if the other processes gets killed or crashes while while it's sending the response.
+                    // This is especially important for 'dotnet test', where the user can simply kill the dotnet.exe process themselves.
+                    // In that case, we want the MTP process to also die.
+                    Environment.FailFast("[NamedPipeClient] Connection lost with the other side.");
+                }
+
+                // Reset the current chunk size
+                int missingBytesToReadOfCurrentChunk = currentReadBytes;
+
+                // If currentRequestSize is 0, we need to read the message size
+                if (currentMessageSize == 0)
+                {
+                    // We need to read the message size, first 4 bytes
+                    currentMessageSize = BitConverter.ToInt32(_readBuffer, 0);
+                    missingBytesToReadOfCurrentChunk = currentReadBytes - sizeof(int);
+                    missingBytesToReadOfWholeMessage = currentMessageSize;
+                    currentReadIndex = sizeof(int);
+                }
+
+                if (missingBytesToReadOfCurrentChunk > 0)
+                {
+                    // We need to read the rest of the message
+                    await _messageBuffer.WriteAsync(_readBuffer.AsMemory(currentReadIndex, missingBytesToReadOfCurrentChunk), cancellationToken).ConfigureAwait(false);
+                    missingBytesToReadOfWholeMessage -= missingBytesToReadOfCurrentChunk;
+                }
+
+                // If we have read all the message, we can deserialize it
+                if (missingBytesToReadOfWholeMessage == 0)
+                {
+                    // Deserialize the message
+                    _messageBuffer.Position = 0;
+
+                    // Get the serializer id
+                    int serializerId = BitConverter.ToInt32(_messageBuffer.GetBuffer(), 0);
+
+                    // Get the serializer
+                    _messageBuffer.Position += sizeof(int); // Skip the serializer id
+                    INamedPipeSerializer responseNamedPipeSerializer = GetSerializer(serializerId);
+
+                    // Deserialize the message
+                    try
+                    {
+                        return (TResponse)responseNamedPipeSerializer.Deserialize(_messageBuffer);
+                    }
+                    finally
+                    {
+                        // Reset the message buffer
+                        _messageBuffer.Position = 0;
+                    }
+                }
+            }
+        }
+        finally
+        {
+            _lock.Release();
+        }
+    }
+
+    public void Dispose()
+    {
+        if (_disposed)
+        {
+            return;
+        }
+
+        _lock.Dispose();
+        _serializationBuffer.Dispose();
+        _messageBuffer.Dispose();
+        _namedPipeClientStream.Dispose();
+        _disposed = true;
+    }
+}

From cb2c757eaedfdb090ca814ee7a7e5dd3f0d424a1 Mon Sep 17 00:00:00 2001
From: Youssef Victor <youssefvictor00@gmail.com>
Date: Wed, 10 Sep 2025 15:14:46 +0200
Subject: [PATCH 07/11] Ensure dotnet test messages are received in the right
 timings/modes (#50727)

---
 .../dotnet/Commands/CliCommandStrings.resx    | 11 +++-
 .../Test/MTP/IPC/Models/HandshakeMessage.cs   |  2 +-
 .../Serializers/HandshakeMessageSerializer.cs |  2 -
 .../Commands/Test/MTP/TestApplication.cs      | 42 +++++++-------
 .../Test/MTP/TestApplicationHandler.cs        | 56 +++++++++++--------
 .../Commands/xlf/CliCommandStrings.cs.xlf     | 15 +++++
 .../Commands/xlf/CliCommandStrings.de.xlf     | 15 +++++
 .../Commands/xlf/CliCommandStrings.es.xlf     | 15 +++++
 .../Commands/xlf/CliCommandStrings.fr.xlf     | 15 +++++
 .../Commands/xlf/CliCommandStrings.it.xlf     | 15 +++++
 .../Commands/xlf/CliCommandStrings.ja.xlf     | 15 +++++
 .../Commands/xlf/CliCommandStrings.ko.xlf     | 15 +++++
 .../Commands/xlf/CliCommandStrings.pl.xlf     | 15 +++++
 .../Commands/xlf/CliCommandStrings.pt-BR.xlf  | 15 +++++
 .../Commands/xlf/CliCommandStrings.ru.xlf     | 15 +++++
 .../Commands/xlf/CliCommandStrings.tr.xlf     | 15 +++++
 .../xlf/CliCommandStrings.zh-Hans.xlf         | 15 +++++
 .../xlf/CliCommandStrings.zh-Hant.xlf         | 15 +++++
 18 files changed, 258 insertions(+), 50 deletions(-)

diff --git a/src/Cli/dotnet/Commands/CliCommandStrings.resx b/src/Cli/dotnet/Commands/CliCommandStrings.resx
index 03d5475f2099..ae125125e3ab 100644
--- a/src/Cli/dotnet/Commands/CliCommandStrings.resx
+++ b/src/Cli/dotnet/Commands/CliCommandStrings.resx
@@ -2682,4 +2682,13 @@ Proceed?</value>
   <data name="UnexpectedHelpMessage" xml:space="preserve">
     <value>An unexpected help-related message was received when `--help` wasn't used.</value>
   </data>
-</root>
\ No newline at end of file
+  <data name="MismatchingHandshakeInfo" xml:space="preserve">
+    <value>A new handshake '{0}' was received for the test application that doesn't match the previous handshake '{1}'.</value>
+  </data>
+  <data name="UnexpectedMessageInHelpMode" xml:space="preserve">
+    <value>A message of type '{0}' was received in help mode, which is not expected.</value>
+  </data>
+  <data name="UnexpectedMessageWithoutHandshake" xml:space="preserve">
+    <value>A message of type '{0}' was received before we got any handshakes, which is unexpected.</value>
+  </data>
+</root>
diff --git a/src/Cli/dotnet/Commands/Test/MTP/IPC/Models/HandshakeMessage.cs b/src/Cli/dotnet/Commands/Test/MTP/IPC/Models/HandshakeMessage.cs
index 00870e30c393..78331178da74 100644
--- a/src/Cli/dotnet/Commands/Test/MTP/IPC/Models/HandshakeMessage.cs
+++ b/src/Cli/dotnet/Commands/Test/MTP/IPC/Models/HandshakeMessage.cs
@@ -3,4 +3,4 @@
 
 namespace Microsoft.DotNet.Cli.Commands.Test.IPC.Models;
 
-internal sealed record HandshakeMessage(Dictionary<byte, string>? Properties) : IRequest, IResponse;
+internal sealed record HandshakeMessage(Dictionary<byte, string> Properties) : IRequest, IResponse;
diff --git a/src/Cli/dotnet/Commands/Test/MTP/IPC/Serializers/HandshakeMessageSerializer.cs b/src/Cli/dotnet/Commands/Test/MTP/IPC/Serializers/HandshakeMessageSerializer.cs
index 933ed3dc301d..6ed6d352f2e5 100644
--- a/src/Cli/dotnet/Commands/Test/MTP/IPC/Serializers/HandshakeMessageSerializer.cs
+++ b/src/Cli/dotnet/Commands/Test/MTP/IPC/Serializers/HandshakeMessageSerializer.cs
@@ -1,8 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-#nullable disable
-
 using System.Diagnostics;
 using Microsoft.DotNet.Cli.Commands.Test.IPC.Models;
 
diff --git a/src/Cli/dotnet/Commands/Test/MTP/TestApplication.cs b/src/Cli/dotnet/Commands/Test/MTP/TestApplication.cs
index 8c16b7961002..05e6e230c14c 100644
--- a/src/Cli/dotnet/Commands/Test/MTP/TestApplication.cs
+++ b/src/Cli/dotnet/Commands/Test/MTP/TestApplication.cs
@@ -1,11 +1,10 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-#nullable disable
-
 using System.Diagnostics;
 using System.Globalization;
 using System.IO.Pipes;
+using System.Threading;
 using Microsoft.DotNet.Cli.Commands.Test.IPC;
 using Microsoft.DotNet.Cli.Commands.Test.IPC.Models;
 using Microsoft.DotNet.Cli.Commands.Test.IPC.Serializers;
@@ -28,9 +27,7 @@ internal sealed class TestApplication(
     private readonly List<string> _outputData = [];
     private readonly List<string> _errorData = [];
     private readonly string _pipeName = NamedPipeServer.GetPipeName(Guid.NewGuid().ToString("N"));
-    private readonly CancellationTokenSource _cancellationToken = new();
 
-    private Task _testAppPipeConnectionLoop;
     private readonly List<NamedPipeServer> _testAppPipeConnections = [];
     private readonly Dictionary<NamedPipeServer, HandshakeMessage> _handshakes = new();
 
@@ -45,17 +42,26 @@ public async Task<int> RunAsync()
         // Consider throwing an exception if it's called more than once.
         var processStartInfo = CreateProcessStartInfo();
 
-        _testAppPipeConnectionLoop = Task.Run(async () => await WaitConnectionAsync(_cancellationToken.Token), _cancellationToken.Token);
-        var testProcessExitCode = await StartProcess(processStartInfo);
+        var cancellationTokenSource = new CancellationTokenSource();
+        var cancellationToken = cancellationTokenSource.Token;
+        Task? testAppPipeConnectionLoop = null;
 
-        WaitOnTestApplicationPipeConnectionLoop();
+        try
+        {
+            testAppPipeConnectionLoop = Task.Run(async () => await WaitConnectionAsync(cancellationToken), cancellationToken);
+            var testProcessExitCode = await StartProcess(processStartInfo);
+            if (_handler.HasMismatchingTestSessionEventCount())
+            {
+                throw new InvalidOperationException(CliCommandStrings.MissingTestSessionEnd);
+            }
 
-        if (_handler.HasMismatchingTestSessionEventCount())
+            return testProcessExitCode;
+        }
+        finally
         {
-            throw new InvalidOperationException(CliCommandStrings.MissingTestSessionEnd);
+            cancellationTokenSource.Cancel();
+            testAppPipeConnectionLoop?.Wait((int)TimeSpan.FromSeconds(30).TotalMilliseconds);
         }
-
-        return testProcessExitCode;
     }
 
     private ProcessStartInfo CreateProcessStartInfo()
@@ -147,12 +153,6 @@ private string GetArguments()
         return builder.ToString();
     }
 
-    private void WaitOnTestApplicationPipeConnectionLoop()
-    {
-        _cancellationToken.Cancel();
-        _testAppPipeConnectionLoop?.Wait((int)TimeSpan.FromSeconds(30).TotalMilliseconds);
-    }
-
     private async Task WaitConnectionAsync(CancellationToken token)
     {
         try
@@ -242,7 +242,7 @@ private Task<IResponse> OnRequest(NamedPipeServer server, IRequest request)
 
     private static string GetSupportedProtocolVersion(HandshakeMessage handshakeMessage)
     {
-        if (!handshakeMessage.Properties.TryGetValue(HandshakeMessagePropertyNames.SupportedProtocolVersions, out string protocolVersions) ||
+        if (!handshakeMessage.Properties.TryGetValue(HandshakeMessagePropertyNames.SupportedProtocolVersions, out string? protocolVersions) ||
             protocolVersions is null)
         {
             // It's not expected we hit this.
@@ -265,7 +265,7 @@ private static string GetSupportedProtocolVersion(HandshakeMessage handshakeMess
     }
 
     private static HandshakeMessage CreateHandshakeMessage(string version) =>
-        new(new Dictionary<byte, string>(capacity: 5)
+        new HandshakeMessage(new Dictionary<byte, string>(capacity: 5)
         {
             { HandshakeMessagePropertyNames.PID, Environment.ProcessId.ToString(CultureInfo.InvariantCulture) },
             { HandshakeMessagePropertyNames.Architecture, RuntimeInformation.ProcessArchitecture.ToString() },
@@ -278,7 +278,7 @@ private async Task<int> StartProcess(ProcessStartInfo processStartInfo)
     {
         Logger.LogTrace($"Starting test process with command '{processStartInfo.FileName}' and arguments '{processStartInfo.Arguments}'.");
 
-        using var process = Process.Start(processStartInfo);
+        using var process = Process.Start(processStartInfo)!;
         StoreOutputAndErrorData(process);
         await process.WaitForExitAsync();
 
@@ -400,7 +400,5 @@ public void Dispose()
                 Reporter.Error.WriteLine(messageBuilder.ToString());
             }
         }
-
-        WaitOnTestApplicationPipeConnectionLoop();
     }
 }
diff --git a/src/Cli/dotnet/Commands/Test/MTP/TestApplicationHandler.cs b/src/Cli/dotnet/Commands/Test/MTP/TestApplicationHandler.cs
index d8aa6c9557eb..b41ca3ec26f1 100644
--- a/src/Cli/dotnet/Commands/Test/MTP/TestApplicationHandler.cs
+++ b/src/Cli/dotnet/Commands/Test/MTP/TestApplicationHandler.cs
@@ -46,17 +46,18 @@ internal void OnHandshakeReceived(HandshakeMessage handshakeMessage, bool gotSup
             return;
         }
 
+        var executionId = handshakeMessage.Properties[HandshakeMessagePropertyNames.ExecutionId];
+        var arch = handshakeMessage.Properties[HandshakeMessagePropertyNames.Architecture]?.ToLower();
+        var tfm = TargetFrameworkParser.GetShortTargetFramework(handshakeMessage.Properties[HandshakeMessagePropertyNames.Framework]);
+        var currentHandshakeInfo = (tfm, arch, executionId);
+
         if (!_handshakeInfo.HasValue)
         {
-            var executionId = handshakeMessage.Properties[HandshakeMessagePropertyNames.ExecutionId];
-            var arch = handshakeMessage.Properties[HandshakeMessagePropertyNames.Architecture]?.ToLower();
-            var tfm = TargetFrameworkParser.GetShortTargetFramework(handshakeMessage.Properties[HandshakeMessagePropertyNames.Framework]);
-
-            _handshakeInfo = (tfm, arch, executionId);
+            _handshakeInfo = currentHandshakeInfo;
         }
-        else
+        else if (_handshakeInfo.Value != currentHandshakeInfo)
         {
-            // TODO: Verify we get the same info.
+            throw new InvalidOperationException(string.Format(CliCommandStrings.MismatchingHandshakeInfo, currentHandshakeInfo, _handshakeInfo.Value));
         }
 
         var hostType = handshakeMessage.Properties[HandshakeMessagePropertyNames.HostType];
@@ -91,13 +92,14 @@ internal void OnDiscoveredTestsReceived(DiscoveredTestMessages discoveredTestMes
     {
         LogDiscoveredTests(discoveredTestMessages);
 
-        // TODO: If _handshakeInfo is null, we should error.
-        // We shouldn't be getting any discovered test messages without a previous handshake.
-
         if (_options.IsHelp)
         {
-            // TODO: Better to throw exception?
-            return;
+            throw new InvalidOperationException(string.Format(CliCommandStrings.UnexpectedMessageInHelpMode, nameof(DiscoveredTestMessages)));
+        }
+
+        if (!_handshakeInfo.HasValue)
+        {
+            throw new InvalidOperationException(string.Format(CliCommandStrings.UnexpectedMessageWithoutHandshake, nameof(DiscoveredTestMessages)));
         }
 
         foreach (var test in discoveredTestMessages.DiscoveredMessages)
@@ -112,13 +114,14 @@ internal void OnTestResultsReceived(TestResultMessages testResultMessage)
     {
         LogTestResults(testResultMessage);
 
-        // TODO: If _handshakeInfo is null, we should error.
-        // We shouldn't be getting any test result messages without a previous handshake.
-
         if (_options.IsHelp)
         {
-            // TODO: Better to throw exception?
-            return;
+            throw new InvalidOperationException(string.Format(CliCommandStrings.UnexpectedMessageInHelpMode, nameof(TestResultMessages)));
+        }
+
+        if (!_handshakeInfo.HasValue)
+        {
+            throw new InvalidOperationException(string.Format(CliCommandStrings.UnexpectedMessageWithoutHandshake, nameof(TestResultMessages)));
         }
 
         var handshakeInfo = _handshakeInfo.Value;
@@ -158,13 +161,14 @@ internal void OnFileArtifactsReceived(FileArtifactMessages fileArtifactMessages)
     {
         LogFileArtifacts(fileArtifactMessages);
 
-        // TODO: If _handshakeInfo is null, we should error.
-        // We shouldn't be getting any file artifact messages without a previous handshake.
-
         if (_options.IsHelp)
         {
-            // TODO: Better to throw exception?
-            return;
+            throw new InvalidOperationException(string.Format(CliCommandStrings.UnexpectedMessageInHelpMode, nameof(FileArtifactMessages)));
+        }
+
+        if (!_handshakeInfo.HasValue)
+        {
+            throw new InvalidOperationException(string.Format(CliCommandStrings.UnexpectedMessageWithoutHandshake, nameof(FileArtifactMessages)));
         }
 
         var handshakeInfo = _handshakeInfo.Value;
@@ -183,8 +187,12 @@ internal void OnSessionEventReceived(TestSessionEvent sessionEvent)
         {
             LogSessionEvent(sessionEvent);
 
-            // TODO: If _handshakeInfo is null, we should error.
-            // We shouldn't be getting any session event messages without a previous handshake.
+            // TODO: Validate if we should get this message in help mode or not.
+
+            if (!_handshakeInfo.HasValue)
+            {
+                throw new InvalidOperationException(string.Format(CliCommandStrings.UnexpectedMessageWithoutHandshake, nameof(DiscoveredTestMessages)));
+            }
 
             if (sessionEvent.SessionType == SessionEventTypes.TestSessionStart)
             {
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.cs.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.cs.xlf
index af8707f4683f..7c487ebbb989 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.cs.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.cs.xlf
@@ -1719,6 +1719,11 @@ Nástroj {1} (verze {2}) se úspěšně nainstaloval. Do souboru manifestu {3} s
         <target state="translated">Minimální očekávané porušení zásad testů, spuštěné testy: {0}, očekávané minimum: {1}</target>
         <note>{0}, {1} number of tests</note>
       </trans-unit>
+      <trans-unit id="MismatchingHandshakeInfo">
+        <source>A new handshake '{0}' was received for the test application that doesn't match the previous handshake '{1}'.</source>
+        <target state="new">A new handshake '{0}' was received for the test application that doesn't match the previous handshake '{1}'.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="MissingDirectiveName">
         <source>Missing name of '{0}' at {1}.</source>
         <target state="translated">Chybí název pro {0} v {1}.</target>
@@ -3548,6 +3553,16 @@ příkazu „dotnet tool list“.</target>
         <target state="new">An unexpected help-related message was received when `--help` wasn't used.</target>
         <note />
       </trans-unit>
+      <trans-unit id="UnexpectedMessageInHelpMode">
+        <source>A message of type '{0}' was received in help mode, which is not expected.</source>
+        <target state="new">A message of type '{0}' was received in help mode, which is not expected.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnexpectedMessageWithoutHandshake">
+        <source>A message of type '{0}' was received before we got any handshakes, which is unexpected.</source>
+        <target state="new">A message of type '{0}' was received before we got any handshakes, which is unexpected.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="UnexpectedTestSessionEnd">
         <source>A test session end event was received without a corresponding test session start.</source>
         <target state="new">A test session end event was received without a corresponding test session start.</target>
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.de.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.de.xlf
index 5a6a288f9b72..4b712e3eb393 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.de.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.de.xlf
@@ -1719,6 +1719,11 @@ Das Tool "{1}" (Version {2}) wurde erfolgreich installiert. Der Eintrag wird der
         <target state="translated">Mindestens erwartete Testrichtlinienverletzung, {0} Tests wurden ausgeführt, mindestens erwartet: {1}</target>
         <note>{0}, {1} number of tests</note>
       </trans-unit>
+      <trans-unit id="MismatchingHandshakeInfo">
+        <source>A new handshake '{0}' was received for the test application that doesn't match the previous handshake '{1}'.</source>
+        <target state="new">A new handshake '{0}' was received for the test application that doesn't match the previous handshake '{1}'.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="MissingDirectiveName">
         <source>Missing name of '{0}' at {1}.</source>
         <target state="translated">Fehlender Name von "{0}" bei "{1}".</target>
@@ -3548,6 +3553,16 @@ und die zugehörigen Paket-IDs für installierte Tools über den Befehl
         <target state="new">An unexpected help-related message was received when `--help` wasn't used.</target>
         <note />
       </trans-unit>
+      <trans-unit id="UnexpectedMessageInHelpMode">
+        <source>A message of type '{0}' was received in help mode, which is not expected.</source>
+        <target state="new">A message of type '{0}' was received in help mode, which is not expected.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnexpectedMessageWithoutHandshake">
+        <source>A message of type '{0}' was received before we got any handshakes, which is unexpected.</source>
+        <target state="new">A message of type '{0}' was received before we got any handshakes, which is unexpected.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="UnexpectedTestSessionEnd">
         <source>A test session end event was received without a corresponding test session start.</source>
         <target state="new">A test session end event was received without a corresponding test session start.</target>
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.es.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.es.xlf
index 64360be1d9bd..4839275dec3b 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.es.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.es.xlf
@@ -1719,6 +1719,11 @@ La herramienta "{1}" (versión "{2}") se instaló correctamente. Se ha agregado
         <target state="translated">Infracción de directiva de pruebas mínimas esperadas, pruebas ejecutadas {0}, mínimas esperadas {1}</target>
         <note>{0}, {1} number of tests</note>
       </trans-unit>
+      <trans-unit id="MismatchingHandshakeInfo">
+        <source>A new handshake '{0}' was received for the test application that doesn't match the previous handshake '{1}'.</source>
+        <target state="new">A new handshake '{0}' was received for the test application that doesn't match the previous handshake '{1}'.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="MissingDirectiveName">
         <source>Missing name of '{0}' at {1}.</source>
         <target state="translated">Falta el nombre de "{0}" en {1}.</target>
@@ -3548,6 +3553,16 @@ y los identificadores de los paquetes correspondientes a las herramientas instal
         <target state="new">An unexpected help-related message was received when `--help` wasn't used.</target>
         <note />
       </trans-unit>
+      <trans-unit id="UnexpectedMessageInHelpMode">
+        <source>A message of type '{0}' was received in help mode, which is not expected.</source>
+        <target state="new">A message of type '{0}' was received in help mode, which is not expected.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnexpectedMessageWithoutHandshake">
+        <source>A message of type '{0}' was received before we got any handshakes, which is unexpected.</source>
+        <target state="new">A message of type '{0}' was received before we got any handshakes, which is unexpected.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="UnexpectedTestSessionEnd">
         <source>A test session end event was received without a corresponding test session start.</source>
         <target state="new">A test session end event was received without a corresponding test session start.</target>
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.fr.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.fr.xlf
index 5d617c717df4..cb9258a4fa6c 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.fr.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.fr.xlf
@@ -1719,6 +1719,11 @@ L'outil '{1}' (version '{2}') a été correctement installé. L'entrée est ajou
         <target state="translated">Violation de stratégie de tests minimale attendue, tests exécutés {0}, minimum attendu {1}</target>
         <note>{0}, {1} number of tests</note>
       </trans-unit>
+      <trans-unit id="MismatchingHandshakeInfo">
+        <source>A new handshake '{0}' was received for the test application that doesn't match the previous handshake '{1}'.</source>
+        <target state="new">A new handshake '{0}' was received for the test application that doesn't match the previous handshake '{1}'.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="MissingDirectiveName">
         <source>Missing name of '{0}' at {1}.</source>
         <target state="translated">Nom manquant pour « {0} » à {1}.</target>
@@ -3548,6 +3553,16 @@ et les ID de package correspondants aux outils installés, utilisez la commande
         <target state="new">An unexpected help-related message was received when `--help` wasn't used.</target>
         <note />
       </trans-unit>
+      <trans-unit id="UnexpectedMessageInHelpMode">
+        <source>A message of type '{0}' was received in help mode, which is not expected.</source>
+        <target state="new">A message of type '{0}' was received in help mode, which is not expected.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnexpectedMessageWithoutHandshake">
+        <source>A message of type '{0}' was received before we got any handshakes, which is unexpected.</source>
+        <target state="new">A message of type '{0}' was received before we got any handshakes, which is unexpected.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="UnexpectedTestSessionEnd">
         <source>A test session end event was received without a corresponding test session start.</source>
         <target state="new">A test session end event was received without a corresponding test session start.</target>
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.it.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.it.xlf
index dbec0ada6e3b..0d9c2edb4902 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.it.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.it.xlf
@@ -1719,6 +1719,11 @@ Lo strumento '{1}' versione '{2}' è stato installato. La voce è stata aggiunta
         <target state="translated">Violazione minima dei criteri di test previsti, test eseguiti {0}, minimo previsto {1}</target>
         <note>{0}, {1} number of tests</note>
       </trans-unit>
+      <trans-unit id="MismatchingHandshakeInfo">
+        <source>A new handshake '{0}' was received for the test application that doesn't match the previous handshake '{1}'.</source>
+        <target state="new">A new handshake '{0}' was received for the test application that doesn't match the previous handshake '{1}'.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="MissingDirectiveName">
         <source>Missing name of '{0}' at {1}.</source>
         <target state="translated">Nome mancante di '{0}' in {1}.</target>
@@ -3548,6 +3553,16 @@ e gli ID pacchetto corrispondenti per gli strumenti installati usando il comando
         <target state="new">An unexpected help-related message was received when `--help` wasn't used.</target>
         <note />
       </trans-unit>
+      <trans-unit id="UnexpectedMessageInHelpMode">
+        <source>A message of type '{0}' was received in help mode, which is not expected.</source>
+        <target state="new">A message of type '{0}' was received in help mode, which is not expected.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnexpectedMessageWithoutHandshake">
+        <source>A message of type '{0}' was received before we got any handshakes, which is unexpected.</source>
+        <target state="new">A message of type '{0}' was received before we got any handshakes, which is unexpected.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="UnexpectedTestSessionEnd">
         <source>A test session end event was received without a corresponding test session start.</source>
         <target state="new">A test session end event was received without a corresponding test session start.</target>
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ja.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ja.xlf
index 0879c292c757..f29eda7e3084 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ja.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ja.xlf
@@ -1719,6 +1719,11 @@ Tool '{1}' (version '{2}') was successfully installed. Entry is added to the man
         <target state="translated">予想されるテストの最小ポリシー違反、テストの実行数 {0} 件、予想される最小数 {1} 件</target>
         <note>{0}, {1} number of tests</note>
       </trans-unit>
+      <trans-unit id="MismatchingHandshakeInfo">
+        <source>A new handshake '{0}' was received for the test application that doesn't match the previous handshake '{1}'.</source>
+        <target state="new">A new handshake '{0}' was received for the test application that doesn't match the previous handshake '{1}'.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="MissingDirectiveName">
         <source>Missing name of '{0}' at {1}.</source>
         <target state="translated">{1} に ' {0}' の名前がありません。</target>
@@ -3548,6 +3553,16 @@ and the corresponding package Ids for installed tools using the command
         <target state="new">An unexpected help-related message was received when `--help` wasn't used.</target>
         <note />
       </trans-unit>
+      <trans-unit id="UnexpectedMessageInHelpMode">
+        <source>A message of type '{0}' was received in help mode, which is not expected.</source>
+        <target state="new">A message of type '{0}' was received in help mode, which is not expected.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnexpectedMessageWithoutHandshake">
+        <source>A message of type '{0}' was received before we got any handshakes, which is unexpected.</source>
+        <target state="new">A message of type '{0}' was received before we got any handshakes, which is unexpected.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="UnexpectedTestSessionEnd">
         <source>A test session end event was received without a corresponding test session start.</source>
         <target state="new">A test session end event was received without a corresponding test session start.</target>
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ko.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ko.xlf
index b9dce47a1ad9..2c70c37ebb45 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ko.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ko.xlf
@@ -1719,6 +1719,11 @@ Tool '{1}' (version '{2}') was successfully installed. Entry is added to the man
         <target state="translated">예상되는 최소 테스트 정책 위반, 테스트 실행 {0}, 필요한 최소 {1}</target>
         <note>{0}, {1} number of tests</note>
       </trans-unit>
+      <trans-unit id="MismatchingHandshakeInfo">
+        <source>A new handshake '{0}' was received for the test application that doesn't match the previous handshake '{1}'.</source>
+        <target state="new">A new handshake '{0}' was received for the test application that doesn't match the previous handshake '{1}'.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="MissingDirectiveName">
         <source>Missing name of '{0}' at {1}.</source>
         <target state="translated">{1}에 ' {0}'의 이름이 없습니다.</target>
@@ -3548,6 +3553,16 @@ and the corresponding package Ids for installed tools using the command
         <target state="new">An unexpected help-related message was received when `--help` wasn't used.</target>
         <note />
       </trans-unit>
+      <trans-unit id="UnexpectedMessageInHelpMode">
+        <source>A message of type '{0}' was received in help mode, which is not expected.</source>
+        <target state="new">A message of type '{0}' was received in help mode, which is not expected.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnexpectedMessageWithoutHandshake">
+        <source>A message of type '{0}' was received before we got any handshakes, which is unexpected.</source>
+        <target state="new">A message of type '{0}' was received before we got any handshakes, which is unexpected.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="UnexpectedTestSessionEnd">
         <source>A test session end event was received without a corresponding test session start.</source>
         <target state="new">A test session end event was received without a corresponding test session start.</target>
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pl.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pl.xlf
index 5732724b2418..19199250332a 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pl.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pl.xlf
@@ -1719,6 +1719,11 @@ Narzędzie „{1}” (wersja „{2}”) zostało pomyślnie zainstalowane. Wpis
         <target state="translated">Minimalne oczekiwane naruszenie zasad testów, uruchomione testy: {0}, oczekiwane minimum: {1}</target>
         <note>{0}, {1} number of tests</note>
       </trans-unit>
+      <trans-unit id="MismatchingHandshakeInfo">
+        <source>A new handshake '{0}' was received for the test application that doesn't match the previous handshake '{1}'.</source>
+        <target state="new">A new handshake '{0}' was received for the test application that doesn't match the previous handshake '{1}'.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="MissingDirectiveName">
         <source>Missing name of '{0}' at {1}.</source>
         <target state="translated">Brak nazwy „{0}” w {1}.</target>
@@ -3548,6 +3553,16 @@ i odpowiednie identyfikatory pakietów zainstalowanych narzędzi można znaleź
         <target state="new">An unexpected help-related message was received when `--help` wasn't used.</target>
         <note />
       </trans-unit>
+      <trans-unit id="UnexpectedMessageInHelpMode">
+        <source>A message of type '{0}' was received in help mode, which is not expected.</source>
+        <target state="new">A message of type '{0}' was received in help mode, which is not expected.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnexpectedMessageWithoutHandshake">
+        <source>A message of type '{0}' was received before we got any handshakes, which is unexpected.</source>
+        <target state="new">A message of type '{0}' was received before we got any handshakes, which is unexpected.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="UnexpectedTestSessionEnd">
         <source>A test session end event was received without a corresponding test session start.</source>
         <target state="new">A test session end event was received without a corresponding test session start.</target>
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pt-BR.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pt-BR.xlf
index 7eb80549cb97..f6a6251199a0 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pt-BR.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pt-BR.xlf
@@ -1719,6 +1719,11 @@ A ferramenta '{1}' (versão '{2}') foi instalada com êxito. A entrada foi adici
         <target state="translated">Violação de política de testes mínimos esperados, {0} testes executados, mínimo esperado {1}</target>
         <note>{0}, {1} number of tests</note>
       </trans-unit>
+      <trans-unit id="MismatchingHandshakeInfo">
+        <source>A new handshake '{0}' was received for the test application that doesn't match the previous handshake '{1}'.</source>
+        <target state="new">A new handshake '{0}' was received for the test application that doesn't match the previous handshake '{1}'.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="MissingDirectiveName">
         <source>Missing name of '{0}' at {1}.</source>
         <target state="translated">Nome de "{0}" ausente em {1}.</target>
@@ -3548,6 +3553,16 @@ e as Ids de pacote correspondentes para as ferramentas instaladas usando o coman
         <target state="new">An unexpected help-related message was received when `--help` wasn't used.</target>
         <note />
       </trans-unit>
+      <trans-unit id="UnexpectedMessageInHelpMode">
+        <source>A message of type '{0}' was received in help mode, which is not expected.</source>
+        <target state="new">A message of type '{0}' was received in help mode, which is not expected.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnexpectedMessageWithoutHandshake">
+        <source>A message of type '{0}' was received before we got any handshakes, which is unexpected.</source>
+        <target state="new">A message of type '{0}' was received before we got any handshakes, which is unexpected.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="UnexpectedTestSessionEnd">
         <source>A test session end event was received without a corresponding test session start.</source>
         <target state="new">A test session end event was received without a corresponding test session start.</target>
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ru.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ru.xlf
index e3cc884fa557..e0a19a6081c6 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ru.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ru.xlf
@@ -1719,6 +1719,11 @@ Tool '{1}' (version '{2}') was successfully installed. Entry is added to the man
         <target state="translated">Нарушение политики минимального ожидаемого числа тестов. Выполнено тестов: {0}, ожидаемый минимум: {1}</target>
         <note>{0}, {1} number of tests</note>
       </trans-unit>
+      <trans-unit id="MismatchingHandshakeInfo">
+        <source>A new handshake '{0}' was received for the test application that doesn't match the previous handshake '{1}'.</source>
+        <target state="new">A new handshake '{0}' was received for the test application that doesn't match the previous handshake '{1}'.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="MissingDirectiveName">
         <source>Missing name of '{0}' at {1}.</source>
         <target state="translated">В {1} отсутствует имя "{0}".</target>
@@ -3549,6 +3554,16 @@ and the corresponding package Ids for installed tools using the command
         <target state="new">An unexpected help-related message was received when `--help` wasn't used.</target>
         <note />
       </trans-unit>
+      <trans-unit id="UnexpectedMessageInHelpMode">
+        <source>A message of type '{0}' was received in help mode, which is not expected.</source>
+        <target state="new">A message of type '{0}' was received in help mode, which is not expected.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnexpectedMessageWithoutHandshake">
+        <source>A message of type '{0}' was received before we got any handshakes, which is unexpected.</source>
+        <target state="new">A message of type '{0}' was received before we got any handshakes, which is unexpected.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="UnexpectedTestSessionEnd">
         <source>A test session end event was received without a corresponding test session start.</source>
         <target state="new">A test session end event was received without a corresponding test session start.</target>
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.tr.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.tr.xlf
index 48408db28746..ccb3a44c50ad 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.tr.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.tr.xlf
@@ -1719,6 +1719,11 @@ Tool '{1}' (version '{2}') was successfully installed. Entry is added to the man
         <target state="translated">Beklenen minimum test ilke ihlali, yürütülen test: {0}, beklenen minimum test: {1}</target>
         <note>{0}, {1} number of tests</note>
       </trans-unit>
+      <trans-unit id="MismatchingHandshakeInfo">
+        <source>A new handshake '{0}' was received for the test application that doesn't match the previous handshake '{1}'.</source>
+        <target state="new">A new handshake '{0}' was received for the test application that doesn't match the previous handshake '{1}'.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="MissingDirectiveName">
         <source>Missing name of '{0}' at {1}.</source>
         <target state="translated">{1} konumunda '{0}' paketinin adı eksik.</target>
@@ -3548,6 +3553,16 @@ karşılık gelen paket kimliklerini bulmak için
         <target state="new">An unexpected help-related message was received when `--help` wasn't used.</target>
         <note />
       </trans-unit>
+      <trans-unit id="UnexpectedMessageInHelpMode">
+        <source>A message of type '{0}' was received in help mode, which is not expected.</source>
+        <target state="new">A message of type '{0}' was received in help mode, which is not expected.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnexpectedMessageWithoutHandshake">
+        <source>A message of type '{0}' was received before we got any handshakes, which is unexpected.</source>
+        <target state="new">A message of type '{0}' was received before we got any handshakes, which is unexpected.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="UnexpectedTestSessionEnd">
         <source>A test session end event was received without a corresponding test session start.</source>
         <target state="new">A test session end event was received without a corresponding test session start.</target>
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hans.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hans.xlf
index d92ef0210eb9..822c1d08279c 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hans.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hans.xlf
@@ -1719,6 +1719,11 @@ Tool '{1}' (version '{2}') was successfully installed. Entry is added to the man
         <target state="translated">最低预期测试策略冲突，测试已运行 {0} 次，最低预期 {1} 次</target>
         <note>{0}, {1} number of tests</note>
       </trans-unit>
+      <trans-unit id="MismatchingHandshakeInfo">
+        <source>A new handshake '{0}' was received for the test application that doesn't match the previous handshake '{1}'.</source>
+        <target state="new">A new handshake '{0}' was received for the test application that doesn't match the previous handshake '{1}'.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="MissingDirectiveName">
         <source>Missing name of '{0}' at {1}.</source>
         <target state="translated">缺少 {1} 处 ‘{0}’ 的名称。</target>
@@ -3548,6 +3553,16 @@ and the corresponding package Ids for installed tools using the command
         <target state="new">An unexpected help-related message was received when `--help` wasn't used.</target>
         <note />
       </trans-unit>
+      <trans-unit id="UnexpectedMessageInHelpMode">
+        <source>A message of type '{0}' was received in help mode, which is not expected.</source>
+        <target state="new">A message of type '{0}' was received in help mode, which is not expected.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnexpectedMessageWithoutHandshake">
+        <source>A message of type '{0}' was received before we got any handshakes, which is unexpected.</source>
+        <target state="new">A message of type '{0}' was received before we got any handshakes, which is unexpected.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="UnexpectedTestSessionEnd">
         <source>A test session end event was received without a corresponding test session start.</source>
         <target state="new">A test session end event was received without a corresponding test session start.</target>
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hant.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hant.xlf
index 1d62894be1bb..82d48dc66e0c 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hant.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hant.xlf
@@ -1719,6 +1719,11 @@ Tool '{1}' (version '{2}') was successfully installed. Entry is added to the man
         <target state="translated">預期測試原則違反的最小值，{0} 個執行的測試，預期的最小值為 {1}</target>
         <note>{0}, {1} number of tests</note>
       </trans-unit>
+      <trans-unit id="MismatchingHandshakeInfo">
+        <source>A new handshake '{0}' was received for the test application that doesn't match the previous handshake '{1}'.</source>
+        <target state="new">A new handshake '{0}' was received for the test application that doesn't match the previous handshake '{1}'.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="MissingDirectiveName">
         <source>Missing name of '{0}' at {1}.</source>
         <target state="translated">缺少位於 {1} 的 '{0}' 名稱。</target>
@@ -3548,6 +3553,16 @@ and the corresponding package Ids for installed tools using the command
         <target state="new">An unexpected help-related message was received when `--help` wasn't used.</target>
         <note />
       </trans-unit>
+      <trans-unit id="UnexpectedMessageInHelpMode">
+        <source>A message of type '{0}' was received in help mode, which is not expected.</source>
+        <target state="new">A message of type '{0}' was received in help mode, which is not expected.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="UnexpectedMessageWithoutHandshake">
+        <source>A message of type '{0}' was received before we got any handshakes, which is unexpected.</source>
+        <target state="new">A message of type '{0}' was received before we got any handshakes, which is unexpected.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="UnexpectedTestSessionEnd">
         <source>A test session end event was received without a corresponding test session start.</source>
         <target state="new">A test session end event was received without a corresponding test session start.</target>

From e5e4503837b00e17a89b6c27ba40b8b94d81c126 Mon Sep 17 00:00:00 2001
From: Youssef Victor <youssefvictor00@gmail.com>
Date: Wed, 10 Sep 2025 16:02:11 +0200
Subject: [PATCH 08/11] Unskip test command tests on macOS (#50701)

---
 .../Utilities/RegexPatternHelper.cs           |  4 +--
 .../GivenDotnetTestBuildsAndDiscoversTests.cs | 12 +++----
 ...tBuildsAndRunsTestBasedOnGlobbingFilter.cs |  9 ++----
 .../Test/GivenDotnetTestBuildsAndRunsTests.cs |  3 +-
 ...etTestBuildsAndRunsTestsForMultipleTFMs.cs |  5 ++-
 ...tBuildsAndRunsTestsWithDifferentOptions.cs | 31 +++++++------------
 6 files changed, 23 insertions(+), 41 deletions(-)

diff --git a/test/Microsoft.NET.TestFramework/Utilities/RegexPatternHelper.cs b/test/Microsoft.NET.TestFramework/Utilities/RegexPatternHelper.cs
index a3e1cf015b90..c4c068cfe2e7 100644
--- a/test/Microsoft.NET.TestFramework/Utilities/RegexPatternHelper.cs
+++ b/test/Microsoft.NET.TestFramework/Utilities/RegexPatternHelper.cs
@@ -16,7 +16,7 @@ public static string GenerateProjectRegexPattern(string projectName, string resu
                 string.Empty;
 
             string exitCodePattern = exitCode == null ? string.Empty : $@"[\s\S]*?Exit\s+code: {exitCode}";
-            return $@".+{configuration}{PathUtility.GetDirectorySeparatorChar()}{version}{PathUtility.GetDirectorySeparatorChar()}{runtimeIdentifier}{projectName}(\.dll|\.exe)?\s+\({version}\|[a-zA-Z][1-9]+\)\s{result}{exitCodePattern}";
+            return $@".+{configuration}{PathUtility.GetDirectorySeparatorChar()}{version}{PathUtility.GetDirectorySeparatorChar()}{runtimeIdentifier}{projectName}(\.dll|\.exe)?\s+\({version}\|[a-zA-Z]+[1-9]+\)\s{result}{exitCodePattern}";
         }
 
         public static string GenerateProjectRegexPattern(string projectName, bool useCurrentVersion, string configuration, string prefix, List<string>? suffix = null, bool addVersionAndArchPattern = true)
@@ -26,7 +26,7 @@ public static string GenerateProjectRegexPattern(string projectName, bool useCur
 
             if (addVersionAndArchPattern)
             {
-                pattern += @$"\s+\({version}\|[a-zA-Z][1-9]+\)";
+                pattern += @$"\s+\({version}\|[a-zA-Z]+[1-9]+\)";
             }
 
             if (suffix == null)
diff --git a/test/dotnet.Tests/CommandTests/Test/GivenDotnetTestBuildsAndDiscoversTests.cs b/test/dotnet.Tests/CommandTests/Test/GivenDotnetTestBuildsAndDiscoversTests.cs
index 4026f994dece..08e5ef2c95fa 100644
--- a/test/dotnet.Tests/CommandTests/Test/GivenDotnetTestBuildsAndDiscoversTests.cs
+++ b/test/dotnet.Tests/CommandTests/Test/GivenDotnetTestBuildsAndDiscoversTests.cs
@@ -14,10 +14,9 @@ public GivenDotnetTestBuildsAndDiscoversTests(ITestOutputHelper log) : base(log)
         {
         }
 
-        //  https://github.com/dotnet/sdk/issues/49665
         [InlineData(TestingConstants.Debug)]
         [InlineData(TestingConstants.Release)]
-        [PlatformSpecificTheory(TestPlatforms.Any & ~TestPlatforms.OSX)]
+        [Theory]
         public void DiscoverTestProjectWithNoTests_ShouldReturnExitCodeGenericFailure(string configuration)
         {
             TestAsset testInstance = _testAssetsManager.CopyTestAsset("TestProjectSolution", Guid.NewGuid().ToString())
@@ -38,10 +37,9 @@ public void DiscoverTestProjectWithNoTests_ShouldReturnExitCodeGenericFailure(st
             result.ExitCode.Should().Be(ExitCodes.ZeroTests);
         }
 
-        //  https://github.com/dotnet/sdk/issues/49665
         [InlineData(TestingConstants.Debug)]
         [InlineData(TestingConstants.Release)]
-        [PlatformSpecificTheory(TestPlatforms.Any & ~TestPlatforms.OSX)]
+        [Theory]
         public void DiscoverMultipleTestProjectsWithNoTests_ShouldReturnExitCodeGenericFailure(string configuration)
         {
             TestAsset testInstance = _testAssetsManager.CopyTestAsset("MultipleTestProjectSolution", Guid.NewGuid().ToString())
@@ -62,10 +60,9 @@ public void DiscoverMultipleTestProjectsWithNoTests_ShouldReturnExitCodeGenericF
             result.ExitCode.Should().Be(ExitCodes.ZeroTests);
         }
 
-        //  https://github.com/dotnet/sdk/issues/49665
         [InlineData(TestingConstants.Debug)]
         [InlineData(TestingConstants.Release)]
-        [PlatformSpecificTheory(TestPlatforms.Any & ~TestPlatforms.OSX)]
+        [Theory]
         public void DiscoverTestProjectWithTests_ShouldReturnExitCodeSuccess(string configuration)
         {
             TestAsset testInstance = _testAssetsManager.CopyTestAsset("TestProjectWithDiscoveredTests", Guid.NewGuid().ToString())
@@ -84,10 +81,9 @@ public void DiscoverTestProjectWithTests_ShouldReturnExitCodeSuccess(string conf
             result.ExitCode.Should().Be(ExitCodes.Success);
         }
 
-        //  https://github.com/dotnet/sdk/issues/49665
         [InlineData(TestingConstants.Debug)]
         [InlineData(TestingConstants.Release)]
-        [PlatformSpecificTheory(TestPlatforms.Any & ~TestPlatforms.OSX)]
+        [Theory]
         public void DiscoverMultipleTestProjectsWithTests_ShouldReturnExitCodeSuccess(string configuration)
         {
             TestAsset testInstance = _testAssetsManager.CopyTestAsset("MultiTestProjectSolutionWithDiscoveredTests", Guid.NewGuid().ToString())
diff --git a/test/dotnet.Tests/CommandTests/Test/GivenDotnetTestBuildsAndRunsTestBasedOnGlobbingFilter.cs b/test/dotnet.Tests/CommandTests/Test/GivenDotnetTestBuildsAndRunsTestBasedOnGlobbingFilter.cs
index f795b1ca9f06..2a82eca0a169 100644
--- a/test/dotnet.Tests/CommandTests/Test/GivenDotnetTestBuildsAndRunsTestBasedOnGlobbingFilter.cs
+++ b/test/dotnet.Tests/CommandTests/Test/GivenDotnetTestBuildsAndRunsTestBasedOnGlobbingFilter.cs
@@ -13,8 +13,7 @@ public GivenDotnetTestBuildsAndRunsTestBasedOnGlobbingFilter(ITestOutputHelper l
         {
         }
 
-        //  https://github.com/dotnet/sdk/issues/49665
-        [PlatformSpecificFact(TestPlatforms.Any & ~TestPlatforms.OSX)]
+        [Fact]
         public void RunTestProjectWithFilterOfDll_ShouldReturnExitCodeSuccess()
         {
             TestAsset testInstance = _testAssetsManager.CopyTestAsset("TestProjectWithTests", Guid.NewGuid().ToString())
@@ -50,8 +49,7 @@ public void RunTestProjectWithFilterOfDll_ShouldReturnExitCodeSuccess()
             result.ExitCode.Should().Be(ExitCodes.Success);
         }
 
-        //  https://github.com/dotnet/sdk/issues/49665
-        [PlatformSpecificFact(TestPlatforms.Any & ~TestPlatforms.OSX)]
+        [Fact]
         public void RunTestProjectsWithFilterOfDll_ShouldReturnExitCodeGenericFailure()
         {
             TestAsset testInstance = _testAssetsManager.CopyTestAsset("MultiTestProjectSolutionWithTests", Guid.NewGuid().ToString())
@@ -97,8 +95,7 @@ public void RunTestProjectsWithFilterOfDll_ShouldReturnExitCodeGenericFailure()
         }
 
 
-        //  https://github.com/dotnet/sdk/issues/49665
-        [PlatformSpecificFact(TestPlatforms.Any & ~TestPlatforms.OSX)]
+        [Fact]
         public void RunTestProjectWithFilterOfDllWithRootDirectory_ShouldReturnExitCodeSuccess()
         {
             TestAsset testInstance = _testAssetsManager.CopyTestAsset("TestProjectWithTests", Guid.NewGuid().ToString())
diff --git a/test/dotnet.Tests/CommandTests/Test/GivenDotnetTestBuildsAndRunsTests.cs b/test/dotnet.Tests/CommandTests/Test/GivenDotnetTestBuildsAndRunsTests.cs
index e867e29311aa..25735f54c6aa 100644
--- a/test/dotnet.Tests/CommandTests/Test/GivenDotnetTestBuildsAndRunsTests.cs
+++ b/test/dotnet.Tests/CommandTests/Test/GivenDotnetTestBuildsAndRunsTests.cs
@@ -214,10 +214,9 @@ public void RunMultipleTestProjectsWithFailingTests_ShouldReturnExitCodeAtLeastO
             result.ExitCode.Should().Be(ExitCodes.AtLeastOneTestFailed);
         }
 
-        //  https://github.com/dotnet/sdk/issues/49665
         [InlineData(TestingConstants.Debug)]
         [InlineData(TestingConstants.Release)]
-        [PlatformSpecificTheory(TestPlatforms.Any & ~TestPlatforms.OSX)]
+        [Theory]
         public void RunMultipleTestProjectsWithDifferentFailures_ShouldReturnExitCodeGenericFailure(string configuration)
         {
             TestAsset testInstance = _testAssetsManager.CopyTestAsset("MultiTestProjectSolutionWithDifferentFailures", Guid.NewGuid().ToString())
diff --git a/test/dotnet.Tests/CommandTests/Test/GivenDotnetTestBuildsAndRunsTestsForMultipleTFMs.cs b/test/dotnet.Tests/CommandTests/Test/GivenDotnetTestBuildsAndRunsTestsForMultipleTFMs.cs
index bc3f0e909b1d..ee143e52bce3 100644
--- a/test/dotnet.Tests/CommandTests/Test/GivenDotnetTestBuildsAndRunsTestsForMultipleTFMs.cs
+++ b/test/dotnet.Tests/CommandTests/Test/GivenDotnetTestBuildsAndRunsTestsForMultipleTFMs.cs
@@ -55,6 +55,7 @@ public void RunMultipleProjectWithDifferentTFMs_ShouldReturnExitCodeGenericFailu
         }
 
         //  https://github.com/dotnet/sdk/issues/49665
+        // Failed to load /private/tmp/helix/working/A83B08FB/p/d/shared/Microsoft.NETCore.App/9.0.0/libhostpolicy.dylib, error: dlopen(/private/tmp/helix/working/A83B08FB/p/d/shared/Microsoft.NETCore.App/9.0.0/libhostpolicy.dylib, 0x0001): tried: '/private/tmp/helix/working/A83B08FB/p/d/shared/Microsoft.NETCore.App/9.0.0/libhostpolicy.dylib' (mach-o file, but is an incompatible architecture (have 'x86_64', need 'arm64')), '/System/Volumes/Preboot/Cryptexes/OS/private/tmp/helix/working/A83B08FB/p/d/shared/Microsoft.NETCore.App/9.0.0/libhostpolicy.dylib' (no such file), '/private/tmp/helix/working/A83B08FB/p/d/shared/Microsoft.NETCore.App/9.0.0/libhostpolicy.dylib' (mach-o file, but is an incompatible architecture (have 'x86_64', need 'arm64'))
         [InlineData(TestingConstants.Debug)]
         [InlineData(TestingConstants.Release)]
         [PlatformSpecificTheory(TestPlatforms.Any & ~TestPlatforms.OSX)]
@@ -142,11 +143,9 @@ public void RunProjectWithMultipleTFMs_ParallelizationTest_RunInParallelShouldFa
             }
         }
 
-        //  https://github.com/dotnet/sdk/issues/49665
-        //  Error output: Failed to load /private/tmp/helix/working/A452091E/p/d/shared/Microsoft.NETCore.App/9.0.0/libhostpolicy.dylib, error: dlopen(/private/tmp/helix/working/A452091E/p/d/shared/Microsoft.NETCore.App/9.0.0/libhostpolicy.dylib, 0x0001): tried: '/private/tmp/helix/working/A452091E/p/d/shared/Microsoft.NETCore.App/9.0.0/libhostpolicy.dylib' (mach-o file, but is an incompatible architecture (have 'x86_64', need 'arm64')), 
         [InlineData(TestingConstants.Debug)]
         [InlineData(TestingConstants.Release)]
-        [PlatformSpecificTheory(TestPlatforms.Any & ~TestPlatforms.OSX)]
+        [Theory]
         public void RunProjectWithMultipleTFMsWithArchOption_ShouldReturnExitCodeGenericFailure(string configuration)
         {
             TestAsset testInstance = _testAssetsManager.CopyTestAsset("TestProjectWithMultipleTFMsSolution", Guid.NewGuid().ToString())
diff --git a/test/dotnet.Tests/CommandTests/Test/GivenDotnetTestBuildsAndRunsTestsWithDifferentOptions.cs b/test/dotnet.Tests/CommandTests/Test/GivenDotnetTestBuildsAndRunsTestsWithDifferentOptions.cs
index 141eceae2710..dc1f77b4d357 100644
--- a/test/dotnet.Tests/CommandTests/Test/GivenDotnetTestBuildsAndRunsTestsWithDifferentOptions.cs
+++ b/test/dotnet.Tests/CommandTests/Test/GivenDotnetTestBuildsAndRunsTestsWithDifferentOptions.cs
@@ -34,10 +34,9 @@ public void RunWithProjectPathWithFailingTests_ShouldReturnExitCodeGenericFailur
             result.ExitCode.Should().Be(ExitCodes.AtLeastOneTestFailed);
         }
 
-        //  https://github.com/dotnet/sdk/issues/49665
         [InlineData(TestingConstants.Debug)]
         [InlineData(TestingConstants.Release)]
-        [PlatformSpecificTheory(TestPlatforms.Any & ~TestPlatforms.OSX)]
+        [Theory]
         public void RunWithSolutionPathWithFailingTests_ShouldReturnExitCodeGenericFailure(string configuration)
         {
             TestAsset testInstance = _testAssetsManager.CopyTestAsset("MultiTestProjectSolutionWithTests", Guid.NewGuid().ToString()).WithSource();
@@ -55,10 +54,9 @@ public void RunWithSolutionPathWithFailingTests_ShouldReturnExitCodeGenericFailu
             result.ExitCode.Should().Be(ExitCodes.AtLeastOneTestFailed);
         }
 
-        //  https://github.com/dotnet/sdk/issues/49665
         [InlineData(TestingConstants.Debug)]
         [InlineData(TestingConstants.Release)]
-        [PlatformSpecificTheory(TestPlatforms.Any & ~TestPlatforms.OSX)]
+        [Theory]
         public void RunWithSolutionFilterPathWithFailingTests_ShouldReturnExitCodeGenericFailure(string configuration)
         {
             TestAsset testInstance = _testAssetsManager.CopyTestAsset("MultiTestProjectSolutionWithTests", Guid.NewGuid().ToString()).WithSource();
@@ -76,10 +74,9 @@ public void RunWithSolutionFilterPathWithFailingTests_ShouldReturnExitCodeGeneri
             result.ExitCode.Should().Be(ExitCodes.AtLeastOneTestFailed);
         }
 
-        //  https://github.com/dotnet/sdk/issues/49665
         [InlineData(TestingConstants.Debug)]
         [InlineData(TestingConstants.Release)]
-        [PlatformSpecificTheory(TestPlatforms.Any & ~TestPlatforms.OSX)]
+        [Theory]
         public void RunWithSolutionFilterPathInOtherDirectory_ShouldReturnExitCodeGenericFailure(string configuration)
         {
             TestAsset testInstance = _testAssetsManager.CopyTestAsset("MultiTestProjectSolutionWithTests", Guid.NewGuid().ToString()).WithSource();
@@ -115,7 +112,7 @@ public void RunWithInvalidProjectExtension_ShouldReturnExitCodeGenericFailure(st
 
         [InlineData(TestingConstants.Debug)]
         [InlineData(TestingConstants.Release)]
-        [PlatformSpecificTheory(TestPlatforms.Any & ~TestPlatforms.OSX)]
+        [Theory]
         public void RunWithDirectoryAsProjectOption_ShouldReturnExitCodeGenericFailure(string configuration)
         {
             TestAsset testInstance = _testAssetsManager.CopyTestAsset("MultiTestProjectSolutionWithTests", Guid.NewGuid().ToString()).WithSource();
@@ -214,10 +211,9 @@ public void RunWithNonExistentSolutionPath_ShouldReturnExitCodeGenericFailure(st
             result.ExitCode.Should().Be(ExitCodes.GenericFailure);
         }
 
-        //  https://github.com/dotnet/sdk/issues/49665
         [InlineData(TestingConstants.Debug)]
         [InlineData(TestingConstants.Release)]
-        [PlatformSpecificTheory(TestPlatforms.Any & ~TestPlatforms.OSX)]
+        [Theory]
         public void RunTestProjectWithArchOption_ShouldReturnExitCodeSuccess(string configuration)
         {
             TestAsset testInstance = _testAssetsManager.CopyTestAsset("TestProjectWithTests", Guid.NewGuid().ToString()).WithSource();
@@ -235,10 +231,9 @@ public void RunTestProjectWithArchOption_ShouldReturnExitCodeSuccess(string conf
             result.ExitCode.Should().Be(ExitCodes.Success);
         }
 
-        //  https://github.com/dotnet/sdk/issues/49665
         [InlineData(TestingConstants.Debug)]
         [InlineData(TestingConstants.Release)]
-        [PlatformSpecificTheory(TestPlatforms.Any & ~TestPlatforms.OSX)]
+        [Theory]
         public void RunTestProjectSolutionWithArchOption_NotSupported(string configuration)
         {
             TestAsset testInstance = _testAssetsManager.CopyTestAsset("TestProjectSolution", Guid.NewGuid().ToString()).WithSource();
@@ -262,6 +257,7 @@ public void RunTestProjectSolutionWithArchOption_NotSupported(string configurati
         }
 
         //  https://github.com/dotnet/sdk/issues/49665
+        // Failed to load /private/tmp/helix/working/A83B08FB/p/d/host/fxr/10.0.0-rc.2.25427.104/libhostfxr.dylib, error: dlopen(/private/tmp/helix/working/A83B08FB/p/d/host/fxr/10.0.0-rc.2.25427.104/libhostfxr.dylib, 0x0001): tried: '/private/tmp/helix/working/A83B08FB/p/d/host/fxr/10.0.0-rc.2.25427.104/libhostfxr.dylib' (mach-o file, but is an incompatible architecture (have 'arm64', need 'x86_64')), '/System/Volumes/Preboot/Cryptexes/OS/private/tmp/helix/working/A83B08FB/p/d/host/fxr/10.0.0-rc.2.25427.104/libhostfxr.dylib' (no such file), '/private/tmp/helix/working/A83B08FB/p/d/host/fxr/10.0.0-rc.2.25427.104/libhostfxr.dylib' (mach-o file, but is an incompatible architecture (have 'arm64', need 'x86_64'))
         [InlineData(TestingConstants.Debug)]
         [InlineData(TestingConstants.Release)]
         [PlatformSpecificTheory(TestPlatforms.Any & ~TestPlatforms.OSX)]
@@ -300,10 +296,9 @@ public void RunTestProjectSolutionWithArchAndRuntimeOptions_ShouldReturnExitCode
             result.ExitCode.Should().Be(ExitCodes.GenericFailure);
         }
 
-        //  https://github.com/dotnet/sdk/issues/49665
         [InlineData(TestingConstants.Debug)]
         [InlineData(TestingConstants.Release)]
-        [PlatformSpecificTheory(TestPlatforms.Any & ~TestPlatforms.OSX)]
+        [Theory]
         public void RunTestProjectSolutionWithOSOption_ShouldReturnExitCodeSuccess(string configuration)
         {
             TestAsset testInstance = _testAssetsManager.CopyTestAsset("TestProjectWithTests", Guid.NewGuid().ToString()).WithSource();
@@ -320,10 +315,9 @@ public void RunTestProjectSolutionWithOSOption_ShouldReturnExitCodeSuccess(strin
             result.ExitCode.Should().Be(ExitCodes.Success);
         }
 
-        //  https://github.com/dotnet/sdk/issues/49665
         [InlineData(TestingConstants.Debug)]
         [InlineData(TestingConstants.Release)]
-        [PlatformSpecificTheory(TestPlatforms.Any & ~TestPlatforms.OSX)]
+        [Theory]
         public void RunTestProjectSolutionWithArchAndOSOptions_ShouldReturnExitCodeSuccess(string configuration)
         {
             TestAsset testInstance = _testAssetsManager.CopyTestAsset("TestProjectWithTests", Guid.NewGuid().ToString()).WithSource();
@@ -436,10 +430,9 @@ public void RunOnSolutionWithMSBuildArgs_ShouldReturnExitCodeGenericFailure(stri
             result.ExitCode.Should().Be(ExitCodes.AtLeastOneTestFailed);
         }
 
-        //  https://github.com/dotnet/sdk/issues/49665
         [InlineData(TestingConstants.Debug)]
         [InlineData(TestingConstants.Release)]
-        [PlatformSpecificTheory(TestPlatforms.Any & ~TestPlatforms.OSX)]
+        [Theory]
         public void RunTestProjectSolutionWithFrameworkOption_ShouldReturnExitCodeSuccess(string configuration)
         {
             TestAsset testInstance = _testAssetsManager.CopyTestAsset("TestProjectWithTests", Guid.NewGuid().ToString()).WithSource();
@@ -511,11 +504,9 @@ public void RunMultiTFMsProjectSolutionWithPreviousFramework_ShouldReturnExitCod
             result.ExitCode.Should().Be(ExitCodes.GenericFailure);
         }
 
-
-        //  https://github.com/dotnet/sdk/issues/49665
         [InlineData(TestingConstants.Debug)]
         [InlineData(TestingConstants.Release)]
-        [PlatformSpecificTheory(TestPlatforms.Any & ~TestPlatforms.OSX)]
+        [Theory]
         public void RunMultiTFMsProjectSolutionWithCurrentFramework_ShouldReturnExitCodeGenericFailure(string configuration)
         {
             TestAsset testInstance = _testAssetsManager.CopyTestAsset("TestProjectWithMultipleTFMsSolution", Guid.NewGuid().ToString()).WithSource();

From 71b374d1b2a5a8e0db5ba0a9e25d79c121643c83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Matou=C5=A1ek?=
 <tmat@users.noreply.github.com>
Date: Wed, 10 Sep 2025 09:18:23 -0700
Subject: [PATCH 09/11] Misc target framework fixes (#50713)

---
 Directory.Build.targets                       |  3 ++-
 eng/SourcePackage.netframework.editorconfig   | 21 +++++++++++++++++++
 .../HotReload/AppModels/HotReloadAppModel.cs  |  8 +------
 3 files changed, 24 insertions(+), 8 deletions(-)
 create mode 100644 eng/SourcePackage.netframework.editorconfig

diff --git a/Directory.Build.targets b/Directory.Build.targets
index e8ed8b44f992..f8d73e5ff744 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -97,8 +97,9 @@
   <!-- Include SourcePackage.editorconfig in all source packages. -->
   <Target Name="_AddEditorConfigToSourcePackage">
     <ItemGroup>
-      <TfmSpecificPackageFile Include="$(MSBuildThisFileDirectory)eng\SourcePackage.editorconfig" PackagePath="contentFiles/cs/$(TargetFramework)/.editorconfig" Condition="'$(TargetFrameworkIdentifier)' != '.NETStandard'"  />
+      <TfmSpecificPackageFile Include="$(MSBuildThisFileDirectory)eng\SourcePackage.editorconfig" PackagePath="contentFiles/cs/$(TargetFramework)/.editorconfig" Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"  />
       <TfmSpecificPackageFile Include="$(MSBuildThisFileDirectory)eng\SourcePackage.netstandard.editorconfig" PackagePath="contentFiles/cs/$(TargetFramework)/.editorconfig" Condition="'$(TargetFrameworkIdentifier)' == '.NETStandard'" />
+      <TfmSpecificPackageFile Include="$(MSBuildThisFileDirectory)eng\SourcePackage.netframework.editorconfig" PackagePath="contentFiles/cs/$(TargetFramework)/.editorconfig" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" />
     </ItemGroup>
   </Target>
 
diff --git a/eng/SourcePackage.netframework.editorconfig b/eng/SourcePackage.netframework.editorconfig
new file mode 100644
index 000000000000..e9cd67ee9fbd
--- /dev/null
+++ b/eng/SourcePackage.netframework.editorconfig
@@ -0,0 +1,21 @@
+# Remove the line below if you want to inherit .editorconfig settings from higher directories
+root = true
+
+# C# files
+[*.cs]
+
+# We don't want any analyzer diagnostics to be reported for people consuming this as a source package.
+dotnet_analyzer_diagnostic.severity = none
+
+generated_code = true
+
+# The above configurations don't apply to compiler warnings.  Requiring all params to be documented
+# is not something we require for this project, so suppressing it directly here.
+dotnet_diagnostic.CS1573.severity = none
+
+# As above, we need to specifically disable compiler warnings that we don't want to break downstream
+# builds
+dotnet_diagnostic.IDE0005.severity = none
+
+# Disable nullability checks when targeting .NET Framework
+dotnet_diagnostic.CS8604.severity = none
\ No newline at end of file
diff --git a/src/BuiltInTools/dotnet-watch/HotReload/AppModels/HotReloadAppModel.cs b/src/BuiltInTools/dotnet-watch/HotReload/AppModels/HotReloadAppModel.cs
index 37502de871c7..7a205a8d1fce 100644
--- a/src/BuiltInTools/dotnet-watch/HotReload/AppModels/HotReloadAppModel.cs
+++ b/src/BuiltInTools/dotnet-watch/HotReload/AppModels/HotReloadAppModel.cs
@@ -16,13 +16,7 @@ protected static string GetInjectedAssemblyPath(string targetFramework, string a
 
     public static string GetStartupHookPath(ProjectGraphNode project)
     {
-        var hookTargetFramework = project.GetTargetFramework() switch
-        {
-            // Note: Hot Reload is only supported on net6.0+
-            "net6.0" or "net7.0" or "net8.0" or "net9.0" => "net6.0",
-            _ => "net10.0",
-        };
-
+        var hookTargetFramework = project.GetTargetFrameworkVersion() is { Major: >= 10 } ? "net10.0" : "net6.0";
         return GetInjectedAssemblyPath(hookTargetFramework, "Microsoft.Extensions.DotNetDeltaApplier");
     }
 

From a2197324e21c8a3c6e9753c8747373306440e9ff Mon Sep 17 00:00:00 2001
From: Youssef Victor <youssefvictor00@gmail.com>
Date: Wed, 10 Sep 2025 20:27:30 +0200
Subject: [PATCH 10/11] Update test command to use global.json (#50673)

---
 Directory.Packages.props                      |   1 -
 .../Components.cs                             |   1 -
 .../LocalizableStrings.Designer.cs            |  45 ----
 .../LocalizableStrings.resx                   |  21 +-
 .../Microsoft.TemplateEngine.Cli.csproj       |   1 -
 .../AddJsonPropertyPostActionProcessor.cs     |  46 +++-
 ...OrUpdateDotnetConfigPostActionProcessor.cs | 131 ----------
 .../xlf/LocalizableStrings.cs.xlf             |  25 --
 .../xlf/LocalizableStrings.de.xlf             |  25 --
 .../xlf/LocalizableStrings.es.xlf             |  25 --
 .../xlf/LocalizableStrings.fr.xlf             |  25 --
 .../xlf/LocalizableStrings.it.xlf             |  25 --
 .../xlf/LocalizableStrings.ja.xlf             |  25 --
 .../xlf/LocalizableStrings.ko.xlf             |  25 --
 .../xlf/LocalizableStrings.pl.xlf             |  25 --
 .../xlf/LocalizableStrings.pt-BR.xlf          |  25 --
 .../xlf/LocalizableStrings.ru.xlf             |  25 --
 .../xlf/LocalizableStrings.tr.xlf             |  25 --
 .../xlf/LocalizableStrings.zh-Hans.xlf        |  25 --
 .../xlf/LocalizableStrings.zh-Hant.xlf        |  25 --
 .../dotnet/Commands/CliCommandStrings.resx    |   7 +-
 .../dotnet/Commands/Test/TestCommandParser.cs |  57 +++--
 .../Commands/xlf/CliCommandStrings.cs.xlf     |   9 +-
 .../Commands/xlf/CliCommandStrings.de.xlf     |   9 +-
 .../Commands/xlf/CliCommandStrings.es.xlf     |   9 +-
 .../Commands/xlf/CliCommandStrings.fr.xlf     |   9 +-
 .../Commands/xlf/CliCommandStrings.it.xlf     |   9 +-
 .../Commands/xlf/CliCommandStrings.ja.xlf     |   9 +-
 .../Commands/xlf/CliCommandStrings.ko.xlf     |   9 +-
 .../Commands/xlf/CliCommandStrings.pl.xlf     |   9 +-
 .../Commands/xlf/CliCommandStrings.pt-BR.xlf  |   9 +-
 .../Commands/xlf/CliCommandStrings.ru.xlf     |   9 +-
 .../Commands/xlf/CliCommandStrings.tr.xlf     |   9 +-
 .../xlf/CliCommandStrings.zh-Hans.xlf         |   9 +-
 .../xlf/CliCommandStrings.zh-Hant.xlf         |   9 +-
 src/Cli/dotnet/dotnet.csproj                  |   1 -
 .../localize/templatestrings.cs.json          |   4 +-
 .../localize/templatestrings.de.json          |   4 +-
 .../localize/templatestrings.en.json          |   4 +-
 .../localize/templatestrings.es.json          |   4 +-
 .../localize/templatestrings.fr.json          |   4 +-
 .../localize/templatestrings.it.json          |   4 +-
 .../localize/templatestrings.ja.json          |   4 +-
 .../localize/templatestrings.ko.json          |   4 +-
 .../localize/templatestrings.pl.json          |   4 +-
 .../localize/templatestrings.pt-BR.json       |   4 +-
 .../localize/templatestrings.ru.json          |   4 +-
 .../localize/templatestrings.tr.json          |   4 +-
 .../localize/templatestrings.zh-Hans.json     |   4 +-
 .../localize/templatestrings.zh-Hant.json     |   4 +-
 .../.template.config/template.json            |  18 +-
 .../localize/templatestrings.cs.json          |   4 +-
 .../localize/templatestrings.de.json          |   4 +-
 .../localize/templatestrings.en.json          |   4 +-
 .../localize/templatestrings.es.json          |   4 +-
 .../localize/templatestrings.fr.json          |   4 +-
 .../localize/templatestrings.it.json          |   4 +-
 .../localize/templatestrings.ja.json          |   4 +-
 .../localize/templatestrings.ko.json          |   4 +-
 .../localize/templatestrings.pl.json          |   4 +-
 .../localize/templatestrings.pt-BR.json       |   4 +-
 .../localize/templatestrings.ru.json          |   4 +-
 .../localize/templatestrings.tr.json          |   4 +-
 .../localize/templatestrings.zh-Hans.json     |   4 +-
 .../localize/templatestrings.zh-Hant.json     |   4 +-
 .../.template.config/template.json            |  18 +-
 .../localize/templatestrings.cs.json          |   4 +-
 .../localize/templatestrings.de.json          |   4 +-
 .../localize/templatestrings.en.json          |   4 +-
 .../localize/templatestrings.es.json          |   4 +-
 .../localize/templatestrings.fr.json          |   4 +-
 .../localize/templatestrings.it.json          |   4 +-
 .../localize/templatestrings.ja.json          |   4 +-
 .../localize/templatestrings.ko.json          |   4 +-
 .../localize/templatestrings.pl.json          |   4 +-
 .../localize/templatestrings.pt-BR.json       |   4 +-
 .../localize/templatestrings.ru.json          |   4 +-
 .../localize/templatestrings.tr.json          |   4 +-
 .../localize/templatestrings.zh-Hans.json     |   4 +-
 .../localize/templatestrings.zh-Hant.json     |   4 +-
 .../.template.config/template.json            |  18 +-
 .../localize/templatestrings.cs.json          |   4 +-
 .../localize/templatestrings.de.json          |   4 +-
 .../localize/templatestrings.en.json          |   4 +-
 .../localize/templatestrings.es.json          |   4 +-
 .../localize/templatestrings.fr.json          |   4 +-
 .../localize/templatestrings.it.json          |   4 +-
 .../localize/templatestrings.ja.json          |   4 +-
 .../localize/templatestrings.ko.json          |   4 +-
 .../localize/templatestrings.pl.json          |   4 +-
 .../localize/templatestrings.pt-BR.json       |   4 +-
 .../localize/templatestrings.ru.json          |   4 +-
 .../localize/templatestrings.tr.json          |   4 +-
 .../localize/templatestrings.zh-Hans.json     |   4 +-
 .../localize/templatestrings.zh-Hant.json     |   4 +-
 .../.template.config/template.json            |  18 +-
 .../XUnit-CSharp/Company.TestProject1.csproj  |   2 +-
 .../XUnit-FSharp/Company.TestProject1.fsproj  |   2 +-
 .../Company.TestProject1.vbproj               |   2 +-
 .../AddJsonPropertyPostActionTests.cs         |  82 +++++++
 ...eateOrUpdateDotnetConfigPostActionTests.cs | 223 ------------------
 .../.template.config/template.json            |  29 ---
 .../AddNewSection/AddNewSection.csproj        |   8 -
 .../AddNewSection/Program.cs                  |  14 --
 .../AddNewSection/dotnet.config               |   2 -
 .../.template.config/template.json            |  29 ---
 .../CreateNonExisting.csproj                  |   8 -
 .../CreateNonExisting/Program.cs              |  14 --
 .../dotnet.config                             |   2 -
 .../global.json                               |   5 +
 .../ConsoleAppDoesNothing/dotnet.config       |   2 -
 .../ConsoleAppDoesNothing/global.json         |   5 +
 .../TestProjects/EmptyFolder/dotnet.config    |   2 -
 .../TestProjects/EmptyFolder/global.json      |   5 +
 .../dotnet.config                             |   2 -
 .../HybridTestRunnerTestProjects/global.json  |   5 +
 .../dotnet.config                             |   2 -
 .../global.json                               |   5 +
 .../dotnet.config                             |   2 -
 .../global.json                               |   5 +
 .../dotnet.config                             |   2 -
 .../global.json                               |   5 +
 .../dotnet.config                             |   2 -
 .../global.json                               |   5 +
 .../MultipleTestProjectSolution/dotnet.config |   2 -
 .../MultipleTestProjectSolution/global.json   |   5 +
 .../dotnet.config                             |   2 -
 .../global.json                               |   5 +
 .../dotnet.config                             |   2 -
 .../global.json                               |   5 +
 .../dotnet.config                             |   2 -
 .../global.json                               |   5 +
 .../TestAppSimpleWithRetry/dotnet.config      |   2 -
 .../TestAppSimpleWithRetry/global.json        |   5 +
 .../TestProjectMTPCrash/dotnet.config         |   2 -
 .../TestProjectMTPCrash/global.json           |   5 +
 .../dotnet.config                             |   2 -
 .../global.json                               |   5 +
 .../TestProjectSolution/dotnet.config         |   2 -
 .../TestProjectSolution/global.json           |   5 +
 .../dotnet.config                             |   2 -
 .../global.json                               |   5 +
 .../dotnet.config                             |   2 -
 .../global.json                               |   5 +
 .../dotnet.config                             |   2 -
 .../global.json                               |   5 +
 .../TestProjectWithClassLibrary/dotnet.config |   2 -
 .../TestProjectWithClassLibrary/global.json   |   5 +
 .../dotnet.config                             |   2 -
 .../global.json                               |   5 +
 .../dotnet.config                             |   2 -
 .../global.json                               |   5 +
 .../dotnet.config                             |   2 -
 .../global.json                               |   5 +
 .../dotnet.config                             |   2 -
 .../TestProjectWithLaunchSettings/global.json |   5 +
 .../dotnet.config                             |   2 -
 .../global.json                               |   5 +
 .../dotnet.config                             |   2 -
 .../global.json                               |   5 +
 .../TestProjectWithTests/dotnet.config        |   2 -
 .../TestProjectWithTests/global.json          |   5 +
 ...ledPackage_LocalPackage.Linux.verified.txt |   2 -
 ...alledPackage_LocalPackage.OSX.verified.txt |   2 -
 ...dPackage_LocalPackage.Windows.verified.txt |   2 -
 ...InstalledPackage_LocalPackage.verified.txt |   2 -
 .../DotnetNewTestTemplatesTests.cs            |   4 +-
 .../PostActionTests.cs                        |  68 ------
 .../Test/TestCommandValidationTests.cs        |  27 ++-
 169 files changed, 529 insertions(+), 1231 deletions(-)
 delete mode 100644 src/Cli/Microsoft.TemplateEngine.Cli/PostActionProcessors/CreateOrUpdateDotnetConfigPostActionProcessor.cs
 delete mode 100644 test/Microsoft.TemplateEngine.Cli.UnitTests/PostActionTests/CreateOrUpdateDotnetConfigPostActionTests.cs
 delete mode 100644 test/TestAssets/TestPackages/dotnet-new/test_templates/PostActions/CreateOrUpdateDotnetConfig/AddNewSection/.template.config/template.json
 delete mode 100644 test/TestAssets/TestPackages/dotnet-new/test_templates/PostActions/CreateOrUpdateDotnetConfig/AddNewSection/AddNewSection.csproj
 delete mode 100644 test/TestAssets/TestPackages/dotnet-new/test_templates/PostActions/CreateOrUpdateDotnetConfig/AddNewSection/Program.cs
 delete mode 100644 test/TestAssets/TestPackages/dotnet-new/test_templates/PostActions/CreateOrUpdateDotnetConfig/AddNewSection/dotnet.config
 delete mode 100644 test/TestAssets/TestPackages/dotnet-new/test_templates/PostActions/CreateOrUpdateDotnetConfig/CreateNonExisting/.template.config/template.json
 delete mode 100644 test/TestAssets/TestPackages/dotnet-new/test_templates/PostActions/CreateOrUpdateDotnetConfig/CreateNonExisting/CreateNonExisting.csproj
 delete mode 100644 test/TestAssets/TestPackages/dotnet-new/test_templates/PostActions/CreateOrUpdateDotnetConfig/CreateNonExisting/Program.cs
 delete mode 100644 test/TestAssets/TestProjects/ClassLibraryWithIsTestProjectAndOtherTestProjects/dotnet.config
 create mode 100644 test/TestAssets/TestProjects/ClassLibraryWithIsTestProjectAndOtherTestProjects/global.json
 delete mode 100644 test/TestAssets/TestProjects/ConsoleAppDoesNothing/dotnet.config
 create mode 100644 test/TestAssets/TestProjects/ConsoleAppDoesNothing/global.json
 delete mode 100644 test/TestAssets/TestProjects/EmptyFolder/dotnet.config
 create mode 100644 test/TestAssets/TestProjects/EmptyFolder/global.json
 delete mode 100644 test/TestAssets/TestProjects/HybridTestRunnerTestProjects/dotnet.config
 create mode 100644 test/TestAssets/TestProjects/HybridTestRunnerTestProjects/global.json
 delete mode 100644 test/TestAssets/TestProjects/MSTestMetaPackageProjectWithMultipleTFMsSolution/dotnet.config
 create mode 100644 test/TestAssets/TestProjects/MSTestMetaPackageProjectWithMultipleTFMsSolution/global.json
 delete mode 100644 test/TestAssets/TestProjects/MultiTestProjectSolutionWithDifferentFailures/dotnet.config
 create mode 100644 test/TestAssets/TestProjects/MultiTestProjectSolutionWithDifferentFailures/global.json
 delete mode 100644 test/TestAssets/TestProjects/MultiTestProjectSolutionWithDiscoveredTests/dotnet.config
 create mode 100644 test/TestAssets/TestProjects/MultiTestProjectSolutionWithDiscoveredTests/global.json
 delete mode 100644 test/TestAssets/TestProjects/MultiTestProjectSolutionWithTests/dotnet.config
 create mode 100644 test/TestAssets/TestProjects/MultiTestProjectSolutionWithTests/global.json
 delete mode 100644 test/TestAssets/TestProjects/MultipleTestProjectSolution/dotnet.config
 create mode 100644 test/TestAssets/TestProjects/MultipleTestProjectSolution/global.json
 delete mode 100644 test/TestAssets/TestProjects/MultipleTestProjectsWithoutSolution/dotnet.config
 create mode 100644 test/TestAssets/TestProjects/MultipleTestProjectsWithoutSolution/global.json
 delete mode 100644 test/TestAssets/TestProjects/ProjectSolutionForMultipleTFMs/dotnet.config
 create mode 100644 test/TestAssets/TestProjects/ProjectSolutionForMultipleTFMs/global.json
 delete mode 100644 test/TestAssets/TestProjects/TestAppPrintingCommandLineArguments/dotnet.config
 create mode 100644 test/TestAssets/TestProjects/TestAppPrintingCommandLineArguments/global.json
 delete mode 100644 test/TestAssets/TestProjects/TestAppSimpleWithRetry/dotnet.config
 create mode 100644 test/TestAssets/TestProjects/TestAppSimpleWithRetry/global.json
 delete mode 100644 test/TestAssets/TestProjects/TestProjectMTPCrash/dotnet.config
 create mode 100644 test/TestAssets/TestProjects/TestProjectMTPCrash/global.json
 delete mode 100644 test/TestAssets/TestProjects/TestProjectMTPWithUseAppHostFalse/dotnet.config
 create mode 100644 test/TestAssets/TestProjects/TestProjectMTPWithUseAppHostFalse/global.json
 delete mode 100644 test/TestAssets/TestProjects/TestProjectSolution/dotnet.config
 create mode 100644 test/TestAssets/TestProjects/TestProjectSolution/global.json
 delete mode 100644 test/TestAssets/TestProjects/TestProjectSolutionTestingMinimumExpectedTests/dotnet.config
 create mode 100644 test/TestAssets/TestProjects/TestProjectSolutionTestingMinimumExpectedTests/global.json
 delete mode 100644 test/TestAssets/TestProjects/TestProjectSolutionWithCodeCoverage/dotnet.config
 create mode 100644 test/TestAssets/TestProjects/TestProjectSolutionWithCodeCoverage/global.json
 delete mode 100644 test/TestAssets/TestProjects/TestProjectSolutionWithTestsAndArtifacts/dotnet.config
 create mode 100644 test/TestAssets/TestProjects/TestProjectSolutionWithTestsAndArtifacts/global.json
 delete mode 100644 test/TestAssets/TestProjects/TestProjectWithClassLibrary/dotnet.config
 create mode 100644 test/TestAssets/TestProjects/TestProjectWithClassLibrary/global.json
 delete mode 100644 test/TestAssets/TestProjects/TestProjectWithClassLibraryDifferentTFMs/dotnet.config
 create mode 100644 test/TestAssets/TestProjects/TestProjectWithClassLibraryDifferentTFMs/global.json
 delete mode 100644 test/TestAssets/TestProjects/TestProjectWithConditionOnGlobalProperty/dotnet.config
 create mode 100644 test/TestAssets/TestProjects/TestProjectWithConditionOnGlobalProperty/global.json
 delete mode 100644 test/TestAssets/TestProjects/TestProjectWithDiscoveredTests/dotnet.config
 create mode 100644 test/TestAssets/TestProjects/TestProjectWithDiscoveredTests/global.json
 delete mode 100644 test/TestAssets/TestProjects/TestProjectWithLaunchSettings/dotnet.config
 create mode 100644 test/TestAssets/TestProjects/TestProjectWithLaunchSettings/global.json
 delete mode 100644 test/TestAssets/TestProjects/TestProjectWithMultipleTFMsParallelization/dotnet.config
 create mode 100644 test/TestAssets/TestProjects/TestProjectWithMultipleTFMsParallelization/global.json
 delete mode 100644 test/TestAssets/TestProjects/TestProjectWithMultipleTFMsSolution/dotnet.config
 create mode 100644 test/TestAssets/TestProjects/TestProjectWithMultipleTFMsSolution/global.json
 delete mode 100644 test/TestAssets/TestProjects/TestProjectWithTests/dotnet.config
 create mode 100644 test/TestAssets/TestProjects/TestProjectWithTests/global.json

diff --git a/Directory.Packages.props b/Directory.Packages.props
index ab453e50c8c7..788923bf48d6 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -59,7 +59,6 @@
     <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsLoggingAbstractionsVersion)" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsoleVersion)" />
     <PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="$(MicrosoftExtensionsObjectPoolPackageVersion)" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.Ini" Version="$(MicrosoftExtensionsConfigurationIniVersion)" />
     <PackageVersion Include="Microsoft.FSharp.Compiler" Version="$(MicrosoftFSharpCompilerPackageVersion)" />
     <PackageVersion Include="Microsoft.Net.Compilers.Toolset.Framework" Version="$(MicrosoftNetCompilersToolsetFrameworkPackageVersion)" />
     <PackageVersion Include="Microsoft.Management.Infrastructure" Version="3.0.0" />
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/Components.cs b/src/Cli/Microsoft.TemplateEngine.Cli/Components.cs
index 34870595d00e..1a73b2615c39 100644
--- a/src/Cli/Microsoft.TemplateEngine.Cli/Components.cs
+++ b/src/Cli/Microsoft.TemplateEngine.Cli/Components.cs
@@ -15,7 +15,6 @@ public static class Components
                 (typeof(IPostActionProcessor), new InstructionDisplayPostActionProcessor()),
                 (typeof(IPostActionProcessor), new ProcessStartPostActionProcessor()),
                 (typeof(IPostActionProcessor), new AddJsonPropertyPostActionProcessor()),
-                (typeof(IPostActionProcessor), new CreateOrUpdateDotnetConfigPostActionProcessor()),
             };
     }
 }
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/LocalizableStrings.Designer.cs b/src/Cli/Microsoft.TemplateEngine.Cli/LocalizableStrings.Designer.cs
index f7b0a86e0e80..ecf9c58147f5 100644
--- a/src/Cli/Microsoft.TemplateEngine.Cli/LocalizableStrings.Designer.cs
+++ b/src/Cli/Microsoft.TemplateEngine.Cli/LocalizableStrings.Designer.cs
@@ -1403,51 +1403,6 @@ internal static string PossibleValuesHeader {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Created new section in &apos;dotnet.config&apos; file.
-        /// </summary>
-        internal static string PostAction_CreateDotnetConfig_CreatedNewSection {
-            get {
-                return ResourceManager.GetString("PostAction_CreateDotnetConfig_CreatedNewSection", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Updating existing values in &apos;dotnet.config&apos; is not yet supported. Please, manually update &apos;dotnet.config&apos; to have &apos;{0}&apos; under section &apos;{1}&apos;..
-        /// </summary>
-        internal static string PostAction_CreateDotnetConfig_ManuallyUpdate {
-            get {
-                return ResourceManager.GetString("PostAction_CreateDotnetConfig_ManuallyUpdate", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Successfully created &apos;dotnet.config&apos; file..
-        /// </summary>
-        internal static string PostAction_CreateDotnetConfig_Succeeded {
-            get {
-                return ResourceManager.GetString("PostAction_CreateDotnetConfig_Succeeded", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The required value in &apos;dotnet.config&apos; is already set..
-        /// </summary>
-        internal static string PostAction_CreateDotnetConfig_ValueAlreadyExist {
-            get {
-                return ResourceManager.GetString("PostAction_CreateDotnetConfig_ValueAlreadyExist", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Post action argument &apos;{0}&apos; is mandatory, but not configured..
-        /// </summary>
-        internal static string PostAction_DotnetConfig_Error_ArgumentNotConfigured {
-            get {
-                return ResourceManager.GetString("PostAction_DotnetConfig_Error_ArgumentNotConfigured", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Post action argument &apos;{0}&apos; is not a valid boolean value..
         /// </summary>
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/LocalizableStrings.resx b/src/Cli/Microsoft.TemplateEngine.Cli/LocalizableStrings.resx
index d7de5f7d82b2..01b59dfe8833 100644
--- a/src/Cli/Microsoft.TemplateEngine.Cli/LocalizableStrings.resx
+++ b/src/Cli/Microsoft.TemplateEngine.Cli/LocalizableStrings.resx
@@ -953,23 +953,4 @@ The header is followed by the list of parameters and their errors (might be seve
   <data name="PostAction_ModifyJson_Verbose_AttemptingToFindJsonFile" xml:space="preserve">
     <value>Attempting to find json file '{0}' in '{1}'</value>
   </data>
-  <data name="PostAction_DotnetConfig_Error_ArgumentNotConfigured" xml:space="preserve">
-    <value>Post action argument '{0}' is mandatory, but not configured.</value>
-  </data>
-  <data name="PostAction_CreateDotnetConfig_Succeeded" xml:space="preserve">
-    <value>Successfully created 'dotnet.config' file.</value>
-    <comment>{Locked="dotnet.config"}</comment>
-  </data>
-  <data name="PostAction_CreateDotnetConfig_CreatedNewSection" xml:space="preserve">
-    <value>Created new section in 'dotnet.config' file</value>
-    <comment>{Locked="dotnet.config"}</comment>
-  </data>
-  <data name="PostAction_CreateDotnetConfig_ValueAlreadyExist" xml:space="preserve">
-    <value>The required value in 'dotnet.config' is already set.</value>
-    <comment>{Locked="dotnet.config"}</comment>
-  </data>
-  <data name="PostAction_CreateDotnetConfig_ManuallyUpdate" xml:space="preserve">
-    <value>Updating existing values in 'dotnet.config' is not yet supported. Please, manually update 'dotnet.config' to have '{0}' under section '{1}'.</value>
-    <comment>{Locked="dotnet.config"}</comment>
-  </data>
-</root>
\ No newline at end of file
+</root>
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/Microsoft.TemplateEngine.Cli.csproj b/src/Cli/Microsoft.TemplateEngine.Cli/Microsoft.TemplateEngine.Cli.csproj
index d8fb3406268a..228c9cd613d2 100644
--- a/src/Cli/Microsoft.TemplateEngine.Cli/Microsoft.TemplateEngine.Cli.csproj
+++ b/src/Cli/Microsoft.TemplateEngine.Cli/Microsoft.TemplateEngine.Cli.csproj
@@ -16,7 +16,6 @@
     <PackageReference Include="Microsoft.TemplateEngine.Edge" />
     <PackageReference Include="Microsoft.TemplateSearch.Common" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Ini" />
     <PackageReference Include="Wcwidth.Sources" ExcludeAssets="all" GeneratePathProperty="true" />
     <PackageReference Include="System.CommandLine" />
   </ItemGroup>
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/PostActionProcessors/AddJsonPropertyPostActionProcessor.cs b/src/Cli/Microsoft.TemplateEngine.Cli/PostActionProcessors/AddJsonPropertyPostActionProcessor.cs
index 68a0855d97ef..80ca23402914 100644
--- a/src/Cli/Microsoft.TemplateEngine.Cli/PostActionProcessors/AddJsonPropertyPostActionProcessor.cs
+++ b/src/Cli/Microsoft.TemplateEngine.Cli/PostActionProcessors/AddJsonPropertyPostActionProcessor.cs
@@ -19,6 +19,7 @@ internal class AddJsonPropertyPostActionProcessor : PostActionProcessorBase
         private const string ParentPropertyPathArgument = "parentPropertyPath";
         private const string NewJsonPropertyNameArgument = "newJsonPropertyName";
         private const string NewJsonPropertyValueArgument = "newJsonPropertyValue";
+        private const string DetectRepoRootForFileCreation = "detectRepositoryRootForFileCreation";
 
         private static readonly JsonSerializerOptions SerializerOptions = new()
         {
@@ -36,6 +37,43 @@ internal class AddJsonPropertyPostActionProcessor : PostActionProcessorBase
 
         internal static Guid ActionProcessorId { get; } = new Guid("695A3659-EB40-4FF5-A6A6-C9C4E629FCB0");
 
+        internal static string GetRootDirectory(IPhysicalFileSystem fileSystem, string outputBasePath)
+        {
+            string? currentDirectory = outputBasePath;
+            string? directoryWithSln = null;
+            while (currentDirectory is not null)
+            {
+                if (fileSystem.FileExists(Path.Combine(currentDirectory, "global.json")) ||
+                    fileSystem.FileExists(Path.Combine(currentDirectory, ".git")) ||
+                    fileSystem.DirectoryExists(Path.Combine(currentDirectory, ".git")))
+                {
+                    // If we found global.json or .git, we immediately return the directory as the repo root.
+                    // We won't go up any further.
+                    return currentDirectory;
+                }
+
+                // DirectoryExists here should always be true in practice, but for the way tests are mocking the file system, it's not.
+                // The check was added to prevent test failures similar to:
+                // System.IO.DirectoryNotFoundException : Could not find a part of the path '/Users/runner/work/1/s/artifacts/bin/Microsoft.TemplateEngine.Cli.UnitTests/Release/sandbox'.
+                // We get to this exception when doing `EnumerateFiles` on a directory that was virtually created in memory (not really available on disk).
+                // EnumerateFiles tries to access the physical file system, which then fails.
+                if (fileSystem.DirectoryExists(currentDirectory) &&
+                    (fileSystem.EnumerateFiles(currentDirectory, "*.sln", SearchOption.TopDirectoryOnly).Any() ||
+                    fileSystem.EnumerateFiles(currentDirectory, "*.slnx", SearchOption.TopDirectoryOnly).Any()))
+                {
+                    directoryWithSln = currentDirectory;
+                }
+
+                currentDirectory = Directory.GetParent(currentDirectory)?.FullName;
+            }
+
+            // If we reach here, that means we didn't find .git or global.json.
+            // So, we return the directory where we found a .sln/.slnx file, if any.
+            // Note that when we keep track of directoryWithSln, we keep updating it from sln/slnx from parent directories, if found.
+            // This means that if there are multiple .sln/.slnx files in the parent directories, we will return the top-most one.
+            return directoryWithSln ?? outputBasePath;
+        }
+
         protected override bool ProcessInternal(
             IEngineEnvironmentSettings environment,
             IPostAction action,
@@ -65,7 +103,13 @@ protected override bool ProcessInternal(
                     return false;
                 }
 
-                string newJsonFilePath = Path.Combine(outputBasePath, jsonFileName);
+                if (!bool.TryParse(action.Args.GetValueOrDefault(DetectRepoRootForFileCreation, "false"), out bool detectRepoRoot))
+                {
+                    Reporter.Error.WriteLine(string.Format(LocalizableStrings.PostAction_ModifyJson_Error_ArgumentNotBoolean, DetectRepoRootForFileCreation));
+                    return false;
+                }
+
+                string newJsonFilePath = Path.Combine(detectRepoRoot ? GetRootDirectory(environment.Host.FileSystem, outputBasePath) : outputBasePath, jsonFileName);
                 environment.Host.FileSystem.WriteAllText(newJsonFilePath, "{}");
                 jsonFiles = new List<string> { newJsonFilePath };
             }
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/PostActionProcessors/CreateOrUpdateDotnetConfigPostActionProcessor.cs b/src/Cli/Microsoft.TemplateEngine.Cli/PostActionProcessors/CreateOrUpdateDotnetConfigPostActionProcessor.cs
deleted file mode 100644
index 9afbf5e899a0..000000000000
--- a/src/Cli/Microsoft.TemplateEngine.Cli/PostActionProcessors/CreateOrUpdateDotnetConfigPostActionProcessor.cs
+++ /dev/null
@@ -1,131 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using Microsoft.DotNet.Cli.Utils;
-using Microsoft.Extensions.Configuration;
-using Microsoft.TemplateEngine.Abstractions;
-using Microsoft.TemplateEngine.Abstractions.PhysicalFileSystem;
-
-namespace Microsoft.TemplateEngine.Cli.PostActionProcessors
-{
-    internal sealed class CreateOrUpdateDotnetConfigPostActionProcessor : PostActionProcessorBase
-    {
-        private const string SectionArgument = "section";
-        private const string KeyArgument = "key";
-        private const string ValueArgument = "value";
-
-        public override Guid Id => ActionProcessorId;
-
-        internal static Guid ActionProcessorId { get; } = new Guid("597E7933-0D87-452C-B094-8FA0EEF7FD97");
-
-        protected override bool ProcessInternal(
-            IEngineEnvironmentSettings environment,
-            IPostAction action,
-            ICreationEffects creationEffects,
-            ICreationResult templateCreationResult,
-            string outputBasePath)
-        {
-            if (!action.Args.TryGetValue(SectionArgument, out string? sectionName))
-            {
-                Reporter.Error.WriteLine(string.Format(LocalizableStrings.PostAction_DotnetConfig_Error_ArgumentNotConfigured, SectionArgument));
-                return false;
-            }
-
-            if (!action.Args.TryGetValue(KeyArgument, out string? key))
-            {
-                Reporter.Error.WriteLine(string.Format(LocalizableStrings.PostAction_DotnetConfig_Error_ArgumentNotConfigured, KeyArgument));
-                return false;
-            }
-
-            if (!action.Args.TryGetValue(ValueArgument, out string? value))
-            {
-                Reporter.Error.WriteLine(string.Format(LocalizableStrings.PostAction_DotnetConfig_Error_ArgumentNotConfigured, ValueArgument));
-                return false;
-            }
-
-            var fileSystem = environment.Host.FileSystem;
-            var repoRoot = GetRootDirectory(fileSystem, outputBasePath);
-            var dotnetConfigFilePath = Path.Combine(repoRoot, "dotnet.config");
-            if (!fileSystem.FileExists(dotnetConfigFilePath))
-            {
-                fileSystem.WriteAllText(dotnetConfigFilePath, $"""
-                    [{sectionName}]
-                    {key} = "{value}"
-
-                    """);
-
-                Reporter.Output.WriteLine(LocalizableStrings.PostAction_CreateDotnetConfig_Succeeded);
-                return true;
-            }
-
-            var builder = new ConfigurationBuilder();
-            using var stream = fileSystem.OpenRead(dotnetConfigFilePath);
-            builder.AddIniStream(stream);
-            IConfigurationRoot config = builder.Build();
-            var section = config.GetSection(sectionName);
-
-            if (!section.Exists())
-            {
-                var existingContent = fileSystem.ReadAllText(dotnetConfigFilePath);
-                fileSystem.WriteAllText(dotnetConfigFilePath, $"""
-                    {existingContent}
-
-                    [{sectionName}]
-                    {key} = "{value}"
-
-                    """);
-
-                Reporter.Output.WriteLine(LocalizableStrings.PostAction_CreateDotnetConfig_CreatedNewSection);
-                return true;
-            }
-
-            string? existingValue = section[key];
-            if (string.IsNullOrEmpty(existingValue))
-            {
-                // The section exists, but the key/value pair does not.
-                Reporter.Error.WriteLine(string.Format(LocalizableStrings.PostAction_CreateDotnetConfig_ManuallyUpdate, $"{key} = \"{value}\"", $"[{sectionName}]"));
-                return false;
-            }
-
-            if (existingValue.Equals(value, StringComparison.Ordinal))
-            {
-                // The key already exists with the same value, nothing to do.
-                Reporter.Output.WriteLine(LocalizableStrings.PostAction_CreateDotnetConfig_ValueAlreadyExist);
-                return true;
-            }
-
-            Reporter.Error.WriteLine(string.Format(LocalizableStrings.PostAction_CreateDotnetConfig_ManuallyUpdate, $"{key} = \"{value}\"", $"[{sectionName}]"));
-            return false;
-        }
-
-        private static string GetRootDirectory(IPhysicalFileSystem fileSystem, string outputBasePath)
-        {
-            string? currentDirectory = outputBasePath;
-            string? directoryWithSln = null;
-            while (currentDirectory is not null)
-            {
-                if (fileSystem.FileExists(Path.Combine(currentDirectory, "dotnet.config")) ||
-                    fileSystem.DirectoryExists(Path.Combine(currentDirectory, ".git")))
-                {
-                    return currentDirectory;
-                }
-
-                // DirectoryExists here should always be true in practice, but for the way tests are mocking the file system, it's not.
-                // The check was added to prevent test failures similar to:
-                // System.IO.DirectoryNotFoundException : Could not find a part of the path '/Users/runner/work/1/s/artifacts/bin/Microsoft.TemplateEngine.Cli.UnitTests/Release/sandbox'.
-                // We get to this exception when doing `EnumerateFiles` on a directory that was virtually created in memory (not really available on disk).
-                // EnumerateFiles tries to access the physical file system, which then fails.
-                if (fileSystem.DirectoryExists(currentDirectory) &&
-                    (fileSystem.EnumerateFiles(currentDirectory, "*.sln", SearchOption.TopDirectoryOnly).Any() ||
-                    fileSystem.EnumerateFiles(currentDirectory, "*.slnx", SearchOption.TopDirectoryOnly).Any()))
-                {
-                    directoryWithSln = currentDirectory;
-                }
-
-                currentDirectory = Directory.GetParent(currentDirectory)?.FullName;
-            }
-
-            return directoryWithSln ?? outputBasePath;
-        }
-    }
-}
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/xlf/LocalizableStrings.cs.xlf b/src/Cli/Microsoft.TemplateEngine.Cli/xlf/LocalizableStrings.cs.xlf
index 39bd00e9d35f..45f6d58a1ba7 100644
--- a/src/Cli/Microsoft.TemplateEngine.Cli/xlf/LocalizableStrings.cs.xlf
+++ b/src/Cli/Microsoft.TemplateEngine.Cli/xlf/LocalizableStrings.cs.xlf
@@ -830,31 +830,6 @@ The header is followed by the list of parameters and their errors (might be seve
         <target state="translated">Chcete tuto akci spustit? [{0}(ano)|{1}(ne)]</target>
         <note />
       </trans-unit>
-      <trans-unit id="PostAction_CreateDotnetConfig_CreatedNewSection">
-        <source>Created new section in 'dotnet.config' file</source>
-        <target state="translated">V souboru dotnet.config se vytvořil nový oddíl.</target>
-        <note>{Locked="dotnet.config"}</note>
-      </trans-unit>
-      <trans-unit id="PostAction_CreateDotnetConfig_ManuallyUpdate">
-        <source>Updating existing values in 'dotnet.config' is not yet supported. Please, manually update 'dotnet.config' to have '{0}' under section '{1}'.</source>
-        <target state="translated">Aktualizace existujících hodnot v souboru dotnet.config se zatím nepodporuje. Ručně prosím aktualizujte soubor dotnet.config, aby obsahoval {0} v oddílu {1}.</target>
-        <note>{Locked="dotnet.config"}</note>
-      </trans-unit>
-      <trans-unit id="PostAction_CreateDotnetConfig_Succeeded">
-        <source>Successfully created 'dotnet.config' file.</source>
-        <target state="translated">Soubor dotnet.config se úspěšně vytvořil.</target>
-        <note>{Locked="dotnet.config"}</note>
-      </trans-unit>
-      <trans-unit id="PostAction_CreateDotnetConfig_ValueAlreadyExist">
-        <source>The required value in 'dotnet.config' is already set.</source>
-        <target state="translated">Požadovaná hodnota v souboru dotnet.config je již nastavena.</target>
-        <note>{Locked="dotnet.config"}</note>
-      </trans-unit>
-      <trans-unit id="PostAction_DotnetConfig_Error_ArgumentNotConfigured">
-        <source>Post action argument '{0}' is mandatory, but not configured.</source>
-        <target state="translated">Argument „{0}“ po akci je povinný, ale není nakonfigurovaný.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="PostAction_ModifyJson_Error_ArgumentNotBoolean">
         <source>Post action argument '{0}' is not a valid boolean value.</source>
         <target state="translated">Argument post-action {0} není platná logická hodnota.</target>
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/xlf/LocalizableStrings.de.xlf b/src/Cli/Microsoft.TemplateEngine.Cli/xlf/LocalizableStrings.de.xlf
index 2e62d4b04a4c..eb67ab8bf9bf 100644
--- a/src/Cli/Microsoft.TemplateEngine.Cli/xlf/LocalizableStrings.de.xlf
+++ b/src/Cli/Microsoft.TemplateEngine.Cli/xlf/LocalizableStrings.de.xlf
@@ -830,31 +830,6 @@ The header is followed by the list of parameters and their errors (might be seve
         <target state="translated">Möchten Sie diese Aktion ausführen [{0} (ja) |{1} (nein)]?</target>
         <note />
       </trans-unit>
-      <trans-unit id="PostAction_CreateDotnetConfig_CreatedNewSection">
-        <source>Created new section in 'dotnet.config' file</source>
-        <target state="translated">Neuer Abschnitt in der dotnet.config-Datei erstellt</target>
-        <note>{Locked="dotnet.config"}</note>
-      </trans-unit>
-      <trans-unit id="PostAction_CreateDotnetConfig_ManuallyUpdate">
-        <source>Updating existing values in 'dotnet.config' is not yet supported. Please, manually update 'dotnet.config' to have '{0}' under section '{1}'.</source>
-        <target state="translated">Das Aktualisieren vorhandener Werte in „dotnet.config“ wird noch nicht unterstützt. Aktualisieren Sie „dotnet.config“ manuell, damit „{0}“ im Abschnitt „{1}“ vorhanden ist.</target>
-        <note>{Locked="dotnet.config"}</note>
-      </trans-unit>
-      <trans-unit id="PostAction_CreateDotnetConfig_Succeeded">
-        <source>Successfully created 'dotnet.config' file.</source>
-        <target state="translated">Die dotnet.config-Datei wurde erfolgreich erstellt.</target>
-        <note>{Locked="dotnet.config"}</note>
-      </trans-unit>
-      <trans-unit id="PostAction_CreateDotnetConfig_ValueAlreadyExist">
-        <source>The required value in 'dotnet.config' is already set.</source>
-        <target state="translated">Der erforderliche Wert in „dotnet.config“ ist bereits festgelegt.</target>
-        <note>{Locked="dotnet.config"}</note>
-      </trans-unit>
-      <trans-unit id="PostAction_DotnetConfig_Error_ArgumentNotConfigured">
-        <source>Post action argument '{0}' is mandatory, but not configured.</source>
-        <target state="translated">Das Postaktionsargument "{0}" ist obligatorisch, aber nicht konfiguriert.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="PostAction_ModifyJson_Error_ArgumentNotBoolean">
         <source>Post action argument '{0}' is not a valid boolean value.</source>
         <target state="translated">Das Post-Aktionsargument „{0}“ ist kein gültiger boolescher Wert.</target>
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/xlf/LocalizableStrings.es.xlf b/src/Cli/Microsoft.TemplateEngine.Cli/xlf/LocalizableStrings.es.xlf
index f0826c732183..748e66f30a00 100644
--- a/src/Cli/Microsoft.TemplateEngine.Cli/xlf/LocalizableStrings.es.xlf
+++ b/src/Cli/Microsoft.TemplateEngine.Cli/xlf/LocalizableStrings.es.xlf
@@ -830,31 +830,6 @@ The header is followed by the list of parameters and their errors (might be seve
         <target state="translated">¿Quiere ejecutar esta acción [{0}(yes)|{1}(no)]?</target>
         <note />
       </trans-unit>
-      <trans-unit id="PostAction_CreateDotnetConfig_CreatedNewSection">
-        <source>Created new section in 'dotnet.config' file</source>
-        <target state="translated">Se ha creado una nueva sección en el archivo "dotnet.config"</target>
-        <note>{Locked="dotnet.config"}</note>
-      </trans-unit>
-      <trans-unit id="PostAction_CreateDotnetConfig_ManuallyUpdate">
-        <source>Updating existing values in 'dotnet.config' is not yet supported. Please, manually update 'dotnet.config' to have '{0}' under section '{1}'.</source>
-        <target state="translated">Aún no se admite la actualización de los valores existentes en "dotnet.config". Actualice manualmente "dotnet.config" para que tenga "{0}" en la sección "{1}".</target>
-        <note>{Locked="dotnet.config"}</note>
-      </trans-unit>
-      <trans-unit id="PostAction_CreateDotnetConfig_Succeeded">
-        <source>Successfully created 'dotnet.config' file.</source>
-        <target state="translated">El archivo "dotnet.config" se creó correctamente.</target>
-        <note>{Locked="dotnet.config"}</note>
-      </trans-unit>
-      <trans-unit id="PostAction_CreateDotnetConfig_ValueAlreadyExist">
-        <source>The required value in 'dotnet.config' is already set.</source>
-        <target state="translated">El valor requerido en "dotnet.config" ya está establecido.</target>
-        <note>{Locked="dotnet.config"}</note>
-      </trans-unit>
-      <trans-unit id="PostAction_DotnetConfig_Error_ArgumentNotConfigured">
-        <source>Post action argument '{0}' is mandatory, but not configured.</source>
-        <target state="translated">El argumento de acción posterior '{0}' es obligatorio, pero no está configurado.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="PostAction_ModifyJson_Error_ArgumentNotBoolean">
         <source>Post action argument '{0}' is not a valid boolean value.</source>
         <target state="translated">El argumento de la acción publicado '{0}' no es un valor booleano válido.</target>
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/xlf/LocalizableStrings.fr.xlf b/src/Cli/Microsoft.TemplateEngine.Cli/xlf/LocalizableStrings.fr.xlf
index 204d36b66c5a..d86722e36e60 100644
--- a/src/Cli/Microsoft.TemplateEngine.Cli/xlf/LocalizableStrings.fr.xlf
+++ b/src/Cli/Microsoft.TemplateEngine.Cli/xlf/LocalizableStrings.fr.xlf
@@ -830,31 +830,6 @@ The header is followed by the list of parameters and their errors (might be seve
         <target state="translated">Voulez-vous exécuter cette action [{0} (yes) |{1} (no)] ?</target>
         <note />
       </trans-unit>
-      <trans-unit id="PostAction_CreateDotnetConfig_CreatedNewSection">
-        <source>Created new section in 'dotnet.config' file</source>
-        <target state="translated">Création d'une nouvelle section dans le fichier « dotnet.config »</target>
-        <note>{Locked="dotnet.config"}</note>
-      </trans-unit>
-      <trans-unit id="PostAction_CreateDotnetConfig_ManuallyUpdate">
-        <source>Updating existing values in 'dotnet.config' is not yet supported. Please, manually update 'dotnet.config' to have '{0}' under section '{1}'.</source>
-        <target state="translated">La mise à jour des valeurs existantes dans « dotnet.config » n'est pas encore prise en charge. Veuillez mettre à jour manuellement 'dotnet.config' pour avoir '{0}' sous la section '{1}'.</target>
-        <note>{Locked="dotnet.config"}</note>
-      </trans-unit>
-      <trans-unit id="PostAction_CreateDotnetConfig_Succeeded">
-        <source>Successfully created 'dotnet.config' file.</source>
-        <target state="translated">Fichier « dotnet.config » créé avec succès.</target>
-        <note>{Locked="dotnet.config"}</note>
-      </trans-unit>
-      <trans-unit id="PostAction_CreateDotnetConfig_ValueAlreadyExist">
-        <source>The required value in 'dotnet.config' is already set.</source>
-        <target state="translated">La valeur requise dans « dotnet.config » est déjà définie.</target>
-        <note>{Locked="dotnet.config"}</note>
-      </trans-unit>
-      <trans-unit id="PostAction_DotnetConfig_Error_ArgumentNotConfigured">
-        <source>Post action argument '{0}' is mandatory, but not configured.</source>
-        <target state="translated">L'argument de publication de l'action '{0}' est obligatoire, mais n'est pas configuré.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="PostAction_ModifyJson_Error_ArgumentNotBoolean">
         <source>Post action argument '{0}' is not a valid boolean value.</source>
         <target state="translated">L’argument post-action « {0} » n’est pas une valeur booléenne valide.</target>
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/xlf/LocalizableStrings.it.xlf b/src/Cli/Microsoft.TemplateEngine.Cli/xlf/LocalizableStrings.it.xlf
index a1794531a180..45d8e4f02e4e 100644
--- a/src/Cli/Microsoft.TemplateEngine.Cli/xlf/LocalizableStrings.it.xlf
+++ b/src/Cli/Microsoft.TemplateEngine.Cli/xlf/LocalizableStrings.it.xlf
@@ -830,31 +830,6 @@ The header is followed by the list of parameters and their errors (might be seve
         <target state="translated">Eseguire questa azione [{0} (sì) |{1} (no)]?</target>
         <note />
       </trans-unit>
-      <trans-unit id="PostAction_CreateDotnetConfig_CreatedNewSection">
-        <source>Created new section in 'dotnet.config' file</source>
-        <target state="translated">Nuova sezione aggiunta al file ''dotnet.config''</target>
-        <note>{Locked="dotnet.config"}</note>
-      </trans-unit>
-      <trans-unit id="PostAction_CreateDotnetConfig_ManuallyUpdate">
-        <source>Updating existing values in 'dotnet.config' is not yet supported. Please, manually update 'dotnet.config' to have '{0}' under section '{1}'.</source>
-        <target state="translated">L'aggiornamento dei valori esistenti in ''dotnet.config' 'non è ancora supportato. Si prega di aggiornare manualmente ''dotnet.config'' per avere ''{0}'' nella sezione ''{1}''.</target>
-        <note>{Locked="dotnet.config"}</note>
-      </trans-unit>
-      <trans-unit id="PostAction_CreateDotnetConfig_Succeeded">
-        <source>Successfully created 'dotnet.config' file.</source>
-        <target state="translated">Il file ''dotnet.config'' è stato creato.</target>
-        <note>{Locked="dotnet.config"}</note>
-      </trans-unit>
-      <trans-unit id="PostAction_CreateDotnetConfig_ValueAlreadyExist">
-        <source>The required value in 'dotnet.config' is already set.</source>
-        <target state="translated">Il valore richiesto in ''dotnet.config'' è già stato impostato.</target>
-        <note>{Locked="dotnet.config"}</note>
-      </trans-unit>
-      <trans-unit id="PostAction_DotnetConfig_Error_ArgumentNotConfigured">
-        <source>Post action argument '{0}' is mandatory, but not configured.</source>
-        <target state="translated">L'argomento post-azione '{0}' è obbligatorio, ma non configurato.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="PostAction_ModifyJson_Error_ArgumentNotBoolean">
         <source>Post action argument '{0}' is not a valid boolean value.</source>
         <target state="translated">L'argomento dell'azione successiva '{0}' non è un valore booleano valido.</target>
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/xlf/LocalizableStrings.ja.xlf b/src/Cli/Microsoft.TemplateEngine.Cli/xlf/LocalizableStrings.ja.xlf
index 2b87f6884fdb..2f9a5c77a259 100644
--- a/src/Cli/Microsoft.TemplateEngine.Cli/xlf/LocalizableStrings.ja.xlf
+++ b/src/Cli/Microsoft.TemplateEngine.Cli/xlf/LocalizableStrings.ja.xlf
@@ -830,31 +830,6 @@ The header is followed by the list of parameters and their errors (might be seve
         <target state="translated">このアクションを実行しますか［{0} (はい) |{1} (いいえ)] ですか?</target>
         <note />
       </trans-unit>
-      <trans-unit id="PostAction_CreateDotnetConfig_CreatedNewSection">
-        <source>Created new section in 'dotnet.config' file</source>
-        <target state="translated">'dotnet.config' ファイルに新しいセクションを作成しました</target>
-        <note>{Locked="dotnet.config"}</note>
-      </trans-unit>
-      <trans-unit id="PostAction_CreateDotnetConfig_ManuallyUpdate">
-        <source>Updating existing values in 'dotnet.config' is not yet supported. Please, manually update 'dotnet.config' to have '{0}' under section '{1}'.</source>
-        <target state="translated">'dotnet.config' の既存の値の更新はまだサポートされていません。セクション '{1}' の下に 'dotnet.config' を手動で更新して '{0}' を持つようにしてください。</target>
-        <note>{Locked="dotnet.config"}</note>
-      </trans-unit>
-      <trans-unit id="PostAction_CreateDotnetConfig_Succeeded">
-        <source>Successfully created 'dotnet.config' file.</source>
-        <target state="translated">'dotnet.config' ファイルが正常に作成されました。</target>
-        <note>{Locked="dotnet.config"}</note>
-      </trans-unit>
-      <trans-unit id="PostAction_CreateDotnetConfig_ValueAlreadyExist">
-        <source>The required value in 'dotnet.config' is already set.</source>
-        <target state="translated">'dotnet.config' に必要な値はすでに設定されています。</target>
-        <note>{Locked="dotnet.config"}</note>
-      </trans-unit>
-      <trans-unit id="PostAction_DotnetConfig_Error_ArgumentNotConfigured">
-        <source>Post action argument '{0}' is mandatory, but not configured.</source>
-        <target state="translated">事後アクション引数 '{0}' は必須ですが、構成されていません。</target>
-        <note />
-      </trans-unit>
       <trans-unit id="PostAction_ModifyJson_Error_ArgumentNotBoolean">
         <source>Post action argument '{0}' is not a valid boolean value.</source>
         <target state="translated">事後アクションの引数 '{0}' は有効なブール値ではありません。</target>
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/xlf/LocalizableStrings.ko.xlf b/src/Cli/Microsoft.TemplateEngine.Cli/xlf/LocalizableStrings.ko.xlf
index be266386b4d8..11699454506d 100644
--- a/src/Cli/Microsoft.TemplateEngine.Cli/xlf/LocalizableStrings.ko.xlf
+++ b/src/Cli/Microsoft.TemplateEngine.Cli/xlf/LocalizableStrings.ko.xlf
@@ -830,31 +830,6 @@ The header is followed by the list of parameters and their errors (might be seve
         <target state="translated">이 작업을 실행하시겠어요 [{0} (예) |{1} (아니요)]?</target>
         <note />
       </trans-unit>
-      <trans-unit id="PostAction_CreateDotnetConfig_CreatedNewSection">
-        <source>Created new section in 'dotnet.config' file</source>
-        <target state="translated">'dotnet.config' 파일에 새 섹션을 만들었습니다.</target>
-        <note>{Locked="dotnet.config"}</note>
-      </trans-unit>
-      <trans-unit id="PostAction_CreateDotnetConfig_ManuallyUpdate">
-        <source>Updating existing values in 'dotnet.config' is not yet supported. Please, manually update 'dotnet.config' to have '{0}' under section '{1}'.</source>
-        <target state="translated">'dotnet.config'의 기존 값 업데이트는 아직 지원되지 않습니다. 'dotnet.config'를 수동으로 업데이트하여 '{0}' 섹션의 '{1}'을(를) 갖도록 하세요.</target>
-        <note>{Locked="dotnet.config"}</note>
-      </trans-unit>
-      <trans-unit id="PostAction_CreateDotnetConfig_Succeeded">
-        <source>Successfully created 'dotnet.config' file.</source>
-        <target state="translated">'dotnet.config' 파일을 만들었습니다.</target>
-        <note>{Locked="dotnet.config"}</note>
-      </trans-unit>
-      <trans-unit id="PostAction_CreateDotnetConfig_ValueAlreadyExist">
-        <source>The required value in 'dotnet.config' is already set.</source>
-        <target state="translated">'dotnet.config'의 필수 값이 이미 설정되어 있습니다.</target>
-        <note>{Locked="dotnet.config"}</note>
-      </trans-unit>
-      <trans-unit id="PostAction_DotnetConfig_Error_ArgumentNotConfigured">
-        <source>Post action argument '{0}' is mandatory, but not configured.</source>
-        <target state="translated">'{0}' 게시물 매크로 함수 인수가 필수이지만 구성되지 않았습니다.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="PostAction_ModifyJson_Error_ArgumentNotBoolean">
         <source>Post action argument '{0}' is not a valid boolean value.</source>
         <target state="translated">사후 작업 인수 '{0}'은(는) 올바른 부울 값이 아닙니다.</target>
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/xlf/LocalizableStrings.pl.xlf b/src/Cli/Microsoft.TemplateEngine.Cli/xlf/LocalizableStrings.pl.xlf
index 18f4ee4817d9..6e5167124b31 100644
--- a/src/Cli/Microsoft.TemplateEngine.Cli/xlf/LocalizableStrings.pl.xlf
+++ b/src/Cli/Microsoft.TemplateEngine.Cli/xlf/LocalizableStrings.pl.xlf
@@ -830,31 +830,6 @@ The header is followed by the list of parameters and their errors (might be seve
         <target state="translated">Chcesz uruchomić tę akcję [{0}(tak)|{1}(nie)]?</target>
         <note />
       </trans-unit>
-      <trans-unit id="PostAction_CreateDotnetConfig_CreatedNewSection">
-        <source>Created new section in 'dotnet.config' file</source>
-        <target state="translated">Utworzono nową sekcję w pliku „dotnet.config”</target>
-        <note>{Locked="dotnet.config"}</note>
-      </trans-unit>
-      <trans-unit id="PostAction_CreateDotnetConfig_ManuallyUpdate">
-        <source>Updating existing values in 'dotnet.config' is not yet supported. Please, manually update 'dotnet.config' to have '{0}' under section '{1}'.</source>
-        <target state="translated">Aktualizowanie istniejących wartości w pliku „dotnet.config” nie jest jeszcze obsługiwane. Ręcznie zaktualizuj plik „dotnet.config”, aby miał element „{0}” w sekcji „{1}”.</target>
-        <note>{Locked="dotnet.config"}</note>
-      </trans-unit>
-      <trans-unit id="PostAction_CreateDotnetConfig_Succeeded">
-        <source>Successfully created 'dotnet.config' file.</source>
-        <target state="translated">Pomyślnie utworzono plik „dotnet.config”.</target>
-        <note>{Locked="dotnet.config"}</note>
-      </trans-unit>
-      <trans-unit id="PostAction_CreateDotnetConfig_ValueAlreadyExist">
-        <source>The required value in 'dotnet.config' is already set.</source>
-        <target state="translated">Wymagana wartość w pliku „dotnet.config” jest już ustawiona.</target>
-        <note>{Locked="dotnet.config"}</note>
-      </trans-unit>
-      <trans-unit id="PostAction_DotnetConfig_Error_ArgumentNotConfigured">
-        <source>Post action argument '{0}' is mandatory, but not configured.</source>
-        <target state="translated">Argument po wystąpieniu akcji „{0}” jest obowiązkowy, ale nie jest skonfigurowany.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="PostAction_ModifyJson_Error_ArgumentNotBoolean">
         <source>Post action argument '{0}' is not a valid boolean value.</source>
         <target state="translated">Argument akcji „{0}” nie jest prawidłową wartością logiczną.</target>
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/Microsoft.TemplateEngine.Cli/xlf/LocalizableStrings.pt-BR.xlf
index 5691c61ba12e..24f89179cb85 100644
--- a/src/Cli/Microsoft.TemplateEngine.Cli/xlf/LocalizableStrings.pt-BR.xlf
+++ b/src/Cli/Microsoft.TemplateEngine.Cli/xlf/LocalizableStrings.pt-BR.xlf
@@ -830,31 +830,6 @@ The header is followed by the list of parameters and their errors (might be seve
         <target state="translated">Deseja executar esta ação [{0}(yes)|{1}(no)]?</target>
         <note />
       </trans-unit>
-      <trans-unit id="PostAction_CreateDotnetConfig_CreatedNewSection">
-        <source>Created new section in 'dotnet.config' file</source>
-        <target state="translated">Nova seção criada no arquivo "dotnet.config"</target>
-        <note>{Locked="dotnet.config"}</note>
-      </trans-unit>
-      <trans-unit id="PostAction_CreateDotnetConfig_ManuallyUpdate">
-        <source>Updating existing values in 'dotnet.config' is not yet supported. Please, manually update 'dotnet.config' to have '{0}' under section '{1}'.</source>
-        <target state="translated">Ainda não há suporte para a atualização de valores existentes em "dotnet.config". Atualize manualmente "dotnet.config" para ter "{0}" na seção "{1}".</target>
-        <note>{Locked="dotnet.config"}</note>
-      </trans-unit>
-      <trans-unit id="PostAction_CreateDotnetConfig_Succeeded">
-        <source>Successfully created 'dotnet.config' file.</source>
-        <target state="translated">Arquivo "dotnet.config" criado com sucesso.</target>
-        <note>{Locked="dotnet.config"}</note>
-      </trans-unit>
-      <trans-unit id="PostAction_CreateDotnetConfig_ValueAlreadyExist">
-        <source>The required value in 'dotnet.config' is already set.</source>
-        <target state="translated">O valor necessário em "dotnet.config" já está definido.</target>
-        <note>{Locked="dotnet.config"}</note>
-      </trans-unit>
-      <trans-unit id="PostAction_DotnetConfig_Error_ArgumentNotConfigured">
-        <source>Post action argument '{0}' is mandatory, but not configured.</source>
-        <target state="translated">O argumento pós-ação '{0}' é obrigatório, mas não configurado.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="PostAction_ModifyJson_Error_ArgumentNotBoolean">
         <source>Post action argument '{0}' is not a valid boolean value.</source>
         <target state="translated">O argumento de pós-ação '{0}' não é um valor booleano válido.</target>
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/xlf/LocalizableStrings.ru.xlf b/src/Cli/Microsoft.TemplateEngine.Cli/xlf/LocalizableStrings.ru.xlf
index 1d9b5d4e94d3..6578a4d5bf14 100644
--- a/src/Cli/Microsoft.TemplateEngine.Cli/xlf/LocalizableStrings.ru.xlf
+++ b/src/Cli/Microsoft.TemplateEngine.Cli/xlf/LocalizableStrings.ru.xlf
@@ -830,31 +830,6 @@ The header is followed by the list of parameters and their errors (might be seve
         <target state="translated">Вы хотите выполнить это действие [{0}(да)|{1}(нет)]?</target>
         <note />
       </trans-unit>
-      <trans-unit id="PostAction_CreateDotnetConfig_CreatedNewSection">
-        <source>Created new section in 'dotnet.config' file</source>
-        <target state="translated">Создан новый раздел в файле "dotnet.config"</target>
-        <note>{Locked="dotnet.config"}</note>
-      </trans-unit>
-      <trans-unit id="PostAction_CreateDotnetConfig_ManuallyUpdate">
-        <source>Updating existing values in 'dotnet.config' is not yet supported. Please, manually update 'dotnet.config' to have '{0}' under section '{1}'.</source>
-        <target state="translated">Изменение существующих значений в "dotnet.config" пока не поддерживается. Отредактируйте "dotnet.config" вручную, чтобы значение "{0}" находилось в разделе "{1}".</target>
-        <note>{Locked="dotnet.config"}</note>
-      </trans-unit>
-      <trans-unit id="PostAction_CreateDotnetConfig_Succeeded">
-        <source>Successfully created 'dotnet.config' file.</source>
-        <target state="translated">Файл "dotnet.config" успешно создан.</target>
-        <note>{Locked="dotnet.config"}</note>
-      </trans-unit>
-      <trans-unit id="PostAction_CreateDotnetConfig_ValueAlreadyExist">
-        <source>The required value in 'dotnet.config' is already set.</source>
-        <target state="translated">Обязательное значение в "dotnet.config" уже установлено.</target>
-        <note>{Locked="dotnet.config"}</note>
-      </trans-unit>
-      <trans-unit id="PostAction_DotnetConfig_Error_ArgumentNotConfigured">
-        <source>Post action argument '{0}' is mandatory, but not configured.</source>
-        <target state="translated">Аргумент после действия "{0}" является обязательным, но не настроен.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="PostAction_ModifyJson_Error_ArgumentNotBoolean">
         <source>Post action argument '{0}' is not a valid boolean value.</source>
         <target state="translated">Аргумент после действия "{0}" не является допустимым логическим значением.</target>
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/xlf/LocalizableStrings.tr.xlf b/src/Cli/Microsoft.TemplateEngine.Cli/xlf/LocalizableStrings.tr.xlf
index 8cfbf1557c82..a0d71cff2b96 100644
--- a/src/Cli/Microsoft.TemplateEngine.Cli/xlf/LocalizableStrings.tr.xlf
+++ b/src/Cli/Microsoft.TemplateEngine.Cli/xlf/LocalizableStrings.tr.xlf
@@ -830,31 +830,6 @@ The header is followed by the list of parameters and their errors (might be seve
         <target state="translated">Bu eylemi çalıştırmak istiyor musunuz [{0}(evet)|{1}(hayır)]?</target>
         <note />
       </trans-unit>
-      <trans-unit id="PostAction_CreateDotnetConfig_CreatedNewSection">
-        <source>Created new section in 'dotnet.config' file</source>
-        <target state="translated">'dotnet.config' dosyasında yeni bölüm oluşturuldu</target>
-        <note>{Locked="dotnet.config"}</note>
-      </trans-unit>
-      <trans-unit id="PostAction_CreateDotnetConfig_ManuallyUpdate">
-        <source>Updating existing values in 'dotnet.config' is not yet supported. Please, manually update 'dotnet.config' to have '{0}' under section '{1}'.</source>
-        <target state="translated">'dotnet.config' içindeki mevcut değerleri güncelleştirmek henüz desteklenmemektedir. Lütfen 'dotnet.config' dosyasını manuel olarak güncelleştirmek suretiyle '{1}' bölümünün altına '{0}' ekleyin.</target>
-        <note>{Locked="dotnet.config"}</note>
-      </trans-unit>
-      <trans-unit id="PostAction_CreateDotnetConfig_Succeeded">
-        <source>Successfully created 'dotnet.config' file.</source>
-        <target state="translated">'dotnet.config' dosyası başarıyla oluşturuldu.</target>
-        <note>{Locked="dotnet.config"}</note>
-      </trans-unit>
-      <trans-unit id="PostAction_CreateDotnetConfig_ValueAlreadyExist">
-        <source>The required value in 'dotnet.config' is already set.</source>
-        <target state="translated">'dotnet.config' dosyasında gerekli değer zaten ayarlanmıştır.</target>
-        <note>{Locked="dotnet.config"}</note>
-      </trans-unit>
-      <trans-unit id="PostAction_DotnetConfig_Error_ArgumentNotConfigured">
-        <source>Post action argument '{0}' is mandatory, but not configured.</source>
-        <target state="translated">'{0}' eylem sonrası bağımsız değişkeni zorunlu, ancak yapılandırılmamış.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="PostAction_ModifyJson_Error_ArgumentNotBoolean">
         <source>Post action argument '{0}' is not a valid boolean value.</source>
         <target state="translated">'{0}' eylem sonrası bağımsız değişkeni, geçerli bir boole değeri değil.</target>
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/Microsoft.TemplateEngine.Cli/xlf/LocalizableStrings.zh-Hans.xlf
index 249c25ff2b81..f75d8ad68dae 100644
--- a/src/Cli/Microsoft.TemplateEngine.Cli/xlf/LocalizableStrings.zh-Hans.xlf
+++ b/src/Cli/Microsoft.TemplateEngine.Cli/xlf/LocalizableStrings.zh-Hans.xlf
@@ -830,31 +830,6 @@ The header is followed by the list of parameters and their errors (might be seve
         <target state="translated">是否要运行此操作 [{0}(是)|{1}(否)]?</target>
         <note />
       </trans-unit>
-      <trans-unit id="PostAction_CreateDotnetConfig_CreatedNewSection">
-        <source>Created new section in 'dotnet.config' file</source>
-        <target state="translated">已在 ‘dotnet.config’ 文件中创建新节</target>
-        <note>{Locked="dotnet.config"}</note>
-      </trans-unit>
-      <trans-unit id="PostAction_CreateDotnetConfig_ManuallyUpdate">
-        <source>Updating existing values in 'dotnet.config' is not yet supported. Please, manually update 'dotnet.config' to have '{0}' under section '{1}'.</source>
-        <target state="translated">尚不支持更新 ‘dotnet.config’ 中的现有值。请在节 ‘{1}’ 下手动将 ‘dotnet.config’ 更新为具有 ‘{0}’。</target>
-        <note>{Locked="dotnet.config"}</note>
-      </trans-unit>
-      <trans-unit id="PostAction_CreateDotnetConfig_Succeeded">
-        <source>Successfully created 'dotnet.config' file.</source>
-        <target state="translated">已成功创建 ‘dotnet.config’ 文件。</target>
-        <note>{Locked="dotnet.config"}</note>
-      </trans-unit>
-      <trans-unit id="PostAction_CreateDotnetConfig_ValueAlreadyExist">
-        <source>The required value in 'dotnet.config' is already set.</source>
-        <target state="translated">已设置 'dotnet.config' 中所需的值。</target>
-        <note>{Locked="dotnet.config"}</note>
-      </trans-unit>
-      <trans-unit id="PostAction_DotnetConfig_Error_ArgumentNotConfigured">
-        <source>Post action argument '{0}' is mandatory, but not configured.</source>
-        <target state="translated">发布操作参数“{0}”是必需的，但未进行配置。</target>
-        <note />
-      </trans-unit>
       <trans-unit id="PostAction_ModifyJson_Error_ArgumentNotBoolean">
         <source>Post action argument '{0}' is not a valid boolean value.</source>
         <target state="translated">Post 操作参数“{0}”不是有效的布尔值。</target>
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/Microsoft.TemplateEngine.Cli/xlf/LocalizableStrings.zh-Hant.xlf
index eb6891d08e3d..56c64a9d9b91 100644
--- a/src/Cli/Microsoft.TemplateEngine.Cli/xlf/LocalizableStrings.zh-Hant.xlf
+++ b/src/Cli/Microsoft.TemplateEngine.Cli/xlf/LocalizableStrings.zh-Hant.xlf
@@ -830,31 +830,6 @@ The header is followed by the list of parameters and their errors (might be seve
         <target state="translated">是否要執行此動作 [{0}(是)|{1}(否)]?</target>
         <note />
       </trans-unit>
-      <trans-unit id="PostAction_CreateDotnetConfig_CreatedNewSection">
-        <source>Created new section in 'dotnet.config' file</source>
-        <target state="translated">在 'dotnet.config' 檔案中建立新區段</target>
-        <note>{Locked="dotnet.config"}</note>
-      </trans-unit>
-      <trans-unit id="PostAction_CreateDotnetConfig_ManuallyUpdate">
-        <source>Updating existing values in 'dotnet.config' is not yet supported. Please, manually update 'dotnet.config' to have '{0}' under section '{1}'.</source>
-        <target state="translated">尚不支援更新 'dotnet.config' 中的現有值。請手動更新 'dotnet.config'，以便在 '{1}' 區段下設定 '{0}'。</target>
-        <note>{Locked="dotnet.config"}</note>
-      </trans-unit>
-      <trans-unit id="PostAction_CreateDotnetConfig_Succeeded">
-        <source>Successfully created 'dotnet.config' file.</source>
-        <target state="translated">已成功建立 'dotnet.config' 檔案。</target>
-        <note>{Locked="dotnet.config"}</note>
-      </trans-unit>
-      <trans-unit id="PostAction_CreateDotnetConfig_ValueAlreadyExist">
-        <source>The required value in 'dotnet.config' is already set.</source>
-        <target state="translated">'dotnet.config' 中所需的值已經設定。</target>
-        <note>{Locked="dotnet.config"}</note>
-      </trans-unit>
-      <trans-unit id="PostAction_DotnetConfig_Error_ArgumentNotConfigured">
-        <source>Post action argument '{0}' is mandatory, but not configured.</source>
-        <target state="translated">動作後引數 '{0}' 是強制的，但未設定。</target>
-        <note />
-      </trans-unit>
       <trans-unit id="PostAction_ModifyJson_Error_ArgumentNotBoolean">
         <source>Post action argument '{0}' is not a valid boolean value.</source>
         <target state="translated">Post 巨集指令引數 '{0}' 不是有效的布林值。</target>
diff --git a/src/Cli/dotnet/Commands/CliCommandStrings.resx b/src/Cli/dotnet/Commands/CliCommandStrings.resx
index ae125125e3ab..0c13072380f3 100644
--- a/src/Cli/dotnet/Commands/CliCommandStrings.resx
+++ b/src/Cli/dotnet/Commands/CliCommandStrings.resx
@@ -643,14 +643,13 @@ If not specified the file will be generated inside the default 'TestResults' dir
     <value>Test runner '{0}' is not supported.</value>
   </data>
   <data name="CmdUnsupportedVSTestTestApplicationsDescription" xml:space="preserve">
-    <value>dotnet.config defines test runner to be Microsoft.Testing.Platform. All projects must use that test runner.
+    <value>global.json defines test runner to be Microsoft.Testing.Platform. All projects must use that test runner.
 The following test projects are using VSTest test runner:
 {0}
 
 See https://aka.ms/dotnet-test/mtp for more information.</value>
-    <comment>{0} is one or more project names.
-Microsoft.Testing.Platform is a name, don't translate.
-dotnet.config is a name don't translate.</comment>
+    <comment>{Locked="global.json"}{Locked="Microsoft.Testing.Platform"}
+{0} is one or more project names.</comment>
   </data>
   <data name="CmdUseLockFileOptionDescription" xml:space="preserve">
     <value>Enables project lock file to be generated and used with restore.</value>
diff --git a/src/Cli/dotnet/Commands/Test/TestCommandParser.cs b/src/Cli/dotnet/Commands/Test/TestCommandParser.cs
index 4dd09a10fe0a..229db64e3d75 100644
--- a/src/Cli/dotnet/Commands/Test/TestCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Test/TestCommandParser.cs
@@ -2,13 +2,28 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.CommandLine;
+using System.Text.Json;
+using System.Text.Json.Serialization;
 using Microsoft.DotNet.Cli.Extensions;
-using Microsoft.Extensions.Configuration;
+using Microsoft.DotNet.Cli.Utils;
+using Command = System.CommandLine.Command;
 
 namespace Microsoft.DotNet.Cli.Commands.Test;
 
 internal static class TestCommandParser
 {
+    private sealed class GlobalJsonModel
+    {
+        [JsonPropertyName("test")]
+        public GlobalJsonTestNode Test { get; set; } = null!;
+    }
+
+    private sealed class GlobalJsonTestNode
+    {
+        [JsonPropertyName("runner")]
+        public string RunnerName { get; set; } = null!;
+    }
+
     public static readonly string DocsLink = "https://aka.ms/dotnet-test";
 
     public static readonly Option<string> SettingsOption = new ForwardedOption<string>("--settings", "-s")
@@ -163,45 +178,37 @@ public static Command GetCommand()
         return Command;
     }
 
-    public static string GetTestRunnerName()
+    private static string GetTestRunnerName()
     {
-        var builder = new ConfigurationBuilder();
-
-        string? dotnetConfigPath = GetDotnetConfigPath(Environment.CurrentDirectory);
-        if (!File.Exists(dotnetConfigPath))
+        string? globalJsonPath = GetGlobalJsonPath(Environment.CurrentDirectory);
+        if (!File.Exists(globalJsonPath))
         {
             return CliConstants.VSTest;
         }
 
-        builder.AddIniFile(dotnetConfigPath);
-
-        IConfigurationRoot config = builder.Build();
-        var testSection = config.GetSection("dotnet.test.runner");
+        string jsonText = File.ReadAllText(globalJsonPath);
 
-        if (!testSection.Exists())
+        // This code path is hit exactly once during the whole life of the dotnet process.
+        // So, no concern about caching JsonSerializerOptions.
+        var globalJson = JsonSerializer.Deserialize<GlobalJsonModel>(jsonText, new JsonSerializerOptions()
         {
-            return CliConstants.VSTest;
-        }
-
-        string? runnerNameSection = testSection["name"];
-
-        if (string.IsNullOrEmpty(runnerNameSection))
-        {
-            return CliConstants.VSTest;
-        }
+            AllowDuplicateProperties = false,
+            AllowTrailingCommas = false,
+            ReadCommentHandling = JsonCommentHandling.Skip,
+        });
 
-        return runnerNameSection;
+        return globalJson?.Test?.RunnerName ?? CliConstants.VSTest;
     }
 
-    private static string? GetDotnetConfigPath(string? startDir)
+    private static string? GetGlobalJsonPath(string? startDir)
     {
         string? directory = startDir;
         while (directory != null)
         {
-            string dotnetConfigPath = Path.Combine(directory, "dotnet.config");
-            if (File.Exists(dotnetConfigPath))
+            string globalJsonPath = Path.Combine(directory, "global.json");
+            if (File.Exists(globalJsonPath))
             {
-                return dotnetConfigPath;
+                return globalJsonPath;
             }
 
             directory = Path.GetDirectoryName(directory);
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.cs.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.cs.xlf
index 7c487ebbb989..85fc1d4d359c 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.cs.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.cs.xlf
@@ -878,19 +878,18 @@ Pokud zadaný adresář neexistuje, bude vytvořen.</target>
         <note />
       </trans-unit>
       <trans-unit id="CmdUnsupportedVSTestTestApplicationsDescription">
-        <source>dotnet.config defines test runner to be Microsoft.Testing.Platform. All projects must use that test runner.
+        <source>global.json defines test runner to be Microsoft.Testing.Platform. All projects must use that test runner.
 The following test projects are using VSTest test runner:
 {0}
 
 See https://aka.ms/dotnet-test/mtp for more information.</source>
-        <target state="translated">Soubor dotnet.config definuje, že spouštěč testů bude Microsoft.Testing.Platform. Tento spouštěč testů musí používat všechny projekty.
+        <target state="needs-review-translation">Soubor dotnet.config definuje, že spouštěč testů bude Microsoft.Testing.Platform. Tento spouštěč testů musí používat všechny projekty.
 Následující testovací projekty používají spouštěč testů VSTest:
 {0}
 
 Další informace najdete na https://aka.ms/dotnet-test/mtp.</target>
-        <note>{0} is one or more project names.
-Microsoft.Testing.Platform is a name, don't translate.
-dotnet.config is a name don't translate.</note>
+        <note>{Locked="global.json"}{Locked="Microsoft.Testing.Platform"}
+{0} is one or more project names.</note>
       </trans-unit>
       <trans-unit id="CmdUseLockFileOptionDescription">
         <source>Enables project lock file to be generated and used with restore.</source>
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.de.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.de.xlf
index 4b712e3eb393..425b6ad7ea7b 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.de.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.de.xlf
@@ -878,19 +878,18 @@ Das angegebene Verzeichnis wird erstellt, wenn es nicht vorhanden ist.</target>
         <note />
       </trans-unit>
       <trans-unit id="CmdUnsupportedVSTestTestApplicationsDescription">
-        <source>dotnet.config defines test runner to be Microsoft.Testing.Platform. All projects must use that test runner.
+        <source>global.json defines test runner to be Microsoft.Testing.Platform. All projects must use that test runner.
 The following test projects are using VSTest test runner:
 {0}
 
 See https://aka.ms/dotnet-test/mtp for more information.</source>
-        <target state="translated">dotnet.config definiert den Test Runner als Microsoft.Testing.Platform. Alle Projekte müssen diesen Test Runner verwenden.
+        <target state="needs-review-translation">dotnet.config definiert den Test Runner als Microsoft.Testing.Platform. Alle Projekte müssen diesen Test Runner verwenden.
 Die folgenden Testprojekte verwenden den VSTest-Test Runner:
 {0}
 
 Weitere Informationen finden Sie unter https://aka.ms/dotnet-test/mtp.</target>
-        <note>{0} is one or more project names.
-Microsoft.Testing.Platform is a name, don't translate.
-dotnet.config is a name don't translate.</note>
+        <note>{Locked="global.json"}{Locked="Microsoft.Testing.Platform"}
+{0} is one or more project names.</note>
       </trans-unit>
       <trans-unit id="CmdUseLockFileOptionDescription">
         <source>Enables project lock file to be generated and used with restore.</source>
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.es.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.es.xlf
index 4839275dec3b..d6d7c5130309 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.es.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.es.xlf
@@ -878,19 +878,18 @@ Si no existe, se creará el directorio especificado.</target>
         <note />
       </trans-unit>
       <trans-unit id="CmdUnsupportedVSTestTestApplicationsDescription">
-        <source>dotnet.config defines test runner to be Microsoft.Testing.Platform. All projects must use that test runner.
+        <source>global.json defines test runner to be Microsoft.Testing.Platform. All projects must use that test runner.
 The following test projects are using VSTest test runner:
 {0}
 
 See https://aka.ms/dotnet-test/mtp for more information.</source>
-        <target state="translated">dotnet.config define que el ejecutor de pruebas sea Microsoft.Testing.Platform. Todos los proyectos deben usar ese ejecutor de pruebas.
+        <target state="needs-review-translation">dotnet.config define que el ejecutor de pruebas sea Microsoft.Testing.Platform. Todos los proyectos deben usar ese ejecutor de pruebas.
 Los siguientes proyectos de prueba usan el ejecutor de pruebas de VSTest:
 {0}
 
 Consulte https://aka.ms/dotnet-test/mtp para obtener más información.</target>
-        <note>{0} is one or more project names.
-Microsoft.Testing.Platform is a name, don't translate.
-dotnet.config is a name don't translate.</note>
+        <note>{Locked="global.json"}{Locked="Microsoft.Testing.Platform"}
+{0} is one or more project names.</note>
       </trans-unit>
       <trans-unit id="CmdUseLockFileOptionDescription">
         <source>Enables project lock file to be generated and used with restore.</source>
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.fr.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.fr.xlf
index cb9258a4fa6c..6c5a9fd2ff32 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.fr.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.fr.xlf
@@ -878,19 +878,18 @@ Le répertoire spécifié est créé, s'il n'existe pas déjà.</target>
         <note />
       </trans-unit>
       <trans-unit id="CmdUnsupportedVSTestTestApplicationsDescription">
-        <source>dotnet.config defines test runner to be Microsoft.Testing.Platform. All projects must use that test runner.
+        <source>global.json defines test runner to be Microsoft.Testing.Platform. All projects must use that test runner.
 The following test projects are using VSTest test runner:
 {0}
 
 See https://aka.ms/dotnet-test/mtp for more information.</source>
-        <target state="translated">dotnet.config définit le test runner comme Microsoft.Testing.Platform. Tous les projets doivent utiliser ce test runner.
+        <target state="needs-review-translation">dotnet.config définit le test runner comme Microsoft.Testing.Platform. Tous les projets doivent utiliser ce test runner.
 Les projets de test suivants utilisent le test runner VSTest :
 {0}
 
 Pour plus d’informations, consultez https://aka.ms/dotnet-test/mtp.</target>
-        <note>{0} is one or more project names.
-Microsoft.Testing.Platform is a name, don't translate.
-dotnet.config is a name don't translate.</note>
+        <note>{Locked="global.json"}{Locked="Microsoft.Testing.Platform"}
+{0} is one or more project names.</note>
       </trans-unit>
       <trans-unit id="CmdUseLockFileOptionDescription">
         <source>Enables project lock file to be generated and used with restore.</source>
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.it.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.it.xlf
index 0d9c2edb4902..27ba778887aa 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.it.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.it.xlf
@@ -878,19 +878,18 @@ Se non esiste, la directory specificata verrà creata.</target>
         <note />
       </trans-unit>
       <trans-unit id="CmdUnsupportedVSTestTestApplicationsDescription">
-        <source>dotnet.config defines test runner to be Microsoft.Testing.Platform. All projects must use that test runner.
+        <source>global.json defines test runner to be Microsoft.Testing.Platform. All projects must use that test runner.
 The following test projects are using VSTest test runner:
 {0}
 
 See https://aka.ms/dotnet-test/mtp for more information.</source>
-        <target state="translated">dotnet.config definisce il Test Runner come Microsoft.Testing.Platform. Tutti i progetti devono usare tale Test Runner.
+        <target state="needs-review-translation">dotnet.config definisce il Test Runner come Microsoft.Testing.Platform. Tutti i progetti devono usare tale Test Runner.
 I progetti di test seguenti usano il Test Runner VSTest:
 {0}
 
 Per altre informazioni, vedi https://aka.ms/dotnet-test/mtp.</target>
-        <note>{0} is one or more project names.
-Microsoft.Testing.Platform is a name, don't translate.
-dotnet.config is a name don't translate.</note>
+        <note>{Locked="global.json"}{Locked="Microsoft.Testing.Platform"}
+{0} is one or more project names.</note>
       </trans-unit>
       <trans-unit id="CmdUseLockFileOptionDescription">
         <source>Enables project lock file to be generated and used with restore.</source>
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ja.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ja.xlf
index f29eda7e3084..92aeb476e879 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ja.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ja.xlf
@@ -878,19 +878,18 @@ The specified directory will be created if it does not exist.</source>
         <note />
       </trans-unit>
       <trans-unit id="CmdUnsupportedVSTestTestApplicationsDescription">
-        <source>dotnet.config defines test runner to be Microsoft.Testing.Platform. All projects must use that test runner.
+        <source>global.json defines test runner to be Microsoft.Testing.Platform. All projects must use that test runner.
 The following test projects are using VSTest test runner:
 {0}
 
 See https://aka.ms/dotnet-test/mtp for more information.</source>
-        <target state="translated">dotnet.config では、テスト ランナーを Microsoft.Testing.Platform と定義します。すべてのプロジェクトで、そのテスト ランナーを使用する必要があります。
+        <target state="needs-review-translation">dotnet.config では、テスト ランナーを Microsoft.Testing.Platform と定義します。すべてのプロジェクトで、そのテスト ランナーを使用する必要があります。
 次のテスト プロジェクトでは、VSTest テスト ランナーを使用しています:
 {0}
 
 詳細については、https://aka.ms/dotnet-test/mtp を参照してください。</target>
-        <note>{0} is one or more project names.
-Microsoft.Testing.Platform is a name, don't translate.
-dotnet.config is a name don't translate.</note>
+        <note>{Locked="global.json"}{Locked="Microsoft.Testing.Platform"}
+{0} is one or more project names.</note>
       </trans-unit>
       <trans-unit id="CmdUseLockFileOptionDescription">
         <source>Enables project lock file to be generated and used with restore.</source>
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ko.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ko.xlf
index 2c70c37ebb45..38843d333d29 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ko.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ko.xlf
@@ -878,19 +878,18 @@ The specified directory will be created if it does not exist.</source>
         <note />
       </trans-unit>
       <trans-unit id="CmdUnsupportedVSTestTestApplicationsDescription">
-        <source>dotnet.config defines test runner to be Microsoft.Testing.Platform. All projects must use that test runner.
+        <source>global.json defines test runner to be Microsoft.Testing.Platform. All projects must use that test runner.
 The following test projects are using VSTest test runner:
 {0}
 
 See https://aka.ms/dotnet-test/mtp for more information.</source>
-        <target state="translated">dotnet.config는 Test Runner를 Microsoft.Testing.Platform으로 정의합니다. 모든 프로젝트는 해당 Test Runner를 사용해야 합니다.
+        <target state="needs-review-translation">dotnet.config는 Test Runner를 Microsoft.Testing.Platform으로 정의합니다. 모든 프로젝트는 해당 Test Runner를 사용해야 합니다.
 다음 테스트 프로젝트에서 VSTest Test Runner를 사용하고 있습니다.
 {0}
 
 자세한 내용은 https://aka.ms/dotnet-test/mtp를 참조하세요.</target>
-        <note>{0} is one or more project names.
-Microsoft.Testing.Platform is a name, don't translate.
-dotnet.config is a name don't translate.</note>
+        <note>{Locked="global.json"}{Locked="Microsoft.Testing.Platform"}
+{0} is one or more project names.</note>
       </trans-unit>
       <trans-unit id="CmdUseLockFileOptionDescription">
         <source>Enables project lock file to be generated and used with restore.</source>
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pl.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pl.xlf
index 19199250332a..69e87e535591 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pl.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pl.xlf
@@ -878,19 +878,18 @@ Jeśli określony katalog nie istnieje, zostanie utworzony.</target>
         <note />
       </trans-unit>
       <trans-unit id="CmdUnsupportedVSTestTestApplicationsDescription">
-        <source>dotnet.config defines test runner to be Microsoft.Testing.Platform. All projects must use that test runner.
+        <source>global.json defines test runner to be Microsoft.Testing.Platform. All projects must use that test runner.
 The following test projects are using VSTest test runner:
 {0}
 
 See https://aka.ms/dotnet-test/mtp for more information.</source>
-        <target state="translated">Plik dotnet.config definiuje moduł uruchamiający testy jako Microsoft.Testing.Platform. Wszystkie projekty muszą używać tego modułu uruchamiającego testy.
+        <target state="needs-review-translation">Plik dotnet.config definiuje moduł uruchamiający testy jako Microsoft.Testing.Platform. Wszystkie projekty muszą używać tego modułu uruchamiającego testy.
 Następujące projekty testowe używają modułu uruchamiającego testy VSTest:
 {0}
 
 Aby uzyskać więcej informacji, zobacz https://aka.ms/dotnet-test/mtp.</target>
-        <note>{0} is one or more project names.
-Microsoft.Testing.Platform is a name, don't translate.
-dotnet.config is a name don't translate.</note>
+        <note>{Locked="global.json"}{Locked="Microsoft.Testing.Platform"}
+{0} is one or more project names.</note>
       </trans-unit>
       <trans-unit id="CmdUseLockFileOptionDescription">
         <source>Enables project lock file to be generated and used with restore.</source>
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pt-BR.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pt-BR.xlf
index f6a6251199a0..d7bc79150ddf 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pt-BR.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pt-BR.xlf
@@ -878,19 +878,18 @@ O diretório especificado será criado se ele ainda não existir.</target>
         <note />
       </trans-unit>
       <trans-unit id="CmdUnsupportedVSTestTestApplicationsDescription">
-        <source>dotnet.config defines test runner to be Microsoft.Testing.Platform. All projects must use that test runner.
+        <source>global.json defines test runner to be Microsoft.Testing.Platform. All projects must use that test runner.
 The following test projects are using VSTest test runner:
 {0}
 
 See https://aka.ms/dotnet-test/mtp for more information.</source>
-        <target state="translated">dotnet.config define o executor de teste como Microsoft.Testing.Platform. Todos os projetos devem usar esse executor de teste.
+        <target state="needs-review-translation">dotnet.config define o executor de teste como Microsoft.Testing.Platform. Todos os projetos devem usar esse executor de teste.
 Os seguintes projetos de teste estão usando o executor de teste do VSTest:
 {0}
 
 Consulte https://aka.ms/dotnet-test/mtp para obter mais informações.</target>
-        <note>{0} is one or more project names.
-Microsoft.Testing.Platform is a name, don't translate.
-dotnet.config is a name don't translate.</note>
+        <note>{Locked="global.json"}{Locked="Microsoft.Testing.Platform"}
+{0} is one or more project names.</note>
       </trans-unit>
       <trans-unit id="CmdUseLockFileOptionDescription">
         <source>Enables project lock file to be generated and used with restore.</source>
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ru.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ru.xlf
index e0a19a6081c6..4c9375f27eb5 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ru.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ru.xlf
@@ -878,19 +878,18 @@ The specified directory will be created if it does not exist.</source>
         <note />
       </trans-unit>
       <trans-unit id="CmdUnsupportedVSTestTestApplicationsDescription">
-        <source>dotnet.config defines test runner to be Microsoft.Testing.Platform. All projects must use that test runner.
+        <source>global.json defines test runner to be Microsoft.Testing.Platform. All projects must use that test runner.
 The following test projects are using VSTest test runner:
 {0}
 
 See https://aka.ms/dotnet-test/mtp for more information.</source>
-        <target state="translated">В dotnet.config в качестве средства выполнения тестов указана Microsoft.Testing.Platform. Все проекты должны использовать это средство выполнения тестов.
+        <target state="needs-review-translation">В dotnet.config в качестве средства выполнения тестов указана Microsoft.Testing.Platform. Все проекты должны использовать это средство выполнения тестов.
 Следующие тестовые проекты используют средство выполнения тестов VSTest:
 {0}
 
 Подробнее см. https://aka.ms/dotnet-test/mtp.</target>
-        <note>{0} is one or more project names.
-Microsoft.Testing.Platform is a name, don't translate.
-dotnet.config is a name don't translate.</note>
+        <note>{Locked="global.json"}{Locked="Microsoft.Testing.Platform"}
+{0} is one or more project names.</note>
       </trans-unit>
       <trans-unit id="CmdUseLockFileOptionDescription">
         <source>Enables project lock file to be generated and used with restore.</source>
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.tr.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.tr.xlf
index ccb3a44c50ad..571f189e9e6d 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.tr.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.tr.xlf
@@ -878,19 +878,18 @@ Belirtilen dizin yoksa oluşturulur.</target>
         <note />
       </trans-unit>
       <trans-unit id="CmdUnsupportedVSTestTestApplicationsDescription">
-        <source>dotnet.config defines test runner to be Microsoft.Testing.Platform. All projects must use that test runner.
+        <source>global.json defines test runner to be Microsoft.Testing.Platform. All projects must use that test runner.
 The following test projects are using VSTest test runner:
 {0}
 
 See https://aka.ms/dotnet-test/mtp for more information.</source>
-        <target state="translated">dotnet.config, test çalıştırıcısını Microsoft.Testing.Platform olarak tanımlar. Tüm projelerin bu test çalıştırıcısını kullanması gereklidir.
+        <target state="needs-review-translation">dotnet.config, test çalıştırıcısını Microsoft.Testing.Platform olarak tanımlar. Tüm projelerin bu test çalıştırıcısını kullanması gereklidir.
 Aşağıdaki test projeleri VSTest test çalıştırıcısını kullanıyor:
 {0}
 
 Daha fazla bilgi için https://aka.ms/dotnet-test/mtp adresine bakın.</target>
-        <note>{0} is one or more project names.
-Microsoft.Testing.Platform is a name, don't translate.
-dotnet.config is a name don't translate.</note>
+        <note>{Locked="global.json"}{Locked="Microsoft.Testing.Platform"}
+{0} is one or more project names.</note>
       </trans-unit>
       <trans-unit id="CmdUseLockFileOptionDescription">
         <source>Enables project lock file to be generated and used with restore.</source>
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hans.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hans.xlf
index 822c1d08279c..f2cd64c757b1 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hans.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hans.xlf
@@ -878,19 +878,18 @@ The specified directory will be created if it does not exist.</source>
         <note />
       </trans-unit>
       <trans-unit id="CmdUnsupportedVSTestTestApplicationsDescription">
-        <source>dotnet.config defines test runner to be Microsoft.Testing.Platform. All projects must use that test runner.
+        <source>global.json defines test runner to be Microsoft.Testing.Platform. All projects must use that test runner.
 The following test projects are using VSTest test runner:
 {0}
 
 See https://aka.ms/dotnet-test/mtp for more information.</source>
-        <target state="translated">dotnet.config 将测试运行器定义为 Microsoft.Testing.Platform。所有项目必须使用该测试运行器。
+        <target state="needs-review-translation">dotnet.config 将测试运行器定义为 Microsoft.Testing.Platform。所有项目必须使用该测试运行器。
 以下测试项目正在使用 VSTest 测试运行器:
 {0}
 
 有关详细信息，请参阅 https://aka.ms/dotnet-test/mtp。</target>
-        <note>{0} is one or more project names.
-Microsoft.Testing.Platform is a name, don't translate.
-dotnet.config is a name don't translate.</note>
+        <note>{Locked="global.json"}{Locked="Microsoft.Testing.Platform"}
+{0} is one or more project names.</note>
       </trans-unit>
       <trans-unit id="CmdUseLockFileOptionDescription">
         <source>Enables project lock file to be generated and used with restore.</source>
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hant.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hant.xlf
index 82d48dc66e0c..757f2270e3c9 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hant.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hant.xlf
@@ -878,19 +878,18 @@ The specified directory will be created if it does not exist.</source>
         <note />
       </trans-unit>
       <trans-unit id="CmdUnsupportedVSTestTestApplicationsDescription">
-        <source>dotnet.config defines test runner to be Microsoft.Testing.Platform. All projects must use that test runner.
+        <source>global.json defines test runner to be Microsoft.Testing.Platform. All projects must use that test runner.
 The following test projects are using VSTest test runner:
 {0}
 
 See https://aka.ms/dotnet-test/mtp for more information.</source>
-        <target state="translated">dotnet.config 定義測試執行器為 Microsoft.Testing.Platform。所有專案必須使用該測試執行器。
+        <target state="needs-review-translation">dotnet.config 定義測試執行器為 Microsoft.Testing.Platform。所有專案必須使用該測試執行器。
 以下測試專案正在使用 VSTest 測試執行器:
 {0}
 
 如需詳細資訊，請參閱 https://aka.ms/dotnet-test/mtp。</target>
-        <note>{0} is one or more project names.
-Microsoft.Testing.Platform is a name, don't translate.
-dotnet.config is a name don't translate.</note>
+        <note>{Locked="global.json"}{Locked="Microsoft.Testing.Platform"}
+{0} is one or more project names.</note>
       </trans-unit>
       <trans-unit id="CmdUseLockFileOptionDescription">
         <source>Enables project lock file to be generated and used with restore.</source>
diff --git a/src/Cli/dotnet/dotnet.csproj b/src/Cli/dotnet/dotnet.csproj
index 156dc1027688..2e63f9a3c5a8 100644
--- a/src/Cli/dotnet/dotnet.csproj
+++ b/src/Cli/dotnet/dotnet.csproj
@@ -66,7 +66,6 @@
     <PackageReference Include="Microsoft.Windows.CsWin32" IncludeAssets="all" Condition="'$(DotNetBuildSourceOnly)' != 'true'" />
     <!-- Lift dependency of NETStandard.Library.NETFramework to version produced in SBRP. -->
     <PackageReference Include="NETStandard.Library" VersionOverride="$(NETStandardLibraryVersion)" ExcludeAssets="All" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Ini" />
     <PackageReference Include="Microsoft.CodeAnalysis.BuildClient" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" />
   </ItemGroup>
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.cs.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.cs.json
index 0fdb47a86fa9..a84a213c397a 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.cs.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.cs.json
@@ -52,7 +52,7 @@
   "symbols/Fixture/choices/TestCleanup/description": "Metoda testovacího přípravku TestCleanup",
   "postActions/restoreNugetPackages/description": "Obnoví balíčky NuGet vyžadované tímto projektem.",
   "postActions/restoreNugetPackages/manualInstructions/default/text": "Spustit dotnet restore",
-  "postActions/createOrUpdateDotnetConfig/description": "Create or update 'dotnet.config' file required by Microsoft.Testing.Platform.",
-  "postActions/createOrUpdateDotnetConfig/manualInstructions/default/text": "Manually create 'dotnet.config' file setting the test runner to Microsoft.Testing.Platform",
+  "postActions/addJsonProperty/description": "Create or update 'global.json' file required by Microsoft.Testing.Platform.",
+  "postActions/addJsonProperty/manualInstructions/default/text": "Manually update or create 'global.json' file setting the test runner to Microsoft.Testing.Platform",
   "postActions/openInEditor/description": "Otevře Test1.cs v editoru."
 }
\ No newline at end of file
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.de.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.de.json
index 594cf985b372..6ce2fa04d6bb 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.de.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.de.json
@@ -52,7 +52,7 @@
   "symbols/Fixture/choices/TestCleanup/description": "Fixierungsmethode \"TestCleanup\"",
   "postActions/restoreNugetPackages/description": "Stellt die NuGet-Pakete wieder her, die für dieses Projekt erforderlich sind.",
   "postActions/restoreNugetPackages/manualInstructions/default/text": "\"dotnet restore\" ausführen",
-  "postActions/createOrUpdateDotnetConfig/description": "Create or update 'dotnet.config' file required by Microsoft.Testing.Platform.",
-  "postActions/createOrUpdateDotnetConfig/manualInstructions/default/text": "Manually create 'dotnet.config' file setting the test runner to Microsoft.Testing.Platform",
+  "postActions/addJsonProperty/description": "Create or update 'global.json' file required by Microsoft.Testing.Platform.",
+  "postActions/addJsonProperty/manualInstructions/default/text": "Manually update or create 'global.json' file setting the test runner to Microsoft.Testing.Platform",
   "postActions/openInEditor/description": "Öffnet Test1.cs im Editor"
 }
\ No newline at end of file
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.en.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.en.json
index fb2e89825d4e..ef734e6510e4 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.en.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.en.json
@@ -52,7 +52,7 @@
   "symbols/Fixture/choices/TestCleanup/description": "TestCleanup fixture method",
   "postActions/restoreNugetPackages/description": "Restore NuGet packages required by this project.",
   "postActions/restoreNugetPackages/manualInstructions/default/text": "Run 'dotnet restore'",
-  "postActions/createOrUpdateDotnetConfig/description": "Create or update 'dotnet.config' file required by Microsoft.Testing.Platform.",
-  "postActions/createOrUpdateDotnetConfig/manualInstructions/default/text": "Manually create 'dotnet.config' file setting the test runner to Microsoft.Testing.Platform",
+  "postActions/addJsonProperty/description": "Create or update 'global.json' file required by Microsoft.Testing.Platform.",
+  "postActions/addJsonProperty/manualInstructions/default/text": "Manually update or create 'global.json' file setting the test runner to Microsoft.Testing.Platform",
   "postActions/openInEditor/description": "Opens Test1.cs in the editor"
 }
\ No newline at end of file
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.es.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.es.json
index 0b1442b5b7b5..79f6e8b7ed5f 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.es.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.es.json
@@ -52,7 +52,7 @@
   "symbols/Fixture/choices/TestCleanup/description": "Método de accesorio TestCleanup",
   "postActions/restoreNugetPackages/description": "Restaure los paquetes NuGet necesarios para este proyecto.",
   "postActions/restoreNugetPackages/manualInstructions/default/text": "Ejecutar \"dotnet restore\"",
-  "postActions/createOrUpdateDotnetConfig/description": "Create or update 'dotnet.config' file required by Microsoft.Testing.Platform.",
-  "postActions/createOrUpdateDotnetConfig/manualInstructions/default/text": "Manually create 'dotnet.config' file setting the test runner to Microsoft.Testing.Platform",
+  "postActions/addJsonProperty/description": "Create or update 'global.json' file required by Microsoft.Testing.Platform.",
+  "postActions/addJsonProperty/manualInstructions/default/text": "Manually update or create 'global.json' file setting the test runner to Microsoft.Testing.Platform",
   "postActions/openInEditor/description": "Abrir Test1.cs en el editor."
 }
\ No newline at end of file
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.fr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.fr.json
index 21305173780f..53fe20ff3650 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.fr.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.fr.json
@@ -52,7 +52,7 @@
   "symbols/Fixture/choices/TestCleanup/description": "Méthode de fixture TestCleanup",
   "postActions/restoreNugetPackages/description": "Restaurez les packages NuGet requis par ce projet.",
   "postActions/restoreNugetPackages/manualInstructions/default/text": "Exécutez « dotnet restore »",
-  "postActions/createOrUpdateDotnetConfig/description": "Create or update 'dotnet.config' file required by Microsoft.Testing.Platform.",
-  "postActions/createOrUpdateDotnetConfig/manualInstructions/default/text": "Manually create 'dotnet.config' file setting the test runner to Microsoft.Testing.Platform",
+  "postActions/addJsonProperty/description": "Create or update 'global.json' file required by Microsoft.Testing.Platform.",
+  "postActions/addJsonProperty/manualInstructions/default/text": "Manually update or create 'global.json' file setting the test runner to Microsoft.Testing.Platform",
   "postActions/openInEditor/description": "Ouvre Test1.cs dans l’éditeur"
 }
\ No newline at end of file
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.it.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.it.json
index a068453a420d..f0bbe81b6081 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.it.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.it.json
@@ -52,7 +52,7 @@
   "symbols/Fixture/choices/TestCleanup/description": "Metodo fixture TestCleanup",
   "postActions/restoreNugetPackages/description": "Ripristina i pacchetti NuGet richiesti da questo progetto.",
   "postActions/restoreNugetPackages/manualInstructions/default/text": "Esegui 'dotnet restore'",
-  "postActions/createOrUpdateDotnetConfig/description": "Create or update 'dotnet.config' file required by Microsoft.Testing.Platform.",
-  "postActions/createOrUpdateDotnetConfig/manualInstructions/default/text": "Manually create 'dotnet.config' file setting the test runner to Microsoft.Testing.Platform",
+  "postActions/addJsonProperty/description": "Create or update 'global.json' file required by Microsoft.Testing.Platform.",
+  "postActions/addJsonProperty/manualInstructions/default/text": "Manually update or create 'global.json' file setting the test runner to Microsoft.Testing.Platform",
   "postActions/openInEditor/description": "Apre Test1.cs nell'editor"
 }
\ No newline at end of file
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ja.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ja.json
index e363c2123673..8abec526fba5 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ja.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ja.json
@@ -52,7 +52,7 @@
   "symbols/Fixture/choices/TestCleanup/description": "TestCleanup フィクスチャ メソッド",
   "postActions/restoreNugetPackages/description": "このプロジェクトに必要な NuGet パッケージを復元します。",
   "postActions/restoreNugetPackages/manualInstructions/default/text": "'dotnet restore' を実行する",
-  "postActions/createOrUpdateDotnetConfig/description": "Create or update 'dotnet.config' file required by Microsoft.Testing.Platform.",
-  "postActions/createOrUpdateDotnetConfig/manualInstructions/default/text": "Manually create 'dotnet.config' file setting the test runner to Microsoft.Testing.Platform",
+  "postActions/addJsonProperty/description": "Create or update 'global.json' file required by Microsoft.Testing.Platform.",
+  "postActions/addJsonProperty/manualInstructions/default/text": "Manually update or create 'global.json' file setting the test runner to Microsoft.Testing.Platform",
   "postActions/openInEditor/description": "エディターで Test1.cs を開きます"
 }
\ No newline at end of file
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ko.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ko.json
index ce2b14bc2d29..7b5233ccbc18 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ko.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ko.json
@@ -52,7 +52,7 @@
   "symbols/Fixture/choices/TestCleanup/description": "TestCleanup fixture 메서드",
   "postActions/restoreNugetPackages/description": "이 프로젝트에 필요한 NuGet 패키지를 복원합니다.",
   "postActions/restoreNugetPackages/manualInstructions/default/text": "'dotnet restore' 실행",
-  "postActions/createOrUpdateDotnetConfig/description": "Create or update 'dotnet.config' file required by Microsoft.Testing.Platform.",
-  "postActions/createOrUpdateDotnetConfig/manualInstructions/default/text": "Manually create 'dotnet.config' file setting the test runner to Microsoft.Testing.Platform",
+  "postActions/addJsonProperty/description": "Create or update 'global.json' file required by Microsoft.Testing.Platform.",
+  "postActions/addJsonProperty/manualInstructions/default/text": "Manually update or create 'global.json' file setting the test runner to Microsoft.Testing.Platform",
   "postActions/openInEditor/description": "편집기에서 Test1.cs 열기"
 }
\ No newline at end of file
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.pl.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.pl.json
index a22f3f0cb23c..bca7305e53d9 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.pl.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.pl.json
@@ -52,7 +52,7 @@
   "symbols/Fixture/choices/TestCleanup/description": "TestCleanup — metoda początkowa",
   "postActions/restoreNugetPackages/description": "Przywróć pakiety NuGet wymagane przez ten projekt.",
   "postActions/restoreNugetPackages/manualInstructions/default/text": "Uruchom polecenie „dotnet restore”",
-  "postActions/createOrUpdateDotnetConfig/description": "Create or update 'dotnet.config' file required by Microsoft.Testing.Platform.",
-  "postActions/createOrUpdateDotnetConfig/manualInstructions/default/text": "Manually create 'dotnet.config' file setting the test runner to Microsoft.Testing.Platform",
+  "postActions/addJsonProperty/description": "Create or update 'global.json' file required by Microsoft.Testing.Platform.",
+  "postActions/addJsonProperty/manualInstructions/default/text": "Manually update or create 'global.json' file setting the test runner to Microsoft.Testing.Platform",
   "postActions/openInEditor/description": "Otwiera plik Test1.cs w edytorze"
 }
\ No newline at end of file
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.pt-BR.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.pt-BR.json
index 7344f39086ef..e97e6205db55 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.pt-BR.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.pt-BR.json
@@ -52,7 +52,7 @@
   "symbols/Fixture/choices/TestCleanup/description": "Método de acessório TestCleanup",
   "postActions/restoreNugetPackages/description": "Restaura os pacotes do NuGet exigidos por este projeto.",
   "postActions/restoreNugetPackages/manualInstructions/default/text": "Executa \"dotnet restore\"",
-  "postActions/createOrUpdateDotnetConfig/description": "Create or update 'dotnet.config' file required by Microsoft.Testing.Platform.",
-  "postActions/createOrUpdateDotnetConfig/manualInstructions/default/text": "Manually create 'dotnet.config' file setting the test runner to Microsoft.Testing.Platform",
+  "postActions/addJsonProperty/description": "Create or update 'global.json' file required by Microsoft.Testing.Platform.",
+  "postActions/addJsonProperty/manualInstructions/default/text": "Manually update or create 'global.json' file setting the test runner to Microsoft.Testing.Platform",
   "postActions/openInEditor/description": "Abre o Test1.cs no editor"
 }
\ No newline at end of file
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ru.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ru.json
index 975bfb42ae77..b3bd988269a7 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ru.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.ru.json
@@ -52,7 +52,7 @@
   "symbols/Fixture/choices/TestCleanup/description": "Метод работы со средствами TestCleanup",
   "postActions/restoreNugetPackages/description": "Восстановление пакетов NuGet, необходимых для этого проекта.",
   "postActions/restoreNugetPackages/manualInstructions/default/text": "Выполнить команду \"dotnet restore\"",
-  "postActions/createOrUpdateDotnetConfig/description": "Create or update 'dotnet.config' file required by Microsoft.Testing.Platform.",
-  "postActions/createOrUpdateDotnetConfig/manualInstructions/default/text": "Manually create 'dotnet.config' file setting the test runner to Microsoft.Testing.Platform",
+  "postActions/addJsonProperty/description": "Create or update 'global.json' file required by Microsoft.Testing.Platform.",
+  "postActions/addJsonProperty/manualInstructions/default/text": "Manually update or create 'global.json' file setting the test runner to Microsoft.Testing.Platform",
   "postActions/openInEditor/description": "Открывает Test1.cs редакторе"
 }
\ No newline at end of file
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.tr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.tr.json
index a045955a540e..e09e1d1eb151 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.tr.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.tr.json
@@ -52,7 +52,7 @@
   "symbols/Fixture/choices/TestCleanup/description": "TestCleanup düzen yöntemi",
   "postActions/restoreNugetPackages/description": "Bu projenin gerektirdiği NuGet paketlerini geri yükleyin.",
   "postActions/restoreNugetPackages/manualInstructions/default/text": "\"dotnet restore\" çalıştır",
-  "postActions/createOrUpdateDotnetConfig/description": "Create or update 'dotnet.config' file required by Microsoft.Testing.Platform.",
-  "postActions/createOrUpdateDotnetConfig/manualInstructions/default/text": "Manually create 'dotnet.config' file setting the test runner to Microsoft.Testing.Platform",
+  "postActions/addJsonProperty/description": "Create or update 'global.json' file required by Microsoft.Testing.Platform.",
+  "postActions/addJsonProperty/manualInstructions/default/text": "Manually update or create 'global.json' file setting the test runner to Microsoft.Testing.Platform",
   "postActions/openInEditor/description": "Test1.cs'yi düzenleyicide açar"
 }
\ No newline at end of file
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.zh-Hans.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.zh-Hans.json
index 273193085681..a7fda34f2294 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.zh-Hans.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.zh-Hans.json
@@ -52,7 +52,7 @@
   "symbols/Fixture/choices/TestCleanup/description": "TestCleanup 固定例程方法",
   "postActions/restoreNugetPackages/description": "还原此项目所需的 NuGet 包。",
   "postActions/restoreNugetPackages/manualInstructions/default/text": "运行 \"dotnet restore\"",
-  "postActions/createOrUpdateDotnetConfig/description": "Create or update 'dotnet.config' file required by Microsoft.Testing.Platform.",
-  "postActions/createOrUpdateDotnetConfig/manualInstructions/default/text": "Manually create 'dotnet.config' file setting the test runner to Microsoft.Testing.Platform",
+  "postActions/addJsonProperty/description": "Create or update 'global.json' file required by Microsoft.Testing.Platform.",
+  "postActions/addJsonProperty/manualInstructions/default/text": "Manually update or create 'global.json' file setting the test runner to Microsoft.Testing.Platform",
   "postActions/openInEditor/description": "在编辑器中打开 Test1.cs"
 }
\ No newline at end of file
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.zh-Hant.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.zh-Hant.json
index d625f9cf2d93..51fc6105a344 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.zh-Hant.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/localize/templatestrings.zh-Hant.json
@@ -52,7 +52,7 @@
   "symbols/Fixture/choices/TestCleanup/description": "TestCleanup 固件方法",
   "postActions/restoreNugetPackages/description": "還原此專案所需的 NuGet 套件。",
   "postActions/restoreNugetPackages/manualInstructions/default/text": "執行 'dotnet restore'",
-  "postActions/createOrUpdateDotnetConfig/description": "Create or update 'dotnet.config' file required by Microsoft.Testing.Platform.",
-  "postActions/createOrUpdateDotnetConfig/manualInstructions/default/text": "Manually create 'dotnet.config' file setting the test runner to Microsoft.Testing.Platform",
+  "postActions/addJsonProperty/description": "Create or update 'global.json' file required by Microsoft.Testing.Platform.",
+  "postActions/addJsonProperty/manualInstructions/default/text": "Manually update or create 'global.json' file setting the test runner to Microsoft.Testing.Platform",
   "postActions/openInEditor/description": "在編輯器中開啟 Test1.cs"
 }
\ No newline at end of file
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/template.json
index 95b01952003c..01977ec20d99 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/template.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/.template.config/template.json
@@ -229,14 +229,18 @@
     },
     {
       "condition": "(TestRunner == \"Microsoft.Testing.Platform\")",
-      "description": "Create or update 'dotnet.config' file required by Microsoft.Testing.Platform.",
-      "manualInstructions": [{ "text": "Manually create 'dotnet.config' file setting the test runner to Microsoft.Testing.Platform" }],
-      "actionId": "597E7933-0D87-452C-B094-8FA0EEF7FD97",
-      "id": "createOrUpdateDotnetConfig",
+      "description": "Create or update 'global.json' file required by Microsoft.Testing.Platform.",
+      "manualInstructions": [{ "text": "Manually update or create 'global.json' file setting the test runner to Microsoft.Testing.Platform" }],
+      "actionId": "695A3659-EB40-4FF5-A6A6-C9C4E629FCB0",
+      "id": "addJsonProperty",
       "args": {
-        "section": "dotnet.test.runner",
-        "key": "name",
-        "value": "Microsoft.Testing.Platform",
+        "allowFileCreation": true,
+        "allowPathCreation": true,
+        "jsonFileName": "global.json",
+        "parentPropertyPath": "test",
+        "newJsonPropertyName": "runner",
+        "newJsonPropertyValue": "Microsoft.Testing.Platform",
+        "detectRepositoryRootForFileCreation": true
       },
       "continueOnError": true
     },
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.cs.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.cs.json
index 1d701ed95fde..b7ff6b32d45f 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.cs.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.cs.json
@@ -52,7 +52,7 @@
   "symbols/Fixture/choices/TestCleanup/description": "Metoda testovacího přípravku TestCleanup",
   "postActions/restoreNugetPackages/description": "Obnoví balíčky NuGet vyžadované tímto projektem.",
   "postActions/restoreNugetPackages/manualInstructions/default/text": "Spustit dotnet restore",
-  "postActions/createOrUpdateDotnetConfig/description": "Create or update 'dotnet.config' file required by Microsoft.Testing.Platform.",
-  "postActions/createOrUpdateDotnetConfig/manualInstructions/default/text": "Manually create 'dotnet.config' file setting the test runner to Microsoft.Testing.Platform",
+  "postActions/addJsonProperty/description": "Create or update 'global.json' file required by Microsoft.Testing.Platform.",
+  "postActions/addJsonProperty/manualInstructions/default/text": "Manually update or create 'global.json' file setting the test runner to Microsoft.Testing.Platform",
   "postActions/openInEditor/description": "Otevře Test1.fs v editoru."
 }
\ No newline at end of file
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.de.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.de.json
index c74ad6135107..83a5669b3e1b 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.de.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.de.json
@@ -52,7 +52,7 @@
   "symbols/Fixture/choices/TestCleanup/description": "Fixierungsmethode \"TestCleanup\"",
   "postActions/restoreNugetPackages/description": "Stellt die NuGet-Pakete wieder her, die für dieses Projekt erforderlich sind.",
   "postActions/restoreNugetPackages/manualInstructions/default/text": "\"dotnet restore\" ausführen",
-  "postActions/createOrUpdateDotnetConfig/description": "Create or update 'dotnet.config' file required by Microsoft.Testing.Platform.",
-  "postActions/createOrUpdateDotnetConfig/manualInstructions/default/text": "Manually create 'dotnet.config' file setting the test runner to Microsoft.Testing.Platform",
+  "postActions/addJsonProperty/description": "Create or update 'global.json' file required by Microsoft.Testing.Platform.",
+  "postActions/addJsonProperty/manualInstructions/default/text": "Manually update or create 'global.json' file setting the test runner to Microsoft.Testing.Platform",
   "postActions/openInEditor/description": "Öffnet Test1.fs im Editor"
 }
\ No newline at end of file
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.en.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.en.json
index 58bb621b8d4d..2ddfebf82f61 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.en.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.en.json
@@ -52,7 +52,7 @@
   "symbols/Fixture/choices/TestCleanup/description": "TestCleanup fixture method",
   "postActions/restoreNugetPackages/description": "Restore NuGet packages required by this project.",
   "postActions/restoreNugetPackages/manualInstructions/default/text": "Run 'dotnet restore'",
-  "postActions/createOrUpdateDotnetConfig/description": "Create or update 'dotnet.config' file required by Microsoft.Testing.Platform.",
-  "postActions/createOrUpdateDotnetConfig/manualInstructions/default/text": "Manually create 'dotnet.config' file setting the test runner to Microsoft.Testing.Platform",
+  "postActions/addJsonProperty/description": "Create or update 'global.json' file required by Microsoft.Testing.Platform.",
+  "postActions/addJsonProperty/manualInstructions/default/text": "Manually update or create 'global.json' file setting the test runner to Microsoft.Testing.Platform",
   "postActions/openInEditor/description": "Opens Test1.fs in the editor"
 }
\ No newline at end of file
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.es.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.es.json
index b76c96adbd90..1e9575a5346f 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.es.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.es.json
@@ -52,7 +52,7 @@
   "symbols/Fixture/choices/TestCleanup/description": "Método de accesorio TestCleanup",
   "postActions/restoreNugetPackages/description": "Restaure los paquetes NuGet necesarios para este proyecto.",
   "postActions/restoreNugetPackages/manualInstructions/default/text": "Ejecutar \"dotnet restore\"",
-  "postActions/createOrUpdateDotnetConfig/description": "Create or update 'dotnet.config' file required by Microsoft.Testing.Platform.",
-  "postActions/createOrUpdateDotnetConfig/manualInstructions/default/text": "Manually create 'dotnet.config' file setting the test runner to Microsoft.Testing.Platform",
+  "postActions/addJsonProperty/description": "Create or update 'global.json' file required by Microsoft.Testing.Platform.",
+  "postActions/addJsonProperty/manualInstructions/default/text": "Manually update or create 'global.json' file setting the test runner to Microsoft.Testing.Platform",
   "postActions/openInEditor/description": "Abrir Test1.fs en el editor"
 }
\ No newline at end of file
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.fr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.fr.json
index 4b6587cf41b6..8c0eb4a05506 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.fr.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.fr.json
@@ -52,7 +52,7 @@
   "symbols/Fixture/choices/TestCleanup/description": "Méthode de fixture TestCleanup",
   "postActions/restoreNugetPackages/description": "Restaurez les packages NuGet requis par ce projet.",
   "postActions/restoreNugetPackages/manualInstructions/default/text": "Exécutez « dotnet restore »",
-  "postActions/createOrUpdateDotnetConfig/description": "Create or update 'dotnet.config' file required by Microsoft.Testing.Platform.",
-  "postActions/createOrUpdateDotnetConfig/manualInstructions/default/text": "Manually create 'dotnet.config' file setting the test runner to Microsoft.Testing.Platform",
+  "postActions/addJsonProperty/description": "Create or update 'global.json' file required by Microsoft.Testing.Platform.",
+  "postActions/addJsonProperty/manualInstructions/default/text": "Manually update or create 'global.json' file setting the test runner to Microsoft.Testing.Platform",
   "postActions/openInEditor/description": "Ouvre Test1.fs dans l’éditeur"
 }
\ No newline at end of file
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.it.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.it.json
index cae6e5791d93..db8b42b1f617 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.it.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.it.json
@@ -52,7 +52,7 @@
   "symbols/Fixture/choices/TestCleanup/description": "Metodo fixture TestCleanup",
   "postActions/restoreNugetPackages/description": "Ripristina i pacchetti NuGet richiesti da questo progetto.",
   "postActions/restoreNugetPackages/manualInstructions/default/text": "Esegui 'dotnet restore'",
-  "postActions/createOrUpdateDotnetConfig/description": "Create or update 'dotnet.config' file required by Microsoft.Testing.Platform.",
-  "postActions/createOrUpdateDotnetConfig/manualInstructions/default/text": "Manually create 'dotnet.config' file setting the test runner to Microsoft.Testing.Platform",
+  "postActions/addJsonProperty/description": "Create or update 'global.json' file required by Microsoft.Testing.Platform.",
+  "postActions/addJsonProperty/manualInstructions/default/text": "Manually update or create 'global.json' file setting the test runner to Microsoft.Testing.Platform",
   "postActions/openInEditor/description": "Apre Test1.fs nell'editor"
 }
\ No newline at end of file
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ja.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ja.json
index 0d237e3e1fb1..93ecd87fadd3 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ja.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ja.json
@@ -52,7 +52,7 @@
   "symbols/Fixture/choices/TestCleanup/description": "TestCleanup フィクスチャ メソッド",
   "postActions/restoreNugetPackages/description": "このプロジェクトに必要な NuGet パッケージを復元します。",
   "postActions/restoreNugetPackages/manualInstructions/default/text": "'dotnet restore' を実行する",
-  "postActions/createOrUpdateDotnetConfig/description": "Create or update 'dotnet.config' file required by Microsoft.Testing.Platform.",
-  "postActions/createOrUpdateDotnetConfig/manualInstructions/default/text": "Manually create 'dotnet.config' file setting the test runner to Microsoft.Testing.Platform",
+  "postActions/addJsonProperty/description": "Create or update 'global.json' file required by Microsoft.Testing.Platform.",
+  "postActions/addJsonProperty/manualInstructions/default/text": "Manually update or create 'global.json' file setting the test runner to Microsoft.Testing.Platform",
   "postActions/openInEditor/description": "エディターで Test1.fs を開きます"
 }
\ No newline at end of file
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ko.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ko.json
index 2ca744e3e3d7..4d43f0445d48 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ko.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ko.json
@@ -52,7 +52,7 @@
   "symbols/Fixture/choices/TestCleanup/description": "TestCleanup fixture 메서드",
   "postActions/restoreNugetPackages/description": "이 프로젝트에 필요한 NuGet 패키지를 복원합니다.",
   "postActions/restoreNugetPackages/manualInstructions/default/text": "'dotnet restore' 실행",
-  "postActions/createOrUpdateDotnetConfig/description": "Create or update 'dotnet.config' file required by Microsoft.Testing.Platform.",
-  "postActions/createOrUpdateDotnetConfig/manualInstructions/default/text": "Manually create 'dotnet.config' file setting the test runner to Microsoft.Testing.Platform",
+  "postActions/addJsonProperty/description": "Create or update 'global.json' file required by Microsoft.Testing.Platform.",
+  "postActions/addJsonProperty/manualInstructions/default/text": "Manually update or create 'global.json' file setting the test runner to Microsoft.Testing.Platform",
   "postActions/openInEditor/description": "편집기에서 Test1.fs 열기"
 }
\ No newline at end of file
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.pl.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.pl.json
index d1049621573c..0562966c9b78 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.pl.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.pl.json
@@ -52,7 +52,7 @@
   "symbols/Fixture/choices/TestCleanup/description": "TestCleanup — metoda początkowa",
   "postActions/restoreNugetPackages/description": "Przywróć pakiety NuGet wymagane przez ten projekt.",
   "postActions/restoreNugetPackages/manualInstructions/default/text": "Uruchom polecenie „dotnet restore”",
-  "postActions/createOrUpdateDotnetConfig/description": "Create or update 'dotnet.config' file required by Microsoft.Testing.Platform.",
-  "postActions/createOrUpdateDotnetConfig/manualInstructions/default/text": "Manually create 'dotnet.config' file setting the test runner to Microsoft.Testing.Platform",
+  "postActions/addJsonProperty/description": "Create or update 'global.json' file required by Microsoft.Testing.Platform.",
+  "postActions/addJsonProperty/manualInstructions/default/text": "Manually update or create 'global.json' file setting the test runner to Microsoft.Testing.Platform",
   "postActions/openInEditor/description": "Otwiera plik Test1.fs w edytorze"
 }
\ No newline at end of file
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.pt-BR.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.pt-BR.json
index 782c6fd53de6..1e0e1f8c92d2 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.pt-BR.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.pt-BR.json
@@ -52,7 +52,7 @@
   "symbols/Fixture/choices/TestCleanup/description": "Método de acessório TestCleanup",
   "postActions/restoreNugetPackages/description": "Restaura os pacotes do NuGet exigidos por este projeto.",
   "postActions/restoreNugetPackages/manualInstructions/default/text": "Executa \"dotnet restore\"",
-  "postActions/createOrUpdateDotnetConfig/description": "Create or update 'dotnet.config' file required by Microsoft.Testing.Platform.",
-  "postActions/createOrUpdateDotnetConfig/manualInstructions/default/text": "Manually create 'dotnet.config' file setting the test runner to Microsoft.Testing.Platform",
+  "postActions/addJsonProperty/description": "Create or update 'global.json' file required by Microsoft.Testing.Platform.",
+  "postActions/addJsonProperty/manualInstructions/default/text": "Manually update or create 'global.json' file setting the test runner to Microsoft.Testing.Platform",
   "postActions/openInEditor/description": "Abre o Test1.fs no editor"
 }
\ No newline at end of file
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ru.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ru.json
index cee394752afe..d82d72c10c99 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ru.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.ru.json
@@ -52,7 +52,7 @@
   "symbols/Fixture/choices/TestCleanup/description": "Метод работы со средствами TestCleanup",
   "postActions/restoreNugetPackages/description": "Восстановление пакетов NuGet, необходимых для этого проекта.",
   "postActions/restoreNugetPackages/manualInstructions/default/text": "Выполнить команду \"dotnet restore\"",
-  "postActions/createOrUpdateDotnetConfig/description": "Create or update 'dotnet.config' file required by Microsoft.Testing.Platform.",
-  "postActions/createOrUpdateDotnetConfig/manualInstructions/default/text": "Manually create 'dotnet.config' file setting the test runner to Microsoft.Testing.Platform",
+  "postActions/addJsonProperty/description": "Create or update 'global.json' file required by Microsoft.Testing.Platform.",
+  "postActions/addJsonProperty/manualInstructions/default/text": "Manually update or create 'global.json' file setting the test runner to Microsoft.Testing.Platform",
   "postActions/openInEditor/description": "Открывает Test1.fs в редакторе"
 }
\ No newline at end of file
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.tr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.tr.json
index 0f8978497413..1cd7b63e0a39 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.tr.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.tr.json
@@ -52,7 +52,7 @@
   "symbols/Fixture/choices/TestCleanup/description": "TestCleanup düzen yöntemi",
   "postActions/restoreNugetPackages/description": "Bu projenin gerektirdiği NuGet paketlerini geri yükleyin.",
   "postActions/restoreNugetPackages/manualInstructions/default/text": "\"dotnet restore\" çalıştır",
-  "postActions/createOrUpdateDotnetConfig/description": "Create or update 'dotnet.config' file required by Microsoft.Testing.Platform.",
-  "postActions/createOrUpdateDotnetConfig/manualInstructions/default/text": "Manually create 'dotnet.config' file setting the test runner to Microsoft.Testing.Platform",
+  "postActions/addJsonProperty/description": "Create or update 'global.json' file required by Microsoft.Testing.Platform.",
+  "postActions/addJsonProperty/manualInstructions/default/text": "Manually update or create 'global.json' file setting the test runner to Microsoft.Testing.Platform",
   "postActions/openInEditor/description": "Test1.fs'yi düzenleyicide açar"
 }
\ No newline at end of file
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.zh-Hans.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.zh-Hans.json
index 50ce4d4cc102..bf7797f48535 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.zh-Hans.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.zh-Hans.json
@@ -52,7 +52,7 @@
   "symbols/Fixture/choices/TestCleanup/description": "TestCleanup 固定例程方法",
   "postActions/restoreNugetPackages/description": "还原此项目所需的 NuGet 包。",
   "postActions/restoreNugetPackages/manualInstructions/default/text": "运行 \"dotnet restore\"",
-  "postActions/createOrUpdateDotnetConfig/description": "Create or update 'dotnet.config' file required by Microsoft.Testing.Platform.",
-  "postActions/createOrUpdateDotnetConfig/manualInstructions/default/text": "Manually create 'dotnet.config' file setting the test runner to Microsoft.Testing.Platform",
+  "postActions/addJsonProperty/description": "Create or update 'global.json' file required by Microsoft.Testing.Platform.",
+  "postActions/addJsonProperty/manualInstructions/default/text": "Manually update or create 'global.json' file setting the test runner to Microsoft.Testing.Platform",
   "postActions/openInEditor/description": "在编辑器中打开 Test1.fs"
 }
\ No newline at end of file
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.zh-Hant.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.zh-Hant.json
index c617677cabde..0f55f462362c 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.zh-Hant.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/localize/templatestrings.zh-Hant.json
@@ -52,7 +52,7 @@
   "symbols/Fixture/choices/TestCleanup/description": "TestCleanup 固件方法",
   "postActions/restoreNugetPackages/description": "還原此專案所需的 NuGet 套件。",
   "postActions/restoreNugetPackages/manualInstructions/default/text": "執行 'dotnet restore'",
-  "postActions/createOrUpdateDotnetConfig/description": "Create or update 'dotnet.config' file required by Microsoft.Testing.Platform.",
-  "postActions/createOrUpdateDotnetConfig/manualInstructions/default/text": "Manually create 'dotnet.config' file setting the test runner to Microsoft.Testing.Platform",
+  "postActions/addJsonProperty/description": "Create or update 'global.json' file required by Microsoft.Testing.Platform.",
+  "postActions/addJsonProperty/manualInstructions/default/text": "Manually update or create 'global.json' file setting the test runner to Microsoft.Testing.Platform",
   "postActions/openInEditor/description": "在編輯器中開啟 Test1.fs"
 }
\ No newline at end of file
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/template.json
index d7f018f5efc6..022ffe70b9cf 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/template.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/.template.config/template.json
@@ -229,14 +229,18 @@
     },
     {
       "condition": "(TestRunner == \"Microsoft.Testing.Platform\")",
-      "description": "Create or update 'dotnet.config' file required by Microsoft.Testing.Platform.",
-      "manualInstructions": [{ "text": "Manually create 'dotnet.config' file setting the test runner to Microsoft.Testing.Platform" }],
-      "actionId": "597E7933-0D87-452C-B094-8FA0EEF7FD97",
-      "id": "createOrUpdateDotnetConfig",
+      "description": "Create or update 'global.json' file required by Microsoft.Testing.Platform.",
+      "manualInstructions": [{ "text": "Manually update or create 'global.json' file setting the test runner to Microsoft.Testing.Platform" }],
+      "actionId": "695A3659-EB40-4FF5-A6A6-C9C4E629FCB0",
+      "id": "addJsonProperty",
       "args": {
-        "section": "dotnet.test.runner",
-        "key": "name",
-        "value": "Microsoft.Testing.Platform",
+        "allowFileCreation": true,
+        "allowPathCreation": true,
+        "jsonFileName": "global.json",
+        "parentPropertyPath": "test",
+        "newJsonPropertyName": "runner",
+        "newJsonPropertyValue": "Microsoft.Testing.Platform",
+        "detectRepositoryRootForFileCreation": true
       },
       "continueOnError": true
     },
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.cs.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.cs.json
index a4faa216478d..d51fe797a198 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.cs.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.cs.json
@@ -52,7 +52,7 @@
   "symbols/Fixture/choices/TestCleanup/description": "Metoda testovacího přípravku TestCleanup",
   "postActions/restoreNugetPackages/description": "Obnoví balíčky NuGet vyžadované tímto projektem.",
   "postActions/restoreNugetPackages/manualInstructions/default/text": "Spustit dotnet restore",
-  "postActions/createOrUpdateDotnetConfig/description": "Create or update 'dotnet.config' file required by Microsoft.Testing.Platform.",
-  "postActions/createOrUpdateDotnetConfig/manualInstructions/default/text": "Manually create 'dotnet.config' file setting the test runner to Microsoft.Testing.Platform",
+  "postActions/addJsonProperty/description": "Create or update 'global.json' file required by Microsoft.Testing.Platform.",
+  "postActions/addJsonProperty/manualInstructions/default/text": "Manually update or create 'global.json' file setting the test runner to Microsoft.Testing.Platform",
   "postActions/openInEditor/description": "Otevře Test1.vb v editoru."
 }
\ No newline at end of file
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.de.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.de.json
index e910f6c6e6b3..91296abf8c4b 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.de.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.de.json
@@ -52,7 +52,7 @@
   "symbols/Fixture/choices/TestCleanup/description": "Fixierungsmethode \"TestCleanup\"",
   "postActions/restoreNugetPackages/description": "Stellt die NuGet-Pakete wieder her, die für dieses Projekt erforderlich sind.",
   "postActions/restoreNugetPackages/manualInstructions/default/text": "\"dotnet restore\" ausführen",
-  "postActions/createOrUpdateDotnetConfig/description": "Create or update 'dotnet.config' file required by Microsoft.Testing.Platform.",
-  "postActions/createOrUpdateDotnetConfig/manualInstructions/default/text": "Manually create 'dotnet.config' file setting the test runner to Microsoft.Testing.Platform",
+  "postActions/addJsonProperty/description": "Create or update 'global.json' file required by Microsoft.Testing.Platform.",
+  "postActions/addJsonProperty/manualInstructions/default/text": "Manually update or create 'global.json' file setting the test runner to Microsoft.Testing.Platform",
   "postActions/openInEditor/description": "Öffnet Test1.vb im Editor"
 }
\ No newline at end of file
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.en.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.en.json
index 1143066584bb..7e7ca4cc4ab3 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.en.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.en.json
@@ -52,7 +52,7 @@
   "symbols/Fixture/choices/TestCleanup/description": "TestCleanup fixture method",
   "postActions/restoreNugetPackages/description": "Restore NuGet packages required by this project.",
   "postActions/restoreNugetPackages/manualInstructions/default/text": "Run 'dotnet restore'",
-  "postActions/createOrUpdateDotnetConfig/description": "Create or update 'dotnet.config' file required by Microsoft.Testing.Platform.",
-  "postActions/createOrUpdateDotnetConfig/manualInstructions/default/text": "Manually create 'dotnet.config' file setting the test runner to Microsoft.Testing.Platform",
+  "postActions/addJsonProperty/description": "Create or update 'global.json' file required by Microsoft.Testing.Platform.",
+  "postActions/addJsonProperty/manualInstructions/default/text": "Manually update or create 'global.json' file setting the test runner to Microsoft.Testing.Platform",
   "postActions/openInEditor/description": "Opens Test1.vb in the editor"
 }
\ No newline at end of file
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.es.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.es.json
index 6812ad4fd80d..26c232daac1e 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.es.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.es.json
@@ -52,7 +52,7 @@
   "symbols/Fixture/choices/TestCleanup/description": "Método de accesorio TestCleanup",
   "postActions/restoreNugetPackages/description": "Restaure los paquetes NuGet necesarios para este proyecto.",
   "postActions/restoreNugetPackages/manualInstructions/default/text": "Ejecutar \"dotnet restore\"",
-  "postActions/createOrUpdateDotnetConfig/description": "Create or update 'dotnet.config' file required by Microsoft.Testing.Platform.",
-  "postActions/createOrUpdateDotnetConfig/manualInstructions/default/text": "Manually create 'dotnet.config' file setting the test runner to Microsoft.Testing.Platform",
+  "postActions/addJsonProperty/description": "Create or update 'global.json' file required by Microsoft.Testing.Platform.",
+  "postActions/addJsonProperty/manualInstructions/default/text": "Manually update or create 'global.json' file setting the test runner to Microsoft.Testing.Platform",
   "postActions/openInEditor/description": "Abrir Test1.vb en el editor"
 }
\ No newline at end of file
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.fr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.fr.json
index 1319abf40675..38dd553aa8a8 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.fr.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.fr.json
@@ -52,7 +52,7 @@
   "symbols/Fixture/choices/TestCleanup/description": "Méthode de fixture TestCleanup",
   "postActions/restoreNugetPackages/description": "Restaurez les packages NuGet requis par ce projet.",
   "postActions/restoreNugetPackages/manualInstructions/default/text": "Exécutez « dotnet restore »",
-  "postActions/createOrUpdateDotnetConfig/description": "Create or update 'dotnet.config' file required by Microsoft.Testing.Platform.",
-  "postActions/createOrUpdateDotnetConfig/manualInstructions/default/text": "Manually create 'dotnet.config' file setting the test runner to Microsoft.Testing.Platform",
+  "postActions/addJsonProperty/description": "Create or update 'global.json' file required by Microsoft.Testing.Platform.",
+  "postActions/addJsonProperty/manualInstructions/default/text": "Manually update or create 'global.json' file setting the test runner to Microsoft.Testing.Platform",
   "postActions/openInEditor/description": "Ouvre Test1.vb dans l’éditeur"
 }
\ No newline at end of file
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.it.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.it.json
index 215f12975feb..d90ba815124c 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.it.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.it.json
@@ -52,7 +52,7 @@
   "symbols/Fixture/choices/TestCleanup/description": "Metodo fixture TestCleanup",
   "postActions/restoreNugetPackages/description": "Ripristina i pacchetti NuGet richiesti da questo progetto.",
   "postActions/restoreNugetPackages/manualInstructions/default/text": "Esegui 'dotnet restore'",
-  "postActions/createOrUpdateDotnetConfig/description": "Create or update 'dotnet.config' file required by Microsoft.Testing.Platform.",
-  "postActions/createOrUpdateDotnetConfig/manualInstructions/default/text": "Manually create 'dotnet.config' file setting the test runner to Microsoft.Testing.Platform",
+  "postActions/addJsonProperty/description": "Create or update 'global.json' file required by Microsoft.Testing.Platform.",
+  "postActions/addJsonProperty/manualInstructions/default/text": "Manually update or create 'global.json' file setting the test runner to Microsoft.Testing.Platform",
   "postActions/openInEditor/description": "Apre Test1.vb nell'editor"
 }
\ No newline at end of file
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ja.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ja.json
index 3566ea0640e7..1e5086d83fa6 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ja.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ja.json
@@ -52,7 +52,7 @@
   "symbols/Fixture/choices/TestCleanup/description": "TestCleanup フィクスチャ メソッド",
   "postActions/restoreNugetPackages/description": "このプロジェクトに必要な NuGet パッケージを復元します。",
   "postActions/restoreNugetPackages/manualInstructions/default/text": "'dotnet restore' を実行する",
-  "postActions/createOrUpdateDotnetConfig/description": "Create or update 'dotnet.config' file required by Microsoft.Testing.Platform.",
-  "postActions/createOrUpdateDotnetConfig/manualInstructions/default/text": "Manually create 'dotnet.config' file setting the test runner to Microsoft.Testing.Platform",
+  "postActions/addJsonProperty/description": "Create or update 'global.json' file required by Microsoft.Testing.Platform.",
+  "postActions/addJsonProperty/manualInstructions/default/text": "Manually update or create 'global.json' file setting the test runner to Microsoft.Testing.Platform",
   "postActions/openInEditor/description": "エディターで Test1.vb を開きます"
 }
\ No newline at end of file
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ko.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ko.json
index 693ea4756c17..b9023d907f62 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ko.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ko.json
@@ -52,7 +52,7 @@
   "symbols/Fixture/choices/TestCleanup/description": "TestCleanup fixture 메서드",
   "postActions/restoreNugetPackages/description": "이 프로젝트에 필요한 NuGet 패키지를 복원합니다.",
   "postActions/restoreNugetPackages/manualInstructions/default/text": "'dotnet restore' 실행",
-  "postActions/createOrUpdateDotnetConfig/description": "Create or update 'dotnet.config' file required by Microsoft.Testing.Platform.",
-  "postActions/createOrUpdateDotnetConfig/manualInstructions/default/text": "Manually create 'dotnet.config' file setting the test runner to Microsoft.Testing.Platform",
+  "postActions/addJsonProperty/description": "Create or update 'global.json' file required by Microsoft.Testing.Platform.",
+  "postActions/addJsonProperty/manualInstructions/default/text": "Manually update or create 'global.json' file setting the test runner to Microsoft.Testing.Platform",
   "postActions/openInEditor/description": "편집기에서 Test1.vb 열기"
 }
\ No newline at end of file
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.pl.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.pl.json
index 210f461e4d01..2df4f1064515 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.pl.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.pl.json
@@ -52,7 +52,7 @@
   "symbols/Fixture/choices/TestCleanup/description": "TestCleanup — metoda początkowa",
   "postActions/restoreNugetPackages/description": "Przywróć pakiety NuGet wymagane przez ten projekt.",
   "postActions/restoreNugetPackages/manualInstructions/default/text": "Uruchom polecenie „dotnet restore”",
-  "postActions/createOrUpdateDotnetConfig/description": "Create or update 'dotnet.config' file required by Microsoft.Testing.Platform.",
-  "postActions/createOrUpdateDotnetConfig/manualInstructions/default/text": "Manually create 'dotnet.config' file setting the test runner to Microsoft.Testing.Platform",
+  "postActions/addJsonProperty/description": "Create or update 'global.json' file required by Microsoft.Testing.Platform.",
+  "postActions/addJsonProperty/manualInstructions/default/text": "Manually update or create 'global.json' file setting the test runner to Microsoft.Testing.Platform",
   "postActions/openInEditor/description": "Otwiera plik Test1.vb w edytorze"
 }
\ No newline at end of file
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.pt-BR.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.pt-BR.json
index a7e21b2fc4c2..b0311cbc2cac 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.pt-BR.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.pt-BR.json
@@ -52,7 +52,7 @@
   "symbols/Fixture/choices/TestCleanup/description": "Método de acessório TestCleanup",
   "postActions/restoreNugetPackages/description": "Restaura os pacotes do NuGet exigidos por este projeto.",
   "postActions/restoreNugetPackages/manualInstructions/default/text": "Executa \"dotnet restore\"",
-  "postActions/createOrUpdateDotnetConfig/description": "Create or update 'dotnet.config' file required by Microsoft.Testing.Platform.",
-  "postActions/createOrUpdateDotnetConfig/manualInstructions/default/text": "Manually create 'dotnet.config' file setting the test runner to Microsoft.Testing.Platform",
+  "postActions/addJsonProperty/description": "Create or update 'global.json' file required by Microsoft.Testing.Platform.",
+  "postActions/addJsonProperty/manualInstructions/default/text": "Manually update or create 'global.json' file setting the test runner to Microsoft.Testing.Platform",
   "postActions/openInEditor/description": "Abre o Test1.vb no editor"
 }
\ No newline at end of file
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ru.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ru.json
index c53d7943066e..b5a84d8cd027 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ru.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.ru.json
@@ -52,7 +52,7 @@
   "symbols/Fixture/choices/TestCleanup/description": "Метод работы со средствами TestCleanup",
   "postActions/restoreNugetPackages/description": "Восстановление пакетов NuGet, необходимых для этого проекта.",
   "postActions/restoreNugetPackages/manualInstructions/default/text": "Выполнить команду \"dotnet restore\"",
-  "postActions/createOrUpdateDotnetConfig/description": "Create or update 'dotnet.config' file required by Microsoft.Testing.Platform.",
-  "postActions/createOrUpdateDotnetConfig/manualInstructions/default/text": "Manually create 'dotnet.config' file setting the test runner to Microsoft.Testing.Platform",
+  "postActions/addJsonProperty/description": "Create or update 'global.json' file required by Microsoft.Testing.Platform.",
+  "postActions/addJsonProperty/manualInstructions/default/text": "Manually update or create 'global.json' file setting the test runner to Microsoft.Testing.Platform",
   "postActions/openInEditor/description": "Открывает Test1.vb в редакторе"
 }
\ No newline at end of file
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.tr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.tr.json
index 71e3b3c5933e..88d9f7cd1761 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.tr.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.tr.json
@@ -52,7 +52,7 @@
   "symbols/Fixture/choices/TestCleanup/description": "TestCleanup düzen yöntemi",
   "postActions/restoreNugetPackages/description": "Bu projenin gerektirdiği NuGet paketlerini geri yükleyin.",
   "postActions/restoreNugetPackages/manualInstructions/default/text": "\"dotnet restore\" çalıştır",
-  "postActions/createOrUpdateDotnetConfig/description": "Create or update 'dotnet.config' file required by Microsoft.Testing.Platform.",
-  "postActions/createOrUpdateDotnetConfig/manualInstructions/default/text": "Manually create 'dotnet.config' file setting the test runner to Microsoft.Testing.Platform",
+  "postActions/addJsonProperty/description": "Create or update 'global.json' file required by Microsoft.Testing.Platform.",
+  "postActions/addJsonProperty/manualInstructions/default/text": "Manually update or create 'global.json' file setting the test runner to Microsoft.Testing.Platform",
   "postActions/openInEditor/description": "Test1.vb'yi düzenleyicide açar"
 }
\ No newline at end of file
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json
index 8ec06bf6163d..53b04ad750ca 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.zh-Hans.json
@@ -52,7 +52,7 @@
   "symbols/Fixture/choices/TestCleanup/description": "TestCleanup 固定例程方法",
   "postActions/restoreNugetPackages/description": "还原此项目所需的 NuGet 包。",
   "postActions/restoreNugetPackages/manualInstructions/default/text": "运行 \"dotnet restore\"",
-  "postActions/createOrUpdateDotnetConfig/description": "Create or update 'dotnet.config' file required by Microsoft.Testing.Platform.",
-  "postActions/createOrUpdateDotnetConfig/manualInstructions/default/text": "Manually create 'dotnet.config' file setting the test runner to Microsoft.Testing.Platform",
+  "postActions/addJsonProperty/description": "Create or update 'global.json' file required by Microsoft.Testing.Platform.",
+  "postActions/addJsonProperty/manualInstructions/default/text": "Manually update or create 'global.json' file setting the test runner to Microsoft.Testing.Platform",
   "postActions/openInEditor/description": "在编辑器中打开 Test1.vb"
 }
\ No newline at end of file
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json
index 9e74ecfbd7bd..9a74906310ef 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/localize/templatestrings.zh-Hant.json
@@ -52,7 +52,7 @@
   "symbols/Fixture/choices/TestCleanup/description": "TestCleanup 固件方法",
   "postActions/restoreNugetPackages/description": "還原此專案所需的 NuGet 套件。",
   "postActions/restoreNugetPackages/manualInstructions/default/text": "執行 'dotnet restore'",
-  "postActions/createOrUpdateDotnetConfig/description": "Create or update 'dotnet.config' file required by Microsoft.Testing.Platform.",
-  "postActions/createOrUpdateDotnetConfig/manualInstructions/default/text": "Manually create 'dotnet.config' file setting the test runner to Microsoft.Testing.Platform",
+  "postActions/addJsonProperty/description": "Create or update 'global.json' file required by Microsoft.Testing.Platform.",
+  "postActions/addJsonProperty/manualInstructions/default/text": "Manually update or create 'global.json' file setting the test runner to Microsoft.Testing.Platform",
   "postActions/openInEditor/description": "在編輯器中開啟 Test1.vb"
 }
\ No newline at end of file
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/template.json
index 71fe6ea96124..cca88e73c3cd 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/template.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/.template.config/template.json
@@ -229,14 +229,18 @@
     },
     {
       "condition": "(TestRunner == \"Microsoft.Testing.Platform\")",
-      "description": "Create or update 'dotnet.config' file required by Microsoft.Testing.Platform.",
-      "manualInstructions": [{ "text": "Manually create 'dotnet.config' file setting the test runner to Microsoft.Testing.Platform" }],
-      "actionId": "597E7933-0D87-452C-B094-8FA0EEF7FD97",
-      "id": "createOrUpdateDotnetConfig",
+      "description": "Create or update 'global.json' file required by Microsoft.Testing.Platform.",
+      "manualInstructions": [{ "text": "Manually update or create 'global.json' file setting the test runner to Microsoft.Testing.Platform" }],
+      "actionId": "695A3659-EB40-4FF5-A6A6-C9C4E629FCB0",
+      "id": "addJsonProperty",
       "args": {
-        "section": "dotnet.test.runner",
-        "key": "name",
-        "value": "Microsoft.Testing.Platform",
+        "allowFileCreation": true,
+        "allowPathCreation": true,
+        "jsonFileName": "global.json",
+        "parentPropertyPath": "test",
+        "newJsonPropertyName": "runner",
+        "newJsonPropertyValue": "Microsoft.Testing.Platform",
+        "detectRepositoryRootForFileCreation": true
       },
       "continueOnError": true
     },
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.cs.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.cs.json
index 6d5b848e0557..70f943fbeceb 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.cs.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.cs.json
@@ -57,7 +57,7 @@
   "symbols/Fixture/choices/TestCleanup/description": "Metoda testovacího přípravku TestCleanup",
   "postActions/restoreNugetPackages/description": "Obnoví balíčky NuGet vyžadované tímto projektem.",
   "postActions/restoreNugetPackages/manualInstructions/default/text": "Spustit dotnet restore",
-  "postActions/createOrUpdateDotnetConfig/description": "Create or update 'dotnet.config' file required by Microsoft.Testing.Platform.",
-  "postActions/createOrUpdateDotnetConfig/manualInstructions/default/text": "Manually create 'dotnet.config' file setting the test runner to Microsoft.Testing.Platform",
+  "postActions/addJsonProperty/description": "Create or update 'global.json' file required by Microsoft.Testing.Platform.",
+  "postActions/addJsonProperty/manualInstructions/default/text": "Manually update or create 'global.json' file setting the test runner to Microsoft.Testing.Platform",
   "postActions/openInEditor/description": "Otevře Test1.cs v editoru."
 }
\ No newline at end of file
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.de.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.de.json
index 809c88470873..a033b36b85f2 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.de.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.de.json
@@ -57,7 +57,7 @@
   "symbols/Fixture/choices/TestCleanup/description": "Fixierungsmethode \"TestCleanup\"",
   "postActions/restoreNugetPackages/description": "Stellt die NuGet-Pakete wieder her, die für dieses Projekt erforderlich sind.",
   "postActions/restoreNugetPackages/manualInstructions/default/text": "\"dotnet restore\" ausführen",
-  "postActions/createOrUpdateDotnetConfig/description": "Create or update 'dotnet.config' file required by Microsoft.Testing.Platform.",
-  "postActions/createOrUpdateDotnetConfig/manualInstructions/default/text": "Manually create 'dotnet.config' file setting the test runner to Microsoft.Testing.Platform",
+  "postActions/addJsonProperty/description": "Create or update 'global.json' file required by Microsoft.Testing.Platform.",
+  "postActions/addJsonProperty/manualInstructions/default/text": "Manually update or create 'global.json' file setting the test runner to Microsoft.Testing.Platform",
   "postActions/openInEditor/description": "Öffnet Test1.cs im Editor"
 }
\ No newline at end of file
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.en.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.en.json
index a54c2eb11253..e2c13a92416c 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.en.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.en.json
@@ -57,7 +57,7 @@
   "symbols/Fixture/choices/TestCleanup/description": "TestCleanup fixture method",
   "postActions/restoreNugetPackages/description": "Restore NuGet packages required by this project.",
   "postActions/restoreNugetPackages/manualInstructions/default/text": "Run 'dotnet restore'",
-  "postActions/createOrUpdateDotnetConfig/description": "Create or update 'dotnet.config' file required by Microsoft.Testing.Platform.",
-  "postActions/createOrUpdateDotnetConfig/manualInstructions/default/text": "Manually create 'dotnet.config' file setting the test runner to Microsoft.Testing.Platform",
+  "postActions/addJsonProperty/description": "Create or update 'global.json' file required by Microsoft.Testing.Platform.",
+  "postActions/addJsonProperty/manualInstructions/default/text": "Manually update or create 'global.json' file setting the test runner to Microsoft.Testing.Platform",
   "postActions/openInEditor/description": "Opens Test1.cs in the editor"
 }
\ No newline at end of file
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.es.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.es.json
index af1a5fbe3a76..dafa0d5fcefb 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.es.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.es.json
@@ -57,7 +57,7 @@
   "symbols/Fixture/choices/TestCleanup/description": "Método de accesorio TestCleanup",
   "postActions/restoreNugetPackages/description": "Restaure los paquetes NuGet necesarios para este proyecto.",
   "postActions/restoreNugetPackages/manualInstructions/default/text": "Ejecutar \"dotnet restore\"",
-  "postActions/createOrUpdateDotnetConfig/description": "Create or update 'dotnet.config' file required by Microsoft.Testing.Platform.",
-  "postActions/createOrUpdateDotnetConfig/manualInstructions/default/text": "Manually create 'dotnet.config' file setting the test runner to Microsoft.Testing.Platform",
+  "postActions/addJsonProperty/description": "Create or update 'global.json' file required by Microsoft.Testing.Platform.",
+  "postActions/addJsonProperty/manualInstructions/default/text": "Manually update or create 'global.json' file setting the test runner to Microsoft.Testing.Platform",
   "postActions/openInEditor/description": "Abrir Test1.cs en el editor."
 }
\ No newline at end of file
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.fr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.fr.json
index d0f7003d4dd4..a42ccf5c7cde 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.fr.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.fr.json
@@ -57,7 +57,7 @@
   "symbols/Fixture/choices/TestCleanup/description": "Méthode de fixture TestCleanup",
   "postActions/restoreNugetPackages/description": "Restaurez les packages NuGet requis par ce projet.",
   "postActions/restoreNugetPackages/manualInstructions/default/text": "Exécutez « dotnet restore »",
-  "postActions/createOrUpdateDotnetConfig/description": "Create or update 'dotnet.config' file required by Microsoft.Testing.Platform.",
-  "postActions/createOrUpdateDotnetConfig/manualInstructions/default/text": "Manually create 'dotnet.config' file setting the test runner to Microsoft.Testing.Platform",
+  "postActions/addJsonProperty/description": "Create or update 'global.json' file required by Microsoft.Testing.Platform.",
+  "postActions/addJsonProperty/manualInstructions/default/text": "Manually update or create 'global.json' file setting the test runner to Microsoft.Testing.Platform",
   "postActions/openInEditor/description": "Ouvre Test1.cs dans l’éditeur"
 }
\ No newline at end of file
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.it.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.it.json
index f63295899090..3cfad9d1ecc3 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.it.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.it.json
@@ -57,7 +57,7 @@
   "symbols/Fixture/choices/TestCleanup/description": "Metodo fixture TestCleanup",
   "postActions/restoreNugetPackages/description": "Ripristina i pacchetti NuGet richiesti da questo progetto.",
   "postActions/restoreNugetPackages/manualInstructions/default/text": "Esegui 'dotnet restore'",
-  "postActions/createOrUpdateDotnetConfig/description": "Create or update 'dotnet.config' file required by Microsoft.Testing.Platform.",
-  "postActions/createOrUpdateDotnetConfig/manualInstructions/default/text": "Manually create 'dotnet.config' file setting the test runner to Microsoft.Testing.Platform",
+  "postActions/addJsonProperty/description": "Create or update 'global.json' file required by Microsoft.Testing.Platform.",
+  "postActions/addJsonProperty/manualInstructions/default/text": "Manually update or create 'global.json' file setting the test runner to Microsoft.Testing.Platform",
   "postActions/openInEditor/description": "Apre Test1.cs nell'editor"
 }
\ No newline at end of file
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ja.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ja.json
index 5d545864c785..0cffb118b6ed 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ja.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ja.json
@@ -57,7 +57,7 @@
   "symbols/Fixture/choices/TestCleanup/description": "TestCleanup フィクスチャ メソッド",
   "postActions/restoreNugetPackages/description": "このプロジェクトに必要な NuGet パッケージを復元します。",
   "postActions/restoreNugetPackages/manualInstructions/default/text": "'dotnet restore' を実行する",
-  "postActions/createOrUpdateDotnetConfig/description": "Create or update 'dotnet.config' file required by Microsoft.Testing.Platform.",
-  "postActions/createOrUpdateDotnetConfig/manualInstructions/default/text": "Manually create 'dotnet.config' file setting the test runner to Microsoft.Testing.Platform",
+  "postActions/addJsonProperty/description": "Create or update 'global.json' file required by Microsoft.Testing.Platform.",
+  "postActions/addJsonProperty/manualInstructions/default/text": "Manually update or create 'global.json' file setting the test runner to Microsoft.Testing.Platform",
   "postActions/openInEditor/description": "エディターで Test1.cs を開きます"
 }
\ No newline at end of file
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ko.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ko.json
index 93670d840378..04e74ff275e0 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ko.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ko.json
@@ -57,7 +57,7 @@
   "symbols/Fixture/choices/TestCleanup/description": "TestCleanup fixture 메서드",
   "postActions/restoreNugetPackages/description": "이 프로젝트에 필요한 NuGet 패키지를 복원합니다.",
   "postActions/restoreNugetPackages/manualInstructions/default/text": "'dotnet restore' 실행",
-  "postActions/createOrUpdateDotnetConfig/description": "Create or update 'dotnet.config' file required by Microsoft.Testing.Platform.",
-  "postActions/createOrUpdateDotnetConfig/manualInstructions/default/text": "Manually create 'dotnet.config' file setting the test runner to Microsoft.Testing.Platform",
+  "postActions/addJsonProperty/description": "Create or update 'global.json' file required by Microsoft.Testing.Platform.",
+  "postActions/addJsonProperty/manualInstructions/default/text": "Manually update or create 'global.json' file setting the test runner to Microsoft.Testing.Platform",
   "postActions/openInEditor/description": "편집기에서 Test1.cs 열기"
 }
\ No newline at end of file
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.pl.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.pl.json
index 91bad70c2d67..7822568a090c 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.pl.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.pl.json
@@ -57,7 +57,7 @@
   "symbols/Fixture/choices/TestCleanup/description": "TestCleanup — metoda początkowa",
   "postActions/restoreNugetPackages/description": "Przywróć pakiety NuGet wymagane przez ten projekt.",
   "postActions/restoreNugetPackages/manualInstructions/default/text": "Uruchom polecenie „dotnet restore”",
-  "postActions/createOrUpdateDotnetConfig/description": "Create or update 'dotnet.config' file required by Microsoft.Testing.Platform.",
-  "postActions/createOrUpdateDotnetConfig/manualInstructions/default/text": "Manually create 'dotnet.config' file setting the test runner to Microsoft.Testing.Platform",
+  "postActions/addJsonProperty/description": "Create or update 'global.json' file required by Microsoft.Testing.Platform.",
+  "postActions/addJsonProperty/manualInstructions/default/text": "Manually update or create 'global.json' file setting the test runner to Microsoft.Testing.Platform",
   "postActions/openInEditor/description": "Otwiera plik Test1.cs w edytorze"
 }
\ No newline at end of file
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.pt-BR.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.pt-BR.json
index d04f93134ea9..b16e73aaff84 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.pt-BR.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.pt-BR.json
@@ -57,7 +57,7 @@
   "symbols/Fixture/choices/TestCleanup/description": "Método de acessório TestCleanup",
   "postActions/restoreNugetPackages/description": "Restaura os pacotes do NuGet exigidos por este projeto.",
   "postActions/restoreNugetPackages/manualInstructions/default/text": "Executa \"dotnet restore\"",
-  "postActions/createOrUpdateDotnetConfig/description": "Create or update 'dotnet.config' file required by Microsoft.Testing.Platform.",
-  "postActions/createOrUpdateDotnetConfig/manualInstructions/default/text": "Manually create 'dotnet.config' file setting the test runner to Microsoft.Testing.Platform",
+  "postActions/addJsonProperty/description": "Create or update 'global.json' file required by Microsoft.Testing.Platform.",
+  "postActions/addJsonProperty/manualInstructions/default/text": "Manually update or create 'global.json' file setting the test runner to Microsoft.Testing.Platform",
   "postActions/openInEditor/description": "Abre o Test1.cs no editor"
 }
\ No newline at end of file
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ru.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ru.json
index 8d5a9ba65708..62dd753e1e66 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ru.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.ru.json
@@ -57,7 +57,7 @@
   "symbols/Fixture/choices/TestCleanup/description": "Метод работы со средствами TestCleanup",
   "postActions/restoreNugetPackages/description": "Восстановление пакетов NuGet, необходимых для этого проекта.",
   "postActions/restoreNugetPackages/manualInstructions/default/text": "Выполнить команду \"dotnet restore\"",
-  "postActions/createOrUpdateDotnetConfig/description": "Create or update 'dotnet.config' file required by Microsoft.Testing.Platform.",
-  "postActions/createOrUpdateDotnetConfig/manualInstructions/default/text": "Manually create 'dotnet.config' file setting the test runner to Microsoft.Testing.Platform",
+  "postActions/addJsonProperty/description": "Create or update 'global.json' file required by Microsoft.Testing.Platform.",
+  "postActions/addJsonProperty/manualInstructions/default/text": "Manually update or create 'global.json' file setting the test runner to Microsoft.Testing.Platform",
   "postActions/openInEditor/description": "Открывает Test1.cs редакторе"
 }
\ No newline at end of file
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.tr.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.tr.json
index 30eb317945c4..a0fe5d119211 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.tr.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.tr.json
@@ -57,7 +57,7 @@
   "symbols/Fixture/choices/TestCleanup/description": "TestCleanup düzen yöntemi",
   "postActions/restoreNugetPackages/description": "Bu projenin gerektirdiği NuGet paketlerini geri yükleyin.",
   "postActions/restoreNugetPackages/manualInstructions/default/text": "\"dotnet restore\" çalıştır",
-  "postActions/createOrUpdateDotnetConfig/description": "Create or update 'dotnet.config' file required by Microsoft.Testing.Platform.",
-  "postActions/createOrUpdateDotnetConfig/manualInstructions/default/text": "Manually create 'dotnet.config' file setting the test runner to Microsoft.Testing.Platform",
+  "postActions/addJsonProperty/description": "Create or update 'global.json' file required by Microsoft.Testing.Platform.",
+  "postActions/addJsonProperty/manualInstructions/default/text": "Manually update or create 'global.json' file setting the test runner to Microsoft.Testing.Platform",
   "postActions/openInEditor/description": "Test1.cs'yi düzenleyicide açar"
 }
\ No newline at end of file
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.zh-Hans.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.zh-Hans.json
index 2b64337eaab6..d3813429eb2c 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.zh-Hans.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.zh-Hans.json
@@ -57,7 +57,7 @@
   "symbols/Fixture/choices/TestCleanup/description": "TestCleanup 固定例程方法",
   "postActions/restoreNugetPackages/description": "还原此项目所需的 NuGet 包。",
   "postActions/restoreNugetPackages/manualInstructions/default/text": "运行 \"dotnet restore\"",
-  "postActions/createOrUpdateDotnetConfig/description": "Create or update 'dotnet.config' file required by Microsoft.Testing.Platform.",
-  "postActions/createOrUpdateDotnetConfig/manualInstructions/default/text": "Manually create 'dotnet.config' file setting the test runner to Microsoft.Testing.Platform",
+  "postActions/addJsonProperty/description": "Create or update 'global.json' file required by Microsoft.Testing.Platform.",
+  "postActions/addJsonProperty/manualInstructions/default/text": "Manually update or create 'global.json' file setting the test runner to Microsoft.Testing.Platform",
   "postActions/openInEditor/description": "在编辑器中打开 Test1.cs"
 }
\ No newline at end of file
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.zh-Hant.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.zh-Hant.json
index 77d7ab1aac3e..65f448819360 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.zh-Hant.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/localize/templatestrings.zh-Hant.json
@@ -57,7 +57,7 @@
   "symbols/Fixture/choices/TestCleanup/description": "TestCleanup 固件方法",
   "postActions/restoreNugetPackages/description": "還原此專案所需的 NuGet 套件。",
   "postActions/restoreNugetPackages/manualInstructions/default/text": "執行 'dotnet restore'",
-  "postActions/createOrUpdateDotnetConfig/description": "Create or update 'dotnet.config' file required by Microsoft.Testing.Platform.",
-  "postActions/createOrUpdateDotnetConfig/manualInstructions/default/text": "Manually create 'dotnet.config' file setting the test runner to Microsoft.Testing.Platform",
+  "postActions/addJsonProperty/description": "Create or update 'global.json' file required by Microsoft.Testing.Platform.",
+  "postActions/addJsonProperty/manualInstructions/default/text": "Manually update or create 'global.json' file setting the test runner to Microsoft.Testing.Platform",
   "postActions/openInEditor/description": "在編輯器中開啟 Test1.cs"
 }
\ No newline at end of file
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/template.json
index 303570a8da7a..b55dff5e27a9 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/template.json
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/.template.config/template.json
@@ -249,14 +249,18 @@
     },
     {
       "condition": "(TestRunner == \"Microsoft.Testing.Platform\")",
-      "description": "Create or update 'dotnet.config' file required by Microsoft.Testing.Platform.",
-      "manualInstructions": [{ "text": "Manually create 'dotnet.config' file setting the test runner to Microsoft.Testing.Platform" }],
-      "actionId": "597E7933-0D87-452C-B094-8FA0EEF7FD97",
-      "id": "createOrUpdateDotnetConfig",
+      "description": "Create or update 'global.json' file required by Microsoft.Testing.Platform.",
+      "manualInstructions": [{ "text": "Manually update or create 'global.json' file setting the test runner to Microsoft.Testing.Platform" }],
+      "actionId": "695A3659-EB40-4FF5-A6A6-C9C4E629FCB0",
+      "id": "addJsonProperty",
       "args": {
-        "section": "dotnet.test.runner",
-        "key": "name",
-        "value": "Microsoft.Testing.Platform",
+        "allowFileCreation": true,
+        "allowPathCreation": true,
+        "jsonFileName": "global.json",
+        "parentPropertyPath": "test",
+        "newJsonPropertyName": "runner",
+        "newJsonPropertyValue": "Microsoft.Testing.Platform",
+        "detectRepositoryRootForFileCreation": true
       },
       "continueOnError": true
     },
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/Company.TestProject1.csproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/Company.TestProject1.csproj
index c29acbb86c83..d06cdf2db4f7 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/Company.TestProject1.csproj
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/Company.TestProject1.csproj
@@ -13,7 +13,7 @@
     <!-- To enable Microsoft.Testing.Platform, uncomment the following line. -->
     <!-- <UseMicrosoftTestingPlatformRunner>true</UseMicrosoftTestingPlatformRunner> -->
     <!-- Note: to use Microsoft.Testing.Platform correctly with dotnet test: -->
-    <!-- 1. You must add dotnet.config specifying the test runner to be Microsoft.Testing.Platform -->
+    <!-- 1. You must create or update your existing global.json to specify the test runner to be Microsoft.Testing.Platform -->
     <!-- 2. You must use .NET 10 SDK or later -->
     <!-- For more information, see https://aka.ms/dotnet-test/mtp and https://xunit.net/docs/getting-started/v3/microsoft-testing-platform -->
     <!-- To enable code coverage with Microsoft.Testing.Platform, add a package reference to Microsoft.Testing.Extensions.CodeCoverage -->
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/Company.TestProject1.fsproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/Company.TestProject1.fsproj
index b0475294491f..f692a0f96f8c 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/Company.TestProject1.fsproj
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/Company.TestProject1.fsproj
@@ -11,7 +11,7 @@
     <!-- To enable Microsoft.Testing.Platform, uncomment the following line. -->
     <!-- <UseMicrosoftTestingPlatformRunner>true</UseMicrosoftTestingPlatformRunner> -->
     <!-- Note: to use Microsoft.Testing.Platform correctly with dotnet test: -->
-    <!-- 1. You must add dotnet.config specifying the test runner to be Microsoft.Testing.Platform -->
+    <!-- 1. You must create or update your existing global.json to specify the test runner to be Microsoft.Testing.Platform -->
     <!-- 2. You must use .NET 10 SDK or later -->
     <!-- For more information, see https://aka.ms/dotnet-test/mtp and https://xunit.net/docs/getting-started/v3/microsoft-testing-platform -->
     <!-- To enable code coverage with Microsoft.Testing.Platform, add a package reference to Microsoft.Testing.Extensions.CodeCoverage -->
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/Company.TestProject1.vbproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/Company.TestProject1.vbproj
index fa23ca052b6a..12420aa04ea8 100644
--- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/Company.TestProject1.vbproj
+++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/Company.TestProject1.vbproj
@@ -11,7 +11,7 @@
     <!-- To enable Microsoft.Testing.Platform, uncomment the following line. -->
     <!-- <UseMicrosoftTestingPlatformRunner>true</UseMicrosoftTestingPlatformRunner> -->
     <!-- Note: to use Microsoft.Testing.Platform correctly with dotnet test: -->
-    <!-- 1. You must add dotnet.config specifying the test runner to be Microsoft.Testing.Platform -->
+    <!-- 1. You must create or update your existing global.json to specify the test runner to be Microsoft.Testing.Platform -->
     <!-- 2. You must use .NET 10 SDK or later -->
     <!-- For more information, see https://aka.ms/dotnet-test/mtp and https://xunit.net/docs/getting-started/v3/microsoft-testing-platform -->
     <!-- To enable code coverage with Microsoft.Testing.Platform, add a package reference to Microsoft.Testing.Extensions.CodeCoverage -->
diff --git a/test/Microsoft.TemplateEngine.Cli.UnitTests/PostActionTests/AddJsonPropertyPostActionTests.cs b/test/Microsoft.TemplateEngine.Cli.UnitTests/PostActionTests/AddJsonPropertyPostActionTests.cs
index 6e43810e538e..23c68bc3ed60 100644
--- a/test/Microsoft.TemplateEngine.Cli.UnitTests/PostActionTests/AddJsonPropertyPostActionTests.cs
+++ b/test/Microsoft.TemplateEngine.Cli.UnitTests/PostActionTests/AddJsonPropertyPostActionTests.cs
@@ -345,6 +345,88 @@ public void FailsWhenFileDoesNotExistAndAllowFileCreationIsSetButAllowPathCreati
             Assert.Equal("{}", _engineEnvironmentSettings.Host.FileSystem.ReadAllText(jsonFilePath));
         }
 
+        [Fact]
+        public void RepoRootDetectionShouldPreferGlobalJson_NoSlnInvolved()
+        {
+            var physicalFileSystem = _engineEnvironmentSettings.Host.FileSystem;
+            var tempPath = _engineEnvironmentSettings.GetTempVirtualizedPath();
+            var dirWithGlobalJson = Path.Combine(tempPath, nameof(RepoRootDetectionShouldPreferGlobalJson_NoSlnInvolved));
+            physicalFileSystem.CreateDirectory(dirWithGlobalJson);
+            physicalFileSystem.WriteAllText(Path.Combine(dirWithGlobalJson, "global.json"), "{}");
+            var subDir = Path.Combine(dirWithGlobalJson, "subdir");
+            physicalFileSystem.CreateDirectory(subDir);
+            AddJsonPropertyPostActionProcessor.GetRootDirectory(physicalFileSystem, subDir).Should().Be(dirWithGlobalJson);
+        }
+
+        [Fact]
+        public void RepoRootDetectionShouldPreferGlobalJson_SlnInSubDirectory()
+        {
+            var physicalFileSystem = _engineEnvironmentSettings.Host.FileSystem;
+            var tempPath = _engineEnvironmentSettings.GetTempVirtualizedPath();
+            var dirWithGlobalJson = Path.Combine(tempPath, nameof(RepoRootDetectionShouldPreferGlobalJson_SlnInSubDirectory));
+            physicalFileSystem.CreateDirectory(dirWithGlobalJson);
+            physicalFileSystem.WriteAllText(Path.Combine(dirWithGlobalJson, "global.json"), "{}");
+            var subDir = Path.Combine(dirWithGlobalJson, "subdir");
+            physicalFileSystem.CreateDirectory(subDir);
+            physicalFileSystem.WriteAllText(Path.Combine(subDir, "MySolution.sln"), "{}");
+            AddJsonPropertyPostActionProcessor.GetRootDirectory(physicalFileSystem, subDir).Should().Be(dirWithGlobalJson);
+        }
+
+        [Fact]
+        public void RepoRootDetectionShouldPreferGlobalJson_SlnInParent()
+        {
+            var physicalFileSystem = _engineEnvironmentSettings.Host.FileSystem;
+            var tempPath = _engineEnvironmentSettings.GetTempVirtualizedPath();
+            var dirWithGlobalJson = Path.Combine(tempPath, nameof(RepoRootDetectionShouldPreferGlobalJson_SlnInParent));
+            physicalFileSystem.CreateDirectory(dirWithGlobalJson);
+            physicalFileSystem.WriteAllText(Path.Combine(dirWithGlobalJson, "global.json"), "{}");
+            var subDir = Path.Combine(dirWithGlobalJson, "subdir");
+            physicalFileSystem.CreateDirectory(subDir);
+            physicalFileSystem.WriteAllText(Path.Combine(tempPath, "MySolution.sln"), "{}");
+            AddJsonPropertyPostActionProcessor.GetRootDirectory(physicalFileSystem, subDir).Should().Be(dirWithGlobalJson);
+        }
+
+        [Fact]
+        public void RepoRootDetectionShouldPreferGitDirectory_NoSlnInvolved()
+        {
+            var physicalFileSystem = _engineEnvironmentSettings.Host.FileSystem;
+            var tempPath = _engineEnvironmentSettings.GetTempVirtualizedPath();
+            var dirWithGitDirectory = Path.Combine(tempPath, nameof(RepoRootDetectionShouldPreferGitDirectory_NoSlnInvolved));
+            physicalFileSystem.CreateDirectory(dirWithGitDirectory);
+            physicalFileSystem.CreateDirectory(Path.Combine(dirWithGitDirectory, ".git"));
+            var subDir = Path.Combine(dirWithGitDirectory, "subdir");
+            physicalFileSystem.CreateDirectory(subDir);
+            AddJsonPropertyPostActionProcessor.GetRootDirectory(physicalFileSystem, subDir).Should().Be(dirWithGitDirectory);
+        }
+
+        [Fact]
+        public void RepoRootDetectionShouldPreferGitDirectory_SlnInSubDirectory()
+        {
+            var physicalFileSystem = _engineEnvironmentSettings.Host.FileSystem;
+            var tempPath = _engineEnvironmentSettings.GetTempVirtualizedPath();
+            var dirWithGitDirectory = Path.Combine(tempPath, nameof(RepoRootDetectionShouldPreferGitDirectory_SlnInSubDirectory));
+            physicalFileSystem.CreateDirectory(dirWithGitDirectory);
+            physicalFileSystem.CreateDirectory(Path.Combine(dirWithGitDirectory, ".git"));
+            var subDir = Path.Combine(dirWithGitDirectory, "subdir");
+            physicalFileSystem.CreateDirectory(subDir);
+            physicalFileSystem.WriteAllText(Path.Combine(subDir, "MySolution.sln"), "");
+            AddJsonPropertyPostActionProcessor.GetRootDirectory(physicalFileSystem, subDir).Should().Be(dirWithGitDirectory);
+        }
+
+        [Fact]
+        public void RepoRootDetectionShouldPreferGitDirectory_SlnInParent()
+        {
+            var physicalFileSystem = _engineEnvironmentSettings.Host.FileSystem;
+            var tempPath = _engineEnvironmentSettings.GetTempVirtualizedPath();
+            var dirWithGitDirectory = Path.Combine(tempPath, nameof(RepoRootDetectionShouldPreferGitDirectory_SlnInParent));
+            physicalFileSystem.CreateDirectory(dirWithGitDirectory);
+            physicalFileSystem.CreateDirectory(Path.Combine(dirWithGitDirectory, ".git"));
+            var subDir = Path.Combine(dirWithGitDirectory, "subdir");
+            physicalFileSystem.CreateDirectory(subDir);
+            physicalFileSystem.WriteAllText(Path.Combine(tempPath, "MySolution.sln"), "");
+            AddJsonPropertyPostActionProcessor.GetRootDirectory(physicalFileSystem, subDir).Should().Be(dirWithGitDirectory);
+        }
+
         private string CreateJsonFile(string targetBasePath, string fileName, string jsonContent)
         {
             string jsonFileFullPath = Path.Combine(targetBasePath, fileName);
diff --git a/test/Microsoft.TemplateEngine.Cli.UnitTests/PostActionTests/CreateOrUpdateDotnetConfigPostActionTests.cs b/test/Microsoft.TemplateEngine.Cli.UnitTests/PostActionTests/CreateOrUpdateDotnetConfigPostActionTests.cs
deleted file mode 100644
index 6d66a0c6b895..000000000000
--- a/test/Microsoft.TemplateEngine.Cli.UnitTests/PostActionTests/CreateOrUpdateDotnetConfigPostActionTests.cs
+++ /dev/null
@@ -1,223 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System.Runtime.CompilerServices;
-using Microsoft.DotNet.Cli.Utils;
-using Microsoft.TemplateEngine.Abstractions;
-using Microsoft.TemplateEngine.Cli.PostActionProcessors;
-using Microsoft.TemplateEngine.Mocks;
-using Microsoft.TemplateEngine.TestHelper;
-
-using Moq;
-
-namespace Microsoft.TemplateEngine.Cli.UnitTests.PostActionTests;
-
-public class CreateOrUpdateDotnetConfigPostActionTests : IClassFixture<EnvironmentSettingsHelper>
-{
-    private readonly IEngineEnvironmentSettings _engineEnvironmentSettings;
-
-    public CreateOrUpdateDotnetConfigPostActionTests(EnvironmentSettingsHelper environmentSettingsHelper)
-    {
-        _engineEnvironmentSettings = environmentSettingsHelper.CreateEnvironment(hostIdentifier: GetType().Name, virtualize: true);
-    }
-
-    [Theory]
-    [InlineData("section")]
-    [InlineData("key")]
-    [InlineData("value")]
-    public void MissingArgumentShouldFail(string missingArgumentName)
-    {
-        string targetBasePath = GetTargetPath();
-
-        var dictionary = new Dictionary<string, string>
-        {
-            ["section"] = "dotnet.test.runner",
-            ["key"] = "name",
-            ["value"] = "Microsoft.Testing.Platform"
-        };
-        dictionary.Remove(missingArgumentName);
-
-        IPostAction postAction = new MockPostAction(default, default, default, default, default!)
-        {
-            ActionId = CreateOrUpdateDotnetConfigPostActionProcessor.ActionProcessorId,
-            Args = dictionary,
-        };
-
-        Mock<IReporter> mockReporter = new();
-
-        mockReporter.Setup(r => r.WriteLine(It.IsAny<string>()))
-            .Verifiable();
-
-        Reporter.SetError(mockReporter.Object);
-
-        CreateOrUpdateDotnetConfigPostActionProcessor processor = new();
-
-        bool result = processor.Process(
-            _engineEnvironmentSettings,
-            postAction,
-            new MockCreationEffects(),
-            new MockCreationResult(),
-            targetBasePath);
-
-        Assert.False(result);
-
-        mockReporter.Verify(r => r.WriteLine(string.Format(LocalizableStrings.PostAction_DotnetConfig_Error_ArgumentNotConfigured, missingArgumentName)), Times.Once);
-    }
-
-    [Fact]
-    public void CreatesDotnetConfigWhenDoesNotExist()
-    {
-        string targetBasePath = GetTargetPath();
-        string dotnetConfigPath = Path.Combine(targetBasePath, "dotnet.config");
-
-        IPostAction postAction = CreatePostActionForMTP();
-
-        Mock<IReporter> mockReporter = new();
-
-        mockReporter.Setup(r => r.WriteLine(It.IsAny<string>()))
-            .Verifiable();
-
-        Reporter.SetOutput(mockReporter.Object);
-
-        CreateOrUpdateDotnetConfigPostActionProcessor processor = new();
-
-        _engineEnvironmentSettings.Host.FileSystem.FileExists(dotnetConfigPath).Should().BeFalse();
-
-        bool result = processor.Process(
-            _engineEnvironmentSettings,
-            postAction,
-            new MockCreationEffects(),
-            new MockCreationResult(),
-            targetBasePath);
-
-        Assert.True(result);
-
-        _engineEnvironmentSettings.Host.FileSystem.FileExists(dotnetConfigPath).Should().BeTrue();
-        _engineEnvironmentSettings.Host.FileSystem.ReadAllText(dotnetConfigPath).Should().Be("""
-            [dotnet.test.runner]
-            name = "Microsoft.Testing.Platform"
-
-            """);
-
-        mockReporter.Verify(r => r.WriteLine(LocalizableStrings.PostAction_CreateDotnetConfig_Succeeded), Times.Once);
-    }
-
-    [Fact]
-    public void CreatesNewSectionWhenFileExistsButSectionDoesNot()
-    {
-        string targetBasePath = GetTargetPath();
-        string dotnetConfigPath = Path.Combine(targetBasePath, "dotnet.config");
-
-        IPostAction postAction = CreatePostActionForMTP();
-        CreateDotnetConfig(dotnetConfigPath, "mysection", "mykey", "myvalue");
-        Mock<IReporter> mockReporter = new();
-
-        mockReporter.Setup(r => r.WriteLine(It.IsAny<string>()))
-            .Verifiable();
-
-        Reporter.SetOutput(mockReporter.Object);
-
-        CreateOrUpdateDotnetConfigPostActionProcessor processor = new();
-
-        _engineEnvironmentSettings.Host.FileSystem.FileExists(dotnetConfigPath).Should().BeTrue();
-        _engineEnvironmentSettings.Host.FileSystem.ReadAllText(dotnetConfigPath).Should().Be("""
-            [mysection]
-            mykey = "myvalue"
-
-            """);
-
-        bool result = processor.Process(
-            _engineEnvironmentSettings,
-            postAction,
-            new MockCreationEffects(),
-            new MockCreationResult(),
-            targetBasePath);
-
-        Assert.True(result);
-
-        _engineEnvironmentSettings.Host.FileSystem.FileExists(dotnetConfigPath).Should().BeTrue();
-        _engineEnvironmentSettings.Host.FileSystem.ReadAllText(dotnetConfigPath).Should().Be("""
-            [mysection]
-            mykey = "myvalue"
-
-
-            [dotnet.test.runner]
-            name = "Microsoft.Testing.Platform"
-
-            """);
-
-        mockReporter.Verify(r => r.WriteLine(LocalizableStrings.PostAction_CreateDotnetConfig_CreatedNewSection), Times.Once);
-    }
-
-    [Fact]
-    public void DoesNothingIfNoUpdatesNeedToHappen()
-    {
-        string targetBasePath = GetTargetPath();
-        string dotnetConfigPath = Path.Combine(targetBasePath, "dotnet.config");
-
-        IPostAction postAction = CreatePostActionForMTP();
-        CreateDotnetConfig(dotnetConfigPath, "dotnet.test.runner", "name", "Microsoft.Testing.Platform");
-        Mock<IReporter> mockReporter = new();
-
-        mockReporter.Setup(r => r.WriteLine(It.IsAny<string>()))
-            .Verifiable();
-
-        Reporter.SetOutput(mockReporter.Object);
-
-        CreateOrUpdateDotnetConfigPostActionProcessor processor = new();
-
-        _engineEnvironmentSettings.Host.FileSystem.FileExists(dotnetConfigPath).Should().BeTrue();
-        _engineEnvironmentSettings.Host.FileSystem.ReadAllText(dotnetConfigPath).Should().Be("""
-            [dotnet.test.runner]
-            name = "Microsoft.Testing.Platform"
-
-            """);
-
-        bool result = processor.Process(
-            _engineEnvironmentSettings,
-            postAction,
-            new MockCreationEffects(),
-            new MockCreationResult(),
-            targetBasePath);
-
-        Assert.True(result);
-
-        _engineEnvironmentSettings.Host.FileSystem.FileExists(dotnetConfigPath).Should().BeTrue();
-        _engineEnvironmentSettings.Host.FileSystem.ReadAllText(dotnetConfigPath).Should().Be("""
-            [dotnet.test.runner]
-            name = "Microsoft.Testing.Platform"
-
-            """);
-
-        mockReporter.Verify(r => r.WriteLine(LocalizableStrings.PostAction_CreateDotnetConfig_ValueAlreadyExist), Times.Once);
-    }
-
-    private static IPostAction CreatePostActionForMTP()
-        => new MockPostAction(default, default, default, default, default!)
-        {
-            ActionId = CreateOrUpdateDotnetConfigPostActionProcessor.ActionProcessorId,
-            Args = new Dictionary<string, string>
-            {
-                ["section"] = "dotnet.test.runner",
-                ["key"] = "name",
-                ["value"] = "Microsoft.Testing.Platform",
-            },
-        };
-
-    private void CreateDotnetConfig(string dotnetConfigPath, string section, string key, string value)
-        => _engineEnvironmentSettings.Host.FileSystem.WriteAllText(dotnetConfigPath, $"""
-            [{section}]
-            {key} = "{value}"
-
-            """);
-
-    private string GetTargetPath([CallerMemberName] string testName = "")
-    {
-        string targetBasePath = Path.Combine(_engineEnvironmentSettings.GetTempVirtualizedPath(), testName);
-        _engineEnvironmentSettings.Host.FileSystem.CreateDirectory(targetBasePath);
-
-        // This is done to not let the preprocessor logic go above our base path directory.
-        _engineEnvironmentSettings.Host.FileSystem.CreateDirectory(Path.Combine(targetBasePath, ".git"));
-        return targetBasePath;
-    }
-}
diff --git a/test/TestAssets/TestPackages/dotnet-new/test_templates/PostActions/CreateOrUpdateDotnetConfig/AddNewSection/.template.config/template.json b/test/TestAssets/TestPackages/dotnet-new/test_templates/PostActions/CreateOrUpdateDotnetConfig/AddNewSection/.template.config/template.json
deleted file mode 100644
index 18b058625a93..000000000000
--- a/test/TestAssets/TestPackages/dotnet-new/test_templates/PostActions/CreateOrUpdateDotnetConfig/AddNewSection/.template.config/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "author": "Test Asset",
-    "classifications": [ "Test Asset" ],
-    "name": "TestAssets.PostActions.CreateOrUpdateDotnetConfig.AddNewSection",
-    "generatorVersions": "[1.0.0.0-*)",
-    "groupIdentity": "TestAssets.PostActions.CreateOrUpdateDotnetConfig.AddNewSection",
-    "precedence": "100",
-    "identity": "TestAssets.PostActions.CreateOrUpdateDotnetConfig.AddNewSection",
-    "shortName": "TestAssets.PostActions.CreateOrUpdateDotnetConfig.AddNewSection",
-    "sourceName": "AddNewSection",
-    "primaryOutputs": [
-        {
-            "path": "AddNewSection.csproj"
-        }
-    ],
-    "postActions": [
-        {
-            "description": "Add dotnet.config",
-            "manualInstructions": [ { "text": "Create dotnet.config manually." } ],
-            "args": {
-                "section": "SectionFromTemplateJson",
-                "key": "KeyFromTemplateJson",
-                "value": "ValueFromTemplateJson"
-            },
-            "actionId": "597E7933-0D87-452C-B094-8FA0EEF7FD97",
-            "continueOnError": true
-        }
-    ]
-}
diff --git a/test/TestAssets/TestPackages/dotnet-new/test_templates/PostActions/CreateOrUpdateDotnetConfig/AddNewSection/AddNewSection.csproj b/test/TestAssets/TestPackages/dotnet-new/test_templates/PostActions/CreateOrUpdateDotnetConfig/AddNewSection/AddNewSection.csproj
deleted file mode 100644
index ba7e2d463888..000000000000
--- a/test/TestAssets/TestPackages/dotnet-new/test_templates/PostActions/CreateOrUpdateDotnetConfig/AddNewSection/AddNewSection.csproj
+++ /dev/null
@@ -1,8 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>$(CurrentTargetFramework)</TargetFramework>
-  </PropertyGroup>
-
-</Project>
diff --git a/test/TestAssets/TestPackages/dotnet-new/test_templates/PostActions/CreateOrUpdateDotnetConfig/AddNewSection/Program.cs b/test/TestAssets/TestPackages/dotnet-new/test_templates/PostActions/CreateOrUpdateDotnetConfig/AddNewSection/Program.cs
deleted file mode 100644
index 38a7692a4297..000000000000
--- a/test/TestAssets/TestPackages/dotnet-new/test_templates/PostActions/CreateOrUpdateDotnetConfig/AddNewSection/Program.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-using Newtonsoft.Json;
-
-namespace Basic
-{
-    class Program
-    {
-        static void Main(string[] args)
-        {
-            Console.WriteLine("Hello World!");
-            string result = JsonConvert.SerializeObject(new { a = "test" });
-        }
-    }
-}
diff --git a/test/TestAssets/TestPackages/dotnet-new/test_templates/PostActions/CreateOrUpdateDotnetConfig/AddNewSection/dotnet.config b/test/TestAssets/TestPackages/dotnet-new/test_templates/PostActions/CreateOrUpdateDotnetConfig/AddNewSection/dotnet.config
deleted file mode 100644
index d658b6c3fdd3..000000000000
--- a/test/TestAssets/TestPackages/dotnet-new/test_templates/PostActions/CreateOrUpdateDotnetConfig/AddNewSection/dotnet.config
+++ /dev/null
@@ -1,2 +0,0 @@
-[existing-section]
-mykey = "myvalue"
\ No newline at end of file
diff --git a/test/TestAssets/TestPackages/dotnet-new/test_templates/PostActions/CreateOrUpdateDotnetConfig/CreateNonExisting/.template.config/template.json b/test/TestAssets/TestPackages/dotnet-new/test_templates/PostActions/CreateOrUpdateDotnetConfig/CreateNonExisting/.template.config/template.json
deleted file mode 100644
index 93c23963f8d7..000000000000
--- a/test/TestAssets/TestPackages/dotnet-new/test_templates/PostActions/CreateOrUpdateDotnetConfig/CreateNonExisting/.template.config/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "author": "Test Asset",
-    "classifications": [ "Test Asset" ],
-    "name": "TestAssets.PostActions.CreateOrUpdateDotnetConfig.CreateNonExisting",
-    "generatorVersions": "[1.0.0.0-*)",
-    "groupIdentity": "TestAssets.PostActions.CreateOrUpdateDotnetConfig.CreateNonExisting",
-    "precedence": "100",
-    "identity": "TestAssets.PostActions.CreateOrUpdateDotnetConfig.CreateNonExisting",
-    "shortName": "TestAssets.PostActions.CreateOrUpdateDotnetConfig.CreateNonExisting",
-    "sourceName": "CreateNonExisting",
-    "primaryOutputs": [
-        {
-            "path": "CreateNonExisting.csproj"
-        }
-    ],
-    "postActions": [
-        {
-            "description": "Add dotnet.config",
-            "manualInstructions": [ { "text": "Create dotnet.config manually." } ],
-            "args": {
-                "section": "SectionFromTemplateJson",
-                "key": "KeyFromTemplateJson",
-                "value": "ValueFromTemplateJson"
-            },
-            "actionId": "597E7933-0D87-452C-B094-8FA0EEF7FD97",
-            "continueOnError": true
-        }
-    ]
-}
diff --git a/test/TestAssets/TestPackages/dotnet-new/test_templates/PostActions/CreateOrUpdateDotnetConfig/CreateNonExisting/CreateNonExisting.csproj b/test/TestAssets/TestPackages/dotnet-new/test_templates/PostActions/CreateOrUpdateDotnetConfig/CreateNonExisting/CreateNonExisting.csproj
deleted file mode 100644
index ba7e2d463888..000000000000
--- a/test/TestAssets/TestPackages/dotnet-new/test_templates/PostActions/CreateOrUpdateDotnetConfig/CreateNonExisting/CreateNonExisting.csproj
+++ /dev/null
@@ -1,8 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>$(CurrentTargetFramework)</TargetFramework>
-  </PropertyGroup>
-
-</Project>
diff --git a/test/TestAssets/TestPackages/dotnet-new/test_templates/PostActions/CreateOrUpdateDotnetConfig/CreateNonExisting/Program.cs b/test/TestAssets/TestPackages/dotnet-new/test_templates/PostActions/CreateOrUpdateDotnetConfig/CreateNonExisting/Program.cs
deleted file mode 100644
index 38a7692a4297..000000000000
--- a/test/TestAssets/TestPackages/dotnet-new/test_templates/PostActions/CreateOrUpdateDotnetConfig/CreateNonExisting/Program.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-using Newtonsoft.Json;
-
-namespace Basic
-{
-    class Program
-    {
-        static void Main(string[] args)
-        {
-            Console.WriteLine("Hello World!");
-            string result = JsonConvert.SerializeObject(new { a = "test" });
-        }
-    }
-}
diff --git a/test/TestAssets/TestProjects/ClassLibraryWithIsTestProjectAndOtherTestProjects/dotnet.config b/test/TestAssets/TestProjects/ClassLibraryWithIsTestProjectAndOtherTestProjects/dotnet.config
deleted file mode 100644
index 28daa0a28213..000000000000
--- a/test/TestAssets/TestProjects/ClassLibraryWithIsTestProjectAndOtherTestProjects/dotnet.config
+++ /dev/null
@@ -1,2 +0,0 @@
-[dotnet.test.runner]
-name= "Microsoft.Testing.Platform"
\ No newline at end of file
diff --git a/test/TestAssets/TestProjects/ClassLibraryWithIsTestProjectAndOtherTestProjects/global.json b/test/TestAssets/TestProjects/ClassLibraryWithIsTestProjectAndOtherTestProjects/global.json
new file mode 100644
index 000000000000..9009caf0ba8f
--- /dev/null
+++ b/test/TestAssets/TestProjects/ClassLibraryWithIsTestProjectAndOtherTestProjects/global.json
@@ -0,0 +1,5 @@
+{
+    "test": {
+        "runner": "Microsoft.Testing.Platform"
+    }
+}
diff --git a/test/TestAssets/TestProjects/ConsoleAppDoesNothing/dotnet.config b/test/TestAssets/TestProjects/ConsoleAppDoesNothing/dotnet.config
deleted file mode 100644
index da0410e32d54..000000000000
--- a/test/TestAssets/TestProjects/ConsoleAppDoesNothing/dotnet.config
+++ /dev/null
@@ -1,2 +0,0 @@
-[dotnet.test.runner]
-name = "Microsoft.Testing.Platform"
diff --git a/test/TestAssets/TestProjects/ConsoleAppDoesNothing/global.json b/test/TestAssets/TestProjects/ConsoleAppDoesNothing/global.json
new file mode 100644
index 000000000000..9009caf0ba8f
--- /dev/null
+++ b/test/TestAssets/TestProjects/ConsoleAppDoesNothing/global.json
@@ -0,0 +1,5 @@
+{
+    "test": {
+        "runner": "Microsoft.Testing.Platform"
+    }
+}
diff --git a/test/TestAssets/TestProjects/EmptyFolder/dotnet.config b/test/TestAssets/TestProjects/EmptyFolder/dotnet.config
deleted file mode 100644
index fcc92b88398e..000000000000
--- a/test/TestAssets/TestProjects/EmptyFolder/dotnet.config
+++ /dev/null
@@ -1,2 +0,0 @@
-[dotnet.test:runner]
-name= "Microsoft.Testing.Platform"
\ No newline at end of file
diff --git a/test/TestAssets/TestProjects/EmptyFolder/global.json b/test/TestAssets/TestProjects/EmptyFolder/global.json
new file mode 100644
index 000000000000..9009caf0ba8f
--- /dev/null
+++ b/test/TestAssets/TestProjects/EmptyFolder/global.json
@@ -0,0 +1,5 @@
+{
+    "test": {
+        "runner": "Microsoft.Testing.Platform"
+    }
+}
diff --git a/test/TestAssets/TestProjects/HybridTestRunnerTestProjects/dotnet.config b/test/TestAssets/TestProjects/HybridTestRunnerTestProjects/dotnet.config
deleted file mode 100644
index 28daa0a28213..000000000000
--- a/test/TestAssets/TestProjects/HybridTestRunnerTestProjects/dotnet.config
+++ /dev/null
@@ -1,2 +0,0 @@
-[dotnet.test.runner]
-name= "Microsoft.Testing.Platform"
\ No newline at end of file
diff --git a/test/TestAssets/TestProjects/HybridTestRunnerTestProjects/global.json b/test/TestAssets/TestProjects/HybridTestRunnerTestProjects/global.json
new file mode 100644
index 000000000000..9009caf0ba8f
--- /dev/null
+++ b/test/TestAssets/TestProjects/HybridTestRunnerTestProjects/global.json
@@ -0,0 +1,5 @@
+{
+    "test": {
+        "runner": "Microsoft.Testing.Platform"
+    }
+}
diff --git a/test/TestAssets/TestProjects/MSTestMetaPackageProjectWithMultipleTFMsSolution/dotnet.config b/test/TestAssets/TestProjects/MSTestMetaPackageProjectWithMultipleTFMsSolution/dotnet.config
deleted file mode 100644
index 28daa0a28213..000000000000
--- a/test/TestAssets/TestProjects/MSTestMetaPackageProjectWithMultipleTFMsSolution/dotnet.config
+++ /dev/null
@@ -1,2 +0,0 @@
-[dotnet.test.runner]
-name= "Microsoft.Testing.Platform"
\ No newline at end of file
diff --git a/test/TestAssets/TestProjects/MSTestMetaPackageProjectWithMultipleTFMsSolution/global.json b/test/TestAssets/TestProjects/MSTestMetaPackageProjectWithMultipleTFMsSolution/global.json
new file mode 100644
index 000000000000..9009caf0ba8f
--- /dev/null
+++ b/test/TestAssets/TestProjects/MSTestMetaPackageProjectWithMultipleTFMsSolution/global.json
@@ -0,0 +1,5 @@
+{
+    "test": {
+        "runner": "Microsoft.Testing.Platform"
+    }
+}
diff --git a/test/TestAssets/TestProjects/MultiTestProjectSolutionWithDifferentFailures/dotnet.config b/test/TestAssets/TestProjects/MultiTestProjectSolutionWithDifferentFailures/dotnet.config
deleted file mode 100644
index 28daa0a28213..000000000000
--- a/test/TestAssets/TestProjects/MultiTestProjectSolutionWithDifferentFailures/dotnet.config
+++ /dev/null
@@ -1,2 +0,0 @@
-[dotnet.test.runner]
-name= "Microsoft.Testing.Platform"
\ No newline at end of file
diff --git a/test/TestAssets/TestProjects/MultiTestProjectSolutionWithDifferentFailures/global.json b/test/TestAssets/TestProjects/MultiTestProjectSolutionWithDifferentFailures/global.json
new file mode 100644
index 000000000000..9009caf0ba8f
--- /dev/null
+++ b/test/TestAssets/TestProjects/MultiTestProjectSolutionWithDifferentFailures/global.json
@@ -0,0 +1,5 @@
+{
+    "test": {
+        "runner": "Microsoft.Testing.Platform"
+    }
+}
diff --git a/test/TestAssets/TestProjects/MultiTestProjectSolutionWithDiscoveredTests/dotnet.config b/test/TestAssets/TestProjects/MultiTestProjectSolutionWithDiscoveredTests/dotnet.config
deleted file mode 100644
index 28daa0a28213..000000000000
--- a/test/TestAssets/TestProjects/MultiTestProjectSolutionWithDiscoveredTests/dotnet.config
+++ /dev/null
@@ -1,2 +0,0 @@
-[dotnet.test.runner]
-name= "Microsoft.Testing.Platform"
\ No newline at end of file
diff --git a/test/TestAssets/TestProjects/MultiTestProjectSolutionWithDiscoveredTests/global.json b/test/TestAssets/TestProjects/MultiTestProjectSolutionWithDiscoveredTests/global.json
new file mode 100644
index 000000000000..9009caf0ba8f
--- /dev/null
+++ b/test/TestAssets/TestProjects/MultiTestProjectSolutionWithDiscoveredTests/global.json
@@ -0,0 +1,5 @@
+{
+    "test": {
+        "runner": "Microsoft.Testing.Platform"
+    }
+}
diff --git a/test/TestAssets/TestProjects/MultiTestProjectSolutionWithTests/dotnet.config b/test/TestAssets/TestProjects/MultiTestProjectSolutionWithTests/dotnet.config
deleted file mode 100644
index 28daa0a28213..000000000000
--- a/test/TestAssets/TestProjects/MultiTestProjectSolutionWithTests/dotnet.config
+++ /dev/null
@@ -1,2 +0,0 @@
-[dotnet.test.runner]
-name= "Microsoft.Testing.Platform"
\ No newline at end of file
diff --git a/test/TestAssets/TestProjects/MultiTestProjectSolutionWithTests/global.json b/test/TestAssets/TestProjects/MultiTestProjectSolutionWithTests/global.json
new file mode 100644
index 000000000000..9009caf0ba8f
--- /dev/null
+++ b/test/TestAssets/TestProjects/MultiTestProjectSolutionWithTests/global.json
@@ -0,0 +1,5 @@
+{
+    "test": {
+        "runner": "Microsoft.Testing.Platform"
+    }
+}
diff --git a/test/TestAssets/TestProjects/MultipleTestProjectSolution/dotnet.config b/test/TestAssets/TestProjects/MultipleTestProjectSolution/dotnet.config
deleted file mode 100644
index 28daa0a28213..000000000000
--- a/test/TestAssets/TestProjects/MultipleTestProjectSolution/dotnet.config
+++ /dev/null
@@ -1,2 +0,0 @@
-[dotnet.test.runner]
-name= "Microsoft.Testing.Platform"
\ No newline at end of file
diff --git a/test/TestAssets/TestProjects/MultipleTestProjectSolution/global.json b/test/TestAssets/TestProjects/MultipleTestProjectSolution/global.json
new file mode 100644
index 000000000000..9009caf0ba8f
--- /dev/null
+++ b/test/TestAssets/TestProjects/MultipleTestProjectSolution/global.json
@@ -0,0 +1,5 @@
+{
+    "test": {
+        "runner": "Microsoft.Testing.Platform"
+    }
+}
diff --git a/test/TestAssets/TestProjects/MultipleTestProjectsWithoutSolution/dotnet.config b/test/TestAssets/TestProjects/MultipleTestProjectsWithoutSolution/dotnet.config
deleted file mode 100644
index 28daa0a28213..000000000000
--- a/test/TestAssets/TestProjects/MultipleTestProjectsWithoutSolution/dotnet.config
+++ /dev/null
@@ -1,2 +0,0 @@
-[dotnet.test.runner]
-name= "Microsoft.Testing.Platform"
\ No newline at end of file
diff --git a/test/TestAssets/TestProjects/MultipleTestProjectsWithoutSolution/global.json b/test/TestAssets/TestProjects/MultipleTestProjectsWithoutSolution/global.json
new file mode 100644
index 000000000000..9009caf0ba8f
--- /dev/null
+++ b/test/TestAssets/TestProjects/MultipleTestProjectsWithoutSolution/global.json
@@ -0,0 +1,5 @@
+{
+    "test": {
+        "runner": "Microsoft.Testing.Platform"
+    }
+}
diff --git a/test/TestAssets/TestProjects/ProjectSolutionForMultipleTFMs/dotnet.config b/test/TestAssets/TestProjects/ProjectSolutionForMultipleTFMs/dotnet.config
deleted file mode 100644
index 28daa0a28213..000000000000
--- a/test/TestAssets/TestProjects/ProjectSolutionForMultipleTFMs/dotnet.config
+++ /dev/null
@@ -1,2 +0,0 @@
-[dotnet.test.runner]
-name= "Microsoft.Testing.Platform"
\ No newline at end of file
diff --git a/test/TestAssets/TestProjects/ProjectSolutionForMultipleTFMs/global.json b/test/TestAssets/TestProjects/ProjectSolutionForMultipleTFMs/global.json
new file mode 100644
index 000000000000..9009caf0ba8f
--- /dev/null
+++ b/test/TestAssets/TestProjects/ProjectSolutionForMultipleTFMs/global.json
@@ -0,0 +1,5 @@
+{
+    "test": {
+        "runner": "Microsoft.Testing.Platform"
+    }
+}
diff --git a/test/TestAssets/TestProjects/TestAppPrintingCommandLineArguments/dotnet.config b/test/TestAssets/TestProjects/TestAppPrintingCommandLineArguments/dotnet.config
deleted file mode 100644
index 28daa0a28213..000000000000
--- a/test/TestAssets/TestProjects/TestAppPrintingCommandLineArguments/dotnet.config
+++ /dev/null
@@ -1,2 +0,0 @@
-[dotnet.test.runner]
-name= "Microsoft.Testing.Platform"
\ No newline at end of file
diff --git a/test/TestAssets/TestProjects/TestAppPrintingCommandLineArguments/global.json b/test/TestAssets/TestProjects/TestAppPrintingCommandLineArguments/global.json
new file mode 100644
index 000000000000..9009caf0ba8f
--- /dev/null
+++ b/test/TestAssets/TestProjects/TestAppPrintingCommandLineArguments/global.json
@@ -0,0 +1,5 @@
+{
+    "test": {
+        "runner": "Microsoft.Testing.Platform"
+    }
+}
diff --git a/test/TestAssets/TestProjects/TestAppSimpleWithRetry/dotnet.config b/test/TestAssets/TestProjects/TestAppSimpleWithRetry/dotnet.config
deleted file mode 100644
index 28daa0a28213..000000000000
--- a/test/TestAssets/TestProjects/TestAppSimpleWithRetry/dotnet.config
+++ /dev/null
@@ -1,2 +0,0 @@
-[dotnet.test.runner]
-name= "Microsoft.Testing.Platform"
\ No newline at end of file
diff --git a/test/TestAssets/TestProjects/TestAppSimpleWithRetry/global.json b/test/TestAssets/TestProjects/TestAppSimpleWithRetry/global.json
new file mode 100644
index 000000000000..9009caf0ba8f
--- /dev/null
+++ b/test/TestAssets/TestProjects/TestAppSimpleWithRetry/global.json
@@ -0,0 +1,5 @@
+{
+    "test": {
+        "runner": "Microsoft.Testing.Platform"
+    }
+}
diff --git a/test/TestAssets/TestProjects/TestProjectMTPCrash/dotnet.config b/test/TestAssets/TestProjects/TestProjectMTPCrash/dotnet.config
deleted file mode 100644
index 28daa0a28213..000000000000
--- a/test/TestAssets/TestProjects/TestProjectMTPCrash/dotnet.config
+++ /dev/null
@@ -1,2 +0,0 @@
-[dotnet.test.runner]
-name= "Microsoft.Testing.Platform"
\ No newline at end of file
diff --git a/test/TestAssets/TestProjects/TestProjectMTPCrash/global.json b/test/TestAssets/TestProjects/TestProjectMTPCrash/global.json
new file mode 100644
index 000000000000..9009caf0ba8f
--- /dev/null
+++ b/test/TestAssets/TestProjects/TestProjectMTPCrash/global.json
@@ -0,0 +1,5 @@
+{
+    "test": {
+        "runner": "Microsoft.Testing.Platform"
+    }
+}
diff --git a/test/TestAssets/TestProjects/TestProjectMTPWithUseAppHostFalse/dotnet.config b/test/TestAssets/TestProjects/TestProjectMTPWithUseAppHostFalse/dotnet.config
deleted file mode 100644
index da0410e32d54..000000000000
--- a/test/TestAssets/TestProjects/TestProjectMTPWithUseAppHostFalse/dotnet.config
+++ /dev/null
@@ -1,2 +0,0 @@
-[dotnet.test.runner]
-name = "Microsoft.Testing.Platform"
diff --git a/test/TestAssets/TestProjects/TestProjectMTPWithUseAppHostFalse/global.json b/test/TestAssets/TestProjects/TestProjectMTPWithUseAppHostFalse/global.json
new file mode 100644
index 000000000000..9009caf0ba8f
--- /dev/null
+++ b/test/TestAssets/TestProjects/TestProjectMTPWithUseAppHostFalse/global.json
@@ -0,0 +1,5 @@
+{
+    "test": {
+        "runner": "Microsoft.Testing.Platform"
+    }
+}
diff --git a/test/TestAssets/TestProjects/TestProjectSolution/dotnet.config b/test/TestAssets/TestProjects/TestProjectSolution/dotnet.config
deleted file mode 100644
index 28daa0a28213..000000000000
--- a/test/TestAssets/TestProjects/TestProjectSolution/dotnet.config
+++ /dev/null
@@ -1,2 +0,0 @@
-[dotnet.test.runner]
-name= "Microsoft.Testing.Platform"
\ No newline at end of file
diff --git a/test/TestAssets/TestProjects/TestProjectSolution/global.json b/test/TestAssets/TestProjects/TestProjectSolution/global.json
new file mode 100644
index 000000000000..9009caf0ba8f
--- /dev/null
+++ b/test/TestAssets/TestProjects/TestProjectSolution/global.json
@@ -0,0 +1,5 @@
+{
+    "test": {
+        "runner": "Microsoft.Testing.Platform"
+    }
+}
diff --git a/test/TestAssets/TestProjects/TestProjectSolutionTestingMinimumExpectedTests/dotnet.config b/test/TestAssets/TestProjects/TestProjectSolutionTestingMinimumExpectedTests/dotnet.config
deleted file mode 100644
index 28daa0a28213..000000000000
--- a/test/TestAssets/TestProjects/TestProjectSolutionTestingMinimumExpectedTests/dotnet.config
+++ /dev/null
@@ -1,2 +0,0 @@
-[dotnet.test.runner]
-name= "Microsoft.Testing.Platform"
\ No newline at end of file
diff --git a/test/TestAssets/TestProjects/TestProjectSolutionTestingMinimumExpectedTests/global.json b/test/TestAssets/TestProjects/TestProjectSolutionTestingMinimumExpectedTests/global.json
new file mode 100644
index 000000000000..9009caf0ba8f
--- /dev/null
+++ b/test/TestAssets/TestProjects/TestProjectSolutionTestingMinimumExpectedTests/global.json
@@ -0,0 +1,5 @@
+{
+    "test": {
+        "runner": "Microsoft.Testing.Platform"
+    }
+}
diff --git a/test/TestAssets/TestProjects/TestProjectSolutionWithCodeCoverage/dotnet.config b/test/TestAssets/TestProjects/TestProjectSolutionWithCodeCoverage/dotnet.config
deleted file mode 100644
index 28daa0a28213..000000000000
--- a/test/TestAssets/TestProjects/TestProjectSolutionWithCodeCoverage/dotnet.config
+++ /dev/null
@@ -1,2 +0,0 @@
-[dotnet.test.runner]
-name= "Microsoft.Testing.Platform"
\ No newline at end of file
diff --git a/test/TestAssets/TestProjects/TestProjectSolutionWithCodeCoverage/global.json b/test/TestAssets/TestProjects/TestProjectSolutionWithCodeCoverage/global.json
new file mode 100644
index 000000000000..9009caf0ba8f
--- /dev/null
+++ b/test/TestAssets/TestProjects/TestProjectSolutionWithCodeCoverage/global.json
@@ -0,0 +1,5 @@
+{
+    "test": {
+        "runner": "Microsoft.Testing.Platform"
+    }
+}
diff --git a/test/TestAssets/TestProjects/TestProjectSolutionWithTestsAndArtifacts/dotnet.config b/test/TestAssets/TestProjects/TestProjectSolutionWithTestsAndArtifacts/dotnet.config
deleted file mode 100644
index 28daa0a28213..000000000000
--- a/test/TestAssets/TestProjects/TestProjectSolutionWithTestsAndArtifacts/dotnet.config
+++ /dev/null
@@ -1,2 +0,0 @@
-[dotnet.test.runner]
-name= "Microsoft.Testing.Platform"
\ No newline at end of file
diff --git a/test/TestAssets/TestProjects/TestProjectSolutionWithTestsAndArtifacts/global.json b/test/TestAssets/TestProjects/TestProjectSolutionWithTestsAndArtifacts/global.json
new file mode 100644
index 000000000000..9009caf0ba8f
--- /dev/null
+++ b/test/TestAssets/TestProjects/TestProjectSolutionWithTestsAndArtifacts/global.json
@@ -0,0 +1,5 @@
+{
+    "test": {
+        "runner": "Microsoft.Testing.Platform"
+    }
+}
diff --git a/test/TestAssets/TestProjects/TestProjectWithClassLibrary/dotnet.config b/test/TestAssets/TestProjects/TestProjectWithClassLibrary/dotnet.config
deleted file mode 100644
index 28daa0a28213..000000000000
--- a/test/TestAssets/TestProjects/TestProjectWithClassLibrary/dotnet.config
+++ /dev/null
@@ -1,2 +0,0 @@
-[dotnet.test.runner]
-name= "Microsoft.Testing.Platform"
\ No newline at end of file
diff --git a/test/TestAssets/TestProjects/TestProjectWithClassLibrary/global.json b/test/TestAssets/TestProjects/TestProjectWithClassLibrary/global.json
new file mode 100644
index 000000000000..9009caf0ba8f
--- /dev/null
+++ b/test/TestAssets/TestProjects/TestProjectWithClassLibrary/global.json
@@ -0,0 +1,5 @@
+{
+    "test": {
+        "runner": "Microsoft.Testing.Platform"
+    }
+}
diff --git a/test/TestAssets/TestProjects/TestProjectWithClassLibraryDifferentTFMs/dotnet.config b/test/TestAssets/TestProjects/TestProjectWithClassLibraryDifferentTFMs/dotnet.config
deleted file mode 100644
index 28daa0a28213..000000000000
--- a/test/TestAssets/TestProjects/TestProjectWithClassLibraryDifferentTFMs/dotnet.config
+++ /dev/null
@@ -1,2 +0,0 @@
-[dotnet.test.runner]
-name= "Microsoft.Testing.Platform"
\ No newline at end of file
diff --git a/test/TestAssets/TestProjects/TestProjectWithClassLibraryDifferentTFMs/global.json b/test/TestAssets/TestProjects/TestProjectWithClassLibraryDifferentTFMs/global.json
new file mode 100644
index 000000000000..9009caf0ba8f
--- /dev/null
+++ b/test/TestAssets/TestProjects/TestProjectWithClassLibraryDifferentTFMs/global.json
@@ -0,0 +1,5 @@
+{
+    "test": {
+        "runner": "Microsoft.Testing.Platform"
+    }
+}
diff --git a/test/TestAssets/TestProjects/TestProjectWithConditionOnGlobalProperty/dotnet.config b/test/TestAssets/TestProjects/TestProjectWithConditionOnGlobalProperty/dotnet.config
deleted file mode 100644
index 28daa0a28213..000000000000
--- a/test/TestAssets/TestProjects/TestProjectWithConditionOnGlobalProperty/dotnet.config
+++ /dev/null
@@ -1,2 +0,0 @@
-[dotnet.test.runner]
-name= "Microsoft.Testing.Platform"
\ No newline at end of file
diff --git a/test/TestAssets/TestProjects/TestProjectWithConditionOnGlobalProperty/global.json b/test/TestAssets/TestProjects/TestProjectWithConditionOnGlobalProperty/global.json
new file mode 100644
index 000000000000..9009caf0ba8f
--- /dev/null
+++ b/test/TestAssets/TestProjects/TestProjectWithConditionOnGlobalProperty/global.json
@@ -0,0 +1,5 @@
+{
+    "test": {
+        "runner": "Microsoft.Testing.Platform"
+    }
+}
diff --git a/test/TestAssets/TestProjects/TestProjectWithDiscoveredTests/dotnet.config b/test/TestAssets/TestProjects/TestProjectWithDiscoveredTests/dotnet.config
deleted file mode 100644
index 28daa0a28213..000000000000
--- a/test/TestAssets/TestProjects/TestProjectWithDiscoveredTests/dotnet.config
+++ /dev/null
@@ -1,2 +0,0 @@
-[dotnet.test.runner]
-name= "Microsoft.Testing.Platform"
\ No newline at end of file
diff --git a/test/TestAssets/TestProjects/TestProjectWithDiscoveredTests/global.json b/test/TestAssets/TestProjects/TestProjectWithDiscoveredTests/global.json
new file mode 100644
index 000000000000..9009caf0ba8f
--- /dev/null
+++ b/test/TestAssets/TestProjects/TestProjectWithDiscoveredTests/global.json
@@ -0,0 +1,5 @@
+{
+    "test": {
+        "runner": "Microsoft.Testing.Platform"
+    }
+}
diff --git a/test/TestAssets/TestProjects/TestProjectWithLaunchSettings/dotnet.config b/test/TestAssets/TestProjects/TestProjectWithLaunchSettings/dotnet.config
deleted file mode 100644
index 28daa0a28213..000000000000
--- a/test/TestAssets/TestProjects/TestProjectWithLaunchSettings/dotnet.config
+++ /dev/null
@@ -1,2 +0,0 @@
-[dotnet.test.runner]
-name= "Microsoft.Testing.Platform"
\ No newline at end of file
diff --git a/test/TestAssets/TestProjects/TestProjectWithLaunchSettings/global.json b/test/TestAssets/TestProjects/TestProjectWithLaunchSettings/global.json
new file mode 100644
index 000000000000..9009caf0ba8f
--- /dev/null
+++ b/test/TestAssets/TestProjects/TestProjectWithLaunchSettings/global.json
@@ -0,0 +1,5 @@
+{
+    "test": {
+        "runner": "Microsoft.Testing.Platform"
+    }
+}
diff --git a/test/TestAssets/TestProjects/TestProjectWithMultipleTFMsParallelization/dotnet.config b/test/TestAssets/TestProjects/TestProjectWithMultipleTFMsParallelization/dotnet.config
deleted file mode 100644
index 28daa0a28213..000000000000
--- a/test/TestAssets/TestProjects/TestProjectWithMultipleTFMsParallelization/dotnet.config
+++ /dev/null
@@ -1,2 +0,0 @@
-[dotnet.test.runner]
-name= "Microsoft.Testing.Platform"
\ No newline at end of file
diff --git a/test/TestAssets/TestProjects/TestProjectWithMultipleTFMsParallelization/global.json b/test/TestAssets/TestProjects/TestProjectWithMultipleTFMsParallelization/global.json
new file mode 100644
index 000000000000..9009caf0ba8f
--- /dev/null
+++ b/test/TestAssets/TestProjects/TestProjectWithMultipleTFMsParallelization/global.json
@@ -0,0 +1,5 @@
+{
+    "test": {
+        "runner": "Microsoft.Testing.Platform"
+    }
+}
diff --git a/test/TestAssets/TestProjects/TestProjectWithMultipleTFMsSolution/dotnet.config b/test/TestAssets/TestProjects/TestProjectWithMultipleTFMsSolution/dotnet.config
deleted file mode 100644
index 28daa0a28213..000000000000
--- a/test/TestAssets/TestProjects/TestProjectWithMultipleTFMsSolution/dotnet.config
+++ /dev/null
@@ -1,2 +0,0 @@
-[dotnet.test.runner]
-name= "Microsoft.Testing.Platform"
\ No newline at end of file
diff --git a/test/TestAssets/TestProjects/TestProjectWithMultipleTFMsSolution/global.json b/test/TestAssets/TestProjects/TestProjectWithMultipleTFMsSolution/global.json
new file mode 100644
index 000000000000..9009caf0ba8f
--- /dev/null
+++ b/test/TestAssets/TestProjects/TestProjectWithMultipleTFMsSolution/global.json
@@ -0,0 +1,5 @@
+{
+    "test": {
+        "runner": "Microsoft.Testing.Platform"
+    }
+}
diff --git a/test/TestAssets/TestProjects/TestProjectWithTests/dotnet.config b/test/TestAssets/TestProjects/TestProjectWithTests/dotnet.config
deleted file mode 100644
index 28daa0a28213..000000000000
--- a/test/TestAssets/TestProjects/TestProjectWithTests/dotnet.config
+++ /dev/null
@@ -1,2 +0,0 @@
-[dotnet.test.runner]
-name= "Microsoft.Testing.Platform"
\ No newline at end of file
diff --git a/test/TestAssets/TestProjects/TestProjectWithTests/global.json b/test/TestAssets/TestProjects/TestProjectWithTests/global.json
new file mode 100644
index 000000000000..9009caf0ba8f
--- /dev/null
+++ b/test/TestAssets/TestProjects/TestProjectWithTests/global.json
@@ -0,0 +1,5 @@
+{
+    "test": {
+        "runner": "Microsoft.Testing.Platform"
+    }
+}
diff --git a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewDetailsTest.CanDisplayDetails_InstalledPackage_LocalPackage.Linux.verified.txt b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewDetailsTest.CanDisplayDetails_InstalledPackage_LocalPackage.Linux.verified.txt
index c69514a6ee7b..948efa0f8d7b 100644
--- a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewDetailsTest.CanDisplayDetails_InstalledPackage_LocalPackage.Linux.verified.txt
+++ b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewDetailsTest.CanDisplayDetails_InstalledPackage_LocalPackage.Linux.verified.txt
@@ -31,8 +31,6 @@
       TestAssets.PostActions.AddProjectToSolution....  TestAssets.PostActions.AddProjectToSolution.BasicInSolutionRoot                           Test Asset          
       TestAssets.PostActions.AddProjectToSolution....  TestAssets.PostActions.AddProjectToSolution.BasicWithFiles                                Test Asset          
       TestAssets.PostActions.AddProjectToSolution....  TestAssets.PostActions.AddProjectToSolution.BasicWithIndexes                              Test Asset          
-      TestAssets.PostActions.CreateOrUpdateDotnetC...  TestAssets.PostActions.CreateOrUpdateDotnetConfig.AddNewSection                           Test Asset          
-      TestAssets.PostActions.CreateOrUpdateDotnetC...  TestAssets.PostActions.CreateOrUpdateDotnetConfig.CreateNonExisting                       Test Asset          
       TestAssets.PostActions.Instructions.Basic        TestAssets.PostActions.Instructions.Basic                                                 Test Asset          
       TestAssets.PostActions.RestoreNuGet.Basic        TestAssets.PostActions.RestoreNuGet.Basic                                                 Test Asset          
       TestAssets.PostActions.RestoreNuGet.BasicWit...  TestAssets.PostActions.RestoreNuGet.BasicWithFiles                                        Test Asset          
diff --git a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewDetailsTest.CanDisplayDetails_InstalledPackage_LocalPackage.OSX.verified.txt b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewDetailsTest.CanDisplayDetails_InstalledPackage_LocalPackage.OSX.verified.txt
index c69514a6ee7b..948efa0f8d7b 100644
--- a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewDetailsTest.CanDisplayDetails_InstalledPackage_LocalPackage.OSX.verified.txt
+++ b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewDetailsTest.CanDisplayDetails_InstalledPackage_LocalPackage.OSX.verified.txt
@@ -31,8 +31,6 @@
       TestAssets.PostActions.AddProjectToSolution....  TestAssets.PostActions.AddProjectToSolution.BasicInSolutionRoot                           Test Asset          
       TestAssets.PostActions.AddProjectToSolution....  TestAssets.PostActions.AddProjectToSolution.BasicWithFiles                                Test Asset          
       TestAssets.PostActions.AddProjectToSolution....  TestAssets.PostActions.AddProjectToSolution.BasicWithIndexes                              Test Asset          
-      TestAssets.PostActions.CreateOrUpdateDotnetC...  TestAssets.PostActions.CreateOrUpdateDotnetConfig.AddNewSection                           Test Asset          
-      TestAssets.PostActions.CreateOrUpdateDotnetC...  TestAssets.PostActions.CreateOrUpdateDotnetConfig.CreateNonExisting                       Test Asset          
       TestAssets.PostActions.Instructions.Basic        TestAssets.PostActions.Instructions.Basic                                                 Test Asset          
       TestAssets.PostActions.RestoreNuGet.Basic        TestAssets.PostActions.RestoreNuGet.Basic                                                 Test Asset          
       TestAssets.PostActions.RestoreNuGet.BasicWit...  TestAssets.PostActions.RestoreNuGet.BasicWithFiles                                        Test Asset          
diff --git a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewDetailsTest.CanDisplayDetails_InstalledPackage_LocalPackage.Windows.verified.txt b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewDetailsTest.CanDisplayDetails_InstalledPackage_LocalPackage.Windows.verified.txt
index f2c16d05d10d..8f48b106823e 100644
--- a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewDetailsTest.CanDisplayDetails_InstalledPackage_LocalPackage.Windows.verified.txt
+++ b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewDetailsTest.CanDisplayDetails_InstalledPackage_LocalPackage.Windows.verified.txt
@@ -31,8 +31,6 @@
       TestAssets.PostActions.AddProjectToSolution....  TestAssets.PostActions.AddProjectToSolution.BasicWithFiles                                Test Asset          
       TestAssets.PostActions.AddProjectToSolution....  TestAssets.PostActions.AddProjectToSolution.BasicWithIndexes                              Test Asset          
       TestAssets.PostActions.AddProjectToSolution....  TestAssets.PostActions.AddProjectToSolution.Basic                                         Test Asset          
-      TestAssets.PostActions.CreateOrUpdateDotnetC...  TestAssets.PostActions.CreateOrUpdateDotnetConfig.AddNewSection                           Test Asset          
-      TestAssets.PostActions.CreateOrUpdateDotnetC...  TestAssets.PostActions.CreateOrUpdateDotnetConfig.CreateNonExisting                       Test Asset          
       TestAssets.PostActions.Instructions.Basic        TestAssets.PostActions.Instructions.Basic                                                 Test Asset          
       TestAssets.PostActions.RestoreNuGet.BasicWit...  TestAssets.PostActions.RestoreNuGet.BasicWithFiles                                        Test Asset          
       TestAssets.PostActions.RestoreNuGet.Basic        TestAssets.PostActions.RestoreNuGet.Basic                                                 Test Asset          
diff --git a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewDetailsTest.CanDisplayDetails_InstalledPackage_LocalPackage.verified.txt b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewDetailsTest.CanDisplayDetails_InstalledPackage_LocalPackage.verified.txt
index 0a6b5d625e43..3264f4ecfdd7 100644
--- a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewDetailsTest.CanDisplayDetails_InstalledPackage_LocalPackage.verified.txt
+++ b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewDetailsTest.CanDisplayDetails_InstalledPackage_LocalPackage.verified.txt
@@ -31,8 +31,6 @@
       TestAssets.PostActions.AddProjectToSolution....  TestAssets.PostActions.AddProjectToSolution.BasicWithFiles                                Test Asset          
       TestAssets.PostActions.AddProjectToSolution....  TestAssets.PostActions.AddProjectToSolution.BasicWithIndexes                              Test Asset          
       TestAssets.PostActions.AddProjectToSolution....  TestAssets.PostActions.AddProjectToSolution.Basic                                         Test Asset          
-      TestAssets.PostActions.CreateOrUpdateDotnetC...  TestAssets.PostActions.CreateOrUpdateDotnetConfig.AddNewSection                           Test Asset          
-      TestAssets.PostActions.CreateOrUpdateDotnetC...  TestAssets.PostActions.CreateOrUpdateDotnetConfig.CreateNonExisting                       Test Asset          
       TestAssets.PostActions.Instructions.Basic        TestAssets.PostActions.Instructions.Basic                                                 Test Asset          
       TestAssets.PostActions.RestoreNuGet.BasicWit...  TestAssets.PostActions.RestoreNuGet.BasicWithFiles                                        Test Asset          
       TestAssets.PostActions.RestoreNuGet.Basic        TestAssets.PostActions.RestoreNuGet.Basic                                                 Test Asset          
diff --git a/test/dotnet-new.IntegrationTests/DotnetNewTestTemplatesTests.cs b/test/dotnet-new.IntegrationTests/DotnetNewTestTemplatesTests.cs
index b50ea3706216..28d6cb6754e6 100644
--- a/test/dotnet-new.IntegrationTests/DotnetNewTestTemplatesTests.cs
+++ b/test/dotnet-new.IntegrationTests/DotnetNewTestTemplatesTests.cs
@@ -181,7 +181,7 @@ public void MSTestAndPlaywrightProjectTemplate_WithCoverageToolAndTestRunner_Can
             string testProjectName = GenerateTestProjectName();
             string outputDirectory = CreateTemporaryFolder(folderName: "Home");
 
-            // Prevent the dotnet.config post action from walking up the directory parents up to our own solution root, which would affect other tests.
+            // Prevent the global.json post action from walking up the directory parents up to our own solution root, which would affect other tests.
             Directory.CreateDirectory(Path.Combine(outputDirectory, ".git"));
 
             string workingDirectory = CreateTemporaryFolder();
@@ -200,7 +200,7 @@ public void MSTestAndPlaywrightProjectTemplate_WithCoverageToolAndTestRunner_Can
                 var isMTP = testRunner == "Microsoft.Testing.Platform";
                 if (isMTP)
                 {
-                    File.Exists(Path.Combine(outputDirectory, "dotnet.config")).Should().BeTrue();
+                    File.Exists(Path.Combine(outputDirectory, "global.json")).Should().BeTrue();
                 }
 
                 var result = new DotnetTestCommand(_log, false)
diff --git a/test/dotnet-new.IntegrationTests/PostActionTests.cs b/test/dotnet-new.IntegrationTests/PostActionTests.cs
index 3acada973357..3e9c6a391914 100644
--- a/test/dotnet-new.IntegrationTests/PostActionTests.cs
+++ b/test/dotnet-new.IntegrationTests/PostActionTests.cs
@@ -3,7 +3,6 @@
 
 using System.Text.Json.Nodes;
 using Microsoft.DotNet.Cli.Utils;
-using Microsoft.TemplateEngine.TestHelper;
 using Microsoft.TemplateEngine.Utils;
 
 namespace Microsoft.DotNet.Cli.New.IntegrationTests
@@ -1216,72 +1215,5 @@ public void AddJsonProperty_FailsWhenJsonFileNotFoundInEligableDirectories()
 
             File.Delete(jsonFileLocation);
         }
-
-        [Fact]
-        public void CreateOrUpdateDotnetConfig_CreateNonExisting()
-        {
-            string templateLocation = _testAssetsManager.CopyTestAsset("PostActions/CreateOrUpdateDotnetConfig/CreateNonExisting", testAssetSubdirectory: DotnetNewTestTemplatesBasePath).WithSource().Path;
-            string expectedTemplateName = "TestAssets.PostActions.CreateOrUpdateDotnetConfig.CreateNonExisting";
-            string home = CreateTemporaryFolder(folderName: "Home");
-            string workingDirectory = CreateTemporaryFolder();
-            string outputDirectory = TestUtils.CreateTemporaryFolder();
-            InstallTestTemplate(templateLocation, _log, home, workingDirectory);
-
-            var commandResult = new DotnetNewCommand(_log, expectedTemplateName, "-n", "MyProject", "-o", outputDirectory)
-                .WithCustomHive(home)
-                .WithWorkingDirectory(workingDirectory)
-                .Execute();
-
-            commandResult
-                .Should()
-                .ExitWith(0)
-                .And.NotHaveStdErr()
-                .And.HaveStdOutContaining($"The template \"{expectedTemplateName}\" was created successfully.")
-                .And.HaveStdOutContaining("Successfully created 'dotnet.config' file.")
-                .And.NotHaveStdOutContaining("Manual instructions");
-
-            Assert.Equal(
-                """
-                [SectionFromTemplateJson]
-                KeyFromTemplateJson = "ValueFromTemplateJson"
-
-                """,
-                File.ReadAllText(Path.Combine(outputDirectory, "dotnet.config")));
-        }
-
-        [Fact]
-        public void CreateOrUpdateDotnetConfig_AddNewSection()
-        {
-            string templateLocation = _testAssetsManager.CopyTestAsset("PostActions/CreateOrUpdateDotnetConfig/AddNewSection", testAssetSubdirectory: DotnetNewTestTemplatesBasePath).WithSource().Path;
-            string expectedTemplateName = "TestAssets.PostActions.CreateOrUpdateDotnetConfig.AddNewSection";
-            string home = CreateTemporaryFolder(folderName: "Home");
-            string workingDirectory = CreateTemporaryFolder();
-            string outputDirectory = TestUtils.CreateTemporaryFolder();
-            InstallTestTemplate(templateLocation, _log, home, workingDirectory);
-
-            var commandResult = new DotnetNewCommand(_log, expectedTemplateName, "-n", "MyProject", "-o", outputDirectory)
-                .WithCustomHive(home)
-                .WithWorkingDirectory(workingDirectory)
-                .Execute();
-
-            commandResult
-                .Should()
-                .ExitWith(0)
-                .And.NotHaveStdErr()
-                .And.HaveStdOutContaining($"The template \"{expectedTemplateName}\" was created successfully.")
-                .And.HaveStdOutContaining("Created new section in 'dotnet.config' file")
-                .And.NotHaveStdOutContaining("Manual instructions");
-
-            Assert.Equal(
-                """
-                [existing-section]
-                mykey = "myvalue"
-
-                [SectionFromTemplateJson]
-                KeyFromTemplateJson = "ValueFromTemplateJson"
-
-                """,
-                File.ReadAllText(Path.Combine(outputDirectory, "dotnet.config")));
-        }
     }
 }
diff --git a/test/dotnet.Tests/CommandTests/Test/TestCommandValidationTests.cs b/test/dotnet.Tests/CommandTests/Test/TestCommandValidationTests.cs
index d9bc689cecf5..4c8a746eebc4 100644
--- a/test/dotnet.Tests/CommandTests/Test/TestCommandValidationTests.cs
+++ b/test/dotnet.Tests/CommandTests/Test/TestCommandValidationTests.cs
@@ -21,10 +21,13 @@ public void TestCommandShouldValidateFileArgumentsAndProvideHelpfulMessages(stri
             // Create the test file
             var testFilePath = Path.Combine(testDir.Path, filename);
             File.WriteAllText(testFilePath, "dummy content");
-            File.WriteAllText(Path.Combine(testDir.Path, "dotnet.config"),
+            File.WriteAllText(Path.Combine(testDir.Path, "global.json"),
                 """
-                [dotnet.test.runner]
-                name = Microsoft.Testing.Platform
+                {
+                    "test": {
+                        "runner": "Microsoft.Testing.Platform"
+                    }
+                }
                 """);
 
             var result = new DotnetTestCommand(Log, disableNewOutput: false)
@@ -44,10 +47,13 @@ public void TestCommandShouldValidateDirectoryArgumentAndProvideHelpfulMessage()
             var testDir = _testAssetsManager.CreateTestDirectory();
             var subDir = Path.Combine(testDir.Path, "test_directory");
             Directory.CreateDirectory(subDir);
-            File.WriteAllText(Path.Combine(testDir.Path, "dotnet.config"),
+            File.WriteAllText(Path.Combine(testDir.Path, "global.json"),
                 """
-                [dotnet.test.runner]
-                name = Microsoft.Testing.Platform
+                {
+                    "test": {
+                        "runner": "Microsoft.Testing.Platform"
+                    }
+                }
                 """);
 
             var result = new DotnetTestCommand(Log, disableNewOutput: false)
@@ -69,10 +75,13 @@ public void TestCommandShouldValidateDllArgumentAndProvideHelpfulMessage()
             // Create a dummy dll file
             var dllPath = Path.Combine(testDir.Path, "test.dll");
             File.WriteAllText(dllPath, "dummy dll content");
-            File.WriteAllText(Path.Combine(testDir.Path, "dotnet.config"),
+            File.WriteAllText(Path.Combine(testDir.Path, "global.json"),
                 """
-                [dotnet.test.runner]
-                name = Microsoft.Testing.Platform
+                {
+                    "test": {
+                        "runner": "Microsoft.Testing.Platform"
+                    }
+                }
                 """);
 
             var result = new DotnetTestCommand(Log, disableNewOutput: false)

From 9fea2adbc7092fea8de9ec001804256682bc912e Mon Sep 17 00:00:00 2001
From: Nikolche Kolev <nikolce1kolev@gmail.com>
Date: Wed, 10 Sep 2025 17:52:03 -0700
Subject: [PATCH 11/11] Improve target graph handling in log messages (#50694)

---
 .../GivenAResolvePackageDependenciesTask.cs   | 23 +++++++-----
 ...WantToGetDependenciesViaDesignTimeBuild.cs | 23 ++++++------
 .../ResolvePackageAssets.cs                   | 17 ++++++---
 .../ResolvePackageDependencies.cs             | 36 +++++++++++++------
 4 files changed, 66 insertions(+), 33 deletions(-)

diff --git a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAResolvePackageDependenciesTask.cs b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAResolvePackageDependenciesTask.cs
index 40543d1ae798..1d4a52b44d49 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAResolvePackageDependenciesTask.cs
+++ b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAResolvePackageDependenciesTask.cs
@@ -141,12 +141,17 @@ public void ItAssignsExpectedTopLevelDependencies()
                 });
         }
 
-        [Fact]
-        public void ItAssignsDiagnosticLevel()
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public void ItAssignsDiagnosticLevel(bool useAlias)
         {
             const string target1 = ".NETCoreApp,Version=v1.0";
             const string target2 = ".NETCoreApp,Version=v2.0";
 
+            string alias1 = useAlias ? "netcoreapp1.0" : target1;
+            string alias2 = useAlias ? "netcoreapp2.0" : target2;
+
             string lockFileContent = CreateLockFileSnippet(
                 targets: new string[] {
                     CreateTarget("netcoreapp1.0", TargetLibA, TargetLibB, TargetLibC),
@@ -157,15 +162,15 @@ public void ItAssignsDiagnosticLevel()
                 logs: new[]
                 {
                     // LibA
-                    CreateLog(NuGetLogCode.NU1000, LogLevel.Information, "", libraryId: "LibA", targetGraphs: new[] { target1 }),
-                    CreateLog(NuGetLogCode.NU1000, LogLevel.Warning,     "", libraryId: "LibA", targetGraphs: new[] { target1 }),
-                    CreateLog(NuGetLogCode.NU1000, LogLevel.Error,       "", libraryId: "LibA", targetGraphs: new[] { target1 }),
+                    CreateLog(NuGetLogCode.NU1000, LogLevel.Information, "", libraryId: "LibA", targetGraphs: new[] { alias1 }),
+                    CreateLog(NuGetLogCode.NU1000, LogLevel.Warning,     "", libraryId: "LibA", targetGraphs: new[] { alias1 }),
+                    CreateLog(NuGetLogCode.NU1000, LogLevel.Error,       "", libraryId: "LibA", targetGraphs: new[] { alias1 }),
                     // LibB
-                    CreateLog(NuGetLogCode.NU1000, LogLevel.Information, "", libraryId: "LibB", targetGraphs: new[] { target1, target2 }),
-                    CreateLog(NuGetLogCode.NU1000, LogLevel.Warning,     "", libraryId: "LibB", targetGraphs: new[] { target1, target2 }),
+                    CreateLog(NuGetLogCode.NU1000, LogLevel.Information, "", libraryId: "LibB", targetGraphs: new[] { alias1, alias2 }),
+                    CreateLog(NuGetLogCode.NU1000, LogLevel.Warning,     "", libraryId: "LibB", targetGraphs: new[] { alias1, alias2 }),
                     // LibC (wrong target)
-                    CreateLog(NuGetLogCode.NU1000, LogLevel.Information, "", libraryId: "LibB", targetGraphs: new[] { target2 }),
-                    CreateLog(NuGetLogCode.NU1000, LogLevel.Warning,     "", libraryId: "LibB", targetGraphs: new[] { target2 })
+                    CreateLog(NuGetLogCode.NU1000, LogLevel.Information, "", libraryId: "LibB", targetGraphs: new[] { alias2 }),
+                    CreateLog(NuGetLogCode.NU1000, LogLevel.Warning,     "", libraryId: "LibB", targetGraphs: new[] { alias2 })
                 }
             );
 
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenThatWeWantToGetDependenciesViaDesignTimeBuild.cs b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenThatWeWantToGetDependenciesViaDesignTimeBuild.cs
index 5a97538139b3..70a49278a575 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenThatWeWantToGetDependenciesViaDesignTimeBuild.cs
+++ b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenThatWeWantToGetDependenciesViaDesignTimeBuild.cs
@@ -351,8 +351,10 @@ public void ItShouldOnlyReturnPackagesInTheSpecifiedTarget()
             Assert.Equal("top.package1/1.0.0", item1.ItemSpec);
         }
 
-        [WindowsOnlyFact]
-        public void ItShouldOnlyReturnTopLevelPackages()
+        [WindowsOnlyTheory]
+        [InlineData("latestNet")]
+        [InlineData("net6.0")]
+        public void ItShouldOnlyReturnTopLevelPackages(string alias)
         {
             var testRoot = _testAssetsManager.CreateTestDirectory().Path;
             Log.WriteLine("Test root: " + testRoot);
@@ -360,11 +362,11 @@ public void ItShouldOnlyReturnTopLevelPackages()
             string projectAssetsJsonPath = Path.Combine(testRoot, "project.assets.json");
             string projectCacheAssetsJsonPath = Path.Combine(testRoot, "projectassets.cache");
             // project.assets.json
-            File.WriteAllText(projectAssetsJsonPath, CreateBasicProjectAssetsFile(testRoot));
+            File.WriteAllText(projectAssetsJsonPath, CreateBasicProjectAssetsFile(testRoot, alias: alias));
             var task = InitializeTask(testRoot, out _);
             task.ProjectAssetsFile = projectAssetsJsonPath;
             task.ProjectAssetsCacheFile = projectCacheAssetsJsonPath;
-            task.TargetFramework = "net6.0";
+            task.TargetFramework = alias;
             task.Execute();
 
             // Verify all top packages are listed here
@@ -404,7 +406,7 @@ public void ItShouldOnlyReturnTopLevelPackages()
         /// </c>
         /// dependent.package2 has an error message, and dependent.package3 has a warning.
         /// </remarks>
-        private string CreateBasicProjectAssetsFile(string testRoot, string package2Type = "package", string package3Type = "package")
+        private string CreateBasicProjectAssetsFile(string testRoot, string package2Type = "package", string package3Type = "package", string alias = "net6.0")
         {
             var json =
 """
@@ -586,11 +588,11 @@ private string CreateBasicProjectAssetsFile(string testRoot, string package2Type
             "C:\\configDir3\\Microsoft.VisualStudio.Offline.config"
           ],
           "originalTargetFrameworks": [
-            "net6.0"
+            "TFM_ALIAS"
           ],
           "frameworks": {
             "net6.0": {
-              "targetAlias": "net6.0",
+              "targetAlias": "TFM_ALIAS",
               "projectReferences": {}
             }
           },
@@ -602,7 +604,7 @@ private string CreateBasicProjectAssetsFile(string testRoot, string package2Type
     },
       "frameworks" : {
           "net6.0": {
-              "targetAlias" : "net6.0",
+              "targetAlias" : "TFM_ALIAS",
               "dependencies" : {
                   "top.package1" : {
                       "target" : "Package",
@@ -620,7 +622,7 @@ private string CreateBasicProjectAssetsFile(string testRoot, string package2Type
       "message": "some warning message",
       "libraryId": "dependent.package2",
       "targetGraphs": [
-        "net6.0"
+        "TFM_ALIAS"
       ]
     },
     {
@@ -630,7 +632,7 @@ private string CreateBasicProjectAssetsFile(string testRoot, string package2Type
       "message": "some warning message",
       "libraryId": "dependent.package3",
       "targetGraphs": [
-        "net6.0"
+        "TFM_ALIAS"
       ]
     }
   ]
@@ -638,6 +640,7 @@ private string CreateBasicProjectAssetsFile(string testRoot, string package2Type
 """;
             return json.Replace("PACKAGE2_TYPE", package2Type)
                        .Replace("PACKAGE3_TYPE", package3Type)
+                       .Replace("TFM_ALIAS", alias)
                        .Replace(@"C:\\.nuget", $@"{testRoot.Replace("\\", "\\\\")}\\.nuget");
         }
         private ResolvePackageAssets InitializeTask(string testRoot, out IEnumerable<PropertyInfo> inputProperties)
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/ResolvePackageAssets.cs b/src/Tasks/Microsoft.NET.Build.Tasks/ResolvePackageAssets.cs
index 8a0cba60b829..31d6c5959cc4 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/ResolvePackageAssets.cs
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/ResolvePackageAssets.cs
@@ -1575,10 +1575,19 @@ Dictionary<string, HashSet<string>> GetReverseDependencies()
                     bool ForCurrentTargetFramework(string targetFramework)
                     {
                         var parts = targetFramework.Split(LockFile.DirectorySeparatorChar);
-                        var parsedTargetGraph = NuGetFramework.Parse(parts[0]);
-                        var alias = _lockFile.PackageSpec.TargetFrameworks
-                            .FirstOrDefault(tf => tf.FrameworkName == parsedTargetGraph)
-                            ?.TargetAlias ?? targetFramework;
+                        string alias = parts[0];
+                        if (alias == _task.TargetFramework)
+                        {
+                            return true;
+                        }
+                        else
+                        {
+                            var parsedTargetGraph = NuGetFramework.Parse(alias);
+                            alias = _lockFile.PackageSpec.TargetFrameworks
+                                .FirstOrDefault(tf => tf.FrameworkName == parsedTargetGraph)
+                                ?.TargetAlias ?? targetFramework;
+                        }
+
                         return alias == _task.TargetFramework;
                     }
 
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/ResolvePackageDependencies.cs b/src/Tasks/Microsoft.NET.Build.Tasks/ResolvePackageDependencies.cs
index bb02ba219335..0dbc7286009e 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/ResolvePackageDependencies.cs
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/ResolvePackageDependencies.cs
@@ -5,6 +5,7 @@
 
 using Microsoft.Build.Framework;
 using Microsoft.Build.Utilities;
+using NuGet.Common;
 using NuGet.Frameworks;
 using NuGet.ProjectModel;
 
@@ -238,20 +239,35 @@ string GetPackageDiagnosticLevel(LockFileLibrary package)
             {
                 string target = TargetFramework ?? "";
 
-                var messages = LockFile.LogMessages.Where(log => log.LibraryId == package.Name && log.TargetGraphs
-                                .Select(tg =>
-                                {
-                                    var parsedTargetGraph = NuGetFramework.Parse(tg);
-                                    var alias = _lockFile.PackageSpec.TargetFrameworks.FirstOrDefault(tf => tf.FrameworkName == parsedTargetGraph)?.TargetAlias;
-                                    return alias ?? tg;
-                                }).Contains(target));
+                LogLevel? logLevel = null;
 
-                if (!messages.Any())
+                foreach (var message in LockFile.LogMessages)
                 {
-                    return string.Empty;
+                    if (message.LibraryId == package.Name)
+                    {
+                        foreach (var targetGraph in message.TargetGraphs)
+                        {
+                            string effectiveTargetGraphName = targetGraph;
+                            // If the target graph is not in the map, then very likely aliases are being used.
+                            if (_targetNameToAliasMap.ContainsKey(targetGraph))
+                            {
+                                var parsedTargetGraph = NuGetFramework.Parse(targetGraph);
+                                effectiveTargetGraphName = _lockFile.PackageSpec.TargetFrameworks.FirstOrDefault(tf => tf.FrameworkName == parsedTargetGraph)?.TargetAlias;
+                            }
+
+                            if (effectiveTargetGraphName == target)
+                            {
+                                if (logLevel == null || message.Level > logLevel)
+                                {
+                                    logLevel = message.Level;
+                                }
+                                break;
+                            }
+                        }
+                    }
                 }
 
-                return messages.Max(log => log.Level).ToString();
+                return logLevel != null ? logLevel.ToString() : string.Empty;
             }
         }