Support BlockStructure endpoint for VB

OmniSharp.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27004.2005
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30804.86
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2C348365-A9D8-459E-9276-56FC46AAEE31}"
 EndProject
@@ -67,9 +67,13 @@ 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}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OmniSharp.Shared", "src\OmniSharp.Shared\OmniSharp.Shared.csproj", "{9571E3FE-E742-44AC-9E1F-64156815B8E1}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OmniSharp.Lsp.Tests", "tests\OmniSharp.Lsp.Tests\OmniSharp.Lsp.Tests.csproj", "{D67AA10B-8DB6-408D-A4C5-0B1DDCF5B3CC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OmniSharp.Lsp.Tests", "tests\OmniSharp.Lsp.Tests\OmniSharp.Lsp.Tests.csproj", "{D67AA10B-8DB6-408D-A4C5-0B1DDCF5B3CC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OmniSharp.Roslyn.VisualBasic.Tests", "tests\OmniSharp.Roslyn.VisualBasic.Tests\OmniSharp.Roslyn.VisualBasic.Tests.csproj", "{F9CDDDB1-3CDF-49AA-9896-BD8516E57D80}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OmniSharp.Roslyn.VisualBasic", "src\OmniSharp.Roslyn.VisualBasic\OmniSharp.Roslyn.VisualBasic.csproj", "{CE85B0B0-87D4-4391-A552-4F8DF6C2C40D}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -369,6 +373,30 @@ Global
 		{D67AA10B-8DB6-408D-A4C5-0B1DDCF5B3CC}.Release|x64.Build.0 = Release|Any CPU
 		{D67AA10B-8DB6-408D-A4C5-0B1DDCF5B3CC}.Release|x86.ActiveCfg = Release|Any CPU
 		{D67AA10B-8DB6-408D-A4C5-0B1DDCF5B3CC}.Release|x86.Build.0 = Release|Any CPU
+		{F9CDDDB1-3CDF-49AA-9896-BD8516E57D80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F9CDDDB1-3CDF-49AA-9896-BD8516E57D80}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F9CDDDB1-3CDF-49AA-9896-BD8516E57D80}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F9CDDDB1-3CDF-49AA-9896-BD8516E57D80}.Debug|x64.Build.0 = Debug|Any CPU
+		{F9CDDDB1-3CDF-49AA-9896-BD8516E57D80}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F9CDDDB1-3CDF-49AA-9896-BD8516E57D80}.Debug|x86.Build.0 = Debug|Any CPU
+		{F9CDDDB1-3CDF-49AA-9896-BD8516E57D80}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F9CDDDB1-3CDF-49AA-9896-BD8516E57D80}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F9CDDDB1-3CDF-49AA-9896-BD8516E57D80}.Release|x64.ActiveCfg = Release|Any CPU
+		{F9CDDDB1-3CDF-49AA-9896-BD8516E57D80}.Release|x64.Build.0 = Release|Any CPU
+		{F9CDDDB1-3CDF-49AA-9896-BD8516E57D80}.Release|x86.ActiveCfg = Release|Any CPU
+		{F9CDDDB1-3CDF-49AA-9896-BD8516E57D80}.Release|x86.Build.0 = Release|Any CPU
+		{CE85B0B0-87D4-4391-A552-4F8DF6C2C40D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CE85B0B0-87D4-4391-A552-4F8DF6C2C40D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CE85B0B0-87D4-4391-A552-4F8DF6C2C40D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CE85B0B0-87D4-4391-A552-4F8DF6C2C40D}.Debug|x64.Build.0 = Debug|Any CPU
+		{CE85B0B0-87D4-4391-A552-4F8DF6C2C40D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CE85B0B0-87D4-4391-A552-4F8DF6C2C40D}.Debug|x86.Build.0 = Debug|Any CPU
+		{CE85B0B0-87D4-4391-A552-4F8DF6C2C40D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CE85B0B0-87D4-4391-A552-4F8DF6C2C40D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CE85B0B0-87D4-4391-A552-4F8DF6C2C40D}.Release|x64.ActiveCfg = Release|Any CPU
+		{CE85B0B0-87D4-4391-A552-4F8DF6C2C40D}.Release|x64.Build.0 = Release|Any CPU
+		{CE85B0B0-87D4-4391-A552-4F8DF6C2C40D}.Release|x86.ActiveCfg = Release|Any CPU
+		{CE85B0B0-87D4-4391-A552-4F8DF6C2C40D}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -398,6 +426,8 @@ Global
 		{9E4BA68C-7F4B-429A-A0C7-8CE7D41D610F} = {35E025BF-BBB2-4FAC-9F4B-37CBA083EE47}
 		{9571E3FE-E742-44AC-9E1F-64156815B8E1} = {2C348365-A9D8-459E-9276-56FC46AAEE31}
 		{D67AA10B-8DB6-408D-A4C5-0B1DDCF5B3CC} = {35E025BF-BBB2-4FAC-9F4B-37CBA083EE47}
