Skip to content

Merge main into live #11261

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 1, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions _zip/missingapi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ references:
name: AssistantClient
fullname: OpenAI.Assistants.AssistantClient
href: https://github.com/openai/openai-dotnet/blob/main/api/OpenAI.netstandard2.0.cs
- uid: OpenAI.Audio.AudioClient
name: AudioClient
fullname: OpenAI.Audio.AudioClient
href: https://github.com/openai/openai-dotnet/blob/main/api/OpenAI.netstandard2.0.cs
- uid: OpenAI.Chat.ChatClient
name: ChatClient
fullname: OpenAI.Chat.ChatClient
Expand Down Expand Up @@ -63,6 +67,10 @@ references:
name: RealtimeConversationSession
fullname: OpenAI.RealtimeConversation.RealtimeConversationSession
href: https://github.com/openai/openai-dotnet/blob/main/api/OpenAI.netstandard2.0.cs
- uid: OpenAI.Responses.OpenAIResponseClient
name: OpenAIResponseClient
fullname: OpenAI.Responses.OpenAIResponseClient
href: https://github.com/openai/openai-dotnet/blob/main/api/OpenAI.netstandard2.0.cs
- uid: Polly.CircuitBreaker.CircuitBreakerStrategyOptions`1
name: CircuitBreakerStrategyOptions`1
fullname: Polly.CircuitBreaker.CircuitBreakerStrategyOptions`1
Expand Down
16 changes: 6 additions & 10 deletions xml/System.Security.Cryptography/Rfc2898DeriveBytes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1039,7 +1039,7 @@ For more information about PBKDF2, see [RFC 2898](https://www.rfc-editor.org/inf
<param name="salt">The key salt used to derive the key.</param>
<param name="iterations">The number of iterations for the operation.</param>
<param name="hashAlgorithm">The hash algorithm to use to derive the key.</param>
<param name="outputLength">The size of key to derive.</param>
<param name="outputLength">The size of the key to derive, in bytes.</param>
<summary>Creates a PBKDF2 derived key from password bytes.</summary>
<returns>A byte array containing the created PBKDF2 derived key.</returns>
<remarks>To be added.</remarks>
Expand Down Expand Up @@ -1100,7 +1100,7 @@ For more information about PBKDF2, see [RFC 2898](https://www.rfc-editor.org/inf
<param name="salt">The key salt used to derive the key.</param>
<param name="iterations">The number of iterations for the operation.</param>
<param name="hashAlgorithm">The hash algorithm to use to derive the key.</param>
<param name="outputLength">The size of key to derive.</param>
<param name="outputLength">The size of the key to derive, in bytes.</param>
<summary>Creates a PBKDF2 derived key from password bytes.</summary>
<returns>A byte array containing the created PBKDF2 derived key.</returns>
<remarks>To be added.</remarks>
Expand Down Expand Up @@ -1207,17 +1207,15 @@ For more information about PBKDF2, see [RFC 2898](https://www.rfc-editor.org/inf
<param name="salt">The key salt used to derive the key.</param>
<param name="iterations">The number of iterations for the operation.</param>
<param name="hashAlgorithm">The hash algorithm to use to derive the key.</param>
<param name="outputLength">The size of key to derive.</param>
<param name="outputLength">The size of the key to derive, in bytes.</param>
<summary>Creates a PBKDF2 derived key from a password.</summary>
<returns>A byte array of length <paramref name="outputLength" /> that is filled with pseudo-random key bytes.</returns>
<remarks>
<format type="text/markdown"><![CDATA[

## Remarks

The `password` will be 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)>.
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)>.

]]></format>
</remarks>
Expand Down Expand Up @@ -1332,17 +1330,15 @@ The `password` will be converted to bytes using the UTF8 encoding. For
<param name="salt">The key salt used to derive the key.</param>
<param name="iterations">The number of iterations for the operation.</param>
<param name="hashAlgorithm">The hash algorithm to use to derive the key.</param>
<param name="outputLength">The size of key to derive.</param>
<param name="outputLength">The size of the key to derive, in bytes.</param>
<summary>Creates a PBKDF2 derived key from a password.</summary>
<returns>A byte array of length <paramref name="outputLength" /> that is filled with pseudo-random key bytes.</returns>
<remarks>
<format type="text/markdown"><![CDATA[

## Remarks

The `password` will be 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)>.
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)>.

]]></format>
</remarks>
Expand Down
4 changes: 1 addition & 3 deletions xml/System.Windows.Controls.Primitives/BulletDecorator.xml
Original file line number Diff line number Diff line change
Expand Up @@ -238,16 +238,14 @@
<a name="xamlPropertyElementUsage_Bullet"></a>
## XAML Property Element Usage

```
```xaml
<object>
<object.Bullet>
<UIElement .../>
</object.Bullet>
</object>
```



