Merge latest Library.Template (#291)

AArnott · renovate[bot] · AndreyTretyak · web-flow · commit ca297f27dfc8 · 2026-04-15T11:39:29.000-06:00
* Fix warning message * Fix Prime-ForCopilot.ps1 when invoked from outside the repo * Use forward slashes consistently in docs * Avoid assigning to an unused variable * Avoid returning early while preparing legacy symbols * Update Dockerfile and global.json updates to v10.0.200 (487) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency powershell to v7.5.5 (#489) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update actions/download-artifact action to v8.0.1 (488) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update Dockerfile and global.json updates to v10.0.201 (490) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency powershell to v7.6.0 (#491) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update actions/deploy-pages action to v5 (492) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Harden path joining in VSInsertion.ps1 * Update mcr.microsoft.com/dotnet/sdk:10.0.201 Docker digest to f061e5a (493) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Harden release workflow to use better runs * Fix the build status badge * Switch from using nuget.exe to dotnet cli commands (#494) * Switch from using nuget.exe to dotnet cli commands * Fix Download-NuGetPackage failure and version selection --------- Co-authored-by: Andrew Arnott <andrew.arnott@microsoft.com> * Fix Expand-Template * Update Microsoft Testing Platform to 2.2.1 (497) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency dotnet-coverage to v18.6.2 * Update dependency Microsoft.Testing.Extensions.CodeCoverage to v18.6.2 * Remove usage of old NuGet tools (#496) * Remove usage of old NuGet tools * Add source for procdump package * Add feed for getting Microsoft.DiaSymReader.Pdb2Pdb * try Copilot suggested fixes * Add pre-release support * Use default configuration for Network Isolation * Bump MicroBuildVersion to 2.0.226 * Update dependency nerdbank.dotnetrepotools to v1.3.1 (#501) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update mcr.microsoft.com/dotnet/sdk:10.0.201 Docker digest to 127d7d4 (502) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update actions/upload-artifact action to v7.0.1 (503) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update actions/upload-pages-artifact action to v5 (504) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency nerdbank.dotnetrepotools to v1.3.13 (505) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update Dockerfile and global.json updates to v10.0.202 (506) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Throw on Download-NuGetPackage errors Instead of writing an error and returning `$null` to the caller, we should do something that's harder to ignore. * Rename variable for better consistency * Defend against exceptions thrown from `Download-NugetPackage.ps1` * Add missing `dotnet symbol` command to manifest * Improve resilience of fetching PackageVersion items * Avoid re-unzipping downloaded symbol packages Get-ExternalSymbolFiles.ps1 was downloading Nerdbank.Streams into obj/SymbolsPackages/nerdbank.streams/2.13.16 via Download-NuGetPackage.ps1, which uses dotnet package download. After that, the script searched for the .nupkg inside that directory and extracted it again into obj/SymbolsPackages/Nerdbank.Streams.2.13.16. That second extraction was redundant and only existed so dotnet symbol and the PDB archival logic had a package root to inspect. The downloaded package directory already contains the package contents in NuGet's normal lowercase layout, so the script can operate on that directory directly. Use the package path returned by Download-NuGetPackage.ps1 for symbol download and PDB discovery, and remove the extra unzip step. This leaves only one materialized package tree under obj/SymbolsPackages. * Avoid stomping on LASTEXITCODE while simply trying to reset it * Fix init.ps1 installation of local microbuild plugins We need the packages *with their dependencies* to be installed, and only I filed dotnet/sdk#53890 to track this missing feature that requires us to go back to using nuget.exe. * Don't download a nuget package twice * Don't assume unpacked structure in Convert-PDB.ps1 * Improve `dotnet symbol` performance We can invoke it just once with all the binaries we want symbols for. * Call out when package versions are missing * Use `dotnet-symbols` 9.0.661903 (the latest public version) * Fix references to undefined variables * Simplify ps1 syntax The old way worked, but copilot reviews kept flagging it as wrong anyway. So we're just appeasing it. * Defend against filename-only output paths --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Andrii Tretiak <andreyt@microsoft.com> Co-authored-by: 🤖 Copilot <no-reply@github.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
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.0",
       "commands": [
         "pwsh"
       ],
       "rollForward": false
     },
     "dotnet-coverage": {
-      "version": "18.5.2",
+      "version": "18.6.2",
       "commands": [
         "dotnet-coverage"
       ],
@@ -31,11 +31,18 @@
       "rollForward": false
     },
     "nerdbank.dotnetrepotools": {
-      "version": "1.2.1",
+      "version": "1.3.13",
       "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
@@ -1,4 +1,4 @@
-if ((git rev-parse --is-shallow-repository) -eq 'true')
+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@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.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@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.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@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.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@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.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@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.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@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.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@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.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,7 @@
 ## High level guidance
 
 * Review the `CONTRIBUTING.md` file for instructions to build and test the software.
-* Run the `.github\Prime-ForCopilot.ps1` script (once) 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/update-library-template.prompt.md b/.github/prompts/update-library-template.prompt.md
@@ -37,6 +37,12 @@ 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).
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -34,10 +34,10 @@ jobs:
       name: 📚 Generate documentation
 
     - 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/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.1</MicrosoftTestingPlatformVersion>
 
-    <MicroBuildVersion>2.0.208</MicroBuildVersion>
+    <MicroBuildVersion>2.0.226</MicroBuildVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="MessagePack" Version="2.5.198" />
@@ -26,7 +26,7 @@
     <PackageVersion Include="xunit.v3.extensibility.core" Version="3.2.2" />
   </ItemGroup>
   <ItemGroup Label="Library.Template">
-    <PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.5.2" />
+    <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,CFSClean2
     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,CFSClean2
     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,CFSClean2
     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,CFSClean2
     sdl:
       sourceAnalysisPool: VSEng-MicroBuildVSStable
 
diff --git a/azure-pipelines/unofficial.yml b/azure-pipelines/unofficial.yml
@@ -55,8 +55,6 @@ variables:
 extends:
   template: azure-pipelines/MicroBuild.1ES.Unofficial.yml@MicroBuildTemplate
   parameters:
-    settings:
-      networkIsolationPolicy: Permissive,CFSClean2
     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,CFSClean2
     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,CFSClean2
     sdl:
       sourceAnalysisPool: VSEng-MicroBuildVSStable
       credscan:
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "10.0.103",
+    "version": "10.0.202",
     "rollForward": "patch",
     "allowPrerelease": false
   },
