Skip to content

Commit b3cf340

Browse files
Merge pull request #12509 from dotnet/main
Merge main into live
2 parents 8e08373 + 7ea4488 commit b3cf340

2 files changed

Lines changed: 11 additions & 11 deletions

File tree

.github/policies/disallow-edits.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ configuration:
2424
pattern: xml/System.CommandLine*/*
2525
- filesMatchPattern:
2626
matchAny: true
27-
pattern: xml/System.Composition/*
27+
pattern: xml/System.Composition*/*
2828
- filesMatchPattern:
2929
matchAny: true
30-
pattern: xml/System.Diagnostics.EventLog.Messages/*
30+
pattern: xml/System.Diagnostics/FileVersionInfo.xml
3131
- filesMatchPattern:
3232
matchAny: true
3333
pattern: xml/System.Formats.Asn1/*
@@ -54,10 +54,10 @@ configuration:
5454
pattern: xml/System.Numerics.Tensors/*
5555
- filesMatchPattern:
5656
matchAny: true
57-
pattern: xml/System.Reflection/DispatchProxy.xml
57+
pattern: xml/System.Reflection.Context/*
5858
- filesMatchPattern:
5959
matchAny: true
60-
pattern: xml/System.Runtime.Serialization.Schema/*
60+
pattern: xml/System.Reflection/DispatchProxy.xml
6161
- filesMatchPattern:
6262
matchAny: true
6363
pattern: xml/System.Runtime.Serialization/ISerializationCodeDomSurrogateProvider.xml

docfx.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -168,14 +168,14 @@
168168
"api/Microsoft.Extensions**": false,
169169
"api/System.CommandLine**": false,
170170
"api/System.Composition**": false,
171-
"api/System.Diagnostics.EventLog.Messages**": false,
172-
"api/System.Formats.Asn1**": false,
173-
"api/System.Formats.Cbor**": false,
174-
"api/System.Formats.Nrbf**": false,
175-
"api/System.Net.ServerSentEvents**": false,
176-
"api/System.Numerics.Tensors**": false,
177-
"api/System.Runtime.Serialization.Schema**": false,
171+
"api/System.Formats.Asn1.**": false,
172+
"api/System.Formats.Cbor.**": false,
173+
"api/System.Formats.Nrbf.**": false,
174+
"api/System.Net.ServerSentEvents.**": false,
175+
"api/System.Numerics.Tensors.**": false,
176+
"api/System.Reflection.Context.**": false,
178177

178+
"api/System.Diagnostics.FileVersionInfo.yml": false,
179179
"api/System.Linq.AsyncEnumerable.yml": false,
180180
"api/System.Linq.IOrderedAsyncEnumerable-1.yml": false,
181181
"api/System.Net.WebProxy.yml": false,

0 commit comments

Comments
 (0)