Skip to content

Commit a281983

Browse files
authored
Merge branch 'main' into users/clintwar/defaultStackSize
2 parents 79888fe + 258234a commit a281983

File tree

427 files changed

+17343
-3887
lines changed

Some content is hidden

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

427 files changed

+17343
-3887
lines changed

.azure/pipelines/ci-public.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -570,11 +570,13 @@ stages:
570570
# Build the shared framework
571571
- script: ./eng/build.cmd -ci -prepareMachine -nativeToolsOnMachine -nobl -all -pack -arch x64
572572
/p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log $(_InternalRuntimeDownloadArgs)
573+
/p:VsTestUseMSBuildOutput=false
573574
displayName: Build shared fx
574575
# -noBuildRepoTasks -noBuildNative -noBuild to avoid repeating work done in the previous step.
575576
- script: ./eng/build.cmd -ci -prepareMachine -nativeToolsOnMachine -nobl -all -noBuildRepoTasks -noBuildNative -noBuild -test
576577
-projects eng\helix\helix.proj /p:IsHelixPRCheck=true /p:IsHelixJob=true
577578
/p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log $(_InternalRuntimeDownloadArgs)
579+
/p:VsTestUseMSBuildOutput=false
578580
displayName: Run build.cmd helix target
579581
env:
580582
HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues

.azure/pipelines/jobs/default-build.yml

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ parameters:
6666

6767
configuration: 'Release'
6868
container: ''
69-
enableRichCodeNavigation: ''
7069
installNodeJs: true
7170
timeoutInMinutes: 180
7271
testRunTitle: $(AgentOsName)-$(BuildConfiguration)
@@ -86,9 +85,6 @@ jobs:
8685
dependsOn: ${{ parameters.dependsOn }}
8786
${{ if ne(parameters.condition, '') }}:
8887
condition: ${{ parameters.condition }}
89-
${{ if ne(parameters.enableRichCodeNavigation, '') }}:
90-
enableRichCodeNavigation: true
91-
richCodeNavigationLanguage: 'csharp,typescript,java'
9288
timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
9389
cancelTimeoutInMinutes: ${{ parameters.cancelTimeoutInMinutes }}
9490
${{ if and(eq(parameters.isAzDOTestingJob, true), ne(parameters.enablePublishTestResults, false)) }}:
@@ -109,10 +105,10 @@ jobs:
109105
vmImage: macOS-13
110106
${{ if eq(parameters.agentOs, 'Linux') }}:
111107
${{ if eq(parameters.useHostedUbuntu, true) }}:
112-
vmImage: ubuntu-20.04
108+
vmImage: ubuntu-22.04
113109
${{ else }}:
114110
name: $(DncEngPublicBuildPool)
115-
demands: ImageOverride -equals Build.Ubuntu.2004.Amd64.Open
111+
demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open
116112
${{ if eq(parameters.agentOs, 'Windows') }}:
117113
name: $(DncEngPublicBuildPool)
118114
demands: ImageOverride -equals windows.vs2022preview.amd64.open
@@ -166,8 +162,6 @@ jobs:
166162
- ${{ if eq(parameters.agentOs, 'macOS') }}:
167163
- script: sudo xcode-select -s /Applications/Xcode_15.2.0.app/Contents/Developer
168164
displayName: Use XCode 15.2.0
169-
- checkout: self
170-
clean: true
171165
- ${{ if and(eq(parameters.agentOs, 'Windows'), eq(parameters.isAzDOTestingJob, true)) }}:
172166
- powershell: ./eng/scripts/InstallProcDump.ps1
173167
displayName: Install ProcDump
@@ -298,9 +292,6 @@ jobs:
298292
dependsOn: ${{ parameters.dependsOn }}
299293
${{ if ne(parameters.condition, '') }}:
300294
condition: ${{ parameters.condition }}
301-
${{ if ne(parameters.enableRichCodeNavigation, '') }}:
302-
enableRichCodeNavigation: true
303-
richCodeNavigationLanguage: 'csharp,typescript,java'
304295
timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
305296
cancelTimeoutInMinutes: ${{ parameters.cancelTimeoutInMinutes }}
306297
${{ if and(eq(parameters.agentOs, 'Windows'), eq(parameters.codeSign, 'true')) }}:
@@ -327,7 +318,7 @@ jobs:
327318
os: macOS
328319
${{ if eq(parameters.agentOs, 'Linux') }}:
329320
name: $(DncEngInternalBuildPool)
330-
image: 1es-ubuntu-2004
321+
image: 1es-ubuntu-2204
331322
os: linux
332323
${{ if eq(parameters.agentOs, 'Windows') }}:
333324
name: $(DncEngInternalBuildPool)
@@ -393,8 +384,6 @@ jobs:
393384
- ${{ if eq(parameters.agentOs, 'macOS') }}:
394385
- script: sudo xcode-select -s /Applications/Xcode_15.2.0.app/Contents/Developer
395386
displayName: Use XCode 15.2.0
396-
- checkout: self
397-
clean: true
398387
- ${{ if and(eq(parameters.agentOs, 'Windows'), eq(parameters.isAzDOTestingJob, true)) }}:
399388
- powershell: ./eng/scripts/InstallProcDump.ps1
400389
displayName: Install ProcDump

