Skip to content

Commit 6d5b52b

Browse files
dotnet-policy-service[bot]dotnet-policy-service[bot]
authored
Merge pull request #11330 from dotnet/main
Merge main into live
2 parents 83e6954 + e283e30 commit 6d5b52b

File tree

532 files changed

+453836
-65368
lines changed

Some content is hidden

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

532 files changed

+453836
-65368
lines changed

‎xml/FrameworksIndex/net-10.0-pp.xml

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

‎xml/FrameworksIndex/net-8.0-pp.xml

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

‎xml/FrameworksIndex/net-9.0-pp.xml

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

‎xml/Microsoft.Extensions.AI/OllamaChatClient.xml

Lines changed: 5 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,6 @@
2424
<InterfaceName>System.IDisposable</InterfaceName>
2525
</Interface>
2626
</Interfaces>
27-
<Attributes>
28-
<Attribute FrameworkAlternate="net-10.0-pp;net-8.0-pp;net-9.0-pp">
29-
<AttributeName Language="C#">[System.Runtime.CompilerServices.Nullable(0)]</AttributeName>
30-
<AttributeName Language="F#">[&lt;System.Runtime.CompilerServices.Nullable(0)&gt;]</AttributeName>
31-
</Attribute>
32-
</Attributes>
3327
<Docs>
3428
<summary>Represents an <see cref="T:Microsoft.Extensions.AI.IChatClient" /> for Ollama.</summary>
3529
<remarks>To be added.</remarks>
@@ -47,14 +41,7 @@
4741
<AssemblyVersion>9.5.0.0</AssemblyVersion>
4842
</AssemblyInfo>
4943
<Parameters>
50-
<Parameter Name="endpoint" Type="System.String">
51-
<Attributes>
52-
<Attribute FrameworkAlternate="net-10.0-pp;net-8.0-pp;net-9.0-pp">
53-
<AttributeName Language="C#">[System.Runtime.CompilerServices.Nullable(1)]</AttributeName>
54-
<AttributeName Language="F#">[&lt;System.Runtime.CompilerServices.Nullable(1)&gt;]</AttributeName>
55-
</Attribute>
56-
</Attributes>
57-
</Parameter>
44+
<Parameter Name="endpoint" Type="System.String" />
5845
<Parameter Name="modelId" Type="System.String" />
5946
<Parameter Name="httpClient" Type="System.Net.Http.HttpClient" />
6047
</Parameters>
@@ -81,14 +68,7 @@
8168
<AssemblyVersion>9.5.0.0</AssemblyVersion>
8269
</AssemblyInfo>
8370
<Parameters>
84-
<Parameter Name="endpoint" Type="System.Uri">
85-
<Attributes>
86-
<Attribute FrameworkAlternate="net-10.0-pp;net-8.0-pp;net-9.0-pp">
87-
<AttributeName Language="C#">[System.Runtime.CompilerServices.Nullable(1)]</AttributeName>
88-
<AttributeName Language="F#">[&lt;System.Runtime.CompilerServices.Nullable(1)&gt;]</AttributeName>
89-
</Attribute>
90-
</Attributes>
91-
</Parameter>
71+
<Parameter Name="endpoint" Type="System.Uri" />
9272
<Parameter Name="modelId" Type="System.String" />
9373
<Parameter Name="httpClient" Type="System.Net.Http.HttpClient" />
9474
</Parameters>
@@ -151,14 +131,7 @@
151131
</ReturnValue>
152132
<Parameters>
153133
<Parameter Name="messages" Type="System.Collections.Generic.IEnumerable&lt;Microsoft.Extensions.AI.ChatMessage&gt;" />
154-
<Parameter Name="options" Type="Microsoft.Extensions.AI.ChatOptions">
155-
<Attributes>
156-
<Attribute FrameworkAlternate="net-10.0-pp;net-8.0-pp;net-9.0-pp">
157-
<AttributeName Language="C#">[System.Runtime.CompilerServices.Nullable(2)]</AttributeName>
158-
<AttributeName Language="F#">[&lt;System.Runtime.CompilerServices.Nullable(2)&gt;]</AttributeName>
159-
</Attribute>
160-
</Attributes>
161-
</Parameter>
134+
<Parameter Name="options" Type="Microsoft.Extensions.AI.ChatOptions" />
162135
<Parameter Name="cancellationToken" Type="System.Threading.CancellationToken" />
163136
</Parameters>
164137
<Docs>
@@ -196,14 +169,7 @@
196169
</ReturnValue>
197170
<Parameters>
198171
<Parameter Name="messages" Type="System.Collections.Generic.IEnumerable&lt;Microsoft.Extensions.AI.ChatMessage&gt;" />
199-
<Parameter Name="options" Type="Microsoft.Extensions.AI.ChatOptions">
200-
<Attributes>
201-
<Attribute FrameworkAlternate="net-10.0-pp;net-8.0-pp;net-9.0-pp">
202-
<AttributeName Language="C#">[System.Runtime.CompilerServices.Nullable(2)]</AttributeName>
203-
<AttributeName Language="F#">[&lt;System.Runtime.CompilerServices.Nullable(2)&gt;]</AttributeName>
204-
</Attribute>
205-
</Attributes>
206-
</Parameter>
172+
<Parameter Name="options" Type="Microsoft.Extensions.AI.ChatOptions" />
207173
<Parameter Name="cancellationToken" Type="System.Threading.CancellationToken">
208174
<Attributes>
209175
<Attribute>
@@ -242,14 +208,7 @@
242208
<ReturnType>System.Object</ReturnType>
243209
</ReturnValue>
244210
<Parameters>
245-
<Parameter Name="serviceType" Type="System.Type">
246-
<Attributes>
247-
<Attribute FrameworkAlternate="net-10.0-pp;net-8.0-pp;net-9.0-pp">
248-
<AttributeName Language="C#">[System.Runtime.CompilerServices.Nullable(1)]</AttributeName>
249-
<AttributeName Language="F#">[&lt;System.Runtime.CompilerServices.Nullable(1)&gt;]</AttributeName>
250-
</Attribute>
251-
</Attributes>
252-
</Parameter>
211+
<Parameter Name="serviceType" Type="System.Type" />
253212
<Parameter Name="serviceKey" Type="System.Object" />
254213
</Parameters>
255214
<Docs>

