Enable OmniSharp.Cake tests for .NET 6

.github/workflows/tests-net6.yml

@@ -28,7 +28,7 @@ jobs:
       matrix:
         os: [ubuntu-18.04, windows-2019, macos-10.15]
         testProjects:
-          - OmniSharp.MSBuild.Tests,OmniSharp.Roslyn.CSharp.Tests,OmniSharp.Script.Tests,OmniSharp.Stdio.Tests,OmniSharp.Http.Tests,OmniSharp.Tests,OmniSharp.Lsp.Tests
+          - OmniSharp.MSBuild.Tests,OmniSharp.Roslyn.CSharp.Tests,OmniSharp.Cake.Tests,OmniSharp.Script.Tests,OmniSharp.Stdio.Tests,OmniSharp.Http.Tests,OmniSharp.Tests,OmniSharp.Lsp.Tests
           - OmniSharp.DotNetTest.Tests
     name: 'Test'
     steps:

build.json

@@ -23,6 +23,7 @@
         "OmniSharp.Stdio.Tests",
         "OmniSharp.DotNetTest.Tests",
         "OmniSharp.Tests",
+        "OmniSharp.Cake.Tests",
         "OmniSharp.Script.Tests",
         "OmniSharp.Lsp.Tests"
     ],

build/Packages.props

@@ -12,7 +12,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Update="Cake.Scripting.Transport" Version="0.8.1" />
+        <PackageReference Update="Cake.Scripting.Transport" Version="0.9.0" />
 
         <PackageReference Update="Dotnet.Script.DependencyModel" Version="1.1.0" />
         <PackageReference Update="Dotnet.Script.DependencyModel.NuGet" Version="1.1.0" />

src/OmniSharp.Cake/Services/CakeScriptService.cs

@@ -44,9 +44,14 @@ public bool Initialize(CakeOptions options)
             {
                 _logger.LogInformation($"Using Cake.Bakery at {serverExecutablePath}");
 
-                _generationService = PlatformHelper.IsMono ?
-                    new ScriptGenerationClient(new MonoScriptGenerationProcess(serverExecutablePath, _environment, _loggerFactory), _environment.TargetDirectory, _loggerFactory) :
-                    new ScriptGenerationClient(serverExecutablePath, _environment.TargetDirectory, _loggerFactory);
+                _generationService =
+#if NET472_OR_GREATER
+                    PlatformHelper.IsMono ?
+                        new ScriptGenerationClient(new MonoScriptGenerationProcess(serverExecutablePath, _environment, _loggerFactory), _environment.TargetDirectory, _loggerFactory) :
+                        new ScriptGenerationClient(serverExecutablePath, _environment.TargetDirectory, _loggerFactory);
+#else
+                    new ScriptGenerationClient(new DotnetScriptGenerationProcess(serverExecutablePath, _environment, _loggerFactory), _environment.TargetDirectory, _loggerFactory);
+#endif
             }
             else if (!string.IsNullOrEmpty(serverExecutablePath))
             {

src/OmniSharp.Cake/Services/DotnetScriptGenerationProcess.cs

@@ -0,0 +1,74 @@
+#if NET6_0_OR_GREATER
+using System;
+using System.Diagnostics;
+using System.IO;
+using Cake.Scripting.Transport.Tcp.Client;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+
+namespace OmniSharp.Cake.Services
+{
+    internal sealed class DotnetScriptGenerationProcess : IScriptGenerationProcess
+    {
+        private readonly ILogger _logger;
+        private readonly IOmniSharpEnvironment _environment;
+        private Process _process;
+
+        public DotnetScriptGenerationProcess(string serverExecutablePath, IOmniSharpEnvironment environment, ILoggerFactory loggerFactory)
+        {
+            _logger = loggerFactory?.CreateLogger(typeof(DotnetScriptGenerationProcess)) ?? NullLogger.Instance;
+            _environment = environment ?? throw new ArgumentNullException(nameof(environment));
+            ServerExecutablePath = serverExecutablePath;
+        }
+
+        public void Dispose()
+        {
+            _process?.Kill();
+            _process?.WaitForExit();
+            _process?.Dispose();
+        }
+
+        public void Start(int port, string workingDirectory)
+        {
+            var fileName = "dotnet";
+            var arguments = $"\"{Path.ChangeExtension(ServerExecutablePath, ".dll")}\"";
+            arguments += $" --port={port}";
+            if (_logger.IsEnabled(LogLevel.Debug))
+            {
+                arguments += " --verbose";
+            }
+
+            var startInfo = new ProcessStartInfo
+            {
+                FileName = fileName,
+                Arguments = arguments,
+                RedirectStandardOutput = true,
+                RedirectStandardError = true,
+                UseShellExecute = false,
+                WorkingDirectory = workingDirectory,
+            };
+
+            _logger.LogDebug("Starting \"{fileName}\" with arguments \"{arguments}\"", startInfo.FileName, startInfo.Arguments);
+            _process = Process.Start(startInfo);
+            _process.ErrorDataReceived += (s, e) =>
+            {
+                if (e.Data != null)
+                {
+                    _logger.LogError(e.Data);
+                }
+            };
+            _process.BeginErrorReadLine();
+            _process.OutputDataReceived += (s, e) =>
+            {
+                if (e.Data != null)
+                {
+                    _logger.LogDebug(e.Data);
+                }
+            };
+            _process.BeginOutputReadLine();
+        }
+
+        public string ServerExecutablePath { get; set; }
+    }
+}
+#endif

src/OmniSharp.Cake/Services/MonoScriptGenerationProcess.cs

@@ -1,4 +1,5 @@
-using System;
+#if NET472_OR_GREATER
+using System;
 using System.Diagnostics;
 using System.IO;
 using System.Runtime.InteropServices;
@@ -108,3 +109,4 @@ public void Start(int port, string workingDirectory)
         public string ServerExecutablePath { get; set; }
     }
 }
