[Instrumentation.WCF] Switch .NET6 to .NET8 #2263
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
github-actions
bot
added
the
comp:instrumentation.wcf
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #2263 +/- ##
==========================================
+ Coverage 73.91% 78.34% +4.43%
==========================================
Files 267 29 -238
Lines 9615 702 -8913
==========================================
- Hits 7107 550 -6557
+ Misses 2508 152 -2356
Flags with carried forward coverage won't be shown. Click here to find out more. |
CodeBlanch
reviewed
Oct 29, 2024
| @@ -23,10 +23,10 @@ | |||
| <Reference Include="System.ServiceModel" /> | |||
| </ItemGroup> | |||
|
|
|||
| <ItemGroup Condition="'$(TargetFramework)' == '$(NetStandardMinimumSupportedVersion)' OR '$(TargetFramework)' == 'net6.0' " > | |||
| <ItemGroup Condition="'$(TargetFramework)' == '$(NetStandardMinimumSupportedVersion)' OR '$(TargetFramework)' == '$(NetMinimumSupportedVersion)' " > | |||
There was a problem hiding this comment.
I would switch this to detect .NETCoreApp so it doesn't need adjustment if some other target (eg $(NetMinimumSupportedVersion);net9.0) is added.
<ItemGroup Condition="'$(TargetFramework)' == '$(NetStandardMinimumSupportedVersion)' OR '$(TargetFrameworkIdentifier)' == '.NETCoreApp'">
<PackageReference Include="System.Security.Cryptography.Xml" Version="4.7.1" />
<PackageReference Include="System.ServiceModel.Primitives" Version="4.7.0" />
<PackageReference Include="System.Drawing.Common" Version="4.7.2" Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'" />
</ItemGroup>But also consider bumping to 8.0.0 versions for net8.0+:
<ItemGroup Condition="'$(TargetFramework)' == '$(NetStandardMinimumSupportedVersion)'">
<PackageReference Include="System.ServiceModel.Primitives" Version="4.7.0" />
<!-- System.Security.Cryptography.Xml is indirect reference. It is needed to upgrade it directly to avoid https://github.com/advisories/GHSA-rxg9-xrhp-64gj -->
<PackageReference Include="System.Security.Cryptography.Xml" Version="4.7.1" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'">
<PackageReference Include="System.ServiceModel.Primitives" Version="8.0.0" />
<!-- System.Security.Cryptography.Xml is indirect reference. It is needed to upgrade it directly to avoid https://github.com/advisories/GHSA-555c-2p6r-68mm -->
<PackageReference Include="System.Security.Cryptography.Xml" Version="8.0.2" />
</ItemGroup>The 8.0.0 versions don't bring in System.Drawing.Common at all. The current form will force System.Drawing.Common onto users who may have already bumped to 8.0.0 to eliminate it 🤔
There was a problem hiding this comment.
First part done. Second deferred to #2274
Kielek
added a commit
to Kielek/opentelemetry-dotnet-contrib
that referenced
this pull request
Oct 30, 2024
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.
Follow up to #2243
Changes
[Instrumentation.WCF] Switch .NET6 to .NET8
Merge requirement checklist
CHANGELOG.mdfiles updated for non-trivial changes[ ] Changes in public API reviewed (if applicable)