Merge branch 'main' into brecon/paths

Author: ilonatommy

.azure/pipelines/ci-public.yml

@@ -76,8 +76,6 @@ variables:
   value: /bl:artifacts/log/Release/Build.CodeSign.binlog
 - name: WindowsInstallersLogArgs
   value: /bl:artifacts/log/Release/Build.Installers.binlog
-- name: WindowsArm64InstallersLogArgs
-  value: /bl:artifacts/log/Release/Build.Installers.Arm64.binlog
 - name: _SignType
   value: ''
 - name: _InternalRuntimeDownloadArgs
@@ -205,29 +203,14 @@ stages:
                 -sign
                 -buildInstallers
                 -noBuildNative
-                /p:DotNetSignType=$(_SignType)
-                $(_BuildArgs)
-                $(_InternalRuntimeDownloadArgs)
-                $(WindowsInstallersLogArgs)
-        displayName: Build Installers
-
-      # Windows installers bundle and sharedfx msi for arm64
-      - script: ./eng/build.cmd
-                -ci
-                -prepareMachine
-                -noBuildRepoTasks
-                -arch arm64
-                -sign
-                -buildInstallers
-                -noBuildNative
                 -publish
                 /p:DotNetSignType=$(_SignType)
                 /p:AssetManifestFileName=aspnetcore-win.xml
                 $(_BuildArgs)
                 $(_PublishArgs)
                 $(_InternalRuntimeDownloadArgs)
-                $(WindowsArm64InstallersLogArgs)
-        displayName: Build ARM64 Installers
+                $(WindowsInstallersLogArgs)
+        displayName: Build Installers
 
       artifacts:
       - name: Windows_Logs_Attempt_$(System.JobAttempt)
@@ -636,6 +619,8 @@ stages:
         agentOs: Windows
         isAzDOTestingJob: true
         timeoutInMinutes: 240
+        # Temporarily disabled due to https://github.com/dotnet/aspnetcore/issues/63140
+        condition: 'false'
         steps:
         - script: git submodule update --init
           displayName: Update submodules

.azure/pipelines/ci.yml

@@ -78,8 +78,6 @@ variables:
   value: /bl:artifacts/log/Release/Build.CodeSign.binlog
 - name: WindowsInstallersLogArgs
   value: /bl:artifacts/log/Release/Build.Installers.binlog
-- name: WindowsArm64InstallersLogArgs
-  value: /bl:artifacts/log/Release/Build.Installers.Arm64.binlog
 - name: _InternalRuntimeDownloadArgs
   value: -RuntimeSourceFeed https://ci.dot.net/internal
          -RuntimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64)
@@ -255,33 +253,16 @@ extends:
                     -sign
                     -buildInstallers
                     -noBuildNative
-                    /p:DotNetSignType=$(_SignType)
-                    $(_BuildArgs)
-                    $(_InternalRuntimeDownloadArgs)
-                    $(WindowsInstallersLogArgs)
-            env:
-              MSBUILDUSESERVER: "1"
-            displayName: Build Installers
-
-          # Windows installers bundle and sharedfx msi for arm64
-          - script: ./eng/build.cmd
-                    -ci
-                    -prepareMachine
-                    -noBuildRepoTasks
-                    -arch arm64
-                    -sign
-                    -buildInstallers
-                    -noBuildNative
                     -publish
                     /p:DotNetSignType=$(_SignType)
                     /p:AssetManifestFileName=aspnetcore-win.xml
                     $(_BuildArgs)
                     $(_PublishArgs)
                     $(_InternalRuntimeDownloadArgs)
-                    $(WindowsArm64InstallersLogArgs)
+                    $(WindowsInstallersLogArgs)
             env:
               MSBUILDUSESERVER: "1"
-            displayName: Build ARM64 Installers
+            displayName: Build Installers
 
           artifacts:
           - name: Windows_Logs_Attempt_$(System.JobAttempt)

.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
@@ -566,6 +566,25 @@ configuration:
 
             Otherwise, please add `tell-mode` label.
       description: Add release/2.3 targeting PRs to the servicing project
+    - if:
+      - payloadType: Pull_Request
+      - isAction:
+          action: Opened
+      - targetsBranch:
+          branch: release/10.0
+      - activitySenderHasPermission:
+          permission: Read
+      - not:
+          isActivitySender:
+            user: dotnet-maestro
+            issueAuthor: False
+      - not:
+          isActivitySender:
+            user: dotnet-maestro-bot
+            issueAuthor: False
+      then:
+      - addLabel:
+          label: servicing-consider
     - if:
       - payloadType: Pull_Request
       - labelAdded:
@@ -614,7 +633,7 @@ configuration:
       then:
       - removeMilestone
       - addMilestone:
-          milestone: 9.0.7
+          milestone: 9.0.9
       description: '[Milestone Assignments] Assign Milestone to PRs merged to release/9.0 branch'
     - if:
       - payloadType: Pull_Request
@@ -625,7 +644,7 @@ configuration:
       then:
       - removeMilestone
       - addMilestone:
-          milestone: 8.0.18
+          milestone: 8.0.20
       description: '[Milestone Assignments] Assign Milestone to PRs merged to release/8.0 branch'
     - if:
       - payloadType: Issues
@@ -742,3 +761,5 @@ configuration:
       description: '[Infrastructure PRs] Add area-infrastructure label to dependabot update Pull Requests & enable auto-merge'
 onFailure: 
 onSuccess: 
+
+

.github/workflows/backport.yml

@@ -14,7 +14,7 @@ permissions:
 
 jobs:
   backport:
-    uses: dotnet/arcade/.github/workflows/backport-base.yml@d777c20040bdc2e52b372fa98dcb84141ed692d3 # 2025-01-13
+    uses: dotnet/arcade/.github/workflows/backport-base.yml@fac534d85b77789bd4daf2b4c916117f1ca381e7 # 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@v5
+
+      # 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/copilot-setup-steps.yml

@@ -14,7 +14,7 @@ jobs:
     # You can define any steps you want, and they will run before the agent starts.
     # If you do not check out your code, Copilot will do this for you.
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 # v4.2.2
 
         # Include PrepareForHelix to maximise what is downloaded here
       - name: Build solution

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

@@ -7,7 +7,8 @@ on:
 permissions:
   contents: write
   pull-requests: write
+  issues: write
 
 jobs:
   Merge:
-    uses: dotnet/arcade/.github/workflows/backport-base.yml@d777c20040bdc2e52b372fa98dcb84141ed692d3 # 2024-06-24
+    uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@fac534d85b77789bd4daf2b4c916117f1ca381e7 # 2024-06-24