microsoft · AArnott · May 13, 2026 · Dec 28, 2025 · Feb 9, 2026 · Feb 10, 2026
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,14 +3,14 @@
   "isRoot": true,
   "tools": {
     "powershell": {
-      "version": "7.5.4",
+      "version": "7.6.1",
       "commands": [
         "pwsh"
       ],
       "rollForward": false
     },
     "dotnet-coverage": {
-      "version": "18.4.1",
+      "version": "18.6.2",
       "commands": [
         "dotnet-coverage"
       ],
@@ -24,18 +24,25 @@
       "rollForward": false
     },
     "docfx": {
-      "version": "2.78.4",
+      "version": "2.78.5",
       "commands": [
         "docfx"
       ],
       "rollForward": false
     },
     "nerdbank.dotnetrepotools": {
-      "version": "1.0.92",
+      "version": "1.4.1",
       "commands": [
         "repo"
       ],
       "rollForward": false
+    },
+    "dotnet-symbol": {
+      "version": "9.0.661903",
+      "commands": [
+        "dotnet-symbol"
+      ],
+      "rollForward": false
     }
   }
 }
diff --git a/.github/Prime-ForCopilot.ps1 b/.github/Prime-ForCopilot.ps1
@@ -0,0 +1,5 @@
+if ((git -C $PSScriptRoot rev-parse --is-shallow-repository) -eq 'true')
+{
+    Write-Host "Shallow clone detected, disabling NBGV Git engine so the build can succeed."
+    $env:NBGV_GitEngine='Disabled'
+}
diff --git a/.github/actions/publish-artifacts/action.yaml b/.github/actions/publish-artifacts/action.yaml
@@ -14,46 +14,46 @@ runs:
 
   - name: 📢 Upload project.assets.json files
     if: always()
-    uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+    uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
     with:
       name: projectAssetsJson-${{ runner.os }}
       path: ${{ runner.temp }}/_artifacts/projectAssetsJson
     continue-on-error: true
   - name: 📢 Upload variables
-    uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+    uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
     with:
       name: variables-${{ runner.os }}
       path: ${{ runner.temp }}/_artifacts/Variables
     continue-on-error: true
   - name: 📢 Upload build_logs
     if: always()
-    uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+    uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
     with:
       name: build_logs-${{ runner.os }}
       path: ${{ runner.temp }}/_artifacts/build_logs
     continue-on-error: true
   - name: 📢 Upload testResults
     if: always()
-    uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+    uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
     with:
       name: testResults-${{ runner.os }}
       path: ${{ runner.temp }}/_artifacts/testResults
     continue-on-error: true
   - name: 📢 Upload coverageResults
     if: always()
-    uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+    uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
     with:
       name: coverageResults-${{ runner.os }}
       path: ${{ runner.temp }}/_artifacts/coverageResults
     continue-on-error: true
   - name: 📢 Upload symbols
-    uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+    uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
     with:
       name: symbols-${{ runner.os }}
       path: ${{ runner.temp }}/_artifacts/symbols
     continue-on-error: true
   - name: 📢 Upload deployables
-    uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+    uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
     with:
       name: deployables-${{ runner.os }}
       path: ${{ runner.temp }}/_artifacts/deployables

diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
@@ -3,7 +3,8 @@
 ## High level guidance
 
 * Review the `CONTRIBUTING.md` file for instructions to build and test the software.
-* Set the `NBGV_GitEngine` environment variable to `Disabled` before running any `dotnet` or `msbuild` commands.
+* Run the `.github/Prime-ForCopilot.ps1` script (once) before running any `dotnet` or `msbuild` commands.
+  If you see any build errors about not finding git objects or a shallow clone, it may be time to run this script again.
 
 ## Software Design
 

diff --git a/.github/prompts/template-release-notes.md b/.github/prompts/template-release-notes.md
diff --git a/...prompts/update-library-template.prompt.md → ...b/skills/update-library-template/SKILL.md b/...prompts/update-library-template.prompt.md → ...b/skills/update-library-template/SKILL.md
@@ -1,17 +1,19 @@
 ---
+name: update-library-template
 description: Merges the latest Library.Template into this repo (at position of HEAD) and resolves conflicts.
+disable-model-invocation: true
 ---
 
 # Instructions
 
-1. Run `tools\MergeFrom-Template.ps1`
+1. Run `./tools/MergeFrom-Template.ps1` from the repo root.
 2. Resolve merge conflicts, taking into account conflict resolution policy below.
 3. Validate the changes, as described in the validation section below.
-4. Commiting your changes (if applicable).
+4. Committing your changes (if applicable).
 
 ## Conflict resolution policy
 