‎xml/Microsoft.Extensions.AI/OllamaEmbeddingGenerator.xml

Lines changed: 4 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,6 @@
2727
<InterfaceName>System.IDisposable</InterfaceName>
2828
</Interface>
2929
</Interfaces>
30-
<Attributes>
31-
<Attribute FrameworkAlternate="net-10.0-pp;net-8.0-pp;net-9.0-pp">
32-
<AttributeName Language="C#">[System.Runtime.CompilerServices.Nullable(0)]</AttributeName>
33-
<AttributeName Language="F#">[&lt;System.Runtime.CompilerServices.Nullable(0)&gt;]</AttributeName>
34-
</Attribute>
35-
</Attributes>
3630
<Docs>
3731
<summary>Represents an <see cref="T:Microsoft.Extensions.AI.IEmbeddingGenerator`2" /> for Ollama.</summary>
3832
<remarks>To be added.</remarks>
@@ -50,14 +44,7 @@
5044
<AssemblyVersion>9.5.0.0</AssemblyVersion>
5145
</AssemblyInfo>
5246
<Parameters>
53-
<Parameter Name="endpoint" Type="System.String">
54-
<Attributes>
55-
<Attribute FrameworkAlternate="net-10.0-pp;net-8.0-pp;net-9.0-pp">
56-
<AttributeName Language="C#">[System.Runtime.CompilerServices.Nullable(1)]</AttributeName>
57-
<AttributeName Language="F#">[&lt;System.Runtime.CompilerServices.Nullable(1)&gt;]</AttributeName>
58-
</Attribute>
59-
</Attributes>
60-
</Parameter>
47+
<Parameter Name="endpoint" Type="System.String" />
6148
<Parameter Name="modelId" Type="System.String" />
6249
<Parameter Name="httpClient" Type="System.Net.Http.HttpClient" />
6350
</Parameters>
@@ -84,14 +71,7 @@
8471
<AssemblyVersion>9.5.0.0</AssemblyVersion>
8572
</AssemblyInfo>
8673
<Parameters>
87-
<Parameter Name="endpoint" Type="System.Uri">
88-
<Attributes>
89-
<Attribute FrameworkAlternate="net-10.0-pp;net-8.0-pp;net-9.0-pp">
90-
<AttributeName Language="C#">[System.Runtime.CompilerServices.Nullable(1)]</AttributeName>
91-
<AttributeName Language="F#">[&lt;System.Runtime.CompilerServices.Nullable(1)&gt;]</AttributeName>
92-
</Attribute>
93-
</Attributes>
94-
</Parameter>
74+
<Parameter Name="endpoint" Type="System.Uri" />
9575
<Parameter Name="modelId" Type="System.String" />
9676
<Parameter Name="httpClient" Type="System.Net.Http.HttpClient" />
9777
</Parameters>
@@ -154,14 +134,7 @@
154134
</ReturnValue>
155135
<Parameters>
156136
<Parameter Name="values" Type="System.Collections.Generic.IEnumerable&lt;System.String&gt;" />
157-
<Parameter Name="options" Type="Microsoft.Extensions.AI.EmbeddingGenerationOptions">
158-
<Attributes>
159-
<Attribute FrameworkAlternate="net-10.0-pp;net-8.0-pp;net-9.0-pp">
160-
<AttributeName Language="C#">[System.Runtime.CompilerServices.Nullable(2)]</AttributeName>
161-
<AttributeName Language="F#">[&lt;System.Runtime.CompilerServices.Nullable(2)&gt;]</AttributeName>
162-
</Attribute>
163-
</Attributes>
164-
</Parameter>
137+
<Parameter Name="options" Type="Microsoft.Extensions.AI.EmbeddingGenerationOptions" />
165138
<Parameter Name="cancellationToken" Type="System.Threading.CancellationToken" />
166139
</Parameters>
167140
<Docs>
@@ -193,14 +166,7 @@
193166
<ReturnType>System.Object</ReturnType>
194167
</ReturnValue>
195168
<Parameters>
196-
<Parameter Name="serviceType" Type="System.Type">
197-
<Attributes>
198-
<Attribute FrameworkAlternate="net-10.0-pp;net-8.0-pp;net-9.0-pp">
199-
<AttributeName Language="C#">[System.Runtime.CompilerServices.Nullable(1)]</AttributeName>
200-
<AttributeName Language="F#">[&lt;System.Runtime.CompilerServices.Nullable(1)&gt;]</AttributeName>
201-
</Attribute>
202-
</Attributes>
203-
</Parameter>
169+
<Parameter Name="serviceType" Type="System.Type" />
204170
<Parameter Name="serviceKey" Type="System.Object" />
205171
</Parameters>
206172
<Docs>

