Skip to content

Commit 3413664

Browse files
dotnet-policy-service[bot]dotnet-policy-service[bot]
authored
Merge pull request #11261 from dotnet/main
Merge main into live
2 parents 457c132 + 23fe6b4 commit 3413664

File tree

166 files changed

+13234
-13306
lines changed

Some content is hidden

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

166 files changed

+13234
-13306
lines changed

‎_zip/missingapi.yml

+8
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ references:
3535
name: AssistantClient
3636
fullname: OpenAI.Assistants.AssistantClient
3737
href: https://github.com/openai/openai-dotnet/blob/main/api/OpenAI.netstandard2.0.cs
38+
- uid: OpenAI.Audio.AudioClient
39+
name: AudioClient
40+
fullname: OpenAI.Audio.AudioClient
41+
href: https://github.com/openai/openai-dotnet/blob/main/api/OpenAI.netstandard2.0.cs
3842
- uid: OpenAI.Chat.ChatClient
3943
name: ChatClient
4044
fullname: OpenAI.Chat.ChatClient
@@ -63,6 +67,10 @@ references:
6367
name: RealtimeConversationSession
6468
fullname: OpenAI.RealtimeConversation.RealtimeConversationSession
6569
href: https://github.com/openai/openai-dotnet/blob/main/api/OpenAI.netstandard2.0.cs
70+
- uid: OpenAI.Responses.OpenAIResponseClient
71+
name: OpenAIResponseClient
72+
fullname: OpenAI.Responses.OpenAIResponseClient
73+
href: https://github.com/openai/openai-dotnet/blob/main/api/OpenAI.netstandard2.0.cs
6674
- uid: Polly.CircuitBreaker.CircuitBreakerStrategyOptions`1
6775
name: CircuitBreakerStrategyOptions`1
6876
fullname: Polly.CircuitBreaker.CircuitBreakerStrategyOptions`1

‎xml/System.Security.Cryptography/Rfc2898DeriveBytes.xml

+6-10
Original file line numberDiff line numberDiff line change
@@ -1039,7 +1039,7 @@ For more information about PBKDF2, see [RFC 2898](https://www.rfc-editor.org/inf
10391039
<param name="salt">The key salt used to derive the key.</param>
10401040
<param name="iterations">The number of iterations for the operation.</param>
10411041
<param name="hashAlgorithm">The hash algorithm to use to derive the key.</param>
1042-
<param name="outputLength">The size of key to derive.</param>
1042+
<param name="outputLength">The size of the key to derive, in bytes.</param>
10431043
<summary>Creates a PBKDF2 derived key from password bytes.</summary>
10441044
<returns>A byte array containing the created PBKDF2 derived key.</returns>
10451045
<remarks>To be added.</remarks>
@@ -1100,7 +1100,7 @@ For more information about PBKDF2, see [RFC 2898](https://www.rfc-editor.org/inf
11001100
<param name="salt">The key salt used to derive the key.</param>
11011101
<param name="iterations">The number of iterations for the operation.</param>
11021102
<param name="hashAlgorithm">The hash algorithm to use to derive the key.</param>
1103-
<param name="outputLength">The size of key to derive.</param>
1103+
<param name="outputLength">The size of the key to derive, in bytes.</param>
11041104
<summary>Creates a PBKDF2 derived key from password bytes.</summary>
11051105
<returns>A byte array containing the created PBKDF2 derived key.</returns>
11061106
<remarks>To be added.</remarks>
@@ -1207,17 +1207,15 @@ For more information about PBKDF2, see [RFC 2898](https://www.rfc-editor.org/inf
12071207
<param name="salt">The key salt used to derive the key.</param>
12081208
<param name="iterations">The number of iterations for the operation.</param>
12091209
<param name="hashAlgorithm">The hash algorithm to use to derive the key.</param>
1210-
<param name="outputLength">The size of key to derive.</param>
1210+
<param name="outputLength">The size of the key to derive, in bytes.</param>
12111211
<summary>Creates a PBKDF2 derived key from a password.</summary>
12121212
<returns>A byte array of length <paramref name="outputLength" /> that is filled with pseudo-random key bytes.</returns>
12131213
<remarks>
12141214
<format type="text/markdown"><![CDATA[
12151215
12161216
## Remarks
12171217
1218-
The `password` will be converted to bytes using the UTF8 encoding. For
1219-
other encodings, convert the password string to bytes using the appropriate <xref:System.Text.Encoding>
1220-
and use <xref:System.Security.Cryptography.Rfc2898DeriveBytes.Pbkdf2(System.ReadOnlySpan{System.Byte},System.ReadOnlySpan{System.Byte},System.Int32,System.Security.Cryptography.HashAlgorithmName,System.Int32)>.
1218+
The `password` is converted to bytes using the UTF8 encoding. For other encodings, convert the password string to bytes using the appropriate <xref:System.Text.Encoding> and use <xref:System.Security.Cryptography.Rfc2898DeriveBytes.Pbkdf2(System.ReadOnlySpan{System.Byte},System.ReadOnlySpan{System.Byte},System.Int32,System.Security.Cryptography.HashAlgorithmName,System.Int32)>.
12211219
12221220
]]></format>
12231221
</remarks>
@@ -1332,17 +1330,15 @@ The `password` will be converted to bytes using the UTF8 encoding. For
13321330
<param name="salt">The key salt used to derive the key.</param>
13331331
<param name="iterations">The number of iterations for the operation.</param>
13341332
<param name="hashAlgorithm">The hash algorithm to use to derive the key.</param>
1335-
<param name="outputLength">The size of key to derive.</param>
1333+
<param name="outputLength">The size of the key to derive, in bytes.</param>
13361334
<summary>Creates a PBKDF2 derived key from a password.</summary>
13371335
<returns>A byte array of length <paramref name="outputLength" /> that is filled with pseudo-random key bytes.</returns>
13381336
<remarks>
13391337
<format type="text/markdown"><![CDATA[
13401338
13411339
## Remarks
13421340
1343-
The `password` will be converted to bytes using the UTF8 encoding. For
1344-
other encodings, convert the password string to bytes using the appropriate <xref:System.Text.Encoding>
1345-
and use <xref:System.Security.Cryptography.Rfc2898DeriveBytes.Pbkdf2(System.Byte[],System.Byte[],System.Int32,System.Security.Cryptography.HashAlgorithmName,System.Int32)>.
1341+
The `password` is converted to bytes using the UTF8 encoding. For other encodings, convert the password string to bytes using the appropriate <xref:System.Text.Encoding> and use <xref:System.Security.Cryptography.Rfc2898DeriveBytes.Pbkdf2(System.Byte[],System.Byte[],System.Int32,System.Security.Cryptography.HashAlgorithmName,System.Int32)>.
13461342
13471343
]]></format>
13481344
</remarks>

‎xml/System.Windows.Controls.Primitives/BulletDecorator.xml

+1-3
Original file line numberDiff line numberDiff line change
@@ -238,16 +238,14 @@
238238
<a name="xamlPropertyElementUsage_Bullet"></a>
239239
## XAML Property Element Usage
240240
241-
```
241+
```xaml
242242
<object>
243243
<object.Bullet>
244244
<UIElement .../>
245245
</object.Bullet>
246246
</object>
247247
```
248248
249-
250-
251249
## Examples
252250
The following examples show how to set the <xref:System.Windows.Controls.Primitives.BulletDecorator.Bullet%2A> property.
253251

