Skip to content

Commit ff0d877

Browse files
committed
chore: resolve merge conflicts
1 parent 02c95e8 commit ff0d877

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

src/Microsoft.OpenApi/Interfaces/IOpenApiReferenceHolder.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public interface IOpenApiReferenceHolder<out T, V> : IOpenApiReferenceHolder whe
2020
/// <summary>
2121
/// Gets the recursively resolved target object.
2222
/// </summary>
23-
T RecursiveTarget { get; }
23+
T? RecursiveTarget { get; }
2424

2525
/// <summary>
2626
/// Copy the reference as a target element with overrides.

src/Microsoft.OpenApi/Models/References/BaseOpenApiReferenceHolder.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public virtual V? Target
2020
}
2121
}
2222
/// <inheritdoc/>
23-
public T RecursiveTarget
23+
public T? RecursiveTarget
2424
{
2525
get
2626
{

src/Microsoft.OpenApi/Models/References/OpenApiTagReference.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public class OpenApiTagReference : BaseOpenApiReferenceHolder<OpenApiTag, IOpenA
1717
/// <summary>
1818
/// Resolved target of the reference.
1919
/// </summary>
20-
public override IOpenApiTag Target
20+
public override IOpenApiTag? Target
2121
{
2222
get
2323
{

test/Microsoft.OpenApi.Tests/PublicApi/PublicApi.approved.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1242,7 +1242,7 @@ namespace Microsoft.OpenApi.Models.References
12421242
where V : Microsoft.OpenApi.Interfaces.IOpenApiReferenceable, Microsoft.OpenApi.Interfaces.IOpenApiSerializable
12431243
{
12441244
protected BaseOpenApiReferenceHolder(Microsoft.OpenApi.Models.References.BaseOpenApiReferenceHolder<T, V> source) { }
1245-
protected BaseOpenApiReferenceHolder(string referenceId, Microsoft.OpenApi.Models.OpenApiDocument hostDocument, Microsoft.OpenApi.Models.ReferenceType referenceType, string externalResource) { }
1245+
protected BaseOpenApiReferenceHolder(string referenceId, Microsoft.OpenApi.Models.OpenApiDocument? hostDocument, Microsoft.OpenApi.Models.ReferenceType referenceType, string? externalResource) { }
12461246
public T RecursiveTarget { get; }
12471247
public Microsoft.OpenApi.Models.OpenApiReference Reference { get; init; }
12481248
public virtual V Target { get; }
@@ -1439,12 +1439,12 @@ namespace Microsoft.OpenApi.Models.References
14391439
}
14401440
public class OpenApiTagReference : Microsoft.OpenApi.Models.References.BaseOpenApiReferenceHolder<Microsoft.OpenApi.Models.OpenApiTag, Microsoft.OpenApi.Models.Interfaces.IOpenApiTag>, Microsoft.OpenApi.Interfaces.IOpenApiElement, Microsoft.OpenApi.Interfaces.IOpenApiReadOnlyExtensible, Microsoft.OpenApi.Interfaces.IOpenApiReferenceable, Microsoft.OpenApi.Interfaces.IOpenApiSerializable, Microsoft.OpenApi.Interfaces.IShallowCopyable<Microsoft.OpenApi.Models.Interfaces.IOpenApiTag>, Microsoft.OpenApi.Models.Interfaces.IOpenApiReadOnlyDescribedElement, Microsoft.OpenApi.Models.Interfaces.IOpenApiTag
14411441
{
1442-
public OpenApiTagReference(string referenceId, Microsoft.OpenApi.Models.OpenApiDocument hostDocument = null, string externalResource = null) { }
1443-
public string Description { get; }
1444-
public System.Collections.Generic.IDictionary<string, Microsoft.OpenApi.Interfaces.IOpenApiExtension> Extensions { get; }
1445-
public Microsoft.OpenApi.Models.OpenApiExternalDocs ExternalDocs { get; }
1446-
public string Name { get; }
1447-
public override Microsoft.OpenApi.Models.Interfaces.IOpenApiTag Target { get; }
1442+
public OpenApiTagReference(string referenceId, Microsoft.OpenApi.Models.OpenApiDocument? hostDocument = null, string? externalResource = null) { }
1443+
public string? Description { get; }
1444+
public System.Collections.Generic.IDictionary<string, Microsoft.OpenApi.Interfaces.IOpenApiExtension>? Extensions { get; }
1445+
public Microsoft.OpenApi.Models.OpenApiExternalDocs? ExternalDocs { get; }
1446+
public string? Name { get; }
1447+
public override Microsoft.OpenApi.Models.Interfaces.IOpenApiTag? Target { get; }
14481448
public override Microsoft.OpenApi.Models.Interfaces.IOpenApiTag CopyReferenceAsTargetElementWithOverrides(Microsoft.OpenApi.Models.Interfaces.IOpenApiTag source) { }
14491449
public Microsoft.OpenApi.Models.Interfaces.IOpenApiTag CreateShallowCopy() { }
14501450
}

0 commit comments

Comments
 (0)