Skip to content

Commit d3c8c66

Browse files
DeagleGrossDeagleGross
committed
merge main
2 parents c9431ec + 25a9b32 commit d3c8c66

File tree

591 files changed

+15933
-3170
lines changed

Some content is hidden

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

591 files changed

+15933
-3170
lines changed

‎.azure/pipelines/ci-public.yml

+2
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

+3-7
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,10 @@ jobs:
109109
vmImage: macOS-13
110110
${{ if eq(parameters.agentOs, 'Linux') }}:
111111
${{ if eq(parameters.useHostedUbuntu, true) }}:
112-
vmImage: ubuntu-20.04
112+
vmImage: ubuntu-22.04
113113
${{ else }}:
114114
name: $(DncEngPublicBuildPool)
115-
demands: ImageOverride -equals Build.Ubuntu.2004.Amd64.Open
115+
demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open
116116
${{ if eq(parameters.agentOs, 'Windows') }}:
117117
name: $(DncEngPublicBuildPool)
118118
demands: ImageOverride -equals windows.vs2022preview.amd64.open
@@ -166,8 +166,6 @@ jobs:
166166
- ${{ if eq(parameters.agentOs, 'macOS') }}:
167167
- script: sudo xcode-select -s /Applications/Xcode_15.2.0.app/Contents/Developer
168168
displayName: Use XCode 15.2.0
169-
- checkout: self
170-
clean: true
171169
- ${{ if and(eq(parameters.agentOs, 'Windows'), eq(parameters.isAzDOTestingJob, true)) }}:
172170
- powershell: ./eng/scripts/InstallProcDump.ps1
173171
displayName: Install ProcDump
@@ -327,7 +325,7 @@ jobs:
327325
os: macOS
328326
${{ if eq(parameters.agentOs, 'Linux') }}:
329327
name: $(DncEngInternalBuildPool)
330-
image: 1es-ubuntu-2004
328+
image: 1es-ubuntu-2204
331329
os: linux
332330
${{ if eq(parameters.agentOs, 'Windows') }}:
333331
name: $(DncEngInternalBuildPool)
@@ -393,8 +391,6 @@ jobs:
393391
- ${{ if eq(parameters.agentOs, 'macOS') }}:
394392
- script: sudo xcode-select -s /Applications/Xcode_15.2.0.app/Contents/Developer
395393
displayName: Use XCode 15.2.0
396-
- checkout: self
397-
clean: true
398394
- ${{ if and(eq(parameters.agentOs, 'Windows'), eq(parameters.isAzDOTestingJob, true)) }}:
399395
- powershell: ./eng/scripts/InstallProcDump.ps1
400396
displayName: Install ProcDump

‎.azure/pipelines/richnav.yml

-84
This file was deleted.

‎.config/tsaoptions.json

+2-1
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

+6-5
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.4
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.15
565566
description: '[Milestone Assignments] Assign Milestone to PRs merged to release/8.0 branch'
566567
- if:
567568
- payloadType: Issues

‎.github/workflows/backport.yml

+1-1
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@66269f6a88f6062f2cccf6eb84660a8a6f5cc5ec # 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

+1-1
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@2e09b2a8a74223d25086d947e2d070827f6c556e # 2024-06-24

‎.github/workflows/locker.yml

+2-2
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

+2-2
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@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
2222
with:
2323
node-version: 16.x
2424
- name: Run Markdownlint

‎.github/workflows/runtime-sync.yml

+4-4
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

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ jobs:
1616

1717
steps:
1818
- name: Checkout code
19-
uses: actions/checkout@v4
19+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2020

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

@@ -39,7 +39,7 @@ jobs:
3939
run: node update-jquery-validate.mjs
4040

4141
- name: Create Pull Request
42-
uses: dotnet/actions-create-pull-request@v4
42+
uses: dotnet/actions-create-pull-request@2b011faafdcbc9ceb11414d64d0573f37c774b04 # v4.2.3
4343
with:
4444
token: ${{ secrets.GITHUB_TOKEN }}
4545
commit-message: Update jquery.validate to ${{ env.JQUERY_VALIDATE_VERSION }}

‎.github/workflows/update-sdk.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
name: Update .NET SDK
2020
runs-on: ubuntu-latest
2121
steps:
22-
- uses: actions/checkout@v4
22+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2323
- uses: martincostello/update-dotnet-sdk@76e2c0df2303d4f6a404228105ebb7d60ace0556 # v3.4.0
2424
with:
2525
quality: 'daily'

‎.github/workflows/update-selenium-and-playwright-dependencies.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616

1717
steps:
1818
- name: Checkout code
19-
uses: actions/checkout@v4
19+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2020

2121
- name: Update dependencies
2222
run: pwsh eng/scripts/update-selenium-and-playwright-versions.ps1

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ jobs:
1414

1515
steps:
1616
- name: Checkout repository
17-
uses: actions/checkout@v4
17+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1818
with:
1919
fetch-depth: 0
2020
submodules: false
2121

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

‎AspNetCore.sln