## Examples
The following examples show how to set the <xref:System.Windows.Controls.Primitives.BulletDecorator.Bullet%2A> property.

Expand Down
12 changes: 6 additions & 6 deletions xml/System.Windows.Controls.Primitives/ButtonBase.xml
Original file line number Diff line number Diff line change
Expand Up @@ -313,8 +313,8 @@
<a name="xamlAttributeUsage_Command"></a>
## XAML Attribute Usage

```
<object Command="commandName"/>
```xaml
<object Command="commandName"/>
```

<a name="xamlValues_Command"></a>
Expand Down Expand Up @@ -382,8 +382,8 @@
<a name="xamlAttributeUsage_CommandParameter"></a>
## XAML Attribute Usage

```
<object CommandParameter="commandParameter" />
```xaml
<object CommandParameter="commandParameter" />
```

<a name="xamlValues_CommandParameter"></a>
Expand Down Expand Up @@ -502,8 +502,8 @@
<a name="xamlAttributeUsage_Target"></a>
## XAML Attribute Usage

```
<ButtonBase CommandTarget="{Binding ElementName= elementName }"/>
```xaml
<ButtonBase CommandTarget="{Binding ElementName= elementName }"/>
```

<a name="xamlValues_CommandTarget"></a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@
<a name="xamlAttributeUsage_Columns"></a>
## XAML Attribute Usage

```
<object Columns="{ResourceExtension ColumnsKey}"/>
```xaml
<object Columns="{ResourceExtension ColumnsKey}"/>
```

<a name="xamlValues_Columns"></a>
Expand Down
12 changes: 6 additions & 6 deletions xml/System.Windows.Controls.Primitives/Popup.xml
Original file line number Diff line number Diff line change
Expand Up @@ -669,10 +669,10 @@
<a name="xamlAttributeUsage_HorizontalOffset"></a>
## XAML Attribute Usage

```
<object HorizontalOffset="double"/>
```xaml
<object HorizontalOffset="double"/>
- or -
<object HorizontalOffset="qualifiedDouble"/>
<object HorizontalOffset="qualifiedDouble"/>
```

<a name="xamlValues_HorizontallOffset"></a>
Expand Down Expand Up @@ -1743,10 +1743,10 @@
<a name="xamlAttributeUsage_VerticalOffset"></a>
## XAML Attribute Usage

```
<object VerticalOffset="double"/>
```xaml
<object VerticalOffset="double"/>
- or -
<object VerticalOffset="qualifiedDouble"/>
<object VerticalOffset="qualifiedDouble"/>
```

<a name="xamlValues_VerticalOffset"></a>
Expand Down
4 changes: 2 additions & 2 deletions xml/System.Windows.Controls.Primitives/RangeBase.xml
Original file line number Diff line number Diff line change
Expand Up @@ -685,8 +685,8 @@
<a name="xamlAttributeUsage_ValueChanged"></a>
## XAML Attribute Usage

