From 10e0874004e3716dceff818e77ad8be40cf5f00b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 19 Sep 2026 20:58:46 +0000 Subject: [PATCH 1/5] Update Testing framework to v4 --- Directory.Packages.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 9a385bc36..301623f70 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -36,7 +36,7 @@ - + @@ -47,7 +47,7 @@ - + From 3d0baceb46c4b54964e2ecae22283b9815637ed4 Mon Sep 17 00:00:00 2001 From: Andrew Arnott Date: Mon, 21 Sep 2026 16:34:25 -0600 Subject: [PATCH 2/5] Fix xUnit v4 parallelization configuration Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- test/Microsoft.VisualStudio.Threading.Tests/AssemblyInfo.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Microsoft.VisualStudio.Threading.Tests/AssemblyInfo.cs b/test/Microsoft.VisualStudio.Threading.Tests/AssemblyInfo.cs index 194900e3c..8fbce1a4c 100644 --- a/test/Microsoft.VisualStudio.Threading.Tests/AssemblyInfo.cs +++ b/test/Microsoft.VisualStudio.Threading.Tests/AssemblyInfo.cs @@ -3,4 +3,4 @@ // Some of our tests measure stress, GC pressure, etc. // It messes with reliable test results when other threads are doing random stuff. -[assembly: CollectionBehavior(DisableTestParallelization = true)] +[assembly: Xunit.v3.Parallelization(Mode = Xunit.Sdk.ParallelMode.None)] From eb4780bd5355bf33c294512f8f26600121c8fbd2 Mon Sep 17 00:00:00 2001 From: Andrew Arnott Date: Mon, 21 Sep 2026 16:36:13 -0600 Subject: [PATCH 3/5] Preserve xUnit support for .NET Framework tests Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- Directory.Packages.props | 9 ++++++--- .../AssemblyInfo.cs | 4 ++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 301623f70..d12688894 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -36,9 +36,11 @@ - + + - + + @@ -47,7 +49,8 @@ - + + diff --git a/test/Microsoft.VisualStudio.Threading.Tests/AssemblyInfo.cs b/test/Microsoft.VisualStudio.Threading.Tests/AssemblyInfo.cs index 8fbce1a4c..50902bf13 100644 --- a/test/Microsoft.VisualStudio.Threading.Tests/AssemblyInfo.cs +++ b/test/Microsoft.VisualStudio.Threading.Tests/AssemblyInfo.cs @@ -3,4 +3,8 @@ // Some of our tests measure stress, GC pressure, etc. // It messes with reliable test results when other threads are doing random stuff. +#if NET472 +[assembly: CollectionBehavior(DisableTestParallelization = true)] +#else [assembly: Xunit.v3.Parallelization(Mode = Xunit.Sdk.ParallelMode.None)] +#endif From a470861907787b5dab94e22ccbd41083bb1bf398 Mon Sep 17 00:00:00 2001 From: Andrew Arnott Date: Mon, 21 Sep 2026 17:02:02 -0600 Subject: [PATCH 4/5] Update combinatorial tests for xUnit v4 Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- Directory.Packages.props | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index d12688894..0af763090 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -38,7 +38,8 @@ - + + From 2b754aeddb4a1dfcb9625d33c0005384cb9c0138 Mon Sep 17 00:00:00 2001 From: Andrew Arnott Date: Mon, 21 Sep 2026 17:40:53 -0600 Subject: [PATCH 5/5] Apply xUnit v4 to all target frameworks Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- Directory.Packages.props | 12 ++++-------- .../AssemblyInfo.cs | 4 ---- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 0af763090..30f15983f 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -36,12 +36,9 @@ - - - - - - + + + @@ -50,8 +47,7 @@ - - + diff --git a/test/Microsoft.VisualStudio.Threading.Tests/AssemblyInfo.cs b/test/Microsoft.VisualStudio.Threading.Tests/AssemblyInfo.cs index 50902bf13..8fbce1a4c 100644 --- a/test/Microsoft.VisualStudio.Threading.Tests/AssemblyInfo.cs +++ b/test/Microsoft.VisualStudio.Threading.Tests/AssemblyInfo.cs @@ -3,8 +3,4 @@ // Some of our tests measure stress, GC pressure, etc. // It messes with reliable test results when other threads are doing random stuff. -#if NET472 -[assembly: CollectionBehavior(DisableTestParallelization = true)] -#else [assembly: Xunit.v3.Parallelization(Mode = Xunit.Sdk.ParallelMode.None)] -#endif