Fixing broken lists in dotnet docs (#8178)
* Fixing broken lists in dotnet docs * update changelog
This commit is contained in:
parent
f6cc3d375c
commit
a7783f26de
|
@ -1,5 +1,6 @@
|
|||
### Improvements
|
||||
* Adds CI detector for Buildkite [#7933](https://github.com/pulumi/pulumi/pull/7933)
|
||||
- Adds CI detector for Buildkite
|
||||
[#7933](https://github.com/pulumi/pulumi/pull/7933)
|
||||
|
||||
- [cli] - Add `--exclude-protected` flag to `pulumi destroy`.
|
||||
[#8359](https://github.com/pulumi/pulumi/pull/8359)
|
||||
|
@ -24,3 +25,6 @@
|
|||
|
||||
- [engine] - Compute dependents correctly during targeted deletes.
|
||||
[#8360](https://github.com/pulumi/pulumi/pull/8360)
|
||||
|
||||
- [docs] - Fix broken lists in dotnet docs
|
||||
[docs#6558](https://github.com/pulumi/docs/issues/6558)
|
||||
|
|
|
@ -127,8 +127,8 @@ namespace Pulumi
|
|||
/// created, these are represented using the special <see cref="Output{T}"/>s type, which
|
||||
/// internally represents two things:
|
||||
/// <list type="number">
|
||||
/// <item>An eventually available value of the output</item>
|
||||
/// <item>The dependency on the source(s) of the output value</item>
|
||||
/// <item><description>An eventually available value of the output</description></item>
|
||||
/// <item><description>The dependency on the source(s) of the output value</description></item>
|
||||
/// </list>
|
||||
/// In fact, <see cref="Output{T}"/>s is quite similar to <see cref="Task{TResult}"/>.
|
||||
/// Additionally, they carry along dependency information.
|
||||
|
|
|
@ -36,18 +36,18 @@ namespace Pulumi
|
|||
/// <para/>
|
||||
/// Conceptually property merging follows these basic rules:
|
||||
/// <list type="number">
|
||||
/// <item>
|
||||
/// <item><description>
|
||||
/// If the property is a collection, the final value will be a collection containing the
|
||||
/// values from each options object.
|
||||
/// </item>
|
||||
/// <item>
|
||||
/// </description></item>
|
||||
/// <item><description>
|
||||
/// Simple scalar values from <paramref name="options2"/> (i.e. <see cref="string"/>s,
|
||||
/// <see cref="int"/>s, <see cref="bool"/>s) will replace the values of <paramref
|
||||
/// name="options1"/>.
|
||||
/// </item>
|
||||
/// <item>
|
||||
/// </description></item>
|
||||
/// <item><description>
|
||||
/// <see langword="null"/> values in <paramref name="options2"/> will be ignored.
|
||||
/// </item>
|
||||
/// </description></item>
|
||||
/// </list>
|
||||
/// </summary>
|
||||
public static ComponentResourceOptions Merge(ComponentResourceOptions? options1, ComponentResourceOptions? options2)
|
||||
|
|
|
@ -51,18 +51,18 @@ namespace Pulumi
|
|||
/// <para/>
|
||||
/// Conceptually property merging follows these basic rules:
|
||||
/// <list type="number">
|
||||
/// <item>
|
||||
/// <item><description>
|
||||
/// If the property is a collection, the final value will be a collection containing the
|
||||
/// values from each options object.
|
||||
/// </item>
|
||||
/// <item>
|
||||
/// </description></item>
|
||||
/// <item><description>
|
||||
/// Simple scalar values from <paramref name="options2"/> (i.e. <see cref="string"/>s,
|
||||
/// <see cref="int"/>s, <see cref="bool"/>s) will replace the values of <paramref
|
||||
/// name="options1"/>.
|
||||
/// </item>
|
||||
/// <item>
|
||||
/// </description></item>
|
||||
/// <item><description>
|
||||
/// <see langword="null"/> values in <paramref name="options2"/> will be ignored.
|
||||
/// </item>
|
||||
/// </description></item>
|
||||
/// </list>
|
||||
/// </summary>
|
||||
public static CustomResourceOptions Merge(CustomResourceOptions? options1, CustomResourceOptions? options2)
|
||||
|
|
Loading…
Reference in a new issue