Merge branch 'master' into port-1.26.2-fixes

pfrozi · Nov 10, 2017 · 95b5681 · 95b5681
2 parents 32e372b + cfad26b
commit 95b5681
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/src/OmniSharp.Abstractions/AssemblyInfo.cs b/src/OmniSharp.Abstractions/AssemblyInfo.cs
@@ -1,7 +1,8 @@
 using System.Runtime.CompilerServices;
 
+[assembly: InternalsVisibleTo("OmniSharp")]
 [assembly: InternalsVisibleTo("OmniSharp.Host")]
 [assembly: InternalsVisibleTo("OmniSharp.Roslyn")]
 [assembly: InternalsVisibleTo("OmniSharp.Roslyn.CSharp")]
 [assembly: InternalsVisibleTo("OmniSharp.DotNetTest.Tests")]
-[assembly: InternalsVisibleTo("OmniSharp.Tests")]
+[assembly: InternalsVisibleTo("OmniSharp.Tests")]
diff --git a/src/OmniSharp.Http/Program.cs b/src/OmniSharp.Http/Program.cs
@@ -11,6 +11,8 @@ static int Main(string[] args) => HostHelpers.Start(() =>
  application.OnExecute(() =>
  {
  var environment = application.CreateEnvironment();
+ OmniSharp.Configuration.ZeroBasedIndices = application.ZeroBasedIndices;
+
  var writer = new SharedTextWriter(Console.Out);
  var plugins = application.CreatePluginAssemblies();
 

diff --git a/src/OmniSharp.Stdio/Program.cs b/src/OmniSharp.Stdio/Program.cs
@@ -28,6 +28,8 @@ static int Main(string[] args) => HostHelpers.Start(() =>
  var output = Console.Out;
 
  var environment = application.CreateEnvironment();
+ OmniSharp.Configuration.ZeroBasedIndices = application.ZeroBasedIndices;
+
  var writer = new SharedTextWriter(output);
  var plugins = application.CreatePluginAssemblies();
  var configuration = new ConfigurationBuilder(environment).Build();