diff --git a/init.ps1 b/init.ps1
@@ -37,6 +37,10 @@
     The environment is configured to build pseudo-loc for JPN only, but may be used to build
     all languages with shipping-style loc by using the `/p:loctype=full,loclanguages=vs`
     when building.
+.PARAMETER Setup
+    Install the MicroBuild setup plugin for building VSIXv3 packages.
+.PARAMETER OptProf
+    Install the MicroBuild OptProf plugin for building optimized assemblies on desktop machines.
 .PARAMETER Sbom
     Install the MicroBuild SBOM plugin.
 .PARAMETER AccessToken
@@ -63,6 +67,10 @@ Param (
     [Parameter()]
     [switch]$Localization,
     [Parameter()]
+    [switch]$Setup,
+    [Parameter()]
+    [switch]$OptProf,
+    [Parameter()]
     [switch]$SBOM,
     [Parameter()]
     [string]$AccessToken,
@@ -128,6 +136,17 @@ try {
         $EnvVars['SignType'] = "Test"
     }
 
+    if ($Setup) {
+        Write-Host "Installing MicroBuild SwixBuild plugin..." -ForegroundColor $HeaderColor
+        & $InstallNuGetPkgScriptPath Microsoft.VisualStudioEng.MicroBuild.Plugins.SwixBuild -source $MicroBuildPackageSource -Verbosity $nugetVerbosity
+    }
+
+    if ($OptProf) {
+        Write-Host "Installing MicroBuild OptProf plugin" -ForegroundColor $HeaderColor
+        & $InstallNuGetPkgScriptPath MicroBuild.Plugins.OptProf -source $MicroBuildPackageSource -Verbosity $nugetVerbosity
+        $EnvVars['OptProfEnabled'] = '1'
+    }
+
     if ($Localization) {
         Write-Host "Installing MicroBuild localization plugin" -ForegroundColor $HeaderColor
         & $InstallNuGetPkgScriptPath MicroBuild.Plugins.Localization -source $MicroBuildPackageSource -Verbosity $nugetVerbosity
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 = "$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
diff --git a/tools/Download-NuGetPackage.ps1 b/tools/Download-NuGetPackage.ps1
diff --git a/tools/Get-ExternalSymbolFiles.ps1 b/tools/Get-ExternalSymbolFiles.ps1
diff --git a/tools/Get-NuGetTool.ps1 b/tools/Get-NuGetTool.ps1
diff --git a/tools/Get-ProcDump.ps1 b/tools/Get-ProcDump.ps1
diff --git a/tools/Install-NuGetPackage.ps1 b/tools/Install-NuGetPackage.ps1
diff --git a/tools/Prepare-Legacy-Symbols.ps1 b/tools/Prepare-Legacy-Symbols.ps1
diff --git a/tools/artifacts/VSInsertion.ps1 b/tools/artifacts/VSInsertion.ps1
diff --git a/tools/variables/ProfilingInputsPropsName.ps1 b/tools/variables/ProfilingInputsPropsName.ps1

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-if ((git rev-parse --is-shallow-repository) -eq 'true')`
	`1`	`+if ((git -C $PSScriptRoot rev-parse --is-shallow-repository) -eq 'true')`
`2`	`2`	`{`
`3`	`3`	`Write-Host "Shallow clone detected, disabling NBGV Git engine so the build can succeed."`
`4`	`4`	`$env:NBGV_GitEngine='Disabled'`