Skip to content

Commit 5019aad

Browse files
Merge branch 'main' into gh-60628
2 parents 1ffc0cd + 82d75a0 commit 5019aad

File tree

64 files changed

+1346
-383
lines changed

Some content is hidden

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

64 files changed

+1346
-383
lines changed

.azure/pipelines/report-green.yml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# This CI job only runs on PRs where all other jobs are skipped.
2+
# This allows Build Analysis to report green. Without this, no jobs would run,
3+
# causing Build Analysis to hang indefinitely (or until someone commented "ba-g {justification}" on the PR).
4+
5+
# Only run this on PRs
6+
trigger: none
7+
# Run for all branches, only on paths that no-op other jobs
8+
pr:
9+
autoCancel: true
10+
branches:
11+
include:
12+
- '*'
13+
paths:
14+
include:
15+
- .devcontainer/*
16+
- .github/*
17+
- .vscode/*
18+
- docs/*
19+
- '**/*.md'
20+
- LICENSE.TXT
21+
- THIRD-PARTY-NOTICES.TXT
22+
23+
# ABG - Always Be Green
24+
jobs:
25+
- template: /eng/common/templates/jobs/jobs.yml
26+
parameters:
27+
enableTelemetry: true
28+
helixRepo: dotnet/aspnetcore
29+
jobs:
30+
- job: Report_Green
31+
enableSBOM: false
32+
pool:
33+
vmImage: ubuntu-22.04
34+
steps:
35+
- powershell: |
36+
exit 0
37+
displayName: Exit 0

.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@0e335649fe2d2f98ea51e55cc1a0899af3617eba # 2025-01-13
17+
uses: dotnet/arcade/.github/workflows/backport-base.yml@aea743edf7c9345cfdbdf9593756973baadc6b37 # 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@0e335649fe2d2f98ea51e55cc1a0899af3617eba # 2024-06-24
13+
uses: dotnet/arcade/.github/workflows/backport-base.yml@aea743edf7c9345cfdbdf9593756973baadc6b37 # 2024-06-24

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ BenchmarkDotNet.Artifacts/
1313
src/SignalR/clients/**/dist/
1414
modules/
1515
.ionide/
16+
TestResults/
1617

1718
# File extensions
1819
*.aps
@@ -33,6 +34,7 @@ modules/
3334
*.suo
3435
*.svclog
3536
*.tlog
37+
*.trx
3638
*.user
3739
*.userprefs
3840
*.vspx

activate.sh

100644100755
File mode changed.

eng/Version.Details.xml

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

eng/Versions.props

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

global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
"jdk": "latest"
2828
},
2929
"msbuild-sdks": {
30-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25330.103",
31-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25330.103",
32-
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25330.103",
30+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25351.105",
31+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25351.105",
32+
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25351.105",
3333
"Microsoft.Build.NoTargets": "3.7.0",
3434
"Microsoft.Build.Traversal": "3.4.0"
3535
}
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
4+
using System.Buffers;
5+
6+
namespace Microsoft.AspNetCore.Components;
7+
8+
internal interface IPersistentComponentStateSerializer
9+
{
10+
void Persist(Type type, object value, IBufferWriter<byte> writer);
11+
object Restore(Type type, ReadOnlySequence<byte> data);
12+
}

src/Components/Components/src/Microsoft.AspNetCore.Components.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<Compile Include="$(ComponentsSharedSourceRoot)src\HotReloadManager.cs" LinkBase="HotReload" />
2020
<Compile Include="$(ComponentsSharedSourceRoot)src\RootTypeCache.cs" LinkBase="Shared" />
2121
<Compile Include="$(SharedSourceRoot)LinkerFlags.cs" LinkBase="Shared" />
22+
<Compile Include="$(SharedSourceRoot)PooledArrayBufferWriter.cs" LinkBase="Shared" />
2223
<Compile Include="$(SharedSourceRoot)QueryStringEnumerable.cs" LinkBase="Shared" />
2324
<Compile Include="$(SharedSourceRoot)Debugger\DictionaryItemDebugView.cs" LinkBase="Shared" />
2425
<Compile Include="$(SharedSourceRoot)Debugger\DictionaryDebugView.cs" LinkBase="Shared" />

0 commit comments

Comments
 (0)