Merge branch 'master' into FixIndexerPropertyReferences

CHANGELOG.md

@@ -1,11 +1,25 @@
 # Changelog
 All changes to the project will be documented in this file.
 
-## [1.32.9] - not yet released
+## [1.32.12] - not released yet
+* Include constant values in `/typelookup` responses ([omnisharp-vscode#2857](https://github.com/OmniSharp/omnisharp-vscode/issues/2857), PR: [#1420](https://github.com/OmniSharp/omnisharp-roslyn/pull/1420))
+
+## [1.32.11] - 2019-02-27
+* Updated to Roslyn `3.0.0-beta4-19126-05` to match VS 16.0p4 ([#1413](https://github.com/OmniSharp/omnisharp-roslyn/issues/1413), PR: [#1414](https://github.com/OmniSharp/omnisharp-roslyn/pull/1414))
+* Added support for reading C# 8.0 `NullableContextOptions` from csproj files ([#1396](https://github.com/OmniSharp/omnisharp-roslyn/issues/1396), PR: [#1404](https://github.com/OmniSharp/omnisharp-roslyn/pull/1404))
+
+## [1.32.10] - 2019-01-25
+* Updated to Roslyn 3.0 to match [VS 2019](https://docs.microsoft.com/en-us/visualstudio/releases/2019/release-notes-preview#VS2019_Preview2) (PR: [#1391](https://github.com/OmniSharp/omnisharp-roslyn/pull/1391))
+* Fixed shutdown event handling for LSP _(Contributed by [@LoneBoco](https://github.com/LoneBoco))_ ([#1113](https://github.com/OmniSharp/omnisharp-roslyn/issues/1113), PR: [#1345](https://github.com/OmniSharp/omnisharp-roslyn/pull/1345))
+
+## [1.32.9] - 2019-1-22
 * Updated to Roslyn `2.11.0-beta1-final` and initial support for C# 8 (PR: [#1365](https://github.com/OmniSharp/omnisharp-roslyn/pull/1365))
 * Incorporate *IndentSwitchCaseSectionWhenBlock* into OmniSharp's formatting options. This fixes the default formatting behavior, as the setting is set to *true* by default, and still allows users to disable it if needed. ([#1351](https://github.com/OmniSharp/omnisharp-roslyn/issues/1351), PR: [#1353](https://github.com/OmniSharp/omnisharp-roslyn/pull/1353))
 * Removed unused `-stdio` flag from the `StdioCommandLineApplication` (PR: [#1362](https://github.com/OmniSharp/omnisharp-roslyn/pull/1362))
 * Fixed finding references to operator overloads _(Contributed by [@SirIntruder](https://github.com/SirIntruder))_ (PR: [#1371](https://github.com/OmniSharp/omnisharp-roslyn/pull/1371))
+* Fixed a 1.29.0 regression that caused LSP not to work with `StdioCommandLineApplication` ([#1269](https://github.com/OmniSharp/omnisharp-roslyn/issues/1269), PR: [#1346](https://github.com/OmniSharp/omnisharp-roslyn/pull/1346))
+* Improved handling of files moving on disk (PR: [#1368](https://github.com/OmniSharp/omnisharp-roslyn/pull/1368))
+* Improved detection of MSBuild when multiple instances are available _(Contributed by [@johnnyasantoss ](https://github.com/johnnyasantoss))_ (PR: [#1349](https://github.com/OmniSharp/omnisharp-roslyn/pull/1349))
 
 ## [1.32.8] - 2018-11-14
 * Fixed MSBuild discovery path (1.32.7 regression) (PR: [#1337](https://github.com/OmniSharp/omnisharp-roslyn/pull/1337))

NuGet.Config

@@ -4,5 +4,7 @@
         <clear />
         <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
         <add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
+        <add key="OmniSharp" value="https://www.myget.org/F/omnisharp/api/v3/index.json" />
+        <add key="roslyn-myget" value="https://dotnet.myget.org/F/roslyn/api/v3/index.json" />
     </packageSources>
 </configuration>

OmniSharp.sln

@@ -9,6 +9,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		build.cake = build.cake
 		build.json = build.json
+		Directory.Build.props = Directory.Build.props
+		Directory.Build.targets = Directory.Build.targets
 		global.json = global.json
 		NuGet.Config = NuGet.Config
 		tools\packages.config = tools\packages.config
@@ -29,8 +31,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OmniSharp.Stdio.Tests", "te
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OmniSharp.Abstractions", "src\OmniSharp.Abstractions\OmniSharp.Abstractions.csproj", "{0C54BE83-EF9E-4419-B654-A0760745BF80}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OmniSharp.Plugins", "src\OmniSharp.Plugins\OmniSharp.Plugins.csproj", "{1C9AE254-6076-4EE6-80FD-B0AE4E16347D}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OmniSharp.Roslyn.CSharp", "src\OmniSharp.Roslyn.CSharp\OmniSharp.Roslyn.CSharp.csproj", "{ED1A82CB-2741-45F5-A28B-7C36EFDF9746}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OmniSharp.Roslyn", "src\OmniSharp.Roslyn\OmniSharp.Roslyn.csproj", "{4F5FC4AF-3977-4ECB-9B58-D16E8024BC97}"
@@ -73,6 +73,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OmniSharp.Stdio.Driver", "s
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OmniSharp.Script.Tests", "tests\OmniSharp.Script.Tests\OmniSharp.Script.Tests.csproj", "{9E4BA68C-7F4B-429A-A0C7-8CE7D41D610F}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OmniSharp.Shared", "src\OmniSharp.Shared\OmniSharp.Shared.csproj", "{9571E3FE-E742-44AC-9E1F-64156815B8E1}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -131,18 +133,6 @@ Global
 		{0C54BE83-EF9E-4419-B654-A0760745BF80}.Release|x64.Build.0 = Release|Any CPU
 		{0C54BE83-EF9E-4419-B654-A0760745BF80}.Release|x86.ActiveCfg = Release|Any CPU
 		{0C54BE83-EF9E-4419-B654-A0760745BF80}.Release|x86.Build.0 = Release|Any CPU
-		{1C9AE254-6076-4EE6-80FD-B0AE4E16347D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1C9AE254-6076-4EE6-80FD-B0AE4E16347D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1C9AE254-6076-4EE6-80FD-B0AE4E16347D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1C9AE254-6076-4EE6-80FD-B0AE4E16347D}.Debug|x64.Build.0 = Debug|Any CPU
-		{1C9AE254-6076-4EE6-80FD-B0AE4E16347D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{1C9AE254-6076-4EE6-80FD-B0AE4E16347D}.Debug|x86.Build.0 = Debug|Any CPU
-		{1C9AE254-6076-4EE6-80FD-B0AE4E16347D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1C9AE254-6076-4EE6-80FD-B0AE4E16347D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1C9AE254-6076-4EE6-80FD-B0AE4E16347D}.Release|x64.ActiveCfg = Release|Any CPU
-		{1C9AE254-6076-4EE6-80FD-B0AE4E16347D}.Release|x64.Build.0 = Release|Any CPU
-		{1C9AE254-6076-4EE6-80FD-B0AE4E16347D}.Release|x86.ActiveCfg = Release|Any CPU
-		{1C9AE254-6076-4EE6-80FD-B0AE4E16347D}.Release|x86.Build.0 = Release|Any CPU
 		{ED1A82CB-2741-45F5-A28B-7C36EFDF9746}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{ED1A82CB-2741-45F5-A28B-7C36EFDF9746}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{ED1A82CB-2741-45F5-A28B-7C36EFDF9746}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -395,6 +385,18 @@ Global
 		{9E4BA68C-7F4B-429A-A0C7-8CE7D41D610F}.Release|x64.Build.0 = Release|Any CPU
 		{9E4BA68C-7F4B-429A-A0C7-8CE7D41D610F}.Release|x86.ActiveCfg = Release|Any CPU
 		{9E4BA68C-7F4B-429A-A0C7-8CE7D41D610F}.Release|x86.Build.0 = Release|Any CPU
+		{9571E3FE-E742-44AC-9E1F-64156815B8E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9571E3FE-E742-44AC-9E1F-64156815B8E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9571E3FE-E742-44AC-9E1F-64156815B8E1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9571E3FE-E742-44AC-9E1F-64156815B8E1}.Debug|x64.Build.0 = Debug|Any CPU
+		{9571E3FE-E742-44AC-9E1F-64156815B8E1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9571E3FE-E742-44AC-9E1F-64156815B8E1}.Debug|x86.Build.0 = Debug|Any CPU
+		{9571E3FE-E742-44AC-9E1F-64156815B8E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9571E3FE-E742-44AC-9E1F-64156815B8E1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9571E3FE-E742-44AC-9E1F-64156815B8E1}.Release|x64.ActiveCfg = Release|Any CPU
+		{9571E3FE-E742-44AC-9E1F-64156815B8E1}.Release|x64.Build.0 = Release|Any CPU
+		{9571E3FE-E742-44AC-9E1F-64156815B8E1}.Release|x86.ActiveCfg = Release|Any CPU
+		{9571E3FE-E742-44AC-9E1F-64156815B8E1}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -404,7 +406,6 @@ Global
 		{A4F5FE6B-D3B4-4B63-A949-44E12AB8D535} = {2C348365-A9D8-459E-9276-56FC46AAEE31}
 		{AB5A975C-378B-45DC-AD69-50D808338AC2} = {35E025BF-BBB2-4FAC-9F4B-37CBA083EE47}
 		{0C54BE83-EF9E-4419-B654-A0760745BF80} = {2C348365-A9D8-459E-9276-56FC46AAEE31}
-		{1C9AE254-6076-4EE6-80FD-B0AE4E16347D} = {2C348365-A9D8-459E-9276-56FC46AAEE31}
 		{ED1A82CB-2741-45F5-A28B-7C36EFDF9746} = {2C348365-A9D8-459E-9276-56FC46AAEE31}
 		{4F5FC4AF-3977-4ECB-9B58-D16E8024BC97} = {2C348365-A9D8-459E-9276-56FC46AAEE31}
 		{9AF025CA-3706-401F-8D50-59FAD5AFE725} = {2C348365-A9D8-459E-9276-56FC46AAEE31}
@@ -426,6 +427,7 @@ Global
 		{BC640CBF-F6E2-42EA-9D61-FB6E515AEA44} = {2C348365-A9D8-459E-9276-56FC46AAEE31}
 		{D2A78CEE-B278-476F-AF34-A7D6F792F973} = {2C348365-A9D8-459E-9276-56FC46AAEE31}
 		{9E4BA68C-7F4B-429A-A0C7-8CE7D41D610F} = {35E025BF-BBB2-4FAC-9F4B-37CBA083EE47}
+		{9571E3FE-E742-44AC-9E1F-64156815B8E1} = {2C348365-A9D8-459E-9276-56FC46AAEE31}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {4DD725CE-B49A-4151-8B77-BB33FE88E46E}

README.md

@@ -10,10 +10,12 @@ OmniSharp-Roslyn is a .NET development platform based on [Roslyn](https://github
 
 OmniSharp-Roslyn is built with the [.NET Core SDK](https://dot.net/) on Windows and [Mono](http://www.mono-project.com/) on OSX/Linux. It targets the __net461__ target framework. OmniSharp requires __mono__ (>=5.2.0) if it is run on a platform other than Windows.
 
-For Arch Linux users, need package [msbuild-stable](https://aur.archlinux.org/packages/msbuild-stable/) (>= 15.0)
+For Arch Linux users, need package [msbuild-stable](https://aur.archlinux.org/packages/msbuild-stable/) (>= 15.0).
 
 In addition, if you need the HTTP interface and you want to run on Linux, you'll also need to make sure that you have [libuv](http://libuv.org) installed.
 
+See also https://github.com/OmniSharp/omnisharp-roslyn/issues/1202#issuecomment-421543905 .
+
 ## What's new
 
 See our [change log](https://github.com/OmniSharp/omnisharp-roslyn/blob/master/CHANGELOG.md) for all of the updates.

build.cake

@@ -48,7 +48,7 @@ bool AllowLegacyTests()
 
     if (platform.IsLinux)
     {
-        var version = platform.Version.ToString();
+        var version = platform.Version?.ToString();
 
         // Taken from https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0/scripts/obtain/dotnet-install.sh
         switch (platform.DistroName)
@@ -638,8 +638,6 @@ Task("Test")
                 // This is necessary to work around a Mono bug that is exasperated by xUnit.
                 DirectoryHelper.Copy($"{env.Folders.MonoMSBuildLib}", instanceFolder);
 
-                DeleteUnnecessaryAssemblies(instanceFolder);
-
                 var runScript = CombinePaths(env.Folders.Mono, "run");
 
                 // By default, the run script launches OmniSharp. To launch our Mono runtime
@@ -655,34 +653,13 @@ Task("Test")
     }
 });
 
-/// <summary>
-/// Delete assemblies that are included in our Mono package.
-/// </summary>
-void DeleteUnnecessaryAssemblies(string folder)
-{
-    FileHelper.Delete(CombinePaths(folder, "System.AppContext.dll"));
-    FileHelper.Delete(CombinePaths(folder, "System.Numerics.Vectors.dll"));
-    FileHelper.Delete(CombinePaths(folder, "System.Runtime.InteropServices.RuntimeInformation.dll"));
-    FileHelper.Delete(CombinePaths(folder, "System.ComponentModel.Primitives.dll"));
-    FileHelper.Delete(CombinePaths(folder, "System.ComponentModel.TypeConverter.dll"));
-    FileHelper.Delete(CombinePaths(folder, "System.Console.dll"));
-    FileHelper.Delete(CombinePaths(folder, "System.IO.FileSystem.Primitives.dll"));
-    FileHelper.Delete(CombinePaths(folder, "System.IO.FileSystem.dll"));
-    FileHelper.Delete(CombinePaths(folder, "System.Security.Cryptography.Encoding.dll"));
-    FileHelper.Delete(CombinePaths(folder, "System.Security.Cryptography.Primitives.dll"));
-    FileHelper.Delete(CombinePaths(folder, "System.Security.Cryptography.X509Certificates.dll"));
-    FileHelper.Delete(CombinePaths(folder, "System.Threading.Thread.dll"));
-}
-
 void CopyMonoBuild(BuildEnvironment env, string sourceFolder, string outputFolder)
 {
     DirectoryHelper.Copy(sourceFolder, outputFolder, copySubDirectories: false);
 
     // Copy MSBuild runtime and libraries
     DirectoryHelper.Copy($"{env.Folders.MSBuild}", CombinePaths(outputFolder, "msbuild"));
 
-    // Included in Mono
-    DeleteUnnecessaryAssemblies(outputFolder);
 }
 
 void CopyExtraDependencies(BuildEnvironment env, string outputFolder)

build.json

@@ -38,7 +38,8 @@
     "CSharpAndFSharp",
     "ProjectWithMismatchedFileName",
     "SolutionWithSignedProject",
-    "ProjectWithMultiTFMLib"
+    "ProjectWithMultiTFMLib",
+    "ExternAlias"
   ],
   "LegacyTestAssets": [
     "LegacyNUnitTestProject",

build/Packages.props

@@ -4,7 +4,7 @@
   <PropertyGroup>
     <MSBuildPackageVersion>15.8.166</MSBuildPackageVersion>
     <NuGetPackageVersion>4.8.0</NuGetPackageVersion>
-    <RoslynPackageVersion>2.11.0-beta1-final</RoslynPackageVersion>
+    <RoslynPackageVersion>3.0.0-beta4-19126-05</RoslynPackageVersion>
     <XunitPackageVersion>2.4.0</XunitPackageVersion>
   </PropertyGroup>
 
@@ -60,13 +60,17 @@
     <PackageReference Update="Nuget.ProjectModel" Version="$(NuGetPackageVersion)" />
     <PackageReference Update="Nuget.Versioning" Version="$(NuGetPackageVersion)" />
 
+    <PackageReference Update="OmniSharp.Extensions.LanguageServer" Version="0.11.3" />
+
     <PackageReference Update="SQLitePCLRaw.bundle_green" Version="1.1.2" />
     <PackageReference Update="System.Collections.Immutable" Version="1.4.0" />
     <PackageReference Update="System.ComponentModel.Composition" Version="4.5.0" />
     <PackageReference Update="System.Composition" Version="1.0.31" />
     <PackageReference Update="System.Reflection.Metadata" Version="1.4.2" />
     <PackageReference Update="System.Threading.Tasks.Dataflow" Version="4.5.24" />
-    <PackageReference Update="System.ValueTuple" Version="4.3.0" />
+    <PackageReference Update="System.ValueTuple" Version="4.4.0" />
+
+    <PackageReference Update="System.Reactive" Version="4.1.2" />
 
     <PackageReference Update="xunit.runner.visualstudio" Version="$(XunitPackageVersion)" />
     <PackageReference Update="xunit" Version="$(XunitPackageVersion)" />

build/Settings.props

@@ -2,7 +2,7 @@
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <LangVersion>7.2</LangVersion>
+    <LangVersion>7.3</LangVersion>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>

global.json

@@ -2,4 +2,4 @@
     "sdk": {
         "version": "2.1.301"
     }
-}
+}

src/OmniSharp.Abstractions/Configuration.cs

@@ -4,7 +4,7 @@ internal static class Configuration
     {
         public static bool ZeroBasedIndices = false;
 
-        public const string RoslynVersion = "2.11.0.0";
+        public const string RoslynVersion = "3.0.0.0";
         public const string RoslynPublicKeyToken = "31bf3856ad364e35";
 
         public readonly static string RoslynFeatures = GetRoslynAssemblyFullName("Microsoft.CodeAnalysis.Features");

src/OmniSharp.Abstractions/Eventing/IEventEmitterExtensions.cs

@@ -1,6 +1,9 @@
 using System;
 using System.Collections.Generic;
 using OmniSharp.Models.Events;
+using OmniSharp;
+using OmniSharp.Models;
+using System.Linq;
 
 namespace OmniSharp.Eventing
 {
@@ -41,5 +44,24 @@ public static void UnresolvedDepdendencies(this IEventEmitter emitter, string pr
                     UnresolvedDependencies = unresolvedDependencies
                 });
         }
+
+        public static void ProjectInformation(this IEventEmitter emitter,
+                                              HashedString projectGuid,
+                                              IEnumerable<HashedString> targetFrameworks,
+                                              IEnumerable<HashedString> references,
+                                              IEnumerable<HashedString> fileExtensions)
+        {
+            var projectConfiguration = new ProjectConfigurationMessage()
+            {
+                TargetFrameworks = targetFrameworks.Select(hashed => hashed.Value),
+                ProjectGuid = projectGuid.Value,
+                References = references.Select(hashed => hashed.Value),
+                FileExtensions = fileExtensions.Select(hashed => hashed.Value)
+            };
+
+            emitter.Emit(
+                EventTypes.ProjectConfiguration,
+                projectConfiguration);
+        }
     }
 }

src/OmniSharp.Abstractions/Models/Events/EventTypes.cs

@@ -10,5 +10,6 @@ public static class EventTypes
         public const string PackageRestoreStarted = nameof(PackageRestoreStarted);
         public const string PackageRestoreFinished = nameof(PackageRestoreFinished);
         public const string UnresolvedDependencies = nameof(UnresolvedDependencies);
+        public const string ProjectConfiguration = nameof(ProjectConfiguration);
     }
 }

src/OmniSharp.Abstractions/Models/Events/ProjectConfigurationMessage.cs

@@ -0,0 +1,13 @@
+using System.Collections;
+using System.Collections.Generic;
+
+namespace OmniSharp.Models.Events
+{
+    public class ProjectConfigurationMessage
+    {
+        public string ProjectGuid { get; set; }
+        public IEnumerable<string> TargetFrameworks { get; set; }
+        public IEnumerable<string> References { get; set; }
+        public IEnumerable<string> FileExtensions { get; set; }
+    }
+}

src/OmniSharp.Abstractions/Models/HashedString.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OmniSharp.Models
+{
+    public class HashedString
+    {
+        public HashedString(string value)
+        {
+            Value = value;
+        }
+
+        public string Value { get; }
+    }
+}

src/OmniSharp.Abstractions/Models/ZeroBasedIndexConverter.cs

@@ -5,7 +5,7 @@
 
 namespace OmniSharp.Models
 {
-    public class ZeroBasedIndexConverter : JsonConverter
+    internal class ZeroBasedIndexConverter : JsonConverter
     {
         public override bool CanConvert(Type objectType)
         {

src/OmniSharp.Abstractions/OmniSharp.Abstractions.csproj

@@ -8,9 +8,6 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Configuration" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" />
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Physical" />
-    <PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" />
     <PackageReference Include="Microsoft.Extensions.Logging" />
     <PackageReference Include="Newtonsoft.Json" />
     <PackageReference Include="NuGet.Versioning" />

src/OmniSharp.Abstractions/Stdio/Services/ISharedTextWriter.cs → src/OmniSharp.Abstractions/Services/ISharedTextWriter.cs

@@ -1,6 +1,6 @@
 using System.Threading.Tasks;
 
-namespace OmniSharp.Stdio.Services
+namespace OmniSharp.Services
 {
     public interface ISharedTextWriter
     {

src/OmniSharp.Cake/OmniSharp.Cake.csproj

@@ -8,6 +8,7 @@
   <ItemGroup>
     <ProjectReference Include="..\OmniSharp.Abstractions\OmniSharp.Abstractions.csproj" />
     <ProjectReference Include="..\OmniSharp.Roslyn\OmniSharp.Roslyn.csproj" />
+    <ProjectReference Include="..\OmniSharp.Shared\OmniSharp.Shared.csproj" />
   </ItemGroup>
 
   <ItemGroup>

src/OmniSharp.DotNet/OmniSharp.DotNet.csproj

@@ -9,6 +9,7 @@
     <ProjectReference Include="..\OmniSharp.Abstractions\OmniSharp.Abstractions.csproj" />
     <ProjectReference Include="..\OmniSharp.DotNet.ProjectModel\OmniSharp.DotNet.ProjectModel.csproj" />
     <ProjectReference Include="..\OmniSharp.Roslyn\OmniSharp.Roslyn.csproj" />
+    <ProjectReference Include="..\OmniSharp.Shared\OmniSharp.Shared.csproj" />
   </ItemGroup>
 
   <ItemGroup>