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

simplify ifdef #1010

Merged
merged 2 commits into from
May 24, 2021
Merged

simplify ifdef #1010

merged 2 commits into from
May 24, 2021

Conversation

bruno-garcia
Copy link
Member

No description provided.

SetNetFxReleaseAndVersion(runtime);
#elif NETSTANDARD || NETCOREAPP // Possibly .NET Core
#else
Copy link
Member Author

Choose a reason for hiding this comment

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

I think we had a bug here since NETCOREAPP was not defined in the csproj

@@ -75,15 +75,15 @@ internal static void SetNetFxReleaseAndVersion(Runtime runtime)
}
#endif

#if NETSTANDARD || NETCOREAPP // Possibly .NET Core
#if !NET461
Copy link
Member Author

Choose a reason for hiding this comment

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

Also here

@bruno-garcia bruno-garcia requested review from Tyrrrz and lucas-zimerman and removed request for Tyrrrz May 24, 2021 16:19
@codecov-commenter
Copy link

codecov-commenter commented May 24, 2021

Codecov Report

Merging #1010 (8898069) into main (796890b) will increase coverage by 0.25%.
The diff coverage is 75.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #1010      +/-   ##
==========================================
+ Coverage   81.24%   81.49%   +0.25%     
==========================================
  Files         184      184              
  Lines        5907     5907              
  Branches     1456     1456              
==========================================
+ Hits         4799     4814      +15     
+ Misses        691      676      -15     
  Partials      417      417              
Impacted Files Coverage Δ
src/Sentry/DefaultSentryScopeStateProcessor.cs 64.70% <ø> (ø)
src/Sentry/IHasBreadcrumbs.cs 83.33% <ø> (+38.88%) ⬆️
...ntry/Integrations/NetFxInstallationsIntegration.cs 100.00% <ø> (ø)
...Sentry/PlatformAbstractions/FrameworkInfo.NetFx.cs 71.23% <ø> (ø)
.../PlatformAbstractions/FrameworkInfo.NetStandard.cs 100.00% <ø> (ø)
...rmAbstractions/NetFxInstallationsEventProcessor.cs 72.72% <ø> (ø)
...ntry/PlatformAbstractions/RegistryKeyExtensions.cs 100.00% <ø> (ø)
src/Sentry/PlatformAbstractions/RuntimeInfo.cs 58.62% <ø> (ø)
src/Sentry/SentryOptionsExtensions.cs 71.42% <ø> (ø)
src/Sentry/PlatformAbstractions/Runtime.cs 43.90% <66.66%> (ø)
... and 3 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 796890b...8898069. Read the comment docs.

@@ -38,7 +38,7 @@ public void Apply(Scope scope, object state)

break;
}
#if HAS_VALUE_TUPLE
#if !NET461
Copy link
Contributor

Choose a reason for hiding this comment

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

Note: we can bring ValueTuple to .NET461 with: https://www.nuget.org/packages/System.ValueTuple/
This will remove the need for this if/defs

Copy link
Member Author

Choose a reason for hiding this comment

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

I had that originally and it cause a WORLD of pain (binding redirects), so I removed it

@bruno-garcia bruno-garcia merged commit 6b60f9c into main May 24, 2021
@bruno-garcia bruno-garcia deleted the ref/ifdef branch May 24, 2021 19:31
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.

3 participants