gh-icsharpcode/NRefactory
Watch
1
0
Fork
You've already forked NRefactory
 0
Code Issues 64 Pull requests 8 Releases Wiki Activity

Fixed member lookup in static context #445

Open
yuske wants to merge 3 commits from yuske/master into master
pull from: yuske/master
merge into: gh-icsharpcode:master
Conversation 0 Commits 3 Files changed 10 +62 -24
yuske commented 2014-09-26 10:31:43 -05:00 (Migrated from github.com)

I've fixed member lookup in resolver for static context case. For details see unit test InstanceMethodCallInStaticContext in Resolver/MemberLookupTests.cs. Also I've made minor fixes initial buildable of projects (changed OutputPath and HintPath).

I've fixed member lookup in resolver for static context case. For details see unit test InstanceMethodCallInStaticContext in Resolver/MemberLookupTests.cs. Also I've made minor fixes initial buildable of projects (changed OutputPath and HintPath).
This pull request has changes conflicting with the target branch.
  • ICSharpCode.NRefactory.Cecil/ICSharpCode.NRefactory.Cecil.csproj
  • ICSharpCode.NRefactory.Tests/ICSharpCode.NRefactory.Tests.csproj
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin 'yuske/master:yuske/master'
git switch 'yuske/master'

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch 'master'
git merge --no-ff 'yuske/master'
git switch 'yuske/master'
git rebase 'master'
git switch 'master'
git merge --ff-only 'yuske/master'
git switch 'yuske/master'
git rebase 'master'
git switch 'master'
git merge --no-ff 'yuske/master'
git switch 'master'
git merge --squash 'yuske/master'
git switch 'master'
git merge --ff-only 'yuske/master'
git switch 'master'
git merge 'yuske/master'
git push origin 'master'
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
Bug

   
Feature Request

   
NR6Pack
No labels
Bug
Feature Request
NR6Pack
Milestone
Clear milestone
No items
No milestone
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference
gh-icsharpcode/NRefactory!445
No description provided.