Skip to content

Commit cc92a38

Browse files
david-driscolldavid-driscoll
committed
Integrated MediatR as a submodule (with renamed namespace to avoid conflicts)
1 parent a5cdb62 commit cc92a38

File tree

83 files changed

+112
-80
lines changed

Some content is hidden

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

83 files changed

+112
-80
lines changed

‎.gitmodules

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[submodule "submodules/MediatR.Extensions.Microsoft.DependencyInjection"]
2+
path = submodules/MediatR.Extensions.Microsoft.DependencyInjection
3+
url = [email protected]:jbogard/MediatR.Extensions.Microsoft.DependencyInjection.git
4+
[submodule "submodules/MediatR"]
5+
path = submodules/MediatR
6+
url = [email protected]:jbogard/MediatR.git

‎build.cake

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,26 @@ Task("Clean")
1414
CleanDirectory(artifacts);
1515
});
1616

17+
Task("Submodules")
18+
.Does(() => {
19+
StartProcess("git", "submodule update --init --recursive");
20+
});
21+
22+
Task("Embed MediatR")
23+
.Does(() => {
24+
foreach (var file in GetFiles("submodules/**/*.cs"))
25+
{
26+
var content = System.IO.File.ReadAllText(file.FullPath);
27+
if (content.IndexOf("namespace MediatR") > -1 || content.IndexOf("using MediatR") > -1)
28+
{
29+
System.IO.File.WriteAllText(file.FullPath, content
30+
.Replace("namespace MediatR", "namespace OmniSharp.Extensions.Embedded.MediatR")
31+
.Replace("using MediatR", "using OmniShqarp.Extensions.Embedded.MediatR")
32+
);
33+
}
34+
}
35+
});
36+
1737
Task("Restore (Unix)")
1838
.WithCriteria(IsRunningOnUnix)
1939
.Does(() =>
@@ -151,6 +171,8 @@ Task("GitVersion")
151171
});
152172

153173
Task("Default")
174+
.IsDependentOn("Submodules")
175+
.IsDependentOn("Embed MediatR")
154176
.IsDependentOn("GitVersion")
155177
.IsDependentOn("Clean")
156178
.IsDependentOn("Build")

‎sample/SampleServer/TextDocumentHandler.cs

Lines changed: 1 addition & 1 deletion
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 MediatR;
4+
using OmniSharp.Extensions.Embedded.MediatR;
55
using OmniSharp.Extensions.LanguageServer;
66
using OmniSharp.Extensions.LanguageServer.Protocol;
77
using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities;

‎src/Client/Handlers/JsonRpcNotificationHandler.cs

Lines changed: 1 addition & 1 deletion
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 MediatR;
4+
using OmniSharp.Extensions.Embedded.MediatR;
55
using Newtonsoft.Json.Linq;
66
using OmniSharp.Extensions.JsonRpc;
77
using OmniSharp.Extensions.LanguageServer.Protocol;

‎src/Client/LanguageRegistration.cs

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

‎src/JsonRpc/EmptyRequest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using MediatR;
1+
using OmniSharp.Extensions.Embedded.MediatR;
22

33
namespace OmniSharp.Extensions.JsonRpc
44
{

‎src/JsonRpc/HandlerCollection.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using System.Linq;
66
using System.Reactive.Disposables;
77
using System.Reflection;
8-
using MediatR;
8+
using OmniSharp.Extensions.Embedded.MediatR;
99

1010
namespace OmniSharp.Extensions.JsonRpc
1111
{

‎src/JsonRpc/IJsonRpcNotificationHandler.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using System.Threading.Tasks;
2-
using MediatR;
2+
using OmniSharp.Extensions.Embedded.MediatR;
33

44
namespace OmniSharp.Extensions.JsonRpc
55
{

‎src/JsonRpc/IJsonRpcRequestHandler.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System.Threading;
22
using System.Threading.Tasks;
3-
using MediatR;
3+
using OmniSharp.Extensions.Embedded.MediatR;
44

55
namespace OmniSharp.Extensions.JsonRpc
66
{

‎src/JsonRpc/JsonRpc.csproj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,12 @@
99
<PackageReference Include="System.Reactive" Version="$(System_Reactive_Version)" />
1010
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(Microsoft_Extensions_DependencyInjection_Version)" />
1111
<PackageReference Include="Microsoft.Extensions.Logging" Version="$(Microsoft_Extensions_Logging_Version)" />
12-
<PackageReference Include="MediatR" Version="$(MediatR_Version)" />
12+
<Compile Include="../../submodules/MediatR/src/MediatR/**/*.cs" Exclude="**/AssemblyInfo.cs" />
13+
<Compile Include="../../submodules/MediatR.Extensions.Microsoft.DependencyInjection/src/MediatR.Extensions.Microsoft.DependencyInjection/**/*.cs" Exclude="**/AssemblyInfo.cs" />
1314
<PackageReference Include="Newtonsoft.Json" Version="$(Newtonsoft_Version)" />
1415
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(Microsoft_Extensions_Logging_Version)" />
15-
<PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="$(MediatR_Extensions_DependencyInjection_Version)" />
16+
<!-- <PackageReference Include="MediatR" Version="$(MediatR_Version)" /> -->
17+
<!-- <PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="$(MediatR_Extensions_DependencyInjection_Version)" /> -->
1618
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(Microsoft_Extensions_DependencyInjection_Version)" />
1719
</ItemGroup>
1820
</Project>

0 commit comments

Comments
 (0)