Skip to content

Commit d997627

Browse files
bjorkstrommdavid-driscoll
bjorkstromm
authored and
david-driscoll
committed
Do not embed MediatR (#177)
* Do not embed MediatR - MediatR is strong-name signed nowadays, no need to embed and sign anymore. * Fix test
1 parent 2086370 commit d997627

File tree

176 files changed

+182
-206
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

176 files changed

+182
-206
lines changed

‎.gitmodules

-6
This file was deleted.

‎Common.Build.props

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<PackageTags>lsp;language server;language server protocol;language client;language server client</PackageTags>
1313
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)\lsp.snk</AssemblyOriginatorKeyFile>
1414
<Logging_Extensions_Version>2.0.0</Logging_Extensions_Version>
15+
<MediatR_Version>7.0.0</MediatR_Version>
1516
</PropertyGroup>
1617
<PropertyGroup>
1718
<EmbedUntrackedSources>true</EmbedUntrackedSources>

‎Common.Build.targets

+2
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,7 @@
2222
<PackageReference Update="XunitXml.TestLogger" Version="2.1.26" />
2323
<PackageReference Update="coverlet.msbuild" Version="2.5.1" />
2424
<PackageReference Update="System.Reactive" Version="4.1.2" />
25+
<PackageReference Update="MediatR" Version="$(MediatR_Version)" />
26+
<PackageReference Update="MediatR.Extensions.Microsoft.DependencyInjection" Version="$(MediatR_Version)" />
2527
</ItemGroup>
2628
</Project>

‎build.cake

-22
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,6 @@
11
#load "nuget:?package=Rocket.Surgery.Cake.Library&version=0.9.3";
22

3-
Task("Submodules")
4-
.Does(() => {
5-
StartProcess("git", "submodule update --init --recursive");
6-
});
7-
8-
Task("Embed MediatR")
9-
.Does(() => {
10-
foreach (var file in GetFiles("submodules/**/*.cs"))
11-
{
12-
var content = System.IO.File.ReadAllText(file.FullPath);
13-
if (content.IndexOf("namespace MediatR") > -1 || content.IndexOf("using MediatR") > -1)
14-
{
15-
System.IO.File.WriteAllText(file.FullPath, content
16-
.Replace("namespace MediatR", "namespace OmniSharp.Extensions.Embedded.MediatR")
17-
.Replace("using MediatR", "using OmniShqarp.Extensions.Embedded.MediatR")
18-
);
19-
}
20-
}
21-
});
22-
233
Task("Default")
24-
.IsDependentOn("Submodules")
25-
.IsDependentOn("Embed MediatR")
264
.IsDependentOn("dotnetcore");
275

286
RunTarget(Target);

‎sample/SampleServer/TextDocumentHandler.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
using System;
22
using System.Threading;
33
using System.Threading.Tasks;
4+
using MediatR;
45
using Microsoft.Extensions.Logging;
5-
using OmniSharp.Extensions.Embedded.MediatR;
66
using OmniSharp.Extensions.LanguageServer;
77
using OmniSharp.Extensions.LanguageServer.Protocol;
88
using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities;

‎src/Client/Handlers/JsonRpcNotificationHandler.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System;
22
using System.Threading;
33
using System.Threading.Tasks;
4-
using OmniSharp.Extensions.Embedded.MediatR;
4+
using MediatR;
55
using Newtonsoft.Json.Linq;
66
using OmniSharp.Extensions.JsonRpc;
77
using OmniSharp.Extensions.LanguageServer.Protocol;

‎src/Client/LanguageRegistration.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using System;
2-
using OmniSharp.Extensions.Embedded.MediatR;
2+
using MediatR;
33
using OmniSharp.Extensions.JsonRpc;
44
using OmniSharp.Extensions.LanguageServer.Client.Handlers;
55

‎src/Dap.Protocol/Events/BreakpointEvent.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using OmniSharp.Extensions.DebugAdapter.Protocol.Models;
2-
using OmniSharp.Extensions.Embedded.MediatR;
2+
using MediatR;
33

