Skip to content

Commit 0f52575

Browse files
committed
Merge branch 'main' into not-found-works-after-navigation
2 parents e4b89c1 + 5678f22 commit 0f52575

File tree

58 files changed

+2138
-1041
lines changed

Some content is hidden

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

58 files changed

+2138
-1041
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/Build.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,14 @@
5656
$(RepoRoot)src\SignalR\perf\benchmarkapps\**\*.csproj;
5757
" />
5858

59-
<!-- In the VMR, we don't build the native ANCM bits in pass 1 -->
59+
<!-- In the .NET product build mode, don't build the native ANCM bits in pass 1 -->
6060
<ProjectToExclude Include="
6161
$(RepoRoot)src\Installers\**\*.vcxproj;
6262
"
6363
Condition=" '$(BuildNative)' == 'true' and '$(DotNetBuild)' == 'true' and ('$(DotNetBuildPass)' == '' or '$(DotNetBuildPass)' == '1') " />
6464

6565

66-
<!-- This project requires inputs from x64, x86, and arm64 on Windows - therefore in the VMR, we build it in pass 2 -->
66+
<!-- This project requires inputs from x64, x86, and arm64 on Windows - therefore in the .NET product build mode, build it in pass 2 -->
6767
<ProjectToExclude Include="
6868
$(RepoRoot)src\Servers\IIS/IntegrationTesting.IIS\src\Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj;
6969
"
@@ -83,7 +83,7 @@
8383
</ProjectToBuild>
8484
</ItemGroup>
8585
</When>
86-
<!-- Projects to build in VMR build pass 2 -->
86+
<!-- Projects to build in .NET product build pass 2 -->
8787
<When Condition="'$(DotNetBuildPass)' == '2'">
8888
<ItemGroup Condition=" '$(DotNetBuild)' == 'true' AND '$(TargetOsName)' == 'win' AND '$(TargetArchitecture)' == 'x64' ">
8989
<!-- Build Hosting Bundle -->
@@ -264,7 +264,7 @@
264264
<_VcxTargetPlatform Condition="'$(TargetArchitecture)' == 'arm64'">ARM64</_VcxTargetPlatform>
265265
</PropertyGroup>
266266

267-
<!-- In the VMR, we build the installers entirely via HostingBundle ProjectReferences in pass 2 -->
267+
<!-- In .NET product build mode, build the installers entirely via HostingBundle ProjectReferences in pass 2 -->
268268
<ItemGroup Condition="'$(DotNetBuild)' != 'true' and '$(_BuildWindowsInstallers)' == 'true' ">
269269
<!-- Build the ANCM custom action -->
270270
<InstallerProject Include="$(RepoRoot)src\Installers\Windows\AspNetCoreModule-Setup\CustomAction\aspnetcoreCA.vcxproj" AdditionalProperties="Platform=x64" />

eng/Common.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<TargetRuntimeIdentifier Condition="'$(TargetRuntimeIdentifier)' == ''">$(TargetOsName)-$(TargetArchitecture)</TargetRuntimeIdentifier>
1313
<PortableBuild Condition="'$(PortableBuild)' == ''">true</PortableBuild>
14-
<DefaultAppHostRuntimeIdentifier Condition=" '$(DotNetBuild)' == 'true' ">$(TargetRuntimeIdentifier)</DefaultAppHostRuntimeIdentifier>
14+
<DefaultAppHostRuntimeIdentifier Condition="'$(DotNetBuild)' == 'true'">$(TargetRuntimeIdentifier)</DefaultAppHostRuntimeIdentifier>
1515

1616
<BuildNodeJS>$(BuildNodeJSUnlessSourcebuild)</BuildNodeJS>
1717
<BuildNodeJS Condition="'$(DotNetBuildSourceOnly)' == 'true'">false</BuildNodeJS>

0 commit comments

Comments
 (0)