Resolve merge conflicts with release/2.0.0 branch

Author: irvinesunday

src/Microsoft.OpenApi/Models/OpenApiConstants.cs

@@ -628,7 +628,7 @@ public static class OpenApiConstants
         /// <summary>
         /// The default registry uri for OpenApi documents and workspaces
         /// </summary>
-        public const string BaseRegistryUri = "http://openapi.net/";
+        public const string BaseRegistryUri = "https://openapi.net/";
 
         #region V2.0
 

src/Microsoft.OpenApi/Models/OpenApiDocument.cs

@@ -451,12 +451,12 @@ private static void WriteHostInfoV2(IOpenApiWriter writer, IList<OpenApiServer>
         /// This method will be replaced by a LoadExternalReferences in the next major update to this library.
         /// Resolving references at load time is going to go away.
         /// </remarks>
-        public IEnumerable<OpenApiError> ResolveReferences()
+        public IEnumerable<OpenApiError> ResolveJsonSchemaReferences()
         {
-            var resolver = new OpenApiReferenceResolver(this, false);
-            var walker = new OpenApiWalker(resolver);
+            var jsonSchemaResolver = new JsonSchemaReferenceResolver(this);
+            var walker = new OpenApiWalker(jsonSchemaResolver);
             walker.Walk(this);
-            return resolver.Errors;
+            return jsonSchemaResolver.Errors;
         }
 
         /// <summary>

src/Microsoft.OpenApi/Models/OpenApiExample.cs

@@ -68,7 +68,7 @@ public OpenApiExample(OpenApiExample example)
         {
             Summary = example?.Summary ?? Summary;
             Description = example?.Description ?? Description;
-            Value = JsonNodeCloneHelper.Clone(example?.Value);
+            Value = example?.Value ?? JsonNodeCloneHelper.Clone(example?.Value);
             ExternalValue = example?.ExternalValue ?? ExternalValue;
             Extensions = example?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(example.Extensions) : null;
             Reference = example?.Reference != null ? new(example?.Reference) : null;

src/Microsoft.OpenApi/Models/OpenApiHeader.cs

@@ -114,8 +114,8 @@ public OpenApiHeader(OpenApiHeader header)
             Style = header?.Style ?? Style;
             Explode = header?.Explode ?? Explode;
             AllowReserved = header?.AllowReserved ?? AllowReserved;
-            _schema = JsonNodeCloneHelper.CloneJsonSchema(header?.Schema);
-            Example = JsonNodeCloneHelper.Clone(header?.Example);
+            Schema = header?.Schema != null ? JsonNodeCloneHelper.CloneJsonSchema(header?.Schema) : null;
+            Example = header?.Example != null ? JsonNodeCloneHelper.Clone(header?.Example) : null;
             Examples = header?.Examples != null ? new Dictionary<string, OpenApiExample>(header.Examples) : null;
             Content = header?.Content != null ? new Dictionary<string, OpenApiMediaType>(header.Content) : null;
             Extensions = header?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(header.Extensions) : null;

src/Microsoft.OpenApi/Models/OpenApiParameter.cs

@@ -167,9 +167,9 @@ public OpenApiParameter(OpenApiParameter parameter)
             Style = parameter?.Style ?? Style;
             Explode = parameter?.Explode ?? Explode;
             AllowReserved = parameter?.AllowReserved ?? AllowReserved;
-            _schema = JsonNodeCloneHelper.CloneJsonSchema(parameter?.Schema);
+            Schema = parameter?.Schema != null ? JsonNodeCloneHelper.CloneJsonSchema(parameter?.Schema) : null;
             Examples = parameter?.Examples != null ? new Dictionary<string, OpenApiExample>(parameter.Examples) : null;
-            Example = JsonNodeCloneHelper.Clone(parameter?.Example);
+            Example = parameter?.Example != null ? JsonNodeCloneHelper.Clone(parameter?.Example) : null;
             Content = parameter?.Content != null ? new Dictionary<string, OpenApiMediaType>(parameter.Content) : null;
             Extensions = parameter?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(parameter.Extensions) : null;
             AllowEmptyValue = parameter?.AllowEmptyValue ?? AllowEmptyValue;

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

@@ -24,7 +24,10 @@ private OpenApiExample Target
             get
             {
                 _target ??= Reference.HostDocument.ResolveReferenceTo<OpenApiExample>(_reference);
-                return _target;
+                OpenApiExample resolved = new OpenApiExample(_target);                
+                if (!string.IsNullOrEmpty(_description)) resolved.Description = _description;
+                if (!string.IsNullOrEmpty(_summary)) resolved.Summary = _summary;
+                return resolved;
             }
         }
 
@@ -71,12 +74,12 @@ internal OpenApiExampleReference(OpenApiExample target, string referenceId)
         public override string Description
         {
             get => string.IsNullOrEmpty(_description) ? Target.Description : _description;
-            set => _description = value; 
+            set => _description = value;
         }
 
         /// <inheritdoc/>
         public override string Summary
-        { 
+        {
             get => string.IsNullOrEmpty(_summary) ? Target.Summary : _summary;
             set => _summary = value;
         }

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

@@ -24,7 +24,9 @@ private OpenApiHeader Target
             get
             {
                 _target ??= Reference.HostDocument.ResolveReferenceTo<OpenApiHeader>(_reference);
-                return _target;
+                OpenApiHeader resolved = new OpenApiHeader(_target);
+                if (!string.IsNullOrEmpty(_description)) resolved.Description = _description;
+                return resolved;
             }
         }
 
@@ -153,7 +155,7 @@ public override void SerializeAsV2(IOpenApiWriter writer)
         private void SerializeInternal(IOpenApiWriter writer,
             Action<IOpenApiWriter, IOpenApiReferenceable> action)
         {
-            Utils.CheckArgumentNull(writer);;
+            Utils.CheckArgumentNull(writer);
             action(writer, Target);
         }
     }

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

@@ -22,7 +22,9 @@ private OpenApiLink Target
             get
             {
                 _target ??= Reference.HostDocument.ResolveReferenceTo<OpenApiLink>(_reference);
-                return _target;
+                OpenApiLink resolved = new OpenApiLink(_target);
+                if (!string.IsNullOrEmpty(_description)) resolved.Description = _description;
+                return resolved;
             }
         }
 

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

@@ -26,7 +26,9 @@ private OpenApiParameter Target
             get
             {
                 _target ??= Reference.HostDocument.ResolveReferenceTo<OpenApiParameter>(_reference);
-                return _target;
+                OpenApiParameter resolved = new OpenApiParameter(_target);
+                if (!string.IsNullOrEmpty(_description)) resolved.Description = _description;
+                return resolved;
             }
         }
 

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

@@ -23,7 +23,10 @@ private OpenApiPathItem Target
             get
             {
                 _target ??= Reference.HostDocument.ResolveReferenceTo<OpenApiPathItem>(_reference);
-                return _target;
+                OpenApiPathItem resolved = new OpenApiPathItem(_target);
+                if (!string.IsNullOrEmpty(_description)) resolved.Description = _description;
+                if (!string.IsNullOrEmpty(_summary)) resolved.Summary = _summary;
+                return resolved;
             }
         }