-
Notifications
You must be signed in to change notification settings - Fork 786
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
[repo] Fix conflicts caused by DS upgrade #4967
[repo] Fix conflicts caused by DS upgrade #4967
Conversation
Codecov Report
@@ Coverage Diff @@
## main #4967 +/- ##
==========================================
+ Coverage 83.30% 83.33% +0.03%
==========================================
Files 295 295
Lines 12361 12361
==========================================
+ Hits 10297 10301 +4
+ Misses 2064 2060 -4
Flags with carried forward coverage won't be shown. Click here to find out more. |
test/OpenTelemetry.Instrumentation.Grpc.Tests/OpenTelemetry.Instrumentation.Grpc.Tests.csproj
Outdated
Show resolved
Hide resolved
…nch/opentelemetry-dotnet into reference-conflict-fixes
@@ -1,6 +1,7 @@ | |||
<Project> | |||
<ItemGroup> | |||
<SolutionProjects Include="..\**\OpenTelemetry.Instrumentation*.csproj" /> | |||
<TestProjects Include="..\test\**\OpenTelemetry.Instrumentation*.csproj" /> |
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 add this? Did you mean to update the instrumentation libraries CI workflow to use this InstrumentationLibraries.proj
file to run tests?
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.
I updated the workflow to call dotnet test InstrumentationLibraries.proj --framework ${{matrix.version}}
but then it fails when some projects don't have a specific target (some libraries don't target net462
for example) so I had to revert it. I left the test targets in InstrumentationLibraries.proj
& OpenTelemetry.proj
though because I thought it was nice to be able to do dotnet test [project_name].proj
on the CLI for local things. But I can remove them if you want they aren't officially being called at the moment. My thinking is basically project files should define at least Restore
, Build
, and VSTest
targets (that's what I'm doing over here on contrib).
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.
I think it's fine to have them defined.
It looks like #4959 introduced some assembly conflicts:
https://github.com/open-telemetry/opentelemetry-dotnet/actions/runs/6554128228/job/17800577378#step:5:35
These were not caught by CI!
Phase 1 - Surface issues:
Set
MSBuildTreatWarningsAsErrors
totrue
to surface these issues in CI.Update: Seems to have worked: https://github.com/open-telemetry/opentelemetry-dotnet/actions/runs/6578376590/job/17871987060?pr=4967#step:5:225
Phase 2 - Fixes:
https://github.com/open-telemetry/opentelemetry-dotnet/pull/4967/files#diff-1a3d043822adecb40bb0b87696fa8303d343b91f7027b0ea2987e8e80ae1b0cfR48bae46cdMSBuildTreatWarningsAsErrors
caused some other issues like package validation workflow was failing with errors on projects withIsPackable = false
. Fixed that by usingOpenTelemetry.proj
instead of the solution for the pack target.-p:RunningDotNetPack=true
directly instead of using an envvar. The envvar is too easy to miss!