-There may be special notes in `.github/prompts/template-release-notes.md` that describe special considerations for certain files or scenarios to help you resolve conflicts appropriately.
+There may be [special notes](template-release-notes.md) that describe special considerations for certain files or scenarios to help you resolve conflicts appropriately.
 Always refer to that file before proceeding.
 In particular, focus on the *incoming* part of the file, since it represents the changes from the Library.Template that you are merging into your repo.
 
@@ -20,6 +22,8 @@ For example the template uses MTPv2 for test projects, but a repo might have cho
 When resolving merge conflicts, consider whether it looks like the relevant code file is older than it should be given the changes the template is bringing in.
 Ask the user when in doubt as to whether the conflict should be resolved in favor of 'catching up' with the template or keeping the current changes.
 
+Use #runSubagent to analyze and resolve merge conflicts across files in parallel.
+
 ### Keep Current files
 
 Conflicts in the following files should always be resolved by keeping the current version (i.e. discard incoming changes):
@@ -31,22 +35,33 @@ Conflicts in the following files should always be resolved by keeping the curren
 Very typically, when the incoming change is to a file that was deleted locally, the correct resolution is to re-delete the file.
 
 In some cases however, the deleted file may have incoming changes that should be applied to other files.
-The `test\Library.Tests\Library.Tests.csproj` file is very typical of this.
+The `test/Library.Tests/Library.Tests.csproj` file is very typical of this.
 Changes to this file should very typically be applied to any and all test projects in the repo.
 You are responsible for doing this in addition to re-deleting this template file.
 
+## Updating package and SDK versions
+
+After the merge, always check global.json for MSBuild Sdks with names starting with `Microsoft.VisualStudio.Internal.MicroBuild`.
+These SDK versions should match the value of the `MicroBuildVersion` property found in `Directory.Packages.props`.
+Always take the latest of the versions you see among these SDKs and the `MicroBuildVersion` property.
+
 ## Validation
 
 Validate the merge result (after resolving any conflicts, if applicable).
 Use #runSubagent for each step.
 
 1. Verify that `dotnet restore` succeeds. Fix any issues that come up.
 2. Verify that `dotnet build` succeeds.
-3. Verify that tests succeed by running `tools\dotnet-test-cloud.ps1`.
+3. Verify that tests succeed by running `tools/dotnet-test-cloud.ps1`.
 
 While these validations are described using `dotnet` CLI commands, some repos require using full msbuild.exe.
 You can detect this by checking the `azure-pipelines/dotnet.yml` or `.github/workflows/build.yml` files for use of one or the other tool.
 
+You are *not* responsible for fixing issues that the merge did not cause.
+If validation fails for reasons that seem unrelated to the changes brought in by the merge, advise the user and ask how they'd like you to proceed.
+That said, sometimes merges will bring in SDK or dependency updates that can cause breaks in seemingly unrelated areas.
+In such cases, you should investigate and solve the issues as needed.
+
 ## Committing your changes
 
 If you have to make any changes for validations to pass, consider whether they qualify as a bad merge conflict resolution or more of a novel change that you're making to work with the Library.Template update.

diff --git a/.github/skills/update-library-template/template-release-notes.md b/.github/skills/update-library-template/template-release-notes.md
@@ -0,0 +1,20 @@
+# Template release notes
+
+This file will describe significant changes in Library.Template as they are introduced, especially if they require special consideration when merging updates into existing repos.
+This file is referenced by update-library-template.prompt.md and should remain in place to facilitate future merges, whether done manually or by AI.
+
+## Solution rename
+
+Never leave a Library.slnx file in the repository.
+You might even see one there even though this particular merge didn't bring it in.
+This can be an artifact of having renamed Library.sln to Library.slnx in the template repo, but ultimately the receiving repo should have only one .sln or .slnx file, with a better name than `Library`.
+Delete any `Library.slnx` that you see.
+Migrate an `.sln` in the repo root to `.slnx` using this command:
+
+```ps1
+dotnet solution EXISTING.sln migrate
+```
+
+This will create an EXISTING.slnx file. `git add` that file, then `git rm` the old `.sln` file.
+Sometimes a repo will reference the sln filename in a script or doc somewhere.
+Search the repo for such references and update them to the slnx file.
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -36,10 +36,10 @@ jobs:
         DocFx: true # Workaround https://github.com/dotnet/docfx/issues/10808
 
     - name: Upload artifact
-      uses: actions/upload-pages-artifact@7b1f4a764d45c48632c6b24a0339c27f5614fb0b # v4
+      uses: actions/upload-pages-artifact@fc324d3547104276b827a68afc52ff2a11cc49c9 # v5.0.0
       with:
         path: docfx/_site
 
     - name: Deploy to GitHub Pages
       id: deployment
