-
Notifications
You must be signed in to change notification settings - Fork 33
Update checks so that netstandard2.0/2.1 projects are supported and will build #87
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.
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
Conversation
and update MSBuildEvaluationContext.cs accordingly IntrinsicFunctions are now loaded at runtime from the current version of Microsoft.Build.dll, as identified by the active runtime. The old IntrinsicFunctions test is no longer meaningful and has been removed This fixes Issue dotdevelop#75 so that all project properties are now evaluated correctly.
….4 or greater or for DotNetCore (runtime) versions 3.x or greater (ie includes .net5.0+) previously only netstandard2.0 was supported for mono 5.2 AND netcore3.0 installed
@@ -34,12 +34,14 @@ namespace MonoDevelop.DotNetCore | |||
{ | |||
class DotNetCoreVersion : IEquatable<DotNetCoreVersion>, IComparable, IComparable<DotNetCoreVersion> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
wouldn't it be more interesting to keep track of which net standard versions are supported by the .net sdks? this way we don't need to compare the sdk's version number, because not every .net sdk supports every net standard version.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
looking back, I really don't know why I changed this version from (2, 1, 602) to (2, 1, 30)!. The matrix of supported versions etc has never been a strong point for me. I was just going for the minimum changes to the existing code (and way of doing things) that fixed the netstandard issue. @gluckez by all means update if you have better understanding
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@hwthomas If it helps, I will certainly not stop you from merging it ;) And I'll have a look tonight to see if the knowledge about the supported frameworks and netstandard versions can be centralized.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@gluckez Many thanks - I appreciate that.
So far, I'm afraid I've been focussing on getting net5ff
and netstandard
projects working, and not being too concerned about improving the state of the codebase!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@hwthomas I guess that's why I'm here xD I'm not too familiar with the codebase yet, but if I can make small improvements while learning, I'll give it a go.
3 questions:
|
@knocte 3 (provisional) answers
Hope this helps, and thanks again for the feedback. |
@hwthomas If the merge conflicts are caused by my pr, maybe there's something I can do to help? I don't have write access here, but I think the issue may be in the changes in MonoDevelop.Core.Tests.csproj. I think a local merge could help identify the conflicts, but could create conflicts in your other pr's, which also include these changes. |
@gluckez Thanks for your offer to help. The conflict is indeed in MonoDevelop.Core.Tests.csproj, where after your PR merge, I need to remove the line
If I were to rebase branch However, I'm not completely sure! And I'm not sure if doing a Edit: Or perhaps it's simplest just to deal with this conflict now, and handle any others as they arise? Any thoughts? |
@hwthomas I'm pretty sure merging main into net5ff_nuget and completing only that pr will do the trick. that branch is based on the branches you used for the other pr's, so there's no need to merge them all sequentially. the last branch includes all commits from previous pr's. If you still want to merge sequentially, then you'll have to rebase fix_issue_75 first, then sequentially rebase the other branches as well because it would cause new conflicts in the other pr's. |
@gluckez Many thanks for that advice - I'd been looking more at merging my commits into |
@gluckez That seems to have worked! I've merged the latest |
@hwthomas that's because net5ff_nuget includes the commits from this branch, but not the other way around. Your last pr was in fact updated and conflicts are resolved there. If you want to do the same here, you should also merge main into this branch. but it's not needed because all commits from all pr's will be merged if you merge #91 . it does look like the CI failed on that last pr, but that's again due to the certificate errors, I bet it'll run fine if you trigger it again. |
@gluckez thanks again - I've viewed the branches with |
Incorporate changes in PR#81 from @gluckez to fix conflicts
Merged as part of PR #96 |
If this above was not actioned, I would simply recommend retrying in CI about 3 times, as a workaround. Later when |
Oops, I've realised I already suggested this, here: #90 (comment) |
The checks for the support of netstandard projects (2.0 and 2.1) were outdated
This PR updates those checks for the current versions of Mono and dotnet-sdks
NB This PR requires PR #77 as well so I rebased my branch
ns2.1_fix
to the tip of branchfix_Issue_75
however
git
seems to have combined the commits from both these branches (which is correct, of course) but I was expecting them to be done as 2 separate PRs. One day I might get the hang ofgit
!