Update dependencies and improve test ordering logic #298

Arash-Sabet · Arash-Sabet · commit f6edbe02fb96 · 2025-07-06T09:56:03.000-04:00
Bump Microsoft.Extensions.* and Microsoft.NET.Test.Sdk package versions to latest patch releases in both main and example projects. Update Azure Pipelines to use .NET SDK 9.0.301 and increment revision. Improve null safety and type resolution in TestPriorityOrderer, and update example tests to use cancellation tokens with Task.Delay.
diff --git a/azure-pipeline-PR.yml b/azure-pipeline-PR.yml
@@ -17,7 +17,7 @@ steps:
   displayName: 'Use .NET 9.0 sdk'
   inputs:
     packageType: sdk
-    version: 9.0.300
+    version: 9.0.301
     installationPath: $(Agent.ToolsDirectory)/dotnet
 - script: echo Started restoring the source code
 - task: DotNetCoreCLI@2
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -1,7 +1,7 @@
 variables:
   Major: 9
   Minor: 0
-  Revision: 5
+  Revision: 6
   BuildConfiguration: Release
 
 name: $(Major).$(Minor).$(Revision)
@@ -25,7 +25,7 @@ steps:
   displayName: 'Use .NET 9.0 sdk'
   inputs:
     packageType: sdk
-    version: 9.0.300
+    version: 9.0.301
     installationPath: $(Agent.ToolsDirectory)/dotnet
 - script: echo Started restoring the source code
 - task: DotNetCoreCLI@2
diff --git a/examples/Xunit.Microsoft.DependencyInjection.ExampleTests/UnitTests.cs b/examples/Xunit.Microsoft.DependencyInjection.ExampleTests/UnitTests.cs
@@ -16,14 +16,14 @@ public void Test2()
     [Fact, TestOrder(3)]
     public async Task Test3()
     {
-        await Task.Delay(3000);
+        await Task.Delay(3000, TestContext.Current.CancellationToken);
         Assert.Equal(1, 1);
     }
 
     [Fact, TestOrder(4)]
     public async Task Test4()
     {
-        await Task.Delay(5000);
+        await Task.Delay(5000, TestContext.Current.CancellationToken);
         Assert.True(1 > 0);
     }
 }
diff --git a/examples/Xunit.Microsoft.DependencyInjection.ExampleTests/Xunit.Microsoft.DependencyInjection.ExampleTests.csproj b/examples/Xunit.Microsoft.DependencyInjection.ExampleTests/Xunit.Microsoft.DependencyInjection.ExampleTests.csproj
@@ -11,8 +11,8 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.5" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.6" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
 		<PackageReference Include="xunit.v3" Version="2.0.3" />
 		<PackageReference Include="xunit.runner.visualstudio" Version="3.1.1">
 		  <PrivateAssets>all</PrivateAssets>
@@ -22,13 +22,13 @@
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.5" />
-		<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.5" />
-		<PackageReference Include="Microsoft.Extensions.Options" Version="9.0.5" />
-		<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.5" />
-		<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="9.0.5" />
-		<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.5" />
-		<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.5" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.6" />
+		<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.6" />
+		<PackageReference Include="Microsoft.Extensions.Options" Version="9.0.6" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.6" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="9.0.6" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.6" />
+		<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.6" />
 	</ItemGroup>
 	<ItemGroup>
 		<None Remove="appsettings.json" />