+		{F9CDDDB1-3CDF-49AA-9896-BD8516E57D80} = {35E025BF-BBB2-4FAC-9F4B-37CBA083EE47}
+		{CE85B0B0-87D4-4391-A552-4F8DF6C2C40D} = {2C348365-A9D8-459E-9276-56FC46AAEE31}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {4DD725CE-B49A-4151-8B77-BB33FE88E46E}

build/Packages.props

@@ -32,6 +32,10 @@
     <PackageReference Update="Microsoft.CodeAnalysis.CSharp.Features" Version="$(RoslynPackageVersion)" />
     <PackageReference Update="Microsoft.CodeAnalysis.CSharp.Scripting" Version="$(RoslynPackageVersion)" />
     <PackageReference Update="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(RoslynPackageVersion)" />
+    <PackageReference Update="Microsoft.CodeAnalysis.VisualBasic" Version="$(RoslynPackageVersion)" />
+    <PackageReference Update="Microsoft.CodeAnalysis.VisualBasic.Features" Version="$(RoslynPackageVersion)" />
+    <PackageReference Update="Microsoft.CodeAnalysis.VisualBasic.Scripting" Version="$(RoslynPackageVersion)" />
+    <PackageReference Update="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="$(RoslynPackageVersion)" />
     <PackageReference Update="Microsoft.CodeAnalysis.Workspaces.Common" Version="$(RoslynPackageVersion)" />
 
     <PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="2.1.1" />

src/OmniSharp.Abstractions/AssemblyInfo.cs

@@ -5,6 +5,7 @@
 [assembly: InternalsVisibleTo("OmniSharp.MSBuild")]
 [assembly: InternalsVisibleTo("OmniSharp.Roslyn")]
 [assembly: InternalsVisibleTo("OmniSharp.Roslyn.CSharp")]
+[assembly: InternalsVisibleTo("OmniSharp.Roslyn.VisualBasic")]
 [assembly: InternalsVisibleTo("OmniSharp.DotNetTest.Tests")]
 [assembly: InternalsVisibleTo("OmniSharp.Tests")]
 [assembly: InternalsVisibleTo("OmniSharp.LanguageServerProtocol")]

src/OmniSharp.Host/AssemblyInfo.cs

@@ -3,5 +3,6 @@
 [assembly: InternalsVisibleTo("OmniSharp.Http.Tests")]
 [assembly: InternalsVisibleTo("OmniSharp.MSBuild.Tests")]
 [assembly: InternalsVisibleTo("OmniSharp.Roslyn.CSharp.Tests")]
+[assembly: InternalsVisibleTo("OmniSharp.Roslyn.VisualBasic.Tests")]
 [assembly: InternalsVisibleTo("OmniSharp.Stdio.Tests")]
 [assembly: InternalsVisibleTo("TestUtility")]

src/OmniSharp.Http/OmniSharp.Http.csproj

@@ -11,6 +11,7 @@
         <ProjectReference Include="..\OmniSharp.MSBuild\OmniSharp.MSBuild.csproj" />
         <ProjectReference Include="..\OmniSharp.Script\OmniSharp.Script.csproj" />
         <ProjectReference Include="..\OmniSharp.Roslyn.CSharp\OmniSharp.Roslyn.CSharp.csproj" />
+        <ProjectReference Include="..\OmniSharp.Roslyn.VisualBasic\OmniSharp.Roslyn.VisualBasic.csproj" />
         <ProjectReference Include="..\OmniSharp.Cake\OmniSharp.Cake.csproj" />
     </ItemGroup>
 

