Skip to content

Commit 8413a40

Browse files
committed
Merge branch 'main' into fix-59451
2 parents e647f2a + 7e31767 commit 8413a40

File tree

178 files changed

+4835
-12628
lines changed

Some content is hidden

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

178 files changed

+4835
-12628
lines changed

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

Lines changed: 0 additions & 7 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)) }}:
@@ -296,9 +292,6 @@ jobs:
296292
dependsOn: ${{ parameters.dependsOn }}
297293
${{ if ne(parameters.condition, '') }}:
298294
condition: ${{ parameters.condition }}
299-
${{ if ne(parameters.enableRichCodeNavigation, '') }}:
300-
enableRichCodeNavigation: true
301-
richCodeNavigationLanguage: 'csharp,typescript,java'
302295
timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
303296
cancelTimeoutInMinutes: ${{ parameters.cancelTimeoutInMinutes }}
304297
${{ if and(eq(parameters.agentOs, 'Windows'), eq(parameters.codeSign, 'true')) }}:

.devcontainer/devcontainer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"dbaeumer.vscode-eslint"
1919
],
2020
"settings": {
21+
"dotnet.defaultSolution": "AspNetCore.slnx",
2122
// Loading projects on demand is better for larger codebases
2223
"omnisharp.enableMsBuildLoadProjectsOnDemand": true,
2324
"omnisharp.enableRoslynAnalyzers": true,

.github/policies/resourceManagement.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,7 @@ configuration:
551551
then:
552552
- removeMilestone
553553
- addMilestone:
554-
milestone: 9.0.4
554+
milestone: 9.0.5
555555
description: '[Milestone Assignments] Assign Milestone to PRs merged to release/9.0 branch'
556556
- if:
557557
- payloadType: Pull_Request
@@ -562,7 +562,7 @@ configuration:
562562
then:
563563
- removeMilestone
564564
- addMilestone:
565-
milestone: 8.0.15
565+
milestone: 8.0.16
566566
description: '[Milestone Assignments] Assign Milestone to PRs merged to release/8.0 branch'
567567
- if:
568568
- 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@66269f6a88f6062f2cccf6eb84660a8a6f5cc5ec # 2025-01-13
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/backport-base.yml@2e09b2a8a74223d25086d947e2d070827f6c556e # 2024-06-24
13+
uses: dotnet/arcade/.github/workflows/backport-base.yml@0c0caeb605f7b2b99408bfa6b18b13526d747727 # 2024-06-24

.github/workflows/markdownlint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
steps:
1919
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2020
- name: Use Node.js
21-
uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
21+
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
2222
with:
2323
node-version: 16.x
2424
- name: Run Markdownlint

.github/workflows/update-jquery-validate.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2020

2121
- name: Setup Node.js
22-
uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
22+
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
2323
with:
2424
node-version: '20.x'
2525

.github/workflows/validate-npm-package-lock-json.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
submodules: false
2121

2222
- name: Set up Node.js
23-
uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
23+
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
2424
with:
2525
node-version: 20.x
2626

AspNetCore.sln

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

AspNetCore.slnx

Lines changed: 1264 additions & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)