+#endif

test-assets/test-projects/CakeProject/tools/packages.config

@@ -1,4 +1,3 @@
 <packages>
-    <package id="Cake" version="1.3.0" />
-    <package id="Cake.Bakery" version="0.8.1" />
+    <package id="Cake.Bakery" version="0.9.0" />
 </packages>

tests/TestUtility/OmniSharpTestHost.cs

@@ -37,9 +37,7 @@ public class OmniSharpTestHost : DisposableObject
             typeof(ScriptProjectSystem).GetTypeInfo().Assembly, // OmniSharp.Script
             typeof(OmniSharpWorkspace).GetTypeInfo().Assembly, // OmniSharp.Roslyn
             typeof(RoslynFeaturesHostServicesProvider).GetTypeInfo().Assembly, // OmniSharp.Roslyn.CSharp
-#if !NETCOREAPP
             typeof(OmniSharp.Cake.CakeProjectSystem).GetTypeInfo().Assembly, // OmniSharp.Cake
-#endif
             typeof(LanguageServerHost).Assembly, // OmniSharp.LanguageServerProtocol
         });
 

tests/TestUtility/TestUtility.csproj

@@ -12,7 +12,7 @@
     <ProjectReference Include="..\..\src\OmniSharp.MSBuild\OmniSharp.MSBuild.csproj" />
     <ProjectReference Include="..\..\src\OmniSharp.Roslyn.CSharp\OmniSharp.Roslyn.CSharp.csproj" />
     <ProjectReference Include="..\..\src\OmniSharp.Script\OmniSharp.Script.csproj" />
-    <ProjectReference Condition="'$(TargetFramework)' == 'net472'" Include="..\..\src\OmniSharp.Cake\OmniSharp.Cake.csproj" />
+    <ProjectReference Include="..\..\src\OmniSharp.Cake\OmniSharp.Cake.csproj" />
     <ProjectReference Include="..\..\src\OmniSharp.Shared\OmniSharp.Shared.csproj" />
   </ItemGroup>