Skip to content

Commit

Permalink
Fix refusing HTTP connections ( #1274 )
Browse files Browse the repository at this point in the history
  • Loading branch information
JulioJu committed Dec 12, 2018
1 parent 1cc5321 commit b5b1a33
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 25 deletions.
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
25 changes: 1 addition & 24 deletions build.cake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand All @@ -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);
}

string PublishMonoBuild(string project, BuildEnvironment env, BuildPlan plan, string configuration)
Expand Down

0 comments on commit b5b1a33

Please sign in to comment.