Merge the main branch from https://github.com/aarnott/Library.Template

AArnott · web-flow · commit 0db458becf69 · 2025-02-08T02:33:24.000Z
Specifically, this merges [574886f from that repo](AArnott/Library.Template@574886f).
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "powershell": {
-      "version": "7.4.6",
+      "version": "7.5.0",
       "commands": [
         "pwsh"
       ],
@@ -17,7 +17,7 @@
       "rollForward": false
     },
     "nbgv": {
-      "version": "3.7.112",
+      "version": "3.7.115",
       "commands": [
         "nbgv"
       ],
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -1,5 +1,5 @@
 # Refer to https://hub.docker.com/_/microsoft-dotnet-sdk for available versions
-FROM mcr.microsoft.com/dotnet/sdk:9.0.101-noble
+FROM mcr.microsoft.com/dotnet/sdk:9.0.102-noble
 
 # Installing mono makes `dotnet test` work without errors even for net472.
 # But installing it takes a long time, so it's excluded by default.
diff --git a/.github/renovate.json b/.github/renovate.json
@@ -16,6 +16,10 @@
 			"matchDatasources": ["dotnet-version", "docker"],
 			"matchDepNames": ["dotnet-sdk", "mcr.microsoft.com/dotnet/sdk"],
 			"groupName": "Dockerfile and global.json updates"
+		},
+		{
+			"matchPackageNames": ["*"],
+			"allowedVersions": "!/-g[a-f0-9]+$/"
 		}
 	]
 }
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -288,3 +288,13 @@ jobs:
       with:
         name: benchmarks-${{ matrix.os }}
         path: ${{ runner.temp }}/_artifacts/benchmarks
+
+  docs:
+    name: 📃 Docs
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: 🔗 Markup Link Checker (mlc)
+      uses: becheran/mlc@v0.19.2
+      with:
+        args: --do-not-warn-for-redirect-to https://learn.microsoft.com*,https://dotnet.microsoft.com/*,https://dev.azure.com/*,https://app.codecov.io/* -p docfx
diff --git a/.github/workflows/libtemplate-update.yml b/.github/workflows/libtemplate-update.yml
@@ -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.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -9,7 +9,7 @@ This project is actively developed using the following software.
 It is highly recommended that anyone contributing to this library use the same
 software.
 
-1. [Visual Studio 2019][VS]
+1. [Visual Studio 2022][VS]
 2. [Node.js][NodeJs] v16 (v18 breaks our build)
 
 ### Optional additional software
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -43,7 +43,7 @@
   </ItemGroup>
   <ItemGroup Label="Library.Template">
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="3.0.0" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="3.0.2" />
     <PackageVersion Include="xunit" Version="2.9.2" />
   </ItemGroup>
   <ItemGroup>
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "9.0.101",
+    "version": "9.0.102",
     "rollForward": "patch",
     "allowPrerelease": false
   }
diff --git a/test/Cake.GitVersioning.Tests/app.config b/test/Cake.GitVersioning.Tests/app.config
diff --git a/test/Cake.GitVersioning.Tests/xunit.runner.json b/test/Cake.GitVersioning.Tests/xunit.runner.json
@@ -0,0 +1,4 @@
+{
+  "$schema": "https://xunit.net/schema/current/xunit.runner.schema.json",
+  "shadowCopy": false
+}
diff --git a/test/Directory.Build.targets b/test/Directory.Build.targets
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
+  <ItemGroup>
+    <Content Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" Condition="Exists('xunit.runner.json')" />
+  </ItemGroup>
+
   <Import Project="$([MSBuild]::GetPathOfFileAbove($(MSBuildThisFile), $(MSBuildThisFileDirectory)..))" />
 </Project>
diff --git a/test/Nerdbank.GitVersioning.Tests/app.config b/test/Nerdbank.GitVersioning.Tests/app.config
diff --git a/test/Nerdbank.GitVersioning.Tests/xunit.runner.json b/test/Nerdbank.GitVersioning.Tests/xunit.runner.json
@@ -0,0 +1,4 @@
+{
+  "$schema": "https://xunit.net/schema/current/xunit.runner.schema.json",
+  "shadowCopy": false
+}
diff --git a/tools/Get-NuGetTool.ps1 b/tools/Get-NuGetTool.ps1
@@ -6,7 +6,7 @@
 #>
 Param(
     [Parameter()]
-    [string]$NuGetVersion='6.4.0'
+    [string]$NuGetVersion='6.12.2'
 )
 
 $toolsPath = & "$PSScriptRoot\Get-TempToolsPath.ps1"
diff --git a/tools/artifacts/_stage_all.ps1 b/tools/artifacts/_stage_all.ps1
@@ -11,7 +11,7 @@ param (
     [switch]$AvoidSymbolicLinks
 )
 
-$ArtifactStagingFolder = & "$PSScriptRoot/../../tools/Get-ArtifactsStagingDirectory.ps1" -CleanIfLocal
+$ArtifactStagingFolder = & "$PSScriptRoot/../Get-ArtifactsStagingDirectory.ps1" -CleanIfLocal
 
 function Create-SymbolicLink {
     param (
diff --git a/tools/artifacts/build_logs.ps1 b/tools/artifacts/build_logs.ps1
@@ -1,4 +1,4 @@
-$ArtifactStagingFolder = & "$PSScriptRoot/../../tools/Get-ArtifactsStagingDirectory.ps1"
+$ArtifactStagingFolder = & "$PSScriptRoot/../Get-ArtifactsStagingDirectory.ps1"
 
 if (!(Test-Path $ArtifactStagingFolder/build_logs)) { return }
 
diff --git a/tools/artifacts/testResults.ps1 b/tools/artifacts/testResults.ps1
@@ -7,7 +7,7 @@ $result = @{}
 $testRoot = Resolve-Path "$PSScriptRoot\..\..\test"
 $result[$testRoot] = (Get-ChildItem "$testRoot\TestResults" -Recurse -Directory | Get-ChildItem -Recurse -File)
 
-$artifactStaging = & "$PSScriptRoot\..\Get-ArtifactsStagingDirectory.ps1"
+$artifactStaging = & "$PSScriptRoot/../Get-ArtifactsStagingDirectory.ps1"
 $testlogsPath = Join-Path $artifactStaging "test_logs"
 if (Test-Path $testlogsPath) {
     $result[$testlogsPath] = Get-ChildItem $testlogsPath -Recurse;

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,10 @@`
`16`	`16`	`"matchDatasources": ["dotnet-version", "docker"],`
`17`	`17`	`"matchDepNames": ["dotnet-sdk", "mcr.microsoft.com/dotnet/sdk"],`
`18`	`18`	`"groupName": "Dockerfile and global.json updates"`
	`19`	`+ },`
	`20`	`+ {`
	`21`	`+ "matchPackageNames": ["*"],`
	`22`	`+ "allowedVersions": "!/-g[a-f0-9]+$/"`
`19`	`23`	`}`
`20`	`24`	`]`
`21`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"sdk": {`
`3`		`- "version": "9.0.101",`
	`3`	`+ "version": "9.0.102",`
`4`	`4`	`"rollForward": "patch",`
`5`	`5`	`"allowPrerelease": false`
`6`	`6`	`}`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +  "$schema": "https://xunit.net/schema/current/xunit.runner.schema.json",
 +  "shadowCopy": false
 +}