Skip to content

Commit f6da28e

Browse files
AArnottAArnott
committed
Specifically, this merges [02bf9ee from that repo](AArnott/Library.Template@02bf9ee).
2 parents 548bbc0 + 02bf9ee commit f6da28e

17 files changed

+63
-66
lines changed

‎.config/dotnet-tools.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"rollForward": false
1818
},
1919
"nbgv": {
20-
"version": "3.7.112",
20+
"version": "3.7.115",
2121
"commands": [
2222
"nbgv"
2323
],

‎.devcontainer/Dockerfile

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

‎.devcontainer/devcontainer.json

+20-16
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,25 @@
11
{
22
"name": "Dev space",
33
"dockerFile": "Dockerfile",
4-
"settings": {
5-
"terminal.integrated.shell.linux": "/usr/bin/pwsh"
4+
"customizations": {
5+
"vscode": {
6+
"settings": {
7+
"terminal.integrated.shell.linux": "/usr/bin/pwsh"
8+
},
9+
"extensions": [
10+
"ms-azure-devops.azure-pipelines",
11+
"ms-dotnettools.csharp",
12+
"k--kato.docomment",
13+
"editorconfig.editorconfig",
14+
"esbenp.prettier-vscode",
15+
"pflannery.vscode-versionlens",
16+
"davidanson.vscode-markdownlint",
17+
"dotjoshjohnson.xml",
18+
"ms-vscode-remote.remote-containers",
19+
"ms-azuretools.vscode-docker",
20+
"tintoy.msbuild-project-tools"
21+
]
22+
}
623
},
7-
"postCreateCommand": "./init.ps1 -InstallLocality machine",
8-
"extensions": [
9-
"ms-azure-devops.azure-pipelines",
10-
"ms-dotnettools.csharp",
11-
"k--kato.docomment",
12-
"editorconfig.editorconfig",
13-
"esbenp.prettier-vscode",
14-
"pflannery.vscode-versionlens",
15-
"davidanson.vscode-markdownlint",
16-
"dotjoshjohnson.xml",
17-
"ms-vscode-remote.remote-containers",
18-
"ms-azuretools.vscode-docker",
19-
"tintoy.msbuild-project-tools"
20-
]
24+
"postCreateCommand": "./init.ps1 -InstallLocality machine"
2125
}

‎.github/.editorconfig

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[renovate.json*]
2+
indent_style = tab

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

-7
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,6 @@ runs:
3232
name: build_logs-${{ runner.os }}
3333
path: ${{ runner.temp }}/_artifacts/build_logs
3434
continue-on-error: true
35-
- name: 📢 Upload test_logs
36-
if: always()
37-
uses: actions/upload-artifact@v4
38-
with:
39-
name: test_logs-${{ runner.os }}
40-
path: ${{ runner.temp }}/_artifacts/test_logs
41-
continue-on-error: true
4235
- name: 📢 Upload testResults
4336
if: always()
4437
uses: actions/upload-artifact@v4

‎.github/renovate.json

+20-22
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,22 @@
11
{
2-
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3-
"extends": [
4-
"config:recommended"
5-
],
6-
"semanticCommits": "disabled",
7-
"labels": ["dependencies"],
8-
"packageRules": [
9-
{
10-
"matchPackageNames": ["nbgv", "nerdbank.gitversioning"],
11-
"groupName": "nbgv and nerdbank.gitversioning updates"
12-
},
13-
{
14-
"matchPackageNames": ["xunit*"],
15-
"allowedVersions": "<3.0",
16-
"groupName": "xunit"
17-
},
18-
{
19-
"matchDatasources": ["dotnet-version", "docker"],
20-
"matchDepNames": ["dotnet-sdk", "mcr.microsoft.com/dotnet/sdk"],
21-
"groupName": "Dockerfile and global.json updates"
22-
}
23-
]
2+
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3+
"extends": ["config:recommended"],
4+
"semanticCommits": "disabled",
5+
"labels": ["dependencies"],
6+
"packageRules": [
7+
{
8+
"matchPackageNames": ["nbgv", "nerdbank.gitversioning"],
9+
"groupName": "nbgv and nerdbank.gitversioning updates"
10+
},
11+
{
12+
"matchPackageNames": ["xunit*"],
13+
"allowedVersions": "<3.0",
14+
"groupName": "xunit"
15+
},
16+
{
17+
"matchDatasources": ["dotnet-version", "docker"],
18+
"matchDepNames": ["dotnet-sdk", "mcr.microsoft.com/dotnet/sdk"],
19+
"groupName": "Dockerfile and global.json updates"
20+
}
21+
]
2422
}

‎.github/workflows/libtemplate-update.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
4646
# Pushing commits that add or change files under .github/workflows will cause our workflow to fail.
4747
# But it usually isn't necessary because the target branch already has (or doesn't have) these changes.
48-
# So if the merged doesn't bring in any changes to these files, try the merge locally and push that
48+
# So if the merge doesn't bring in any changes to these files, try the merge locally and push that
4949
# to keep github happy.
5050
if ((git rev-list FETCH_HEAD ^HEAD --count -- .github/workflows) -eq 0) {
5151
# Indeed there are no changes in that area. So merge locally to try to appease GitHub.

‎Directory.Packages.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<GlobalPackageReference Include="CSharpIsNullAnalyzer" Version="0.1.593" />
2121
<GlobalPackageReference Include="DotNetAnalyzers.DocumentationAnalyzers" Version="1.0.0-beta.59" />
2222
<!-- The condition works around https://github.com/dotnet/sdk/issues/44951 -->
23-
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.7.112" Condition="!('$(TF_BUILD)'=='true' and '$(dotnetformat)'=='true')" />
23+
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.7.115" Condition="!('$(TF_BUILD)'=='true' and '$(dotnetformat)'=='true')" />
2424
<GlobalPackageReference Include="PolySharp" Version="1.15.0" />
2525
<GlobalPackageReference Include="StyleCop.Analyzers.Unstable" Version="1.2.0.556" />
2626
</ItemGroup>

‎global.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "9.0.101",
3+
"version": "9.0.102",
44
"rollForward": "patch",
55
"allowPrerelease": false
66
}

‎test/Directory.Build.targets

+4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project>
3+
<ItemGroup>
4+
<Content Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" Condition="Exists('xunit.runner.json')" />
5+
</ItemGroup>
6+
37
<Import Project="$([MSBuild]::GetPathOfFileAbove($(MSBuildThisFile), $(MSBuildThisFileDirectory)..))" />
48
</Project>

‎test/Xunit.SkippableFact.Tests/Xunit.SkippableFact.Tests.csproj

-5
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,6 @@
44
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
55
<IsPackable>false</IsPackable>
66
</PropertyGroup>
7-
<ItemGroup>
8-
<Content Include="xunit.runner.json">
9-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
10-
</Content>
11-
</ItemGroup>
127
<ItemGroup>
138
<ProjectReference Include="..\..\src\Xunit.SkippableFact\Xunit.SkippableFact.csproj" />
149
</ItemGroup>

‎test/Xunit.SkippableFact.Tests/xunit.runner.json

-3
This file was deleted.

‎tools/Get-ArtifactsStagingDirectory.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Param(
44
if ($env:BUILD_ARTIFACTSTAGINGDIRECTORY) {
55
$ArtifactStagingFolder = $env:BUILD_ARTIFACTSTAGINGDIRECTORY
66
} elseif ($env:RUNNER_TEMP) {
7-
$ArtifactStagingFolder = "$env:RUNNER_TEMP\_artifacts"
7+
$ArtifactStagingFolder = Join-Path $env:RUNNER_TEMP _artifacts
88
} else {
99
$ArtifactStagingFolder = [System.IO.Path]::GetFullPath("$PSScriptRoot/../obj/_artifacts")
1010
if ($CleanIfLocal -and (Test-Path $ArtifactStagingFolder)) {

‎tools/artifacts/_stage_all.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ param (
1111
[switch]$AvoidSymbolicLinks
1212
)
1313

14-
$ArtifactStagingFolder = & "$PSScriptRoot/../../tools/Get-ArtifactsStagingDirectory.ps1" -CleanIfLocal
14+
$ArtifactStagingFolder = & "$PSScriptRoot/../Get-ArtifactsStagingDirectory.ps1" -CleanIfLocal
1515

1616
function Create-SymbolicLink {
1717
param (

‎tools/artifacts/build_logs.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
$ArtifactStagingFolder = & "$PSScriptRoot/../../tools/Get-ArtifactsStagingDirectory.ps1"
1+
$ArtifactStagingFolder = & "$PSScriptRoot/../Get-ArtifactsStagingDirectory.ps1"
22

33
if (!(Test-Path $ArtifactStagingFolder/build_logs)) { return }
44

‎tools/artifacts/testResults.ps1

+3-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ $result = @{}
77
$testRoot = Resolve-Path "$PSScriptRoot\..\..\test"
88
$result[$testRoot] = (Get-ChildItem "$testRoot\TestResults" -Recurse -Directory | Get-ChildItem -Recurse -File)
99

10-
$testlogsPath = "$env:BUILD_ARTIFACTSTAGINGDIRECTORY\test_logs"
10+
$artifactStaging = & "$PSScriptRoot/../Get-ArtifactsStagingDirectory.ps1"
11+
$testlogsPath = Join-Path $artifactStaging "test_logs"
1112
if (Test-Path $testlogsPath) {
12-
$result[$testlogsPath] = Get-ChildItem "$testlogsPath\*";
13+
$result[$testlogsPath] = Get-ChildItem $testlogsPath -Recurse;
1314
}
1415

1516
$result

‎tools/dotnet-test-cloud.ps1

+6-3
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ if ($x86) {
4444
}
4545
}
4646

47+
$testBinLog = Join-Path $ArtifactStagingFolder (Join-Path build_logs test.binlog)
48+
$testDiagLog = Join-Path $ArtifactStagingFolder (Join-Path test_logs diag.log)
49+
4750
& $dotnet test $RepoRoot `
4851
--no-build `
4952
-c $Configuration `
@@ -52,8 +55,8 @@ if ($x86) {
5255
--settings "$PSScriptRoot/test.runsettings" `
5356
--blame-hang-timeout 60s `
5457
--blame-crash `
55-
-bl:"$ArtifactStagingFolder/build_logs/test.binlog" `
56-
--diag "$ArtifactStagingFolder/test_logs/diag.log;TraceLevel=info" `
58+
-bl:"$testBinLog" `
59+
--diag "$testDiagLog;TraceLevel=info" `
5760
--logger trx `
5861

5962
$unknownCounter = 0
@@ -65,7 +68,7 @@ Get-ChildItem -Recurse -Path $RepoRoot\test\*.trx |% {
6568
$runTitle = $null
6669
if ($x.TestRun.TestDefinitions -and $x.TestRun.TestDefinitions.GetElementsByTagName('UnitTest')) {
6770
$storage = $x.TestRun.TestDefinitions.GetElementsByTagName('UnitTest')[0].storage -replace '\\','/'
68-
if ($storage -match '/(?<tfm>net[^/]+)/(?:(?<rid>[^/]+)/)?(?<lib>[^/]+)\.dll$') {
71+
if ($storage -match '/(?<tfm>net[^/]+)/(?:(?<rid>[^/]+)/)?(?<lib>[^/]+)\.(dll|exe)$') {
6972
if ($matches.rid) {
7073
$runTitle = "$($matches.lib) ($($matches.tfm), $($matches.rid), $Agent)"
7174
} else {

0 commit comments

Comments
 (0)