Skip to content

Commit e2d94ac

Browse files
gewarrengewarren
authored
Merge pull request #10566 from dotnet/main
Merge main into live
2 parents f425ebb + 03831f4 commit e2d94ac

File tree

4,503 files changed

+825
-65767
lines changed

Some content is hidden

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

4,503 files changed

+825
-65767
lines changed

‎.github/policies/auto-merge.yml‎

Lines changed: 34 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,50 @@
1+
id:
12
name: GitOps.PullRequestIssueManagement
23
description: GitOps.PullRequestIssueManagement primitive
4+
owner:
35
resource: repository
4-
6+
disabled: false
7+
where:
58
configuration:
69
resourceManagementConfiguration:
710
eventResponderTasks:
8-
- description: Auto-squash-merge PRs to main labeled with auto-merge
11+
- description: Approve and auto-squash-merge dependabot PRs to main labeled 'auto-merge'
912
triggerOnOwnActions: true
1013
if:
11-
- payloadType: Pull_Request
12-
- labelAdded:
13-
label: ':octocat: auto-merge'
14-
- targetsBranch:
15-
branch: main
14+
- payloadType: Pull_Request
15+
- labelAdded:
16+
label: ':octocat: auto-merge'
17+
- targetsBranch:
18+
branch: main
19+
- or:
20+
- isActivitySender:
21+
user: dependabot
22+
- isActivitySender:
23+
user: dependabot[bot]
1624
then:
17-
- enableAutoMerge:
18-
mergeMethod: Squash
25+
- enableAutoMerge:
26+
mergeMethod: Squash
27+
- approvePullRequest:
28+
comment: "Approved; this PR will merge when all status checks pass."
1929

20-
- description: Auto-merge PRs to live labeled with auto-merge
30+
- description: Auto-merge policy service bot PRs to live labeled 'auto-merge'
2131
triggerOnOwnActions: true
2232
if:
23-
- payloadType: Pull_Request
24-
- labelAdded:
25-
label: ':octocat: auto-merge'
26-
- targetsBranch:
27-
branch: live
33+
- payloadType: Pull_Request
34+
- labelAdded:
35+
label: ':octocat: auto-merge'
36+
- targetsBranch:
37+
branch: live
38+
- isActivitySender:
39+
user: dotnet-policy-service[bot]
2840
then:
29-
- enableAutoMerge:
30-
mergeMethod: Merge
41+
- enableAutoMerge:
42+
mergeMethod: Merge
3143

32-
- description: Don't auto-merge PRs with auto-merge label removed
44+
- description: Don't auto-merge PRs with 'auto-merge' label removed
3345
if:
34-
- payloadType: Pull_Request
35-
- labelRemoved:
36-
label: ':octocat: auto-merge'
46+
- payloadType: Pull_Request
47+
- labelRemoved:
48+
label: ':octocat: auto-merge'
3749
then:
38-
- disableAutoMerge
50+
- disableAutoMerge

‎xml/Microsoft.CSharp.RuntimeBinder/Binder.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@
2828
<AttributeName Language="C#">[System.Runtime.CompilerServices.Nullable(0)]</AttributeName>
2929
<AttributeName Language="F#">[&lt;System.Runtime.CompilerServices.Nullable(0)&gt;]</AttributeName>
3030
</Attribute>
31-
<Attribute FrameworkAlternate="net-8.0;net-9.0">
32-
<AttributeName Language="C#">[System.Runtime.CompilerServices.NullableContext(1)]</AttributeName>
33-
<AttributeName Language="F#">[&lt;System.Runtime.CompilerServices.NullableContext(1)&gt;]</AttributeName>
34-
</Attribute>
3531
</Attributes>
3632
<Docs>
3733
<summary>Contains factory methods to create dynamic call site binders for CSharp.</summary>

