Skip to content

Commit aa66f3a

Browse files
authored
Merge branch 'main' into BlazorHotReloadPackage
2 parents f887036 + 92bc896 commit aa66f3a

File tree

22 files changed

+389
-527
lines changed

22 files changed

+389
-527
lines changed

.azure/pipelines/ci-public.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -632,8 +632,8 @@ stages:
632632
platform:
633633
name: 'Managed'
634634
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-build-amd64'
635-
buildScript: './eng/build.sh --publish --no-build-repo-tasks $(_PublishArgs) $(_InternalRuntimeDownloadArgs)'
636-
skipPublishValidation: true
635+
buildScript: './eng/build.sh'
636+
buildArguments: '--source-build $(_InternalRuntimeDownloadArgs)'
637637
jobProperties:
638638
timeoutInMinutes: 120
639639
variables:

.azure/pipelines/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -676,9 +676,9 @@ extends:
676676
enableInternalSources: true
677677
platform:
678678
name: 'Managed'
679-
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8'
680-
buildScript: './eng/build.sh --publish --no-build-repo-tasks $(_PublishArgs) $(_InternalRuntimeDownloadArgs)'
681-
skipPublishValidation: true
679+
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9'
680+
buildScript: './eng/build.sh'
681+
buildArguments: '--source-build $(_InternalRuntimeDownloadArgs)'
682682
jobProperties:
683683
timeoutInMinutes: 120
684684
variables:

.github/policies/resourceManagement.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -555,7 +555,7 @@ configuration:
555555
then:
556556
- removeMilestone
557557
- addMilestone:
558-
milestone: 9.0.5
558+
milestone: 9.0.6
559559
description: '[Milestone Assignments] Assign Milestone to PRs merged to release/9.0 branch'
560560
- if:
561561
- payloadType: Pull_Request
@@ -566,7 +566,7 @@ configuration:
566566
then:
567567
- removeMilestone
568568
- addMilestone:
569-
milestone: 8.0.16
569+
milestone: 8.0.17
570570
description: '[Milestone Assignments] Assign Milestone to PRs merged to release/8.0 branch'
571571
- if:
572572
- 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@11c848003df85813f4821fec2d43290fd4ca8594 # 2025-01-13
17+
uses: dotnet/arcade/.github/workflows/backport-base.yml@43abe63bfc701d34e6599490a557a74710693410 # 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@11c848003df85813f4821fec2d43290fd4ca8594 # 2024-06-24
13+
uses: dotnet/arcade/.github/workflows/backport-base.yml@43abe63bfc701d34e6599490a557a74710693410 # 2024-06-24

eng/DotNetBuild.props

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

0 commit comments

Comments
 (0)