Skip to content
This repository has been archived by the owner on Oct 26, 2018. It is now read-only.

Target .NET Core 2.0 and .NET Framework 4.6.1 #72

Merged
merged 1 commit into from
Jun 8, 2017

Conversation

natemcmaster
Copy link
Contributor

Removes .NET Standard support.

See #70 (comment)

@@ -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);
Copy link
Member

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?

Copy link
Contributor Author

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.

Copy link
Member

Choose a reason for hiding this comment

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

Cool beans 👍

@@ -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;
Copy link
Member

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

@rynowak
Copy link
Member

rynowak commented Jun 8, 2017

:shipit:

@natemcmaster natemcmaster force-pushed the namc/no-netstandard branch from ff7692a to 9fe8578 Compare June 8, 2017 19:51
@natemcmaster natemcmaster merged commit 9fe8578 into dev Jun 8, 2017
@natemcmaster natemcmaster deleted the namc/no-netstandard branch June 8, 2017 19:51
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants