Sort out some outstanding issues after xUnit upgrade #19363

T-Gro merged 5 commits intodotnet:maindotnet/fsharp:mainfrom

majocha:xunit2-cleanupmajocha/fsharp:xunit2-cleanupCopy head branch name to clipboard