44
namespace OmniSharp.Extensions.DebugAdapter.Protocol.Events
55
{

‎src/Dap.Protocol/Events/BreakpointExtensions.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using System.Threading;
33
using System.Threading.Tasks;
44
using OmniSharp.Extensions.DebugAdapter.Protocol.Requests;
5-
using OmniSharp.Extensions.Embedded.MediatR;
5+
using MediatR;
66
using OmniSharp.Extensions.JsonRpc;
77

88
namespace OmniSharp.Extensions.DebugAdapter.Protocol.Events

‎src/Dap.Protocol/Events/CapabilitiesEvent.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using OmniSharp.Extensions.DebugAdapter.Protocol.Models;
2-
using OmniSharp.Extensions.Embedded.MediatR;
2+
using MediatR;
33

44
namespace OmniSharp.Extensions.DebugAdapter.Protocol.Events
55
{

‎src/Dap.Protocol/Events/CapabilitiesExtensions.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using System.Threading;
33
using System.Threading.Tasks;
44
using OmniSharp.Extensions.DebugAdapter.Protocol.Requests;
5-
using OmniSharp.Extensions.Embedded.MediatR;
5+
using MediatR;
66
using OmniSharp.Extensions.JsonRpc;
77

88
namespace OmniSharp.Extensions.DebugAdapter.Protocol.Events

‎src/Dap.Protocol/Events/ContinuedEvent.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization;
2-
using OmniSharp.Extensions.Embedded.MediatR;
2+
using MediatR;
33

44
namespace OmniSharp.Extensions.DebugAdapter.Protocol.Events
55
{

‎src/Dap.Protocol/Events/ContinuedExtensions.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using System.Threading;
33
using System.Threading.Tasks;
44
using OmniSharp.Extensions.DebugAdapter.Protocol.Requests;
5-
using OmniSharp.Extensions.Embedded.MediatR;
5+
using MediatR;
66
using OmniSharp.Extensions.JsonRpc;
77

88
namespace OmniSharp.Extensions.DebugAdapter.Protocol.Events

‎src/Dap.Protocol/Events/ExitedEvent.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using OmniSharp.Extensions.Embedded.MediatR;
1+
using MediatR;
22

33
namespace OmniSharp.Extensions.DebugAdapter.Protocol.Events
44
{

‎src/Dap.Protocol/Events/ExitedExtensions.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using System.Threading;
33
using System.Threading.Tasks;
44
using OmniSharp.Extensions.DebugAdapter.Protocol.Requests;
5-
using OmniSharp.Extensions.Embedded.MediatR;
5+
using MediatR;
66
using OmniSharp.Extensions.JsonRpc;
77

88
namespace OmniSharp.Extensions.DebugAdapter.Protocol.Events

‎src/Dap.Protocol/Events/InitializedEvent.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using OmniSharp.Extensions.Embedded.MediatR;
1+
using MediatR;
22

33
namespace OmniSharp.Extensions.DebugAdapter.Protocol.Events
44
{

‎src/Dap.Protocol/Events/InitializedExtensions.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using System.Threading;
33
using System.Threading.Tasks;
44
using OmniSharp.Extensions.DebugAdapter.Protocol.Requests;
5-
using OmniSharp.Extensions.Embedded.MediatR;
5+
using MediatR;
66
using OmniSharp.Extensions.JsonRpc;
77

88
namespace OmniSharp.Extensions.DebugAdapter.Protocol.Events

‎src/Dap.Protocol/Events/LoadedSourceEvent.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using OmniSharp.Extensions.DebugAdapter.Protocol.Models;
2-
using OmniSharp.Extensions.Embedded.MediatR;
2+
using MediatR;
33

44
namespace OmniSharp.Extensions.DebugAdapter.Protocol.Events
55
{

‎src/Dap.Protocol/Events/LoadedSourceExtensions.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using System.Threading;
33
using System.Threading.Tasks;
44
using OmniSharp.Extensions.DebugAdapter.Protocol.Requests;
5-
using OmniSharp.Extensions.Embedded.MediatR;
5+
using MediatR;
66
using OmniSharp.Extensions.JsonRpc;
77

88
namespace OmniSharp.Extensions.DebugAdapter.Protocol.Events

‎src/Dap.Protocol/Events/ModuleEvent.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using OmniSharp.Extensions.DebugAdapter.Protocol.Models;
2-
using OmniSharp.Extensions.Embedded.MediatR;
2+
using MediatR;
33

44
namespace OmniSharp.Extensions.DebugAdapter.Protocol.Events
55
{

‎src/Dap.Protocol/Events/ModuleExtensions.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using System.Threading;
33
using System.Threading.Tasks;
44
using OmniSharp.Extensions.DebugAdapter.Protocol.Requests;
5-
using OmniSharp.Extensions.Embedded.MediatR;
5+
using MediatR;
66
using OmniSharp.Extensions.JsonRpc;
77

88
namespace OmniSharp.Extensions.DebugAdapter.Protocol.Events

‎src/Dap.Protocol/Events/OutputEvent.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using Newtonsoft.Json.Linq;
22
using OmniSharp.Extensions.DebugAdapter.Protocol.Models;
33
using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization;
4-
using OmniSharp.Extensions.Embedded.MediatR;
4+
using MediatR;
55

66
namespace OmniSharp.Extensions.DebugAdapter.Protocol.Events
77
{

‎src/Dap.Protocol/Events/OutputExtensions.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using System.Threading;
33
using System.Threading.Tasks;
44
using OmniSharp.Extensions.DebugAdapter.Protocol.Requests;
5-
using OmniSharp.Extensions.Embedded.MediatR;
5+
using MediatR;
66
using OmniSharp.Extensions.JsonRpc;
77

88
namespace OmniSharp.Extensions.DebugAdapter.Protocol.Events

‎src/Dap.Protocol/Events/ProcessEvent.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization;
2-
using OmniSharp.Extensions.Embedded.MediatR;
2+
using MediatR;
33

44
namespace OmniSharp.Extensions.DebugAdapter.Protocol.Events
55
{

‎src/Dap.Protocol/Events/ProcessExtensions.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using System.Threading;
33
using System.Threading.Tasks;
44
using OmniSharp.Extensions.DebugAdapter.Protocol.Requests;
5-
using OmniSharp.Extensions.Embedded.MediatR;
5+
using MediatR;
66
using OmniSharp.Extensions.JsonRpc;
77

88
namespace OmniSharp.Extensions.DebugAdapter.Protocol.Events

‎src/Dap.Protocol/Events/StoppedEvent.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization;
2-
using OmniSharp.Extensions.Embedded.MediatR;
2+
using MediatR;
33

44
namespace OmniSharp.Extensions.DebugAdapter.Protocol.Events
55
{

‎src/Dap.Protocol/Events/StoppedExtensions.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using System.Threading;
33
using System.Threading.Tasks;
44
using OmniSharp.Extensions.DebugAdapter.Protocol.Requests;
5-
using OmniSharp.Extensions.Embedded.MediatR;
5+
using MediatR;
66
using OmniSharp.Extensions.JsonRpc;
77

88
namespace OmniSharp.Extensions.DebugAdapter.Protocol.Events

‎src/Dap.Protocol/Events/TerminatedEvent.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using Newtonsoft.Json.Linq;
22
using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization;
3-
using OmniSharp.Extensions.Embedded.MediatR;
3+
using MediatR;
44

55
namespace OmniSharp.Extensions.DebugAdapter.Protocol.Events
66
{

‎src/Dap.Protocol/Events/TerminatedExtensions.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using System.Threading;
33
using System.Threading.Tasks;
44
using OmniSharp.Extensions.DebugAdapter.Protocol.Requests;
5-
using OmniSharp.Extensions.Embedded.MediatR;
5+
using MediatR;
66
using OmniSharp.Extensions.JsonRpc;
77

88
namespace OmniSharp.Extensions.DebugAdapter.Protocol.Events

‎src/Dap.Protocol/Events/ThreadEvent.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using OmniSharp.Extensions.Embedded.MediatR;
1+
using MediatR;
22

33
namespace OmniSharp.Extensions.DebugAdapter.Protocol.Events
44
{

‎src/Dap.Protocol/Events/ThreadExtensions.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using System.Threading;
33
using System.Threading.Tasks;
44
using OmniSharp.Extensions.DebugAdapter.Protocol.Requests;
5-
using OmniSharp.Extensions.Embedded.MediatR;
5+
using MediatR;
66
using OmniSharp.Extensions.JsonRpc;
77

88
namespace OmniSharp.Extensions.DebugAdapter.Protocol.Events

‎src/Dap.Protocol/Requests/AttachRequestArguments.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using Newtonsoft.Json.Linq;
22
using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization;
3-
using OmniSharp.Extensions.Embedded.MediatR;
3+
using MediatR;
44

55
namespace OmniSharp.Extensions.DebugAdapter.Protocol.Requests
66
{

‎src/Dap.Protocol/Requests/CompletionsArguments.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization;
2-
using OmniSharp.Extensions.Embedded.MediatR;
2+
using MediatR;
33

44
namespace OmniSharp.Extensions.DebugAdapter.Protocol.Requests
55
{

‎src/Dap.Protocol/Requests/ConfigurationDoneArguments.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using OmniSharp.Extensions.Embedded.MediatR;
1+
using MediatR;
22

33
namespace OmniSharp.Extensions.DebugAdapter.Protocol.Requests
44
{

‎src/Dap.Protocol/Requests/ContinueArguments.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using OmniSharp.Extensions.Embedded.MediatR;
1+
using MediatR;
22

33
namespace OmniSharp.Extensions.DebugAdapter.Protocol.Requests
44
{

‎src/Dap.Protocol/Requests/DataBreakpointInfoArguments.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization;
2-
using OmniSharp.Extensions.Embedded.MediatR;
2+
using MediatR;
33

44
namespace OmniSharp.Extensions.DebugAdapter.Protocol.Requests
55
{

‎src/Dap.Protocol/Requests/DisassembleArguments.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization;
2-
using OmniSharp.Extensions.Embedded.MediatR;
2+
using MediatR;
33

44
namespace OmniSharp.Extensions.DebugAdapter.Protocol.Requests
55
{

‎src/Dap.Protocol/Requests/DisconnectArguments.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization;
2-
using OmniSharp.Extensions.Embedded.MediatR;
2+
using MediatR;
33

44
namespace OmniSharp.Extensions.DebugAdapter.Protocol.Requests
55
{

‎src/Dap.Protocol/Requests/EvaluateArguments.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using OmniSharp.Extensions.DebugAdapter.Protocol.Models;
22
using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization;
3-
using OmniSharp.Extensions.Embedded.MediatR;
3+
using MediatR;
44

55
namespace OmniSharp.Extensions.DebugAdapter.Protocol.Requests
66
{

‎src/Dap.Protocol/Requests/ExceptionInfoArguments.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using OmniSharp.Extensions.Embedded.MediatR;
1+
using MediatR;
22

33
namespace OmniSharp.Extensions.DebugAdapter.Protocol.Requests
44
{

‎src/Dap.Protocol/Requests/GotoArguments.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using OmniSharp.Extensions.Embedded.MediatR;
1+
using MediatR;
22

33
namespace OmniSharp.Extensions.DebugAdapter.Protocol.Requests
44
{

‎src/Dap.Protocol/Requests/GotoTargetsArguments.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using OmniSharp.Extensions.DebugAdapter.Protocol.Models;
22
using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization;
3-
using OmniSharp.Extensions.Embedded.MediatR;
3+
using MediatR;
44

55
namespace OmniSharp.Extensions.DebugAdapter.Protocol.Requests
66
{

‎src/Dap.Protocol/Requests/InitializeRequestArguments.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization;
2-
using OmniSharp.Extensions.Embedded.MediatR;
2+
using MediatR;
33

44
namespace OmniSharp.Extensions.DebugAdapter.Protocol.Requests
55
{

‎src/Dap.Protocol/Requests/LaunchRequestArguments.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using Newtonsoft.Json.Linq;
22
using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization;
3-
using OmniSharp.Extensions.Embedded.MediatR;
3+
using MediatR;
44

55
namespace OmniSharp.Extensions.DebugAdapter.Protocol.Requests
66
{

‎src/Dap.Protocol/Requests/LoadedSourcesArguments.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using OmniSharp.Extensions.Embedded.MediatR;
1+
using MediatR;
22

33
namespace OmniSharp.Extensions.DebugAdapter.Protocol.Requests
44
{

‎src/Dap.Protocol/Requests/ModulesArguments.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization;
2-
using OmniSharp.Extensions.Embedded.MediatR;
2+
using MediatR;
33

44
namespace OmniSharp.Extensions.DebugAdapter.Protocol.Requests
55
{

‎src/Dap.Protocol/Requests/NextArguments.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using OmniSharp.Extensions.Embedded.MediatR;
1+
using MediatR;
22

33
namespace OmniSharp.Extensions.DebugAdapter.Protocol.Requests
44
{

‎src/Dap.Protocol/Requests/PauseArguments.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using OmniSharp.Extensions.Embedded.MediatR;
1+
using MediatR;
22

33
namespace OmniSharp.Extensions.DebugAdapter.Protocol.Requests
44
{

‎src/Dap.Protocol/Requests/ReadMemoryArguments.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization;
2-
using OmniSharp.Extensions.Embedded.MediatR;
2+
using MediatR;
33

44
namespace OmniSharp.Extensions.DebugAdapter.Protocol.Requests
55
{

‎src/Dap.Protocol/Requests/RestartArguments.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using OmniSharp.Extensions.Embedded.MediatR;
1+
using MediatR;
22

33
namespace OmniSharp.Extensions.DebugAdapter.Protocol.Requests
44
{

0 commit comments

Comments
 (0)