Skip to content

Commit 809a297

Browse files
marafmaraf
committed
Merge remote-tracking branch 'upstream/main' into BlazorPreloadRoot
2 parents c9a8eda + 78e5147 commit 809a297

File tree

289 files changed

+7062
-1976
lines changed

Some content is hidden

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

289 files changed

+7062
-1976
lines changed

‎.azure/pipelines/components-e2e-tests.yml‎

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,35 @@ jobs:
5858
displayName: Build JS
5959
- script: .dotnet/dotnet build ./src/Components/test/E2ETest -c $(BuildConfiguration) --no-restore
6060
displayName: Build
61-
- script: .dotnet/dotnet test ./src/Components/test/E2ETest -c $(BuildConfiguration) --no-build --filter 'Quarantined!=true|Quarantined=false'
62-
-p:VsTestUseMSBuildOutput=false
63-
--logger:"trx%3BLogFileName=Microsoft.AspNetCore.Components.E2ETests.trx"
64-
--logger:"html%3BLogFileName=Microsoft.AspNetCore.Components.E2ETests.html"
65-
--results-directory $(Build.SourcesDirectory)/artifacts/TestResults/$(BuildConfiguration)/Unquarantined
61+
- script: |
62+
set -o pipefail
63+
64+
.dotnet/dotnet test ./src/Components/test/E2ETest \
65+
-c $(BuildConfiguration) \
66+
--no-build \
67+
--filter 'Quarantined!=true|Quarantined=false' \
68+
-p:VsTestUseMSBuildOutput=false \
69+
--logger:"trx%3BLogFileName=Microsoft.AspNetCore.Components.E2ETests.trx" \
70+
--logger:"html%3BLogFileName=Microsoft.AspNetCore.Components.E2ETests.html" \
71+
--results-directory $(Build.SourcesDirectory)/artifacts/TestResults/$(BuildConfiguration)/Unquarantined \
72+
| tee e2e-test-output.log
73+
74+
if grep -q "No test matches the given testcase filter" e2e-test-output.log
75+
then
76+
echo "##vso[task.logissue type=error] No tests matched the filter."
77+
78+
exit 1
79+
fi
80+
81+
# Check total tests run to detect abnormalities. In case the number of tests changes significantly, we should adjust the threshold.
82+
# Extract total from the summary line "Failed: xx, Passed: yy, Skipped: zz, Total: NNN, Duration: ..."
83+
total=$(sed -nE 's/.*Failed:[[:space:]]*[0-9]+,[[:space:]]*Passed:[[:space:]]*[0-9]+,[[:space:]]*Skipped:[[:space:]]*[0-9]+,[[:space:]]*Total:[[:space:]]*([0-9]+).*/\1/p' e2e-test-output.log)
84+
min_total=1000
85+
if [ -z "$total" ] || [ "$total" -lt "$min_total" ]
86+
then
87+
echo "##vso[task.logissue type=error] Insufficient total test count: $total. We expect at least $min_total tests to run."
88+
exit 1
89+
fi
6690
displayName: Run E2E tests
6791
- script: .dotnet/dotnet test ./src/Components/test/E2ETest -c $(BuildConfiguration) --no-build --filter 'Quarantined=true' -p:RunQuarantinedTests=true
6892
-p:VsTestUseMSBuildOutput=false

‎.github/policies/resourceManagement.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,7 @@ configuration:
553553
then:
554554
- removeMilestone
555555
- addMilestone:
556-
milestone: 9.0.6
556+
milestone: 9.0.7
557557
description: '[Milestone Assignments] Assign Milestone to PRs merged to release/9.0 branch'
558558
- if:
559559
- payloadType: Pull_Request
@@ -564,7 +564,7 @@ configuration:
564564
then:
565565
- removeMilestone
566566
- addMilestone:
567-
milestone: 8.0.17
567+
milestone: 8.0.18
568568
description: '[Milestone Assignments] Assign Milestone to PRs merged to release/8.0 branch'
569569
- if:
570570
- 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@fdcda9b4919dd16bd2388b5421cc5d55afac0e88 # 2025-01-13
17+
uses: dotnet/arcade/.github/workflows/backport-base.yml@d237be4630776450573bc588eb995bb8f9ebc04f # 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@fdcda9b4919dd16bd2388b5421cc5d55afac0e88 # 2024-06-24
13+
uses: dotnet/arcade/.github/workflows/backport-base.yml@d237be4630776450573bc588eb995bb8f9ebc04f # 2024-06-24