‎xml/System.Windows.Controls.Primitives/ButtonBase.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -313,8 +313,8 @@
313313
<a name="xamlAttributeUsage_Command"></a>
314314
## XAML Attribute Usage
315315
316-
```
317-
<object Command="commandName"/>
316+
```xaml
317+
<object Command="commandName"/>
318318
```
319319
320320
<a name="xamlValues_Command"></a>
@@ -382,8 +382,8 @@
382382
<a name="xamlAttributeUsage_CommandParameter"></a>
383383
## XAML Attribute Usage
384384
385-
```
386-
<object CommandParameter="commandParameter" />
385+
```xaml
386+
<object CommandParameter="commandParameter" />
387387
```
388388
389389
<a name="xamlValues_CommandParameter"></a>
@@ -502,8 +502,8 @@
502502
<a name="xamlAttributeUsage_Target"></a>
503503
## XAML Attribute Usage
504504
505-
```
506-
<ButtonBase CommandTarget="{Binding ElementName= elementName }"/>
505+
```xaml
506+
<ButtonBase CommandTarget="{Binding ElementName= elementName }"/>
507507
```
508508
509509
<a name="xamlValues_CommandTarget"></a>

‎xml/System.Windows.Controls.Primitives/GridViewRowPresenterBase.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@
9595
<a name="xamlAttributeUsage_Columns"></a>
9696
## XAML Attribute Usage
9797
98-
```
99-
<object Columns="{ResourceExtension ColumnsKey}"/>
98+
```xaml
99+
<object Columns="{ResourceExtension ColumnsKey}"/>
100100
```
101101
102102
<a name="xamlValues_Columns"></a>

