From 3c7787e3249915f43ad0720f0ddb923539e8d83a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaury=20Lev=C3=A9?= <amauryleve@microsoft.com>
Date: Tue, 28 Jan 2025 11:37:12 +0100
Subject: [PATCH] Open experimentally Configuration and Logging (#4795)

---
 .editorconfig                                 |  2 +
 .../Microsoft.Testing.Platform/.editorconfig  |  5 --
 .../Builder/ITestApplicationBuilder.cs        |  8 +++
 .../Builder/TestApplicationBuilder.cs         |  6 +-
 .../CommandLineOptionsValidator.cs            | 16 ++---
 .../CommandLine/OptionRecord.cs               |  5 +-
 .../CommandLine/ParseResult.cs                | 26 ++++----
 .../CommandLine/Parser.cs                     |  2 +-
 .../Configurations/IConfigurationManager.cs   |  3 +-
 .../Configurations/IConfigurationProvider.cs  |  3 +-
 .../Configurations/IConfigurationSource.cs    |  3 +-
 .../Hosts/ToolsTestHost.cs                    | 18 +++---
 .../Logging/ILoggerProvider.cs                |  3 +-
 .../Logging/ILoggingManager.cs                |  3 +-
 .../PublicAPI/PublicAPI.Unshipped.txt         | 33 ++++++++++
 .../CommandLine/CommandLineHandlerTests.cs    |  4 +-
 .../CommandLine/CommandLineTests.cs           | 62 +++++++++----------
 .../ConfigurationManagerTests.cs              | 12 ++--
 18 files changed, 131 insertions(+), 83 deletions(-)
 delete mode 100644 src/Platform/Microsoft.Testing.Platform/.editorconfig

diff --git a/.editorconfig b/.editorconfig
index 742a013007..aec278d367 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -262,6 +262,8 @@ dotnet_diagnostic.VSTHRD002.severity = none             # VSTHRD002 Avoid proble
 dotnet_diagnostic.VSTHRD003.severity = none             # VSTHRD003: Avoid awaiting foreign Tasks
 dotnet_diagnostic.VSTHRD105.severity = none             # VSTHRD105: Avoid method overloads that assume TaskScheduler.Current
 
+dotnet_diagnostic.TPEXP.severity = none                 # TPEXP: Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
+
 #### Naming styles ####
 
 ## Naming rules (define naming rule using dotnet_naming_rule.<rule_name>.<option>)
diff --git a/src/Platform/Microsoft.Testing.Platform/.editorconfig b/src/Platform/Microsoft.Testing.Platform/.editorconfig
deleted file mode 100644
index a9e2e322b6..0000000000
--- a/src/Platform/Microsoft.Testing.Platform/.editorconfig
+++ /dev/null
@@ -1,5 +0,0 @@
-root = false
-
-[*.{cs,vb}]
-# TPEXP: Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
-dotnet_diagnostic.TPEXP.severity = none
diff --git a/src/Platform/Microsoft.Testing.Platform/Builder/ITestApplicationBuilder.cs b/src/Platform/Microsoft.Testing.Platform/Builder/ITestApplicationBuilder.cs
index 2094a1d713..073a4e96ce 100644
--- a/src/Platform/Microsoft.Testing.Platform/Builder/ITestApplicationBuilder.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Builder/ITestApplicationBuilder.cs
@@ -3,7 +3,9 @@
 
 using Microsoft.Testing.Platform.Capabilities.TestFramework;
 using Microsoft.Testing.Platform.CommandLine;
+using Microsoft.Testing.Platform.Configurations;
 using Microsoft.Testing.Platform.Extensions.TestFramework;
+using Microsoft.Testing.Platform.Logging;
 using Microsoft.Testing.Platform.TestHost;
 using Microsoft.Testing.Platform.TestHostControllers;
 
@@ -29,6 +31,12 @@ public interface ITestApplicationBuilder
     /// </summary>
     ICommandLineManager CommandLine { get; }
 
+    [Experimental("TPEXP", UrlFormat = "https://aka.ms/testingplatform/diagnostics#{0}")]
+    IConfigurationManager Configuration { get; }
+
+    [Experimental("TPEXP", UrlFormat = "https://aka.ms/testingplatform/diagnostics#{0}")]
+    ILoggingManager Logging { get; }
+
     /// <summary>
     /// Registers a test framework with the application builder.
     /// </summary>
diff --git a/src/Platform/Microsoft.Testing.Platform/Builder/TestApplicationBuilder.cs b/src/Platform/Microsoft.Testing.Platform/Builder/TestApplicationBuilder.cs
index d20d1327e7..fc807275b2 100644
--- a/src/Platform/Microsoft.Testing.Platform/Builder/TestApplicationBuilder.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Builder/TestApplicationBuilder.cs
@@ -58,9 +58,11 @@ internal TestApplicationBuilder(
 
     internal ITestHostOrchestratorManager TestHostOrchestrator => _testHostBuilder.TestHostOrchestratorManager;
 
-    internal IConfigurationManager Configuration => _testHostBuilder.Configuration;
+    [Experimental("TPEXP", UrlFormat = "https://aka.ms/testingplatform/diagnostics#{0}")]
+    public IConfigurationManager Configuration => _testHostBuilder.Configuration;
 
-    internal ILoggingManager Logging => _testHostBuilder.Logging;
+    [Experimental("TPEXP", UrlFormat = "https://aka.ms/testingplatform/diagnostics#{0}")]
+    public ILoggingManager Logging => _testHostBuilder.Logging;
 
     internal IPlatformOutputDeviceManager OutputDisplay => _testHostBuilder.OutputDisplay;
 
diff --git a/src/Platform/Microsoft.Testing.Platform/CommandLine/CommandLineOptionsValidator.cs b/src/Platform/Microsoft.Testing.Platform/CommandLine/CommandLineOptionsValidator.cs
index aa67608816..9becb9e8c5 100644
--- a/src/Platform/Microsoft.Testing.Platform/CommandLine/CommandLineOptionsValidator.cs
+++ b/src/Platform/Microsoft.Testing.Platform/CommandLine/CommandLineOptionsValidator.cs
@@ -148,12 +148,12 @@ private static ValidationResult ValidateNoUnknownOptions(
         Dictionary<ICommandLineOptionsProvider, IReadOnlyCollection<CommandLineOption>> systemOptionsByProvider)
     {
         StringBuilder? stringBuilder = null;
-        foreach (OptionRecord optionRecord in parseResult.Options)
+        foreach (CommandLineParseOption optionRecord in parseResult.Options)
         {
-            if (!extensionOptionsByProvider.Union(systemOptionsByProvider).Any(tuple => tuple.Value.Any(x => x.Name == optionRecord.Option)))
+            if (!extensionOptionsByProvider.Union(systemOptionsByProvider).Any(tuple => tuple.Value.Any(x => x.Name == optionRecord.Name)))
             {
                 stringBuilder ??= new();
-                stringBuilder.AppendLine(string.Format(CultureInfo.InvariantCulture, PlatformResources.CommandLineUnknownOption, optionRecord.Option));
+                stringBuilder.AppendLine(string.Format(CultureInfo.InvariantCulture, PlatformResources.CommandLineUnknownOption, optionRecord.Name));
             }
         }
 
@@ -167,11 +167,11 @@ private static ValidationResult ValidateOptionsArgumentArity(
         Dictionary<string, (ICommandLineOptionsProvider Provider, CommandLineOption Option)> providerAndOptionByOptionName)
     {
         StringBuilder stringBuilder = new();
-        foreach (IGrouping<string, OptionRecord> groupedOptions in parseResult.Options.GroupBy(x => x.Option))
+        foreach (IGrouping<string, CommandLineParseOption> groupedOptions in parseResult.Options.GroupBy(x => x.Name))
         {
             // getting the arguments count for an option.
             int arity = 0;
-            foreach (OptionRecord optionEntry in groupedOptions)
+            foreach (CommandLineParseOption optionEntry in groupedOptions)
             {
                 arity += optionEntry.Arguments.Length;
             }
@@ -205,14 +205,14 @@ private static async Task<ValidationResult> ValidateOptionsArgumentsAsync(
         ApplicationStateGuard.Ensure(parseResult is not null);
 
         StringBuilder? stringBuilder = null;
-        foreach (OptionRecord optionRecord in parseResult.Options)
+        foreach (CommandLineParseOption optionRecord in parseResult.Options)
         {
-            (ICommandLineOptionsProvider provider, CommandLineOption option) = providerAndOptionByOptionName[optionRecord.Option];
+            (ICommandLineOptionsProvider provider, CommandLineOption option) = providerAndOptionByOptionName[optionRecord.Name];
             ValidationResult result = await provider.ValidateOptionArgumentsAsync(option, optionRecord.Arguments);
             if (!result.IsValid)
             {
                 stringBuilder ??= new();
-                stringBuilder.AppendLine(string.Format(CultureInfo.InvariantCulture, PlatformResources.CommandLineInvalidArgumentsForOption, optionRecord.Option, result.ErrorMessage));
+                stringBuilder.AppendLine(string.Format(CultureInfo.InvariantCulture, PlatformResources.CommandLineInvalidArgumentsForOption, optionRecord.Name, result.ErrorMessage));
             }
         }
 
diff --git a/src/Platform/Microsoft.Testing.Platform/CommandLine/OptionRecord.cs b/src/Platform/Microsoft.Testing.Platform/CommandLine/OptionRecord.cs
index b09b09de8b..9c2e4800b2 100644
--- a/src/Platform/Microsoft.Testing.Platform/CommandLine/OptionRecord.cs
+++ b/src/Platform/Microsoft.Testing.Platform/CommandLine/OptionRecord.cs
@@ -3,9 +3,10 @@
 
 namespace Microsoft.Testing.Platform.CommandLine;
 
-internal sealed class OptionRecord(string option, string[] arguments)
+[Experimental("TPEXP", UrlFormat = "https://aka.ms/testingplatform/diagnostics#{0}")]
+public sealed class CommandLineParseOption(string name, string[] arguments)
 {
-    public string Option { get; } = option;
+    public string Name { get; } = name;
 
     public string[] Arguments { get; } = arguments;
 }
diff --git a/src/Platform/Microsoft.Testing.Platform/CommandLine/ParseResult.cs b/src/Platform/Microsoft.Testing.Platform/CommandLine/ParseResult.cs
index a95ccc9e83..d59fcf13d7 100644
--- a/src/Platform/Microsoft.Testing.Platform/CommandLine/ParseResult.cs
+++ b/src/Platform/Microsoft.Testing.Platform/CommandLine/ParseResult.cs
@@ -3,7 +3,8 @@
 
 namespace Microsoft.Testing.Platform.CommandLine;
 
-internal sealed class CommandLineParseResult(string? toolName, IReadOnlyList<OptionRecord> options, IReadOnlyList<string> errors) : IEquatable<CommandLineParseResult>
+[Experimental("TPEXP", UrlFormat = "https://aka.ms/testingplatform/diagnostics#{0}")]
+public sealed class CommandLineParseResult(string? toolName, IReadOnlyList<CommandLineParseOption> options, IReadOnlyList<string> errors) : IEquatable<CommandLineParseResult>
 {
     public const char OptionPrefix = '-';
 
@@ -11,7 +12,7 @@ internal sealed class CommandLineParseResult(string? toolName, IReadOnlyList<Opt
 
     public string? ToolName { get; } = toolName;
 
-    public IReadOnlyList<OptionRecord> Options { get; } = options;
+    public IReadOnlyList<CommandLineParseOption> Options { get; } = options;
 
     public IReadOnlyList<string> Errors { get; } = errors;
 
@@ -54,11 +55,11 @@ public bool Equals(CommandLineParseResult? other)
             return false;
         }
 
-        IReadOnlyList<OptionRecord> thisOptions = Options;
-        IReadOnlyList<OptionRecord> otherOptions = other.Options;
+        IReadOnlyList<CommandLineParseOption> thisOptions = Options;
+        IReadOnlyList<CommandLineParseOption> otherOptions = other.Options;
         for (int i = 0; i < thisOptions.Count; i++)
         {
-            if (thisOptions[i].Option != otherOptions[i].Option)
+            if (thisOptions[i].Name != otherOptions[i].Name)
             {
                 return false;
             }
@@ -81,12 +82,12 @@ public bool Equals(CommandLineParseResult? other)
     }
 
     public bool IsOptionSet(string optionName)
-        => Options.Any(o => o.Option.Equals(optionName.Trim(OptionPrefix), StringComparison.OrdinalIgnoreCase));
+        => Options.Any(o => o.Name.Equals(optionName.Trim(OptionPrefix), StringComparison.OrdinalIgnoreCase));
 
     public bool TryGetOptionArgumentList(string optionName, [NotNullWhen(true)] out string[]? arguments)
     {
         optionName = optionName.Trim(OptionPrefix);
-        IEnumerable<OptionRecord> result = Options.Where(x => x.Option == optionName);
+        IEnumerable<CommandLineParseOption> result = Options.Where(x => x.Name == optionName);
         if (result.Any())
         {
             arguments = result.SelectMany(x => x.Arguments).ToArray();
@@ -97,14 +98,15 @@ public bool TryGetOptionArgumentList(string optionName, [NotNullWhen(true)] out
         return false;
     }
 
-    public override bool Equals(object? obj) => Equals(obj as CommandLineParseResult);
+    public override bool Equals(object? obj)
+        => Equals(obj as CommandLineParseResult);
 
     public override int GetHashCode()
     {
         HashCode hashCode = default;
-        foreach (OptionRecord option in Options)
+        foreach (CommandLineParseOption option in Options)
         {
-            hashCode.Add(option.Option);
+            hashCode.Add(option.Name);
             foreach (string value in option.Arguments)
             {
                 hashCode.Add(value);
@@ -144,9 +146,9 @@ public override string ToString()
         }
         else
         {
-            foreach (OptionRecord option in Options)
+            foreach (CommandLineParseOption option in Options)
             {
-                builder.AppendLine(CultureInfo.InvariantCulture, $"   {option.Option}");
+                builder.AppendLine(CultureInfo.InvariantCulture, $"   {option.Name}");
                 foreach (string arg in option.Arguments)
                 {
                     builder.AppendLine(CultureInfo.InvariantCulture, $"        {arg}");
diff --git a/src/Platform/Microsoft.Testing.Platform/CommandLine/Parser.cs b/src/Platform/Microsoft.Testing.Platform/CommandLine/Parser.cs
index ed1bf536d1..61551e2c83 100644
--- a/src/Platform/Microsoft.Testing.Platform/CommandLine/Parser.cs
+++ b/src/Platform/Microsoft.Testing.Platform/CommandLine/Parser.cs
@@ -35,7 +35,7 @@ public static CommandLineParseResult Parse(string[] args, IEnvironment environme
 
     private static CommandLineParseResult Parse(List<string> args, IEnvironment environment)
     {
-        List<OptionRecord> options = [];
+        List<CommandLineParseOption> options = [];
         List<string> errors = [];
 
         string? currentOption = null;
diff --git a/src/Platform/Microsoft.Testing.Platform/Configurations/IConfigurationManager.cs b/src/Platform/Microsoft.Testing.Platform/Configurations/IConfigurationManager.cs
index 4d2d0cd2b5..8eb7b7daef 100644
--- a/src/Platform/Microsoft.Testing.Platform/Configurations/IConfigurationManager.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Configurations/IConfigurationManager.cs
@@ -3,7 +3,8 @@
 
 namespace Microsoft.Testing.Platform.Configurations;
 
-internal interface IConfigurationManager
+[Experimental("TPEXP", UrlFormat = "https://aka.ms/testingplatform/diagnostics#{0}")]
+public interface IConfigurationManager
 {
     void AddConfigurationSource(Func<IConfigurationSource> source);
 }
diff --git a/src/Platform/Microsoft.Testing.Platform/Configurations/IConfigurationProvider.cs b/src/Platform/Microsoft.Testing.Platform/Configurations/IConfigurationProvider.cs
index 4dfa9ece03..293ccdc5a4 100644
--- a/src/Platform/Microsoft.Testing.Platform/Configurations/IConfigurationProvider.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Configurations/IConfigurationProvider.cs
@@ -3,7 +3,8 @@
 
 namespace Microsoft.Testing.Platform.Configurations;
 
-internal interface IConfigurationProvider
+[Experimental("TPEXP", UrlFormat = "https://aka.ms/testingplatform/diagnostics#{0}")]
+public interface IConfigurationProvider
 {
     Task LoadAsync();
 
diff --git a/src/Platform/Microsoft.Testing.Platform/Configurations/IConfigurationSource.cs b/src/Platform/Microsoft.Testing.Platform/Configurations/IConfigurationSource.cs
index bbff508621..76bab9d798 100644
--- a/src/Platform/Microsoft.Testing.Platform/Configurations/IConfigurationSource.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Configurations/IConfigurationSource.cs
@@ -6,7 +6,8 @@
 
 namespace Microsoft.Testing.Platform.Configurations;
 
-internal interface IConfigurationSource : IExtension
+[Experimental("TPEXP", UrlFormat = "https://aka.ms/testingplatform/diagnostics#{0}")]
+public interface IConfigurationSource : IExtension
 {
     int Order { get; }
 
diff --git a/src/Platform/Microsoft.Testing.Platform/Hosts/ToolsTestHost.cs b/src/Platform/Microsoft.Testing.Platform/Hosts/ToolsTestHost.cs
index 983cd2db40..c4eb8aabb5 100644
--- a/src/Platform/Microsoft.Testing.Platform/Hosts/ToolsTestHost.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Hosts/ToolsTestHost.cs
@@ -98,13 +98,13 @@ private bool UnknownOptions([NotNullWhen(true)] out string? error, ITool tool)
         }
 
         StringBuilder stringBuilder = new();
-        foreach (OptionRecord optionRecord in _commandLineHandler.ParseResult.Options)
+        foreach (CommandLineParseOption optionRecord in _commandLineHandler.ParseResult.Options)
         {
-            if (!GetAllCommandLineOptionsProviderByOptionName(optionRecord.Option).Any())
+            if (!GetAllCommandLineOptionsProviderByOptionName(optionRecord.Name).Any())
             {
                 stringBuilder.AppendLine(
                     CultureInfo.InvariantCulture,
-                    $"Unknown option '{optionRecord.Option}' for tool '{tool.DisplayName}'.");
+                    $"Unknown option '{optionRecord.Name}' for tool '{tool.DisplayName}'.");
             }
         }
 
@@ -122,7 +122,7 @@ private bool ExtensionArgumentArityAreInvalid([NotNullWhen(true)] out string? er
         error = null;
 
         StringBuilder stringBuilder = new();
-        foreach (IGrouping<string, OptionRecord> optionRecord in _commandLineHandler.ParseResult.Options.GroupBy(x => x.Option))
+        foreach (IGrouping<string, CommandLineParseOption> optionRecord in _commandLineHandler.ParseResult.Options.GroupBy(x => x.Name))
         {
             string optionName = optionRecord.Key;
             int arity = optionRecord.Count();
@@ -140,7 +140,7 @@ private bool ExtensionArgumentArityAreInvalid([NotNullWhen(true)] out string? er
         {
             foreach (CommandLineOption option in extension.GetCommandLineOptions())
             {
-                if (_commandLineHandler.ParseResult.Options.Count(x => x.Option == option.Name) < option.Arity.Min)
+                if (_commandLineHandler.ParseResult.Options.Count(x => x.Name == option.Name) < option.Arity.Min)
                 {
                     stringBuilder.AppendLine(
                         CultureInfo.InvariantCulture,
@@ -161,13 +161,13 @@ private bool ExtensionArgumentArityAreInvalid([NotNullWhen(true)] out string? er
     private async Task<ValidationResult> ValidateOptionsArgumentsAsync(ITool tool)
     {
         StringBuilder stringBuilder = new();
-        foreach (OptionRecord optionRecord in _commandLineHandler.ParseResult.Options)
+        foreach (CommandLineParseOption optionRecord in _commandLineHandler.ParseResult.Options)
         {
-            ICommandLineOptionsProvider extension = GetAllCommandLineOptionsProviderByOptionName(optionRecord.Option).Single();
-            ValidationResult result = await extension.ValidateOptionArgumentsAsync(extension.GetCommandLineOptions().Single(x => x.Name == optionRecord.Option), optionRecord.Arguments);
+            ICommandLineOptionsProvider extension = GetAllCommandLineOptionsProviderByOptionName(optionRecord.Name).Single();
+            ValidationResult result = await extension.ValidateOptionArgumentsAsync(extension.GetCommandLineOptions().Single(x => x.Name == optionRecord.Name), optionRecord.Arguments);
             if (!result.IsValid)
             {
-                stringBuilder.AppendLine(CultureInfo.InvariantCulture, $"Invalid arguments for option '--{optionRecord.Option}': {result.ErrorMessage}, tool {tool.DisplayName}");
+                stringBuilder.AppendLine(CultureInfo.InvariantCulture, $"Invalid arguments for option '--{optionRecord.Name}': {result.ErrorMessage}, tool {tool.DisplayName}");
             }
         }
 
diff --git a/src/Platform/Microsoft.Testing.Platform/Logging/ILoggerProvider.cs b/src/Platform/Microsoft.Testing.Platform/Logging/ILoggerProvider.cs
index adc5ebc938..6f683b73f5 100644
--- a/src/Platform/Microsoft.Testing.Platform/Logging/ILoggerProvider.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Logging/ILoggerProvider.cs
@@ -3,7 +3,8 @@
 
 namespace Microsoft.Testing.Platform.Logging;
 
-internal interface ILoggerProvider
+[Experimental("TPEXP", UrlFormat = "https://aka.ms/testingplatform/diagnostics#{0}")]
+public interface ILoggerProvider
 {
     ILogger CreateLogger(string categoryName);
 }
diff --git a/src/Platform/Microsoft.Testing.Platform/Logging/ILoggingManager.cs b/src/Platform/Microsoft.Testing.Platform/Logging/ILoggingManager.cs
index 4aa9ee37e7..7f12af4ce0 100644
--- a/src/Platform/Microsoft.Testing.Platform/Logging/ILoggingManager.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Logging/ILoggingManager.cs
@@ -3,7 +3,8 @@
 
 namespace Microsoft.Testing.Platform.Logging;
 
-internal interface ILoggingManager
+[Experimental("TPEXP", UrlFormat = "https://aka.ms/testingplatform/diagnostics#{0}")]
+public interface ILoggingManager
 {
     void AddProvider(Func<LogLevel, IServiceProvider, ILoggerProvider> loggerProviderFactory);
 }
diff --git a/src/Platform/Microsoft.Testing.Platform/PublicAPI/PublicAPI.Unshipped.txt b/src/Platform/Microsoft.Testing.Platform/PublicAPI/PublicAPI.Unshipped.txt
index 7dc5c58110..9259f964e0 100644
--- a/src/Platform/Microsoft.Testing.Platform/PublicAPI/PublicAPI.Unshipped.txt
+++ b/src/Platform/Microsoft.Testing.Platform/PublicAPI/PublicAPI.Unshipped.txt
@@ -1 +1,34 @@
 #nullable enable
+Microsoft.Testing.Platform.Builder.ITestApplicationBuilder.Configuration.get -> Microsoft.Testing.Platform.Configurations.IConfigurationManager!
+Microsoft.Testing.Platform.Builder.ITestApplicationBuilder.Logging.get -> Microsoft.Testing.Platform.Logging.ILoggingManager!
+[TPEXP]const Microsoft.Testing.Platform.CommandLine.CommandLineParseResult.OptionPrefix = '-' -> char
+[TPEXP]Microsoft.Testing.Platform.CommandLine.CommandLineParseOption
+[TPEXP]Microsoft.Testing.Platform.CommandLine.CommandLineParseOption.Arguments.get -> string![]!
+[TPEXP]Microsoft.Testing.Platform.CommandLine.CommandLineParseOption.CommandLineParseOption(string! name, string![]! arguments) -> void
+[TPEXP]Microsoft.Testing.Platform.CommandLine.CommandLineParseOption.Name.get -> string!
+[TPEXP]Microsoft.Testing.Platform.CommandLine.CommandLineParseResult
+[TPEXP]Microsoft.Testing.Platform.CommandLine.CommandLineParseResult.CommandLineParseResult(string? toolName, System.Collections.Generic.IReadOnlyList<Microsoft.Testing.Platform.CommandLine.CommandLineParseOption!>! options, System.Collections.Generic.IReadOnlyList<string!>! errors) -> void
+[TPEXP]Microsoft.Testing.Platform.CommandLine.CommandLineParseResult.Equals(Microsoft.Testing.Platform.CommandLine.CommandLineParseResult? other) -> bool
+[TPEXP]Microsoft.Testing.Platform.CommandLine.CommandLineParseResult.Errors.get -> System.Collections.Generic.IReadOnlyList<string!>!
+[TPEXP]Microsoft.Testing.Platform.CommandLine.CommandLineParseResult.HasError.get -> bool
+[TPEXP]Microsoft.Testing.Platform.CommandLine.CommandLineParseResult.HasTool.get -> bool
+[TPEXP]Microsoft.Testing.Platform.CommandLine.CommandLineParseResult.IsOptionSet(string! optionName) -> bool
+[TPEXP]Microsoft.Testing.Platform.CommandLine.CommandLineParseResult.Options.get -> System.Collections.Generic.IReadOnlyList<Microsoft.Testing.Platform.CommandLine.CommandLineParseOption!>!
+[TPEXP]Microsoft.Testing.Platform.CommandLine.CommandLineParseResult.ToolName.get -> string?
+[TPEXP]Microsoft.Testing.Platform.CommandLine.CommandLineParseResult.TryGetOptionArgumentList(string! optionName, out string![]? arguments) -> bool
+[TPEXP]Microsoft.Testing.Platform.Configurations.IConfigurationManager
+[TPEXP]Microsoft.Testing.Platform.Configurations.IConfigurationManager.AddConfigurationSource(System.Func<Microsoft.Testing.Platform.Configurations.IConfigurationSource!>! source) -> void
+[TPEXP]Microsoft.Testing.Platform.Configurations.IConfigurationProvider
+[TPEXP]Microsoft.Testing.Platform.Configurations.IConfigurationProvider.LoadAsync() -> System.Threading.Tasks.Task!
+[TPEXP]Microsoft.Testing.Platform.Configurations.IConfigurationProvider.TryGet(string! key, out string? value) -> bool
+[TPEXP]Microsoft.Testing.Platform.Configurations.IConfigurationSource
+[TPEXP]Microsoft.Testing.Platform.Configurations.IConfigurationSource.BuildAsync(Microsoft.Testing.Platform.CommandLine.CommandLineParseResult! commandLineParseResult) -> System.Threading.Tasks.Task<Microsoft.Testing.Platform.Configurations.IConfigurationProvider!>!
+[TPEXP]Microsoft.Testing.Platform.Configurations.IConfigurationSource.Order.get -> int
+[TPEXP]Microsoft.Testing.Platform.Logging.ILoggerProvider
+[TPEXP]Microsoft.Testing.Platform.Logging.ILoggerProvider.CreateLogger(string! categoryName) -> Microsoft.Testing.Platform.Logging.ILogger!
+[TPEXP]Microsoft.Testing.Platform.Logging.ILoggingManager
+[TPEXP]Microsoft.Testing.Platform.Logging.ILoggingManager.AddProvider(System.Func<Microsoft.Testing.Platform.Logging.LogLevel, System.IServiceProvider!, Microsoft.Testing.Platform.Logging.ILoggerProvider!>! loggerProviderFactory) -> void
+[TPEXP]override Microsoft.Testing.Platform.CommandLine.CommandLineParseResult.Equals(object? obj) -> bool
+[TPEXP]override Microsoft.Testing.Platform.CommandLine.CommandLineParseResult.GetHashCode() -> int
+[TPEXP]override Microsoft.Testing.Platform.CommandLine.CommandLineParseResult.ToString() -> string!
+[TPEXP]static Microsoft.Testing.Platform.CommandLine.CommandLineParseResult.Empty.get -> Microsoft.Testing.Platform.CommandLine.CommandLineParseResult!
diff --git a/test/UnitTests/Microsoft.Testing.Platform.UnitTests/CommandLine/CommandLineHandlerTests.cs b/test/UnitTests/Microsoft.Testing.Platform.UnitTests/CommandLine/CommandLineHandlerTests.cs
index c192ec482f..c0ad24766c 100644
--- a/test/UnitTests/Microsoft.Testing.Platform.UnitTests/CommandLine/CommandLineHandlerTests.cs
+++ b/test/UnitTests/Microsoft.Testing.Platform.UnitTests/CommandLine/CommandLineHandlerTests.cs
@@ -249,9 +249,9 @@ public void IsVersionInvoked_VersionOptionSet_ReturnsTrue()
     public void GetOptionValue_OptionExists_ReturnsOptionValue()
     {
         // Arrange
-        OptionRecord optionRecord = new("name", ["value1", "value2"]);
+        CommandLineParseOption option = new("name", ["value1", "value2"]);
         CommandLineHandler commandLineHandler = new(
-            new CommandLineParseResult(string.Empty, [optionRecord], []), _extensionCommandLineOptionsProviders,
+            new CommandLineParseResult(string.Empty, [option], []), _extensionCommandLineOptionsProviders,
             _systemCommandLineOptionsProviders, _testApplicationModuleInfoMock.Object, _runtimeFeatureMock.Object);
 
         // Act
diff --git a/test/UnitTests/Microsoft.Testing.Platform.UnitTests/CommandLine/CommandLineTests.cs b/test/UnitTests/Microsoft.Testing.Platform.UnitTests/CommandLine/CommandLineTests.cs
index 7a433734c6..74af4bf15c 100644
--- a/test/UnitTests/Microsoft.Testing.Platform.UnitTests/CommandLine/CommandLineTests.cs
+++ b/test/UnitTests/Microsoft.Testing.Platform.UnitTests/CommandLine/CommandLineTests.cs
@@ -15,7 +15,7 @@ public sealed class CommandLineTests
     // So, we introduce this wrapper to be used instead so that the test method can be made public.
     public sealed class CommandLineParseResultWrapper
     {
-        internal CommandLineParseResultWrapper(string? toolName, IReadOnlyList<OptionRecord> options, IReadOnlyList<string> errors)
+        internal CommandLineParseResultWrapper(string? toolName, IReadOnlyList<CommandLineParseOption> options, IReadOnlyList<string> errors)
             => Result = new CommandLineParseResult(toolName, options, errors);
 
         internal CommandLineParseResult Result { get; }
@@ -61,43 +61,43 @@ public static string ParserTestDataFormat(MethodInfo methodInfo, object?[]? data
 
     internal static IEnumerable<(int TestNum, string[] Args, (string RspFileName, string RspFileContent)[]? RspFiles, CommandLineParseResultWrapper ParseResult)> ParserTestsData()
     {
-        yield return (1, ["--option1", "a"], null, new CommandLineParseResultWrapper(null, new List<OptionRecord> { new("option1", ["a"]) }.ToArray(), []));
-        yield return (2, ["--option1", "a", "b"], null, new CommandLineParseResultWrapper(null, new List<OptionRecord> { new("option1", ["a", "b"]) }.ToArray(), []));
-        yield return (3, ["-option1", "a"], null, new CommandLineParseResultWrapper(null, new List<OptionRecord> { new("option1", ["a"]) }.ToArray(), []));
-        yield return (4, ["--option1", "a", "-option2", "c"], null, new CommandLineParseResultWrapper(null, new List<OptionRecord>
+        yield return (1, ["--option1", "a"], null, new CommandLineParseResultWrapper(null, new List<CommandLineParseOption> { new("option1", ["a"]) }.ToArray(), []));
+        yield return (2, ["--option1", "a", "b"], null, new CommandLineParseResultWrapper(null, new List<CommandLineParseOption> { new("option1", ["a", "b"]) }.ToArray(), []));
+        yield return (3, ["-option1", "a"], null, new CommandLineParseResultWrapper(null, new List<CommandLineParseOption> { new("option1", ["a"]) }.ToArray(), []));
+        yield return (4, ["--option1", "a", "-option2", "c"], null, new CommandLineParseResultWrapper(null, new List<CommandLineParseOption>
         {
             new("option1", ["a"]),
             new("option2", ["c"]),
         }.ToArray(), []));
-        yield return (5, ["---option1", "a"], null, new CommandLineParseResultWrapper(null, new List<OptionRecord>().ToArray(), ["Unexpected argument ---option1", "Unexpected argument a"]));
-        yield return (6, ["--option1", "'a'"], null, new CommandLineParseResultWrapper(null, new List<OptionRecord> { new("option1", ["a"]) }.ToArray(), []));
-        yield return (7, ["--option1", "'a'", "--option2", "'hello'"], null, new CommandLineParseResultWrapper(null, new List<OptionRecord>
+        yield return (5, ["---option1", "a"], null, new CommandLineParseResultWrapper(null, new List<CommandLineParseOption>().ToArray(), ["Unexpected argument ---option1", "Unexpected argument a"]));
+        yield return (6, ["--option1", "'a'"], null, new CommandLineParseResultWrapper(null, new List<CommandLineParseOption> { new("option1", ["a"]) }.ToArray(), []));
+        yield return (7, ["--option1", "'a'", "--option2", "'hello'"], null, new CommandLineParseResultWrapper(null, new List<CommandLineParseOption>
         {
             new("option1", ["a"]),
             new("option2", ["hello"]),
         }.ToArray(), []));
-        yield return (8, ["--option1", "'a'b'"], null, new CommandLineParseResultWrapper(null, new List<OptionRecord> { new("option1", []) }.ToArray(), ["Unexpected single quote in argument: 'a'b' for option '--option1'"]));
-        yield return (9, ["option1", "--option1"], null, new CommandLineParseResultWrapper("option1", new List<OptionRecord> { new("option1", []) }.ToArray(), []));
-        yield return (10, ["--option1", @"""\\"""], null, new CommandLineParseResultWrapper(null, new List<OptionRecord> { new("option1", ["\\"]) }.ToArray(), []));
-        yield return (11, ["--option1", @" "" \"" "" "], null, new CommandLineParseResultWrapper(null, new List<OptionRecord> { new("option1", [" \" "]) }.ToArray(), []));
-        yield return (12, ["--option1", @" "" \$ "" "], null, new CommandLineParseResultWrapper(null, new List<OptionRecord> { new("option1", [" $ "]) }.ToArray(), []));
-        yield return (13, ["--option1", $@" "" \{Environment.NewLine} "" "], null, new CommandLineParseResultWrapper(null, new List<OptionRecord> { new("option1", [$" {Environment.NewLine} "]) }.ToArray(), []));
-        yield return (14, ["--option1", "a"], null, new CommandLineParseResultWrapper(null, new List<OptionRecord> { new("option1", ["a"]) }.ToArray(), []));
-        yield return (15, ["--option1:a"], null, new CommandLineParseResultWrapper(null, new List<OptionRecord> { new("option1", ["a"]) }.ToArray(), []));
-        yield return (16, ["--option1=a"], null, new CommandLineParseResultWrapper(null, new List<OptionRecord> { new("option1", ["a"]) }.ToArray(), []));
-        yield return (17, ["--option1=a", "--option1=b"], null, new CommandLineParseResultWrapper(null, new List<OptionRecord> { new("option1", ["a"]), new("option1", ["b"]) }.ToArray(), []));
-        yield return (18, ["--option1=a", "--option1 b"], null, new CommandLineParseResultWrapper(null, new List<OptionRecord> { new("option1", ["a"]), new("option1", ["b"]) }.ToArray(), []));
-        yield return (19, ["--option1=a=a"], null, new CommandLineParseResultWrapper(null, new List<OptionRecord> { new("option1", ["a=a"]) }.ToArray(), []));
-        yield return (20, ["--option1=a:a"], null, new CommandLineParseResultWrapper(null, new List<OptionRecord> { new("option1", ["a:a"]) }.ToArray(), []));
-        yield return (21, ["--option1:a=a"], null, new CommandLineParseResultWrapper(null, new List<OptionRecord> { new("option1", ["a=a"]) }.ToArray(), []));
-        yield return (22, ["--option1:a:a"], null, new CommandLineParseResultWrapper(null, new List<OptionRecord> { new("option1", ["a:a"]) }.ToArray(), []));
-        yield return (23, ["--option1:a:a", "--option1:a=a"], null, new CommandLineParseResultWrapper(null, new List<OptionRecord> { new("option1", ["a:a"]), new("option1", ["a=a"]) }.ToArray(), []));
+        yield return (8, ["--option1", "'a'b'"], null, new CommandLineParseResultWrapper(null, new List<CommandLineParseOption> { new("option1", []) }.ToArray(), ["Unexpected single quote in argument: 'a'b' for option '--option1'"]));
+        yield return (9, ["option1", "--option1"], null, new CommandLineParseResultWrapper("option1", new List<CommandLineParseOption> { new("option1", []) }.ToArray(), []));
+        yield return (10, ["--option1", @"""\\"""], null, new CommandLineParseResultWrapper(null, new List<CommandLineParseOption> { new("option1", ["\\"]) }.ToArray(), []));
+        yield return (11, ["--option1", @" "" \"" "" "], null, new CommandLineParseResultWrapper(null, new List<CommandLineParseOption> { new("option1", [" \" "]) }.ToArray(), []));
+        yield return (12, ["--option1", @" "" \$ "" "], null, new CommandLineParseResultWrapper(null, new List<CommandLineParseOption> { new("option1", [" $ "]) }.ToArray(), []));
+        yield return (13, ["--option1", $@" "" \{Environment.NewLine} "" "], null, new CommandLineParseResultWrapper(null, new List<CommandLineParseOption> { new("option1", [$" {Environment.NewLine} "]) }.ToArray(), []));
+        yield return (14, ["--option1", "a"], null, new CommandLineParseResultWrapper(null, new List<CommandLineParseOption> { new("option1", ["a"]) }.ToArray(), []));
+        yield return (15, ["--option1:a"], null, new CommandLineParseResultWrapper(null, new List<CommandLineParseOption> { new("option1", ["a"]) }.ToArray(), []));
+        yield return (16, ["--option1=a"], null, new CommandLineParseResultWrapper(null, new List<CommandLineParseOption> { new("option1", ["a"]) }.ToArray(), []));
+        yield return (17, ["--option1=a", "--option1=b"], null, new CommandLineParseResultWrapper(null, new List<CommandLineParseOption> { new("option1", ["a"]), new("option1", ["b"]) }.ToArray(), []));
+        yield return (18, ["--option1=a", "--option1 b"], null, new CommandLineParseResultWrapper(null, new List<CommandLineParseOption> { new("option1", ["a"]), new("option1", ["b"]) }.ToArray(), []));
+        yield return (19, ["--option1=a=a"], null, new CommandLineParseResultWrapper(null, new List<CommandLineParseOption> { new("option1", ["a=a"]) }.ToArray(), []));
+        yield return (20, ["--option1=a:a"], null, new CommandLineParseResultWrapper(null, new List<CommandLineParseOption> { new("option1", ["a:a"]) }.ToArray(), []));
+        yield return (21, ["--option1:a=a"], null, new CommandLineParseResultWrapper(null, new List<CommandLineParseOption> { new("option1", ["a=a"]) }.ToArray(), []));
+        yield return (22, ["--option1:a:a"], null, new CommandLineParseResultWrapper(null, new List<CommandLineParseOption> { new("option1", ["a:a"]) }.ToArray(), []));
+        yield return (23, ["--option1:a:a", "--option1:a=a"], null, new CommandLineParseResultWrapper(null, new List<CommandLineParseOption> { new("option1", ["a:a"]), new("option1", ["a=a"]) }.ToArray(), []));
         yield return (24, ["--option1", "a", "@test.rsp", "--option5", "e"], [("test.rsp",
             """
             --option2 b
             --option3 c
             --option4 d
-            """)], new CommandLineParseResultWrapper(null, new List<OptionRecord>
+            """)], new CommandLineParseResultWrapper(null, new List<CommandLineParseOption>
         {
             new("option1", ["a"]),
             new("option2", ["b"]),
@@ -116,7 +116,7 @@ public static string ParserTestDataFormat(MethodInfo methodInfo, object?[]? data
             """
             --option3 c
             --option4 d
-            """)], new CommandLineParseResultWrapper(null, new List<OptionRecord>
+            """)], new CommandLineParseResultWrapper(null, new List<CommandLineParseOption>
         {
             new("option1", ["a"]),
             new("option2", ["b"]),
@@ -130,7 +130,7 @@ public static string ParserTestDataFormat(MethodInfo methodInfo, object?[]? data
             """
             --option1 a
             --option2 b
-            """)], new CommandLineParseResultWrapper(null, new List<OptionRecord>
+            """)], new CommandLineParseResultWrapper(null, new List<CommandLineParseOption>
         {
             new("option1", ["a"]),
             new("option2", ["b"]),
@@ -142,7 +142,7 @@ public static string ParserTestDataFormat(MethodInfo methodInfo, object?[]? data
             """
             --option3 c
             --option4 d
-            """)], new CommandLineParseResultWrapper(null, new List<OptionRecord>
+            """)], new CommandLineParseResultWrapper(null, new List<CommandLineParseOption>
         {
             new("option1", ["a"]),
             new("option2", ["b"]),
@@ -156,7 +156,7 @@ public static string ParserTestDataFormat(MethodInfo methodInfo, object?[]? data
             --option2 b
             --option3 c
             --option4 d
-            """)], new CommandLineParseResultWrapper(null, new List<OptionRecord>
+            """)], new CommandLineParseResultWrapper(null, new List<CommandLineParseOption>
         {
             new("option1", ["a"]),
             new("option2", ["b"]),
@@ -173,7 +173,7 @@ public static string ParserTestDataFormat(MethodInfo methodInfo, object?[]? data
             """
             --option3 c
             --option4 d
-            """)], new CommandLineParseResultWrapper(null, new List<OptionRecord>
+            """)], new CommandLineParseResultWrapper(null, new List<CommandLineParseOption>
         {
             new("option1", ["a"]),
             new("option2", ["b"]),
@@ -191,7 +191,7 @@ public static string ParserTestDataFormat(MethodInfo methodInfo, object?[]? data
             """
             --option3 c
             --option4 d
-            """)], new CommandLineParseResultWrapper(null, new List<OptionRecord>
+            """)], new CommandLineParseResultWrapper(null, new List<CommandLineParseOption>
         {
             new("option1", ["a"]),
             new("option2", ["b"]),
diff --git a/test/UnitTests/Microsoft.Testing.Platform.UnitTests/Configuration/ConfigurationManagerTests.cs b/test/UnitTests/Microsoft.Testing.Platform.UnitTests/Configuration/ConfigurationManagerTests.cs
index 6a0c76f8c2..c9afab81cb 100644
--- a/test/UnitTests/Microsoft.Testing.Platform.UnitTests/Configuration/ConfigurationManagerTests.cs
+++ b/test/UnitTests/Microsoft.Testing.Platform.UnitTests/Configuration/ConfigurationManagerTests.cs
@@ -33,7 +33,7 @@ public async ValueTask GetConfigurationValueFromJson(string jsonFileConfig, stri
         CurrentTestApplicationModuleInfo testApplicationModuleInfo = new(new SystemEnvironment(), new SystemProcessHandler());
         ConfigurationManager configurationManager = new(fileSystem.Object, testApplicationModuleInfo);
         configurationManager.AddConfigurationSource(() => new JsonConfigurationSource(testApplicationModuleInfo, fileSystem.Object, null));
-        IConfiguration configuration = await configurationManager.BuildAsync(null, new CommandLineParseResult(null, new List<OptionRecord>(), Array.Empty<string>()));
+        IConfiguration configuration = await configurationManager.BuildAsync(null, new CommandLineParseResult(null, new List<CommandLineParseOption>(), Array.Empty<string>()));
         Assert.AreEqual(result, configuration[key], $"Expected '{result}' found '{configuration[key]}'");
     }
 
@@ -64,7 +64,7 @@ public async ValueTask InvalidJson_Fail()
         ConfigurationManager configurationManager = new(fileSystem.Object, testApplicationModuleInfo);
         configurationManager.AddConfigurationSource(() =>
             new JsonConfigurationSource(testApplicationModuleInfo, fileSystem.Object, null));
-        await Assert.ThrowsAsync<NullReferenceException>(() => configurationManager.BuildAsync(null, new CommandLineParseResult(null, new List<OptionRecord>(), Array.Empty<string>())));
+        await Assert.ThrowsAsync<NullReferenceException>(() => configurationManager.BuildAsync(null, new CommandLineParseResult(null, new List<CommandLineParseOption>(), Array.Empty<string>())));
     }
 
     [TestMethod]
@@ -91,7 +91,7 @@ public async ValueTask GetConfigurationValueFromJsonWithFileLoggerProvider(strin
         configurationManager.AddConfigurationSource(() =>
             new JsonConfigurationSource(testApplicationModuleInfo, fileSystem.Object, null));
 
-        IConfiguration configuration = await configurationManager.BuildAsync(loggerProviderMock.Object, new CommandLineParseResult(null, new List<OptionRecord>(), Array.Empty<string>()));
+        IConfiguration configuration = await configurationManager.BuildAsync(loggerProviderMock.Object, new CommandLineParseResult(null, new List<CommandLineParseOption>(), Array.Empty<string>()));
         Assert.AreEqual(result, configuration[key], $"Expected '{result}' found '{configuration[key]}'");
 
         loggerMock.Verify(x => x.LogAsync(LogLevel.Trace, It.IsAny<string>(), null, LoggingExtensions.Formatter), Times.Once);
@@ -102,7 +102,7 @@ public async ValueTask BuildAsync_EmptyConfigurationSources_ThrowsException()
     {
         CurrentTestApplicationModuleInfo testApplicationModuleInfo = new(new SystemEnvironment(), new SystemProcessHandler());
         ConfigurationManager configurationManager = new(new SystemFileSystem(), testApplicationModuleInfo);
-        await Assert.ThrowsAsync<InvalidOperationException>(() => configurationManager.BuildAsync(null, new CommandLineParseResult(null, new List<OptionRecord>(), Array.Empty<string>())));
+        await Assert.ThrowsAsync<InvalidOperationException>(() => configurationManager.BuildAsync(null, new CommandLineParseResult(null, new List<CommandLineParseOption>(), Array.Empty<string>())));
     }
 
     [TestMethod]
@@ -115,7 +115,7 @@ public async ValueTask BuildAsync_ConfigurationSourcesNotEnabledAsync_ThrowsExce
         ConfigurationManager configurationManager = new(new SystemFileSystem(), testApplicationModuleInfo);
         configurationManager.AddConfigurationSource(() => mockConfigurationSource.Object);
 
-        await Assert.ThrowsAsync<InvalidOperationException>(() => configurationManager.BuildAsync(null, new CommandLineParseResult(null, new List<OptionRecord>(), Array.Empty<string>())));
+        await Assert.ThrowsAsync<InvalidOperationException>(() => configurationManager.BuildAsync(null, new CommandLineParseResult(null, new List<CommandLineParseOption>(), Array.Empty<string>())));
 
         mockConfigurationSource.Verify(x => x.IsEnabledAsync(), Times.Once);
     }
@@ -135,7 +135,7 @@ public async ValueTask BuildAsync_ConfigurationSourceIsAsyncInitializableExtensi
         ConfigurationManager configurationManager = new(new SystemFileSystem(), testApplicationModuleInfo);
         configurationManager.AddConfigurationSource(() => fakeConfigurationSource);
 
-        await Assert.ThrowsAsync<InvalidOperationException>(() => configurationManager.BuildAsync(null, new CommandLineParseResult(null, new List<OptionRecord>(), Array.Empty<string>())));
+        await Assert.ThrowsAsync<InvalidOperationException>(() => configurationManager.BuildAsync(null, new CommandLineParseResult(null, new List<CommandLineParseOption>(), Array.Empty<string>())));
     }
 
     private class FakeConfigurationSource : IConfigurationSource, IAsyncInitializableExtension