Skip to content

Commit

Permalink
Merge the microbuild branch from https://github.com/aarnott/Library.T…
Browse files Browse the repository at this point in the history
…emplate

Specifically, this merges [3730643 from that repo](AArnott/Library.Template@3730643).
  • Loading branch information
AArnott committed Jan 27, 2025
2 parents bebd30b + 3730643 commit 4d2de60
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"powershell": {
"version": "7.4.6",
"version": "7.5.0",
"commands": [
"pwsh"
],
Expand Down
4 changes: 4 additions & 0 deletions .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@
"matchDatasources": ["dotnet-version", "docker"],
"matchDepNames": ["dotnet-sdk", "mcr.microsoft.com/dotnet/sdk"],
"groupName": "Dockerfile and global.json updates"
},
{
"matchPackageNames": ["Microsoft.VisualStudio.Internal.MicroBuild*"],
"groupName": "microbuild"
}
]
}
2 changes: 1 addition & 1 deletion .github/workflows/libtemplate-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
# Pushing commits that add or change files under .github/workflows will cause our workflow to fail.
# But it usually isn't necessary because the target branch already has (or doesn't have) these changes.
# So if the merged doesn't bring in any changes to these files, try the merge locally and push that
# So if the merge doesn't bring in any changes to these files, try the merge locally and push that
# to keep github happy.
if ((git rev-list FETCH_HEAD ^HEAD --count -- .github/workflows) -eq 0) {
# Indeed there are no changes in that area. So merge locally to try to appease GitHub.
Expand Down

0 comments on commit 4d2de60

Please sign in to comment.