Skip to content

Merge main into live #12166

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.

Sign up for GitHub

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
dotnet-policy-service merged 3 commits into from
Dec 23, 2025
+33 −31
Merged

Merge main into live #12166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
78e1b9c
Clarify CacheExtensions.TryGetValue<TItem> documentation for type mis…
Copilot Dec 23, 2025
018f366
Update DateTimeOffset.xml (#11630)
Rob-S Dec 23, 2025
5814ca9
Update AntiXssEncoder.xml for issue 10378 (#10379)
JeffSchwandt Dec 23, 2025
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
14 changes: 8 additions & 6 deletions xml/Microsoft.Extensions.Caching.Memory/CacheExtensions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,9 @@
<param name="cache">The <see cref="T:Microsoft.Extensions.Caching.Memory.IMemoryCache" /> instance this method extends.</param>
<param name="key">The key of the value to get.</param>
<summary>
Gets the value associated with this key if present.
Gets the value associated with this key if present and castable to <typeparamref name="TItem" />.
</summary>
<returns>The value associated with this key, or <c>default(TItem)</c> if the key is not present.</returns>
<returns>The value associated with this key, or <c>default(TItem)</c> if the key is not present or the stored value can't be cast to <typeparamref name="TItem" />.</returns>
<remarks>To be added.</remarks>
</Docs>
</Member>
Expand Down Expand Up @@ -595,13 +595,15 @@
<typeparam name="TItem">The type of the object to get.</typeparam>
<param name="cache">The <see cref="T:Microsoft.Extensions.Caching.Memory.IMemoryCache" /> instance this method extends.</param>
<param name="key">The key of the value to get.</param>
<param name="value">The value associated with the given key.</param>
<param name="value">The value associated with the given key, or <c>default(TItem)</c> if the key is not found or the stored value can't be cast to <typeparamref name="TItem" />.</param>
<summary>
Tries to get the value associated with the given key.
Tries to get the value associated with the given key and cast it to <typeparamref name="TItem" />.
</summary>
<returns>
<c>true</c> if the key was found; <c>false</c> otherwise.</returns>
<remarks>To be added.</remarks>
<c>true</c> if the key was found and the stored value can be cast to <typeparamref name="TItem" />; <c>false</c> otherwise.</returns>
<remarks>
This method returns <c>false</c> both when the key is not present in the cache and when the key is present but the stored value can't be cast to <typeparamref name="TItem" />. If you need to distinguish between these two cases (for example, in instrumented caches tracking hit/miss metrics), use the non-generic <see cref="M:Microsoft.Extensions.Caching.Memory.IMemoryCache.TryGetValue(System.Object,System.Object@)" /> method instead, which returns <c>true</c> if the key is present regardless of type.
</remarks>
</Docs>
</Member>
</Members>
Expand Down
36 changes: 18 additions & 18 deletions xml/System.Web.Security.AntiXss/AntiXssEncoder.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,20 +174,20 @@
|0x0180 - 0x024F|Characters between 0x0180 (384 decimal) and 0x024F (591 decimal). (The Unicode [Latin-Extended-B](https://www.unicode.org/charts/PDF/U0180.pdf) character range.)|
|0x0250 - 0x02AF|Characters between 0x0250 (592 decimal) and 0x02AF (687 decimal). (The Unicode [IPA Extensions](https://www.unicode.org/charts/PDF/U0250.pdf) character range.)|
|0x02B0 - 0x02FF|Characters between 0x02B0 (688 decimal) and 0x02FF (767 decimal). (The Unicode [Spacing Modifier Letters](https://www.unicode.org/charts/PDF/U02B0.pdf) character range.)|
|0x0300 - 0x036F|Characters between 0x0300 (768 decimal) and 0x036F (879 decimal). (The Unicode [Combining Diacritical Marks](https://www.unicode.org/charts/PDF/U0300.pdf) character range.)|

The following table lists examples of inputs and the corresponding encoded outputs.

|Input examples| Encoded outputs|
|-|-|
|`alert('XSS Attack!');`|`alert(&#39;XSS&#32;Attack!&#39;);`|
|`<script>alert('XSS Attack!');</script>`|`&lt;script&gt;alert(&#39;XSS Attack!&#39;);&lt;/script&gt;`|
|`alert('XSSあAttack!');`|`alert(&#39;XSS&#12354;Attack!&#39;);`|
|`[email protected]`|`[email protected]`|
|`"Anti-Cross Site Scripting Namespace"`|`&quot;Anti-Cross&#32;Site&#32;Scripting&#32;Namespace&quot;`|

To customize the safe list, call the <xref:System.Web.Security.AntiXss.AntiXssEncoder.MarkAsSafe%2A> method.

|0x0300 - 0x036F|Characters between 0x0300 (768 decimal) and 0x036F (879 decimal). (The Unicode [Combining Diacritical Marks](https://www.unicode.org/charts/PDF/U0300.pdf) character range.)|
The following table lists examples of inputs and the corresponding encoded outputs.
|Input examples| Encoded outputs|
|-|-|
|`alert('XSS Attack!');`|`alert(&#39;XSS Attack!&#39;);`|
|`<script>alert('XSS Attack!');</script>`|`&lt;script&gt;alert(&#39;XSS Attack!&#39;);&lt;/script&gt;`|
|`alert('XSSあAttack!');`|`alert(&#39;XSS&#12354;Attack!&#39;);`|
|`[email protected]`|`[email protected]`|
|`"Anti-Cross Site Scripting Namespace"`|`&quot;Anti-Cross Site Scripting Namespace&quot;`|
To customize the safe list, call the <xref:System.Web.Security.AntiXss.AntiXssEncoder.MarkAsSafe%2A> method.
]]></format>
</remarks>
</Docs>
Expand Down Expand Up @@ -279,11 +279,11 @@

| Input | Output |
|------------------------------------------|---------------------------------------------------------------|
| `alert('XSS Attack!');` | `alert(&#39;XSS&#32;Attack!&#39;);` |
| `alert('XSS Attack!');` | `alert(&#39;XSS Attack!&#39;);` |
| `<script>alert('XSS Attack!');</script>` | `&lt;script&gt;alert(&#39;XSS Attack!&#39;);&lt;/script&gt;` |
| `alert('XSSあAttack!');` | `alert(&#39;XSS&#12354;Attack!&#39;);` |
| `[email protected]` | `[email protected]` |
| `"Anti-Cross Site Scripting Namespace"` | `&quot;Anti-Cross&#32;Site&#32;Scripting&#32;Namespace&quot;` |
| `"Anti-Cross Site Scripting Namespace"` | `&quot;Anti-Cross Site Scripting Namespace&quot;` |

To customize the safe list, call the <xref:System.Web.Security.AntiXss.AntiXssEncoder.MarkAsSafe%2A> method.

Expand Down Expand Up @@ -367,11 +367,11 @@

| Input | Output |
|-------|--------|
|`alert('XSS Attack!');`|`alert(&#39;XSS&#32;Attack!&#39;);`|
|`alert('XSS Attack!');`|`alert(&#39;XSS Attack!&#39;);`|
|`<script>alert('XSS Attack!');</script>`|`&lt;script&gt;alert(&#39;XSS Attack!&#39;);&lt;/script&gt;`|
|`alert('XSSあAttack!');`|`alert(&#39;XSS&#12354;Attack!&#39;);`|
|`[email protected]`|`[email protected]`|
|`"Anti-Cross Site Scripting Namespace"`|`&quot;Anti-Cross&#32;Site&#32;Scripting&#32;Namespace&quot;`|
|`"Anti-Cross Site Scripting Namespace"`|`&quot;Anti-Cross Site Scripting Namespace&quot;`|

To customize the safe list, call the <xref:System.Web.Security.AntiXss.AntiXssEncoder.MarkAsSafe%2A> method.

Expand Down
14 changes: 7 additions & 7 deletions xml/System/DateTimeOffset.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@
<Docs>
<param name="dateTime">A date and time.</param>
<param name="offset">The time's offset from Coordinated Universal Time (UTC).</param>
<summary>Initializes a new instance of the <see cref="T:System.DateTimeOffset" /> structure using the specified <see cref="T:System.DateTime" /> value and offset.</summary>
<summary>Initializes a new instance of the <see cref="T:System.DateTimeOffset" /> structure using the specified <see cref="T:System.DateTime" /> value and <paramref name="offset" />.</summary>
<remarks>
<format type="text/markdown"><![CDATA[

Expand Down Expand Up @@ -378,7 +378,7 @@
<Docs>
<param name="ticks">A date and time expressed as the number of 100-nanosecond intervals that have elapsed since 12:00:00 midnight on January 1, 0001.</param>
<param name="offset">The time's offset from Coordinated Universal Time (UTC).</param>
<summary>Initializes a new instance of the <see cref="T:System.DateTimeOffset" /> structure using the specified number of ticks and offset.</summary>
<summary>Initializes a new instance of the <see cref="T:System.DateTimeOffset" /> structure using the specified number of <paramref name="ticks" /> and <paramref name="offset" />.</summary>
<remarks>
<format type="text/markdown"><![CDATA[

Expand Down Expand Up @@ -499,7 +499,7 @@
<param name="minute">The minutes (0 through 59).</param>
<param name="second">The seconds (0 through 59).</param>
<param name="offset">The time's offset from Coordinated Universal Time (UTC).</param>
<summary>Initializes a new instance of the <see cref="T:System.DateTimeOffset" /> structure using the specified year, month, day, hour, minute, second, and offset.</summary>
<summary>Initializes a new instance of the <see cref="T:System.DateTimeOffset" /> structure using the specified <paramref name="year" />, <paramref name="month" />, <paramref name="day" />, <paramref name="hour" />, <paramref name="minute" />, <paramref name="second" />, and <paramref name="offset" />.</summary>
<remarks>
<format type="text/markdown"><![CDATA[

Expand Down Expand Up @@ -606,7 +606,7 @@
<param name="second">The seconds (0 through 59).</param>
<param name="millisecond">The milliseconds (0 through 999).</param>
<param name="offset">The time's offset from Coordinated Universal Time (UTC).</param>
<summary>Initializes a new instance of the <see cref="T:System.DateTimeOffset" /> structure using the specified year, month, day, hour, minute, second, millisecond, and offset.</summary>
<summary>Initializes a new instance of the <see cref="T:System.DateTimeOffset" /> structure using the specified <paramref name="year" />, <paramref name="month" />, <paramref name="day" />, <paramref name="hour" />, <paramref name="minute" />, <paramref name="second" />, <paramref name="millisecond" />, and <paramref name="offset" />.</summary>
<remarks>
<format type="text/markdown"><![CDATA[

Expand Down Expand Up @@ -715,7 +715,7 @@
<param name="millisecond">The milliseconds (0 through 999).</param>
<param name="calendar">The calendar that is used to interpret <paramref name="year" />, <paramref name="month" />, and <paramref name="day" />.</param>
<param name="offset">The time's offset from Coordinated Universal Time (UTC).</param>
<summary>Initializes a new instance of the <see cref="T:System.DateTimeOffset" /> structure using the specified year, month, day, hour, minute, second, millisecond, and offset of a specified calendar.</summary>
<summary>Initializes a new instance of the <see cref="T:System.DateTimeOffset" /> structure using the specified <paramref name="year" />, <paramref name="month" />, <paramref name="day" />, <paramref name="hour" />, <paramref name="minute" />, <paramref name="second" />, <paramref name="millisecond" />, <paramref name="calendar" />, and <paramref name="offset" />.</summary>
<remarks>
<format type="text/markdown"><![CDATA[

Expand Down Expand Up @@ -820,7 +820,7 @@
<param name="millisecond">The milliseconds (0 through 999).</param>
<param name="microsecond">The microseconds (0 through 999).</param>
<param name="offset">The time's offset from Coordinated Universal Time (UTC).</param>
<summary>Initializes a new instance of the <see cref="T:System.DateTimeOffset" /> structure using the specified <paramref name="year" />, <paramref name="month" />, <paramref name="day" />, <paramref name="hour" />, <paramref name="minute" />, <paramref name="second" />, <paramref name="millisecond" />, <paramref name="microsecond" /> and <paramref name="offset" />.</summary>
<summary>Initializes a new instance of the <see cref="T:System.DateTimeOffset" /> structure using the specified <paramref name="year" />, <paramref name="month" />, <paramref name="day" />, <paramref name="hour" />, <paramref name="minute" />, <paramref name="second" />, <paramref name="millisecond" />, <paramref name="microsecond" />, and <paramref name="offset" />.</summary>
<remarks>
<format type="text/markdown"><![CDATA[

Expand Down Expand Up @@ -910,7 +910,7 @@ This constructor interprets `year`, `month` and `day` as a year, month and day
<param name="microsecond">The microseconds (0 through 999).</param>
<param name="calendar">The calendar that is used to interpret <paramref name="year" />, <paramref name="month" />, and <paramref name="day" />.</param>
<param name="offset">The time's offset from Coordinated Universal Time (UTC).</param>
<summary>Initializes a new instance of the <see cref="T:System.DateTimeOffset" /> structure using the specified <paramref name="year" />, <paramref name="month" />, <paramref name="day" />, <paramref name="hour" />, <paramref name="minute" />, <paramref name="second" />, <paramref name="millisecond" />, <paramref name="microsecond" /> and <paramref name="offset" />.</summary>
<summary>Initializes a new instance of the <see cref="T:System.DateTimeOffset" /> structure using the specified <paramref name="year" />, <paramref name="month" />, <paramref name="day" />, <paramref name="hour" />, <paramref name="minute" />, <paramref name="second" />, <paramref name="millisecond" />, <paramref name="microsecond" />, <paramref name="calendar" />, and <paramref name="offset" />.</summary>
<remarks>
<format type="text/markdown"><![CDATA[

Expand Down