Merge pull request #95 from OmniSharp/sn-support

Strong naming... yay!!! ... booo!!  (╯°□°）╯︵ ┻━┻

Author: david-driscoll

.gitmodules

@@ -0,0 +1,6 @@
+[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

Common.Build.props

@@ -4,6 +4,9 @@
         <Copyright>Copyright OmniSharp and contributors © 2018</Copyright>
         <Authors>David Driscoll</Authors>
         <LangVersion>latest</LangVersion>
+        <SignAssembly>true</SignAssembly>
+        <DelaySign>false</DelaySign>
+        <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)\lsp.snk</AssemblyOriginatorKeyFile>
     </PropertyGroup>
     <PropertyGroup>
         <Microsoft_Extensions_Logging_Version>2.0.0</Microsoft_Extensions_Logging_Version>

build.cake

@@ -14,6 +14,26 @@ Task("Clean")
     CleanDirectory(artifacts);
 });
 
+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("Restore (Unix)")
     .WithCriteria(IsRunningOnUnix)
     .Does(() =>
@@ -151,6 +171,8 @@ Task("GitVersion")
     });
 
 Task("Default")
+    .IsDependentOn("Submodules")
+    .IsDependentOn("Embed MediatR")
     .IsDependentOn("GitVersion")
     .IsDependentOn("Clean")
     .IsDependentOn("Build")

lsp.snk

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

sample/SampleServer/TextDocumentHandler.cs

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

src/Client/Handlers/JsonRpcNotificationHandler.cs

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

src/Client/LanguageRegistration.cs

@@ -2,12 +2,22 @@
     <Import Project="$([MSBuild]::GetPathOfFileAbove('Common.Build.props', '$(MSBuildThisFileDirectory)../'))" />
     <PropertyGroup>
         <PackageVersion Condition="'$(GitVersion_NuGetVersion)' != ''">$(GitVersion_NuGetVersion)</PackageVersion>
-        <AssemblyVersion Condition="'$(GitVersion_AssemblySemVer)' != ''">$(GitVersion_AssemblySemVer)</AssemblyVersion>
+        <AssemblyVersion Condition="'$(GitVersion_AssemblySemVer)' != ''">$(GitVersion_Major).$(GitVersion_Minor).0.0</AssemblyVersion>
+        <AssemblyVersion Condition="'$(AssemblyVersion)' == ''">0.0.9.9</AssemblyVersion>
         <FileVersion Condition="'$(GitVersion_AssemblySemVer)' != ''">$(GitVersion_AssemblySemVer)</FileVersion>
         <InformationalVersion Condition="'$(GitVersion_InformationalVersion)' != ''">$(GitVersion_InformationalVersion)</InformationalVersion>
         <IsPackable>true</IsPackable>
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="SourceLink.Create.CommandLine" Version="$(SourceLink_Version)" PrivateAssets="All" />
+        <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
+            <_Parameter1>Client.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100391db875e68eb4bfef49ce14313b9e13f2cd3cc89eb273bbe6c11a55044c7d4f566cf092e1c77ef9e7c75b1496ae7f95d925938f5a01793dd8d9f99ae0a7595779b71b971287d7d7b5960d052078d14f5ce1a85ea5c9fb2f59ac735ff7bc215cab469b7c3486006860bad6f4c3b5204ea2f28dd4e1d05e2cca462cfd593b9f9f</_Parameter1>
+        </AssemblyAttribute>
+        <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
+            <_Parameter1>JsonRpc.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100391db875e68eb4bfef49ce14313b9e13f2cd3cc89eb273bbe6c11a55044c7d4f566cf092e1c77ef9e7c75b1496ae7f95d925938f5a01793dd8d9f99ae0a7595779b71b971287d7d7b5960d052078d14f5ce1a85ea5c9fb2f59ac735ff7bc215cab469b7c3486006860bad6f4c3b5204ea2f28dd4e1d05e2cca462cfd593b9f9f</_Parameter1>
+        </AssemblyAttribute>
+        <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
+            <_Parameter1>Lsp.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100391db875e68eb4bfef49ce14313b9e13f2cd3cc89eb273bbe6c11a55044c7d4f566cf092e1c77ef9e7c75b1496ae7f95d925938f5a01793dd8d9f99ae0a7595779b71b971287d7d7b5960d052078d14f5ce1a85ea5c9fb2f59ac735ff7bc215cab469b7c3486006860bad6f4c3b5204ea2f28dd4e1d05e2cca462cfd593b9f9f</_Parameter1>
+        </AssemblyAttribute>
     </ItemGroup>
 </Project>

src/Directory.Build.props

@@ -1,4 +1,4 @@
-using MediatR;
+using OmniSharp.Extensions.Embedded.MediatR;
 
 namespace OmniSharp.Extensions.JsonRpc
 {

src/JsonRpc/EmptyRequest.cs

@@ -5,7 +5,7 @@
 using System.Linq;
 using System.Reactive.Disposables;
 using System.Reflection;
-using MediatR;
+using OmniSharp.Extensions.Embedded.MediatR;
 
 namespace OmniSharp.Extensions.JsonRpc
 {