Skip to content

[main] Source code updates from dotnet/source-build-assets - #7604

Merged
mthalman merged 6 commits into
mainfrom
darc-main-5c28b7b9-ddd1-4563-aca7-a75e627801e7
Jul 10, 2026
Merged

[main] Source code updates from dotnet/source-build-assets#7604
mthalman merged 6 commits into
mainfrom
darc-main-5c28b7b9-ddd1-4563-aca7-a75e627801e7

Conversation

@dotnet-maestro

@dotnet-maestro dotnet-maestro Bot commented Jul 9, 2026

Copy link
Copy Markdown
Contributor

Note

This is a codeflow update. It may contain both source code changes from
the source repo
as well as dependency updates. Learn more here.

This pull request brings the following source code changes

From https://github.com/dotnet/source-build-assets

Diff the source with this PR branch
darc vmr diff --name-only https://github.com/dotnet/source-build-assets:fabc140df32321079f5fff2f297fab380d47b50c..https://github.com/dotnet/dotnet:darc-main-5c28b7b9-ddd1-4563-aca7-a75e627801e7

@dotnet-maestro

dotnet-maestro Bot commented Jul 9, 2026

Copy link
Copy Markdown
Contributor Author

@dotnet-policy-service
dotnet-policy-service Bot requested a review from a team July 9, 2026 02:09
@akoeplinger

Copy link
Copy Markdown
Member
  CSC : error CS1705: Assembly 'OpenTelemetry' with identity 'OpenTelemetry, Version=1.15.3.0, Culture=neutral, PublicKeyToken=7bd6737fe5b67e3c' uses 'OpenTelemetry.Api, Version=1.15.3.0, Culture=neutral, PublicKeyToken=7bd6737fe5b67e3c' which has a higher version than referenced assembly 'OpenTelemetry.Api' with identity 'OpenTelemetry.Api, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7bd6737fe5b67e3c' [/__w/1/s/src/sdk/src/Cli/dotnet/dotnet.csproj]
  CSC : error CS1705: Assembly 'OpenTelemetry.Exporter.OpenTelemetryProtocol' with identity 'OpenTelemetry.Exporter.OpenTelemetryProtocol, Version=1.15.3.0, Culture=neutral, PublicKeyToken=7bd6737fe5b67e3c' uses 'OpenTelemetry.Api, Version=1.15.3.0, Culture=neutral, PublicKeyToken=7bd6737fe5b67e3c' which has a higher version than referenced assembly 'OpenTelemetry.Api' with identity 'OpenTelemetry.Api, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7bd6737fe5b67e3c' [/__w/1/s/src/sdk/src/Cli/dotnet/dotnet.csproj]
  CSC : error CS1705: Assembly 'OpenTelemetry.Exporter.InMemory' with identity 'OpenTelemetry.Exporter.InMemory, Version=1.15.3.0, Culture=neutral, PublicKeyToken=7bd6737fe5b67e3c' uses 'OpenTelemetry.Api, Version=1.15.3.0, Culture=neutral, PublicKeyToken=7bd6737fe5b67e3c' which has a higher version than referenced assembly 'OpenTelemetry.Api' with identity 'OpenTelemetry.Api, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7bd6737fe5b67e3c' [/__w/1/s/src/sdk/src/Cli/dotnet/dotnet.csproj]

@baronfel @mthalman failures related to the OTel bumps

@baronfel

baronfel commented Jul 9, 2026

Copy link
Copy Markdown
Member

@akoeplinger taking a look now

@baronfel

baronfel commented Jul 9, 2026

Copy link
Copy Markdown
Member

@akoeplinger I bumped the SB versions to 1.16.0 ahead of bumping the SDK - if I bump the SDK would that clear this up?

@baronfel

baronfel commented Jul 9, 2026

Copy link
Copy Markdown
Member

SDK bump is merged, should flow here soon.

@mthalman

Copy link
Copy Markdown
Member

This needs #7651. Both PRs are dependent on each other. I'll get things merged.

…8-914d6782d34b' into darc-main-5c28b7b9-ddd1-4563-aca7-a75e627801e7
@mthalman

Copy link
Copy Markdown
Member

Done. Needs another reviewer.

@mthalman
mthalman merged commit 6abd65d into main Jul 10, 2026
14 of 16 checks passed
@mthalman
mthalman deleted the darc-main-5c28b7b9-ddd1-4563-aca7-a75e627801e7 branch July 10, 2026 22:00
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