Merge branch 'main' into dmkorolev/dataprotector-spans

Author: DeagleGross

.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

.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/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@d777c20040bdc2e52b372fa98dcb84141ed692d3 # 2025-01-13
     with:
       pr_description_template: |
         Backport of #%source_pr_number% to %target_branch%

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

@@ -0,0 +1,21 @@
+## 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.

.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@d777c20040bdc2e52b372fa98dcb84141ed692d3 # 2024-06-24

eng/Version.Details.xml

@@ -414,7 +414,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
 
   # Locate Visual Studio installation or download x-copy msbuild.
   $vsInfo = LocateVisualStudio $vsRequirements
-  if ($vsInfo -ne $null) {
+  if ($vsInfo -ne $null -and $env:ForceUseXCopyMSBuild -eq $null) {
     # Ensure vsInstallDir has a trailing slash
     $vsInstallDir = Join-Path $vsInfo.installationPath "\"
     $vsMajorVersion = $vsInfo.installationVersion.Split('.')[0]

eng/Versions.props

@@ -124,6 +124,11 @@ try {
     foreach ($dep in $versionDetails.SelectNodes('//Dependency')) {
         Write-Verbose "Found $dep"
 
+        if ($dep.Label -eq 'Manual') {
+            # skip dependencies that are manually updated
+            continue
+        }
+
         $expectedVersion = $dep.Version
 
         if ($dep.Name -in $globalJson.'msbuild-sdks'.PSObject.Properties.Name) {