Use Assert.Skip where applicable.

Author: eiriktsarpalis

Directory.Packages.props

@@ -35,7 +35,7 @@
     <PackageVersion Include="Serilog.Sinks.Debug" Version="3.0.0" />
     <PackageVersion Include="Serilog.Sinks.File" Version="6.0.0" />
     <PackageVersion Include="System.Linq.AsyncEnumerable" Version="$(System10Version)" />
-    <PackageVersion Include="xunit.v3" Version="2.0.0" />
+    <PackageVersion Include="xunit.v3" Version="1.1.0" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="3.0.2" />
   </ItemGroup>
 </Project>

ModelContextProtocol.sln

@@ -31,9 +31,11 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B6FB2B28-D5DE-4654-BE9A-45E305DE4852}"
 	ProjectSection(SolutionItems) = preProject
 		Directory.Build.props = Directory.Build.props
+		Directory.Packages.props = Directory.Packages.props
 		global.json = global.json
 		LICENSE = LICENSE
 		logo.png = logo.png
+		nuget.config = nuget.config
 		README.MD = README.MD
 		version.json = version.json
 	EndProjectSection

tests/ModelContextProtocol.Tests/ClientIntegrationTests.cs

@@ -537,9 +537,6 @@ public async Task SamplingViaChatClient_RequestResponseProperlyPropagated()
 
     private static void SkipTestIfNoOpenAIKey()
     {
-        if (string.IsNullOrEmpty(s_openAIKey))
-        {
-            throw SkipException.ForSkip("No OpenAI key provided. Skipping test.");
-        }
+        Assert.SkipWhen(s_openAIKey is null, "No OpenAI key provided. Skipping test.");
     }
 }

tests/ModelContextProtocol.Tests/SseIntegrationTests.cs

@@ -57,10 +57,7 @@ public async Task ConnectAndReceiveMessage_InMemoryServer()
     [Trait("Execution", "Manual")]
     public async Task ConnectAndReceiveMessage_EverythingServerWithSse()
     {
-        if (!EverythingSseServerFixture.IsDockerAvailable)
-        {
-            return;
-        }
+        Assert.SkipWhen(!EverythingSseServerFixture.IsDockerAvailable, "docker is not available");
 
         using var loggerFactory = LoggerFactory.Create(builder =>
             builder.AddConsole()
@@ -101,10 +98,7 @@ public async Task ConnectAndReceiveMessage_EverythingServerWithSse()
     [Trait("Execution", "Manual")]
     public async Task Sampling_Sse_EverythingServer()
     {
-        if (!EverythingSseServerFixture.IsDockerAvailable)
-        {
-            return;
-        }
+        Assert.SkipWhen(!EverythingSseServerFixture.IsDockerAvailable, "docker is not available");
 
         // arrange
         using var loggerFactory = Microsoft.Extensions.Logging.LoggerFactory.Create(builder =>