‎xml/Microsoft.Extensions.VectorData.ConnectorSupport.Filter/FilterTranslationPreprocessor.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,6 @@
1313
<BaseTypeName>System.Linq.Expressions.ExpressionVisitor</BaseTypeName>
1414
</Base>
1515
<Interfaces />
16-
<Attributes>
17-
<Attribute FrameworkAlternate="net-10.0-pp;net-8.0-pp;net-9.0-pp">
18-
<AttributeName Language="C#">[System.Diagnostics.CodeAnalysis.Experimental("MEVD9001")]</AttributeName>
19-
<AttributeName Language="F#">[&lt;System.Diagnostics.CodeAnalysis.Experimental("MEVD9001")&gt;]</AttributeName>
20-
</Attribute>
21-
</Attributes>
2216
<Docs>
2317
<summary>
2418
A processor for user-provided filter expressions which performs various common transformations before actual translation takes place.

‎xml/Microsoft.Extensions.VectorData.ConnectorSupport.Filter/QueryParameterExpression.xml

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,6 @@
1313
<BaseTypeName>System.Linq.Expressions.Expression</BaseTypeName>
1414
</Base>
1515
<Interfaces />
16-
<Attributes>
17-
<Attribute FrameworkAlternate="net-10.0-pp;net-8.0-pp;net-9.0-pp">
18-
<AttributeName Language="C#">[System.Diagnostics.CodeAnalysis.Experimental("MEVD9001")]</AttributeName>
19-
<AttributeName Language="F#">[&lt;System.Diagnostics.CodeAnalysis.Experimental("MEVD9001")&gt;]</AttributeName>
20-
</Attribute>
21-
<Attribute FrameworkAlternate="net-10.0-pp;net-8.0-pp;net-9.0-pp">
22-
<AttributeName Language="C#">[System.Runtime.CompilerServices.Nullable(0)]</AttributeName>
23-
<AttributeName Language="F#">[&lt;System.Runtime.CompilerServices.Nullable(0)&gt;]</AttributeName>
24-
</Attribute>
25-
</Attributes>
2616
<Docs>
2717
<summary>
2818
An expression representation a query parameter (captured variable) in the filter expression.
@@ -44,14 +34,7 @@
4434
</AssemblyInfo>
4535
<Parameters>
4636
<Parameter Name="name" Type="System.String" />
47-
<Parameter Name="value" Type="System.Object">
48-
<Attributes>
49-
<Attribute FrameworkAlternate="net-10.0-pp;net-8.0-pp;net-9.0-pp">
50-
<AttributeName Language="C#">[System.Runtime.CompilerServices.Nullable(2)]</AttributeName>
51-
<AttributeName Language="F#">[&lt;System.Runtime.CompilerServices.Nullable(2)&gt;]</AttributeName>
52-
</Attribute>
53-
</Attributes>
54-
</Parameter>
37+
<Parameter Name="value" Type="System.Object" />
5538
<Parameter Name="type" Type="System.Type" />
5639
</Parameters>
5740
<Docs>
@@ -143,12 +126,6 @@
143126
<AssemblyName>Microsoft.Extensions.VectorData.Abstractions</AssemblyName>
144127
<AssemblyVersion>9.0.0.0</AssemblyVersion>
145128
</AssemblyInfo>
146-
<Attributes>
147-
<Attribute FrameworkAlternate="net-10.0-pp;net-8.0-pp;net-9.0-pp">
148-
<AttributeName Language="C#">[System.Runtime.CompilerServices.Nullable(2)]</AttributeName>
149-
<AttributeName Language="F#">[&lt;System.Runtime.CompilerServices.Nullable(2)&gt;]</AttributeName>
150-
</Attribute>
151-
</Attributes>
152129
<ReturnValue>
153130
<ReturnType>System.Object</ReturnType>
154131
</ReturnValue>

