diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 5ebc2dc..777e86b 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "powershell": { - "version": "7.6.0", + "version": "7.6.1", "commands": [ "pwsh" ], @@ -31,7 +31,7 @@ "rollForward": false }, "nerdbank.dotnetrepotools": { - "version": "1.3.13", + "version": "1.4.1", "commands": [ "repo" ], diff --git a/.github/prompts/update-library-template.prompt.md b/.github/skills/update-library-template/SKILL.md similarity index 93% rename from .github/prompts/update-library-template.prompt.md rename to .github/skills/update-library-template/SKILL.md index 13eb2bd..941df2f 100644 --- a/.github/prompts/update-library-template.prompt.md +++ b/.github/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. 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. diff --git a/.github/prompts/template-release-notes.md b/.github/skills/update-library-template/template-release-notes.md similarity index 100% rename from .github/prompts/template-release-notes.md rename to .github/skills/update-library-template/template-release-notes.md diff --git a/.gitignore b/.gitignore index 1b77993..83b1d55 100644 --- 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 index 93436f5..a535471 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -4,7 +4,7 @@ true true - 2.2.1 + 2.2.2 2.0.226 diff --git a/global.json b/global.json index b2d2548..bc98aa5 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "10.0.202", + "version": "10.0.300", "rollForward": "patch", "allowPrerelease": false }, diff --git a/tools/Convert-PDB.ps1 b/tools/Convert-PDB.ps1 index d4e548a..27346d6 100644 --- a/tools/Convert-PDB.ps1 +++ b/tools/Convert-PDB.ps1 @@ -40,7 +40,7 @@ if ($outputDirectory) { New-Item -ItemType Directory -Force -Path $outputDirectory | Out-Null } -$toolpath = "$pdb2pdbpath/tools/Pdb2Pdb.exe" +$toolpath = Join-Path $pdb2pdbpath 'tools\Pdb2Pdb.exe' $arguments = $DllPath, '/out', $OutputPath, '/nowarn', '0021' if ($PdbPath) { $arguments += '/pdb', $PdbPath diff --git a/tools/Download-NuGetPackage.ps1 b/tools/Download-NuGetPackage.ps1 index 6eef937..5864c68 100644 --- a/tools/Download-NuGetPackage.ps1 +++ b/tools/Download-NuGetPackage.ps1 @@ -37,7 +37,7 @@ if (!(Test-Path $OutputDirectory)) { New-Item -ItemType Directory -Path $OutputD $OutputDirectory = (Resolve-Path $OutputDirectory).Path $ConfigFile = (Resolve-Path $ConfigFile).Path -$packageIdLower = $PackageId.ToLower() +$packageIdLower = $PackageId.ToLowerInvariant() $packageRoot = Join-Path $OutputDirectory $packageIdLower if ($Version) { diff --git a/tools/Get-ExternalSymbolFiles.ps1 b/tools/Get-ExternalSymbolFiles.ps1 index 7b498af..c5dbfd3 100644 --- a/tools/Get-ExternalSymbolFiles.ps1 +++ b/tools/Get-ExternalSymbolFiles.ps1 @@ -1,4 +1,4 @@ -[CmdletBinding(SupportsShouldProcess = $true)] +[CmdletBinding()] Param ( ) @@ -70,7 +70,7 @@ Function Get-PackageVersions() { } $propsPath = (Resolve-Path -LiteralPath (Join-Path $PSScriptRoot '..\Directory.Packages.props')).Path - $output = & dotnet build $propsPath -nologo -verbosity:quiet -getItem:PackageVersion 2>&1 + $output = & dotnet msbuild $propsPath -nologo -verbosity:quiet -getItem:PackageVersion 2>&1 if ($LASTEXITCODE -ne 0) { Write-Error "Failed to evaluate package versions from Directory.Packages.props.`n$($output | Out-String)" return @{} @@ -79,7 +79,7 @@ Function Get-PackageVersions() { $jsonText = ($output | Out-String).Trim() $jsonStart = $jsonText.IndexOf('{') if ($jsonStart -lt 0) { - Write-Error 'Failed to locate JSON output from `dotnet build -getItem:PackageVersion`.' + Write-Error 'Failed to locate JSON output from `dotnet msbuild -getItem:PackageVersion`.' return @{} } diff --git a/tools/Get-NuGetTool.ps1 b/tools/Get-NuGetTool.ps1 index e507596..088c5f3 100644 --- a/tools/Get-NuGetTool.ps1 +++ b/tools/Get-NuGetTool.ps1 @@ -15,7 +15,7 @@ function Test-NuGetExecutableSignature { [string]$Path ) - if (!(Test-Path $Path)) { + if (!(Test-Path -LiteralPath $Path)) { return $false }