Skip to content

Commit 3abf762

Browse files
authored
Merge pull request #1363 from dotnet/auto/libtemplateUpdate
Merge latest Library.Template
2 parents 9d389cd + b2d1164 commit 3abf762

9 files changed

Lines changed: 16 additions & 11 deletions

File tree

.config/dotnet-tools.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
"isRoot": true,
44
"tools": {
55
"powershell": {
6-
"version": "7.6.0",
6+
"version": "7.6.1",
77
"commands": [
88
"pwsh"
99
],
1010
"rollForward": false
1111
},
1212
"dotnet-coverage": {
13-
"version": "18.6.2",
13+
"version": "18.7.0",
1414
"commands": [
1515
"dotnet-coverage"
1616
],
@@ -31,7 +31,7 @@
3131
"rollForward": false
3232
},
3333
"nerdbank.dotnetrepotools": {
34-
"version": "1.3.13",
34+
"version": "1.4.1",
3535
"commands": [
3636
"repo"
3737
],

.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Refer to https://hub.docker.com/_/microsoft-dotnet-sdk for available versions
2-
FROM mcr.microsoft.com/dotnet/sdk:10.0.202@sha256:adc02be8b87957d07208a4a3e51775935b33bad3317de8c45b1e67357b4c073b
2+
FROM mcr.microsoft.com/dotnet/sdk:10.0.300@sha256:dc8430e6024d454edadad1e160e1973be3cabbb7125998ef190d9e5c6adf7dbb
33

44
# Installing mono makes `dotnet test` work without errors even for net472.
55
# But installing it takes a long time, so it's excluded by default.

.github/prompts/update-library-template.prompt.md renamed to .github/skills/update-library-template/SKILL.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
---
2+
name: update-library-template
23
description: Merges the latest Library.Template into this repo (at position of HEAD) and resolves conflicts.
4+
disable-model-invocation: true
35
---
46

57
# Instructions
68

7-
1. Run `tools/MergeFrom-Template.ps1`
9+
1. Run `./tools/MergeFrom-Template.ps1` from the repo root.
810
2. Resolve merge conflicts, taking into account conflict resolution policy below.
911
3. Validate the changes, as described in the validation section below.
1012
4. Committing your changes (if applicable).
1113

1214
## Conflict resolution policy
1315

14-
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.
16+
There may be [special notes](template-release-notes.md) that describe special considerations for certain files or scenarios to help you resolve conflicts appropriately.
1517
Always refer to that file before proceeding.
1618
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.
1719

.github/prompts/template-release-notes.md renamed to .github/skills/update-library-template/template-release-notes.md

File renamed without changes.

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ jobs:
115115
shell: pwsh
116116

117117
- name: 🪪 Authorize NuGet package push
118-
uses: NuGet/login@d22cc5f58ff5b88bf9bd452535b4335137e24544 # v1.1.0
118+
uses: NuGet/login@8d196754b4036150537f80ac539e15c2f1028841 # v1.2.0
119119
id: nuget-login
120120
if: ${{ github.event_name != 'workflow_dispatch' || inputs.publish_nuget }}
121121
with:

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -358,3 +358,6 @@ MigrationBackup/
358358

359359
# Analysis results
360360
*.sarif
361+
362+
# C# Dev Kit cache files
363+
*.lscache

Directory.Packages.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<PropertyGroup>
55
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
66
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
7-
<MicrosoftTestingPlatformVersion>2.2.1</MicrosoftTestingPlatformVersion>
7+
<MicrosoftTestingPlatformVersion>2.2.3</MicrosoftTestingPlatformVersion>
88
<BenchmarkDotNetVersion>0.15.8</BenchmarkDotNetVersion>
99
<MSBuildPackageVersion>16.11.6</MSBuildPackageVersion>
1010
<!-- LibGit2Sharp Native Binary version - used in both main project and Cake addin -->
@@ -41,7 +41,7 @@
4141
<PackageVersion Include="Xunit.Combinatorial" Version="2.0.24" />
4242
</ItemGroup>
4343
<ItemGroup Label="Library.Template">
44-
<PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.6.2" />
44+
<PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.7.0" />
4545
<PackageVersion Include="Microsoft.Testing.Extensions.CrashDump" Version="$(MicrosoftTestingPlatformVersion)" />
4646
<PackageVersion Include="Microsoft.Testing.Extensions.HangDump" Version="$(MicrosoftTestingPlatformVersion)" />
4747
<PackageVersion Include="Microsoft.Testing.Extensions.TrxReport" Version="$(MicrosoftTestingPlatformVersion)" />

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "10.0.202",
3+
"version": "10.0.300",
44
"rollForward": "patch",
55
"allowPrerelease": false
66
},

tools/Download-NuGetPackage.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ if ($downloadExitCode -ne 0) {
5454
}
5555

5656
# Return the path to the downloaded package directory (dotnet package download uses lowercase id)
57-
$packageIdLower = $PackageId.ToLower()
57+
$packageIdLower = $PackageId.ToLowerInvariant()
5858
if ($Version) {
5959
$packageRoot = Join-Path $OutputDirectory $packageIdLower
6060
$packageDir = Get-ChildItem -Path $packageRoot -Directory -ErrorAction SilentlyContinue |

0 commit comments

Comments
 (0)