Merge branch 'main' into feat/enable-NRT

src/Microsoft.OpenApi/Reader/V3/OpenApiV3Deserializer.cs

@@ -138,15 +138,15 @@
 
         private static IOpenApiExtension LoadExtension(string name, ParseNode node)
         {
             if (node.Context.ExtensionParsers is not null && node.Context.ExtensionParsers.TryGetValue(name, out var parser) && parser(
                 node.CreateAny(), OpenApiSpecVersion.OpenApi3_0) is { } result)
             {
                 return result;
             }
             else
             {
                 return new OpenApiAny(node.CreateAny());
             }
         }
 
         private static string? LoadString(ParseNode node)
@@ -159,9 +159,12 @@
             var refSegments = pointer.Split('/');
             var refId = refSegments[refSegments.Count() -1];
             var isExternalResource = !refSegments[0].StartsWith("#", StringComparison.OrdinalIgnoreCase);
-
-            string? externalResource = isExternalResource ? $"{refSegments[0]}/{refSegments[1].TrimEnd('#')}" : null;
-
+
+            string? externalResource = null;
+            if (isExternalResource)
+            {
+                externalResource = pointer.Split('#')[0].TrimEnd('#');
+            }
             return (refId, externalResource);
         }
     }

src/Microsoft.OpenApi/Reader/V31/OpenApiV31Deserializer.cs

@@ -137,14 +137,14 @@
 
         private static IOpenApiExtension LoadExtension(string name, ParseNode node)
         {
             if (node.Context.ExtensionParsers is not null && node.Context.ExtensionParsers.TryGetValue(name, out var parser))
             {
                 return parser(node.CreateAny(), OpenApiSpecVersion.OpenApi3_1);
             }
             else
             {
                 return new OpenApiAny(node.CreateAny());
             }
         }
 
         private static string? LoadString(ParseNode node)
@@ -173,7 +173,7 @@
             string? externalResource = null;
             if (isExternalResource && pointer.Contains('#'))
             {
-                externalResource = $"{refSegments[0]}/{refSegments[1].TrimEnd('#')}";
+                externalResource = pointer.Split('#')[0].TrimEnd('#');
             }
 
             return (refId, externalResource);