Skip to content

Commit e0a3bb2

Browse files
Merge pull request #1849 from microsoft/mk/set-workspace-baseUrl
Set workspace baseUrl when creating a workspace
2 parents f1c9297 + c3fac4e commit e0a3bb2

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

src/Microsoft.OpenApi/Reader/OpenApiJsonReader.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,8 @@ private JsonNode LoadJsonNodes(TextReader input)
192192
private async Task<OpenApiDiagnostic> LoadExternalRefs(OpenApiDocument document, CancellationToken cancellationToken, OpenApiReaderSettings settings, string format = null)
193193
{
194194
// Create workspace for all documents to live in.
195-
var openApiWorkSpace = new OpenApiWorkspace();
195+
var baseUrl = settings.BaseUrl ?? new Uri(OpenApiConstants.BaseRegistryUri);
196+
var openApiWorkSpace = new OpenApiWorkspace(baseUrl);
196197

197198
// Load this root document into the workspace
198199
var streamLoader = new DefaultStreamLoader(settings.BaseUrl);

src/Microsoft.OpenApi/Reader/Services/DefaultStreamLoader.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,9 @@ public Stream Load(Uri uri)
5656
/// <exception cref="ArgumentException"></exception>
5757
public async Task<Stream> LoadAsync(Uri uri)
5858
{
59-
var absoluteUri = new Uri(baseUrl, uri);
59+
Uri absoluteUri;
60+
absoluteUri = baseUrl.AbsoluteUri.Equals(OpenApiConstants.BaseRegistryUri) ? new Uri(Directory.GetCurrentDirectory() + uri)
61+
: new Uri(baseUrl, uri);
6062

6163
switch (absoluteUri.Scheme)
6264
{

0 commit comments

Comments
 (0)