‎xml/System.Windows.Controls.Primitives/Popup.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -669,10 +669,10 @@
669669
<a name="xamlAttributeUsage_HorizontalOffset"></a>
670670
## XAML Attribute Usage
671671
672-
```
673-
<object HorizontalOffset="double"/>
672+
```xaml
673+
<object HorizontalOffset="double"/>
674674
- or -
675-
<object HorizontalOffset="qualifiedDouble"/>
675+
<object HorizontalOffset="qualifiedDouble"/>
676676
```
677677
678678
<a name="xamlValues_HorizontallOffset"></a>
@@ -1743,10 +1743,10 @@
17431743
<a name="xamlAttributeUsage_VerticalOffset"></a>
17441744
## XAML Attribute Usage
17451745
1746-
```
1747-
<object VerticalOffset="double"/>
1746+
```xaml
1747+
<object VerticalOffset="double"/>
17481748
- or -
1749-
<object VerticalOffset="qualifiedDouble"/>
1749+
<object VerticalOffset="qualifiedDouble"/>
17501750
```
17511751
17521752
<a name="xamlValues_VerticalOffset"></a>

‎xml/System.Windows.Controls.Primitives/RangeBase.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -685,8 +685,8 @@
685685
<a name="xamlAttributeUsage_ValueChanged"></a>
686686
## XAML Attribute Usage
687687
688-
```
689-
<object ValueChanged="RoutedPropertyChangedEventHandler"/>
688+
```xaml
689+
<object ValueChanged="RoutedPropertyChangedEventHandler"/>
690690
```
691691
692692
]]></format>

‎xml/System.Windows.Controls.Primitives/StatusBar.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -332,8 +332,8 @@
332332
<a name="xamlAttributeUsage_SeparatorStyleKey"></a>
333333
## XAML Attribute Usage
334334
335-
```
336-
<object x:Key="{x:Static StatusBar.SeparatorStyleKey}"/>
335+
```xaml
336+
<object x:Key="{x:Static StatusBar.SeparatorStyleKey}"/>
337337
```
338338
339339
]]></format>

‎xml/System.Windows.Controls.Ribbon/Ribbon.xml

