Skip to content

Commit a0fef4e

Browse files
committed
Merge branch 'main' into BlazorBenchPreload
2 parents e97f6fa + 1415d9b commit a0fef4e

File tree

210 files changed

+5461
-2435
lines changed

Some content is hidden

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

210 files changed

+5461
-2435
lines changed

.azure/pipelines/components-e2e-tests.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,15 @@ pr:
1717
branches:
1818
include:
1919
- '*'
20+
paths:
21+
exclude:
22+
- .devcontainer/*
23+
- .github/*
24+
- .vscode/*
25+
- docs/*
26+
- '**/*.md'
27+
- LICENSE.TXT
28+
- THIRD-PARTY-NOTICES.TXT
2029

2130
variables:
2231
- name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE

.github/copilot-instructions.md

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
## General
2+
3+
* Make only high confidence suggestions when reviewing code changes.
4+
* Always use the latest version C#, currently C# 13 features.
5+
* Never change global.json unless explicitly asked to.
6+
* Never change package.json or package-lock.json files unless explicitly asked to.
7+
* Never change NuGet.config files unless explicitly asked to.
8+
9+
## Formatting
10+
11+
* Apply code-formatting style defined in `.editorconfig`.
12+
* Prefer file-scoped namespace declarations and single-line using directives.
13+
* Insert a newline before the opening curly brace of any code block (e.g., after `if`, `for`, `while`, `foreach`, `using`, `try`, etc.).
14+
* Ensure that the final return statement of a method is on its own line.
15+
* Use pattern matching and switch expressions wherever possible.
16+
* Use `nameof` instead of string literals when referring to member names.
17+
* Ensure that XML doc comments are created for any public APIs. When applicable, include `<example>` and `<code>` documentation in the comments.
18+
19+
### Nullable Reference Types
20+
21+
* Declare variables non-nullable, and check for `null` at entry points.
22+
* Always use `is null` or `is not null` instead of `== null` or `!= null`.
23+
* Trust the C# null annotations and don't add null checks when the type system says a value cannot be null.
24+
25+
### Testing
26+
27+
* We use xUnit SDK v3 for tests.
28+
* Do not emit "Act", "Arrange" or "Assert" comments.
29+
* Use Moq for mocking in tests.
30+
* Copy existing style in nearby files for test method names and capitalization.
31+
32+
## Running tests
33+
34+
* To build and run tests in the repo, use the `build.sh` script that is located in each subdirectory within the `src` folder. For example, to run the build with tests in the `src/Http` directory, run `./src/Http/build.sh -test`.

.github/policies/resourceManagement.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -239,8 +239,6 @@ configuration:
239239
- titleContains:
240240
pattern: Source code updates
241241
isRegex: False
242-
- targetsBranch:
243-
branch: main
244242
then:
245243
- addLabel:
246244
label: area-infrastructure
@@ -382,18 +380,18 @@ configuration:
382380
branch: main
383381
then:
384382
- addMilestone:
385-
milestone: 10.0-preview5
383+
milestone: 10.0-preview6
386384
description: '[Milestone Assignments] Assign Milestone to PRs merged to the `main` branch'
387385
- if:
388386
- payloadType: Pull_Request
389387
- isAction:
390388
action: Closed
391389
- targetsBranch:
392-
branch: release/10.0-preview4
390+
branch: release/10.0-preview5
393391
then:
394392
- removeMilestone
395393
- addMilestone:
396-
milestone: 10.0-preview4
394+
milestone: 10.0-preview5
397395
description: '[Milestone Assignments] Assign Milestone to PRs merged to release/10.0-preview1 branch'
398396
- if:
399397
- payloadType: Issues
@@ -555,7 +553,7 @@ configuration:
555553
then:
556554
- removeMilestone
557555
- addMilestone:
558-
milestone: 9.0.6
556+
milestone: 9.0.7
559557
description: '[Milestone Assignments] Assign Milestone to PRs merged to release/9.0 branch'
560558
- if:
561559
- payloadType: Pull_Request
@@ -566,7 +564,7 @@ configuration:
566564
then:
567565
- removeMilestone
568566
- addMilestone:
569-
milestone: 8.0.17
567+
milestone: 8.0.18
570568
description: '[Milestone Assignments] Assign Milestone to PRs merged to release/8.0 branch'
571569
- if:
572570
- payloadType: Issues

.github/workflows/backport.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ permissions:
1414