‎xml/Microsoft.CSharp.RuntimeBinder/CSharpArgumentInfo.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,6 @@
4949
<AssemblyVersion>8.0.0.0</AssemblyVersion>
5050
<AssemblyVersion>9.0.0.0</AssemblyVersion>
5151
</AssemblyInfo>
52-
<Attributes>
53-
<Attribute FrameworkAlternate="net-8.0;net-9.0">
54-
<AttributeName Language="C#">[System.Runtime.CompilerServices.NullableContext(1)]</AttributeName>
55-
<AttributeName Language="F#">[&lt;System.Runtime.CompilerServices.NullableContext(1)&gt;]</AttributeName>
56-
</Attribute>
57-
</Attributes>
5852
<ReturnValue>
5953
<ReturnType>Microsoft.CSharp.RuntimeBinder.CSharpArgumentInfo</ReturnType>
6054
</ReturnValue>

‎xml/Microsoft.CSharp.RuntimeBinder/RuntimeBinderException.xml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@
2525
<AttributeName Language="C#">[System.Runtime.CompilerServices.Nullable(0)]</AttributeName>
2626
<AttributeName Language="F#">[&lt;System.Runtime.CompilerServices.Nullable(0)&gt;]</AttributeName>
2727
</Attribute>
28-
<Attribute FrameworkAlternate="net-8.0;net-9.0">
29-
<AttributeName Language="C#">[System.Runtime.CompilerServices.NullableContext(2)]</AttributeName>
30-
<AttributeName Language="F#">[&lt;System.Runtime.CompilerServices.NullableContext(2)&gt;]</AttributeName>
31-
</Attribute>
3228
<Attribute FrameworkAlternate="netframework-4.0;netframework-4.5;netframework-4.5.1;netframework-4.5.2;netframework-4.6;netframework-4.6.1;netframework-4.6.2;netframework-4.7;netframework-4.7.1;netframework-4.7.2;netframework-4.8;netframework-4.8.1">
3329
<AttributeName Language="C#">[System.Serializable]</AttributeName>
3430
<AttributeName Language="F#">[&lt;System.Serializable&gt;]</AttributeName>
@@ -171,10 +167,6 @@
171167
<AttributeName Language="C#">[System.Obsolete("This API supports obsolete formatter-based serialization. It should not be called or extended by application code.", DiagnosticId="SYSLIB0051", UrlFormat="https://aka.ms/dotnet-warnings/{0}")]</AttributeName>
172168
<AttributeName Language="F#">[&lt;System.Obsolete("This API supports obsolete formatter-based serialization. It should not be called or extended by application code.", DiagnosticId="SYSLIB0051", UrlFormat="https://aka.ms/dotnet-warnings/{0}")&gt;]</AttributeName>
173169
</Attribute>
174-
<Attribute FrameworkAlternate="net-8.0;net-9.0">
175-
<AttributeName Language="C#">[System.Runtime.CompilerServices.NullableContext(1)]</AttributeName>
176-
<AttributeName Language="F#">[&lt;System.Runtime.CompilerServices.NullableContext(1)&gt;]</AttributeName>
177-
</Attribute>
178170
<Attribute FrameworkAlternate="netframework-4.0">
179171
<AttributeName Language="C#">[System.Runtime.TargetedPatchingOptOut("Performance critical to inline this type of method across NGen image boundaries")]</AttributeName>
180172
<AttributeName Language="F#">[&lt;System.Runtime.TargetedPatchingOptOut("Performance critical to inline this type of method across NGen image boundaries")&gt;]</AttributeName>

‎xml/Microsoft.CSharp.RuntimeBinder/RuntimeBinderInternalCompilerException.xml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@
2525
<AttributeName Language="C#">[System.Runtime.CompilerServices.Nullable(0)]</AttributeName>
2626
<AttributeName Language="F#">[&lt;System.Runtime.CompilerServices.Nullable(0)&gt;]</AttributeName>
2727
</Attribute>
28-
<Attribute FrameworkAlternate="net-8.0;net-9.0">
29-
<AttributeName Language="C#">[System.Runtime.CompilerServices.NullableContext(2)]</AttributeName>
30-
<AttributeName Language="F#">[&lt;System.Runtime.CompilerServices.NullableContext(2)&gt;]</AttributeName>
31-
</Attribute>
3228
<Attribute FrameworkAlternate="netframework-4.0;netframework-4.5;netframework-4.5.1;netframework-4.5.2;netframework-4.6;netframework-4.6.1;netframework-4.6.2;netframework-4.7;netframework-4.7.1;netframework-4.7.2;netframework-4.8;netframework-4.8.1">
3329
<AttributeName Language="C#">[System.Serializable]</AttributeName>
3430
<AttributeName Language="F#">[&lt;System.Serializable&gt;]</AttributeName>
@@ -171,10 +167,6 @@
171167
<AttributeName Language="C#">[System.Obsolete("This API supports obsolete formatter-based serialization. It should not be called or extended by application code.", DiagnosticId="SYSLIB0051", UrlFormat="https://aka.ms/dotnet-warnings/{0}")]</AttributeName>
172168
<AttributeName Language="F#">[&lt;System.Obsolete("This API supports obsolete formatter-based serialization. It should not be called or extended by application code.", DiagnosticId="SYSLIB0051", UrlFormat="https://aka.ms/dotnet-warnings/{0}")&gt;]</AttributeName>
173169
</Attribute>
174-
<Attribute FrameworkAlternate="net-8.0;net-9.0">
175-
<AttributeName Language="C#">[System.Runtime.CompilerServices.NullableContext(1)]</AttributeName>
176-
<AttributeName Language="F#">[&lt;System.Runtime.CompilerServices.NullableContext(1)&gt;]</AttributeName>
177-
</Attribute>
178170
<Attribute FrameworkAlternate="netframework-4.0">
179171
<AttributeName Language="C#">[System.Runtime.TargetedPatchingOptOut("Performance critical to inline this type of method across NGen image boundaries")]</AttributeName>
180172
<AttributeName Language="F#">[&lt;System.Runtime.TargetedPatchingOptOut("Performance critical to inline this type of method across NGen image boundaries")&gt;]</AttributeName>

‎xml/Microsoft.DotNet.PlatformAbstractions/HashCodeCombiner.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,6 @@
3232
<AttributeName Language="C#">[System.Runtime.CompilerServices.Nullable(0)]</AttributeName>
3333
<AttributeName Language="F#">[&lt;System.Runtime.CompilerServices.Nullable(0)&gt;]</AttributeName>
3434
</Attribute>
35-
<Attribute FrameworkAlternate="net-8.0;net-9.0">
36-
<AttributeName Language="C#">[System.Runtime.CompilerServices.NullableContext(2)]</AttributeName>
37-
<AttributeName Language="F#">[&lt;System.Runtime.CompilerServices.NullableContext(2)&gt;]</AttributeName>
38-
</Attribute>
3935
</Attributes>
4036
<Docs>
4137
<summary>To be added.</summary>

‎xml/Microsoft.Extensions.AmbientMetadata/ApplicationMetadata.xml‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,6 @@
2626
<AttributeName Language="C#">[System.Runtime.CompilerServices.Nullable(0)]</AttributeName>
2727
<AttributeName Language="F#">[&lt;System.Runtime.CompilerServices.Nullable(0)&gt;]</AttributeName>
2828
</Attribute>
29-
<Attribute FrameworkAlternate="net-8.0;net-9.0">
30-
<AttributeName Language="C#">[System.Runtime.CompilerServices.NullableContext(1)]</AttributeName>
31-
<AttributeName Language="F#">[&lt;System.Runtime.CompilerServices.NullableContext(1)&gt;]</AttributeName>
32-
</Attribute>
3329
</Attributes>
3430
<Docs>
3531
<summary>
@@ -104,14 +100,6 @@
104100
<AttributeName Language="C#">[System.Runtime.CompilerServices.Nullable(2)]</AttributeName>
105101
<AttributeName Language="F#">[&lt;System.Runtime.CompilerServices.Nullable(2)&gt;]</AttributeName>
106102
</Attribute>
107-
<Attribute FrameworkAlternate="net-8.0;net-9.0">
108-
<AttributeName Language="C#">[get: System.Runtime.CompilerServices.NullableContext(2)]</AttributeName>
109-
<AttributeName Language="F#">[&lt;get: System.Runtime.CompilerServices.NullableContext(2)&gt;]</AttributeName>
110-
</Attribute>
111-
<Attribute FrameworkAlternate="net-8.0;net-9.0">
112-
<AttributeName Language="C#">[set: System.Runtime.CompilerServices.NullableContext(2)]</AttributeName>
113-
<AttributeName Language="F#">[&lt;set: System.Runtime.CompilerServices.NullableContext(2)&gt;]</AttributeName>
114-
</Attribute>
115103
</Attributes>
116104
<ReturnValue>
117105
<ReturnType>System.String</ReturnType>
@@ -142,14 +130,6 @@
142130
<AttributeName Language="C#">[System.Runtime.CompilerServices.Nullable(2)]</AttributeName>
143131
<AttributeName Language="F#">[&lt;System.Runtime.CompilerServices.Nullable(2)&gt;]</AttributeName>
144132
</Attribute>
145-
<Attribute FrameworkAlternate="net-8.0;net-9.0">
146-
<AttributeName Language="C#">[get: System.Runtime.CompilerServices.NullableContext(2)]</AttributeName>
147-
<AttributeName Language="F#">[&lt;get: System.Runtime.CompilerServices.NullableContext(2)&gt;]</AttributeName>
148-
</Attribute>
149-
<Attribute FrameworkAlternate="net-8.0;net-9.0">
150-
<AttributeName Language="C#">[set: System.Runtime.CompilerServices.NullableContext(2)]</AttributeName>
151-
<AttributeName Language="F#">[&lt;set: System.Runtime.CompilerServices.NullableContext(2)&gt;]</AttributeName>
152-
</Attribute>
153133
</Attributes>
154134
<ReturnValue>
155135
<ReturnType>System.String</ReturnType>

‎xml/Microsoft.Extensions.AsyncState/AsyncStateToken.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,6 @@
8383
<AssemblyVersion>8.10.0.0</AssemblyVersion>
8484
<AssemblyVersion>9.0.0.0</AssemblyVersion>
8585
</AssemblyInfo>
86-
<Attributes>
87-
<Attribute FrameworkAlternate="net-8.0;net-9.0">
88-
<AttributeName Language="C#">[System.Runtime.CompilerServices.NullableContext(2)]</AttributeName>
89-
<AttributeName Language="F#">[&lt;System.Runtime.CompilerServices.NullableContext(2)&gt;]</AttributeName>
90-
</Attribute>
91-
</Attributes>
9286
<ReturnValue>
9387
<ReturnType>System.Boolean</ReturnType>
9488
</ReturnValue>

‎xml/Microsoft.Extensions.AsyncState/IAsyncContext`1.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,6 @@
2828
</TypeParameter>
2929
</TypeParameters>
3030
<Interfaces />
31-
<Attributes>
32-
<Attribute FrameworkAlternate="net-8.0;net-9.0">
33-
<AttributeName Language="C#">[System.Runtime.CompilerServices.NullableContext(2)]</AttributeName>
34-
<AttributeName Language="F#">[&lt;System.Runtime.CompilerServices.NullableContext(2)&gt;]</AttributeName>
35-
</Attribute>
36-
</Attributes>
3731
<Docs>
3832
<typeparam name="T">The type of the asynchronous state.</typeparam>
3933
<summary>

‎xml/Microsoft.Extensions.AsyncState/IAsyncLocalContext`1.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,6 @@
3434
<AttributeName Language="C#">[System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]</AttributeName>
3535
<AttributeName Language="F#">[&lt;System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)&gt;]</AttributeName>
3636
</Attribute>
37-
<Attribute FrameworkAlternate="net-8.0;net-9.0">
38-
<AttributeName Language="C#">[System.Runtime.CompilerServices.NullableContext(1)]</AttributeName>
39-
<AttributeName Language="F#">[&lt;System.Runtime.CompilerServices.NullableContext(1)&gt;]</AttributeName>
40-
</Attribute>
4137
</Attributes>
4238
<Docs>
4339
<typeparam name="T">The type of the asynchronous state.</typeparam>

0 commit comments

Comments
 (0)