diff --git a/src/TestsOrder/TestPriorityOrderer.cs b/src/TestsOrder/TestPriorityOrderer.cs
@@ -13,12 +13,14 @@ public IReadOnlyCollection<TTestCase> OrderTestCases<TTestCase>(IReadOnlyCollect
 		foreach (var testCase in testCases)
 		{
 			var priority = 0;
-
 			var testMethod = testCase.TestMethod;
-			var type = Type.GetType(testMethod.TestClass.TestClassNamespace);
-			var method = type?.GetMethod(testMethod.MethodName);
+			var type = Type.GetType(testMethod?.TestClass.TestClassNamespace ?? string.Empty) ?? AppDomain.CurrentDomain
+					.GetAssemblies()
+					.Select(a => a.GetType(testMethod?.TestClass?.TestClassName ?? string.Empty))
+					.FirstOrDefault(t => t != null);
+			var method = type?.GetMethod(testMethod?.MethodName ?? string.Empty);
 			var attributes = method?.GetCustomAttributes(typeof(TestOrderAttribute));
-			foreach (var attr in attributes)
+			foreach (var attr in attributes!)
 			{
 				if (attr is TestOrderAttribute orderAttr)
 				{
@@ -32,7 +34,7 @@ public IReadOnlyCollection<TTestCase> OrderTestCases<TTestCase>(IReadOnlyCollect
 		var testCaseCollection = new List<TTestCase>();
 		foreach (var list in sortedMethods.Keys.Select(priority => sortedMethods[priority]))
 		{
-			list.Sort((x, y) => StringComparer.OrdinalIgnoreCase.Compare(x.TestMethod.MethodName, y.TestMethod.MethodName));
+			list.Sort((x, y) => StringComparer.OrdinalIgnoreCase.Compare(x.TestMethod?.MethodName, y.TestMethod?.MethodName));
 			foreach (var testCase in list)
 			{
 				testCaseCollection.Add(testCase);
diff --git a/src/Xunit.Microsoft.DependencyInjection.csproj b/src/Xunit.Microsoft.DependencyInjection.csproj
@@ -7,12 +7,12 @@
 	<PackageReadmeFile>README.md</PackageReadmeFile>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.5" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.5" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="9.0.5" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.5" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.6" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.6" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="9.0.6" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.6" />
     <PackageReference Include="xunit.v3.extensibility.core" Version="2.0.3" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.5" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.6" />
   </ItemGroup>
   <ItemGroup>
 	<None Include="..\README.md" Pack="true" PackagePath="\" />

Original file line number	Diff line number	Diff line change
`@@ -16,14 +16,14 @@ public void Test2()`
`16`	`16`	`[Fact, TestOrder(3)]`
`17`	`17`	`public async Task Test3()`
`18`	`18`	`{`
`19`		`- await Task.Delay(3000);`
	`19`	`+ await Task.Delay(3000, TestContext.Current.CancellationToken);`
`20`	`20`	`Assert.Equal(1, 1);`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`[Fact, TestOrder(4)]`
`24`	`24`	`public async Task Test4()`
`25`	`25`	`{`
`26`		`- await Task.Delay(5000);`
	`26`	`+ await Task.Delay(5000, TestContext.Current.CancellationToken);`
`27`	`27`	`Assert.True(1 > 0);`
`28`	`28`	`}`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,12 +13,14 @@ public IReadOnlyCollection<TTestCase> OrderTestCases<TTestCase>(IReadOnlyCollect`
`13`	`13`	`foreach (var testCase in testCases)`
`14`	`14`	`{`
`15`	`15`	`var priority = 0;`
`16`		`-`
`17`	`16`	`var testMethod = testCase.TestMethod;`
`18`		`- var type = Type.GetType(testMethod.TestClass.TestClassNamespace);`
`19`		`- var method = type?.GetMethod(testMethod.MethodName);`
	`17`	`+ var type = Type.GetType(testMethod?.TestClass.TestClassNamespace ?? string.Empty) ?? AppDomain.CurrentDomain`
	`18`	`+ .GetAssemblies()`
	`19`	`+ .Select(a => a.GetType(testMethod?.TestClass?.TestClassName ?? string.Empty))`
	`20`	`+ .FirstOrDefault(t => t != null);`
	`21`	`+ var method = type?.GetMethod(testMethod?.MethodName ?? string.Empty);`
`20`	`22`	`var attributes = method?.GetCustomAttributes(typeof(TestOrderAttribute));`
`21`		`- foreach (var attr in attributes)`
	`23`	`+ foreach (var attr in attributes!)`
`22`	`24`	`{`
`23`	`25`	`if (attr is TestOrderAttribute orderAttr)`
`24`	`26`	`{`
`@@ -32,7 +34,7 @@ public IReadOnlyCollection<TTestCase> OrderTestCases<TTestCase>(IReadOnlyCollect`
`32`	`34`	`var testCaseCollection = new List<TTestCase>();`
`33`	`35`	`foreach (var list in sortedMethods.Keys.Select(priority => sortedMethods[priority]))`
`34`	`36`	`{`
`35`		`- list.Sort((x, y) => StringComparer.OrdinalIgnoreCase.Compare(x.TestMethod.MethodName, y.TestMethod.MethodName));`
	`37`	`+ list.Sort((x, y) => StringComparer.OrdinalIgnoreCase.Compare(x.TestMethod?.MethodName, y.TestMethod?.MethodName));`
`36`	`38`	`foreach (var testCase in list)`
`37`	`39`	`{`
`38`	`40`	`testCaseCollection.Add(testCase);`