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.

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

Fix build errors after merging master to netcore #324

Merged
merged 22 commits into from
Feb 21, 2017

Conversation

jeremymeng
Copy link
Contributor

No description provided.

Martin Hammerschmied and others added 22 commits July 18, 2016 10:29
…, `object.Equals(object obj)` and `object.GetHashCode()`.
…s. Also fixed a couple of white space errors.
Allow for class mocks and interface mocks to mock System.Object methods
`System.Object` methods should always work.
…ct methods in the interceptor context. Fixes devlooped#273 (again :-)) (devlooped#280)
…ew VB test assembly, hopefully in a way people will be happy with (devlooped#291)
…ult rather than create a TaskCompletionSource
T4-generated overloads for ReturnsAsync(Func<T1, T2, ... TResult> value)
adds ReturnAsync extention method that accepts a Func<TResult>
* Fixes devlooped#278.  Only fixes some of the issue though.  Also adds new VB test assembly, hopefully in a way people will be happy with

* Another fix for issue devlooped#278 that no longer causes issue devlooped#295.
There is still problematic code in the Interceptor for comparing the arguments of calls, but for now it no longer causes a problem with propeties with arguments as the expression string builder now reports the arguments for property reads.
I've added a comment explaining the flaws (as I see them) in the Interceptor code in the hope that it will help when someone next as a problem, or at least stops them missing the same thing as I did earlier.
# Conflicts:
#	Moq.sln
#	Source/Extensions.cs
#	Source/InterceptorStrategies.cs
#	Source/Mock.cs
#	Source/Proxy/CastleProxyFactory.cs
#	UnitTests/Regressions/IssueReportsFixture.cs
It's unfortunate that conditional compilation directives cannnot
contain just part of a Xml Doc comment.
@kzu kzu merged commit cbaa6c0 into devlooped:netcore Feb 21, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants