Add net461 as a separate target for Elastic.Apm #277
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
gregkalapos
commented
Jun 13, 2019
| @@ -39,7 +39,7 @@ static ElasticApmModule() | |||
| private HttpApplication _httpApp; | |||
|
|
|||
| private static Version AspNetVersion => typeof(HttpRuntime).Assembly.GetName().Version; | |||
| private static string ClrDescription => RuntimeInformation.FrameworkDescription; | |||
| private static string ClrDescription => "aaa"; // RuntimeInformation.FrameworkDescription; | |||
There was a problem hiding this comment.
Fix is already on @SergeyKleyman's machine.
|
As I want to validate whether the GH notification checks are fine, I'll say |
Codecov Report
@@ Coverage Diff @@
## master #277 +/- ##
==========================================
+ Coverage 79.57% 79.84% +0.26%
==========================================
Files 71 71
Lines 2326 2287 -39
Branches 417 411 -6
==========================================
- Hits 1851 1826 -25
+ Misses 300 283 -17
- Partials 175 178 +3
Continue to review full report at Codecov.
|
…ption in ElasticApmModule.cs
|
Merging this. ❗️ Very important ❗️ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
#248 seems to break our Full Framework code, mainly because it adds
System.Diagnostics.PerformanceCounteras a dependency toElastic.Apm. We use thePerformanceCountertype from this package, but it turns out that this type is inSystem.dllin case ofnet461. The problem itself isn't specific to this class, I suspect we'd have this later with other things (so as a quick and sloppy summary: usingnetstandard2.0onnet461is a pain,net461should be a separate target, and that's what this PR proposes).The recommendation from Microsoft is also to target
net461andnetstandard2.0separately.Current problems/questions:
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>toElastic.Apmbuilds will fail on Linux (CI) and macOS (my dev machine). Therefore I added<PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">checks to only buildnet461on Windows. I'm not 100% sure this is a good idea, because in this case the generated NuGet packages contain an additionalnet461dll on Windows, but those are missing when we generate the packages on a non Windows OSs. I think this is very dangerous, because we may end up with a release where thenet461Elastic.Apmdll is missing. Open for ideas on how to solve this, otherwise we can go with this and think about it later.@SergeyKleyman feel free to push your fix to the
RuntimeInformation.FrameworkDescriptionissue.