Skip to content

Commit 8f3a586

Browse files
committed
#431: ValueTask defined in xunit.runner.visualstudio causing conflict
1 parent 0a250fc commit 8f3a586

19 files changed

+52
-26
lines changed

src/xunit.runner.visualstudio/Constants.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
namespace Xunit.Runner.VisualStudio;
22

3-
public static class Constants
3+
internal static class Constants
44
{
55
#if NETFRAMEWORK
66
public const string ExecutorUri = "executor://xunit/VsTestRunner3/netfx/";

src/xunit.runner.visualstudio/Sinks/DiagnosticMessageSink.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace Xunit.Runner.VisualStudio;
44

5-
public class DiagnosticMessageSink : DiagnosticEventSink
5+
internal class DiagnosticMessageSink : DiagnosticEventSink
66
{
77
public DiagnosticMessageSink(
88
LoggerHelper log,

src/xunit.runner.visualstudio/Sinks/VsDiscoverySink.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
namespace Xunit.Runner.VisualStudio;
1717

18-
public sealed class VsDiscoverySink : IVsDiscoverySink, IDisposable
18+
internal sealed class VsDiscoverySink : IVsDiscoverySink, IDisposable
1919
{
2020
static readonly string Ellipsis = new((char)183, 3);
2121
const int MaximumDisplayNameLength = 447;

src/xunit.runner.visualstudio/Sinks/VsExecutionSink.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
namespace Xunit.Runner.VisualStudio;
1616

17-
public sealed class VsExecutionSink : TestMessageSink, IDisposable
17+
internal sealed class VsExecutionSink : TestMessageSink, IDisposable
1818
{
1919
readonly Func<bool> cancelledThunk;
2020
readonly LoggerHelper logger;

src/xunit.runner.visualstudio/TestPlatformContext.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ namespace Xunit.Runner.VisualStudio;
44
/// Provides contextual information on a test run/discovery based on runsettings
55
/// or the invocation (execution, discovery).
66
/// </summary>
7-
public struct TestPlatformContext
7+
internal struct TestPlatformContext
88
{
99
/// <summary>
1010
/// Indicates if the test runner is running in design mode (meaning, inside the Visual Studio IDE).

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
namespace Xunit.Runner.VisualStudio;
77

8-
public class AssemblyRunInfo
8+
internal class AssemblyRunInfo
99
{
1010
AssemblyRunInfo(
1111
LoggerHelper logger,

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
namespace Xunit.Runner.VisualStudio;
88

9-
public class LoggerHelper(IMessageLogger? logger, Stopwatch stopwatch)
9+
internal class LoggerHelper(IMessageLogger? logger, Stopwatch stopwatch)
1010
{
1111
public IMessageLogger? InnerLogger { get; private set; } = logger;
1212

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
namespace Xunit.Runner.VisualStudio;
88

9-
public class RunSettings
9+
internal class RunSettings
1010
{
1111
public AppDomainSupport? AppDomain { get; set; }
1212
public string? Culture { get; set; }

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
namespace Xunit.Runner.VisualStudio;
99

10-
public class TestCaseFilter
10+
internal class TestCaseFilter
1111
{
1212
const string DisplayNameString = "DisplayName";
1313
const string FullyQualifiedNameString = "FullyQualifiedName";

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace Xunit.Runner.VisualStudio;
44

5-
public class VisualStudioRunnerLogger(LoggerHelper loggerHelper) :
5+
internal class VisualStudioRunnerLogger(LoggerHelper loggerHelper) :
66
IRunnerLogger
77
{
88
static readonly object lockObject = new();

src/xunit.runner.visualstudio/VsTestRunner.cs

+8-8
Original file line numberDiff line numberDiff line change
@@ -120,22 +120,22 @@ public class VsTestRunner : ITestDiscoverer, ITestExecutor
120120
"xunit.v3.runner.utility.netstandard20.dll",
121121
};
122122

123-
public static TestProperty ManagedMethodProperty { get; } =
123+
internal static TestProperty ManagedMethodProperty { get; } =
124124
TestProperty.Register("TestCase.ManagedMethod", "ManagedMethod", string.Empty, string.Empty, typeof(string), x => !string.IsNullOrWhiteSpace(x as string), TestPropertyAttributes.Hidden, typeof(TestCase));
125125

126-
public static TestProperty ManagedTypeProperty { get; } =
126+
internal static TestProperty ManagedTypeProperty { get; } =
127127
TestProperty.Register("TestCase.ManagedType", "ManagedType", string.Empty, string.Empty, typeof(string), x => !string.IsNullOrWhiteSpace(x as string), TestPropertyAttributes.Hidden, typeof(TestCase));
128128

129-
public static TestProperty SkipReasonProperty { get; } =
129+
internal static TestProperty SkipReasonProperty { get; } =
130130
TestProperty.Register("XunitSkipReason", "xUnit.net Skip Reason", typeof(string), typeof(VsTestRunner));
131131

132-
public static TestProperty TestCaseExplicitProperty { get; } =
132+
internal static TestProperty TestCaseExplicitProperty { get; } =
133133
TestProperty.Register("XunitTestCaseExplicit", "xUnit.net Test Case Explicit Flag", typeof(bool), typeof(VsTestRunner));
134134

135-
public static TestProperty TestCaseSerializationProperty { get; } =
135+
internal static TestProperty TestCaseSerializationProperty { get; } =
136136
TestProperty.Register("XunitTestCaseSerialization", "xUnit.net Test Case Serialization", typeof(string), typeof(VsTestRunner));
137137

138-
public static TestProperty TestCaseUniqueIDProperty { get; } =
138+
internal static TestProperty TestCaseUniqueIDProperty { get; } =
139139
TestProperty.Register("XunitTestCaseUniqueID", "xUnit.net Test Case Unique ID", typeof(string), typeof(VsTestRunner));
140140

141141
public void Cancel() =>
@@ -307,7 +307,7 @@ async Task<bool> DiscoverTestsInAssembly<TVisitor>(
307307
return true;
308308
}
309309

310-
public static IReadOnlyList<IRunnerReporter> GetAvailableRunnerReporters(LoggerHelper? logger)
310+
internal static IReadOnlyList<IRunnerReporter> GetAvailableRunnerReporters(LoggerHelper? logger)
311311
{
312312
var result = RegisteredRunnerReporters.Get(typeof(VsTestRunner).Assembly, out var messages);
313313

@@ -318,7 +318,7 @@ public static IReadOnlyList<IRunnerReporter> GetAvailableRunnerReporters(LoggerH
318318
return result;
319319
}
320320

321-
public static IRunnerReporter GetRunnerReporter(
321+
internal static IRunnerReporter GetRunnerReporter(
322322
LoggerHelper? logger,
323323
RunSettings runSettings)
324324
{

src/xunit.runner.visualstudio/xunit.runner.visualstudio.csproj

+4
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
1212
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1313
</PropertyGroup>
1414

15+
<ItemGroup>
16+
<InternalsVisibleTo Include="test.xunit.runner.visualstudio" />
17+
</ItemGroup>
18+
1519
<ItemGroup>
1620
<PackageReference Include="xunit.analyzers" Version="$(XunitAnalyzersVersion)" PrivateAssets="All" />
1721
<PackageReference Include="xunit.v3.runner.utility" Version="$(XunitV3Version)" />

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

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1+
extern alias VSTestAdapter;
2+
13
using System;
24
using Xunit;
35
using Xunit.Runner.Common;
4-
using Xunit.Runner.VisualStudio;
56
using Xunit.Sdk;
7+
using RunSettings = VSTestAdapter.Xunit.Runner.VisualStudio.RunSettings;
68

79
public class RunSettingsTests
810
{

test/test.xunit.runner.visualstudio/RunnerReporterTests.cs

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1+
extern alias VSTestAdapter;
2+
13
using System;
24
using System.Diagnostics;
35
using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
46
using NSubstitute;
57
using Xunit;
68
using Xunit.Runner.Common;
7-
using Xunit.Runner.VisualStudio;
9+
using LoggerHelper = VSTestAdapter.Xunit.Runner.VisualStudio.LoggerHelper;
10+
using RunSettings = VSTestAdapter.Xunit.Runner.VisualStudio.RunSettings;
11+
using VsTestRunner = VSTestAdapter.Xunit.Runner.VisualStudio.VsTestRunner;
812

913
public class RunnerReporterTests
1014
{

test/test.xunit.runner.visualstudio/Sinks/VsDiscoverySinkTests.cs

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
1+
extern alias VSTestAdapter;
2+
13
using System;
24
using System.Collections.Generic;
35
using System.Linq;
46
using Xunit;
57
using Xunit.Runner.VisualStudio;
8+
using Constants = VSTestAdapter.Xunit.Runner.VisualStudio.Constants;
9+
using TestPlatformContext = VSTestAdapter.Xunit.Runner.VisualStudio.TestPlatformContext;
10+
using VsDiscoverySink = VSTestAdapter.Xunit.Runner.VisualStudio.VsDiscoverySink;
11+
using VsTestRunner = VSTestAdapter.Xunit.Runner.VisualStudio.VsTestRunner;
612

713
public class VsDiscoverySinkTests
814
{
@@ -45,7 +51,7 @@ public void StandardData(
4551

4652
Assert.NotNull(vsTestCase);
4753

48-
// Standard VSTest properties
54+
// Standard VSTest propertiesgi
4955
Assert.Equal("/source/file.cs", vsTestCase.CodeFilePath);
5056
Assert.Equal("test-case-display-name", vsTestCase.DisplayName);
5157
Assert.Equal(Constants.ExecutorUri, vsTestCase.ExecutorUri.OriginalString);

test/test.xunit.runner.visualstudio/TestCaseFilterTests.cs

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
extern alias VSTestAdapter;
2+
13
using System;
24
using System.Collections.Generic;
35
using System.Diagnostics;
@@ -7,8 +9,9 @@
79
using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
810
using NSubstitute;
911
using Xunit;
10-
using Xunit.Runner.VisualStudio;
11-
using Constants = Xunit.Runner.VisualStudio.Constants;
12+
using Constants = VSTestAdapter.Xunit.Runner.VisualStudio.Constants;
13+
using LoggerHelper = VSTestAdapter.Xunit.Runner.VisualStudio.LoggerHelper;
14+
using TestCaseFilter = VSTestAdapter.Xunit.Runner.VisualStudio.TestCaseFilter;
1215

1316
public class TestCaseFilterTests
1417
{

test/test.xunit.runner.visualstudio/Utility/SpyLoggerHelper.cs

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1+
extern alias VSTestAdapter;
2+
13
using System.Collections.Generic;
24
using System.Diagnostics;
35
using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
6+
using LoggerHelper = VSTestAdapter.Xunit.Runner.VisualStudio.LoggerHelper;
47

58
namespace Xunit.Runner.VisualStudio;
69

7-
public class SpyLoggerHelper(SpyMessageLogger logger, Stopwatch stopwatch) :
10+
internal class SpyLoggerHelper(SpyMessageLogger logger, Stopwatch stopwatch) :
811
LoggerHelper(logger, stopwatch)
912
{
1013
public IReadOnlyCollection<string> Messages => logger.Messages;

test/test.xunit.runner.visualstudio/VsTestRunnerTests.cs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1+
extern alias VSTestAdapter;
2+
13
using System.ComponentModel;
24
using System.Reflection;
35
using Xunit;
4-
using Xunit.Runner.VisualStudio;
6+
using VsTestRunner = VSTestAdapter.Xunit.Runner.VisualStudio.VsTestRunner;
57

68
public class VsTestRunnerTests
79
{

test/test.xunit.runner.visualstudio/test.xunit.runner.visualstudio.csproj

+3-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515
</ItemGroup>
1616

1717
<ItemGroup>
18-
<ProjectReference Include="..\..\src\xunit.runner.visualstudio\xunit.runner.visualstudio.csproj" />
18+
<ProjectReference Include="..\..\src\xunit.runner.visualstudio\xunit.runner.visualstudio.csproj">
19+
<Aliases>VSTestAdapter</Aliases>
20+
</ProjectReference>
1921
</ItemGroup>
2022

2123
</Project>

0 commit comments

Comments
 (0)