Separate ASP.NET Core tests into a distinct project and make the main test project netfx compatible. (#254)

* Separate ASP.NET Core tests into a distinct project and make the main test project netfx compatible.

* Fix merge conflicts.

* Update tests/ModelContextProtocol.Tests/ModelContextProtocol.Tests.csproj

Co-authored-by: Stephen Halter <[email protected]>

* Revert "Fix merge conflicts."

This reverts commit 852169b.

* Fix merge conflicts

---------

Co-authored-by: Stephen Halter <[email protected]>

Author: eiriktsarpalis

Directory.Packages.props

@@ -66,5 +66,6 @@
     <PackageVersion Include="System.Linq.AsyncEnumerable" Version="$(System10Version)" />
     <PackageVersion Include="xunit.v3" Version="2.0.1" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="3.0.2" />
+    <PackageVersion Include="System.Net.Http" Version="4.3.4" />
   </ItemGroup>
 </Project>

ModelContextProtocol.sln

@@ -54,6 +54,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EverythingServer", "samples
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModelContextProtocol.AspNetCore", "src\ModelContextProtocol.AspNetCore\ModelContextProtocol.AspNetCore.csproj", "{37B6A5E0-9995-497D-8B43-3BC6870CC716}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModelContextProtocol.AspNetCore.Tests", "tests\ModelContextProtocol.AspNetCore.Tests\ModelContextProtocol.AspNetCore.Tests.csproj", "{85557BA6-3D29-4C95-A646-2A972B1C2F25}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -104,6 +106,10 @@ Global
 		{37B6A5E0-9995-497D-8B43-3BC6870CC716}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{37B6A5E0-9995-497D-8B43-3BC6870CC716}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{37B6A5E0-9995-497D-8B43-3BC6870CC716}.Release|Any CPU.Build.0 = Release|Any CPU
+		{85557BA6-3D29-4C95-A646-2A972B1C2F25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{85557BA6-3D29-4C95-A646-2A972B1C2F25}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{85557BA6-3D29-4C95-A646-2A972B1C2F25}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{85557BA6-3D29-4C95-A646-2A972B1C2F25}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -121,6 +127,7 @@ Global
 		{0D1552DC-E6ED-4AAC-5562-12F8352F46AA} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
 		{17B8453F-AB72-99C5-E5EA-D0B065A6AE65} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
 		{37B6A5E0-9995-497D-8B43-3BC6870CC716} = {A2F1F52A-9107-4BF8-8C3F-2F6670E7D0AD}
+		{85557BA6-3D29-4C95-A646-2A972B1C2F25} = {2A77AF5C-138A-4EBB-9A13-9205DCD67928}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {384A3888-751F-4D75-9AE5-587330582D89}

samples/TestServerWithHosting/Program.cs

@@ -35,5 +35,5 @@
 }
 finally
 {
-    await Log.CloseAndFlushAsync();
+    Log.CloseAndFlush();
 }

samples/TestServerWithHosting/TestServerWithHosting.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net9.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net9.0;net8.0;net472</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <!--

src/Common/Polyfills/System/Diagnostics/ProcessExtensions.cs

@@ -10,4 +10,28 @@ public static void Kill(this Process process, bool entireProcessTree)
         _ = entireProcessTree;
         process.Kill();
     }
+
+    public static async Task WaitForExitAsync(this Process process, CancellationToken cancellationToken = default)
+    {
+        if (process.HasExited)
+        {
+            return;
+        }
+
+        var tcs = new TaskCompletionSource<bool>();
+        void ProcessExitedHandler(object? sender, EventArgs e) => tcs.TrySetResult(true);
+
+        try
+        {
+            process.EnableRaisingEvents = true;
+            process.Exited += ProcessExitedHandler;
+
+            using var _ = cancellationToken.Register(() => tcs.TrySetCanceled(cancellationToken));
+            await tcs.Task.ConfigureAwait(false);
+        }
+        finally
+        {
+            process.Exited -= ProcessExitedHandler;
+        }
+    }
 }

