Skip to content

[main] Source code updates from dotnet/sdk #1582

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 4 commits into from
Jul 25, 2025
Merged

[main] Source code updates from dotnet/sdk #1582

merged 4 commits into from
Jul 25, 2025

Conversation

dotnet-maestro[bot]
Copy link
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/sdk

@dotnet-maestro DotNet Maestro
Copy link
Contributor Author

There was a conflict in the PR branch when flowing source from https://github.com/nuget/nuget.client/tree/c21ba3b47e224cf84490bdc53b89e7f9ebcc1841
Files conflicting with the head branch:

Updates from this subscription will be blocked until the conflict is resolved, or the PR is merged

@akoeplinger
Copy link
Member

New prebuilts caused by dotnet/sdk#49749

/__w/1/s/eng/finish-source-only.proj(136,5): error : 1 new packages used not in baseline! See report at /__w/1/s/artifacts/log/Release/baseline-comparison.xml for more information. Package IDs are:
/__w/1/s/eng/finish-source-only.proj(136,5): error : System.Diagnostics.DiagnosticSource.10.0.0-preview.7.25359.101
##[error]eng/finish-source-only.proj(136,5): error : (NETCORE_ENGINEERING_TELEMETRY=Build) 1 new packages used not in baseline! See report at /__w/1/s/artifacts/log/Release/baseline-comparison.xml for more information. Package IDs are:
System.Diagnostics.DiagnosticSource.10.0.0-preview.7.25359.101
/__w/1/s/eng/finish-source-only.proj(136,5): error : 1 forbidden test usages found in 1 projects:
/__w/1/s/eng/finish-source-only.proj(136,5): error : artifacts/obj/sdk/project-assets-json/obj/Tests/Microsoft.DotNet.Cli.Utils/project.assets.json
##[error]eng/finish-source-only.proj(136,5): error : (NETCORE_ENGINEERING_TELEMETRY=Build) 1 forbidden test usages found in 1 projects:
artifacts/obj/sdk/project-assets-json/obj/Tests/Microsoft.DotNet.Cli.Utils/project.assets.json
/__w/1/s/eng/finish-source-only.proj(136,5): error : Prebuilt usages are different from the baseline. If detected changes are acceptable, update baseline with:
/__w/1/s/eng/finish-source-only.proj(136,5): error : cp '/__w/1/s/artifacts/log/Release/generated-new-baseline.xml' '/__w/1/s/eng/tools/prebuilt-baseline.xml'

/cc @dotnet/source-build

@dotnet-maestro DotNet Maestro
Copy link
Contributor Author

There was a conflict in the PR branch when flowing source from https://github.com/nuget/nuget.client/tree/c21ba3b47e224cf84490bdc53b89e7f9ebcc1841
Files conflicting with the head branch:

Updates from this subscription will be blocked until the conflict is resolved, or the PR is merged

@akoeplinger
Copy link
Member

New error:

src/sdk/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj(0,0): error NU1510: (NETCORE_ENGINEERING_TELEMETRY=Restore) Warning As Error: PackageReference System.Diagnostics.DiagnosticSource will not be pruned. Consider removing this package from your dependencies, as it is likely unnecessary.

@akoeplinger
Copy link
Member

@baronfel do you know why Microsoft.DotNet.Cli.Utils.csproj still targets net472? I don't see any obvious usages in netframework projects

@dotnet-maestro dotnet-maestro bot merged commit 00380ad into main Jul 25, 2025
15 checks passed
@dotnet-maestro dotnet-maestro bot deleted the darc-main-959a064b-4e42-4ec4-9b40-1c10d03965d1 branch July 25, 2025 09:18
@akoeplinger akoeplinger mentioned this pull request Jul 25, 2025
Merged
@baronfel
Copy link
Member

@akoeplinger looks like it's a dependency of our test framework, which needs to be able to run both netfx and net targets for our testing

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@akoeplinger akoeplinger akoeplinger approved these changes

Assignees
No one assigned
Labels
None yet
Projects
.NET Unified Build
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@akoeplinger @baronfel @ellahathaway