‎AspNetCore.slnx‎

Lines changed: 303 additions & 293 deletions
Large diffs are not rendered by default.

‎Directory.Build.props‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,10 @@
106106
<NuspecBasePath>$(MSBuildProjectDirectory)</NuspecBasePath>
107107

108108
<IncludeSymbols>true</IncludeSymbols>
109+
109110
<DefaultNetFxTargetFramework>net462</DefaultNetFxTargetFramework>
111+
<!-- Current xunit.runner.visualstudio supports net472+/net8.0+ only. So we can't use net462 -->
112+
<DefaultNetFxTargetFramework Condition="'$(IsTestProject)'=='true'">net472</DefaultNetFxTargetFramework>
110113

111114
<CrossgenOutput Condition="'$(DotNetBuildUseMonoRuntime)' == 'true'">false</CrossgenOutput>
112115
</PropertyGroup>

‎eng/Build.props‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@
198198
$(RepoRoot)src\Extensions\**\*.csproj;
199199
$(RepoRoot)src\BuildAfterTargetingPack\*.csproj;
200200
$(RepoRoot)src\OpenApi\**\*.csproj;
201+
$(RepoRoot)src\Validation\**\*.csproj;
201202
$(RepoRoot)eng\tools\HelixTestRunner\HelixTestRunner.csproj;
202203
"
203204
Exclude="
@@ -242,6 +243,7 @@
242243
$(RepoRoot)src\Extensions\**\src\*.csproj;
243244
$(RepoRoot)src\BuildAfterTargetingPack\*.csproj;
244245
$(RepoRoot)src\OpenApi\**\src\*.csproj;
246+
$(RepoRoot)src\Validation\**\src\*.csproj;
245247
"
246248
Exclude="
247249
@(ProjectToBuild);

‎eng/Dependencies.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ and are generated based on the last package release.
2929
<LatestPackageReference Include="Microsoft.DotNet.HotReload.Agent.Data" />
3030
<LatestPackageReference Include="Microsoft.Extensions.Caching.Abstractions" />
3131
<LatestPackageReference Include="Microsoft.Extensions.Caching.Memory" />
32+
<LatestPackageReference Include="Microsoft.Extensions.Caching.Hybrid" />
3233
<LatestPackageReference Include="Microsoft.Extensions.Configuration.Abstractions" />
3334
<LatestPackageReference Include="Microsoft.Extensions.Configuration.Binder" />
3435
<LatestPackageReference Include="Microsoft.Extensions.Configuration.CommandLine" />

‎eng/ProjectReferences.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,5 +170,6 @@
170170
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Grpc.JsonTranscoding" ProjectPath="$(RepoRoot)src\Grpc\JsonTranscoding\src\Microsoft.AspNetCore.Grpc.JsonTranscoding\Microsoft.AspNetCore.Grpc.JsonTranscoding.csproj" />
171171
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Grpc.Swagger" ProjectPath="$(RepoRoot)src\Grpc\JsonTranscoding\src\Microsoft.AspNetCore.Grpc.Swagger\Microsoft.AspNetCore.Grpc.Swagger.csproj" />
172172
<ProjectReferenceProvider Include="Microsoft.AspNetCore.OpenApi" ProjectPath="$(RepoRoot)src\OpenApi\src\Microsoft.AspNetCore.OpenApi.csproj" />
173+
<ProjectReferenceProvider Include="Microsoft.Extensions.Validation" ProjectPath="$(RepoRoot)src\Validation\src\Microsoft.Extensions.Validation.csproj" />
173174
</ItemGroup>
174175
</Project>

‎eng/SharedFramework.Local.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
<AspNetCoreAppReferenceAndPackage Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" />
3838
<AspNetCoreAppReferenceAndPackage Include="Microsoft.Extensions.Diagnostics.HealthChecks" />
3939
<AspNetCoreAppReferenceAndPackage Include="Microsoft.Extensions.Features" />
40+
<AspNetCoreAppReferenceAndPackage Include="Microsoft.Extensions.Validation" />
4041

4142
<!-- These assemblies are only in the shared framework -->
4243
<AspNetCoreAppReference Include="Microsoft.AspNetCore" />

0 commit comments

Comments
 (0)