Merge pull request #1140 from dotnet/dev/andarno/libtemplateUpdate

Merge latest Library.Template

Author: AArnott

.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.100-noble
+FROM mcr.microsoft.com/dotnet/sdk:9.0.101-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.

.github/actions/publish-artifacts/action.yaml

@@ -5,7 +5,7 @@ runs:
   using: composite
   steps:
   - name: 📥 Collect artifacts
-    run: azure-pipelines/artifacts/_stage_all.ps1
+    run: tools/artifacts/_stage_all.ps1
     shell: pwsh
     if: always()
 

.github/dependabot.yml

@@ -0,0 +1,23 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:recommended"
+  ],
+  "semanticCommits": "disabled",
+  "labels": ["dependencies"],
+  "packageRules": [
+    {
+      "matchPackageNames": ["nbgv", "nerdbank.gitversioning"],
+      "groupName": "nbgv and nerdbank.gitversioning updates"
+    },
+    {
+      "matchPackageNames": ["xunit*"],
+      "groupName": "xunit"
+    },
+    {
+      "matchDatasources": ["dotnet-version", "docker"],
+      "matchDepNames": ["dotnet-sdk", "mcr.microsoft.com/dotnet/sdk"],
+      "groupName": "Dockerfile and global.json updates"
+    }
+  ]
+}

.github/renovate.json

@@ -25,7 +25,7 @@ jobs:
       id: merge
       shell: pwsh
       run: |
-        $LibTemplateBranch = & ./azure-pipelines/Get-LibTemplateBasis.ps1 -ErrorIfNotRelated
+        $LibTemplateBranch = & ./tools/Get-LibTemplateBasis.ps1 -ErrorIfNotRelated
         if ($LASTEXITCODE -ne 0) {
           exit $LASTEXITCODE
         }

.github/workflows/libtemplate-update.yml

@@ -17,7 +17,7 @@ permissions:
 
 jobs:
   release:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
     - name: ⚙️ Initialization
       shell: pwsh

.github/workflows/release.yml

@@ -90,3 +90,13 @@ via `[Fact(Skip = "Test does not pass yet")]` or similar message to keep our tes
  [VS]: https://www.visualstudio.com/downloads/
  [NodeJs]: https://nodejs.org
  [NodeJsTools]: https://www.visualstudio.com/vs/node-js/
+
+## Updating dependencies
+
+This repo uses Renovate to keep dependencies current.
+Configuration is in the `.github/renovate.json` file.
+[Learn more about configuring Renovate](https://docs.renovatebot.com/configuration-options/).
+
+When changing the renovate.json file, follow [these validation steps](https://docs.renovatebot.com/config-validation/).
+
+If Renovate is not creating pull requests when you expect it to, check that the [Renovate GitHub App](https://github.com/apps/renovate) is configured for your account or repo.

CONTRIBUTING.md

@@ -15,16 +15,15 @@
     <PackageVersion Include="BenchmarkDotNet" Version="$(BenchmarkDotNetVersion)" />
     <PackageVersion Include="Cake.Core" Version="3.2.0" />
     <PackageVersion Include="DotNetMDDocs" Version="0.112.39" />
-    <PackageVersion Include="LibGit2Sharp" Version="0.28.0" />
     <PackageVersion Include="LibGit2Sharp.NativeBinaries" Version="$(LibGit2SharpNativeVersion)" />
+    <PackageVersion Include="LibGit2Sharp" Version="0.28.0" />
     <PackageVersion Include="Microsoft.Build.Framework" Version="$(MSBuildPackageVersion)" />
     <PackageVersion Include="Microsoft.Build.Locator" Version="1.7.8" />
     <PackageVersion Include="Microsoft.Build.Tasks.Core" Version="$(MSBuildPackageVersion)" />
     <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="$(MSBuildPackageVersion)" />
     <PackageVersion Include="Microsoft.Build" Version="$(MSBuildPackageVersion)" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.6.0" />
     <PackageVersion Include="Microsoft.DotNet.PlatformAbstractions" Version="3.1.6" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.2.206-beta" />
     <PackageVersion Include="Nerdbank.GitVersioning.LKG" Version="3.4.173-alpha" />
     <PackageVersion Include="Newtonsoft.Json.Schema" Version="4.0.1" />
@@ -39,12 +38,17 @@
     <PackageVersion Include="System.Text.Json" Version="8.0.5" />
     <PackageVersion Include="System.Threading.Tasks.Dataflow" Version="9.0.0" />
     <PackageVersion Include="Validation" Version="2.5.51" />
-    <PackageVersion Include="Xunit.Combinatorial" Version="1.6.24" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
-    <PackageVersion Include="Xunit.SkippableFact" Version="1.5.23" />
-    <PackageVersion Include="xunit" Version="2.9.2" />
+    <PackageVersion Include="Xunit.Combinatorial" Version="2.0.5-alpha" />
+  </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.v3" Version="1.0.0" />
   </ItemGroup>
   <ItemGroup>
+    <!-- Put repo-specific GlobalPackageReference items in this group. -->
+  </ItemGroup>
+  <ItemGroup Label="Library.Template">
     <GlobalPackageReference Include="CSharpIsNullAnalyzer" Version="0.1.593" />
     <GlobalPackageReference Include="DotNetAnalyzers.DocumentationAnalyzers" Version="1.0.0-beta.59" />
     <GlobalPackageReference Include="PolySharp" Version="1.15.0" />

Directory.Packages.props

@@ -109,10 +109,10 @@ stages:
       clean: true
       submodules: true # keep the warnings quiet about the wiki not being enlisted
     - task: UseDotNet@2
-      displayName: Install .NET 9.0.100 SDK
+      displayName: Install .NET 9.0.101 SDK
       inputs:
         packageType: sdk
-        version: 9.0.100
+        version: 9.0.101
     - script: dotnet --info
       displayName: Show dotnet SDK info
     - bash: |

azure-pipelines.yml

@@ -23,7 +23,7 @@ jobs:
   - template: install-dependencies.yml
   - pwsh: |
       Invoke-WebRequest -Uri "https://dot.net/v1/dotnet-install.ps1" -OutFile dotnet-install.ps1
-      & .\dotnet-install.ps1 -Architecture x86 -Version 9.0.100 -InstallDir "C:\Program Files (x86)\dotnet\" -NoPath -Verbose
+      & .\dotnet-install.ps1 -Architecture x86 -Version 9.0.101 -InstallDir "C:\Program Files (x86)\dotnet\" -NoPath -Verbose
     displayName: ⚙ Install 32-bit .NET SDK and runtimes
 
   - template: dotnet.yml