Skip to content

Merge master into vnext (20261110) - #2166

Merged
Tyrie Vella (tyrielv) merged 7 commits into
microsoft:vnextfrom
tyrielv:tyrielv/merge-master-to-vnext-20261110
Nov 11, 2026
Merged

Tyrie Vella (tyrielv) merged 7 commits into
microsoft:vnextfrom
tyrielv:tyrielv/merge-master-to-vnext-20261110

Conversation

@tyrielv

Copy link
Copy Markdown
Contributor

Problem and Context

vnext lacks six commits from master, including the unit-test Git discovery fix.
This routine forward merge brings those changes into vnext and preserves the shared merge history.

Changes

dependabot Bot and others added 7 commits November 10, 2026 14:33
Bumps [actions/setup-dotnet](https://github.com/actions/setup-dotnet) from 6.0.0 to 6.1.0.
- [Release notes](https://github.com/actions/setup-dotnet/releases)
- [Commits](actions/setup-dotnet@a98b568...0f4a354)

---
updated-dependencies:
- dependency-name: actions/setup-dotnet
  dependency-version: 6.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Find Git through PATH instead of a fixed system installation directory.
Share the resolver across the Git-dependent test fixtures.
Preserve missing-Git failure and skip policies.
Keep metadata-only worktree tests on a mock Git path.

Add filesystem-only tests for search order, quoted directories, empty
entries, relative paths, and absent Git.

Assisted-by: GPT-6.1 Sol
Signed-off-by: Tyrie Vella <tyrielv@gmail.com>
Keep semicolons inside quoted PATH directories.
Add a filesystem-only regression case for that directory shape.
Compare resolved Windows paths without case sensitivity.
Use one Git prerequisite guard across authentication test entry points.

Assisted-by: GPT-6.1 Sol
Signed-off-by: Tyrie Vella <tyrielv@gmail.com>
…tions/actions/setup-dotnet-6.1.0

Bump actions/setup-dotnet from 6.0.0 to 6.1.0
Resolve Git through PATH in both tests that reject the shared config ID.
Keep all three enlistment constructions on the real Git executable.

Assisted-by: GPT-6.1 Sol
Signed-off-by: Tyrie Vella <tyrielv@gmail.com>
…path

Resolve unit-test Git dependencies through PATH
Include unit-test Git discovery through PATH and actions/setup-dotnet 6.1.0.
Preserve the complete master merge history.

Assisted-by: GPT-6.1 Sol
Signed-off-by: Tyrie Vella <tyrielv@gmail.com>
@KeithIsSleeping

Copy link
Copy Markdown

[KeithBot]: ✅ No issues found · iteration 1 (c6530ab)

Validation

  • ✅ Merge purity: remerge-diff + merge-tree
  • ✅ CI run: 34/34 jobs green on PR tree
  • ✅ Unit suite: 1875 head vs 1867 base
  • ✅ Real-Git fixtures via PATH (282 cases)
  • ✅ setup-dotnet v6.1.0 SHA pin

Approving.

🤖 KeithBot · claude-opus-5.5 · reply on a thread to dispute

@tyrielv
Tyrie Vella (tyrielv) merged commit 119082a into microsoft:vnext Nov 11, 2026
35 checks passed
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.

2 participants