Skip to content

Commit 32945b9

Browse files
committed
Merge remote-tracking branch 'upstream/main' into BlazorHotReloadComponentPropertiesCache
2 parents 43b4c10 + d65e599 commit 32945b9

File tree

309 files changed

+5146
-2976
lines changed

Some content is hidden

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

309 files changed

+5146
-2976
lines changed

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

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,24 @@ pr:
1818
include:
1919
- '*'
2020
paths:
21+
include:
22+
- eng/*
23+
- src/Components/*
24+
- src/Extensions/*
25+
- src/Framework/*
26+
- src/Hosting/*
27+
- src/Http/*
28+
- src/Middleware/HttpLogging/*
29+
- src/Middleware/HttpOverrides/*
30+
- src/Middleware/HttpsPolicy/*
31+
- src/Middleware/Localization/*
32+
- src/Middleware/Session/*
33+
- src/Middleware/StaticFiles/*
34+
- src/Middleware/WebSockets/*
35+
- src/Servers/*
36+
- src/SignalR/*
2137
exclude:
22-
- .devcontainer/*
23-
- .github/*
24-
- .vscode/*
25-
- docs/*
2638
- '**/*.md'
27-
- LICENSE.TXT
28-
- THIRD-PARTY-NOTICES.TXT
2939

3040
variables:
3141
- name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE

.github/copilot-instructions.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,11 @@
3232
## Running tests
3333

3434
* 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`.
35+
36+
## .NET Environment
37+
38+
* Before running any `dotnet` commands in this repository, always activate the locally installed .NET environment first by running the appropriate activation script from the repository root:
39+
* On Windows: `. ./activate.ps1` (from repository root)
40+
* On Linux/Mac: `source activate.sh` (from repository root)
41+
* If not in the repository root, navigate there first or use the full path to the activation script.
42+
* This ensures that the correct version of .NET SDK is used for the repository.

.github/policies/resourceManagement.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -441,18 +441,18 @@ configuration:
441441
branch: main
442442
then:
443443
- addMilestone:
444-
milestone: 10.0-preview7
444+
milestone: 10.0-rc1
445445
description: '[Milestone Assignments] Assign Milestone to PRs merged to the `main` branch'
446446
- if:
447447
- payloadType: Pull_Request
448448
- isAction:
449449
action: Closed
450450
- targetsBranch:
451-
branch: release/10.0-preview6
451+
branch: release/10.0-preview7
452452
then:
453453
- removeMilestone
454454
- addMilestone:
455-
milestone: 10.0-preview6
455+
milestone: 10.0-preview7
456456
description: '[Milestone Assignments] Assign Milestone to PRs merged to release/10.0-preview1 branch'
457457
- if:
458458
- 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@5a11b260f9b0f31b4e7643ad823a4e0f2cdb3ddb # 2025-01-13
17+
uses: dotnet/arcade/.github/workflows/backport-base.yml@d777c20040bdc2e52b372fa98dcb84141ed692d3 # 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+
## Description
2+
3+
Selenium is used in the aspnetcore repo for automated E2E integration testing.
4+
Playwright is used in the aspnetcore repo for some benchmarking apps. We need to ensure the docker file and the package version match.
5+
6+
## Instructions
7+
8+
To update the Selenium and Playwright versions, these files need to be updated:
9+
10+
### Packages
11+
- [ ] [Selenium in `Versions.props`](eng/Versions.props) from NuGet:
12+
- [ ] [Selenium.WebDriver](https://www.nuget.org/packages/Selenium.WebDriver/) (Config variable `SeleniumWebDriverVersion`)
13+
- [ ] [Selenium.Support](https://www.nuget.org/packages/Selenium.Support/) (Config variable `SeleniumSupportVersion`)
14+
- [ ] Ensure Playwright versions match
15+
- [ ] [Blazor Wasm benchmarks in `src/Components/benchmarkapps/Wasm.Performance/dockerfile`](src/Components/benchmarkapps/Wasm.Performance/dockerfile) (image starts with `mcr.microsoft.com`)
16+
- [ ] [Playwright package version](eng/Versions.props) (Config variable `PlaywrightVersion`)
17+
18+
## Actions
19+
20+
Please, open the PR against `main` branch and include changes to the files listed above.
21+
22+
Also:
23+
- mention @dotnet/aspnet-build in the opened Pull Request - this will be a responsible engineer for changes validation.
24+
- add the `build-ops` label to the opened Pull Request
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: "[Monthly] Schedule Browser-Testing Dependencies Update Issue"
2+
3+
on:
4+
schedule:
5+
# Runs on the first day of every month at midnight UTC
6+
- cron: '0 0 1 * *'
7+
workflow_dispatch: # for manual triggering
8+
9+
jobs:
10+
create-issue:
11+
runs-on: ubuntu-latest
12+
permissions:
13+
contents: read
14+
issues: write
15+
steps:
16+
- name: Checkout repository
17+
uses: actions/checkout@v4
18+
19+
# copilot can be assigned to the issue
20+
# https://cli.github.com/manual/gh_issue_create
21+
- name: Create Issue From Template
22+
env:
23+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
24+
GH_REPO: ${{ github.repository }}
25+
run: |
26+
gh issue create \
27+
--title "Request Browser-Testing Dependencies Update" \
28+
--body-file ".github/workflows/browsertesting-issue-body.md" \
29+
--assignee "@copilot"

.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@5a11b260f9b0f31b4e7643ad823a4e0f2cdb3ddb # 2024-06-24
13+
uses: dotnet/arcade/.github/workflows/backport-base.yml@d777c20040bdc2e52b372fa98dcb84141ed692d3 # 2024-06-24

eng/Version.Details.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<!-- will get filled in the next backflow -->

0 commit comments

Comments
 (0)