‎xml/Microsoft.Extensions.VectorData.ConnectorSupport/VectorStoreRecordDataPropertyModel.xml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,6 @@
1313
<BaseTypeName>Microsoft.Extensions.VectorData.ConnectorSupport.VectorStoreRecordPropertyModel</BaseTypeName>
1414
</Base>
1515
<Interfaces />
16-
<Attributes>
17-
<Attribute FrameworkAlternate="net-10.0-pp;net-8.0-pp;net-9.0-pp">
18-
<AttributeName Language="C#">[System.Diagnostics.CodeAnalysis.Experimental("MEVD9001")]</AttributeName>
19-
<AttributeName Language="F#">[&lt;System.Diagnostics.CodeAnalysis.Experimental("MEVD9001")&gt;]</AttributeName>
20-
</Attribute>
21-
<Attribute FrameworkAlternate="net-10.0-pp;net-8.0-pp;net-9.0-pp">
22-
<AttributeName Language="C#">[System.Runtime.CompilerServices.Nullable(0)]</AttributeName>
23-
<AttributeName Language="F#">[&lt;System.Runtime.CompilerServices.Nullable(0)&gt;]</AttributeName>
24-
</Attribute>
25-
</Attributes>
2616
<Docs>
2717
<summary>
2818
Represents a data property on a vector store record.

