Skip to content

Commit 3f68aac

Browse files
committed
Merge remote-tracking branch 'origin/main' into dropThreadingAnalyzers
2 parents 5721467 + d4e6e4c commit 3f68aac

File tree

160 files changed

+2613
-2891
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

160 files changed

+2613
-2891
lines changed

.config/dotnet-tools.json

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,32 @@
33
"isRoot": true,
44
"tools": {
55
"powershell": {
6-
"version": "7.4.2",
6+
"version": "7.5.0",
77
"commands": [
88
"pwsh"
9-
]
9+
],
10+
"rollForward": false
1011
},
1112
"dotnet-coverage": {
12-
"version": "17.11.0",
13+
"version": "17.14.2",
1314
"commands": [
1415
"dotnet-coverage"
15-
]
16+
],
17+
"rollForward": false
1618
},
1719
"nbgv": {
18-
"version": "3.6.133",
20+
"version": "3.7.115",
1921
"commands": [
2022
"nbgv"
21-
]
23+
],
24+
"rollForward": false
25+
},
26+
"docfx": {
27+
"version": "2.78.3",
28+
"commands": [
29+
"docfx"
30+
],
31+
"rollForward": false
2232
}
2333
}
2434
}

.devcontainer/Dockerfile

Lines changed: 6 additions & 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:8.0.201-jammy
2+
FROM mcr.microsoft.com/dotnet/sdk:9.0.200-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.
@@ -12,3 +12,8 @@ FROM mcr.microsoft.com/dotnet/sdk:8.0.201-jammy
1212
# See https://github.com/dotnet/dotnet-docker/issues/2790 for a discussion on this, where the prioritized use case
1313
# was *not* devcontainers, sadly.
1414
ENV NUGET_XMLDOC_MODE=
15+
16+
# Install Node.js 16
17+
RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash - \
18+
&& apt-get install -y nodejs
19+
RUN npm i -g yarn

.devcontainer/devcontainer.json

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,28 @@
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+
"amodio.tsl-problem-matcher",
22+
"firsttris.vscode-jest-runner",
23+
"Orta.vscode-jest"
24+
]
25+
}
626
},
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-
"pflannery.vscode-versionlens",
14-
"davidanson.vscode-markdownlint",
15-
"dotjoshjohnson.xml",
16-
"ms-vscode-remote.remote-containers",
17-
"ms-azuretools.vscode-docker",
18-
"ms-vscode.powershell"
19-
]
27+
"postCreateCommand": "./init.ps1 -InstallLocality machine"
2028
}

.editorconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ indent_size = 2
2626
# Xml config files
2727
[*.{ruleset,config,nuspec,resx,vsixmanifest,vsct,runsettings}]
2828
indent_size = 2
29+
indent_style = space
2930

3031
[*.{js,ts,json}]
3132
indent_style = tab
@@ -188,5 +189,8 @@ dotnet_diagnostic.DOC202.severity = warning
188189
# CA1062: Validate arguments of public methods
189190
dotnet_diagnostic.CA1062.severity = warning
190191

192+
# CA2016: Forward the CancellationToken parameter
193+
dotnet_diagnostic.CA2016.severity = warning
194+
191195
[*.sln]
192196
indent_style = tab

.github/.editorconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[renovate.json*]
2+
indent_style = tab
Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
name: Publish artifacts
2+
description: Publish artifacts
3+
4+
runs:
5+
using: composite
6+
steps:
7+
- name: 📥 Collect artifacts
8+
run: tools/artifacts/_stage_all.ps1
9+
shell: pwsh
10+
if: always()
11+
12+
# TODO: replace this hard-coded list with a loop that utilizes the NPM package at
13+
# https://github.com/actions/toolkit/tree/main/packages/artifact (or similar) to push the artifacts.
14+
15+
- name: 📢 Upload project.assets.json files
16+
if: always()
17+
uses: actions/upload-artifact@v4
18+
with:
19+
name: projectAssetsJson-${{ runner.os }}
20+
path: ${{ runner.temp }}/_artifacts/projectAssetsJson
21+
continue-on-error: true
22+
- name: 📢 Upload variables
23+
uses: actions/upload-artifact@v4
24+
with:
25+
name: variables-${{ runner.os }}
26+
path: ${{ runner.temp }}/_artifacts/Variables
27+
continue-on-error: true
28+
- name: 📢 Upload build_logs
29+
if: always()
30+
uses: actions/upload-artifact@v4
31+
with:
32+
name: build_logs-${{ runner.os }}
33+
path: ${{ runner.temp }}/_artifacts/build_logs
34+
continue-on-error: true
35+
- name: 📢 Upload testResults
36+
if: always()
37+
uses: actions/upload-artifact@v4
38+
with:
39+
name: testResults-${{ runner.os }}
40+
path: ${{ runner.temp }}/_artifacts/testResults
41+
continue-on-error: true
42+
- name: 📢 Upload coverageResults
43+
if: always()
44+
uses: actions/upload-artifact@v4
45+
with:
46+
name: coverageResults-${{ runner.os }}
47+
path: ${{ runner.temp }}/_artifacts/coverageResults
48+
continue-on-error: true
49+
- name: 📢 Upload symbols
50+
uses: actions/upload-artifact@v4
51+
with:
52+
name: symbols-${{ runner.os }}
53+
path: ${{ runner.temp }}/_artifacts/symbols
54+
continue-on-error: true
55+
- name: 📢 Upload deployables
56+
uses: actions/upload-artifact@v4
57+
with:
58+
name: deployables-${{ runner.os }}
59+
path: ${{ runner.temp }}/_artifacts/deployables
60+
if: always()

.github/dependabot.yml

Lines changed: 0 additions & 15 deletions
This file was deleted.

.github/renovate.json

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
{
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+
"groupName": "xunit"
14+
},
15+
{
16+
"matchDatasources": ["dotnet-version", "docker"],
17+
"matchDepNames": ["dotnet-sdk", "mcr.microsoft.com/dotnet/sdk"],
18+
"groupName": "Dockerfile and global.json updates"
19+
},
20+
{
21+
"matchPackageNames": ["*"],
22+
"allowedVersions": "!/-g[a-f0-9]+$/"
23+
},
24+
{
25+
"matchPackageNames": [
26+
"Microsoft.Bcl.AsyncInterfaces",
27+
"System.Collections.Immutable",
28+
"System.Text.Json"
29+
],
30+
"allowedVersions": "<9.0",
31+
"groupName": "Included in .NET runtime"
32+
}
33+
]
34+
}

0 commit comments

Comments
 (0)