src/OmniSharp.LanguageServerProtocol/OmniSharp.LanguageServerProtocol.csproj

@@ -16,6 +16,7 @@
     <ItemGroup>
         <ProjectReference Include="..\OmniSharp.Host\OmniSharp.Host.csproj" />
         <ProjectReference Include="..\OmniSharp.Roslyn.CSharp\OmniSharp.Roslyn.CSharp.csproj" />
+        <ProjectReference Include="..\OmniSharp.Roslyn.VisualBasic\OmniSharp.Roslyn.VisualBasic.csproj" />
         <ProjectReference Include="..\OmniSharp.DotNetTest\OmniSharp.DotNetTest.csproj" />
         <ProjectReference Include="..\OmniSharp.MSBuild\OmniSharp.MSBuild.csproj" />
         <ProjectReference Include="..\OmniSharp.Script\OmniSharp.Script.csproj" />

src/OmniSharp.MSBuild/OmniSharp.MSBuild.csproj

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

src/OmniSharp.Roslyn.VisualBasic/OmniSharp.Roslyn.VisualBasic.csproj

@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFrameworks>net472;netcoreapp2.1;netstandard2.0</TargetFrameworks>
+        <PlatformTarget>AnyCPU</PlatformTarget>
+        <IsPackable>true</IsPackable>
+        <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\OmniSharp.Abstractions\OmniSharp.Abstractions.csproj" />
+        <ProjectReference Include="..\OmniSharp.Roslyn\OmniSharp.Roslyn.csproj" />
+        <ProjectReference Include="..\OmniSharp.Shared\OmniSharp.Shared.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
+        <PackageReference Include="System.Reactive" />
+        <PackageReference Include="ICSharpCode.Decompiler" />
+        <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" />
+        <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Features" />
+        <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" />
+    </ItemGroup>
+</Project>

src/OmniSharp.Roslyn.VisualBasic/Services/Structure/BlockStructureService.cs

@@ -0,0 +1,95 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Composition;
+using System.Reflection;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Text;
+using OmniSharp.Extensions;
+using OmniSharp.Mef;
+using OmniSharp.Models.V2;
+using OmniSharp.Services;
+using OmniSharp.Utilities;
+
+namespace OmniSharp.Roslyn.VisualBasic.Services.Structure
+{
+    [OmniSharpHandler(OmniSharpEndpoints.V2.BlockStructure, LanguageNames.VisualBasic)]
+    public class BlockStructureService : IRequestHandler<BlockStructureRequest, BlockStructureResponse>
+    {
+        private const string PreprocessorRegion = nameof(PreprocessorRegion);
+
+        private readonly IAssemblyLoader _loader;
+        private readonly Lazy<Assembly> _featureAssembly;
+        private readonly Lazy<Type> _blockStructureService;
+        private readonly Lazy<Type> _blockStructure;
+        private readonly Lazy<Type> _blockSpan;
+        private readonly Lazy<MethodInfo> _getBlockStructure;
+        private readonly MethodInfo _getSpans;
+        private readonly MethodInfo _getIsCollpasible;
+        private readonly MethodInfo _getTextSpan;
+        private readonly MethodInfo _getType;
+        private readonly OmniSharpWorkspace _workspace;
+
+        [ImportingConstructor]
+        public BlockStructureService(IAssemblyLoader loader, OmniSharpWorkspace workspace)
+        {
+            _workspace = workspace;
+            _loader = loader;
+            _featureAssembly = _loader.LazyLoad(Configuration.RoslynFeatures);
+
+            _blockStructureService = _featureAssembly.LazyGetType("Microsoft.CodeAnalysis.Structure.BlockStructureService");
+            _blockStructure = _featureAssembly.LazyGetType("Microsoft.CodeAnalysis.Structure.BlockStructure");
+            _blockSpan = _featureAssembly.LazyGetType("Microsoft.CodeAnalysis.Structure.BlockSpan");
+
+            _getBlockStructure = _blockStructureService.LazyGetMethod("GetBlockStructure");
+            _getSpans = _blockStructure.Value.GetProperty("Spans").GetMethod;
+            _getIsCollpasible = _blockSpan.Value.GetProperty("IsCollapsible").GetMethod;
+            _getTextSpan = _blockSpan.Value.GetProperty("TextSpan").GetMethod;
+            _getType = _blockSpan.Value.GetProperty("Type").GetMethod;
+        }
+
+        public async Task<BlockStructureResponse> Handle(BlockStructureRequest request)
+        {
+            // To provide complete code structure for the document wait until all projects are loaded.
+            var document = await _workspace.GetDocumentFromFullProjectModelAsync(request.FileName);
+            if (document == null)
+            {
+                return null;
+            }
+
+            var text = await document.GetTextAsync();
+
+            var service = _blockStructureService.LazyGetMethod("GetService").InvokeStatic(new[] { document });
+
+            var structure = _getBlockStructure.Invoke<object>(service, new object[] { document, CancellationToken.None });
+            var spans = _getSpans.Invoke<IEnumerable>(structure, Array.Empty<object>());
+
+
+            var outliningSpans = new List<CodeFoldingBlock>();
+            foreach (var span in spans)
+            {
+                if (_getIsCollpasible.Invoke<bool>(span, Array.Empty<object>()))
+                {
+                    var textSpan = _getTextSpan.Invoke<TextSpan>(span, Array.Empty<object>());
+
+                    outliningSpans.Add(new CodeFoldingBlock(
+                        text.GetRangeFromSpan(textSpan),
+                        type: ConvertToWellKnownBlockType(_getType.Invoke<string>(span, Array.Empty<object>()))));
+                }
+            }
+
+            return new BlockStructureResponse() { Spans = outliningSpans };
+        }
+
+        private string ConvertToWellKnownBlockType(string kind)
+        {
+            return kind == CodeFoldingBlockKinds.Comment || kind == CodeFoldingBlockKinds.Imports
+                ? kind
+                : kind == PreprocessorRegion
+                    ? CodeFoldingBlockKinds.Region
+                    : null;
+        }
+    }
+}

