Merge branch 'dotnet:main' into main

Author: marcominerva

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

@@ -18,14 +18,24 @@ pr:
     include:
     - '*'
   paths:
+    include:
+    - eng/*
+    - src/Components/*
+    - src/Extensions/*
+    - src/Framework/*
+    - src/Hosting/*
+    - src/Http/*
+    - src/Middleware/HttpLogging/*
+    - src/Middleware/HttpOverrides/*
+    - src/Middleware/HttpsPolicy/*
+    - src/Middleware/Localization/*
+    - src/Middleware/Session/*
+    - src/Middleware/StaticFiles/*
+    - src/Middleware/WebSockets/*
+    - src/Servers/*
+    - src/SignalR/*
     exclude:
-    - .devcontainer/*
-    - .github/*
-    - .vscode/*
-    - docs/*
     - '**/*.md'
-    - LICENSE.TXT
-    - THIRD-PARTY-NOTICES.TXT
 
 variables:
 - name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE

.editorconfig

@@ -464,12 +464,6 @@ dotnet_diagnostic.IDE0161.severity = silent
 # IDE0005: Remove unused usings. Ignore for shared src files since imports for those depend on the projects in which they are included.
 dotnet_diagnostic.IDE0005.severity = silent
 
-[{**/microsoft.dotnet.hotreload.agent*/**.cs}]
-# IDE0005: Remove unused usings. Ignore for shared src files coming from nuget package.
-dotnet_diagnostic.IDE0005.severity = silent
-# IDE0073: A source file is missing a required header. Ignore for shared src files coming from nuget package.
-dotnet_diagnostic.IDE0073.severity = silent
-
 
 # Verify settings
 [*.{received,verified}.{txt,xml,json}]

.github/copilot-instructions.md

@@ -32,3 +32,11 @@
 ## Running tests
 
 * 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`.
+
+## .NET Environment
+
+* 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:
+  * On Windows: `. ./activate.ps1` (from repository root)
+  * On Linux/Mac: `source activate.sh` (from repository root)
+* If not in the repository root, navigate there first or use the full path to the activation script.
+* This ensures that the correct version of .NET SDK is used for the repository.

.github/policies/resourceManagement.yml

@@ -441,18 +441,18 @@ configuration:
           branch: main
       then:
       - addMilestone:
-          milestone: 10.0-preview7
+          milestone: 10.0-rc1
       description: '[Milestone Assignments] Assign Milestone to PRs merged to the `main` branch'
     - if:
       - payloadType: Pull_Request
       - isAction:
           action: Closed
       - targetsBranch:
-          branch: release/10.0-preview6
+          branch: release/10.0-preview7
       then:
       - removeMilestone
       - addMilestone:
-          milestone: 10.0-preview6
+          milestone: 10.0-preview7
       description: '[Milestone Assignments] Assign Milestone to PRs merged to release/10.0-preview1 branch'
     - if:
       - payloadType: Issues

.github/workflows/backport.yml

@@ -14,7 +14,7 @@ permissions:
 
 jobs:
   backport:
-    uses: dotnet/arcade/.github/workflows/backport-base.yml@5a11b260f9b0f31b4e7643ad823a4e0f2cdb3ddb # 2025-01-13
+    uses: dotnet/arcade/.github/workflows/backport-base.yml@e2fed65f9c524d12c64876194ae4ce177b935bb3 # 2025-01-13
     with:
       pr_description_template: |
         Backport of #%source_pr_number% to %target_branch%

.github/workflows/browsertesting-issue-body.md

@@ -0,0 +1,24 @@
+## Description
+
+Selenium is used in the aspnetcore repo for automated E2E integration testing.
+Playwright is used in the aspnetcore repo for some benchmarking apps. We need to ensure the docker file and the package version match.
+
+## Instructions
+
+To update the Selenium and Playwright versions, these files need to be updated:
+
+### Packages
+  - [ ] [Selenium in `Versions.props`](eng/Versions.props) from NuGet:
+    - [ ] [Selenium.WebDriver](https://www.nuget.org/packages/Selenium.WebDriver/) (Config variable `SeleniumWebDriverVersion`)
+    - [ ] [Selenium.Support](https://www.nuget.org/packages/Selenium.Support/) (Config variable `SeleniumSupportVersion`)
+  - [ ] Ensure Playwright versions match
+    - [ ]  [Blazor Wasm benchmarks in `src/Components/benchmarkapps/Wasm.Performance/dockerfile`](src/Components/benchmarkapps/Wasm.Performance/dockerfile) (image starts with `mcr.microsoft.com`)
+    - [ ]  [Playwright package version](eng/Versions.props) (Config variable `PlaywrightVersion`)
+
+## Actions
+
+Please, open the PR against `main` branch and include changes to the files listed above.
+
+Also:
+- mention @dotnet/aspnet-build in the opened Pull Request - this will be a responsible engineer for changes validation.
+- add the `build-ops` label to the opened Pull Request

.github/workflows/browsertesting-open-issue.yml

@@ -0,0 +1,29 @@
+name: "[Monthly] Schedule Browser-Testing Dependencies Update Issue"
+
+on:
+  schedule:
+    # Runs on the first day of every month at midnight UTC
+    - cron: '0 0 1 * *'
+  workflow_dispatch: # for manual triggering
+
+jobs:
+  create-issue:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      issues: write
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      # copilot can be assigned to the issue
+      # https://cli.github.com/manual/gh_issue_create
+      - name: Create Issue From Template
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_REPO: ${{ github.repository }}
+        run: |
+          gh issue create \
+            --title "Request Browser-Testing Dependencies Update" \
+            --body-file ".github/workflows/browsertesting-issue-body.md" \
+            --assignee "@copilot"

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

@@ -10,4 +10,4 @@ permissions:
 
 jobs:
   Merge:
-    uses: dotnet/arcade/.github/workflows/backport-base.yml@5a11b260f9b0f31b4e7643ad823a4e0f2cdb3ddb # 2024-06-24
+    uses: dotnet/arcade/.github/workflows/backport-base.yml@e2fed65f9c524d12c64876194ae4ce177b935bb3 # 2024-06-24

eng/Dependencies.props

@@ -25,8 +25,6 @@ and are generated based on the last package release.
     <LatestPackageReference Include="Microsoft.CodeAnalysis.ExternalAccess.AspNetCore" />
     <LatestPackageReference Include="Microsoft.CodeAnalysis.Razor" />
     <LatestPackageReference Include="Microsoft.CSharp" />
-    <LatestPackageReference Include="Microsoft.DotNet.HotReload.Agent" />
-    <LatestPackageReference Include="Microsoft.DotNet.HotReload.Agent.Data" />
     <LatestPackageReference Include="Microsoft.Extensions.Caching.Abstractions" />
     <LatestPackageReference Include="Microsoft.Extensions.Caching.Memory" />
     <LatestPackageReference Include="Microsoft.Extensions.Caching.Hybrid" />

eng/Version.Details.props

@@ -0,0 +1 @@
+<!-- will get filled in the next backflow -->