Skip to content

Commit f233b4e

Browse files
DeagleGrossDeagleGross
committed
Merge branch 'main' into dmkorolev/dataprotection/lin-perf-1
2 parents a046b3f + 7ba02e8 commit f233b4e

File tree

251 files changed

+4605
-9725
lines changed

Some content is hidden

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

251 files changed

+4605
-9725
lines changed

‎.azure/pipelines/ci-public.yml‎

Lines changed: 2 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,6 @@ variables:
7979
value: true
8080
- template: /eng/common/templates/variables/pool-providers.yml
8181

82-
resources:
83-
containers:
84-
- container: debpkg
85-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg
86-
87-
- container: rpmpkg
88-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm
89-
9082
stages:
9183
- stage: build
9284
displayName: Build
@@ -313,43 +305,13 @@ stages:
313305
--ci
314306
--arch x64
315307
--pack
308+
--build-installers
316309
--all
317310
--no-build-java
318311
-p:OnlyPackPlatformSpecificPackages=true
319312
$(_BuildArgs)
320313
$(_InternalRuntimeDownloadArgs)
321314
displayName: Run build.sh
322-
- script: ./eng/build.sh
323-
--ci
324-
--nobl
325-
--arch x64
326-
--build-installers
327-
--no-build-deps
328-
--no-build-nodejs
329-
-p:OnlyPackPlatformSpecificPackages=true
330-
-p:BuildRuntimeArchive=false
331-
-p:LinuxInstallerType=deb
332-
$(_BuildArgs)
333-
$(_InternalRuntimeDownloadArgs)
334-
displayName: Build Debian installers
335-
target: debpkg
336-
- script: ./eng/build.sh
337-
--ci
338-
--nobl
339-
--arch x64
340-
--build-installers
341-
--no-build-deps
342-
--no-build-nodejs
343-
--publish
344-
-p:OnlyPackPlatformSpecificPackages=true
345-
-p:BuildRuntimeArchive=false
346-
-p:LinuxInstallerType=rpm
347-
-p:AssetManifestFileName=aspnetcore-Linux_x64.xml
348-
$(_BuildArgs)
349-
$(_PublishArgs)
350-
$(_InternalRuntimeDownloadArgs)
351-
displayName: Build RPM installers
352-
target: rpmpkg
353315
artifacts:
354316
- name: Linux_x64_Logs_Attempt_$(System.JobAttempt)
355317
path: artifacts/log/
@@ -404,29 +366,13 @@ stages:
404366
--ci
405367
--arch arm64
406368
--pack
369+
--build-installers
407370
--all
408371
--no-build-java
409372
-p:OnlyPackPlatformSpecificPackages=true
410373
$(_BuildArgs)
411374
$(_InternalRuntimeDownloadArgs)
412375
displayName: Run build.sh
413-
- script: ./eng/build.sh
414-
--ci
415-
--nobl
416-
--arch arm64
417-
--build-installers
418-
--no-build-deps
419-
--no-build-nodejs
420-
--publish
421-
-p:OnlyPackPlatformSpecificPackages=true
422-
-p:BuildRuntimeArchive=false
423-
-p:LinuxInstallerType=rpm
424-
-p:AssetManifestFileName=aspnetcore-Linux_arm64.xml
425-
$(_BuildArgs)
426-
$(_PublishArgs)
427-
$(_InternalRuntimeDownloadArgs)
428-
displayName: Build RPM installers
429-
target: rpmpkg
430376
artifacts:
431377
- name: Linux_arm64_Logs_Attempt_$(System.JobAttempt)
432378
path: artifacts/log/

‎.azure/pipelines/ci.yml‎

