Skip to content

Commit 4d2de60

Browse files
committed
Merge the microbuild branch from https://github.com/aarnott/Library.Template
Specifically, this merges [3730643 from that repo](AArnott/Library.Template@3730643).
2 parents bebd30b + 3730643 commit 4d2de60

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

.config/dotnet-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"powershell": {
6-
"version": "7.4.6",
6+
"version": "7.5.0",
77
"commands": [
88
"pwsh"
99
],

.github/renovate.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@
2020
"matchDatasources": ["dotnet-version", "docker"],
2121
"matchDepNames": ["dotnet-sdk", "mcr.microsoft.com/dotnet/sdk"],
2222
"groupName": "Dockerfile and global.json updates"
23+
},
24+
{
25+
"matchPackageNames": ["Microsoft.VisualStudio.Internal.MicroBuild*"],
26+
"groupName": "microbuild"
2327
}
2428
]
2529
}

.github/workflows/libtemplate-update.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
4646
# Pushing commits that add or change files under .github/workflows will cause our workflow to fail.
4747
# But it usually isn't necessary because the target branch already has (or doesn't have) these changes.
48-
# So if the merged doesn't bring in any changes to these files, try the merge locally and push that
48+
# So if the merge doesn't bring in any changes to these files, try the merge locally and push that
4949
# to keep github happy.
5050
if ((git rev-list FETCH_HEAD ^HEAD --count -- .github/workflows) -eq 0) {
5151
# Indeed there are no changes in that area. So merge locally to try to appease GitHub.

0 commit comments

Comments
 (0)