+15
Original file line numberDiff line numberDiff line change
@@ -1772,6 +1772,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Http.R
17721772
EndProject
17731773
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Http.ValidationsGenerator", "src\Http\Http.Extensions\gen\Microsoft.AspNetCore.Http.ValidationsGenerator\Microsoft.AspNetCore.Http.ValidationsGenerator.csproj", "{7899F5DD-AA7C-4561-BAC4-E2EC78B7D157}"
17741774
EndProject
1775+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Endpoints", "Endpoints", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
1776+
EndProject
1777+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CustomElements", "CustomElements", "{E22DD5A6-06E2-490E-BD32-88D629FD6668}"
1778+
EndProject
17751779
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TlsFeaturesObserve", "src\Servers\HttpSys\samples\TlsFeaturesObserve\TlsFeaturesObserve.csproj", "{98C71EC8-1303-F55D-4032-E6728971770E}"
17761780
EndProject
17771781
Global
@@ -11786,6 +11790,15 @@ Global
1178611790
{7324770C-0871-4D73-BE3D-5E2F3E9E1B1E} = {D30A658D-61F6-444B-9AC7-F66A1A1B86B6}
1178711791
{B54A8F61-60DE-4AD9-87CA-D102F230678E} = {D30A658D-61F6-444B-9AC7-F66A1A1B86B6}
1178811792
{D30A658D-61F6-444B-9AC7-F66A1A1B86B6} = {5E46DC83-C39C-4E3A-B242-C064607F4367}
11793+
{76C3E22D-092B-4E8A-81F0-DCF071BFF4CD} = {E22DD5A6-06E2-490E-BD32-88D629FD6668}
11794+
{A05652B3-953E-4915-9D7F-0E361D988815} = {0CE1CC26-98CE-4022-A81C-E32AAFC9B819}
11795+
{AE4D272D-6F13-42C8-9404-C149188AFA33} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
11796+
{5D438258-CB19-4282-814F-974ABBC71411} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
11797+
{F5AE525F-F435-40F9-A567-4D5EC3B50D6E} = {5FE1FBC1-8CE3-4355-9866-44FE1307C5F1}
11798+
{87D58D50-20D1-4091-88C5-8D88DCCC2DE3} = {6126DCE4-9692-4EE2-B240-C65743572995}
11799+
{433F91E4-E39D-4EB0-B798-2998B3969A2C} = {6126DCE4-9692-4EE2-B240-C65743572995}
11800+
{8A021D6D-7935-4AB3-BB47-38D4FF9B0D13} = {6126DCE4-9692-4EE2-B240-C65743572995}
11801+
{757CBDE0-5D0A-4FD8-99F3-6C20BDDD4E63} = {5FE1FBC1-8CE3-4355-9866-44FE1307C5F1}
1178911802
{96EC4DD3-028E-6E27-5B14-08C21B07CE89} = {017429CC-C5FB-48B4-9C46-034E29EE2F06}
1179011803
{1BBD75D2-429D-D565-A98E-36437448E8C0} = {96EC4DD3-028E-6E27-5B14-08C21B07CE89}
1179111804
{C10EB67A-F43E-4B85-AEFD-7064C9B3DBE2} = {1BBD75D2-429D-D565-A98E-36437448E8C0}
@@ -11795,6 +11808,8 @@ Global
1179511808
{01A75167-DF5A-AF38-8700-C3FBB2C2CFF5} = {225AEDCF-7162-4A86-AC74-06B84660B379}
1179611809
{E6D564C0-4CA5-411C-BF40-9802AF7900CB} = {01A75167-DF5A-AF38-8700-C3FBB2C2CFF5}
1179711810
{7899F5DD-AA7C-4561-BAC4-E2EC78B7D157} = {01A75167-DF5A-AF38-8700-C3FBB2C2CFF5}
11811+
{02EA681E-C7D8-13C7-8484-4AC65E1B71E8} = {60D51C98-2CC0-40DF-B338-44154EFEE2FF}
11812+
{E22DD5A6-06E2-490E-BD32-88D629FD6668} = {60D51C98-2CC0-40DF-B338-44154EFEE2FF}
1179811813
{98C71EC8-1303-F55D-4032-E6728971770E} = {49016328-4D32-46E4-A4D2-94686ED38EA2}
1179911814
EndGlobalSection
1180011815
GlobalSection(ExtensibilityGlobals) = postSolution

‎Directory.Build.props

+3-8
Original file line numberDiff line numberDiff line change
@@ -195,18 +195,13 @@
195195
limitations in the way the .NET SDK finds shared frameworks and targeting packs. It allows
196196
tests to use the shared frameworks and targeting packs that were just built.
197197
198-
However, source-build needs this to not happen while building projects that rely on the
199-
AppHost framework pack. Source-build installs an SDK in a custom location outside this
198+
However, the VMR needs this to not happen while building projects that rely on the
199+
AppHost framework pack. The VMR installs an SDK in a custom location outside this
200200
repository, and setting NetCoreTargetingPackRoot to a different location causes source-build
201201
to restore the AppHost pack as a prebuilt rather than using the one that's present in the SDK.
202-
Source-build doesn't run tests, so the property is simply conditioned out.
202+
The dotnet product build doesn't run tests, so the property is simply conditioned out.
203203
-->
204204
<NetCoreTargetingPackRoot Condition="'$(DotNetBuild)' != 'true'">$(LocalDotNetRoot)packs\</NetCoreTargetingPackRoot>
205-
<!-- This is not correct and needs attention eventually. This is primarily used to find the nethost headers in the apphost pack.
206-
These should be coming from a restored apphost pack, rather than a hard-coded local SDK. In fact, aspnetcore
207-
should not rely on a local SDK or mutating one to build. -->
208-
<NetCoreTargetingPackRoot Condition="'$(DotNetBuild)' == 'true'">$(DotNetRoot)packs\</NetCoreTargetingPackRoot>
209-
210205
</PropertyGroup>
211206

212207
<Import Project="eng\tools\RepoTasks\RepoTasks.tasks" Condition="'$(MSBuildProjectName)' != 'RepoTasks' AND '$(DesignTimeBuild)' != 'true'" />

‎NuGet.config

-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
<add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
1212
<add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
1313
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
14-
<!-- Used for the Rich Navigation indexing task -->
15-
<add key="richnav" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" />
1614
</packageSources>
1715
<disabledPackageSources>
1816
<clear />

0 commit comments

Comments
 (0)