Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix refusing HTTP connections ( #1274 ) #1361

Merged
merged 2 commits into from
Mar 19, 2019
Merged

Fix refusing HTTP connections ( #1274 ) #1361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5b1a33
Fix refusing HTTP connections ( #1274 )
Dec 12, 2018
bf6fcc5
Merge branch 'master' into fixRefusingHTTPConenctions
Mar 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion README.md
View file
Open in desktop
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
View file
Open in desktop
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);
}

void CopyExtraDependencies(BuildEnvironment env, string outputFolder)
Expand Down