Disable Cake tests in net6

OmniSharp · Nov 25, 2021 · 9a999d2 · 9a999d2
1 parent 845529c
commit 9a999d2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/tests-net6.yml b/.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.Cake.Tests,OmniSharp.Script.Tests,OmniSharp.Stdio.Tests,OmniSharp.Http.Tests,OmniSharp.Tests,OmniSharp.Lsp.Tests
+          - OmniSharp.MSBuild.Tests,OmniSharp.Roslyn.CSharp.Tests,OmniSharp.Script.Tests,OmniSharp.Stdio.Tests,OmniSharp.Http.Tests,OmniSharp.Tests,OmniSharp.Lsp.Tests
           - OmniSharp.DotNetTest.Tests
     name: 'Test'
     steps:

diff --git a/tests/TestUtility/OmniSharpTestHost.cs b/tests/TestUtility/OmniSharpTestHost.cs
@@ -12,7 +12,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using OmniSharp;
-using OmniSharp.Cake;
 using OmniSharp.DotNetTest.Models;
 using OmniSharp.Eventing;
 using OmniSharp.LanguageServerProtocol;
@@ -38,7 +37,9 @@ public class OmniSharpTestHost : DisposableObject
             typeof(ScriptProjectSystem).GetTypeInfo().Assembly, // OmniSharp.Script
             typeof(OmniSharpWorkspace).GetTypeInfo().Assembly, // OmniSharp.Roslyn
             typeof(RoslynFeaturesHostServicesProvider).GetTypeInfo().Assembly, // OmniSharp.Roslyn.CSharp
-            typeof(CakeProjectSystem).GetTypeInfo().Assembly, // OmniSharp.Cake
+#if !NETCOREAPP
+            typeof(OmniSharp.Cake.CakeProjectSystem).GetTypeInfo().Assembly, // OmniSharp.Cake
+#endif
             typeof(LanguageServerHost).Assembly, // OmniSharp.LanguageServerProtocol
         });
 

diff --git a/tests/TestUtility/TestUtility.csproj b/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 Include="..\..\src\OmniSharp.Cake\OmniSharp.Cake.csproj" />
+    <ProjectReference Condition="'$(TargetFramework)' == 'net472'" Include="..\..\src\OmniSharp.Cake\OmniSharp.Cake.csproj" />
     <ProjectReference Include="..\..\src\OmniSharp.Shared\OmniSharp.Shared.csproj" />
   </ItemGroup>