Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

[release/11.0.1xx-preview6] Source code updates from nuget/nuget.client - #7355

#7355
Merged
dotnet-maestro[bot] merged 2 commits into
release/11.0.1xx-preview6dotnet/dotnet:release/11.0.1xx-preview6from
darc-release/11.0.1xx-preview6-6fee09c8-67a7-45d5-b123-7eba4e553d76dotnet/dotnet:darc-release/11.0.1xx-preview6-6fee09c8-67a7-45d5-b123-7eba4e553d76Copy head branch name to clipboard
Jun 25, 2026
Merged

[release/11.0.1xx-preview6] Source code updates from nuget/nuget.client#7355
dotnet-maestro[bot] merged 2 commits into
release/11.0.1xx-preview6dotnet/dotnet:release/11.0.1xx-preview6from
darc-release/11.0.1xx-preview6-6fee09c8-67a7-45d5-b123-7eba4e553d76dotnet/dotnet:darc-release/11.0.1xx-preview6-6fee09c8-67a7-45d5-b123-7eba4e553d76Copy head branch name to clipboard

Conversation

@dotnet-maestro

@dotnet-maestro dotnet-maestro Bot commented Jun 24, 2026 •
edited
Loading

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/nuget/nuget.client

Diff the source with this PR branch 
darc vmr diff --name-only https://github.com/nuget/nuget.client:097edf1fd3fc849850e3ec3c6236db8260572a0f..https://github.com/dotnet/dotnet:darc-release/11.0.1xx-preview6-6fee09c8-67a7-45d5-b123-7eba4e553d76

@dotnet-maestro

dotnet-maestro Bot commented Jun 24, 2026

Copy link
Copy Markdown
Contributor Author

Caution

🚨 Action Required — Conflict detected

A conflict was detected when trying to update this PR with changes from build 320068 of https://github.com/nuget/nuget.client/tree/a2674b0d0381f599f8dd03e932e4fb5bf5399da3.

The conflicts in the following files need to be manually resolved:

ℹ️ To resolve the conflicts, please follow these steps:

  1. Clone the current repository

    git clone https://github.com/dotnet/dotnet
cd dotnet

  2. Make sure your darc is up-to-date
    (version 1.1.0-beta.26322.2 or higher)

    # Linux / MacOS
./eng/common/darc-init.sh
# or on Windows
.\eng\common\darc-init.ps1

  3. Run from repo's git clone and follow the instructions provided by the command to stage the conflict locally

    darc vmr resolve-conflict --subscription a1f7e677-1d23-499a-9d1e-e79f16b78627

    This should apply the build 320068 with sources from a2674b0

  4. Resolve the conflicts, commit & push the changes

  5. Once pushed, the Codeflow verification check will turn green.
    If not, a new build might have flown into the PR and you might need to run the command above again.

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@dotnet-maestro

dotnet-maestro Bot commented Jun 24, 2026

Copy link
Copy Markdown
Contributor Author

Note

PRs from original repository included in this codeflow update:

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@dotnet-maestro

dotnet-maestro Bot commented Jun 24, 2026

Copy link
Copy Markdown
Contributor Author

Caution

🚨 Action Required — Conflict detected

A conflict was detected when trying to update this PR with changes from build 320070 of https://github.com/nuget/nuget.client/tree/9ce79e9b9daef742920235c2ea89eb2cbd5e0afa.

The conflicts in the following files need to be manually resolved:

ℹ️ To resolve the conflicts, please follow these steps:

  1. Clone the current repository

    git clone https://github.com/dotnet/dotnet
cd dotnet

  2. Make sure your darc is up-to-date
    (version 1.1.0-beta.26322.2 or higher)

    # Linux / MacOS
./eng/common/darc-init.sh
# or on Windows
.\eng\common\darc-init.ps1

  3. Run from repo's git clone and follow the instructions provided by the command to stage the conflict locally

    darc vmr resolve-conflict --subscription a1f7e677-1d23-499a-9d1e-e79f16b78627

    This should apply the build 320070 with sources from 9ce79e9

  4. Resolve the conflicts, commit & push the changes

  5. Once pushed, the Codeflow verification check will turn green.
    If not, a new build might have flown into the PR and you might need to run the command above again.

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@dotnet-maestro

dotnet-maestro Bot commented Jun 24, 2026

Copy link
Copy Markdown
Contributor Author

Note

PRs from original repository included in this codeflow update:

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@dotnet-maestro
dotnet-maestro Bot force-pushed the darc-release/11.0.1xx-preview6-6fee09c8-67a7-45d5-b123-7eba4e553d76 branch from 40533d5 to 9a1b5d8 Compare June 25, 2026 02:20
@dotnet-maestro

dotnet-maestro Bot commented Jun 25, 2026

Copy link
Copy Markdown
Contributor Author

Caution

🚨 Action Required — Conflict detected

A conflict was detected when trying to update this PR with changes from build 320151 of https://github.com/nuget/nuget.client/tree/e38a45fe881041fdc7b2acf437e4c17e681b8fb1.

The conflicts in the following files need to be manually resolved:

ℹ️ To resolve the conflicts, please follow these steps:

  1. Clone the current repository

    git clone https://github.com/dotnet/dotnet
cd dotnet

  2. Make sure your darc is up-to-date
    (version 1.1.0-beta.26322.2 or higher)

    # Linux / MacOS
./eng/common/darc-init.sh
# or on Windows
.\eng\common\darc-init.ps1

  3. Run from repo's git clone and follow the instructions provided by the command to stage the conflict locally

    darc vmr resolve-conflict --subscription a1f7e677-1d23-499a-9d1e-e79f16b78627

    This should apply the build 320151 with sources from e38a45f

  4. Resolve the conflicts, commit & push the changes

  5. Once pushed, the Codeflow verification check will turn green.
    If not, a new build might have flown into the PR and you might need to run the command above again.

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@dotnet-maestro

