Skip to content

Commit 2ff5570

Browse files
authored
Merge pull request #275 from microsoft/dev/andarno/libtemplateUpdate
Merge latest Library.Template
2 parents d32ad49 + 57b7dbf commit 2ff5570

File tree

7 files changed

+14
-7
lines changed

7 files changed

+14
-7
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
@@ -16,6 +16,10 @@
1616
"matchDatasources": ["dotnet-version", "docker"],
1717
"matchDepNames": ["dotnet-sdk", "mcr.microsoft.com/dotnet/sdk"],
1818
"groupName": "Dockerfile and global.json updates"
19+
},
20+
{
21+
"matchPackageNames": ["Microsoft.VisualStudio.Internal.MicroBuild*"],
22+
"groupName": "microbuild"
1923
}
2024
]
2125
}

.github/workflows/docs_validate.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,16 @@ on:
66

77
jobs:
88
build:
9-
name: 📚 docfx
9+
name: 📚 Doc validation
1010
runs-on: ubuntu-22.04
1111
steps:
1212
- uses: actions/checkout@v4
1313
with:
1414
fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
15+
- name: 🔗 Markup Link Checker (mlc)
16+
uses: becheran/[email protected]
17+
with:
18+
args: --do-not-warn-for-redirect-to https://learn.microsoft.com*,https://dev.azure.com/*,https://app.codecov.io/*,https://msrc.microsoft.com/*,https://www.microsoft.com/en-us/msrc* -p docfx -i https://aka.ms/onboardsupport,https://aka.ms/spot,https://www.microsoft.com/msrc/cvd,https://www.microsoft.com/msrc
1519
- name: ⚙ Install prerequisites
1620
run: |
1721
./init.ps1 -UpgradePrerequisites

.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.

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ You should install the version specified in `global.json` or a later version wit
2525
the same major.minor.Bxx "hundreds" band.
2626
For example if 2.2.300 is specified, you may install 2.2.300, 2.2.301, or 2.2.310
2727
while the 2.2.400 version would not be considered compatible by .NET SDK.
28-
See [.NET Core Versioning](https://docs.microsoft.com/dotnet/core/versions/) for more information.
28+
See [.NET Core Versioning](https://learn.microsoft.com/dotnet/core/versions/) for more information.
2929

3030
## Package restore
3131

@@ -44,7 +44,7 @@ Building, testing, and packing this repository can be done by using the standard
4444
## Releases
4545

4646
Use `nbgv tag` to create a tag for a particular commit that you mean to release.
47-
[Learn more about `nbgv` and its `tag` and `prepare-release` commands](https://github.com/dotnet/Nerdbank.GitVersioning/blob/main/doc/nbgv-cli.md).
47+
[Learn more about `nbgv` and its `tag` and `prepare-release` commands](https://dotnet.github.io/Nerdbank.GitVersioning/docs/nbgv-cli.html).
4848

4949
Push the tag.
5050

azure-pipelines/unofficial.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ trigger:
33
branches:
44
include:
55
- main
6-
- microbuild
76
- 'validate/*'
87
paths:
98
exclude:

tools/Get-NuGetTool.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#>
77
Param(
88
[Parameter()]
9-
[string]$NuGetVersion='6.4.0'
9+
[string]$NuGetVersion='6.12.2'
1010
)
1111

1212
$toolsPath = & "$PSScriptRoot\Get-TempToolsPath.ps1"

0 commit comments

Comments
 (0)