diff --git a/utbot-rider/src/dotnet/UtBot/UtBot.Rd/RdWriter.cs b/utbot-rider/src/dotnet/UtBot/UtBot.Rd/RdWriter.cs deleted file mode 100644 index 8c3374aa81..0000000000 --- a/utbot-rider/src/dotnet/UtBot/UtBot.Rd/RdWriter.cs +++ /dev/null @@ -1,20 +0,0 @@ -// using System.IO; -// using System.Text; -// -// namespace UtBot.Rd; -// -// public class RdWriter : TextWriter -// { -// public override Encoding Encoding { get; } = Encoding.UTF8; -// -// public RdWriter -// -// public override void Write(char value) -// { -// } -// -// public override void Write(char[] buffer, int index, int count) -// { -// base.Write(buffer, index, count); -// } -// } \ No newline at end of file diff --git a/utbot-rider/src/dotnet/UtBot/UtBot.VSharp/VSharpMain.cs b/utbot-rider/src/dotnet/UtBot/UtBot.VSharp/VSharpMain.cs index df812c2559..be1bee9ffd 100644 --- a/utbot-rider/src/dotnet/UtBot/UtBot.VSharp/VSharpMain.cs +++ b/utbot-rider/src/dotnet/UtBot/UtBot.VSharp/VSharpMain.cs @@ -21,7 +21,6 @@ public static class VSharpMain public static readonly string VSharpProcessName = "VSharp"; public static void Main(string[] args) { - // TextWriter); using var blockingQueue = new BlockingCollection(1); var port = int.Parse(args[0]); var ldef = new LifetimeDefinition(); diff --git a/utbot-rider/src/dotnet/UtBot/UtBot/ProcessWithRdServer.cs b/utbot-rider/src/dotnet/UtBot/UtBot/ProcessWithRdServer.cs index f2aaa2c045..3cfcd81c25 100644 --- a/utbot-rider/src/dotnet/UtBot/UtBot/ProcessWithRdServer.cs +++ b/utbot-rider/src/dotnet/UtBot/UtBot/ProcessWithRdServer.cs @@ -41,7 +41,7 @@ public ProcessWithRdServer(string name, int port, string exePath, IShellLocks sh var wire = new SocketWire.Server(Lifetime, scheduler, socket); var serializers = new Serializers(); var identities = new Identities(IdKind.Server); - var startInfo = new ProcessStartInfo(exePath, $"{port}"); + var startInfo = new ProcessStartInfo("dotnet", $"{exePath} {port}"); Protocol = new Protocol(name, serializers, identities, scheduler, wire, Lifetime); scheduler.Queue(() => { @@ -53,14 +53,10 @@ public ProcessWithRdServer(string name, int port, string exePath, IShellLocks sh blockingCollection.TryAdd(s); } }); - // VSharpModel.? }); _process = new Process(); - // _process.ErrorDataReceived; - // _process.EnableRaisingEvents; - // _process. - Lifetime.OnTermination(() => _process.Kill(entireProcessTree: true)); _process.StartInfo = startInfo; + Lifetime.OnTermination(() => _process.Kill(entireProcessTree: true)); if (_process.Start()) _process.Exited += (_, _) => _ldef.Terminate(); else diff --git a/utbot-rider/src/dotnet/UtBot/UtBot/UnitTestBuilder.cs b/utbot-rider/src/dotnet/UtBot/UtBot/UnitTestBuilder.cs index 67a0e6212c..5316799652 100644 --- a/utbot-rider/src/dotnet/UtBot/UtBot/UnitTestBuilder.cs +++ b/utbot-rider/src/dotnet/UtBot/UtBot/UnitTestBuilder.cs @@ -139,7 +139,7 @@ private void Generate(IBackgroundProgressIndicator progressIndicator, IProject p project.Locks.AssertNonMainThread(); var pluginPath = FileSystemPath.Parse(Assembly.GetExecutingAssembly().Location) .Parent; - var vsharpRunner = pluginPath.Combine("UtBot.VSharp"); + var vsharpRunner = pluginPath.Combine("UtBot.VSharp.dll"); var port = NetworkUtil.GetFreePort(); var proc = new ProcessWithRdServer(VSharpMain.VSharpProcessName, port, vsharpRunner.FullPath, project.Locks, _lifetime); var projectCsprojPath = project.ProjectFileLocation.FullPath;