Do not embed MediatR (#177)

* Do not embed MediatR

- MediatR is strong-name signed nowadays, no need to embed and sign anymore.

* Fix test

Author: bjorkstromm

.gitmodules

@@ -12,6 +12,7 @@
         <PackageTags>lsp;language server;language server protocol;language client;language server client</PackageTags>
         <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)\lsp.snk</AssemblyOriginatorKeyFile>
         <Logging_Extensions_Version>2.0.0</Logging_Extensions_Version>
+        <MediatR_Version>7.0.0</MediatR_Version>
     </PropertyGroup>
     <PropertyGroup>
         <EmbedUntrackedSources>true</EmbedUntrackedSources>

Common.Build.props

@@ -22,5 +22,7 @@
         <PackageReference Update="XunitXml.TestLogger" Version="2.1.26" />
         <PackageReference Update="coverlet.msbuild" Version="2.5.1" />
         <PackageReference Update="System.Reactive" Version="4.1.2" />
+        <PackageReference Update="MediatR" Version="$(MediatR_Version)" />
+        <PackageReference Update="MediatR.Extensions.Microsoft.DependencyInjection" Version="$(MediatR_Version)" />
     </ItemGroup>
 </Project>

Common.Build.targets

@@ -1,28 +1,6 @@
 #load "nuget:?package=Rocket.Surgery.Cake.Library&version=0.9.3";
 
-Task("Submodules")
-    .Does(() => {
-        StartProcess("git", "submodule update --init --recursive");
-    });
-
-Task("Embed MediatR")
-    .Does(() => {
-        foreach (var file in GetFiles("submodules/**/*.cs"))
-        {
-            var content = System.IO.File.ReadAllText(file.FullPath);
-            if (content.IndexOf("namespace MediatR") > -1 || content.IndexOf("using MediatR") > -1)
-            {
-                System.IO.File.WriteAllText(file.FullPath, content
-                    .Replace("namespace MediatR", "namespace OmniSharp.Extensions.Embedded.MediatR")
-                    .Replace("using MediatR", "using OmniShqarp.Extensions.Embedded.MediatR")
-                );
-            }
-        }
-    });
-
 Task("Default")
-    .IsDependentOn("Submodules")
-    .IsDependentOn("Embed MediatR")
     .IsDependentOn("dotnetcore");
 
 RunTarget(Target);

build.cake

@@ -1,8 +1,8 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
+using MediatR;
 using Microsoft.Extensions.Logging;
-using OmniSharp.Extensions.Embedded.MediatR;
 using OmniSharp.Extensions.LanguageServer;
 using OmniSharp.Extensions.LanguageServer.Protocol;
 using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities;

sample/SampleServer/TextDocumentHandler.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-using OmniSharp.Extensions.Embedded.MediatR;
+using MediatR;
 using Newtonsoft.Json.Linq;
 using OmniSharp.Extensions.JsonRpc;
 using OmniSharp.Extensions.LanguageServer.Protocol;

src/Client/Handlers/JsonRpcNotificationHandler.cs

@@ -1,5 +1,5 @@
 using System;
-using OmniSharp.Extensions.Embedded.MediatR;
+using MediatR;
 using OmniSharp.Extensions.JsonRpc;
 using OmniSharp.Extensions.LanguageServer.Client.Handlers;
 

src/Client/LanguageRegistration.cs

@@ -1,5 +1,5 @@
 using OmniSharp.Extensions.DebugAdapter.Protocol.Models;
-using OmniSharp.Extensions.Embedded.MediatR;
+using MediatR;
 
 namespace OmniSharp.Extensions.DebugAdapter.Protocol.Events
 {

src/Dap.Protocol/Events/BreakpointEvent.cs

@@ -2,7 +2,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using OmniSharp.Extensions.DebugAdapter.Protocol.Requests;
-using OmniSharp.Extensions.Embedded.MediatR;
+using MediatR;
 using OmniSharp.Extensions.JsonRpc;
 
 namespace OmniSharp.Extensions.DebugAdapter.Protocol.Events

src/Dap.Protocol/Events/BreakpointExtensions.cs

@@ -1,5 +1,5 @@
 using OmniSharp.Extensions.DebugAdapter.Protocol.Models;
-using OmniSharp.Extensions.Embedded.MediatR;
+using MediatR;
 
 namespace OmniSharp.Extensions.DebugAdapter.Protocol.Events
 {