Skip to content

Commit 9621351

Browse files
authored
Merge branch 'main' into templates
2 parents 7bc7ba7 + 97d1829 commit 9621351

File tree

3,000 files changed

+313612
-112715
lines changed

Some content is hidden

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

3,000 files changed

+313612
-112715
lines changed

.CodeQL.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# This file configures CodeQL runs and TSA bug autofiling. For more information, see:
2+
# https://eng.ms/docs/cloud-ai-platform/devdiv/one-engineering-system-1es/1es-docs/codeql/troubleshooting/bugs/generated-library-code
3+
# (Access restricted to Microsoft employees only.)
4+
5+
path_classifiers:
6+
refs:
7+
# The test/ directories don't contain shipping implementations of code, so they should
8+
# be excluded from analysis.
9+
- src/**/test/*

.azure/pipelines/azure-pipelines-mirror-within-azdo.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ trigger:
33
batch: true
44
branches:
55
include:
6-
- internal/release/6.0
6+
- internal/release/8.0
77

88
parameters:
99
# Run the pipeline manually (usually disallowed)

.azure/pipelines/blazor-daily-tests.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
# Uses Scheduled Triggers, which aren't supported in YAML yet.
2-
# https://learn.microsoft.com/en-us/azure/devops/pipelines/build/triggers?view=vsts&tabs=yaml#scheduled
2+
# https://learn.microsoft.com/azure/devops/pipelines/build/triggers?view=vsts&tabs=yaml#scheduled
33

44
# Daily Tests for Blazor
55
# These use Sauce Labs resources, hence they run daily rather than per-commit.
66

77
# We just need one Windows machine because all it does is trigger SauceLabs.
88
variables:
99
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
10-
- group: DotNet-MSRC-Storage
1110
- group: AzureDevOps-Artifact-Feeds-Pats
1211
- name: SAUCE_CONNECT_DOWNLOAD_ON_INSTALL
1312
value: true

.azure/pipelines/ci-public.yml

Lines changed: 62 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# See https://learn.microsoft.com/en-us/azure/devops/pipelines/yaml-schema for details on this file.
2+
# See https://learn.microsoft.com/azure/devops/pipelines/yaml-schema for details on this file.
33
#
44

55
# Configure which branches trigger builds
@@ -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
@@ -101,7 +93,7 @@ stages:
10193
- powershell: ./eng/scripts/CodeCheck.ps1 -ci $(_InternalRuntimeDownloadArgs)
10294
displayName: Run eng/scripts/CodeCheck.ps1
10395
artifacts:
104-
- name: Code_Check_Logs
96+
- name: Code_Check_Logs_Attempt_$(System.JobAttempt)
10597
path: artifacts/log/
10698
publishOnError: true
10799
includeForks: true
@@ -227,7 +219,7 @@ stages:
227219
displayName: Build ARM64 Installers
228220

229221
artifacts:
230-
- name: Windows_Logs
222+
- name: Windows_Logs_Attempt_$(System.JobAttempt)
231223
path: artifacts/log/
232224
publishOnError: true
233225
includeForks: true
@@ -259,7 +251,7 @@ stages:
259251
$(_PublishArgs)
260252
$(_InternalRuntimeDownloadArgs)
261253
artifacts:
262-
- name: MacOS_arm64_Logs
254+
- name: MacOS_arm64_Logs_Attempt_$(System.JobAttempt)
263255
path: artifacts/log/
264256
publishOnError: true
265257
includeForks: true
@@ -289,7 +281,7 @@ stages:
289281
$(_PublishArgs)
290282
$(_InternalRuntimeDownloadArgs)
291283
artifacts:
292-
- name: MacOS_x64_Logs
284+
- name: MacOS_x64_Logs_Attempt_$(System.JobAttempt)
293285
path: artifacts/log/
294286
publishOnError: true
295287
includeForks: true
@@ -313,45 +305,15 @@ 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:
354-
- name: Linux_x64_Logs
316+
- name: Linux_x64_Logs_Attempt_$(System.JobAttempt)
355317
path: artifacts/log/
356318
publishOnError: true
357319
includeForks: true
@@ -381,7 +343,7 @@ stages:
381343
$(_PublishArgs)
382344
$(_InternalRuntimeDownloadArgs)
383345
artifacts:
384-
- name: Linux_arm_Logs
346+
- name: Linux_arm_Logs_Attempt_$(System.JobAttempt)
385347
path: artifacts/log/
386348
publishOnError: true
387349
includeForks: true
@@ -404,31 +366,15 @@ 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:
431-
- name: Linux_arm64_Logs
377+
- name: Linux_arm64_Logs_Attempt_$(System.JobAttempt)
432378
path: artifacts/log/
433379
publishOnError: true
434380
includeForks: true
@@ -459,10 +405,9 @@ stages:
459405
$(_BuildArgs)
460406
$(_PublishArgs)
461407
$(_InternalRuntimeDownloadArgs)
462-
installNodeJs: false
463408
disableComponentGovernance: true
464409
artifacts:
465-
- name: Linux_musl_x64_Logs
410+
- name: Linux_musl_x64_Logs_Attempt_$(System.JobAttempt)
466411
path: artifacts/log/
467412
publishOnError: true
468413
includeForks: true
@@ -495,7 +440,7 @@ stages:
495440
$(_PublishArgs)
496441
$(_InternalRuntimeDownloadArgs)
497442
artifacts:
498-
- name: Linux_musl_arm_Logs
443+
- name: Linux_musl_arm_Logs_Attempt_$(System.JobAttempt)
499444
path: artifacts/log/
500445
publishOnError: true
501446
includeForks: true
@@ -528,7 +473,7 @@ stages:
528473
$(_PublishArgs)
529474
$(_InternalRuntimeDownloadArgs)
530475
artifacts:
531-
- name: Linux_musl_arm64_Logs
476+
- name: Linux_musl_arm64_Logs_Attempt_$(System.JobAttempt)
532477
path: artifacts/log/
533478
publishOnError: true
534479
includeForks: true
@@ -557,14 +502,18 @@ stages:
557502
- powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1; & ./src/Servers/IIS/tools/update_schema.ps1"
558503
displayName: Setup IISExpress test certificates and schema
559504
artifacts:
560-
- name: Windows_Test_Logs
505+
- name: Windows_Test_Logs_Attempt_$(System.JobAttempt)
561506
path: artifacts/log/
562507
publishOnError: true
563508
includeForks: true
564-
- name: Windows_Test_Results
509+
- name: Windows_Test_Results_Attempt_$(System.JobAttempt)
565510
path: artifacts/TestResults/
566511
publishOnError: true
567512
includeForks: true
513+
- name: Minified_JS_Files
514+
path: src/Components/Web.JS/dist/Release/
515+
publishOnError: true
516+
includeForks: true
568517

569518
- template: jobs/default-build.yml
570519
parameters:
@@ -573,16 +522,16 @@ stages:
573522
agentOs: macOS
574523
timeoutInMinutes: 90
575524
isAzDOTestingJob: true
576-
buildArgs: --all --test --binaryLog "/p:RunTemplateTests=false /p:SkipHelixReadyTests=true" $(_InternalRuntimeDownloadArgs)
525+
buildArgs: --all --test --binaryLog /p:RunTemplateTests=false /p:SkipHelixReadyTests=true $(_InternalRuntimeDownloadArgs)
577526
beforeBuild:
578527
- bash: "./eng/scripts/install-nginx-mac.sh"
579528
displayName: Installing Nginx
580529
artifacts:
581-
- name: MacOS_Test_Logs
530+
- name: MacOS_Test_Logs_Attempt_$(System.JobAttempt)
582531
path: artifacts/log/
583532
publishOnError: true
584533
includeForks: true
585-
- name: MacOS_Test_Results
534+
- name: MacOS_Test_Results_Attempt_$(System.JobAttempt)
586535
path: artifacts/TestResults/
587536
publishOnError: true
588537
includeForks: true
@@ -594,18 +543,18 @@ stages:
594543
agentOs: Linux
595544
isAzDOTestingJob: true
596545
useHostedUbuntu: false
597-
buildArgs: --all --test --binaryLog "/p:RunTemplateTests=false /p:SkipHelixReadyTests=true" $(_InternalRuntimeDownloadArgs)
546+
buildArgs: --all --test --binaryLog /p:RunTemplateTests=false /p:SkipHelixReadyTests=true $(_InternalRuntimeDownloadArgs)
598547
beforeBuild:
599548
- bash: "./eng/scripts/install-nginx-linux.sh"
600549
displayName: Installing Nginx
601550
- bash: "echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p"
602551
displayName: Increase inotify limit
603552
artifacts:
604-
- name: Linux_Test_Logs
553+
- name: Linux_Test_Logs_Attempt_$(System.JobAttempt)
605554
path: artifacts/log/
606555
publishOnError: true
607556
includeForks: true
608-
- name: Linux_Test_Results
557+
- name: Linux_Test_Results_Attempt_$(System.JobAttempt)
609558
path: artifacts/TestResults/
610559
publishOnError: true
611560
includeForks: true
@@ -632,7 +581,43 @@ stages:
632581
SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
633582

634583
artifacts:
635-
- name: Helix_logs
584+
- name: Helix_Logs_Attempt_$(System.JobAttempt)
585+
path: artifacts/log/
586+
publishOnError: true
587+
includeForks: true
588+
589+
# Local development validation
590+
- template: jobs/default-build.yml
591+
parameters:
592+
jobName: Local_Windows
593+
jobDisplayName: 'Test: Windows local development validation'
594+
agentOs: Windows
595+
isAzDOTestingJob: true
596+
timeoutInMinutes: 240
597+
steps:
598+
- script: git submodule update --init
599+
displayName: Update submodules
600+
- script: ./restore.cmd
601+
displayName: Run restore.cmd
602+
- powershell: ./eng/build.ps1 -all -noBuildJava -noBuildNodeJS "-WarnAsError:false"
603+
displayName: Build (No NodeJS)
604+
- script: npm run build
605+
displayName: Build JS
606+
- script: ./eng/build.cmd -all -noBuildJava -pack -c Debug
607+
displayName: Build (Debug)
608+
- script: ./eng/build.cmd -all -noBuildJava -pack -c Release
609+
displayName: Build (Release)
610+
- script: ./src/ProjectTemplates/build.cmd
611+
-test
612+
-NoRestore
613+
-NoBuild
614+
-NoBuildDeps
615+
-configuration Release
616+
-bl
617+
displayName: Run project template tests
618+
619+
artifacts:
620+
- name: Local_Windows_x64_Logs_Attempt_$(System.JobAttempt)
636621
path: artifacts/log/
637622
publishOnError: true
638623
includeForks: true

0 commit comments

Comments
 (0)