1515
jobs:
1616
backport:
17-
uses: dotnet/arcade/.github/workflows/backport-base.yml@d7540e540636883d3d080d087223d28b6b7395ae # 2025-01-13
17+
uses: dotnet/arcade/.github/workflows/backport-base.yml@fdcda9b4919dd16bd2388b5421cc5d55afac0e88 # 2025-01-13
1818
with:
1919
pr_description_template: |
2020
Backport of #%source_pr_number% to %target_branch%
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: "Copilot Setup Steps"
2+
3+
# Allow testing of the setup steps from your repository's "Actions" tab.
4+
on: workflow_dispatch
5+
6+
jobs:
7+
# The job MUST be called `copilot-setup-steps` or it will not be picked up by Copilot.
8+
copilot-setup-steps:
9+
runs-on: 8-core-ubuntu-latest
10+
11+
permissions:
12+
contents: read
13+
14+
# You can define any steps you want, and they will run before the agent starts.
15+
# If you do not check out your code, Copilot will do this for you.
16+
steps:
17+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
18+
19+
# Include PrepareForHelix to maximise what is downloaded here
20+
- name: Build solution
21+
env:
22+
# prevent GitInfo errors
23+
CI: false
24+
run: ./restore.sh

.github/workflows/inter-branch-merge-flow.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ permissions:
1010

1111
jobs:
1212
Merge:
13-
uses: dotnet/arcade/.github/workflows/backport-base.yml@d7540e540636883d3d080d087223d28b6b7395ae # 2024-06-24
13+
uses: dotnet/arcade/.github/workflows/backport-base.yml@fdcda9b4919dd16bd2388b5421cc5d55afac0e88 # 2024-06-24

.github/workflows/markdownlint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ jobs:
2424
- name: Run Markdownlint
2525
run: |
2626
echo "::add-matcher::.github/workflows/markdownlint-problem-matcher.json"
27-
npm i -g markdownlint-cli
27+
npm i -g markdownlint-cli@0.45.0
2828
markdownlint "docs/**/*.md"

Directory.Build.props

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,10 @@
106106
<NuspecBasePath>$(MSBuildProjectDirectory)</NuspecBasePath>
107107

108108
<IncludeSymbols>true</IncludeSymbols>
109+
109110
<DefaultNetFxTargetFramework>net462</DefaultNetFxTargetFramework>
111+
<!-- Current xunit.runner.visualstudio supports net472+/net8.0+ only. So we can't use net462 -->
112+
<DefaultNetFxTargetFramework Condition="'$(IsTestProject)'=='true'">net472</DefaultNetFxTargetFramework>
110113

111114
<CrossgenOutput Condition="'$(DotNetBuildUseMonoRuntime)' == 'true'">false</CrossgenOutput>
112115
</PropertyGroup>

docs/AddingNewProjects.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,4 @@ while the second (the one with condition `'$(BuildMainlyReferenceProviders)' ==
5050
3. Add your project name to the lists in `src\Framework\test\TestData.cs`. This is not strictly necessary for the project to work but there is a test on CI that will fail if this is not done. Make sure to include your project in a way that maintains alphabetical order.
5151
5252
## Manually saving solution and solution filter files
53-
VS is pretty good at keeping the files up to date and organized correctly. It will also prompt you if it finds an error and, in most cases, offer a solution to fix the issue. Sometimes just saving the file will trigger VS to resolve any issues automatically. However, if you would like to add a new solution filter file or update one manually you can find a tutorial link [here](https://learn.microsoft.com/visualstudio/ide/filtered-solutions).
53+
VS is pretty good at keeping the files up to date and organized correctly. It will also prompt you if it finds an error and, in most cases, offer a solution to fix the issue. Sometimes just saving the file will trigger VS to resolve any issues automatically. However, if you would like to add a new solution filter file or update one manually you can find a [tutorial on filtered solutions in Visual Studio](https://learn.microsoft.com/visualstudio/ide/filtered-solutions).

docs/DailyBuilds.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Daily builds include the latest source code changes. They are not supported for
44

55
If you want to download the latest daily build and use it in a project, then you need to:
66

7-
* Obtain the latest [build of the .NET Core SDK](https://github.com/dotnet/sdk/blob/main/documentation/package-table.md).
7+
* Obtain the latest [build of the .NET Core SDK](https://github.com/dotnet/dotnet/blob/main/docs/builds-table.md).
88
* Add a NuGet.Config to your project directory with the following content:
99

1010
## .NET 8
@@ -60,4 +60,4 @@ These are available in the [Visual Studio Preview](https://www.visualstudio.com/
6060

6161
## Downloading daily builds of aspnetcore
6262

63-
Links to our daily builds can be found [here](https://github.com/dotnet/aspnetcore/blob/main/README.md#nightly-builds).
63+
Links to our daily builds can be found in the [ASP.NET Core nightly builds section](https://github.com/dotnet/aspnetcore/blob/main/README.md#nightly-builds).

0 commit comments

Comments
 (0)