Skip to content

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

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
Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

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

wants to merge 3 commits into from
+3,779 −1,185

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

Important

There are conflicts with the main branch in this PR. Apart from conflicts in the source files, this means there are unresolved conflicts in the codeflow metadata file src/source-manifest.json.
When resolving these, please use the (incoming/ours) version from the PR branch. The correct content should be this:

{
  "barId": 276758,
  "path": "sdk",
  "remoteUri": "https://github.com/dotnet/sdk",
  "commitSha": "d4e9bbcbe1f5ab6e4f53246d7a7bc892624453dc"
}

In case of unclarities, consult the FAQ or tag @dotnet/product-construction for assistance.

@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/3326797718ee206580a99e6a042c8d6aae9ec773
Files conflicting with the head branch:

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

@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/3326797718ee206580a99e6a042c8d6aae9ec773
Files conflicting with the head branch:

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
.NET Unified Build
Status: No status
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@akoeplinger