Skip to content

Commit 2ae6e82

Browse files
Merging main into darc-main-85a65ee4-bc43-4d9a-9b5c-beffc2bf862a
2 parents ce921d3 + c5d6996 commit 2ae6e82

File tree

26 files changed

+934
-668
lines changed

26 files changed

+934
-668
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: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
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+
8+
## Formatting
9+
10+
* Apply code-formatting style defined in `.editorconfig`.
11+
* Prefer file-scoped namespace declarations and single-line using directives.
12+
* Insert a newline before the opening curly brace of any code block (e.g., after `if`, `for`, `while`, `foreach`, `using`, `try`, etc.).
13+
* Ensure that the final return statement of a method is on its own line.
14+
* Use pattern matching and switch expressions wherever possible.
15+
* Use `nameof` instead of string literals when referring to member names.
16+
* Ensure that XML doc comments are created for any public APIs. When applicable, include `<example>` and `<code>` documentation in the comments.
17+
18+
### Nullable Reference Types
19+
20+
* Declare variables non-nullable, and check for `null` at entry points.
21+
* Always use `is null` or `is not null` instead of `== null` or `!= null`.
22+
* Trust the C# null annotations and don't add null checks when the type system says a value cannot be null.
23+
24+
### Testing
25+
26+
* We use xUnit SDK v3 for tests.
27+
* Do not emit "Act", "Arrange" or "Assert" comments.
28+
* Use Moq for mocking in tests.
29+
* Copy existing style in nearby files for test method names and capitalization.
30+
31+
## Running tests
32+
33+
* 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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -382,18 +382,18 @@ configuration:
382382
branch: main
383383
then:
384384
- addMilestone:
385-
milestone: 10.0-preview5
385+
milestone: 10.0-preview6
386386
description: '[Milestone Assignments] Assign Milestone to PRs merged to the `main` branch'
387387
- if:
388388
- payloadType: Pull_Request
389389
- isAction:
390390
action: Closed
391391
- targetsBranch:
392-
branch: release/10.0-preview4
392+
branch: release/10.0-preview5
393393
then:
394394
- removeMilestone
395395
- addMilestone:
396-
milestone: 10.0-preview4
396+
milestone: 10.0-preview5
397397
description: '[Milestone Assignments] Assign Milestone to PRs merged to release/10.0-preview1 branch'
398398
- if:
399399
- payloadType: Issues
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: 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/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"

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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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).

docs/WebTransport.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ To use it, simply run from VS. This will launch the server and terminal. Now you
1818

1919
## Using Edge or Chrome DevTools as a client
2020

21-
The Chromium project has implemented a WebTransport client and can be accessed via their JS API from the Chrome or Edge DevTools console. A good sample app demonstrating how to use that API can be found [here](https://github.com/myjimmy/google-webtransport-sample/blob/ee13bde656c4d421d1f2a8e88fd71f572272c163/client.js).
21+
The Chromium project has implemented a WebTransport client and can be accessed via their JS API from the Chrome or Edge DevTools console. A good sample app demonstrating how to use that API can be found in the [Google WebTransport sample repository](https://github.com/myjimmy/google-webtransport-sample/blob/ee13bde656c4d421d1f2a8e88fd71f572272c163/client.js).
2222

2323
## Note about preview features
2424

@@ -171,7 +171,7 @@ session.Abort(int errorCode);
171171
```
172172
Aborting a WebTransport session will result in severing the connection with the client and aborting all the streams. You can optionally specify an error code that will be passed down into the logs. The default value (256) represents no error.
173173

174-
**Note:** valid error codes are defined [here](https://www.rfc-editor.org/rfc/rfc9114.html#name-http-3-error-codes).
174+
**Note:** valid error codes are defined in the [HTTP/3 Error Codes specification](https://www.rfc-editor.org/rfc/rfc9114.html#name-http-3-error-codes).
175175

176176
- Aborting a WebTransport stream
177177
```C#

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AspNetCoreMajorVersion>10</AspNetCoreMajorVersion>
1010
<AspNetCoreMinorVersion>0</AspNetCoreMinorVersion>
1111
<AspNetCorePatchVersion>0</AspNetCorePatchVersion>
12-
<PreReleaseVersionIteration>5</PreReleaseVersionIteration>
12+
<PreReleaseVersionIteration>6</PreReleaseVersionIteration>
1313
<ValidateBaseline>true</ValidateBaseline>
1414
<IdentityModelVersion Condition="'$(IsIdentityModelTestJob)' != 'true'">8.0.1</IdentityModelVersion>
1515
<IdentityModelVersion Condition="'$(IsIdentityModelTestJob)' == 'true'">*-*</IdentityModelVersion>

eng/build.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ runtime_source_feed=''
3737
runtime_source_feed_key=''
3838
source_build=''
3939
product_build=''
40+
warn_as_error=true
4041

4142
if [ "$(uname)" = "Darwin" ]; then
4243
target_os_name='osx'
@@ -86,6 +87,7 @@ Options:
8687
--binarylog|-bl Use a binary logger
8788
--excludeCIBinarylog Don't output binary log by default in CI builds (short: -nobl).
8889
--verbosity|-v MSBuild verbosity: q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic]
90+
--warnAsError Sets warnaserror msbuild parameter: 'true' or 'false'
8991
9092
--runtime-source-feed Additional feed that can be used when downloading .NET runtimes and SDKs
9193
--runtime-source-feed-key Key for feed that can be used when downloading .NET runtimes and SDKs
@@ -259,6 +261,11 @@ while [[ $# -gt 0 ]]; do
259261
-productbuild|-product-build|-pb)
260262
product_build=true
261263
;;
264+
-warnaserror)
265+
shift
266+
[ -z "${1:-}" ] && __error "Missing value for parameter --warnaserror" && __usage
267+
warn_as_error="${1:-}"
268+
;;
262269
*)
263270
msbuild_args[${#msbuild_args[*]}]="$1"
264271
;;

0 commit comments

Comments
 (0)