Skip to content

Commit bf7b8cf

Browse files
baywetbaywet
authored
Merge pull request #1161 from microsoft/vnext
master refresh
2 parents 9c18762 + 21e91c6 commit bf7b8cf

File tree

11 files changed

+28
-18
lines changed

11 files changed

+28
-18
lines changed

‎src/Microsoft.OpenApi.Readers/Microsoft.OpenApi.Readers.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<Company>Microsoft</Company>
1111
<Title>Microsoft.OpenApi.Readers</Title>
1212
<PackageId>Microsoft.OpenApi.Readers</PackageId>
13-
<Version>1.6.0</Version>
13+
<Version>1.6.1</Version>
1414
<Description>OpenAPI.NET Readers for JSON and YAML documents</Description>
1515
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
1616
<PackageTags>OpenAPI .NET</PackageTags>

‎src/Microsoft.OpenApi.Workbench/Microsoft.OpenApi.Workbench.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
88
</PropertyGroup>
99
<ItemGroup>
10-
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.355802">
10+
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.410601">
1111
<PrivateAssets>all</PrivateAssets>
1212
</PackageReference>
1313
<PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0" />

‎src/Microsoft.OpenApi/Microsoft.OpenApi.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<Company>Microsoft</Company>
1212
<Title>Microsoft.OpenApi</Title>
1313
<PackageId>Microsoft.OpenApi</PackageId>
14-
<Version>1.6.0</Version>
14+
<Version>1.6.1</Version>
1515
<Description>.NET models with JSON and YAML writers for OpenAPI specification</Description>
1616
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
1717
<PackageTags>OpenAPI .NET</PackageTags>

‎src/Microsoft.OpenApi/Models/OpenApiContact.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public OpenApiContact() { }
4646
public OpenApiContact(OpenApiContact contact)
4747
{
4848
Name = contact?.Name ?? Name;
49-
Url = contact?.Url != null ? new Uri(contact.Url.OriginalString) : null;
49+
Url = contact?.Url != null ? new Uri(contact.Url.OriginalString, UriKind.RelativeOrAbsolute) : null;
5050
Email = contact?.Email ?? Email;
5151
Extensions = contact?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(contact.Extensions) : null;
5252
}

‎src/Microsoft.OpenApi/Models/OpenApiExternalDocs.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@ public class OpenApiExternalDocs : IOpenApiSerializable, IOpenApiExtensible
3232
/// <summary>
3333
/// Parameter-less constructor
3434
/// </summary>
35-
public OpenApiExternalDocs() {}
35+
public OpenApiExternalDocs() { }
3636

3737
/// <summary>
3838
/// Initializes a copy of an <see cref="OpenApiExternalDocs"/> object
3939
/// </summary>
4040
public OpenApiExternalDocs(OpenApiExternalDocs externalDocs)
4141
{
4242
Description = externalDocs?.Description ?? Description;
43-
Url = externalDocs?.Url != null ? new Uri(externalDocs.Url.OriginalString) : null;
43+
Url = externalDocs?.Url != null ? new Uri(externalDocs.Url.OriginalString, UriKind.RelativeOrAbsolute) : null;
4444
Extensions = externalDocs?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(externalDocs.Extensions) : null;
4545
}
4646

‎src/Microsoft.OpenApi/Models/OpenApiLicense.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@ public class OpenApiLicense : IOpenApiSerializable, IOpenApiExtensible
3232
/// <summary>
3333
/// Parameterless constructor
3434
/// </summary>
35-
public OpenApiLicense() {}
35+
public OpenApiLicense() { }
3636

3737
/// <summary>
3838
/// Initializes a copy of an <see cref="OpenApiLicense"/> object
3939
/// </summary>
4040
public OpenApiLicense(OpenApiLicense license)
4141
{
4242
Name = license?.Name ?? Name;
43-
Url = license?.Url != null ? new Uri(license.Url.OriginalString) : null;
43+
Url = license?.Url != null ? new Uri(license.Url.OriginalString, UriKind.RelativeOrAbsolute) : null;
4444
Extensions = license?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(license.Extensions) : null;
4545
}
4646

‎src/Microsoft.OpenApi/Models/OpenApiOAuthFlow.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,16 @@ public class OpenApiOAuthFlow : IOpenApiSerializable, IOpenApiExtensible
4444
/// <summary>
4545
/// Parameterless constructor
4646
/// </summary>
47-
public OpenApiOAuthFlow() {}
47+
public OpenApiOAuthFlow() { }
4848