src/OmniSharp.Roslyn/AssemblyInfo.cs

@@ -1,4 +1,5 @@
 using System.Runtime.CompilerServices;
 
 [assembly: InternalsVisibleTo("OmniSharp.Tests")]
-[assembly: InternalsVisibleTo("OmniSharp.Roslyn.CSharp")]
+[assembly: InternalsVisibleTo("OmniSharp.Roslyn.CSharp")]
+[assembly: InternalsVisibleTo("OmniSharp.Roslyn.VisualBasic")]

src/OmniSharp.Roslyn/Properties/AssemblyInfo.cs

@@ -1,4 +1,4 @@
 using System.Runtime.CompilerServices;
 
 [assembly: InternalsVisibleTo("OmniSharp.Roslyn.CSharp.Tests")]
-
+[assembly: InternalsVisibleTo("OmniSharp.Roslyn.VisualBasic.Tests")]

src/OmniSharp.Shared/AssemblyInfo.cs

@@ -5,5 +5,6 @@
 [assembly: InternalsVisibleTo("OmniSharp.MSBuild")]
 [assembly: InternalsVisibleTo("OmniSharp.Roslyn")]
 [assembly: InternalsVisibleTo("OmniSharp.Roslyn.CSharp")]
+[assembly: InternalsVisibleTo("OmniSharp.Roslyn.VisualBasic")]
 [assembly: InternalsVisibleTo("OmniSharp.DotNetTest.Tests")]
 [assembly: InternalsVisibleTo("OmniSharp.Tests")]

src/OmniSharp.Stdio/OmniSharp.Stdio.csproj

@@ -9,6 +9,7 @@
         <ProjectReference Include="..\OmniSharp.LanguageServerProtocol\OmniSharp.LanguageServerProtocol.csproj" />
         <ProjectReference Include="..\OmniSharp.Host\OmniSharp.Host.csproj" />
         <ProjectReference Include="..\OmniSharp.Roslyn.CSharp\OmniSharp.Roslyn.CSharp.csproj" />
+        <ProjectReference Include="..\OmniSharp.Roslyn.VisualBasic\OmniSharp.Roslyn.VisualBasic.csproj" />
         <ProjectReference Include="..\OmniSharp.DotNetTest\OmniSharp.DotNetTest.csproj" />
         <ProjectReference Include="..\OmniSharp.MSBuild\OmniSharp.MSBuild.csproj" />
         <ProjectReference Include="..\OmniSharp.Script\OmniSharp.Script.csproj" />