src/Common/Polyfills/System/IO/TextReaderExtensions.cs

@@ -4,21 +4,7 @@ internal static class TextReaderExtensions
 {
     public static Task<string> ReadLineAsync(this TextReader reader, CancellationToken cancellationToken)
     {
-        if (cancellationToken.IsCancellationRequested)
-        {
-            return Task.FromCanceled<string>(cancellationToken);
-        }
-
+        cancellationToken.ThrowIfCancellationRequested();
         return reader.ReadLineAsync();
     }
-
-    public static Task<string> ReadToEndAsync(this TextReader reader, CancellationToken cancellationToken)
-    {
-        if (cancellationToken.IsCancellationRequested)
-        {
-            return Task.FromCanceled<string>(cancellationToken);
-        }
-
-        return reader.ReadToEndAsync();
-    }
 }

src/Common/Polyfills/System/IO/TextWriterExtensions.cs

@@ -5,33 +5,6 @@ namespace System.IO;
 
 internal static class TextWriterExtensions
 {
-    public static async Task WriteLineAsync(this TextWriter writer, ReadOnlyMemory<char> value, CancellationToken cancellationToken)
-    {
-        Throw.IfNull(writer);
-
-        if (value.IsEmpty)
-        {
-            return;
-        }
-
-        cancellationToken.ThrowIfCancellationRequested();
-
-        if (MemoryMarshal.TryGetString(value, out string str, out int start, out int length) &&
-            start == 0 && length == str.Length)
-        {
-            await writer.WriteLineAsync(str).ConfigureAwait(false);
-        }
-        else if (MemoryMarshal.TryGetArray(value, out ArraySegment<char> array) &&
-            array.Array is not null && array.Offset == 0 && array.Count == array.Array.Length)
-        {
-            await writer.WriteLineAsync(array.Array).ConfigureAwait(false);
-        }
-        else
-        {
-            await writer.WriteLineAsync(value.ToArray()).ConfigureAwait(false);
-        }
-    }
-
     public static async Task FlushAsync(this TextWriter writer, CancellationToken cancellationToken)
     {
         cancellationToken.ThrowIfCancellationRequested();

src/Common/Polyfills/System/Threading/Tasks/TaskExtensions.cs

@@ -9,13 +9,18 @@ public static Task WaitAsync(this Task task, CancellationToken cancellationToken
         return WaitAsync(task, Timeout.InfiniteTimeSpan, cancellationToken);
     }
 
-    public static async Task<T> WaitAsync<T>(this Task<T> task, CancellationToken cancellationToken)
+    public static Task<T> WaitAsync<T>(this Task<T> task, CancellationToken cancellationToken)
     {
-        await WaitAsync(task, Timeout.InfiniteTimeSpan, cancellationToken);
+        return WaitAsync(task, Timeout.InfiniteTimeSpan, cancellationToken);
+    }
+
+    public static async Task<T> WaitAsync<T>(this Task<T> task, TimeSpan timeout, CancellationToken cancellationToken = default)
+    {
+        await WaitAsync((Task)task, timeout, cancellationToken).ConfigureAwait(false);
         return task.Result;
     }
 
-    public static async Task WaitAsync(this Task task, TimeSpan timeout, CancellationToken cancellationToken)
+    public static async Task WaitAsync(this Task task, TimeSpan timeout, CancellationToken cancellationToken = default)
     {
         Throw.IfNull(task);
 

src/ModelContextProtocol/Utils/Throw.cs renamed to src/Common/Throw.cs

@@ -14,6 +14,10 @@
     <IsAotCompatible>true</IsAotCompatible>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Include="..\Common\Throw.cs" Link="Utils\Throw.cs" />
+  </ItemGroup>
+
   <!-- Dependencies only needed by netstandard2.0 -->
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
     <Compile Include="..\Common\Polyfills\**\*.cs" />