4949
/// <summary>
5050
/// Initializes a copy of an <see cref="OpenApiOAuthFlow"/> object
5151
/// </summary>
5252
public OpenApiOAuthFlow(OpenApiOAuthFlow oAuthFlow)
5353
{
54-
AuthorizationUrl = oAuthFlow?.AuthorizationUrl != null ? new Uri(oAuthFlow.AuthorizationUrl.OriginalString) : null;
55-
TokenUrl = oAuthFlow?.TokenUrl != null ? new Uri(oAuthFlow.TokenUrl.OriginalString) : null;
56-
RefreshUrl = oAuthFlow?.RefreshUrl != null ? new Uri(oAuthFlow.RefreshUrl.OriginalString) : null;
54+
AuthorizationUrl = oAuthFlow?.AuthorizationUrl != null ? new Uri(oAuthFlow.AuthorizationUrl.OriginalString, UriKind.RelativeOrAbsolute) : null;
55+
TokenUrl = oAuthFlow?.TokenUrl != null ? new Uri(oAuthFlow.TokenUrl.OriginalString, UriKind.RelativeOrAbsolute) : null;
56+
RefreshUrl = oAuthFlow?.RefreshUrl != null ? new Uri(oAuthFlow.RefreshUrl.OriginalString, UriKind.RelativeOrAbsolute) : null;
5757
Scopes = oAuthFlow?.Scopes != null ? new Dictionary<string, string>(oAuthFlow.Scopes) : null;
5858
Extensions = oAuthFlow?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(oAuthFlow.Extensions) : null;
5959
}

‎src/Microsoft.OpenApi/Models/OpenApiSchema.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -536,6 +536,11 @@ internal void SerializeAsV2(
536536
}
537537

538538
target.SerializeAsV2WithoutReference(writer, parentRequiredProperties, propertyName);
539+
540+
if (Reference != null)
541+
{
542+
settings.LoopDetector.PopLoop<OpenApiSchema>();
543+
}
539544
}
540545

541546
/// <summary>

‎src/Microsoft.OpenApi/Models/OpenApiSecurityScheme.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public class OpenApiSecurityScheme : IOpenApiSerializable, IOpenApiReferenceable
7777
/// <summary>
7878
/// Parameterless constructor
7979
/// </summary>
80-
public OpenApiSecurityScheme() {}
80+
public OpenApiSecurityScheme() { }
8181

8282
/// <summary>
8383
/// Initializes a copy of <see cref="OpenApiSecurityScheme"/> object
@@ -91,7 +91,7 @@ public OpenApiSecurityScheme(OpenApiSecurityScheme securityScheme)
9191
Scheme = securityScheme?.Scheme ?? Scheme;
9292
BearerFormat = securityScheme?.BearerFormat ?? BearerFormat;
9393
Flows = securityScheme?.Flows != null ? new(securityScheme?.Flows) : null;
94-
OpenIdConnectUrl = securityScheme?.OpenIdConnectUrl != null ? new Uri(securityScheme.OpenIdConnectUrl.OriginalString) : null;
94+
OpenIdConnectUrl = securityScheme?.OpenIdConnectUrl != null ? new Uri(securityScheme.OpenIdConnectUrl.OriginalString, UriKind.RelativeOrAbsolute) : null;
9595
Extensions = securityScheme?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(securityScheme.Extensions) : null;
9696
UnresolvedReference = securityScheme?.UnresolvedReference ?? UnresolvedReference;
9797
Reference = securityScheme?.Reference != null ? new(securityScheme?.Reference) : null;
@@ -107,8 +107,8 @@ public void SerializeAsV3(IOpenApiWriter writer)
107107
throw Error.ArgumentNull(nameof(writer));
108108
}
109109

110-
111-
if (Reference != null)
110+
111+
if (Reference != null)
112112
{
113113
Reference.SerializeAsV3(writer);
114114
return;

‎test/Microsoft.OpenApi.Tests/Microsoft.OpenApi.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<PackageReference Include="Moq" Version="4.18.4" />
2929
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
3030
<PackageReference Include="SharpYaml" Version="2.1.0" />
31-
<PackageReference Include="Verify.Xunit" Version="19.7.1" />
31+
<PackageReference Include="Verify.Xunit" Version="19.9.2" />
3232
<PackageReference Include="xunit" Version="2.4.2" />
3333
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
3434
<PrivateAssets>all</PrivateAssets>

0 commit comments

Comments
 (0)