.azure/pipelines/richnav.yml

Lines changed: 0 additions & 84 deletions
This file was deleted.

.config/tsaoptions.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,6 @@
88
],
99
"projectName": "DEVDIV",
1010
"repositoryName": "AspNetCore",
11-
"template": "TFSDEVDIV"
11+
"template": "TFSDEVDIV",
12+
"serviceTreeId": "4db45fa9-fb0f-43ce-b523-ad1da773dfbc"
1213
}

.github/policies/resourceManagement.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# Policybot docs live at https://eng.ms/docs/more/github-inside-microsoft/policies/resource-management
12
id:
23
name: GitOps.PullRequestIssueManagement
34
description: GitOps.PullRequestIssueManagement primitive
@@ -377,18 +378,18 @@ configuration:
377378
branch: main
378379
then:
379380
- addMilestone:
380-
milestone: 10.0-preview3
381+
milestone: 10.0-preview4
381382
description: '[Milestone Assignments] Assign Milestone to PRs merged to the `main` branch'
382383
- if:
383384
- payloadType: Pull_Request
384385
- isAction:
385386
action: Closed
386387
- targetsBranch:
387-
branch: release/10.0-preview2
388+
branch: release/10.0-preview3
388389
then:
389390
- removeMilestone
390391
- addMilestone:
391-
milestone: 10.0-preview2
392+
milestone: 10.0-preview3
392393
description: '[Milestone Assignments] Assign Milestone to PRs merged to release/10.0-preview1 branch'
393394
- if:
394395
- payloadType: Issues
@@ -550,7 +551,7 @@ configuration:
550551
then:
551552
- removeMilestone
552553
- addMilestone:
553-
milestone: 9.0.3
554+
milestone: 9.0.5
554555
description: '[Milestone Assignments] Assign Milestone to PRs merged to release/9.0 branch'
555556
- if:
556557
- payloadType: Pull_Request
@@ -561,7 +562,7 @@ configuration:
561562
then:
562563
- removeMilestone
563564
- addMilestone:
564-
milestone: 8.0.14
565+
milestone: 8.0.16
565566
description: '[Milestone Assignments] Assign Milestone to PRs merged to release/8.0 branch'
566567
- if:
567568
- payloadType: Issues

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

.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/inter-branch-merge-base.yml@main
13+
uses: dotnet/arcade/.github/workflows/backport-base.yml@0c0caeb605f7b2b99408bfa6b18b13526d747727 # 2024-06-24

.github/workflows/locker.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Locker - Lock stale issues
22
on:
33
schedule:
4-
- cron: '34 8 * * *' # Once per day, overnight PT, uncommon minute of hour
4+
- cron: '34 12 * * 1-5' # Once per weekday, overnight PT, uncommon minute of hour
55

66
workflow_dispatch:
77
# Manual triggering through the GitHub UI, API, or CLI
@@ -23,7 +23,7 @@ jobs:
2323
if: ${{ github.repository_owner == 'dotnet' }}
2424
steps:
2525
- name: Checkout Actions
26-
uses: actions/checkout@v4
26+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2727
with:
2828
repository: "microsoft/vscode-github-triage-actions"
2929
path: ./actions

.github/workflows/markdownlint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ jobs:
1616
runs-on: ubuntu-latest
1717

1818
steps:
19-
- uses: actions/checkout@v4
19+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2020
- name: Use Node.js
21-
uses: actions/setup-node@v4
21+
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
2222
with:
2323
node-version: 16.x
2424
- name: Run Markdownlint

.github/workflows/runtime-sync.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ jobs:
2121
runs-on: windows-latest
2222
steps:
2323
- name: Checkout aspnetcore
24-
uses: actions/checkout@v4
24+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2525
with:
2626
# Test this script using changes in a fork
2727
repository: 'dotnet/aspnetcore'
2828
path: aspnetcore
2929
ref: main
3030
- name: Checkout runtime
31-
uses: actions/checkout@v4
31+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3232
with:
3333
# Test this script using changes in a fork
3434
repository: 'dotnet/runtime'
@@ -47,7 +47,7 @@ jobs:
4747
mkdir ..\artifacts
4848
git status > ..\artifacts\status.txt
4949
git diff > ..\artifacts\diff.txt
50-
- uses: actions/upload-artifact@v4
50+
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
5151
with:
5252
name: results
5353
path: artifacts
@@ -64,7 +64,7 @@ jobs:
6464
- name: Send PR
6565
if: steps.check.outputs.sendpr == 'true'
6666
# https://github.com/marketplace/actions/create-pull-request
67-
uses: dotnet/actions-create-pull-request@v4
67+
uses: dotnet/actions-create-pull-request@2b011faafdcbc9ceb11414d64d0573f37c774b04 # v4.2.3
6868
with:
6969
token: ${{ secrets.GITHUB_TOKEN }}
7070
path: .\aspnetcore

0 commit comments

Comments
 (0)