diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index efa6594ef..000000000 --- a/.gitmodules +++ /dev/null @@ -1,6 +0,0 @@ -[submodule "submodules/MediatR.Extensions.Microsoft.DependencyInjection"] - path = submodules/MediatR.Extensions.Microsoft.DependencyInjection - url = https://github.com/jbogard/MediatR.Extensions.Microsoft.DependencyInjection.git -[submodule "submodules/MediatR"] - path = submodules/MediatR - url = https://github.com/jbogard/MediatR.git diff --git a/Common.Build.props b/Common.Build.props index a5076669b..efd8012dd 100644 --- a/Common.Build.props +++ b/Common.Build.props @@ -12,6 +12,7 @@ lsp;language server;language server protocol;language client;language server client $(MSBuildThisFileDirectory)\lsp.snk 2.0.0 + 7.0.0 true diff --git a/Common.Build.targets b/Common.Build.targets index d54ebc86f..e840a9a02 100644 --- a/Common.Build.targets +++ b/Common.Build.targets @@ -22,5 +22,7 @@ + + diff --git a/build.cake b/build.cake index c5fa9c31b..4caae9589 100644 --- a/build.cake +++ b/build.cake @@ -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); diff --git a/sample/SampleServer/TextDocumentHandler.cs b/sample/SampleServer/TextDocumentHandler.cs index df3703ce2..c9bb28941 100644 --- a/sample/SampleServer/TextDocumentHandler.cs +++ b/sample/SampleServer/TextDocumentHandler.cs @@ -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; diff --git a/src/Client/Handlers/JsonRpcNotificationHandler.cs b/src/Client/Handlers/JsonRpcNotificationHandler.cs index 7c706d68d..ac689ca6d 100644 --- a/src/Client/Handlers/JsonRpcNotificationHandler.cs +++ b/src/Client/Handlers/JsonRpcNotificationHandler.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; diff --git a/src/Client/LanguageRegistration.cs b/src/Client/LanguageRegistration.cs index 419e8aedd..d01048639 100644 --- a/src/Client/LanguageRegistration.cs +++ b/src/Client/LanguageRegistration.cs @@ -1,5 +1,5 @@ using System; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using OmniSharp.Extensions.JsonRpc; using OmniSharp.Extensions.LanguageServer.Client.Handlers; diff --git a/src/Dap.Protocol/Events/BreakpointEvent.cs b/src/Dap.Protocol/Events/BreakpointEvent.cs index 6b78ee81e..94291e004 100644 --- a/src/Dap.Protocol/Events/BreakpointEvent.cs +++ b/src/Dap.Protocol/Events/BreakpointEvent.cs @@ -1,5 +1,5 @@ using OmniSharp.Extensions.DebugAdapter.Protocol.Models; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.DebugAdapter.Protocol.Events { diff --git a/src/Dap.Protocol/Events/BreakpointExtensions.cs b/src/Dap.Protocol/Events/BreakpointExtensions.cs index 2d314cd4a..305b0060f 100644 --- a/src/Dap.Protocol/Events/BreakpointExtensions.cs +++ b/src/Dap.Protocol/Events/BreakpointExtensions.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 diff --git a/src/Dap.Protocol/Events/CapabilitiesEvent.cs b/src/Dap.Protocol/Events/CapabilitiesEvent.cs index 7c9b058b6..0125055af 100644 --- a/src/Dap.Protocol/Events/CapabilitiesEvent.cs +++ b/src/Dap.Protocol/Events/CapabilitiesEvent.cs @@ -1,5 +1,5 @@ using OmniSharp.Extensions.DebugAdapter.Protocol.Models; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.DebugAdapter.Protocol.Events { diff --git a/src/Dap.Protocol/Events/CapabilitiesExtensions.cs b/src/Dap.Protocol/Events/CapabilitiesExtensions.cs index 35619fda7..a55789b9d 100644 --- a/src/Dap.Protocol/Events/CapabilitiesExtensions.cs +++ b/src/Dap.Protocol/Events/CapabilitiesExtensions.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 diff --git a/src/Dap.Protocol/Events/ContinuedEvent.cs b/src/Dap.Protocol/Events/ContinuedEvent.cs index 3fbf9f28b..b7538b334 100644 --- a/src/Dap.Protocol/Events/ContinuedEvent.cs +++ b/src/Dap.Protocol/Events/ContinuedEvent.cs @@ -1,5 +1,5 @@ using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.DebugAdapter.Protocol.Events { diff --git a/src/Dap.Protocol/Events/ContinuedExtensions.cs b/src/Dap.Protocol/Events/ContinuedExtensions.cs index ef82a1758..2526d3a00 100644 --- a/src/Dap.Protocol/Events/ContinuedExtensions.cs +++ b/src/Dap.Protocol/Events/ContinuedExtensions.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 diff --git a/src/Dap.Protocol/Events/ExitedEvent.cs b/src/Dap.Protocol/Events/ExitedEvent.cs index 28dd98e87..9f4ba0b67 100644 --- a/src/Dap.Protocol/Events/ExitedEvent.cs +++ b/src/Dap.Protocol/Events/ExitedEvent.cs @@ -1,4 +1,4 @@ -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.DebugAdapter.Protocol.Events { diff --git a/src/Dap.Protocol/Events/ExitedExtensions.cs b/src/Dap.Protocol/Events/ExitedExtensions.cs index 84b06c6f7..c15b37e05 100644 --- a/src/Dap.Protocol/Events/ExitedExtensions.cs +++ b/src/Dap.Protocol/Events/ExitedExtensions.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 diff --git a/src/Dap.Protocol/Events/InitializedEvent.cs b/src/Dap.Protocol/Events/InitializedEvent.cs index 8ee8f0b80..ec0b9657c 100644 --- a/src/Dap.Protocol/Events/InitializedEvent.cs +++ b/src/Dap.Protocol/Events/InitializedEvent.cs @@ -1,4 +1,4 @@ -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.DebugAdapter.Protocol.Events { diff --git a/src/Dap.Protocol/Events/InitializedExtensions.cs b/src/Dap.Protocol/Events/InitializedExtensions.cs index ae0a83371..d363ffee7 100644 --- a/src/Dap.Protocol/Events/InitializedExtensions.cs +++ b/src/Dap.Protocol/Events/InitializedExtensions.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 diff --git a/src/Dap.Protocol/Events/LoadedSourceEvent.cs b/src/Dap.Protocol/Events/LoadedSourceEvent.cs index b11c3a88e..2c7627d4c 100644 --- a/src/Dap.Protocol/Events/LoadedSourceEvent.cs +++ b/src/Dap.Protocol/Events/LoadedSourceEvent.cs @@ -1,5 +1,5 @@ using OmniSharp.Extensions.DebugAdapter.Protocol.Models; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.DebugAdapter.Protocol.Events { diff --git a/src/Dap.Protocol/Events/LoadedSourceExtensions.cs b/src/Dap.Protocol/Events/LoadedSourceExtensions.cs index bfd7e5f1d..ab8ba8a03 100644 --- a/src/Dap.Protocol/Events/LoadedSourceExtensions.cs +++ b/src/Dap.Protocol/Events/LoadedSourceExtensions.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 diff --git a/src/Dap.Protocol/Events/ModuleEvent.cs b/src/Dap.Protocol/Events/ModuleEvent.cs index 66bbe4520..083ef9e92 100644 --- a/src/Dap.Protocol/Events/ModuleEvent.cs +++ b/src/Dap.Protocol/Events/ModuleEvent.cs @@ -1,5 +1,5 @@ using OmniSharp.Extensions.DebugAdapter.Protocol.Models; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.DebugAdapter.Protocol.Events { diff --git a/src/Dap.Protocol/Events/ModuleExtensions.cs b/src/Dap.Protocol/Events/ModuleExtensions.cs index a61063cf2..5cd81b7ba 100644 --- a/src/Dap.Protocol/Events/ModuleExtensions.cs +++ b/src/Dap.Protocol/Events/ModuleExtensions.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 diff --git a/src/Dap.Protocol/Events/OutputEvent.cs b/src/Dap.Protocol/Events/OutputEvent.cs index 427879257..aa3185012 100644 --- a/src/Dap.Protocol/Events/OutputEvent.cs +++ b/src/Dap.Protocol/Events/OutputEvent.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json.Linq; using OmniSharp.Extensions.DebugAdapter.Protocol.Models; using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.DebugAdapter.Protocol.Events { diff --git a/src/Dap.Protocol/Events/OutputExtensions.cs b/src/Dap.Protocol/Events/OutputExtensions.cs index d42584e0c..21125bf9c 100644 --- a/src/Dap.Protocol/Events/OutputExtensions.cs +++ b/src/Dap.Protocol/Events/OutputExtensions.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 diff --git a/src/Dap.Protocol/Events/ProcessEvent.cs b/src/Dap.Protocol/Events/ProcessEvent.cs index 96a78c1d0..1bd2a9f7b 100644 --- a/src/Dap.Protocol/Events/ProcessEvent.cs +++ b/src/Dap.Protocol/Events/ProcessEvent.cs @@ -1,5 +1,5 @@ using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.DebugAdapter.Protocol.Events { diff --git a/src/Dap.Protocol/Events/ProcessExtensions.cs b/src/Dap.Protocol/Events/ProcessExtensions.cs index b86003e6f..ac42e7d02 100644 --- a/src/Dap.Protocol/Events/ProcessExtensions.cs +++ b/src/Dap.Protocol/Events/ProcessExtensions.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 diff --git a/src/Dap.Protocol/Events/StoppedEvent.cs b/src/Dap.Protocol/Events/StoppedEvent.cs index 80f5fc25d..e71b3f870 100644 --- a/src/Dap.Protocol/Events/StoppedEvent.cs +++ b/src/Dap.Protocol/Events/StoppedEvent.cs @@ -1,5 +1,5 @@ using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.DebugAdapter.Protocol.Events { diff --git a/src/Dap.Protocol/Events/StoppedExtensions.cs b/src/Dap.Protocol/Events/StoppedExtensions.cs index cd972887d..9d2c0a899 100644 --- a/src/Dap.Protocol/Events/StoppedExtensions.cs +++ b/src/Dap.Protocol/Events/StoppedExtensions.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 diff --git a/src/Dap.Protocol/Events/TerminatedEvent.cs b/src/Dap.Protocol/Events/TerminatedEvent.cs index ec43ecc23..cc572f5cc 100644 --- a/src/Dap.Protocol/Events/TerminatedEvent.cs +++ b/src/Dap.Protocol/Events/TerminatedEvent.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json.Linq; using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.DebugAdapter.Protocol.Events { diff --git a/src/Dap.Protocol/Events/TerminatedExtensions.cs b/src/Dap.Protocol/Events/TerminatedExtensions.cs index 7a99acdee..a265b6fd7 100644 --- a/src/Dap.Protocol/Events/TerminatedExtensions.cs +++ b/src/Dap.Protocol/Events/TerminatedExtensions.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 diff --git a/src/Dap.Protocol/Events/ThreadEvent.cs b/src/Dap.Protocol/Events/ThreadEvent.cs index 1d78e5491..9f35133a6 100644 --- a/src/Dap.Protocol/Events/ThreadEvent.cs +++ b/src/Dap.Protocol/Events/ThreadEvent.cs @@ -1,4 +1,4 @@ -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.DebugAdapter.Protocol.Events { diff --git a/src/Dap.Protocol/Events/ThreadExtensions.cs b/src/Dap.Protocol/Events/ThreadExtensions.cs index d3a5ce214..db141a1be 100644 --- a/src/Dap.Protocol/Events/ThreadExtensions.cs +++ b/src/Dap.Protocol/Events/ThreadExtensions.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 diff --git a/src/Dap.Protocol/Requests/AttachRequestArguments.cs b/src/Dap.Protocol/Requests/AttachRequestArguments.cs index 76667dfe1..dec593656 100644 --- a/src/Dap.Protocol/Requests/AttachRequestArguments.cs +++ b/src/Dap.Protocol/Requests/AttachRequestArguments.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json.Linq; using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.DebugAdapter.Protocol.Requests { diff --git a/src/Dap.Protocol/Requests/CompletionsArguments.cs b/src/Dap.Protocol/Requests/CompletionsArguments.cs index 7371cace0..aa6267861 100644 --- a/src/Dap.Protocol/Requests/CompletionsArguments.cs +++ b/src/Dap.Protocol/Requests/CompletionsArguments.cs @@ -1,5 +1,5 @@ using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.DebugAdapter.Protocol.Requests { diff --git a/src/Dap.Protocol/Requests/ConfigurationDoneArguments.cs b/src/Dap.Protocol/Requests/ConfigurationDoneArguments.cs index b8d09a91e..f3494dae1 100644 --- a/src/Dap.Protocol/Requests/ConfigurationDoneArguments.cs +++ b/src/Dap.Protocol/Requests/ConfigurationDoneArguments.cs @@ -1,4 +1,4 @@ -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.DebugAdapter.Protocol.Requests { diff --git a/src/Dap.Protocol/Requests/ContinueArguments.cs b/src/Dap.Protocol/Requests/ContinueArguments.cs index 598f624d2..43aacb53a 100644 --- a/src/Dap.Protocol/Requests/ContinueArguments.cs +++ b/src/Dap.Protocol/Requests/ContinueArguments.cs @@ -1,4 +1,4 @@ -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.DebugAdapter.Protocol.Requests { diff --git a/src/Dap.Protocol/Requests/DataBreakpointInfoArguments.cs b/src/Dap.Protocol/Requests/DataBreakpointInfoArguments.cs index 1e7f8c88f..347855754 100644 --- a/src/Dap.Protocol/Requests/DataBreakpointInfoArguments.cs +++ b/src/Dap.Protocol/Requests/DataBreakpointInfoArguments.cs @@ -1,5 +1,5 @@ using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.DebugAdapter.Protocol.Requests { diff --git a/src/Dap.Protocol/Requests/DisassembleArguments.cs b/src/Dap.Protocol/Requests/DisassembleArguments.cs index 0397936f6..4490aa2a3 100644 --- a/src/Dap.Protocol/Requests/DisassembleArguments.cs +++ b/src/Dap.Protocol/Requests/DisassembleArguments.cs @@ -1,5 +1,5 @@ using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.DebugAdapter.Protocol.Requests { diff --git a/src/Dap.Protocol/Requests/DisconnectArguments.cs b/src/Dap.Protocol/Requests/DisconnectArguments.cs index da699ae8c..4854bdc4a 100644 --- a/src/Dap.Protocol/Requests/DisconnectArguments.cs +++ b/src/Dap.Protocol/Requests/DisconnectArguments.cs @@ -1,5 +1,5 @@ using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.DebugAdapter.Protocol.Requests { diff --git a/src/Dap.Protocol/Requests/EvaluateArguments.cs b/src/Dap.Protocol/Requests/EvaluateArguments.cs index 252385313..15dd588da 100644 --- a/src/Dap.Protocol/Requests/EvaluateArguments.cs +++ b/src/Dap.Protocol/Requests/EvaluateArguments.cs @@ -1,6 +1,6 @@ using OmniSharp.Extensions.DebugAdapter.Protocol.Models; using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.DebugAdapter.Protocol.Requests { diff --git a/src/Dap.Protocol/Requests/ExceptionInfoArguments.cs b/src/Dap.Protocol/Requests/ExceptionInfoArguments.cs index 195a4bb65..e03671e8f 100644 --- a/src/Dap.Protocol/Requests/ExceptionInfoArguments.cs +++ b/src/Dap.Protocol/Requests/ExceptionInfoArguments.cs @@ -1,4 +1,4 @@ -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.DebugAdapter.Protocol.Requests { diff --git a/src/Dap.Protocol/Requests/GotoArguments.cs b/src/Dap.Protocol/Requests/GotoArguments.cs index 7791ced0a..6494cba29 100644 --- a/src/Dap.Protocol/Requests/GotoArguments.cs +++ b/src/Dap.Protocol/Requests/GotoArguments.cs @@ -1,4 +1,4 @@ -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.DebugAdapter.Protocol.Requests { diff --git a/src/Dap.Protocol/Requests/GotoTargetsArguments.cs b/src/Dap.Protocol/Requests/GotoTargetsArguments.cs index 78881b059..f4e336d1d 100644 --- a/src/Dap.Protocol/Requests/GotoTargetsArguments.cs +++ b/src/Dap.Protocol/Requests/GotoTargetsArguments.cs @@ -1,6 +1,6 @@ using OmniSharp.Extensions.DebugAdapter.Protocol.Models; using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.DebugAdapter.Protocol.Requests { diff --git a/src/Dap.Protocol/Requests/InitializeRequestArguments.cs b/src/Dap.Protocol/Requests/InitializeRequestArguments.cs index 865791233..ba27b64a6 100644 --- a/src/Dap.Protocol/Requests/InitializeRequestArguments.cs +++ b/src/Dap.Protocol/Requests/InitializeRequestArguments.cs @@ -1,5 +1,5 @@ using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.DebugAdapter.Protocol.Requests { diff --git a/src/Dap.Protocol/Requests/LaunchRequestArguments.cs b/src/Dap.Protocol/Requests/LaunchRequestArguments.cs index b724a9330..df78118c6 100644 --- a/src/Dap.Protocol/Requests/LaunchRequestArguments.cs +++ b/src/Dap.Protocol/Requests/LaunchRequestArguments.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json.Linq; using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.DebugAdapter.Protocol.Requests { diff --git a/src/Dap.Protocol/Requests/LoadedSourcesArguments.cs b/src/Dap.Protocol/Requests/LoadedSourcesArguments.cs index 3a98a1ac9..884350eac 100644 --- a/src/Dap.Protocol/Requests/LoadedSourcesArguments.cs +++ b/src/Dap.Protocol/Requests/LoadedSourcesArguments.cs @@ -1,4 +1,4 @@ -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.DebugAdapter.Protocol.Requests { diff --git a/src/Dap.Protocol/Requests/ModulesArguments.cs b/src/Dap.Protocol/Requests/ModulesArguments.cs index 6c58006b1..7ad29c87c 100644 --- a/src/Dap.Protocol/Requests/ModulesArguments.cs +++ b/src/Dap.Protocol/Requests/ModulesArguments.cs @@ -1,5 +1,5 @@ using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.DebugAdapter.Protocol.Requests { diff --git a/src/Dap.Protocol/Requests/NextArguments.cs b/src/Dap.Protocol/Requests/NextArguments.cs index 8005c2ee1..7dbf0de51 100644 --- a/src/Dap.Protocol/Requests/NextArguments.cs +++ b/src/Dap.Protocol/Requests/NextArguments.cs @@ -1,4 +1,4 @@ -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.DebugAdapter.Protocol.Requests { diff --git a/src/Dap.Protocol/Requests/PauseArguments.cs b/src/Dap.Protocol/Requests/PauseArguments.cs index 82bcd937e..93c29c3f7 100644 --- a/src/Dap.Protocol/Requests/PauseArguments.cs +++ b/src/Dap.Protocol/Requests/PauseArguments.cs @@ -1,4 +1,4 @@ -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.DebugAdapter.Protocol.Requests { diff --git a/src/Dap.Protocol/Requests/ReadMemoryArguments.cs b/src/Dap.Protocol/Requests/ReadMemoryArguments.cs index a4cb3d8fa..e249f1669 100644 --- a/src/Dap.Protocol/Requests/ReadMemoryArguments.cs +++ b/src/Dap.Protocol/Requests/ReadMemoryArguments.cs @@ -1,5 +1,5 @@ using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.DebugAdapter.Protocol.Requests { diff --git a/src/Dap.Protocol/Requests/RestartArguments.cs b/src/Dap.Protocol/Requests/RestartArguments.cs index e6f863d68..ed3173838 100644 --- a/src/Dap.Protocol/Requests/RestartArguments.cs +++ b/src/Dap.Protocol/Requests/RestartArguments.cs @@ -1,4 +1,4 @@ -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.DebugAdapter.Protocol.Requests { diff --git a/src/Dap.Protocol/Requests/RestartFrameArguments.cs b/src/Dap.Protocol/Requests/RestartFrameArguments.cs index fdfcb863f..eb5fe9424 100644 --- a/src/Dap.Protocol/Requests/RestartFrameArguments.cs +++ b/src/Dap.Protocol/Requests/RestartFrameArguments.cs @@ -1,4 +1,4 @@ -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.DebugAdapter.Protocol.Requests { diff --git a/src/Dap.Protocol/Requests/ReverseContinueArguments.cs b/src/Dap.Protocol/Requests/ReverseContinueArguments.cs index db9047c27..4717c7521 100644 --- a/src/Dap.Protocol/Requests/ReverseContinueArguments.cs +++ b/src/Dap.Protocol/Requests/ReverseContinueArguments.cs @@ -1,4 +1,4 @@ -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.DebugAdapter.Protocol.Requests { diff --git a/src/Dap.Protocol/Requests/RunInTerminalArguments.cs b/src/Dap.Protocol/Requests/RunInTerminalArguments.cs index 91320f5e8..839b30d69 100644 --- a/src/Dap.Protocol/Requests/RunInTerminalArguments.cs +++ b/src/Dap.Protocol/Requests/RunInTerminalArguments.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using OmniSharp.Extensions.DebugAdapter.Protocol.Models; using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.DebugAdapter.Protocol.Requests { diff --git a/src/Dap.Protocol/Requests/ScopesArguments.cs b/src/Dap.Protocol/Requests/ScopesArguments.cs index 06750db4e..fb760fda7 100644 --- a/src/Dap.Protocol/Requests/ScopesArguments.cs +++ b/src/Dap.Protocol/Requests/ScopesArguments.cs @@ -1,4 +1,4 @@ -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.DebugAdapter.Protocol.Requests { diff --git a/src/Dap.Protocol/Requests/SetBreakpointsArguments.cs b/src/Dap.Protocol/Requests/SetBreakpointsArguments.cs index 63a6e93bc..77f68a2a6 100644 --- a/src/Dap.Protocol/Requests/SetBreakpointsArguments.cs +++ b/src/Dap.Protocol/Requests/SetBreakpointsArguments.cs @@ -1,7 +1,7 @@ using System; using OmniSharp.Extensions.DebugAdapter.Protocol.Models; using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.DebugAdapter.Protocol.Requests { diff --git a/src/Dap.Protocol/Requests/SetDataBreakpointsArguments.cs b/src/Dap.Protocol/Requests/SetDataBreakpointsArguments.cs index ce3dc3d48..31b441a13 100644 --- a/src/Dap.Protocol/Requests/SetDataBreakpointsArguments.cs +++ b/src/Dap.Protocol/Requests/SetDataBreakpointsArguments.cs @@ -1,5 +1,5 @@ using OmniSharp.Extensions.DebugAdapter.Protocol.Models; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.DebugAdapter.Protocol.Requests { diff --git a/src/Dap.Protocol/Requests/SetExceptionBreakpointsArguments.cs b/src/Dap.Protocol/Requests/SetExceptionBreakpointsArguments.cs index 03ba05e07..72c183229 100644 --- a/src/Dap.Protocol/Requests/SetExceptionBreakpointsArguments.cs +++ b/src/Dap.Protocol/Requests/SetExceptionBreakpointsArguments.cs @@ -1,6 +1,6 @@ using OmniSharp.Extensions.DebugAdapter.Protocol.Models; using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.DebugAdapter.Protocol.Requests { diff --git a/src/Dap.Protocol/Requests/SetExpressionArguments.cs b/src/Dap.Protocol/Requests/SetExpressionArguments.cs index 03f046577..4d3d23bed 100644 --- a/src/Dap.Protocol/Requests/SetExpressionArguments.cs +++ b/src/Dap.Protocol/Requests/SetExpressionArguments.cs @@ -1,6 +1,6 @@ using OmniSharp.Extensions.DebugAdapter.Protocol.Models; using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.DebugAdapter.Protocol.Requests { diff --git a/src/Dap.Protocol/Requests/SetFunctionBreakpointsArguments.cs b/src/Dap.Protocol/Requests/SetFunctionBreakpointsArguments.cs index e7b00bd37..bfc4583ba 100644 --- a/src/Dap.Protocol/Requests/SetFunctionBreakpointsArguments.cs +++ b/src/Dap.Protocol/Requests/SetFunctionBreakpointsArguments.cs @@ -1,5 +1,5 @@ using OmniSharp.Extensions.DebugAdapter.Protocol.Models; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.DebugAdapter.Protocol.Requests { diff --git a/src/Dap.Protocol/Requests/SetVariableArguments.cs b/src/Dap.Protocol/Requests/SetVariableArguments.cs index 0600fccd7..2145b0569 100644 --- a/src/Dap.Protocol/Requests/SetVariableArguments.cs +++ b/src/Dap.Protocol/Requests/SetVariableArguments.cs @@ -1,6 +1,6 @@ using OmniSharp.Extensions.DebugAdapter.Protocol.Models; using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.DebugAdapter.Protocol.Requests { diff --git a/src/Dap.Protocol/Requests/SourceArguments.cs b/src/Dap.Protocol/Requests/SourceArguments.cs index cd0170183..e433f754b 100644 --- a/src/Dap.Protocol/Requests/SourceArguments.cs +++ b/src/Dap.Protocol/Requests/SourceArguments.cs @@ -1,6 +1,6 @@ using OmniSharp.Extensions.DebugAdapter.Protocol.Models; using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.DebugAdapter.Protocol.Requests { diff --git a/src/Dap.Protocol/Requests/StackTraceArguments.cs b/src/Dap.Protocol/Requests/StackTraceArguments.cs index 98384d3dd..5373409c5 100644 --- a/src/Dap.Protocol/Requests/StackTraceArguments.cs +++ b/src/Dap.Protocol/Requests/StackTraceArguments.cs @@ -1,6 +1,6 @@ using OmniSharp.Extensions.DebugAdapter.Protocol.Models; using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.DebugAdapter.Protocol.Requests { diff --git a/src/Dap.Protocol/Requests/StepBackArguments.cs b/src/Dap.Protocol/Requests/StepBackArguments.cs index 45e82f241..322a6bfa0 100644 --- a/src/Dap.Protocol/Requests/StepBackArguments.cs +++ b/src/Dap.Protocol/Requests/StepBackArguments.cs @@ -1,4 +1,4 @@ -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.DebugAdapter.Protocol.Requests { diff --git a/src/Dap.Protocol/Requests/StepInArguments.cs b/src/Dap.Protocol/Requests/StepInArguments.cs index 56199d5ca..0deae99f2 100644 --- a/src/Dap.Protocol/Requests/StepInArguments.cs +++ b/src/Dap.Protocol/Requests/StepInArguments.cs @@ -1,5 +1,5 @@ using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.DebugAdapter.Protocol.Requests { diff --git a/src/Dap.Protocol/Requests/StepInTargetsArguments.cs b/src/Dap.Protocol/Requests/StepInTargetsArguments.cs index 42f7f8ab9..065219b6b 100644 --- a/src/Dap.Protocol/Requests/StepInTargetsArguments.cs +++ b/src/Dap.Protocol/Requests/StepInTargetsArguments.cs @@ -1,4 +1,4 @@ -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.DebugAdapter.Protocol.Requests { diff --git a/src/Dap.Protocol/Requests/StepOutArguments.cs b/src/Dap.Protocol/Requests/StepOutArguments.cs index 8d955f5a6..59cdfe424 100644 --- a/src/Dap.Protocol/Requests/StepOutArguments.cs +++ b/src/Dap.Protocol/Requests/StepOutArguments.cs @@ -1,4 +1,4 @@ -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.DebugAdapter.Protocol.Requests { diff --git a/src/Dap.Protocol/Requests/TerminateArguments.cs b/src/Dap.Protocol/Requests/TerminateArguments.cs index 08ce38dae..d3f67bd11 100644 --- a/src/Dap.Protocol/Requests/TerminateArguments.cs +++ b/src/Dap.Protocol/Requests/TerminateArguments.cs @@ -1,5 +1,5 @@ using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.DebugAdapter.Protocol.Requests { diff --git a/src/Dap.Protocol/Requests/TerminateThreadsArguments.cs b/src/Dap.Protocol/Requests/TerminateThreadsArguments.cs index 71945a9e9..5c1878291 100644 --- a/src/Dap.Protocol/Requests/TerminateThreadsArguments.cs +++ b/src/Dap.Protocol/Requests/TerminateThreadsArguments.cs @@ -1,6 +1,6 @@ using OmniSharp.Extensions.DebugAdapter.Protocol.Models; using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.DebugAdapter.Protocol.Requests { diff --git a/src/Dap.Protocol/Requests/ThreadsArguments.cs b/src/Dap.Protocol/Requests/ThreadsArguments.cs index 35f608b89..7e076fe1f 100644 --- a/src/Dap.Protocol/Requests/ThreadsArguments.cs +++ b/src/Dap.Protocol/Requests/ThreadsArguments.cs @@ -1,4 +1,4 @@ -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.DebugAdapter.Protocol.Requests { diff --git a/src/Dap.Protocol/Requests/VariablesArguments.cs b/src/Dap.Protocol/Requests/VariablesArguments.cs index 8050459d5..1fe4b2d60 100644 --- a/src/Dap.Protocol/Requests/VariablesArguments.cs +++ b/src/Dap.Protocol/Requests/VariablesArguments.cs @@ -1,6 +1,6 @@ using OmniSharp.Extensions.DebugAdapter.Protocol.Models; using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.DebugAdapter.Protocol.Requests { diff --git a/src/JsonRpc/CancelParams.cs b/src/JsonRpc/CancelParams.cs index 0f11e0db0..e63fa48d3 100644 --- a/src/JsonRpc/CancelParams.cs +++ b/src/JsonRpc/CancelParams.cs @@ -1,4 +1,4 @@ -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using Newtonsoft.Json; using Newtonsoft.Json.Serialization; diff --git a/src/JsonRpc/CancelRequestHandler.cs b/src/JsonRpc/CancelRequestHandler.cs index 92edfc7a1..4318e3d09 100644 --- a/src/JsonRpc/CancelRequestHandler.cs +++ b/src/JsonRpc/CancelRequestHandler.cs @@ -1,6 +1,6 @@ using System.Threading; using System.Threading.Tasks; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using OmniSharp.Extensions.JsonRpc; namespace OmniSharp.Extensions.JsonRpc diff --git a/src/JsonRpc/DelegatingNotification.cs b/src/JsonRpc/DelegatingNotification.cs index d58ada8c9..489230e94 100644 --- a/src/JsonRpc/DelegatingNotification.cs +++ b/src/JsonRpc/DelegatingNotification.cs @@ -1,4 +1,4 @@ -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.JsonRpc { diff --git a/src/JsonRpc/DelegatingNotificationHandler.cs b/src/JsonRpc/DelegatingNotificationHandler.cs index d64c157d7..4314aa0b0 100644 --- a/src/JsonRpc/DelegatingNotificationHandler.cs +++ b/src/JsonRpc/DelegatingNotificationHandler.cs @@ -1,7 +1,7 @@ using System; using System.Threading; using System.Threading.Tasks; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.JsonRpc { diff --git a/src/JsonRpc/DelegatingRequest.cs b/src/JsonRpc/DelegatingRequest.cs index 396d25280..c0bc8e2a4 100644 --- a/src/JsonRpc/DelegatingRequest.cs +++ b/src/JsonRpc/DelegatingRequest.cs @@ -1,5 +1,5 @@ using Newtonsoft.Json.Linq; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.JsonRpc { diff --git a/src/JsonRpc/EmptyRequest.cs b/src/JsonRpc/EmptyRequest.cs index bc27f5818..ac387d701 100644 --- a/src/JsonRpc/EmptyRequest.cs +++ b/src/JsonRpc/EmptyRequest.cs @@ -1,4 +1,4 @@ -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.JsonRpc { diff --git a/src/JsonRpc/HandlerCollection.cs b/src/JsonRpc/HandlerCollection.cs index d5f6f0e79..f901746b5 100644 --- a/src/JsonRpc/HandlerCollection.cs +++ b/src/JsonRpc/HandlerCollection.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Reactive.Disposables; using System.Reflection; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.JsonRpc { diff --git a/src/JsonRpc/ICancelRequestHandler.cs b/src/JsonRpc/ICancelRequestHandler.cs index 04c22d1ab..3a25583bb 100644 --- a/src/JsonRpc/ICancelRequestHandler.cs +++ b/src/JsonRpc/ICancelRequestHandler.cs @@ -1,7 +1,7 @@ using System; using System.Threading; using System.Threading.Tasks; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using OmniSharp.Extensions.JsonRpc; // ReSharper disable CheckNamespace diff --git a/src/JsonRpc/IJsonRpcHandler.cs b/src/JsonRpc/IJsonRpcHandler.cs index 6bd614882..107745188 100644 --- a/src/JsonRpc/IJsonRpcHandler.cs +++ b/src/JsonRpc/IJsonRpcHandler.cs @@ -1,6 +1,6 @@ using System.Threading; using System.Threading.Tasks; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.JsonRpc { diff --git a/src/JsonRpc/IJsonRpcNotificationHandler.cs b/src/JsonRpc/IJsonRpcNotificationHandler.cs index f0d9c7c19..900408895 100644 --- a/src/JsonRpc/IJsonRpcNotificationHandler.cs +++ b/src/JsonRpc/IJsonRpcNotificationHandler.cs @@ -1,5 +1,5 @@ using System.Threading.Tasks; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.JsonRpc { diff --git a/src/JsonRpc/IJsonRpcRequestHandler.cs b/src/JsonRpc/IJsonRpcRequestHandler.cs index 2ed7af7d0..3dc203785 100644 --- a/src/JsonRpc/IJsonRpcRequestHandler.cs +++ b/src/JsonRpc/IJsonRpcRequestHandler.cs @@ -1,6 +1,6 @@ using System.Threading; using System.Threading.Tasks; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.JsonRpc { diff --git a/src/JsonRpc/JsonRpc.csproj b/src/JsonRpc/JsonRpc.csproj index 5800dd65b..b175f8b7a 100644 --- a/src/JsonRpc/JsonRpc.csproj +++ b/src/JsonRpc/JsonRpc.csproj @@ -13,7 +13,7 @@ - - + + diff --git a/src/JsonRpc/JsonRpcServer.cs b/src/JsonRpc/JsonRpcServer.cs index 92f5dfceb..411ff907a 100644 --- a/src/JsonRpc/JsonRpcServer.cs +++ b/src/JsonRpc/JsonRpcServer.cs @@ -8,7 +8,7 @@ using System.Reflection; using System.Threading; using System.Threading.Tasks; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Extensions.Logging; diff --git a/src/JsonRpc/RequestRouterBase.cs b/src/JsonRpc/RequestRouterBase.cs index 99bf1fc8d..654e00913 100644 --- a/src/JsonRpc/RequestRouterBase.cs +++ b/src/JsonRpc/RequestRouterBase.cs @@ -2,7 +2,7 @@ using System.Reflection; using System.Threading; using System.Threading.Tasks; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using Microsoft.Extensions.DependencyInjection; using OmniSharp.Extensions.JsonRpc.Server; using OmniSharp.Extensions.JsonRpc.Server.Messages; diff --git a/src/JsonRpc/ServiceCollectionExtensions.cs b/src/JsonRpc/ServiceCollectionExtensions.cs index 68dbbf021..0c6fc4e8f 100644 --- a/src/JsonRpc/ServiceCollectionExtensions.cs +++ b/src/JsonRpc/ServiceCollectionExtensions.cs @@ -1,7 +1,9 @@ using System; using System.Collections.Generic; +using System.Linq; using System.Reflection; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; +using MediatR.Registration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; @@ -11,7 +13,8 @@ public static class ServiceCollectionExtensions { public static IServiceCollection AddJsonRpcMediatR(this IServiceCollection services, IEnumerable assemblies) { - services.AddMediatR(assemblies); + ServiceRegistrar.AddRequiredServices(services, new MediatRServiceConfiguration()); + ServiceRegistrar.AddMediatRClasses(services, assemblies); services.AddScoped(); services.RemoveAll(); services.AddScoped( diff --git a/src/Protocol/Client/Client/IRegisterCapabilityHandler.cs b/src/Protocol/Client/Client/IRegisterCapabilityHandler.cs index 7160ead31..c76f93d61 100644 --- a/src/Protocol/Client/Client/IRegisterCapabilityHandler.cs +++ b/src/Protocol/Client/Client/IRegisterCapabilityHandler.cs @@ -1,7 +1,7 @@ using System; using System.Threading; using System.Threading.Tasks; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using OmniSharp.Extensions.JsonRpc; using OmniSharp.Extensions.LanguageServer.Protocol.Models; diff --git a/src/Protocol/Client/Client/IUnregisterCapabilityHandler.cs b/src/Protocol/Client/Client/IUnregisterCapabilityHandler.cs index e0d2c4630..dc02e2c9c 100644 --- a/src/Protocol/Client/Client/IUnregisterCapabilityHandler.cs +++ b/src/Protocol/Client/Client/IUnregisterCapabilityHandler.cs @@ -1,7 +1,7 @@ using System; using System.Threading; using System.Threading.Tasks; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using OmniSharp.Extensions.JsonRpc; using OmniSharp.Extensions.LanguageServer.Protocol.Models; diff --git a/src/Protocol/Document/Client/IPublishDiagnosticsHandler.cs b/src/Protocol/Document/Client/IPublishDiagnosticsHandler.cs index a50185656..1f7bdb42a 100644 --- a/src/Protocol/Document/Client/IPublishDiagnosticsHandler.cs +++ b/src/Protocol/Document/Client/IPublishDiagnosticsHandler.cs @@ -1,7 +1,7 @@ using System; using System.Threading; using System.Threading.Tasks; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using OmniSharp.Extensions.JsonRpc; using OmniSharp.Extensions.LanguageServer.Protocol.Models; diff --git a/src/Protocol/Document/Server/ICodeActionHandler.cs b/src/Protocol/Document/Server/ICodeActionHandler.cs index 7feff5fa2..e4573ade4 100644 --- a/src/Protocol/Document/Server/ICodeActionHandler.cs +++ b/src/Protocol/Document/Server/ICodeActionHandler.cs @@ -1,7 +1,7 @@ using System; using System.Threading; using System.Threading.Tasks; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using OmniSharp.Extensions.JsonRpc; using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities; using OmniSharp.Extensions.LanguageServer.Protocol.Models; diff --git a/src/Protocol/Document/Server/IDidChangeTextDocumentHandler.cs b/src/Protocol/Document/Server/IDidChangeTextDocumentHandler.cs index 7c564a609..9d8610e1c 100644 --- a/src/Protocol/Document/Server/IDidChangeTextDocumentHandler.cs +++ b/src/Protocol/Document/Server/IDidChangeTextDocumentHandler.cs @@ -1,7 +1,7 @@ using System; using System.Threading; using System.Threading.Tasks; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using OmniSharp.Extensions.JsonRpc; using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities; using OmniSharp.Extensions.LanguageServer.Protocol.Models; diff --git a/src/Protocol/Document/Server/IDidCloseTextDocumentHandler.cs b/src/Protocol/Document/Server/IDidCloseTextDocumentHandler.cs index b7e660aa8..bd6bcfa0c 100644 --- a/src/Protocol/Document/Server/IDidCloseTextDocumentHandler.cs +++ b/src/Protocol/Document/Server/IDidCloseTextDocumentHandler.cs @@ -1,7 +1,7 @@ using System; using System.Threading; using System.Threading.Tasks; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using OmniSharp.Extensions.JsonRpc; using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities; using OmniSharp.Extensions.LanguageServer.Protocol.Models; diff --git a/src/Protocol/Document/Server/IDidOpenTextDocumentHandler.cs b/src/Protocol/Document/Server/IDidOpenTextDocumentHandler.cs index b32e76939..8242591ad 100644 --- a/src/Protocol/Document/Server/IDidOpenTextDocumentHandler.cs +++ b/src/Protocol/Document/Server/IDidOpenTextDocumentHandler.cs @@ -1,7 +1,7 @@ using System; using System.Threading; using System.Threading.Tasks; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using OmniSharp.Extensions.JsonRpc; using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities; using OmniSharp.Extensions.LanguageServer.Protocol.Models; diff --git a/src/Protocol/Document/Server/IDidSaveTextDocumentHandler.cs b/src/Protocol/Document/Server/IDidSaveTextDocumentHandler.cs index 085fc02b6..766eafc67 100644 --- a/src/Protocol/Document/Server/IDidSaveTextDocumentHandler.cs +++ b/src/Protocol/Document/Server/IDidSaveTextDocumentHandler.cs @@ -1,7 +1,7 @@ using System; using System.Threading; using System.Threading.Tasks; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using OmniSharp.Extensions.JsonRpc; using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities; using OmniSharp.Extensions.LanguageServer.Protocol.Models; diff --git a/src/Protocol/Document/Server/ITextDocumentSyncHandler.cs b/src/Protocol/Document/Server/ITextDocumentSyncHandler.cs index 61c16996b..a7bb9498a 100644 --- a/src/Protocol/Document/Server/ITextDocumentSyncHandler.cs +++ b/src/Protocol/Document/Server/ITextDocumentSyncHandler.cs @@ -1,7 +1,7 @@ using System; using System.Threading; using System.Threading.Tasks; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities; using OmniSharp.Extensions.LanguageServer.Protocol.Models; using OmniSharp.Extensions.LanguageServer.Protocol.Server.Capabilities; diff --git a/src/Protocol/Document/Server/IWillSaveTextDocumentHandler.cs b/src/Protocol/Document/Server/IWillSaveTextDocumentHandler.cs index 91d3dd0b4..0209a9791 100644 --- a/src/Protocol/Document/Server/IWillSaveTextDocumentHandler.cs +++ b/src/Protocol/Document/Server/IWillSaveTextDocumentHandler.cs @@ -1,7 +1,7 @@ using System; using System.Threading; using System.Threading.Tasks; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using OmniSharp.Extensions.JsonRpc; using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities; using OmniSharp.Extensions.LanguageServer.Protocol.Models; diff --git a/src/Protocol/Document/Server/IWillSaveWaitUntilTextDocumentHandler.cs b/src/Protocol/Document/Server/IWillSaveWaitUntilTextDocumentHandler.cs index be05a288f..849b6ab2f 100644 --- a/src/Protocol/Document/Server/IWillSaveWaitUntilTextDocumentHandler.cs +++ b/src/Protocol/Document/Server/IWillSaveWaitUntilTextDocumentHandler.cs @@ -1,7 +1,7 @@ using System; using System.Threading; using System.Threading.Tasks; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using OmniSharp.Extensions.JsonRpc; using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities; using OmniSharp.Extensions.LanguageServer.Protocol.Models; diff --git a/src/Protocol/General/Client/ShutdownExtensions.cs b/src/Protocol/General/Client/ShutdownExtensions.cs index b6ebf8bf3..7c033675b 100644 --- a/src/Protocol/General/Client/ShutdownExtensions.cs +++ b/src/Protocol/General/Client/ShutdownExtensions.cs @@ -1,5 +1,5 @@ using System.Threading.Tasks; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using OmniSharp.Extensions.LanguageServer.Protocol.Client; // ReSharper disable CheckNamespace diff --git a/src/Protocol/General/Server/IExitHandler.cs b/src/Protocol/General/Server/IExitHandler.cs index ae81ac5da..666109563 100644 --- a/src/Protocol/General/Server/IExitHandler.cs +++ b/src/Protocol/General/Server/IExitHandler.cs @@ -1,7 +1,7 @@ using System; using System.Threading; using System.Threading.Tasks; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using OmniSharp.Extensions.JsonRpc; using OmniSharp.Extensions.LanguageServer.Protocol.Server; diff --git a/src/Protocol/General/Server/IInitializeHandler.cs b/src/Protocol/General/Server/IInitializeHandler.cs index a9a723562..4c90fcbbf 100644 --- a/src/Protocol/General/Server/IInitializeHandler.cs +++ b/src/Protocol/General/Server/IInitializeHandler.cs @@ -1,7 +1,7 @@ using System; using System.Threading; using System.Threading.Tasks; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using OmniSharp.Extensions.JsonRpc; using OmniSharp.Extensions.LanguageServer.Protocol.Models; diff --git a/src/Protocol/General/Server/IInitializedHandler.cs b/src/Protocol/General/Server/IInitializedHandler.cs index aefbc3fdd..c70346eee 100644 --- a/src/Protocol/General/Server/IInitializedHandler.cs +++ b/src/Protocol/General/Server/IInitializedHandler.cs @@ -1,7 +1,7 @@ using System; using System.Threading; using System.Threading.Tasks; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using OmniSharp.Extensions.JsonRpc; using OmniSharp.Extensions.LanguageServer.Protocol.Models; // ReSharper disable CheckNamespace diff --git a/src/Protocol/General/Server/IShutdownHandler.cs b/src/Protocol/General/Server/IShutdownHandler.cs index 640bade9d..fbbe4b2a7 100644 --- a/src/Protocol/General/Server/IShutdownHandler.cs +++ b/src/Protocol/General/Server/IShutdownHandler.cs @@ -1,7 +1,7 @@ using System; using System.Threading; using System.Threading.Tasks; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using OmniSharp.Extensions.JsonRpc; using OmniSharp.Extensions.LanguageServer.Protocol.Models; diff --git a/src/Protocol/Models/ApplyWorkspaceEditParams.cs b/src/Protocol/Models/ApplyWorkspaceEditParams.cs index 5a141e4ef..ab6decdba 100644 --- a/src/Protocol/Models/ApplyWorkspaceEditParams.cs +++ b/src/Protocol/Models/ApplyWorkspaceEditParams.cs @@ -1,4 +1,4 @@ -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using Newtonsoft.Json; using Newtonsoft.Json.Serialization; using OmniSharp.Extensions.LanguageServer.Protocol.Serialization; diff --git a/src/Protocol/Models/CodeActionParams.cs b/src/Protocol/Models/CodeActionParams.cs index f334c411b..b213b3659 100644 --- a/src/Protocol/Models/CodeActionParams.cs +++ b/src/Protocol/Models/CodeActionParams.cs @@ -1,4 +1,4 @@ -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using Newtonsoft.Json; using Newtonsoft.Json.Serialization; diff --git a/src/Protocol/Models/CodeLens.cs b/src/Protocol/Models/CodeLens.cs index b496d4dd0..9d37c4210 100644 --- a/src/Protocol/Models/CodeLens.cs +++ b/src/Protocol/Models/CodeLens.cs @@ -1,4 +1,4 @@ -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using Newtonsoft.Json.Serialization; diff --git a/src/Protocol/Models/CodeLensParams.cs b/src/Protocol/Models/CodeLensParams.cs index 0ccd08865..1e3622b24 100644 --- a/src/Protocol/Models/CodeLensParams.cs +++ b/src/Protocol/Models/CodeLensParams.cs @@ -1,4 +1,4 @@ -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using Newtonsoft.Json; using Newtonsoft.Json.Serialization; diff --git a/src/Protocol/Models/ColorPresentationParams.cs b/src/Protocol/Models/ColorPresentationParams.cs index c559d0155..438dd5ffa 100644 --- a/src/Protocol/Models/ColorPresentationParams.cs +++ b/src/Protocol/Models/ColorPresentationParams.cs @@ -1,4 +1,4 @@ -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { diff --git a/src/Protocol/Models/CompletionItem.cs b/src/Protocol/Models/CompletionItem.cs index c16cc8278..468223bd0 100644 --- a/src/Protocol/Models/CompletionItem.cs +++ b/src/Protocol/Models/CompletionItem.cs @@ -1,4 +1,4 @@ -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using Newtonsoft.Json.Serialization; diff --git a/src/Protocol/Models/CompletionParams.cs b/src/Protocol/Models/CompletionParams.cs index 83fbc77b8..39219aa19 100644 --- a/src/Protocol/Models/CompletionParams.cs +++ b/src/Protocol/Models/CompletionParams.cs @@ -1,4 +1,4 @@ -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using Newtonsoft.Json; using Newtonsoft.Json.Serialization; using OmniSharp.Extensions.LanguageServer.Protocol.Serialization; diff --git a/src/Protocol/Models/ConfigurationParams.cs b/src/Protocol/Models/ConfigurationParams.cs index 389586e29..11d4e57a9 100644 --- a/src/Protocol/Models/ConfigurationParams.cs +++ b/src/Protocol/Models/ConfigurationParams.cs @@ -1,4 +1,4 @@ -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using Newtonsoft.Json.Linq; namespace OmniSharp.Extensions.LanguageServer.Protocol.Models diff --git a/src/Protocol/Models/DeclarationParams.cs b/src/Protocol/Models/DeclarationParams.cs index fbd4e9b35..5b1ef2cd3 100644 --- a/src/Protocol/Models/DeclarationParams.cs +++ b/src/Protocol/Models/DeclarationParams.cs @@ -1,4 +1,4 @@ -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { diff --git a/src/Protocol/Models/DefinitionParams.cs b/src/Protocol/Models/DefinitionParams.cs index a3364358f..546ffa572 100644 --- a/src/Protocol/Models/DefinitionParams.cs +++ b/src/Protocol/Models/DefinitionParams.cs @@ -1,4 +1,4 @@ -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { diff --git a/src/Protocol/Models/DidChangeConfigurationParams.cs b/src/Protocol/Models/DidChangeConfigurationParams.cs index fd16d4f8a..24f42b938 100644 --- a/src/Protocol/Models/DidChangeConfigurationParams.cs +++ b/src/Protocol/Models/DidChangeConfigurationParams.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using Newtonsoft.Json; using Newtonsoft.Json.Serialization; using Newtonsoft.Json.Linq; diff --git a/src/Protocol/Models/DidChangeTextDocumentParams.cs b/src/Protocol/Models/DidChangeTextDocumentParams.cs index 928fc0ca1..2fdb34527 100644 --- a/src/Protocol/Models/DidChangeTextDocumentParams.cs +++ b/src/Protocol/Models/DidChangeTextDocumentParams.cs @@ -1,4 +1,4 @@ -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using Newtonsoft.Json; using Newtonsoft.Json.Serialization; diff --git a/src/Protocol/Models/DidChangeWatchedFilesParams.cs b/src/Protocol/Models/DidChangeWatchedFilesParams.cs index 5c4daa947..5ee68254f 100644 --- a/src/Protocol/Models/DidChangeWatchedFilesParams.cs +++ b/src/Protocol/Models/DidChangeWatchedFilesParams.cs @@ -1,4 +1,4 @@ -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using Newtonsoft.Json; using Newtonsoft.Json.Serialization; diff --git a/src/Protocol/Models/DidChangeWorkspaceFoldersParams.cs b/src/Protocol/Models/DidChangeWorkspaceFoldersParams.cs index 0bcf74b60..5e3ce668f 100644 --- a/src/Protocol/Models/DidChangeWorkspaceFoldersParams.cs +++ b/src/Protocol/Models/DidChangeWorkspaceFoldersParams.cs @@ -1,4 +1,4 @@ -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { diff --git a/src/Protocol/Models/DidCloseTextDocumentParams.cs b/src/Protocol/Models/DidCloseTextDocumentParams.cs index aab3fad27..31ddc5297 100644 --- a/src/Protocol/Models/DidCloseTextDocumentParams.cs +++ b/src/Protocol/Models/DidCloseTextDocumentParams.cs @@ -1,4 +1,4 @@ -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using Newtonsoft.Json; using Newtonsoft.Json.Serialization; diff --git a/src/Protocol/Models/DidOpenTextDocumentParams.cs b/src/Protocol/Models/DidOpenTextDocumentParams.cs index b9d676614..2c139a1be 100644 --- a/src/Protocol/Models/DidOpenTextDocumentParams.cs +++ b/src/Protocol/Models/DidOpenTextDocumentParams.cs @@ -1,4 +1,4 @@ -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using Newtonsoft.Json; using Newtonsoft.Json.Serialization; diff --git a/src/Protocol/Models/DidSaveTextDocumentParams.cs b/src/Protocol/Models/DidSaveTextDocumentParams.cs index 7bb580563..b99969a7d 100644 --- a/src/Protocol/Models/DidSaveTextDocumentParams.cs +++ b/src/Protocol/Models/DidSaveTextDocumentParams.cs @@ -1,4 +1,4 @@ -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using Newtonsoft.Json; using Newtonsoft.Json.Serialization; using OmniSharp.Extensions.LanguageServer.Protocol.Serialization; diff --git a/src/Protocol/Models/DocumentColorParams.cs b/src/Protocol/Models/DocumentColorParams.cs index 8c86ca5c3..3e465c442 100644 --- a/src/Protocol/Models/DocumentColorParams.cs +++ b/src/Protocol/Models/DocumentColorParams.cs @@ -1,4 +1,4 @@ -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { diff --git a/src/Protocol/Models/DocumentFormattingParams.cs b/src/Protocol/Models/DocumentFormattingParams.cs index 38de71ac3..d983e3a31 100644 --- a/src/Protocol/Models/DocumentFormattingParams.cs +++ b/src/Protocol/Models/DocumentFormattingParams.cs @@ -1,4 +1,4 @@ -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using Newtonsoft.Json; using Newtonsoft.Json.Serialization; diff --git a/src/Protocol/Models/DocumentHighlightParams.cs b/src/Protocol/Models/DocumentHighlightParams.cs index 143be52d9..2c773aabe 100644 --- a/src/Protocol/Models/DocumentHighlightParams.cs +++ b/src/Protocol/Models/DocumentHighlightParams.cs @@ -1,4 +1,4 @@ -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { @@ -6,4 +6,4 @@ public class DocumentHighlightParams : TextDocumentPositionParams, IRequest { } -} \ No newline at end of file +} diff --git a/src/Protocol/Models/ICanBeResolvedHandler.cs b/src/Protocol/Models/ICanBeResolvedHandler.cs index 817f9ac66..d4085b0ed 100644 --- a/src/Protocol/Models/ICanBeResolvedHandler.cs +++ b/src/Protocol/Models/ICanBeResolvedHandler.cs @@ -1,4 +1,4 @@ -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using OmniSharp.Extensions.JsonRpc; namespace OmniSharp.Extensions.LanguageServer.Protocol.Models diff --git a/src/Protocol/Models/ImplementationParams.cs b/src/Protocol/Models/ImplementationParams.cs index 50c0d2372..563fc8776 100644 --- a/src/Protocol/Models/ImplementationParams.cs +++ b/src/Protocol/Models/ImplementationParams.cs @@ -1,4 +1,4 @@ -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { diff --git a/src/Protocol/Models/InitializeParams.cs b/src/Protocol/Models/InitializeParams.cs index 752b87e79..1630a3e89 100644 --- a/src/Protocol/Models/InitializeParams.cs +++ b/src/Protocol/Models/InitializeParams.cs @@ -1,5 +1,5 @@ using System; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using Newtonsoft.Json; using Newtonsoft.Json.Serialization; using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities; diff --git a/src/Protocol/Models/InitializedParams.cs b/src/Protocol/Models/InitializedParams.cs index fcb03a579..1ff4dc5ee 100644 --- a/src/Protocol/Models/InitializedParams.cs +++ b/src/Protocol/Models/InitializedParams.cs @@ -1,5 +1,5 @@ using System; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using Newtonsoft.Json; using Newtonsoft.Json.Serialization; using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities; diff --git a/src/Protocol/Models/LogMessageParams.cs b/src/Protocol/Models/LogMessageParams.cs index e17fee26f..c5691d4e4 100644 --- a/src/Protocol/Models/LogMessageParams.cs +++ b/src/Protocol/Models/LogMessageParams.cs @@ -1,4 +1,4 @@ -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using Newtonsoft.Json; using Newtonsoft.Json.Serialization; diff --git a/src/Protocol/Models/PrepareRenameParams.cs b/src/Protocol/Models/PrepareRenameParams.cs index d124facf2..cd78c91f9 100644 --- a/src/Protocol/Models/PrepareRenameParams.cs +++ b/src/Protocol/Models/PrepareRenameParams.cs @@ -1,4 +1,4 @@ -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { diff --git a/src/Protocol/Models/PublishDiagnosticsParams.cs b/src/Protocol/Models/PublishDiagnosticsParams.cs index b089c7188..302319f54 100644 --- a/src/Protocol/Models/PublishDiagnosticsParams.cs +++ b/src/Protocol/Models/PublishDiagnosticsParams.cs @@ -1,5 +1,5 @@ using System; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using Newtonsoft.Json; using Newtonsoft.Json.Serialization; using OmniSharp.Extensions.LanguageServer.Protocol.Serialization.Converters; diff --git a/src/Protocol/Models/ReferenceParams.cs b/src/Protocol/Models/ReferenceParams.cs index 73cafb775..cf0e53bd1 100644 --- a/src/Protocol/Models/ReferenceParams.cs +++ b/src/Protocol/Models/ReferenceParams.cs @@ -1,4 +1,4 @@ -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using Newtonsoft.Json; using Newtonsoft.Json.Serialization; diff --git a/src/Protocol/Models/RegistrationParams.cs b/src/Protocol/Models/RegistrationParams.cs index 667f169a6..fe8a2c553 100644 --- a/src/Protocol/Models/RegistrationParams.cs +++ b/src/Protocol/Models/RegistrationParams.cs @@ -1,4 +1,4 @@ -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using Newtonsoft.Json; using Newtonsoft.Json.Serialization; diff --git a/src/Protocol/Models/RenameParams.cs b/src/Protocol/Models/RenameParams.cs index 46131137a..a3d70e961 100644 --- a/src/Protocol/Models/RenameParams.cs +++ b/src/Protocol/Models/RenameParams.cs @@ -1,4 +1,4 @@ -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using Newtonsoft.Json; using Newtonsoft.Json.Serialization; diff --git a/src/Protocol/Models/ShowMessageParams.cs b/src/Protocol/Models/ShowMessageParams.cs index b74c886ce..a6f650a24 100644 --- a/src/Protocol/Models/ShowMessageParams.cs +++ b/src/Protocol/Models/ShowMessageParams.cs @@ -1,4 +1,4 @@ -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using Newtonsoft.Json; using Newtonsoft.Json.Serialization; diff --git a/src/Protocol/Models/ShowMessageRequestParams.cs b/src/Protocol/Models/ShowMessageRequestParams.cs index 921ed1b40..f9612ee1a 100644 --- a/src/Protocol/Models/ShowMessageRequestParams.cs +++ b/src/Protocol/Models/ShowMessageRequestParams.cs @@ -1,4 +1,4 @@ -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using Newtonsoft.Json; using Newtonsoft.Json.Serialization; using OmniSharp.Extensions.LanguageServer.Protocol.Serialization; diff --git a/src/Protocol/Models/ShutdownParams.cs b/src/Protocol/Models/ShutdownParams.cs index 0946491fd..5ef2d70ee 100644 --- a/src/Protocol/Models/ShutdownParams.cs +++ b/src/Protocol/Models/ShutdownParams.cs @@ -1,4 +1,4 @@ -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { @@ -6,4 +6,4 @@ public class ShutdownParams : IRequest { } -} \ No newline at end of file +} diff --git a/src/Protocol/Models/SignatureHelpParams.cs b/src/Protocol/Models/SignatureHelpParams.cs index 7574251b5..3f884459b 100644 --- a/src/Protocol/Models/SignatureHelpParams.cs +++ b/src/Protocol/Models/SignatureHelpParams.cs @@ -1,6 +1,6 @@ -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { public class SignatureHelpParams : TextDocumentPositionParams, IRequest { } -} \ No newline at end of file +} diff --git a/src/Protocol/Models/TypeDefinitionParams.cs b/src/Protocol/Models/TypeDefinitionParams.cs index ebc2e337f..83e83b930 100644 --- a/src/Protocol/Models/TypeDefinitionParams.cs +++ b/src/Protocol/Models/TypeDefinitionParams.cs @@ -1,4 +1,4 @@ -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { diff --git a/src/Protocol/Models/UnregistrationParams.cs b/src/Protocol/Models/UnregistrationParams.cs index 54348de3f..f343bbd0c 100644 --- a/src/Protocol/Models/UnregistrationParams.cs +++ b/src/Protocol/Models/UnregistrationParams.cs @@ -1,4 +1,4 @@ -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using Newtonsoft.Json; using Newtonsoft.Json.Serialization; diff --git a/src/Protocol/Models/WillSaveTextDocumentParams.cs b/src/Protocol/Models/WillSaveTextDocumentParams.cs index 44030df5c..033c6a3a6 100644 --- a/src/Protocol/Models/WillSaveTextDocumentParams.cs +++ b/src/Protocol/Models/WillSaveTextDocumentParams.cs @@ -1,4 +1,4 @@ -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using Newtonsoft.Json; using Newtonsoft.Json.Serialization; diff --git a/src/Protocol/Models/WillSaveWaitUntilTextDocumentParams.cs b/src/Protocol/Models/WillSaveWaitUntilTextDocumentParams.cs index 316ddcc10..0d6bc17ff 100644 --- a/src/Protocol/Models/WillSaveWaitUntilTextDocumentParams.cs +++ b/src/Protocol/Models/WillSaveWaitUntilTextDocumentParams.cs @@ -1,4 +1,4 @@ -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { diff --git a/src/Protocol/Models/WorkspaceFolderParams.cs b/src/Protocol/Models/WorkspaceFolderParams.cs index db22b2094..d5c04836e 100644 --- a/src/Protocol/Models/WorkspaceFolderParams.cs +++ b/src/Protocol/Models/WorkspaceFolderParams.cs @@ -1,4 +1,4 @@ -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { diff --git a/src/Protocol/Models/WorkspaceSymbolParams.cs b/src/Protocol/Models/WorkspaceSymbolParams.cs index 1204ee67c..5a05a3007 100644 --- a/src/Protocol/Models/WorkspaceSymbolParams.cs +++ b/src/Protocol/Models/WorkspaceSymbolParams.cs @@ -1,4 +1,4 @@ -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using Newtonsoft.Json; using Newtonsoft.Json.Serialization; diff --git a/src/Protocol/Window/Client/TelemetryEventParams.cs b/src/Protocol/Window/Client/TelemetryEventParams.cs index f4f539f05..b9a93eaa8 100644 --- a/src/Protocol/Window/Client/TelemetryEventParams.cs +++ b/src/Protocol/Window/Client/TelemetryEventParams.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using Newtonsoft.Json; using Newtonsoft.Json.Linq; diff --git a/src/Protocol/Workspace/Server/IDidChangeConfigurationHandler.cs b/src/Protocol/Workspace/Server/IDidChangeConfigurationHandler.cs index a65336a3b..fa67c4ff5 100644 --- a/src/Protocol/Workspace/Server/IDidChangeConfigurationHandler.cs +++ b/src/Protocol/Workspace/Server/IDidChangeConfigurationHandler.cs @@ -2,7 +2,7 @@ using System.Threading; using System.Threading.Tasks; using Newtonsoft.Json.Linq; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using OmniSharp.Extensions.JsonRpc; using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities; using OmniSharp.Extensions.LanguageServer.Protocol.Models; diff --git a/src/Protocol/Workspace/Server/IDidChangeWatchedFilesHandler.cs b/src/Protocol/Workspace/Server/IDidChangeWatchedFilesHandler.cs index 34712f95e..7e22a5e2e 100644 --- a/src/Protocol/Workspace/Server/IDidChangeWatchedFilesHandler.cs +++ b/src/Protocol/Workspace/Server/IDidChangeWatchedFilesHandler.cs @@ -1,7 +1,7 @@ using System; using System.Threading; using System.Threading.Tasks; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using OmniSharp.Extensions.JsonRpc; using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities; using OmniSharp.Extensions.LanguageServer.Protocol.Models; diff --git a/src/Protocol/Workspace/Server/IDidChangeWorkspaceFoldersHandler.cs b/src/Protocol/Workspace/Server/IDidChangeWorkspaceFoldersHandler.cs index abc6b23ef..1c7fea603 100644 --- a/src/Protocol/Workspace/Server/IDidChangeWorkspaceFoldersHandler.cs +++ b/src/Protocol/Workspace/Server/IDidChangeWorkspaceFoldersHandler.cs @@ -2,7 +2,7 @@ using OmniSharp.Extensions.LanguageServer.Protocol.Models; using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities; using System.Threading.Tasks; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using System.Threading; using System; diff --git a/src/Protocol/Workspace/Server/IExecuteCommandHandler.cs b/src/Protocol/Workspace/Server/IExecuteCommandHandler.cs index 4b251e607..72e332997 100644 --- a/src/Protocol/Workspace/Server/IExecuteCommandHandler.cs +++ b/src/Protocol/Workspace/Server/IExecuteCommandHandler.cs @@ -1,7 +1,7 @@ using System; using System.Threading; using System.Threading.Tasks; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using OmniSharp.Extensions.JsonRpc; using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities; using OmniSharp.Extensions.LanguageServer.Protocol.Models; diff --git a/src/Server/HandlerDescriptor.cs b/src/Server/HandlerDescriptor.cs index 044c64e6e..b86a19c55 100644 --- a/src/Server/HandlerDescriptor.cs +++ b/src/Server/HandlerDescriptor.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using OmniSharp.Extensions.JsonRpc; using OmniSharp.Extensions.LanguageServer.Protocol; using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities; diff --git a/src/Server/Handlers/ExitHandler.cs b/src/Server/Handlers/ExitHandler.cs index f752c2399..34f8000b9 100644 --- a/src/Server/Handlers/ExitHandler.cs +++ b/src/Server/Handlers/ExitHandler.cs @@ -3,7 +3,7 @@ using System.Reactive.Threading.Tasks; using System.Threading; using System.Threading.Tasks; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using OmniSharp.Extensions.JsonRpc; using OmniSharp.Extensions.LanguageServer.Protocol; using OmniSharp.Extensions.LanguageServer.Protocol.Server; diff --git a/src/Server/Handlers/ShutdownHandler.cs b/src/Server/Handlers/ShutdownHandler.cs index ee6623cd8..96fe14d24 100644 --- a/src/Server/Handlers/ShutdownHandler.cs +++ b/src/Server/Handlers/ShutdownHandler.cs @@ -4,7 +4,7 @@ using System.Reactive.Threading.Tasks; using System.Threading; using System.Threading.Tasks; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using OmniSharp.Extensions.JsonRpc; using OmniSharp.Extensions.LanguageServer.Protocol; using OmniSharp.Extensions.LanguageServer.Protocol.Server; diff --git a/src/Server/LanguageServer.cs b/src/Server/LanguageServer.cs index ff5c23246..389f746ac 100644 --- a/src/Server/LanguageServer.cs +++ b/src/Server/LanguageServer.cs @@ -8,7 +8,7 @@ using System.Reflection; using System.Threading; using System.Threading.Tasks; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Extensions.Logging; diff --git a/src/Server/LspRequestRouter.cs b/src/Server/LspRequestRouter.cs index aeef58772..6f42ca755 100644 --- a/src/Server/LspRequestRouter.cs +++ b/src/Server/LspRequestRouter.cs @@ -5,7 +5,7 @@ using System.Reflection; using System.Threading; using System.Threading.Tasks; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Newtonsoft.Json.Linq; diff --git a/src/Server/Matchers/ResolveCommandMatcher.cs b/src/Server/Matchers/ResolveCommandMatcher.cs index bc05db791..f8dd69d9f 100644 --- a/src/Server/Matchers/ResolveCommandMatcher.cs +++ b/src/Server/Matchers/ResolveCommandMatcher.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Newtonsoft.Json.Linq; diff --git a/src/Server/Pipelines/ResolveCommandPipeline.cs b/src/Server/Pipelines/ResolveCommandPipeline.cs index b444e21f1..94ac85058 100644 --- a/src/Server/Pipelines/ResolveCommandPipeline.cs +++ b/src/Server/Pipelines/ResolveCommandPipeline.cs @@ -2,7 +2,7 @@ using System.Reflection; using System.Threading; using System.Threading.Tasks; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using Microsoft.Extensions.Logging; using Newtonsoft.Json.Linq; using OmniSharp.Extensions.JsonRpc; diff --git a/submodules/MediatR b/submodules/MediatR deleted file mode 160000 index ff4f387e8..000000000 --- a/submodules/MediatR +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ff4f387e869f3b52a80c740490e8187878f300d5 diff --git a/submodules/MediatR.Extensions.Microsoft.DependencyInjection b/submodules/MediatR.Extensions.Microsoft.DependencyInjection deleted file mode 160000 index c0defbceb..000000000 --- a/submodules/MediatR.Extensions.Microsoft.DependencyInjection +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c0defbceb2050115781be1ce4c3a7d9dfc07443d diff --git a/test/JsonRpc.Tests/AutoNSubstitute/NSubstituteRegistrationHandler.cs b/test/JsonRpc.Tests/AutoNSubstitute/NSubstituteRegistrationHandler.cs index d395d292a..9d4088c98 100644 --- a/test/JsonRpc.Tests/AutoNSubstitute/NSubstituteRegistrationHandler.cs +++ b/test/JsonRpc.Tests/AutoNSubstitute/NSubstituteRegistrationHandler.cs @@ -4,7 +4,7 @@ using Autofac; using Autofac.Builder; using Autofac.Core; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; // ReSharper disable once CheckNamespace namespace NSubstitute diff --git a/test/JsonRpc.Tests/HandlerResolverTests.cs b/test/JsonRpc.Tests/HandlerResolverTests.cs index d11b82be3..b0d13582b 100644 --- a/test/JsonRpc.Tests/HandlerResolverTests.cs +++ b/test/JsonRpc.Tests/HandlerResolverTests.cs @@ -5,7 +5,7 @@ using System.Threading.Tasks; using FluentAssertions; using FluentAssertions.Common; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using NSubstitute; using OmniSharp.Extensions.JsonRpc; using Xunit; diff --git a/test/JsonRpc.Tests/MediatorTestsNotificationHandler.cs b/test/JsonRpc.Tests/MediatorTestsNotificationHandler.cs index 9c830fe16..55f7c2b25 100644 --- a/test/JsonRpc.Tests/MediatorTestsNotificationHandler.cs +++ b/test/JsonRpc.Tests/MediatorTestsNotificationHandler.cs @@ -3,7 +3,7 @@ using System.Reflection; using System.Threading; using System.Threading.Tasks; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using Microsoft.Extensions.DependencyInjection; using NSubstitute; using OmniSharp.Extensions.JsonRpc; diff --git a/test/JsonRpc.Tests/MediatorTestsNotificationHandlerOfT.cs b/test/JsonRpc.Tests/MediatorTestsNotificationHandlerOfT.cs index f4cde5d29..9184a1f3f 100644 --- a/test/JsonRpc.Tests/MediatorTestsNotificationHandlerOfT.cs +++ b/test/JsonRpc.Tests/MediatorTestsNotificationHandlerOfT.cs @@ -2,7 +2,7 @@ using System.Reflection; using System.Threading; using System.Threading.Tasks; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using Microsoft.Extensions.DependencyInjection; using Newtonsoft.Json; using Newtonsoft.Json.Linq; diff --git a/test/JsonRpc.Tests/MediatorTestsRequestHandlerOfTRequest.cs b/test/JsonRpc.Tests/MediatorTestsRequestHandlerOfTRequest.cs index 0173c288e..da4efbccc 100644 --- a/test/JsonRpc.Tests/MediatorTestsRequestHandlerOfTRequest.cs +++ b/test/JsonRpc.Tests/MediatorTestsRequestHandlerOfTRequest.cs @@ -3,7 +3,7 @@ using System.Threading; using System.Threading.Tasks; using FluentAssertions; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using Microsoft.Extensions.DependencyInjection; using Newtonsoft.Json; using Newtonsoft.Json.Linq; diff --git a/test/JsonRpc.Tests/MediatorTestsRequestHandlerOfTRequestTResponse.cs b/test/JsonRpc.Tests/MediatorTestsRequestHandlerOfTRequestTResponse.cs index 5dd5a6be9..7a825e9a0 100644 --- a/test/JsonRpc.Tests/MediatorTestsRequestHandlerOfTRequestTResponse.cs +++ b/test/JsonRpc.Tests/MediatorTestsRequestHandlerOfTRequestTResponse.cs @@ -5,7 +5,7 @@ using System.Threading; using System.Threading.Tasks; using FluentAssertions; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using Microsoft.Extensions.DependencyInjection; using Newtonsoft.Json; using Newtonsoft.Json.Linq; diff --git a/test/JsonRpc.Tests/RequestRouterTests.cs b/test/JsonRpc.Tests/RequestRouterTests.cs index 26f0352de..ac9216029 100644 --- a/test/JsonRpc.Tests/RequestRouterTests.cs +++ b/test/JsonRpc.Tests/RequestRouterTests.cs @@ -4,7 +4,7 @@ using System.Text; using System.Threading; using System.Threading.Tasks; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Newtonsoft.Json; diff --git a/test/Lsp.Tests/ExecuteCommandSyncHandlerExtensions.cs b/test/Lsp.Tests/ExecuteCommandSyncHandlerExtensions.cs index 57f17e299..8d297a508 100644 --- a/test/Lsp.Tests/ExecuteCommandSyncHandlerExtensions.cs +++ b/test/Lsp.Tests/ExecuteCommandSyncHandlerExtensions.cs @@ -4,7 +4,7 @@ using System.Text; using System.Threading; using System.Threading.Tasks; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using NSubstitute; using OmniSharp.Extensions.LanguageServer.Protocol; using OmniSharp.Extensions.LanguageServer.Protocol.Models; diff --git a/test/Lsp.Tests/HandlerResolverTests.cs b/test/Lsp.Tests/HandlerResolverTests.cs index fb460e5ed..d089bf6c7 100644 --- a/test/Lsp.Tests/HandlerResolverTests.cs +++ b/test/Lsp.Tests/HandlerResolverTests.cs @@ -12,7 +12,7 @@ using Xunit; using HandlerCollection = OmniSharp.Extensions.LanguageServer.Server.HandlerCollection; using System.Collections.Generic; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using OmniSharp.Extensions.LanguageServer.Protocol.Server; using OmniSharp.Extensions.LanguageServer.Server; diff --git a/test/Lsp.Tests/LanguageServerTests.cs b/test/Lsp.Tests/LanguageServerTests.cs index 1b9231ec3..b3d24ca48 100644 --- a/test/Lsp.Tests/LanguageServerTests.cs +++ b/test/Lsp.Tests/LanguageServerTests.cs @@ -5,7 +5,7 @@ using FluentAssertions; using Microsoft.Extensions.Logging; using NSubstitute; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using OmniSharp.Extensions.LanguageServer.Client; using OmniSharp.Extensions.LanguageServer.Client.Processes; using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities; diff --git a/test/Lsp.Tests/LspRequestRouterTests.cs b/test/Lsp.Tests/LspRequestRouterTests.cs index fad180d4c..dd2a9307f 100644 --- a/test/Lsp.Tests/LspRequestRouterTests.cs +++ b/test/Lsp.Tests/LspRequestRouterTests.cs @@ -4,7 +4,7 @@ using System.Text; using System.Threading; using System.Threading.Tasks; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Newtonsoft.Json; diff --git a/test/Lsp.Tests/MediatorTestsRequestHandlerOfTRequest.cs b/test/Lsp.Tests/MediatorTestsRequestHandlerOfTRequest.cs index 5cbc6cae4..da6448bb6 100644 --- a/test/Lsp.Tests/MediatorTestsRequestHandlerOfTRequest.cs +++ b/test/Lsp.Tests/MediatorTestsRequestHandlerOfTRequest.cs @@ -4,7 +4,7 @@ using System.Threading; using System.Threading.Tasks; using FluentAssertions; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using Microsoft.Extensions.DependencyInjection; using OmniSharp.Extensions.LanguageServer.Protocol; using Newtonsoft.Json; diff --git a/test/Lsp.Tests/MediatorTestsRequestHandlerOfTRequestTResponse.cs b/test/Lsp.Tests/MediatorTestsRequestHandlerOfTRequestTResponse.cs index 43dc921c2..695ce127a 100644 --- a/test/Lsp.Tests/MediatorTestsRequestHandlerOfTRequestTResponse.cs +++ b/test/Lsp.Tests/MediatorTestsRequestHandlerOfTRequestTResponse.cs @@ -5,7 +5,7 @@ using System.Threading; using System.Threading.Tasks; using FluentAssertions; -using OmniSharp.Extensions.Embedded.MediatR; +using MediatR; using Microsoft.Extensions.DependencyInjection; using OmniSharp.Extensions.LanguageServer.Protocol; using Newtonsoft.Json;