From 51bb552c14c66a7fb3d8d6212b669270c3b8fe6d Mon Sep 17 00:00:00 2001
From: Brad Wilson <dotnetguy@gmail.com>
Date: Thu, 8 Jun 2023 00:41:57 -0700
Subject: [PATCH] Add support for failSkips in configuration file

---
 Versions.props                                | 6 +++---
 src/xunit.runner.visualstudio/VsTestRunner.cs | 2 ++
 test/xunit.runner.json                        | 1 +
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Versions.props b/Versions.props
index 95421a3c..daf7021f 100644
--- a/Versions.props
+++ b/Versions.props
@@ -2,13 +2,13 @@
 
   <PropertyGroup>
     <MicrosoftNetCoreAppRefVersion>6.0.11</MicrosoftNetCoreAppRefVersion>
-    <MicrosoftNetTestSdkVersion>17.6.0</MicrosoftNetTestSdkVersion>
+    <MicrosoftNetTestSdkVersion>17.6.2</MicrosoftNetTestSdkVersion>
     <MicrosoftSourceLinkGitHubVersion>1.1.1</MicrosoftSourceLinkGitHubVersion>
-    <MicrosoftTestPlatformObjectModelVersion>17.6.0</MicrosoftTestPlatformObjectModelVersion>
+    <MicrosoftTestPlatformObjectModelVersion>17.6.2</MicrosoftTestPlatformObjectModelVersion>
     <NerdbankGitVersioningVersion>3.6.133</NerdbankGitVersioningVersion>
     <NSubstituteVersion>5.0.0</NSubstituteVersion>
     <TunnelVisionLabsReferenceAssemblyAnnotatorVersion>1.0.0-alpha.160</TunnelVisionLabsReferenceAssemblyAnnotatorVersion>
-    <XunitVersion>2.5.0-pre.22</XunitVersion>
+    <XunitVersion>2.5.0-pre.24</XunitVersion>
   </PropertyGroup>
 
 </Project>
diff --git a/src/xunit.runner.visualstudio/VsTestRunner.cs b/src/xunit.runner.visualstudio/VsTestRunner.cs
index f0280b73..7d970109 100644
--- a/src/xunit.runner.visualstudio/VsTestRunner.cs
+++ b/src/xunit.runner.visualstudio/VsTestRunner.cs
@@ -567,6 +567,8 @@ static bool IsXunitPackageReferenced(string assemblyFileName)
 				IExecutionSink resultsSink = vsExecutionSink;
 				if (longRunningSeconds > 0)
 					resultsSink = new DelegatingLongRunningTestDetectionSink(resultsSink, TimeSpan.FromSeconds(longRunningSeconds), diagnosticSink);
+				if (configuration.FailSkipsOrDefault)
+					resultsSink = new DelegatingFailSkipSink(resultsSink);
 
 				controller.RunTests(testCases, resultsSink, executionOptions);
 				resultsSink.Finished.WaitOne();
diff --git a/test/xunit.runner.json b/test/xunit.runner.json
index f32429fb..18ac72b1 100644
--- a/test/xunit.runner.json
+++ b/test/xunit.runner.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "https://xunit.net/schema/v2.5/xunit.runner.schema.json",
   "diagnosticMessages": true,
   "methodDisplay": "classAndMethod",
   "parallelizeAssembly": true