+16-18
Original file line numberDiff line numberDiff line change
@@ -178,19 +178,18 @@
178178
```xaml
179179
xmlns:ribbon="clr-namespace:System.Windows.Controls.Ribbon;assembly=RibbonControlsLibrary"
180180
...
181-
<ribbon:Ribbon >
182-
    <ribbon:Ribbon.ApplicationMenu>
183-
        <ribbon:RibbonApplicationMenu SmallImageSource="Images\SmallIcon.png">
184-
            <ribbon:RibbonApplicationMenuItem Header="Hello _Ribbon"
185-
                                              x:Name="MenuItem1"
186-
                                              ImageSource="Images\LargeIcon.png"/>
187-
        </ribbon:RibbonApplicationMenu>
188-
    </ribbon:Ribbon.ApplicationMenu>
189-
    <ribbon:RibbonTab>
181+
<ribbon:Ribbon>
182+
<ribbon:Ribbon.ApplicationMenu>
183+
<ribbon:RibbonApplicationMenu SmallImageSource="Images\SmallIcon.png">
184+
<ribbon:RibbonApplicationMenuItem Header="Hello _Ribbon"
185+
x:Name="MenuItem1"
186+
ImageSource="Images\LargeIcon.png"/>
187+
</ribbon:RibbonApplicationMenu>
188+
</ribbon:Ribbon.ApplicationMenu>
189+
<ribbon:RibbonTab>
190190
<!-- Ribbon content goes here. -->
191-
    </ribbon:RibbonTab>
192-
</ribbon:Ribbon >
193-
191+
</ribbon:RibbonTab>
192+
</ribbon:Ribbon>
194193
```
195194
196195
]]></format>
@@ -519,14 +518,13 @@ xmlns:ribbon="clr-namespace:System.Windows.Controls.Ribbon;assembly=RibbonContro
519518
520519
```xaml
521520
</ribbon:Ribbon>
522-
    <ribbon:RibbonTab Name="Pens" Header="Pens" ContextualTabGroupHeader="Ink Tools" >
521+
<ribbon:RibbonTab Name="Pens" Header="Pens" ContextualTabGroupHeader="Ink Tools" >
523522
<!-- Ribbon Tab Content -->
524-
    </ribbon:RibbonTab>
525-
    <ribbon:Ribbon.ContextualTabGroups>
526-
        <ribbon:RibbonContextualTabGroup Header="Ink Tools" Visibility="Visible" Background="Green" />
527-
    </ribbon:Ribbon.ContextualTabGroups>
523+
</ribbon:RibbonTab>
524+
<ribbon:Ribbon.ContextualTabGroups>
525+
<ribbon:RibbonContextualTabGroup Header="Ink Tools" Visibility="Visible" Background="Green" />
526+
</ribbon:Ribbon.ContextualTabGroups>
528527
</ribbon:Ribbon>
529-
530528
```
531529
532530
]]></format>

‎xml/System.Windows.Controls.Ribbon/RibbonContextualTabGroup.xml

+5-8
Original file line numberDiff line numberDiff line change
@@ -34,21 +34,18 @@
3434
## Remarks
3535
You use a *contextual tab* to display groups of commands that are relevant only in a particular context. Contextual tab groups are shown or hidden based on specified criteria. For example, an Ink Tools tab group might be shown when tablet input is detected, or a Picture Tools tab group might be shown when an Image object is selected.
3636
37-
38-
3937
## Examples
4038
The following example shows a <xref:System.Windows.Controls.Ribbon.RibbonTab> named **Pens** that is in the **Ink Tools** contextual tab group.
4139
4240
```xaml
4341
</ribbon:Ribbon>
44-
    <ribbon:RibbonTab Name="Pens" Header="Pens" ContextualTabGroupHeader="Ink Tools" >
42+
<ribbon:RibbonTab Name="Pens" Header="Pens" ContextualTabGroupHeader="Ink Tools" >
4543
<!-- Ribbon Tab Content -->
46-
    </ribbon:RibbonTab>
47-
    <ribbon:Ribbon.ContextualTabGroups>
48-
        <ribbon:RibbonContextualTabGroup Header="Ink Tools" Visibility="Visible" Background="Green" />
49-
    </ribbon:Ribbon.ContextualTabGroups>
44+
</ribbon:RibbonTab>
45+
<ribbon:Ribbon.ContextualTabGroups>
46+
<ribbon:RibbonContextualTabGroup Header="Ink Tools" Visibility="Visible" Background="Green" />
47+
</ribbon:Ribbon.ContextualTabGroups>
5048
</ribbon:Ribbon>
51-
5249
```
5350
5451
]]></format>

‎xml/System.Windows.Controls.Ribbon/RibbonGroup.xml

