Skip to content

Commit 00e3309

Browse files
Merge main into darc-main-9d94a9f3-5df0-4962-8085-c05bfa573c93
2 parents 60572f1 + cc6b317 commit 00e3309

File tree

123 files changed

+1570
-375
lines changed

Some content is hidden

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

123 files changed

+1570
-375
lines changed

.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
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
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+
Also mention @dotnet/aspnet-build in the opened Pull Request - this will be a responsible engineer for changes validation.
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"

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 -->

eng/Version.Details.xml

Lines changed: 193 additions & 193 deletions
Large diffs are not rendered by default.

eng/Versions.props

Lines changed: 97 additions & 97 deletions
Large diffs are not rendered by default.

global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
"jdk": "latest"
2828
},
2929
"msbuild-sdks": {
30-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25371.106",
31-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25371.106",
32-
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25371.106",
30+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25372.103",
31+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25372.103",
32+
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25372.103",
3333
"Microsoft.Build.NoTargets": "3.7.0",
3434
"Microsoft.Build.Traversal": "3.4.0"
3535
}

src/Components/benchmarkapps/Wasm.Performance/dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build
1+
FROM mcr.microsoft.com/dotnet/sdk:latest AS build
22

33
ENV StressRunDuration=0
44
ARG DEBIAN_FRONTEND=noninteractive
@@ -29,7 +29,7 @@ RUN .dotnet/dotnet publish -c Release -r linux-x64 --sc true -o /app ./src/Compo
2929
RUN chmod +x /app/Wasm.Performance.Driver
3030

3131
WORKDIR /app
32-
FROM mcr.microsoft.com/playwright/dotnet:v1.53.0-jammy-amd64 AS final
32+
FROM mcr.microsoft.com/playwright/dotnet:v1.54.0-jammy-amd64 AS final
3333
COPY --from=build ./app ./
3434
COPY ./exec.sh ./
3535

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
4+
namespace Microsoft.AspNetCore.Http.Metadata;
5+
6+
/// <summary>
7+
/// Metadata that indicates the endpoint is intended for API clients.
8+
/// When present, authentication handlers should prefer returning status codes over browser redirects.
9+
/// </summary>
10+
internal sealed class ApiEndpointMetadata : IApiEndpointMetadata
11+
{
12+
/// <summary>
13+
/// Singleton instance of <see cref="ApiEndpointMetadata"/>.
14+
/// </summary>
15+
public static readonly ApiEndpointMetadata Instance = new();
16+
17+
private ApiEndpointMetadata()
18+
{
19+
}
20+
}

0 commit comments

Comments
 (0)