This repository has been archived by the owner on Oct 26, 2018. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 26
Target .NET Core 2.0 and .NET Framework 4.6.1 #72
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rynowak
reviewed
Jun 8, 2017
@@ -28,7 +28,7 @@ public static IDisposable SubscribeWithAdapter(this DiagnosticListener diagnosti | |||
Func<string, object, object, bool> isEnabled) | |||
{ | |||
var adapter = new DiagnosticSourceAdapter(target, isEnabled); | |||
return diagnostic.Subscribe(adapter, adapter.IsEnabled); | |||
return diagnostic.Subscribe(adapter, (Predicate<string>)adapter.IsEnabled); |
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.
Why are these changes required?
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.
.Subscribe has overloads in netcoreapp2.0/net461 that were not in ns1.3. The call was ambiguous.
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.
Cool beans 👍
rynowak
reviewed
Jun 8, 2017
@@ -154,7 +154,7 @@ internal static bool VerifyProxySupport(ProxyBuilderContext context, Tuple<Type, | |||
VerificationResult elementResult; | |||
context.Visited.TryGetValue(elementKey, out elementResult); | |||
|
|||
var proxyType = elementResult?.Type?.GetTypeInfo() ?? (TypeInfo)elementResult?.TypeBuilder; | |||
var proxyType = elementResult?.Type ?? elementResult?.TypeBuilder as Type; |
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.
This should be a c-style cast, it's never expected to fail
Eilon
approved these changes
Jun 8, 2017
natemcmaster
force-pushed
the
namc/no-netstandard
branch
from
June 8, 2017 19:51
ff7692a
to
9fe8578
Compare
Merged
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Removes .NET Standard support.
See #70 (comment)