‎xml/Microsoft.Extensions.VectorData.ConnectorSupport/VectorStoreRecordJsonModelBuilder.xml

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,6 @@
1313
<BaseTypeName>Microsoft.Extensions.VectorData.ConnectorSupport.VectorStoreRecordModelBuilder</BaseTypeName>
1414
</Base>
1515
<Interfaces />
16-
<Attributes>
17-
<Attribute FrameworkAlternate="net-10.0-pp;net-8.0-pp;net-9.0-pp">
18-
<AttributeName Language="C#">[System.Diagnostics.CodeAnalysis.Experimental("MEVD9001")]</AttributeName>
19-
<AttributeName Language="F#">[&lt;System.Diagnostics.CodeAnalysis.Experimental("MEVD9001")&gt;]</AttributeName>
20-
</Attribute>
21-
<Attribute FrameworkAlternate="net-10.0-pp;net-8.0-pp;net-9.0-pp">
22-
<AttributeName Language="C#">[System.Runtime.CompilerServices.Nullable(0)]</AttributeName>
23-
<AttributeName Language="F#">[&lt;System.Runtime.CompilerServices.Nullable(0)&gt;]</AttributeName>
24-
</Attribute>
25-
</Attributes>
2616
<Docs>
2717
<summary>
2818
A model builder that performs logic specific to connectors which use System.Text.Json for serialization.
@@ -68,22 +58,9 @@
6858
</AssemblyInfo>
6959
<ReturnValue>
7060
<ReturnType>Microsoft.Extensions.VectorData.ConnectorSupport.VectorStoreRecordModel</ReturnType>
71-
<Attributes>
72-
<Attribute FrameworkAlternate="net-10.0-pp">
73-
<AttributeName Language="C#">[System.Runtime.CompilerServices.Nullable(1)]</AttributeName>
74-
<AttributeName Language="F#">[&lt;System.Runtime.CompilerServices.Nullable(1)&gt;]</AttributeName>
75-
</Attribute>
76-
</Attributes>
7761
</ReturnValue>
7862
<Parameters>
79-
<Parameter Name="type" Type="System.Type">
80-
<Attributes>
81-
<Attribute FrameworkAlternate="net-10.0-pp;net-8.0-pp;net-9.0-pp">
82-
<AttributeName Language="C#">[System.Runtime.CompilerServices.Nullable(1)]</AttributeName>
83-
<AttributeName Language="F#">[&lt;System.Runtime.CompilerServices.Nullable(1)&gt;]</AttributeName>
84-
</Attribute>
85-
</Attributes>
86-
</Parameter>
63+
<Parameter Name="type" Type="System.Type" />
8764
<Parameter Name="vectorStoreRecordDefinition" Type="Microsoft.Extensions.VectorData.VectorStoreRecordDefinition" />
8865
<Parameter Name="defaultEmbeddingGenerator" Type="Microsoft.Extensions.AI.IEmbeddingGenerator" />
8966
<Parameter Name="jsonSerializerOptions" Type="System.Text.Json.JsonSerializerOptions" />

‎xml/Microsoft.Extensions.VectorData.ConnectorSupport/VectorStoreRecordKeyPropertyModel.xml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,6 @@
1313
<BaseTypeName>Microsoft.Extensions.VectorData.ConnectorSupport.VectorStoreRecordPropertyModel</BaseTypeName>
1414
</Base>
1515
<Interfaces />
16-
<Attributes>
17-
<Attribute FrameworkAlternate="net-10.0-pp;net-8.0-pp;net-9.0-pp">
18-
<AttributeName Language="C#">[System.Diagnostics.CodeAnalysis.Experimental("MEVD9001")]</AttributeName>
19-
<AttributeName Language="F#">[&lt;System.Diagnostics.CodeAnalysis.Experimental("MEVD9001")&gt;]</AttributeName>
20-
</Attribute>
21-
<Attribute FrameworkAlternate="net-10.0-pp;net-8.0-pp;net-9.0-pp">
22-
<AttributeName Language="C#">[System.Runtime.CompilerServices.Nullable(0)]</AttributeName>
23-
<AttributeName Language="F#">[&lt;System.Runtime.CompilerServices.Nullable(0)&gt;]</AttributeName>
24-
</Attribute>
25-
</Attributes>
2616
<Docs>
2717
<summary>
2818
Represents a key property on a vector store record.

0 commit comments

Comments
 (0)