Skip to content

Update mstest monorepo to v4 (major) #1512

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Update mstest monorepo to v4 (major) #1512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
00619ab
Update mstest monorepo to v4
renovate[bot] Oct 29, 2025
32f7c1e
Resolve MSTest v4 breaking changes
JamieMagee Oct 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
<PackageVersion Include="MinVer" Version="5.0.0" />
<PackageVersion Include="Moq" Version="4.18.4" />
<PackageVersion Include="morelinq" Version="4.4.0" />
<PackageVersion Include="MSTest.TestFramework" Version="3.11.0" />
<PackageVersion Include="MSTest.Analyzers" Version="3.11.0" />
<PackageVersion Include="MSTest.TestAdapter" Version="3.11.0" />
<PackageVersion Include="MSTest.TestFramework" Version="4.0.1" />
<PackageVersion Include="MSTest.Analyzers" Version="4.0.1" />
<PackageVersion Include="MSTest.TestAdapter" Version="4.0.1" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
<PackageVersion Include="Newtonsoft.Json.Schema" Version="3.0.16" />
Expand Down
3 changes: 3 additions & 0 deletions test/Microsoft.ComponentDetection.Common.Tests/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
using Microsoft.VisualStudio.TestTools.UnitTesting;

[assembly: Parallelize(Scope = ExecutionScope.ClassLevel)]
3 changes: 3 additions & 0 deletions test/Microsoft.ComponentDetection.Contracts.Tests/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
using Microsoft.VisualStudio.TestTools.UnitTesting;

[assembly: Parallelize(Scope = ExecutionScope.ClassLevel)]
3 changes: 3 additions & 0 deletions test/Microsoft.ComponentDetection.Detectors.Tests/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
using Microsoft.VisualStudio.TestTools.UnitTesting;

[assembly: Parallelize(Scope = ExecutionScope.ClassLevel)]
25 changes: 10 additions & 15 deletions test/Microsoft.ComponentDetection.Detectors.Tests/GoComponentTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,17 @@ public void ConstructorTest_NameVersion()
}

[TestMethod]
[ExpectedException(typeof(ArgumentNullException))]
[System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "MSTEST0006:Avoid '[ExpectedException]'", Justification = "Single-line test case")]
public void ConstructorTest_NameVersion_NullVersion()
{
var goComponent = new GoComponent(TestName, null);
var action = () => new GoComponent(TestName, null);
action.Should().ThrowExactly<ArgumentNullException>();
}

[TestMethod]
[ExpectedException(typeof(ArgumentNullException))]
[System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "MSTEST0006:Avoid '[ExpectedException]'", Justification = "Single-line test case")]
public void ConstructorTest_NameVersion_NullName()
{
var goComponent = new GoComponent(null, TestVersion);
var action = () => new GoComponent(null, TestVersion);
action.Should().ThrowExactly<ArgumentNullException>();
}

[TestMethod]
Expand All @@ -56,27 +54,24 @@ public void ConstructorTest_NameVersionHash()
}

[TestMethod]
[ExpectedException(typeof(ArgumentNullException))]
[System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "MSTEST0006:Avoid '[ExpectedException]'", Justification = "Single-line test case")]
public void ConstructorTest_NameVersionHash_NullVersion()
{
var goComponent = new GoComponent(TestName, null, TestHash);
var action = () => new GoComponent(TestName, null, TestHash);
action.Should().ThrowExactly<ArgumentNullException>();
}

[TestMethod]
[ExpectedException(typeof(ArgumentNullException))]
[System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "MSTEST0006:Avoid '[ExpectedException]'", Justification = "Single-line test case")]
public void ConstructorTest_NameVersionHash_NullName()
{
var goComponent = new GoComponent(null, TestVersion, TestHash);
var action = () => new GoComponent(null, TestVersion, TestHash);
action.Should().ThrowExactly<ArgumentNullException>();
}

[TestMethod]
[ExpectedException(typeof(ArgumentNullException))]
[System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "MSTEST0006:Avoid '[ExpectedException]'", Justification = "Single-line test case")]
public void ConstructorTest_NameVersionHash_NullHash()
{
var goComponent = new GoComponent(TestName, TestVersion, null);
var action = () => new GoComponent(TestName, TestVersion, null);
action.Should().ThrowExactly<ArgumentNullException>();
}

[TestMethod]
Expand Down
3 changes: 3 additions & 0 deletions test/Microsoft.ComponentDetection.Orchestrator.Tests/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
using Microsoft.VisualStudio.TestTools.UnitTesting;

[assembly: Parallelize(Scope = ExecutionScope.ClassLevel)]
22 changes: 17 additions & 5 deletions test/Microsoft.ComponentDetection.TestsUtilities/Attributes/SkipTestIfNotWindowsAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,36 @@
namespace Microsoft.ComponentDetection.TestsUtilities;

using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Threading.Tasks;
using Microsoft.VisualStudio.TestTools.UnitTesting;

public sealed class SkipTestIfNotWindowsAttribute : TestMethodAttribute
{
public override TestResult[] Execute(ITestMethod testMethod)
public SkipTestIfNotWindowsAttribute([CallerFilePath] string callerFilePath = "", [CallerLineNumber] int callerLineNumber = -1)
: base(callerFilePath, callerLineNumber)
{
this.CallerFilePath = callerFilePath;
this.CallerLineNumber = callerLineNumber;
}

public string CallerFilePath { get; }

public int CallerLineNumber { get; }

public override Task<TestResult[]> ExecuteAsync(ITestMethod testMethod)
{
if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
return
[
return Task.FromResult<TestResult[]>([
new TestResult
{
Outcome = UnitTestOutcome.Inconclusive,
TestFailureException = new AssertInconclusiveException($"Skipped on {RuntimeInformation.OSDescription}."),
},
];
]);
}

return base.Execute(testMethod);
return base.ExecuteAsync(testMethod);
}
}
22 changes: 17 additions & 5 deletions test/Microsoft.ComponentDetection.TestsUtilities/Attributes/SkipTestOnWindowsAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,36 @@
namespace Microsoft.ComponentDetection.TestsUtilities;

using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Threading.Tasks;
using Microsoft.VisualStudio.TestTools.UnitTesting;

public sealed class SkipTestOnWindowsAttribute : TestMethodAttribute
{
public override TestResult[] Execute(ITestMethod testMethod)
public SkipTestOnWindowsAttribute([CallerFilePath] string callerFilePath = "", [CallerLineNumber] int callerLineNumber = -1)
: base(callerFilePath, callerLineNumber)
{
this.CallerFilePath = callerFilePath;
this.CallerLineNumber = callerLineNumber;
}

public string CallerFilePath { get; }

public int CallerLineNumber { get; }

public override Task<TestResult[]> ExecuteAsync(ITestMethod testMethod)
{
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
return
[
return Task.FromResult<TestResult[]>([
new TestResult
{
Outcome = UnitTestOutcome.Inconclusive,
TestFailureException = new AssertInconclusiveException("Skipped on Windows."),
},
];
]);
}

return base.Execute(testMethod);
return base.ExecuteAsync(testMethod);
}
}
3 changes: 3 additions & 0 deletions test/Microsoft.ComponentDetection.VerificationTests/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
using Microsoft.VisualStudio.TestTools.UnitTesting;

[assembly: Parallelize(Scope = ExecutionScope.ClassLevel)]
Loading