dotnet-maestro Bot commented Jun 25, 2026

Copy link
Copy Markdown
Contributor Author

Note

PRs from original repository included in this codeflow update:

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@dotnet-maestro
dotnet-maestro Bot force-pushed the darc-release/11.0.1xx-preview6-6fee09c8-67a7-45d5-b123-7eba4e553d76 branch from 9a1b5d8 to c613aed Compare June 25, 2026 17:50
@dotnet-maestro

dotnet-maestro Bot commented Jun 25, 2026

Copy link
Copy Markdown
Contributor Author

Caution

🚨 Action Required — Conflict detected

A conflict was detected when trying to update this PR with changes from build 320235 of https://github.com/nuget/nuget.client/tree/5834c6b92104a694734368df6ee6b77bad6094de.

The conflicts in the following files need to be manually resolved:

ℹ️ To resolve the conflicts, please follow these steps:

  1. Clone the current repository

    git clone https://github.com/dotnet/dotnet
cd dotnet

  2. Make sure your darc is up-to-date
    (version 1.1.0-beta.26322.2 or higher)

    # Linux / MacOS
./eng/common/darc-init.sh
# or on Windows
.\eng\common\darc-init.ps1

  3. Run from repo's git clone and follow the instructions provided by the command to stage the conflict locally

    darc vmr resolve-conflict --subscription a1f7e677-1d23-499a-9d1e-e79f16b78627

    This should apply the build 320235 with sources from 5834c6b

  4. Resolve the conflicts, commit & push the changes

  5. Once pushed, the Codeflow verification check will turn green.
    If not, a new build might have flown into the PR and you might need to run the command above again.

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@dotnet-maestro

dotnet-maestro Bot commented Jun 25, 2026

Copy link
Copy Markdown
Contributor Author

Note

PRs from original repository included in this codeflow update:

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@dotnet-maestro

dotnet-maestro Bot commented Jun 25, 2026

Copy link
Copy Markdown
Contributor Author

Caution

🚨 Action Required — Conflict detected

A conflict was detected when trying to update this PR with changes from build 320240 of https://github.com/nuget/nuget.client/tree/097edf1fd3fc849850e3ec3c6236db8260572a0f.

The conflicts in the following files need to be manually resolved:

ℹ️ To resolve the conflicts, please follow these steps:

  1. Clone the current repository

    git clone https://github.com/dotnet/dotnet
cd dotnet

  2. Make sure your darc is up-to-date
    (version 1.1.0-beta.26322.2 or higher)

    # Linux / MacOS
./eng/common/darc-init.sh
# or on Windows
.\eng\common\darc-init.ps1

  3. Run from repo's git clone and follow the instructions provided by the command to stage the conflict locally

    darc vmr resolve-conflict --subscription a1f7e677-1d23-499a-9d1e-e79f16b78627

    This should apply the build 320240 with sources from 097edf1

  4. Resolve the conflicts, commit & push the changes

  5. Once pushed, the Codeflow verification check will turn green.
    If not, a new build might have flown into the PR and you might need to run the command above again.

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@dotnet-maestro

dotnet-maestro Bot commented Jun 25, 2026

Copy link
Copy Markdown
Contributor Author

Note

PRs from original repository included in this codeflow update:

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@lewing
Resolve conflict in src/nuget-client/Directory.Packages.props
e793dce 
nuget.client upgraded Microsoft.Internal.VisualStudio.Shell.Framework from
17.10.40173 to 18.8.850 as part of a VS17->VS18 sweep (matching the bump
of Microsoft.VisualStudio.ComponentModelHost). The VMR side had not moved
from the previous-flow value, so taking the incoming nuget.client version
is the correct resolution.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@dotnet-policy-service
dotnet-policy-service Bot requested a review from a team June 25, 2026 20:18
lewing added a commit that referenced this pull request Jun 25, 2026
@lewing
Resolve conflict in src/nuget-client/Directory.Packages.props
452904d 
nuget.client upgraded Microsoft.Internal.VisualStudio.Shell.Framework from
17.10.40173 to 18.8.850 as part of a VS17->VS18 sweep. VMR side had not
moved from the previous-flow value, so taking the incoming version is the
correct resolution. Mirrors the resolution applied to PR #7355.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@dotnet-maestro
dotnet-maestro Bot merged commit 4451d73 into release/11.0.1xx-preview6 Jun 25, 2026
16 checks passed
@dotnet-maestro
dotnet-maestro Bot deleted the darc-release/11.0.1xx-preview6-6fee09c8-67a7-45d5-b123-7eba4e553d76 branch June 25, 2026 23:02
@dotnet-policy-service
dotnet-policy-service Bot requested a review from a team June 25, 2026 23:08
dotnet-maestro Bot added a commit that referenced this pull request Jun 26, 2026
@dotnet-maestro
[main] Source code updates from nuget/nuget.client (#7339)
e8cf72e 
[main] Source code updates from nuget/nuget.client


 - Resolve conflict in src/nuget-client/Directory.Packages.props

nuget.client upgraded Microsoft.Internal.VisualStudio.Shell.Framework from
17.10.40173 to 18.8.850 as part of a VS17->VS18 sweep. VMR side had not
moved from the previous-flow value, so taking the incoming version is the
correct resolution. Mirrors the resolution applied to PR #7355.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Nigusu-Allehu Nigusu-Allehu Nigusu-Allehu approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@Nigusu-Allehu @lewing
Morty Proxy This is a proxified and sanitized view of the page, visit original site.