```
<object ValueChanged="RoutedPropertyChangedEventHandler"/>
```xaml
<object ValueChanged="RoutedPropertyChangedEventHandler"/>
```

]]></format>
Expand Down
4 changes: 2 additions & 2 deletions xml/System.Windows.Controls.Primitives/StatusBar.xml
Original file line number Diff line number Diff line change
Expand Up @@ -332,8 +332,8 @@
<a name="xamlAttributeUsage_SeparatorStyleKey"></a>
## XAML Attribute Usage
```
<object x:Key="{x:Static StatusBar.SeparatorStyleKey}"/>
```xaml
<object x:Key="{x:Static StatusBar.SeparatorStyleKey}"/>
```
]]></format>
Expand Down
34 changes: 16 additions & 18 deletions xml/System.Windows.Controls.Ribbon/Ribbon.xml
Original file line number Diff line number Diff line change
Expand Up @@ -178,19 +178,18 @@
```xaml
xmlns:ribbon="clr-namespace:System.Windows.Controls.Ribbon;assembly=RibbonControlsLibrary"
...
<ribbon:Ribbon >
    <ribbon:Ribbon.ApplicationMenu>
        <ribbon:RibbonApplicationMenu SmallImageSource="Images\SmallIcon.png">
            <ribbon:RibbonApplicationMenuItem Header="Hello _Ribbon"
                                              x:Name="MenuItem1"
                                              ImageSource="Images\LargeIcon.png"/>
        </ribbon:RibbonApplicationMenu>
    </ribbon:Ribbon.ApplicationMenu>
    <ribbon:RibbonTab>
<ribbon:Ribbon>
<ribbon:Ribbon.ApplicationMenu>
<ribbon:RibbonApplicationMenu SmallImageSource="Images\SmallIcon.png">
<ribbon:RibbonApplicationMenuItem Header="Hello _Ribbon"
x:Name="MenuItem1"
ImageSource="Images\LargeIcon.png"/>
</ribbon:RibbonApplicationMenu>
</ribbon:Ribbon.ApplicationMenu>
<ribbon:RibbonTab>
<!-- Ribbon content goes here. -->
    </ribbon:RibbonTab>
</ribbon:Ribbon >

</ribbon:RibbonTab>
</ribbon:Ribbon>
```

]]></format>
Expand Down Expand Up @@ -519,14 +518,13 @@ xmlns:ribbon="clr-namespace:System.Windows.Controls.Ribbon;assembly=RibbonContro

```xaml
</ribbon:Ribbon>
    <ribbon:RibbonTab Name="Pens" Header="Pens" ContextualTabGroupHeader="Ink Tools" >
<ribbon:RibbonTab Name="Pens" Header="Pens" ContextualTabGroupHeader="Ink Tools" >
<!-- Ribbon Tab Content -->
    </ribbon:RibbonTab>
    <ribbon:Ribbon.ContextualTabGroups>
        <ribbon:RibbonContextualTabGroup Header="Ink Tools" Visibility="Visible" Background="Green" />
    </ribbon:Ribbon.ContextualTabGroups>
</ribbon:RibbonTab>
<ribbon:Ribbon.ContextualTabGroups>
<ribbon:RibbonContextualTabGroup Header="Ink Tools" Visibility="Visible" Background="Green" />
</ribbon:Ribbon.ContextualTabGroups>
</ribbon:Ribbon>

```

]]></format>
Expand Down
13 changes: 5 additions & 8 deletions xml/System.Windows.Controls.Ribbon/RibbonContextualTabGroup.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,21 +34,18 @@
## Remarks
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.



## Examples
The following example shows a <xref:System.Windows.Controls.Ribbon.RibbonTab> named **Pens** that is in the **Ink Tools** contextual tab group.

```xaml
</ribbon:Ribbon>
    <ribbon:RibbonTab Name="Pens" Header="Pens" ContextualTabGroupHeader="Ink Tools" >
<ribbon:RibbonTab Name="Pens" Header="Pens" ContextualTabGroupHeader="Ink Tools" >
<!-- Ribbon Tab Content -->
    </ribbon:RibbonTab>
    <ribbon:Ribbon.ContextualTabGroups>
        <ribbon:RibbonContextualTabGroup Header="Ink Tools" Visibility="Visible" Background="Green" />
    </ribbon:Ribbon.ContextualTabGroups>
</ribbon:RibbonTab>
<ribbon:Ribbon.ContextualTabGroups>
<ribbon:RibbonContextualTabGroup Header="Ink Tools" Visibility="Visible" Background="Green" />
</ribbon:Ribbon.ContextualTabGroups>
</ribbon:Ribbon>

```

]]></format>
Expand Down
22 changes: 11 additions & 11 deletions xml/System.Windows.Controls.Ribbon/RibbonGroup.xml
Original file line number Diff line number Diff line change
Expand Up @@ -264,17 +264,17 @@

```xaml
<ribbon:RibbonGroup.GroupSizeDefinitions>
  <ribbon:RibbonGroupSizeDefinition>
    <ribbon:RibbonControlSizeDefinition ImageSize="Large" IsLabelVisible="True" />
    <ribbon:RibbonControlSizeDefinition ImageSize="Small" IsLabelVisible="True" />
    <ribbon:RibbonControlSizeDefinition ImageSize="Small" IsLabelVisible="True" />
  </ribbon:RibbonGroupSizeDefinition>
  <ribbon:RibbonGroupSizeDefinition>
    <ribbon:RibbonControlSizeDefinition ImageSize="Large" IsLabelVisible="True" />
    <ribbon:RibbonControlSizeDefinition ImageSize="Small" IsLabelVisible="False" />
    <ribbon:RibbonControlSizeDefinition ImageSize="Small" IsLabelVisible="False" />
  </ribbon:RibbonGroupSizeDefinition>
  <ribbon:RibbonGroupSizeDefinition IsCollapsed="True" />
<ribbon:RibbonGroupSizeDefinition>
<ribbon:RibbonControlSizeDefinition ImageSize="Large" IsLabelVisible="True" />
<ribbon:RibbonControlSizeDefinition ImageSize="Small" IsLabelVisible="True" />
<ribbon:RibbonControlSizeDefinition ImageSize="Small" IsLabelVisible="True" />
</ribbon:RibbonGroupSizeDefinition>
<ribbon:RibbonGroupSizeDefinition>
<ribbon:RibbonControlSizeDefinition ImageSize="Large" IsLabelVisible="True" />
<ribbon:RibbonControlSizeDefinition ImageSize="Small" IsLabelVisible="False" />
<ribbon:RibbonControlSizeDefinition ImageSize="Small" IsLabelVisible="False" />
</ribbon:RibbonGroupSizeDefinition>
<ribbon:RibbonGroupSizeDefinition IsCollapsed="True" />
</ribbon:RibbonGroup.GroupSizeDefinitions>
```

Expand Down
24 changes: 12 additions & 12 deletions xml/System.Windows.Controls.Ribbon/RibbonGroupSizeDefinition.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,19 +33,19 @@
## Examples
The following example shows a <xref:System.Windows.Controls.Ribbon.RibbonGroup.GroupSizeDefinitions%2A> collection that specifies three different group sizes.
```
```xaml
<ribbon:RibbonGroup.GroupSizeDefinitions>
  <ribbon:RibbonGroupSizeDefinition>
    <ribbon:RibbonControlSizeDefinition ImageSize="Large" IsLabelVisible="True" />
    <ribbon:RibbonControlSizeDefinition ImageSize="Small" IsLabelVisible="True" />
    <ribbon:RibbonControlSizeDefinition ImageSize="Small" IsLabelVisible="True" />
  </ribbon:RibbonGroupSizeDefinition>
  <ribbon:RibbonGroupSizeDefinition>
    <ribbon:RibbonControlSizeDefinition ImageSize="Large" IsLabelVisible="True" />
    <ribbon:RibbonControlSizeDefinition ImageSize="Small" IsLabelVisible="False" />
    <ribbon:RibbonControlSizeDefinition ImageSize="Small" IsLabelVisible="False" />
  </ribbon:RibbonGroupSizeDefinition>
  <ribbon:RibbonGroupSizeDefinition IsCollapsed="True" />
<ribbon:RibbonGroupSizeDefinition>
<ribbon:RibbonControlSizeDefinition ImageSize="Large" IsLabelVisible="True" />
<ribbon:RibbonControlSizeDefinition ImageSize="Small" IsLabelVisible="True" />
<ribbon:RibbonControlSizeDefinition ImageSize="Small" IsLabelVisible="True" />
</ribbon:RibbonGroupSizeDefinition>
<ribbon:RibbonGroupSizeDefinition>
<ribbon:RibbonControlSizeDefinition ImageSize="Large" IsLabelVisible="True" />
<ribbon:RibbonControlSizeDefinition ImageSize="Small" IsLabelVisible="False" />
<ribbon:RibbonControlSizeDefinition ImageSize="Small" IsLabelVisible="False" />
</ribbon:RibbonGroupSizeDefinition>
<ribbon:RibbonGroupSizeDefinition IsCollapsed="True" />
</ribbon:RibbonGroup.GroupSizeDefinitions>
```
Expand Down
Loading
Loading