always run the TS client impl. in this repo

  + update LW TS deps. -> 0.10.0-beta.1

Author: dslmeinte

cs/Directory.Packages.props

@@ -8,7 +8,7 @@ SPDX-License-Identifier: Apache-2.0
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <LionWebCSharpVersion>0.5.0</LionWebCSharpVersion>
     <!-- Can be overwritten by environment variable TS_DELTA_CLI_VERSION -->
-    <TS_DELTA_CLI_VERSION Condition="'$(TS_DELTA_CLI_VERSION)' == ''">0.10.0-alpha.6</TS_DELTA_CLI_VERSION>
+    <TS_DELTA_CLI_VERSION Condition="'$(TS_DELTA_CLI_VERSION)' == ''">0.10.0-beta.1</TS_DELTA_CLI_VERSION>
     <UseLionWebPackages>true</UseLionWebPackages>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='DEBUG'">

cs/LionWeb.Integration.WebSocket.Tests/LionWeb.Integration.WebSocket.Tests.csproj

@@ -2,7 +2,6 @@
     <PropertyGroup>
         <RootNamespace>LionWeb.Integration.WebSocket.Tests</RootNamespace>
         <IsTestProject>true</IsTestProject>
-        <DefineConstants Condition="$(UseLionWebPackages)">USE_LION_WEB_PACKAGES</DefineConstants>
         <NoWarn>1591</NoWarn>
     </PropertyGroup>
 

cs/LionWeb.Integration.WebSocket.Tests/TsClientProcessesExtensions.cs

@@ -18,7 +18,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 
 using System.Diagnostics;
-using System.Runtime.InteropServices;
 
 namespace LionWeb.Integration.WebSocket.Tests;
 
@@ -29,75 +28,30 @@ public static Process TsClient(string clientId, int port, IEnumerable<string> ta
         out string errorTrigger)
     {
         var cmdLine = $"{port} {clientId} {string.Join(",", tasks)}";
-
-// Accesses `<DefineConstants>USE_LION_WEB_PACKAGES</DefineConstants>` from .csproj 
-#if USE_LION_WEB_PACKAGES
-        var process = TsNpxClient(cmdLine);
-#else
         var process = TsRelativeDirectoryClient(cmdLine);
-#endif
 
         process.StartInfo.UseShellExecute = false;
         readyTrigger = "LionWeb delta protocol client";
         errorTrigger = "Error";
         return process;
     }
 
-    /// <remarks>
-    /// This method assumes that
-    /// <list type="number">
-    ///  <item>the lionweb-typescript repo is located right next to the lionweb-integration-testing repo,</item>
-    ///  <item>that the latter repo has been checked out on the delta-protocol-impl branch,</item>
-    ///  <item>and that it's been built entirely successfully.</item>
-    /// </list>
-    /// </remarks>
     private static Process TsRelativeDirectoryClient(string cmdLine)
     {
         var process = new Process();
         process.StartInfo.FileName = "node";
         process.StartInfo.WorkingDirectory =
-            $"{Directory.GetCurrentDirectory()}/../../../../../../lionweb-typescript/packages/delta-protocol-test-cli";
+            $"{Directory.GetCurrentDirectory()}/../../../../../ts";
         // cwd is assumed to be: <LionWeb dir.>/lionweb-integration-testing/cs/LionWeb.Integration.WebSocket.Tests/bin/Debug/net8.0
         // (hence 7x ../)
         process.StartInfo.Arguments = $"dist/cli-client.js {cmdLine}";
-
         return process;
     }
 
-    private static Process CreateNodeUtilityProcess(params string[] arguments)
-    {
-        var process = new Process();
-        var effectiveArguments = RuntimeInformation.IsOSPlatform(OSPlatform.Windows)
-            ? ["powershell", ..arguments]   // on Windows, we need to call `powershell npx` instead of `npx`
-            : arguments;
-        process.StartInfo.FileName = effectiveArguments[0];
-        process.StartInfo.Arguments = string.Join(" ", effectiveArguments[1..]);
-        return process;
-    }
-
-    /// <remarks>
-    /// This method assumes that
-    /// <list type="number">
-    /// <item><i>Directory.Packages.props</i> property <c>LionWebTsVersion</c> is set.</item>
-    /// <item>the <c>@lionweb/delta-protocol-test-cli</c> NPM package has been downloaded and cached locally.</item>
-    /// </list>
-    /// </remarks>
-    // ReSharper disable once UnusedMember.Local
-    private static Process TsNpxClient(string cmdLine)
-        => CreateNodeUtilityProcess("npx", $"--package=@lionweb/delta-protocol-test-cli@{LionWebTsVersion}", "--cmd=cli-client", cmdLine);
-
     internal static string LionWebTsVersion => AssemblyConfigurationAttribute.Get("LionWebTsVersion");
 
-    internal static Process TsInstallClientPackage()
-        => CreateNodeUtilityProcess("npm", "install", $"@lionweb/delta-protocol-test-cli@{LionWebTsVersion}");
-
     internal static Process? SetUpTsClient()
     {
-// Accesses `<DefineConstants>USE_LION_WEB_PACKAGES</DefineConstants>` from .csproj 
-#if USE_LION_WEB_PACKAGES
-        return TsInstallClientPackage();
-#else
         return null;
-#endif
     }
 }

cs/README.md

@@ -28,20 +28,6 @@ This guarantees no interference between server and client, and enables implement
 
 Client tests work exactly the same — we put `TestFixture(ServerProcesses.<foreignServerLiteral>)` attributes on `WebSocketClientTestBase` and use `ServerProcessesExtensions.Create()` to set up the "foreign" server process.
 
-### How to distinguish scenarios
-When setting up the process of the "foreign" implementation, we need to distinguish which scenario we're running in: see next section for a description of the scenarios.
-
-We use preprocessor directives to distinguish the scenarios:
-
-```csharp
-// Accesses `<DefineConstants>USE_LION_WEB_PACKAGES</DefineConstants>` from .csproj 
-#if USE_LION_WEB_PACKAGES
-    Process result = TsNpxPackageClient(cmdLine);
-#else
-    Process result = TsRelativeDirectoryClient(cmdLine);
-#endif
-```
-
 ## How to run different scenarios
 
 ### Using "foreign" implementations from packages