Merge pull request #1350 from microsoft/dev/andarno/libtemplateUpdate

Merge latest Library.Template

Author: AArnott

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "powershell": {
-      "version": "7.4.6",
+      "version": "7.5.0",
       "commands": [
         "pwsh"
       ],

.github/dependabot.yml

@@ -16,6 +16,45 @@
 			"matchDatasources": ["dotnet-version", "docker"],
 			"matchDepNames": ["dotnet-sdk", "mcr.microsoft.com/dotnet/sdk"],
 			"groupName": "Dockerfile and global.json updates"
+		},
+		{
+			"matchPackageNames": ["*"],
+			"allowedVersions": "!/-g[a-f0-9]+$/"
+		},
+		{
+			"matchPackageNames": [
+				"System.Collections.Immutable",
+				"System.Composition*",
+				"System.Diagnostics.DiagnosticSource",
+				"System.IO.Pipelines",
+				"System.Reflection.Metadata",
+				"System.Text.Json",
+				"System.Threading.Tasks.Dataflow",
+				"Microsoft.Bcl.AsyncInterfaces"
+			],
+			"allowedVersions": "<9.0",
+			"groupName": "Included in .NET runtime"
+		},
+		{
+			"matchPackageNames": ["Microsoft.VisualStudio.Internal.MicroBuild*"],
+			"groupName": "microbuild"
+		},
+		{
+			"matchPackageNames": ["Microsoft.VisualStudio.*"],
+			"groupName": "Visual Studio SDK"
+		},
+		{
+			"matchPackageNames": ["Microsoft.VisualStudio.*"],
+			"matchUpdateTypes": ["patch"],
+			"enabled": false
+		},
+		{
+			"matchPackageNames": ["MessagePack"],
+			"enabled": false
+		},
+		{
+			"matchJsonata": [ "sharedVariableName='CodeAnalysisVersionForAnalyzers'" ],
+			"enabled": false
 		}
 	]
 }

.github/renovate.json

@@ -3,15 +3,23 @@ name: 📃 Docfx Validate
 on:
   pull_request:
   workflow_dispatch:
+  push:
+    branches:
+    - main
+    - microbuild
 
 jobs:
   build:
-    name: 📚 docfx
-    runs-on: ubuntu-22.04
+    name: 📚 Doc validation
+    runs-on: ubuntu-24.04
     steps:
     - uses: actions/checkout@v4
       with:
         fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
+    - 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 -i https://aka.ms/onboardsupport,https://aka.ms/spot,https://msrc.microsoft.com/*,https://www.microsoft.com/msrc*,https://microsoft.com/msrc*
     - name: ⚙ Install prerequisites
       run: |
         ./init.ps1 -UpgradePrerequisites

.github/workflows/docs_validate.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.

.github/workflows/libtemplate-update.yml

@@ -25,7 +25,7 @@ You should install the version specified in `global.json` or a later version wit
 the same major.minor.Bxx "hundreds" band.
 For example if 2.2.300 is specified, you may install 2.2.300, 2.2.301, or 2.2.310
 while the 2.2.400 version would not be considered compatible by .NET SDK.
-See [.NET Core Versioning](https://docs.microsoft.com/dotnet/core/versions/) for more information.
+See [.NET Core Versioning](https://learn.microsoft.com/dotnet/core/versions/) for more information.
 
 ## Package restore
 
@@ -49,7 +49,7 @@ When we identify a gem that we should support but do not yet support, file [an i
 ## Releases
 
 Use `nbgv tag` to create a tag for a particular commit that you mean to release.
-[Learn more about `nbgv` and its `tag` and `prepare-release` commands](https://github.com/dotnet/Nerdbank.GitVersioning/blob/main/doc/nbgv-cli.md).
+[Learn more about `nbgv` and its `tag` and `prepare-release` commands](https://dotnet.github.io/Nerdbank.GitVersioning/docs/nbgv-cli.html).
 
 Push the tag.
 

CONTRIBUTING.md

@@ -5,15 +5,16 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
 
-    <MicroBuildVersion>2.0.171</MicroBuildVersion>
+    <MicroBuildVersion>2.0.181</MicroBuildVersion>
     <MetadataVersion>61.0.15-preview</MetadataVersion>
     <WDKMetadataVersion>0.12.8-experimental</WDKMetadataVersion>
     <!-- <DiaMetadataVersion>0.2.185-preview-g7e1e6a442c</DiaMetadataVersion> -->
     <ApiDocsVersion>0.1.42-alpha</ApiDocsVersion>
     <CodeAnalysisVersion>4.12.0</CodeAnalysisVersion>
-    <CodeAnalysisVersion Condition="'$(IsTestProject)'!='true'">3.11.0</CodeAnalysisVersion>
+    <CodeAnalysisVersionForAnalyzers>3.11.0</CodeAnalysisVersionForAnalyzers>
   </PropertyGroup>
   <ItemGroup>
+    <!-- We have to use the MessagePack version used by win32metadata (https://github.com/microsoft/CsWin32/issues/371) -->
     <PackageVersion Include="MessagePack" Version="2.2.85" />
     <PackageVersion Include="MessagePackAnalyzer" Version="2.5.192" />
     <PackageVersion Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.4" />
@@ -36,19 +37,22 @@
     <PackageVersion Include="Xunit.Combinatorial" Version="2.0.24" />
     <PackageVersion Include="Xunit.Assert" Version="2.3.0" />
   </ItemGroup>
-  <ItemGroup Label="Library.Template">
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
-    <PackageVersion Include="Microsoft.VisualStudio.Internal.MicroBuild.NonShipping" Version="$(MicroBuildVersion)" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="3.0.1" />
-    <PackageVersion Include="xunit.v3" Version="1.0.1" />
-  </ItemGroup>
   <ItemGroup Condition="'$(IsTestProject)'!='true'">
     <!-- These versions carefully chosen to support VS 2019 Update 11. -->
+    <PackageVersion Update="Microsoft.CodeAnalysis.Common" Version="$(CodeAnalysisVersionForAnalyzers)" />
+    <PackageVersion Update="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(CodeAnalysisVersionForAnalyzers)" />
+    <PackageVersion Update="Microsoft.CodeAnalysis.CSharp" Version="$(CodeAnalysisVersionForAnalyzers)" />
     <PackageVersion Update="System.Collections.Immutable" Version="5.0.0" />
     <PackageVersion Update="System.Memory" Version="4.5.4" />
     <PackageVersion Update="System.Reflection.Metadata" Version="5.0.0" />
     <PackageVersion Update="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
   </ItemGroup>
+  <ItemGroup Label="Library.Template">
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageVersion Include="Microsoft.VisualStudio.Internal.MicroBuild.NonShipping" Version="$(MicroBuildVersion)" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="3.0.2" />
+    <PackageVersion Include="xunit.v3" Version="1.1.0" />
+  </ItemGroup>
   <ItemGroup>
     <!-- Put repo-specific GlobalPackageReference items in this group. -->
   </ItemGroup>

Directory.Packages.props

@@ -6,7 +6,7 @@
 #>
 Param(
     [Parameter()]
-    [string]$NuGetVersion='6.4.0'
+    [string]$NuGetVersion='6.12.2'
 )
 
 $toolsPath = & "$PSScriptRoot\Get-TempToolsPath.ps1"