xunit/xunit#3298: Source information missing from dotnet test

Author: bradwilson

src/xunit.runner.visualstudio/Utility/RunSettings.cs

@@ -10,6 +10,7 @@ internal class RunSettings
 {
 	public AppDomainSupport? AppDomain { get; set; }
 	public int? AssertEquivalentMaxDepth { get; set; }
+	public bool? CollectSourceInformation { get; set; }
 	public string? Culture { get; set; }
 	public bool DesignMode { get; set; } = false;
 	public bool? DiagnosticMessages { get; set; }
@@ -43,6 +44,8 @@ public void CopyTo(TestAssemblyConfiguration configuration)
 			configuration.AppDomain = AppDomain;
 		if (AssertEquivalentMaxDepth.HasValue)
 			configuration.AssertEquivalentMaxDepth = AssertEquivalentMaxDepth;
+		if (CollectSourceInformation.HasValue)
+			configuration.IncludeSourceInformation = CollectSourceInformation;
 		if (Culture is not null)
 			configuration.Culture = Culture.ToUpperInvariant() switch
 			{
@@ -237,6 +240,10 @@ public static RunSettings Parse(string? settingsXml)
 					var runConfigurationElement = runSettingsElement.Element("RunConfiguration");
 					if (runConfigurationElement is not null)
 					{
+						var collectSourceInformationString = runConfigurationElement.Element(Constants.RunConfiguration.CollectSourceInformation)?.Value;
+						if (bool.TryParse(collectSourceInformationString, out var collectSourceInformation))
+							result.CollectSourceInformation = collectSourceInformation;
+
 						var designModeString = runConfigurationElement.Element(Constants.RunConfiguration.DesignMode)?.Value;
 						if (bool.TryParse(designModeString, out var designMode))
 							result.DesignMode = designMode;

src/xunit.runner.visualstudio/VsTestRunner.cs

@@ -224,7 +224,6 @@ async Task DiscoverTests<TVisitor>(
 						return;
 
 					var discoveryOptions = TestFrameworkOptions.ForDiscovery(assembly.Configuration);
-					discoveryOptions.SetIncludeSourceInformation(true);
 					if (!await DiscoverTestsInAssembly(controller, logger, runSettings, visitorFactory, visitComplete, assembly, discoveryOptions))
 						break;
 				}

test/test.xunit.runner.visualstudio/RunSettingsTests.cs

@@ -13,6 +13,7 @@ void AssertDefaultValues(RunSettings runSettings)
 	{
 		Assert.Null(runSettings.AppDomain);
 		Assert.Null(runSettings.AssertEquivalentMaxDepth);
+		Assert.Null(runSettings.CollectSourceInformation);
 		Assert.False(runSettings.DesignMode);
 		Assert.Null(runSettings.DiagnosticMessages);
 		Assert.Null(runSettings.FailSkips);
@@ -140,6 +141,7 @@ public void RunSettingsHelperShouldReadBooleanValuesCorrectly(bool testValue)
 
 		var runSettings = RunSettings.Parse(settingsXml);
 
+		Assert.Equal(testValue, runSettings.CollectSourceInformation);
 		Assert.Equal(testValue, runSettings.DesignMode);
 		Assert.Equal(testValue, runSettings.DiagnosticMessages);
 		Assert.Equal(testValue, runSettings.FailSkips);