Lines changed: 34 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,13 @@ variables:
3838
- ${{ if or(startswith(variables['Build.SourceBranch'], 'refs/heads/release/'), startswith(variables['Build.SourceBranch'], 'refs/heads/internal/release/'), eq(variables['Build.Reason'], 'Manual')) }}:
3939
- name: PostBuildSign
4040
value: false
41+
- name: _ArcadePublishNonWindowsArg
42+
value: ''
4143
- ${{ else }}:
4244
- name: PostBuildSign
4345
value: true
46+
- name: _ArcadePublishNonWindowsArg
47+
value: --publish
4448
- name: _UseHelixOpenQueues
4549
value: ${{ ne(variables['System.TeamProject'], 'internal') }}
4650
- ${{ if and(notin(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.SourceBranch'], 'refs/heads/main')) }}:
@@ -99,12 +103,6 @@ variables:
99103
- template: /eng/common/templates-official/variables/pool-providers.yml@self
100104

101105
resources:
102-
containers:
103-
- container: debpkg
104-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg
105-
106-
- container: rpmpkg
107-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm
108106
repositories:
109107
# Repo: 1ESPipelineTemplates/1ESPipelineTemplates
110108
- repository: 1esPipelines
@@ -299,7 +297,7 @@ extends:
299297
--pack
300298
--all
301299
--no-build-java
302-
--publish
300+
$(_ArcadePublishNonWindowsArg)
303301
-p:OnlyPackPlatformSpecificPackages=true
304302
-p:AssetManifestFileName=aspnetcore-MacOS_arm64.xml
305303
$(_BuildArgs)
@@ -329,7 +327,7 @@ extends:
329327
--pack
330328
--all
331329
--no-build-java
332-
--publish
330+
$(_ArcadePublishNonWindowsArg)
333331
-p:OnlyPackPlatformSpecificPackages=true
334332
-p:AssetManifestFileName=aspnetcore-MacOS_x64.xml
335333
$(_BuildArgs)
@@ -355,48 +353,18 @@ extends:
355353
jobDisplayName: "Build: Linux x64"
356354
agentOs: Linux
357355
useHostedUbuntu: false
358-
steps:
359-
- script: ./eng/build.sh
360-
--ci
361-
--arch x64
362-
--pack
363-
--all
364-
--no-build-java
365-
-p:OnlyPackPlatformSpecificPackages=true
366-
$(_BuildArgs)
367-
$(_InternalRuntimeDownloadArgs)
368-
displayName: Run build.sh
369-
- script: ./eng/build.sh
370-
--ci
371-
--nobl
372-
--arch x64
373-
--build-installers
374-
--no-build-deps
375-
--no-build-nodejs
376-
-p:OnlyPackPlatformSpecificPackages=true
377-
-p:BuildRuntimeArchive=false
378-
-p:LinuxInstallerType=deb
379-
$(_BuildArgs)
380-
$(_InternalRuntimeDownloadArgs)
381-
displayName: Build Debian installers
382-
target: debpkg
383-
- script: ./eng/build.sh
384-
--ci
385-
--nobl
386-
--arch x64
387-
--build-installers
388-
--no-build-deps
389-
--no-build-nodejs
390-
--publish
391-
-p:OnlyPackPlatformSpecificPackages=true
392-
-p:BuildRuntimeArchive=false
393-
-p:LinuxInstallerType=rpm
394-
-p:AssetManifestFileName=aspnetcore-Linux_x64.xml
395-
$(_BuildArgs)
396-
$(_PublishArgs)
397-
$(_InternalRuntimeDownloadArgs)
398-
displayName: Build RPM installers
399-
target: rpmpkg
356+
buildArgs:
357+
--arch x64
358+
--pack
359+
--all
360+
--build-installers
361+
--no-build-java
362+
$(_ArcadePublishNonWindowsArg)
363+
-p:OnlyPackPlatformSpecificPackages=true
364+
-p:AssetManifestFileName=aspnetcore-Linux_x64.xml
365+
$(_BuildArgs)
366+
$(_PublishArgs)
367+
$(_InternalRuntimeDownloadArgs)
400368
artifacts:
401369
- name: Linux_x64_Logs_Attempt_$(System.JobAttempt)
402370
path: artifacts/log/
@@ -421,7 +389,7 @@ extends:
421389
--pack
422390
--all
423391
--no-build-java
424-
--publish
392+
$(_ArcadePublishNonWindowsArg)
425393
-p:OnlyPackPlatformSpecificPackages=true
426394
-p:AssetManifestFileName=aspnetcore-Linux_arm.xml
427395
$(_BuildArgs)
@@ -446,34 +414,18 @@ extends:
446414
jobName: Linux_arm64_build
447415
jobDisplayName: "Build: Linux ARM64"
448416
agentOs: Linux
449-
steps:
450-
- script: ./eng/build.sh
451-
--ci
452-
--arch arm64
453-
--pack
454-
--all
455-
--no-build-java
456-
-p:OnlyPackPlatformSpecificPackages=true
457-
$(_BuildArgs)
458-
$(_InternalRuntimeDownloadArgs)
459-
displayName: Run build.sh
460-
- script: ./eng/build.sh
461-
--ci
462-
--nobl
463-
--arch arm64
464-
--build-installers
465-
--no-build-deps
466-
--no-build-nodejs
467-
--publish
468-
-p:OnlyPackPlatformSpecificPackages=true
469-
-p:BuildRuntimeArchive=false
470-
-p:LinuxInstallerType=rpm
471-
-p:AssetManifestFileName=aspnetcore-Linux_arm64.xml
472-
$(_BuildArgs)
473-
$(_PublishArgs)
474-
$(_InternalRuntimeDownloadArgs)
475-
displayName: Build RPM installers
476-
target: rpmpkg
417+
buildArgs:
418+
--arch arm64
419+
--pack
420+
--all
421+
--build-installers
422+
--no-build-java
423+
$(_ArcadePublishNonWindowsArg)
424+
-p:OnlyPackPlatformSpecificPackages=true
425+
-p:AssetManifestFileName=aspnetcore-Linux_arm64.xml
426+
$(_BuildArgs)
427+
$(_PublishArgs)
428+
$(_InternalRuntimeDownloadArgs)
477429
artifacts:
478430
- name: Linux_arm64_Logs_Attempt_$(System.JobAttempt)
479431
path: artifacts/log/
@@ -500,7 +452,7 @@ extends:
500452
--pack
501453
--all
502454
--no-build-java
503-
--publish
455+
$(_ArcadePublishNonWindowsArg)
504456
-p:OnlyPackPlatformSpecificPackages=true
505457
-p:AssetManifestFileName=aspnetcore-Linux_musl_x64.xml
506458
$(_BuildArgs)
@@ -534,7 +486,7 @@ extends:
534486
--pack
535487
--all
536488
--no-build-java
537-
--publish
489+
$(_ArcadePublishNonWindowsArg)
538490
-p:OnlyPackPlatformSpecificPackages=true
539491
-p:AssetManifestFileName=aspnetcore-Linux_musl_arm.xml
540492
$(_BuildArgs)
@@ -567,7 +519,7 @@ extends:
567519
--pack
568520
--all
569521
--no-build-java
570-
--publish
522+
$(_ArcadePublishNonWindowsArg)
571523
-p:OnlyPackPlatformSpecificPackages=true
572524
-p:AssetManifestFileName=aspnetcore-Linux_musl_arm64.xml
573525
$(_BuildArgs)

‎.azure/pipelines/jobs/codesign-xplat.yml‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,20 @@ jobs:
1919
inputs:
2020
artifactName: ${{ parameters.inputName }}_Packages
2121
downloadPath: $(Build.StagingDirectory)/downloaded_packages/
22-
itemPattern: '**/*.nupkg'
22+
itemPattern: |
23+
**/*.nupkg
24+
**/*.tar.gz
25+
**/*.deb
26+
**/*.rpm
2327
- task: CopyFiles@2
2428
displayName: Copy packages to ArtifactsShippingPackagesDir
2529
inputs:
2630
sourceFolder: $(Build.StagingDirectory)/downloaded_packages/
27-
contents: '**/*.nupkg'
31+
contents: |
32+
**/*.nupkg
33+
**/*.tar.gz
34+
**/*.deb
35+
**/*.rpm
2836
targetFolder: $(Build.SourcesDirectory)/artifacts/packages/$(BuildConfiguration)/shipping/
2937
flattenFolders: true
3038
- powershell: .\eng\common\build.ps1

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -210,15 +210,15 @@ jobs:
210210
${{ step.env }}
211211
- ${{ if eq(parameters.steps, '')}}:
212212
- ${{ if eq(parameters.agentOs, 'Windows') }}:
213-
- script: $(BuildDirectory)\build.cmd -ci -prepareMachine -nativeToolsOnMachine -nobl -Configuration $(BuildConfiguration) $(BuildScriptArgs)
213+
- script: $(BuildDirectory)\build.cmd -ci -prepareMachine -nativeToolsOnMachine -Configuration $(BuildConfiguration) $(BuildScriptArgs)
214214
/p:DotNetSignType=$(_SignType)
215215
displayName: Run build.cmd
216216
env:
217217
COMPlus_DbgEnableMiniDump: 1
218218
COMPlus_DbgMiniDumpName: "$(System.DefaultWorkingDirectory)/dotnet-%d.%t.core"
219219
DotNetBuildsInternalReadSasToken: $(dotnetbuilds-internal-container-read-token)
220220
- ${{ if ne(parameters.agentOs, 'Windows') }}:
221-
- script: $(BuildDirectory)/build.sh --ci --nobl --configuration $(BuildConfiguration) $(BuildScriptArgs)
221+
- script: $(BuildDirectory)/build.sh --ci --configuration $(BuildConfiguration) $(BuildScriptArgs)
222222
displayName: Run build.sh
223223
env:
224224
COMPlus_DbgEnableMiniDump: 1
@@ -451,15 +451,15 @@ jobs:
451451
${{ step.env }}
452452
- ${{ if eq(parameters.steps, '')}}:
453453
- ${{ if eq(parameters.agentOs, 'Windows') }}:
454-
- script: $(BuildDirectory)\build.cmd -ci -prepareMachine -nativeToolsOnMachine -nobl -Configuration $(BuildConfiguration) $(BuildScriptArgs)
454+
- script: $(BuildDirectory)\build.cmd -ci -prepareMachine -nativeToolsOnMachine -Configuration $(BuildConfiguration) $(BuildScriptArgs)
455455
/p:DotNetSignType=$(_SignType)
456456
displayName: Run build.cmd
457457
env:
458458
COMPlus_DbgEnableMiniDump: 1
459459
COMPlus_DbgMiniDumpName: "$(System.DefaultWorkingDirectory)/dotnet-%d.%t.core"
460460
DotNetBuildsInternalReadSasToken: $(dotnetbuilds-internal-container-read-token)
461461
- ${{ if ne(parameters.agentOs, 'Windows') }}:
462-
- script: $(BuildDirectory)/build.sh --ci --nobl --configuration $(BuildConfiguration) $(BuildScriptArgs)
462+
- script: $(BuildDirectory)/build.sh --ci --configuration $(BuildConfiguration) $(BuildScriptArgs)
463463
displayName: Run build.sh
464464
env:
465465
COMPlus_DbgEnableMiniDump: 1

‎.github/CODEOWNERS‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
/src/Hosting/**/PublicAPI.*Shipped.txt @dotnet/aspnet-api-review
3030
/src/Http/ @BrennanConroy @halter73 @captainsafia
3131
/src/Http/**/PublicAPI.*Shipped.txt @dotnet/aspnet-api-review @BrennanConroy
32-
/src/Http/Routing/ @javiercn
33-
/src/Http/Routing/**/PublicAPI.*Shipped.txt @dotnet/aspnet-api-review @javiercn
32+
/src/Http/Routing/ @halter73
33+
/src/Http/Routing/**/PublicAPI.*Shipped.txt @dotnet/aspnet-api-review @halter73
3434
/src/HttpClientFactory/ @captainsafia @halter73
3535
/src/HttpClientFactory/**/PublicAPI.*Shipped.txt @dotnet/aspnet-api-review @captainsafia @halter73
3636
/src/Installers/ @dotnet/aspnet-build @wtgodbe

‎.github/workflows/update-sdk.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
runs-on: ubuntu-latest
2121
steps:
2222
- uses: actions/checkout@v4
23-
- uses: martincostello/update-dotnet-sdk@67d6e2b14939c06978a7f80444157296c3defe14 # v3.2.3
23+
- uses: martincostello/update-dotnet-sdk@76e2c0df2303d4f6a404228105ebb7d60ace0556 # v3.4.0
2424
with:
2525
quality: 'daily'
2626
repo-token: ${{ secrets.GITHUB_TOKEN }}

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: Update Selenium and Playwright dependencies
2+
3+
on:
4+
schedule:
5+
- cron: '0 0 1-7 * 1' # Run on the first monday of the month
6+
workflow_dispatch: # Allow manual runs
7+
8+
permissions:
9+
contents: write
10+
issues: write
11+
pull-requests: write
12+
13+
jobs:
14+
update-jquery-validate:
15+
runs-on: ubuntu-latest
16+
17+
steps:
18+
- name: Checkout code
19+
uses: actions/checkout@v4
20+
21+
- name: Update dependencies
22+
run: pwsh eng/scripts/update-selenium-and-playwright-versions.ps1
23+
env:
24+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)