Skip to content

Merge latest from Library.Template#387

Merged
AArnott merged 22 commits into
mainfrom
aarnott/template-merge
Jun 10, 2026
Merged

Merge latest from Library.Template#387
AArnott merged 22 commits into
mainfrom
aarnott/template-merge

Conversation

@AArnott

@AArnott AArnott commented Jun 10, 2026

Copy link
Copy Markdown
Member

Summary

  • merge the latest Library.Template microbuild updates into this repo
  • update workflow pins, tool versions, and template-managed packages/scripts
  • resolve the Directory.Packages.props conflict in favor of MicrosoftTestingPlatformVersion 2.2.3

Validation

  • dotnet restore
  • dotnet build
  • tools/dotnet-test-cloud.ps1

renovate Bot and others added 22 commits May 15, 2026 17:48
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
… (519)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
… (520)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…earch (#513)

* Fix Install-DotNetSdk.ps1 hang from recursive Directory.Build.props search

The Get-ChildItem call applied -Recurse to all three path arguments,
including Directory.Build.props. PowerShell splits this into container
+ leaf filter, so -Recurse causes it to search the entire repo root
for every file named Directory.Build.props, crawling into large
directories (bin, obj, tmp, etc.) and causing the script to hang.

Split the call so -Recurse only applies to the src/ and test/ project
file globs. Directory.Build.props is fetched with Get-Item -LiteralPath
(single file, no recursion, no wildcard interpretation).

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Recursively search src/ and test/ for Directory.Build.props

Address review feedback: keep recursive Directory.Build.props discovery under src/ and test/, while still picking up the repo-root file. Avoids crawling top-level bin/obj/tmp directories.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: drognanar <3418274+drognanar@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* Update Dockerfile and global.json updates to v10.0.301

* Bump global.json too

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Andrew Arnott <andrew.arnott@microsoft.com>
Specifically, this merges 6c56573 from https://github.com/aarnott/Library.Template.

Resolved the Directory.Packages.props merge conflict by taking the incoming MicrosoftTestingPlatformVersion 2.2.3 while preserving the repo's existing package structure.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot AI review requested due to automatic review settings June 10, 2026 13:02
@AArnott AArnott enabled auto-merge June 10, 2026 13:02

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Merges the latest Library.Template updates into the repo, refreshing SDK/tooling versions and updating template-managed dependencies and workflow pins to match the template baseline.

Changes:

  • Bump .NET SDK from 10.0.300 to 10.0.301 via global.json.
  • Update centrally-managed package/tool versions (notably Microsoft Testing Platform 2.2.3, code coverage extension, PolySharp, and dotnet tools).
  • Refresh GitHub Actions workflow pins (notably actions/checkout) and adjust tooling scripts/docs to align with the template.

Reviewed changes

Copilot reviewed 9 out of 9 changed files in this pull request and generated 1 comment.

Show a summary per file
File Description
tools/Install-DotNetSdk.ps1 Refines project/props discovery when scanning TFMs to determine runtime installs.
global.json Bumps pinned .NET SDK patch version.
Directory.Packages.props Updates template-managed dependency versions, including MTP version and other pinned packages.
CONTRIBUTING.md Adds a Testing section pointing contributors to tools/dotnet-test-cloud.ps1 for cloud-like test runs.
.github/workflows/libtemplate-update.yml Updates actions/checkout pin to the newer template SHA.
.github/workflows/docs.yml Updates actions/checkout pin to the newer template SHA.
.github/workflows/copilot-setup-steps.yml Updates actions/checkout pin used for Copilot agent setup runs.
.github/skills/bundle-dependency-prs/SKILL.md Adds a new skill definition for bundling/fixing dependency PRs.
.config/dotnet-tools.json Updates pinned dotnet tool versions (pwsh, dotnet-coverage, repo tools).

Comment thread .github/workflows/docs.yml
@AArnott AArnott merged commit 7bfe382 into main Jun 10, 2026
10 of 12 checks passed
@AArnott AArnott deleted the aarnott/template-merge branch June 10, 2026 16:46
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.

4 participants