Skip to content

Commit 00924a6

Browse files
Merge main into darc-main-7b1c79ae-2f41-4630-80d2-f4f1b04124f4
2 parents d757bfd + 334fe40 commit 00924a6

File tree

258 files changed

+3896
-1375
lines changed

Some content is hidden

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

258 files changed

+3896
-1375
lines changed

.azure/pipelines/ci-public.yml

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,6 @@ variables:
7676
value: /bl:artifacts/log/Release/Build.CodeSign.binlog
7777
- name: WindowsInstallersLogArgs
7878
value: /bl:artifacts/log/Release/Build.Installers.binlog
79-
- name: WindowsArm64InstallersLogArgs
80-
value: /bl:artifacts/log/Release/Build.Installers.Arm64.binlog
8179
- name: _SignType
8280
value: ''
8381
- name: _InternalRuntimeDownloadArgs
@@ -205,29 +203,14 @@ stages:
205203
-sign
206204
-buildInstallers
207205
-noBuildNative
208-
/p:DotNetSignType=$(_SignType)
209-
$(_BuildArgs)
210-
$(_InternalRuntimeDownloadArgs)
211-
$(WindowsInstallersLogArgs)
212-
displayName: Build Installers
213-
214-
# Windows installers bundle and sharedfx msi for arm64
215-
- script: ./eng/build.cmd
216-
-ci
217-
-prepareMachine
218-
-noBuildRepoTasks
219-
-arch arm64
220-
-sign
221-
-buildInstallers
222-
-noBuildNative
223206
-publish
224207
/p:DotNetSignType=$(_SignType)
225208
/p:AssetManifestFileName=aspnetcore-win.xml
226209
$(_BuildArgs)
227210
$(_PublishArgs)
228211
$(_InternalRuntimeDownloadArgs)
229-
$(WindowsArm64InstallersLogArgs)
230-
displayName: Build ARM64 Installers
212+
$(WindowsInstallersLogArgs)
213+
displayName: Build Installers
231214

232215
artifacts:
233216
- name: Windows_Logs_Attempt_$(System.JobAttempt)

.azure/pipelines/ci.yml

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,6 @@ variables:
7878
value: /bl:artifacts/log/Release/Build.CodeSign.binlog
7979
- name: WindowsInstallersLogArgs
8080
value: /bl:artifacts/log/Release/Build.Installers.binlog
81-
- name: WindowsArm64InstallersLogArgs
82-
value: /bl:artifacts/log/Release/Build.Installers.Arm64.binlog
8381
- name: _InternalRuntimeDownloadArgs
8482
value: -RuntimeSourceFeed https://ci.dot.net/internal
8583
-RuntimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64)
@@ -255,33 +253,16 @@ extends:
255253
-sign
256254
-buildInstallers
257255
-noBuildNative
258-
/p:DotNetSignType=$(_SignType)
259-
$(_BuildArgs)
260-
$(_InternalRuntimeDownloadArgs)
261-
$(WindowsInstallersLogArgs)
262-
env:
263-
MSBUILDUSESERVER: "1"
264-
displayName: Build Installers
265-
266-
# Windows installers bundle and sharedfx msi for arm64
267-
- script: ./eng/build.cmd
268-
-ci
269-
-prepareMachine
270-
-noBuildRepoTasks
271-
-arch arm64
272-
-sign
273-
-buildInstallers
274-
-noBuildNative
275256
-publish
276257
/p:DotNetSignType=$(_SignType)
277258
/p:AssetManifestFileName=aspnetcore-win.xml
278259
$(_BuildArgs)
279260
$(_PublishArgs)
280261
$(_InternalRuntimeDownloadArgs)
281-
$(WindowsArm64InstallersLogArgs)
262+
$(WindowsInstallersLogArgs)
282263
env:
283264
MSBUILDUSESERVER: "1"
284-
displayName: Build ARM64 Installers
265+
displayName: Build Installers
285266

286267
artifacts:
287268
- name: Windows_Logs_Attempt_$(System.JobAttempt)

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,17 +98,13 @@ jobs:
9898
exit 1
9999
fi
100100
displayName: Run E2E tests
101-
env:
102-
DOTNET_EnableAVX512: 0
103101
- script: .dotnet/dotnet test ./src/Components/test/E2ETest -c $(BuildConfiguration) --no-build --filter 'Quarantined=true' -p:RunQuarantinedTests=true
104102
-p:VsTestUseMSBuildOutput=false
105103
--logger:"trx%3BLogFileName=Microsoft.AspNetCore.Components.E2ETests.trx"
106104
--logger:"html%3BLogFileName=Microsoft.AspNetCore.Components.E2ETests.html"
107105
--results-directory $(Build.SourcesDirectory)/artifacts/TestResults/$(BuildConfiguration)/Quarantined
108106
displayName: Run Quarantined E2E tests
109107
continueOnError: true
110-
env:
111-
DOTNET_EnableAVX512: 0
112108
- task: PublishTestResults@2
113109
displayName: Publish E2E Test Results
114110
inputs:

.github/policies/resourceManagement.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -566,6 +566,25 @@ configuration:
566566
567567
Otherwise, please add `tell-mode` label.
568568
description: Add release/2.3 targeting PRs to the servicing project
569+
- if:
570+
- payloadType: Pull_Request
571+
- isAction:
572+
action: Opened
573+
- targetsBranch:
574+
branch: release/10.0
575+
- activitySenderHasPermission:
576+
permission: Read
577+
- not:
578+
isActivitySender:
579+
user: dotnet-maestro
580+
issueAuthor: False
581+
- not:
582+
isActivitySender:
583+
user: dotnet-maestro-bot
584+
issueAuthor: False
585+
then:
586+
- addLabel:
587+
label: servicing-consider
569588
- if:
570589
- payloadType: Pull_Request
571590
- labelAdded:
@@ -743,3 +762,4 @@ configuration:
743762
onFailure:
744763
onSuccess:
745764

765+

.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@7c0434b26153965459a8d7968f18cf7c0a2cf463 # 2025-01-13
17+
uses: dotnet/arcade/.github/workflows/backport-base.yml@fac534d85b77789bd4daf2b4c916117f1ca381e7 # 2025-01-13
1818
with:
1919
pr_description_template: |
2020
Backport of #%source_pr_number% to %target_branch%

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
issues: write
1515
steps:
1616
- name: Checkout repository
17-
uses: actions/checkout@v4
17+
uses: actions/checkout@v5
1818

1919
# copilot can be assigned to the issue
2020
# https://cli.github.com/manual/gh_issue_create

.github/workflows/copilot-setup-steps.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
# You can define any steps you want, and they will run before the agent starts.
1515
# If you do not check out your code, Copilot will do this for you.
1616
steps:
17-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
17+
- uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 # v4.2.2
1818

1919
# Include PrepareForHelix to maximise what is downloaded here
2020
- name: Build solution

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

.github/workflows/locker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
if: ${{ github.repository_owner == 'dotnet' }}
2424
steps:
2525
- name: Checkout Actions
26-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
26+
uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 # v4.2.2
2727
with:
2828
repository: "microsoft/vscode-github-triage-actions"
2929
path: ./actions

.github/workflows/markdownlint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717

1818
steps:
19-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
19+
- uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 # v4.2.2
2020
- name: Use Node.js
2121
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
2222
with:

0 commit comments

Comments
 (0)