tests/OmniSharp.Roslyn.VisualBasic.Tests/AssemblyInfo.cs

@@ -0,0 +1 @@
+[assembly: Xunit.CollectionBehavior(DisableTestParallelization = true)]

tests/OmniSharp.Roslyn.VisualBasic.Tests/BlockStructureFacts.cs

@@ -0,0 +1,90 @@
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
+using OmniSharp.Models.V2;
+using OmniSharp.Roslyn.VisualBasic.Services.Structure;
+using TestUtility;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace OmniSharp.Roslyn.VisualBasic.Tests
+{
+    public class BlockStructureFacts : AbstractSingleRequestHandlerTestFixture<BlockStructureService>
+    {
+        public BlockStructureFacts(ITestOutputHelper output, SharedOmniSharpHostFixture sharedOmniSharpHostFixture)
+            : base(output, sharedOmniSharpHostFixture)
+        {
+        }
+
+        protected override string EndpointName => OmniSharpEndpoints.V2.BlockStructure;
+
+        [Fact]
+        public async Task UsesRoslynBlockStructureService()
+        {
+            var testFile = new TestFile("foo0.vb", @"[|Class Foo
+
+    [|Public Sub M()
+        [|If True Then
+            System.Console.WriteLine()
+        End If|]
+    End Sub|]
+End Class|]");
+            var text = testFile.Content.Text;
+
+            var lineSpans = (await GetResponseAsync(testFile)).Spans
+                .Select(b => b.Range)
+                .ToArray();
+
+            var expected = testFile.Content.GetSpans()
+                .Select(span => testFile.Content.GetRangeFromSpan(span).ToRange()).ToArray();
+
+            Assert.Equal(expected, lineSpans);
+        }
+
+        [Fact]
+        public async Task SupportsRegionBlocks()
+        {
+            var testFile = new TestFile("foo.vb", @"
+[|#Region ""Code Region Here""
+[|Class Foo
+    [|Public Sub M()
+        [|if False Then
+        End If|]
+    End Sub|]
+End Class|]
+#End Region|]");
+
+            // TODO: Investigate why the Kind is null.
+            // A starting point for investigation could be 'ConvertToWellKnownBlockType'
+            //var regionSpan = Assert.Single((await GetResponseAsync(testFile)).Spans,
+            //    span => span.Kind == CodeFoldingBlockKinds.Region);
+
+            //Assert.Equal(1, regionSpan.Range.Start.Line);
+            //Assert.Equal(0, regionSpan.Range.Start.Column);
+            //Assert.Equal(11, regionSpan.Range.End.Line);
+            //Assert.Equal(10, regionSpan.Range.End.Column);
+
+            var lineSpans = (await GetResponseAsync(testFile)).Spans
+                .Select(b => b.Range)
+                .OrderBy(b => b.Start.Line)
+                .ToArray();
+
+            var expected = testFile.Content.GetSpans()
+                .Select(span => testFile.Content.GetRangeFromSpan(span).ToRange()).ToArray();
+
+            Assert.Equal(expected, lineSpans);
+        }
+
+        private Task<BlockStructureResponse> GetResponseAsync(TestFile testFile)
+        {
+            SharedOmniSharpTestHost.AddFilesToWorkspace(testFile);
+            var request = new BlockStructureRequest
+            {
+                FileName = testFile.FileName,
+            };
+
+            var requestHandler = GetRequestHandler(SharedOmniSharpTestHost, LanguageNames.VisualBasic);
+            return requestHandler.Handle(request);
+        }
+    }
+}

tests/OmniSharp.Roslyn.VisualBasic.Tests/OmniSharp.Roslyn.VisualBasic.Tests.csproj

@@ -0,0 +1,31 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net472</TargetFramework>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
+    <WarningsNotAsErrors>CS0618</WarningsNotAsErrors>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Include="..\app.config" Link="app.config" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\OmniSharp.Roslyn.VisualBasic\OmniSharp.Roslyn.VisualBasic.csproj" />
+    <ProjectReference Include="..\TestUtility\TestUtility.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="xunit.runner.visualstudio" />
+    <PackageReference Include="xunit" />
+    <PackageReference Include="SQLitePCLRaw.bundle_green" PrivateAssets="all" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
+
+</Project>