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

Add custom resolver for libcoreclr.so #900

Merged
merged 1 commit into from
Sep 25, 2020
Merged

Add custom resolver for libcoreclr.so #900

merged 1 commit into from
Sep 25, 2020

Conversation

am11
Copy link
Contributor

@am11 am11 commented Sep 18, 2020

This patch is required for "true" SingleFile form factor, introduced in .NET 5.0.
I tested @benadams' repro (by using replacing PackageReference with ProjectReference and commenting out this line) and confirmed this special-casing for .NET5.0 (using SDK's implicitly defined compilation constant NET5_0) fixes the problem.

Fixes #889.

cc @MichalStrehovsky, @benadams

am11
am11 commented Sep 18, 2020
View reviewed changes
Terminal.Gui/Views/TextView.cs
@@ -30,6 +30,8 @@
using System.Text;
using NStack;

using Rune = System.Rune;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This to fix a compiler error; disambiguate .NET5's System.Text.Rune with System.Rune coming from https://github.com/migueldeicaza/NStack/blob/447f61d/NStack/unicode/Rune.cs#L4.

@am11 am11 force-pushed the feature/interop/net5.0 branch 3 times, most recently from b6d3286 to 74c0c24 Compare September 18, 2020 21:39
tig
tig approved these changes Sep 21, 2020
View reviewed changes
Copy link
Collaborator

@tig tig left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This all looks great. I don't have time to test and I want to do that before I merge. But I will asap.

@am11 am11 force-pushed the feature/interop/net5.0 branch from 74c0c24 to 19955fa Compare September 22, 2020 09:58
@tig
Copy link
Collaborator

tig commented Sep 25, 2020

Is .NET 5 at a point where we would be comfortable releasing a nuget package built with it?

@am11
Copy link
Contributor Author

am11 commented Sep 25, 2020

The .NET 5.0 general availability is rumored for Nov. 2020. Some NuGet packages are using dotnet 5.0 RC versions for their preview / beta releases. If there is a stable version planned for gui.cs before Nov, we can postpone merging this PR (otherwise a preview version would be welcome meanwhile to obtain feedback from masses). 🙂

@BDisp
Copy link
Collaborator

BDisp commented Sep 25, 2020

Is .NET 5 at a point where we would be comfortable releasing a nuget package built with it?

Still in Release Candidate. I only like to deal with them when they are published with the last Visual Studio version.

@tig
Copy link
Collaborator

tig commented Sep 25, 2020

My recommendation is that we merge this change now for 0.90 and plan on launching 1.0 after .NET 5 launches in Nov.

Any objections?

@am11
Copy link
Contributor Author

am11 commented Sep 25, 2020

Sounds good, will likely give us more bake time to iron out possible bugs in 5.0 bits. 😎👍

@tig tig merged commit e2e5cc2 into gui-cs:master Sep 25, 2020
@am11 am11 deleted the feature/interop/net5.0 branch September 25, 2020 17:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MichalStrehovsky MichalStrehovsky MichalStrehovsky left review comments

@tig tig tig approved these changes

@BDisp BDisp BDisp approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Doesn't work with .NET 5 single file apps
4 participants
@am11 @tig @BDisp @MichalStrehovsky