-      uses: actions/deploy-pages@d6db90164ac5ed86f2b6aed7e0febac5b3c0c03e # v4.0.5
+      uses: actions/deploy-pages@cd2ce8fcbc39b97be8ca5fce6e763baed58fa128 # v5.0.0
diff --git a/.github/workflows/docs_validate.yml b/.github/workflows/docs_validate.yml
@@ -13,7 +13,7 @@ jobs:
     name: 📚 Doc validation
     runs-on: ubuntu-24.04
     steps:
-    - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       with:
         fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
     - name: 🔗 Markup Link Checker (mlc)

diff --git a/.gitignore b/.gitignore
@@ -358,3 +358,6 @@ MigrationBackup/
 
 # Analysis results
 *.sarif
+
+# C# Dev Kit cache files
+*.lscache
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -4,9 +4,9 @@
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
-    <MicrosoftTestingPlatformVersion>2.1.0</MicrosoftTestingPlatformVersion>
+    <MicrosoftTestingPlatformVersion>2.2.2</MicrosoftTestingPlatformVersion>
     <MessagePackVersion>2.5.198</MessagePackVersion>
-    <MicroBuildVersion>2.0.208</MicroBuildVersion>
+    <MicroBuildVersion>2.0.226</MicroBuildVersion>
     <RoslynVersion>4.14.0</RoslynVersion>
     <CodeAnalysisAnalyzerVersion>4.14.0</CodeAnalysisAnalyzerVersion>
     <VisualStudioThreadingVersion>17.14.15</VisualStudioThreadingVersion>
@@ -50,7 +50,7 @@
     <PackageVersion Update="System.Reflection.Metadata" Version="9.0.0" />
   </ItemGroup>
   <ItemGroup Label="Library.Template">
-    <PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.4.1" />
+    <PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.6.2" />
     <PackageVersion Include="Microsoft.Testing.Extensions.CrashDump" Version="$(MicrosoftTestingPlatformVersion)" />
     <PackageVersion Include="Microsoft.Testing.Extensions.HangDump" Version="$(MicrosoftTestingPlatformVersion)" />
     <PackageVersion Include="Microsoft.Testing.Extensions.TrxReport" Version="$(MicrosoftTestingPlatformVersion)" />

diff --git a/azure-pipelines/archive-sourcecode.yml b/azure-pipelines/archive-sourcecode.yml
@@ -35,8 +35,6 @@ variables:
 extends:
   template: azure-pipelines/MicroBuild.1ES.Official.yml@MicroBuildTemplate
   parameters:
-    settings:
-      networkIsolationPolicy: Permissive,CFSClean
     sdl:
       sourceAnalysisPool: VSEng-MicroBuildVSStable
 

diff --git a/azure-pipelines/libtemplate-update.yml b/azure-pipelines/libtemplate-update.yml
@@ -30,8 +30,6 @@ variables:
 extends:
   template: azure-pipelines/MicroBuild.1ES.Unofficial.yml@MicroBuildTemplate
   parameters:
-    settings:
-      networkIsolationPolicy: Permissive,CFSClean
     sdl:
       sourceAnalysisPool:
         name: AzurePipelines-EO

diff --git a/azure-pipelines/official.yml b/azure-pipelines/official.yml
@@ -45,8 +45,6 @@ variables:
 extends:
   template: azure-pipelines/MicroBuild.1ES.Official.yml@MicroBuildTemplate
   parameters:
-    settings:
-      networkIsolationPolicy: Permissive,CFSClean
     sdl:
       sourceAnalysisPool: VSEng-MicroBuildVSStable
       codeSignValidation:

diff --git a/azure-pipelines/release.yml b/azure-pipelines/release.yml
@@ -20,8 +20,6 @@ variables:
 extends:
   template: azure-pipelines/MicroBuild.1ES.Official.yml@MicroBuildTemplate
   parameters:
-    settings:
-      networkIsolationPolicy: Permissive,CFSClean
     sdl:
       sourceAnalysisPool: VSEng-MicroBuildVSStable
 

diff --git a/azure-pipelines/unofficial.yml b/azure-pipelines/unofficial.yml
@@ -56,8 +56,6 @@ variables:
 extends:
   template: azure-pipelines/MicroBuild.1ES.Unofficial.yml@MicroBuildTemplate
   parameters:
-    settings:
-      networkIsolationPolicy: Permissive,CFSClean
     sdl:
       sourceAnalysisPool: VSEng-MicroBuildVSStable
       credscan:

diff --git a/azure-pipelines/vs-insertion.yml b/azure-pipelines/vs-insertion.yml
@@ -22,8 +22,6 @@ variables:
 extends:
   template: azure-pipelines/MicroBuild.1ES.Official.yml@MicroBuildTemplate
   parameters:
-    settings:
-      networkIsolationPolicy: Permissive,CFSClean
     sdl:
       sourceAnalysisPool: VSEng-MicroBuildVSStable
       sbom:

diff --git a/azure-pipelines/vs-validation.yml b/azure-pipelines/vs-validation.yml
@@ -26,8 +26,6 @@ variables:
 extends:
   template: azure-pipelines/MicroBuild.1ES.Unofficial.yml@MicroBuildTemplate
   parameters:
-    settings:
-      networkIsolationPolicy: Permissive,CFSClean
     sdl:
       sourceAnalysisPool: VSEng-MicroBuildVSStable
       credscan:

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "10.0.102",
+    "version": "10.0.300",
     "rollForward": "patch",
     "allowPrerelease": false
   },

diff --git a/src/StreamJsonRpc/NerdbankMessagePackFormatter.cs b/src/StreamJsonRpc/NerdbankMessagePackFormatter.cs
@@ -131,7 +131,7 @@ public NerdbankMessagePackFormatter()
     public MessagePackSerializer UserDataSerializer
     {
         get => this.userDataSerializer;
-        [MemberNotNull(nameof(this.userDataSerializer))]
+        [MemberNotNull(nameof(userDataSerializer))]
         init
         {
             Requires.NotNull(value);

diff --git a/tools/Convert-PDB.ps1 b/tools/Convert-PDB.ps1
@@ -10,11 +10,11 @@
 #>
 [CmdletBinding()]
 Param(
-    [Parameter(Mandatory=$true,Position=0)]
+    [Parameter(Mandatory = $true, Position = 0)]
     [string]$DllPath,
     [Parameter()]
     [string]$PdbPath,
-    [Parameter(Mandatory=$true,Position=1)]
+    [Parameter(Mandatory = $true, Position = 1)]
     [string]$OutputPath
 )
 
@@ -23,26 +23,28 @@ if ($IsMacOS -or $IsLinux) {
     return
 }
 
-$version = '1.1.0-beta2-21101-01'
-$baseDir = "$PSScriptRoot/../obj/tools"
-$pdb2pdbpath = "$baseDir/Microsoft.DiaSymReader.Pdb2Pdb.$version/tools/Pdb2Pdb.exe"
-if (-not (Test-Path $pdb2pdbpath)) {
-    if (-not (Test-Path $baseDir)) { New-Item -Type Directory -Path $baseDir | Out-Null }
-    $baseDir = (Resolve-Path $baseDir).Path # Normalize it
-    Write-Verbose "& (& $PSScriptRoot/Get-NuGetTool.ps1) install Microsoft.DiaSymReader.Pdb2Pdb -version $version -PackageSaveMode nuspec -OutputDirectory $baseDir -Source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json | Out-Null"
-    # This package originally comes from the https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json feed.
-    # Add this feed as an upstream to whatever feed is in nuget.config if this step fails.
-    & (& $PSScriptRoot/Get-NuGetTool.ps1) install Microsoft.DiaSymReader.Pdb2Pdb -version $version -PackageSaveMode nuspec -OutputDirectory $baseDir | Out-Null
-    if ($LASTEXITCODE -ne 0) {
-        Write-Error "Failed to install Microsoft.DiaSymReader.Pdb2Pdb. Consider adding https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json as an upstream to your nuget.config feed."
-        return
-    }
+# This package originally comes from the https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json feed.
+# Add this feed as an upstream to whatever feed is in nuget.config if this step fails.
+$packageID = 'Microsoft.DiaSymReader.Pdb2Pdb'
+$packageVersion = '1.1.0-beta2-21101-01'
+try {
+    $pdb2pdbpath = & "$PSScriptRoot/Download-NuGetPackage.ps1" -PackageId $packageID -Version $packageVersion -Source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
+}
+catch {
+    Write-Error "Failed to install $packageID. Consider adding https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json as an upstream to your nuget.config feed."
+    return
+}
+
+$outputDirectory = Split-Path $OutputPath -Parent
+if ($outputDirectory) {
+    New-Item -ItemType Directory -Force -Path $outputDirectory | Out-Null
 }
 
-$args = $DllPath,'/out',$OutputPath,'/nowarn','0021'
+$toolpath = Join-Path $pdb2pdbpath 'tools\Pdb2Pdb.exe'
+$arguments = $DllPath, '/out', $OutputPath, '/nowarn', '0021'
 if ($PdbPath) {
-    $args += '/pdb',$PdbPath
+    $arguments += '/pdb', $PdbPath
 }
 
-Write-Verbose "$pdb2pdbpath $args"
-& $pdb2pdbpath $args
+Write-Verbose "$toolpath $arguments"
+& $toolpath $arguments