+11-11
Original file line numberDiff line numberDiff line change
@@ -264,17 +264,17 @@
264264
265265
```xaml
266266
<ribbon:RibbonGroup.GroupSizeDefinitions>
267-
  <ribbon:RibbonGroupSizeDefinition>
268-
    <ribbon:RibbonControlSizeDefinition ImageSize="Large" IsLabelVisible="True" />
269-
    <ribbon:RibbonControlSizeDefinition ImageSize="Small" IsLabelVisible="True" />
270-
    <ribbon:RibbonControlSizeDefinition ImageSize="Small" IsLabelVisible="True" />
271-
  </ribbon:RibbonGroupSizeDefinition>
272-
  <ribbon:RibbonGroupSizeDefinition>
273-
    <ribbon:RibbonControlSizeDefinition ImageSize="Large" IsLabelVisible="True" />
274-
    <ribbon:RibbonControlSizeDefinition ImageSize="Small" IsLabelVisible="False" />
275-
    <ribbon:RibbonControlSizeDefinition ImageSize="Small" IsLabelVisible="False" />
276-
  </ribbon:RibbonGroupSizeDefinition>
277-
  <ribbon:RibbonGroupSizeDefinition IsCollapsed="True" />
267+
<ribbon:RibbonGroupSizeDefinition>
268+
<ribbon:RibbonControlSizeDefinition ImageSize="Large" IsLabelVisible="True" />
269+
<ribbon:RibbonControlSizeDefinition ImageSize="Small" IsLabelVisible="True" />
270+
<ribbon:RibbonControlSizeDefinition ImageSize="Small" IsLabelVisible="True" />
271+
</ribbon:RibbonGroupSizeDefinition>
272+
<ribbon:RibbonGroupSizeDefinition>
273+
<ribbon:RibbonControlSizeDefinition ImageSize="Large" IsLabelVisible="True" />
274+
<ribbon:RibbonControlSizeDefinition ImageSize="Small" IsLabelVisible="False" />
275+
<ribbon:RibbonControlSizeDefinition ImageSize="Small" IsLabelVisible="False" />
276+
</ribbon:RibbonGroupSizeDefinition>
277+
<ribbon:RibbonGroupSizeDefinition IsCollapsed="True" />
278278
</ribbon:RibbonGroup.GroupSizeDefinitions>
279279
```
280280

‎xml/System.Windows.Controls.Ribbon/RibbonGroupSizeDefinition.xml

+12-12
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,19 @@
3333
## Examples
3434
The following example shows a <xref:System.Windows.Controls.Ribbon.RibbonGroup.GroupSizeDefinitions%2A> collection that specifies three different group sizes.
3535
36-
```
36+
```xaml
3737
<ribbon:RibbonGroup.GroupSizeDefinitions>
38-
  <ribbon:RibbonGroupSizeDefinition>
39-
    <ribbon:RibbonControlSizeDefinition ImageSize="Large" IsLabelVisible="True" />
40-
    <ribbon:RibbonControlSizeDefinition ImageSize="Small" IsLabelVisible="True" />
41-
    <ribbon:RibbonControlSizeDefinition ImageSize="Small" IsLabelVisible="True" />
42-
  </ribbon:RibbonGroupSizeDefinition>
43-
  <ribbon:RibbonGroupSizeDefinition>
44-
    <ribbon:RibbonControlSizeDefinition ImageSize="Large" IsLabelVisible="True" />
45-
    <ribbon:RibbonControlSizeDefinition ImageSize="Small" IsLabelVisible="False" />
46-
    <ribbon:RibbonControlSizeDefinition ImageSize="Small" IsLabelVisible="False" />
47-
  </ribbon:RibbonGroupSizeDefinition>
48-
  <ribbon:RibbonGroupSizeDefinition IsCollapsed="True" />
38+
<ribbon:RibbonGroupSizeDefinition>
39+
<ribbon:RibbonControlSizeDefinition ImageSize="Large" IsLabelVisible="True" />
40+
<ribbon:RibbonControlSizeDefinition ImageSize="Small" IsLabelVisible="True" />
41+
<ribbon:RibbonControlSizeDefinition ImageSize="Small" IsLabelVisible="True" />
42+
</ribbon:RibbonGroupSizeDefinition>
43+
<ribbon:RibbonGroupSizeDefinition>
44+
<ribbon:RibbonControlSizeDefinition ImageSize="Large" IsLabelVisible="True" />
45+
<ribbon:RibbonControlSizeDefinition ImageSize="Small" IsLabelVisible="False" />
46+
<ribbon:RibbonControlSizeDefinition ImageSize="Small" IsLabelVisible="False" />
47+
</ribbon:RibbonGroupSizeDefinition>
48+
<ribbon:RibbonGroupSizeDefinition IsCollapsed="True" />
4949
</ribbon:RibbonGroup.GroupSizeDefinitions>
5050
```
5151

0 commit comments

Comments
 (0)