Fixes bugs and failing tests #1503

MaggieKimani1 · 2023-12-13T10:03:40Z

This PR ensures our v2 branch is at per with the vnext branch by resolving occurring merge conflicts.
It also addresses the following fixes:

Handle number overflow during parsing of min/max values

…g directory

Configure Hidi --settings-file path to be relative to the current working directory

Bumps [Verify.Xunit](https://github.com/VerifyTests/Verify) from 22.5.0 to 22.6.0. - [Release notes](https://github.com/VerifyTests/Verify/releases) - [Commits](https://github.com/VerifyTests/Verify/commits/22.6.0) --- updated-dependencies: - dependency-name: Verify.Xunit dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>

…-22.6.0 Bump Verify.Xunit from 22.5.0 to 22.6.0

Update bug_report.md

Bumps [Moq](https://github.com/moq/moq) from 4.20.69 to 4.20.70. - [Release notes](https://github.com/moq/moq/releases) - [Changelog](https://github.com/devlooped/moq/blob/main/CHANGELOG.md) - [Commits](moq/moq.spikes@v4.20.69...v4.20.70) --- updated-dependencies: - dependency-name: Moq dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>

Bump Moq from 4.20.69 to 4.20.70

…guity

Bumps Microsoft.OData.Edm from 7.18.0 to 7.19.0. --- updated-dependencies: - dependency-name: Microsoft.OData.Edm dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>

…ata.Edm-7.19.0 Bump Microsoft.OData.Edm from 7.18.0 to 7.19.0

…s_ReturnsFallback test

…Overflow_Overflows_ReturnsFallback_culture_dependend Fix culture dependency in ParseDecimalWithFallbackOnOverflow_Overflows_ReturnsFallback test

Bumps [PublicApiGenerator](https://github.com/PublicApiGenerator/PublicApiGenerator) from 11.0.0 to 11.1.0. - [Release notes](https://github.com/PublicApiGenerator/PublicApiGenerator/releases) - [Commits](PublicApiGenerator/PublicApiGenerator@11.0.0...11.1.0) --- updated-dependencies: - dependency-name: PublicApiGenerator dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>

Bumps [Verify.Xunit](https://github.com/VerifyTests/Verify) from 22.6.0 to 22.7.1. - [Release notes](https://github.com/VerifyTests/Verify/releases) - [Commits](VerifyTests/Verify@22.6.0...22.7.1) --- updated-dependencies: - dependency-name: Verify.Xunit dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>

Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3 to 4. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](actions/setup-java@v3...v4) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]>

Bumps [actions/setup-dotnet](https://github.com/actions/setup-dotnet) from 3 to 4. - [Release notes](https://github.com/actions/setup-dotnet/releases) - [Commits](actions/setup-dotnet@v3...v4) --- updated-dependencies: - dependency-name: actions/setup-dotnet dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]>

…ions/setup-dotnet-4 Bump actions/setup-dotnet from 3 to 4

…-22.7.1 Bump Verify.Xunit from 22.6.0 to 22.7.1

src/Microsoft.OpenApi/Writers/OpenApiWriterBase.cs

baywet

It seems you've also merged from vnext to this branch. I was expecting many more conflicts. Could you please provide information about how many conflicts you've had to resolve?

src/Microsoft.OpenApi.Readers/ParseNodes/MapNode.cs

src/Microsoft.OpenApi.Readers/V2/OpenApiDocumentDeserializer.cs

src/Microsoft.OpenApi/Helpers/SchemaSerializerHelper.cs

src/Microsoft.OpenApi/Validations/Rules/JsonSchemaRules.cs

Co-authored-by: Vincent Biret <[email protected]>

MaggieKimani1 · 2023-12-13T13:20:04Z

It seems you've also merged from vnext to this branch. I was expecting many more conflicts. Could you please provide information about how many conflicts you've had to resolve?

Actually most of the conflicts I resolved by merging vnext into our v2 branch I committed directly into the v2 branch.
Here is the commit: 99a038c
We had over 120 conflicting files, most of which were affected by our switch from OpenApiSchema to JSON Schema. We also had some failing tests as a result of the merge, most of which are being fixed by this PR.

src/Microsoft.OpenApi/Services/OpenApiReferenceResolver.cs

…crosoft/OpenAPI.NET into mk/fix-bugs-and-failing-tests

src/Microsoft.OpenApi/Validations/Rules/JsonSchemaRules.cs

src/Microsoft.OpenApi/Services/OpenApiReferenceResolver.cs

src/Microsoft.OpenApi/Writers/OpenApiWriterBase.cs

src/Microsoft.OpenApi/Helpers/SchemaSerializerHelper.cs

baywet

Thanks for making the changes and providing some context. Glad the merge went well.
It was on my list to do, but I never actually got to it.

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

sonarqubecloud · 2023-12-13T14:52:05Z

Quality Gate failed

Failed conditions

78.1% Coverage on New Code (required ≥ 80%)
37.5% Duplication on New Code (required ≤ 3%)

See analysis details on SonarCloud

Robulane and others added 30 commits November 22, 2023 16:30

Handle number overflow during parsing of min/max values

4bc07e3

Merge pull request #1480 from Robulane/users/robulane/DontCrash

d06a89d

Handle number overflow during parsing of min/max values

Configure the settings file path to be relative to the current workin…

47ef775

…g directory

Upgrade lib versions

85dafb5

Merge pull request #1481 from microsoft/mk/fix-hidi-relative-path

9037ca4

Configure Hidi --settings-file path to be relative to the current working directory

Merge pull request #1483 from microsoft/dependabot/nuget/Verify.Xunit…

05c5615

…-22.6.0 Bump Verify.Xunit from 22.5.0 to 22.6.0

Update bug_report.md

b786bc0

Merge pull request #1484 from microsoft/mk/update-issue-template

2e77c9c

Update bug_report.md

Merge pull request #1485 from microsoft/dependabot/nuget/Moq-4.20.70

57084f4

Bump Moq from 4.20.69 to 4.20.70

Update public API interface

cf2106a

Create Json schema mappings with references in components

10c69a8

Add spec version param for writing out $refs for different versions

1ac5b1b

Clean up code and tests

9ed4887

Remove dependency on external lib that uses YamlDotNet to reduce ambi…

6c88daa

…guity

Throw an exception if referenced schema does not exist

80e7d84

code cleanup

9198a2c

Merge pull request #1488 from microsoft/dependabot/nuget/Microsoft.OD…

d1cf89f

…ata.Edm-7.19.0 Bump Microsoft.OData.Edm from 7.18.0 to 7.19.0

Fix unresolved references in OpenApiWalker

5b40826

Fix culture dependency in ParseDecimalWithFallbackOnOverflow_Overflow…

8a40801

…s_ReturnsFallback test

Merge pull request #1492 from dldl-cmd/fix_ParseDecimalWithFallbackOn…

c2ca883

…Overflow_Overflows_ReturnsFallback_culture_dependend Fix culture dependency in ParseDecimalWithFallbackOnOverflow_Overflows_ReturnsFallback test

Use keyword examples instead of example

ffc87ca

Merge pull request #1496 from microsoft/dependabot/github_actions/act…

47636da

…ions/setup-dotnet-4 Bump actions/setup-dotnet from 3 to 4

Merge pull request #1494 from microsoft/dependabot/nuget/Verify.Xunit…

d3fa9ef

…-22.7.1 Bump Verify.Xunit from 22.6.0 to 22.7.1

MaggieKimani1 requested review from peombwa, zengin, baywet, millicentachieng and andrueastman as code owners December 13, 2023 10:03

github-advanced-security bot found potential problems Dec 13, 2023

View reviewed changes

src/Microsoft.OpenApi/Writers/OpenApiWriterBase.cs Fixed Show fixed Hide fixed

baywet requested changes Dec 13, 2023

View reviewed changes

MaggieKimani1 and others added 4 commits December 13, 2023 16:09

Use ternary operator and compound assignment.

8a48a77

Update src/Microsoft.OpenApi/Validations/Rules/JsonSchemaRules.cs

d6a6b53

Co-authored-by: Vincent Biret <[email protected]>

Update src/Microsoft.OpenApi/Validations/Rules/JsonSchemaRules.cs

a9048c1

Co-authored-by: Vincent Biret <[email protected]>

Update src/Microsoft.OpenApi/Validations/Rules/JsonSchemaRules.cs

cb8288b

Co-authored-by: Vincent Biret <[email protected]>

Remove commented out code

60d6993

baywet reviewed Dec 13, 2023

View reviewed changes

src/Microsoft.OpenApi/Services/OpenApiReferenceResolver.cs Outdated Show resolved Hide resolved

MaggieKimani1 added 2 commits December 13, 2023 16:20

Merge branch 'mk/fix-bugs-and-failing-tests' of https://github.com/mi…

d190669

…crosoft/OpenAPI.NET into mk/fix-bugs-and-failing-tests

Remove null check

0880d82

baywet reviewed Dec 13, 2023

View reviewed changes

src/Microsoft.OpenApi/Validations/Rules/JsonSchemaRules.cs Outdated Show resolved Hide resolved

Use pattern matching and the native count extension method

dedf3a2

github-advanced-security bot found potential problems Dec 13, 2023

View reviewed changes

src/Microsoft.OpenApi/Services/OpenApiReferenceResolver.cs Fixed Show fixed Hide fixed

MaggieKimani1 self-assigned this Dec 13, 2023

code cleanup

e585f4c

baywet requested changes Dec 13, 2023

View reviewed changes

src/Microsoft.OpenApi/Writers/OpenApiWriterBase.cs Outdated Show resolved Hide resolved

src/Microsoft.OpenApi/Writers/OpenApiWriterBase.cs Outdated Show resolved Hide resolved

src/Microsoft.OpenApi/Helpers/SchemaSerializerHelper.cs Show resolved Hide resolved

Apply suggestions from code review

0ed8e45

baywet approved these changes Dec 13, 2023

View reviewed changes

baywet reviewed Dec 13, 2023

View reviewed changes

test/Microsoft.OpenApi.Tests/PublicApi/PublicApi.approved.txt Outdated Show resolved Hide resolved

- updates public API

744d045

baywet approved these changes Dec 13, 2023

View reviewed changes

MaggieKimani1 merged commit 73aead3 into release/2.0.0 Dec 13, 2023
8 of 9 checks passed

MaggieKimani1 deleted the mk/fix-bugs-and-failing-tests branch December 13, 2023 15:21

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fixes bugs and failing tests #1503

Fixes bugs and failing tests #1503

MaggieKimani1 commented Dec 13, 2023 •

edited

Loading

baywet left a comment

MaggieKimani1 commented Dec 13, 2023

baywet left a comment

sonarqubecloud bot commented Dec 13, 2023

Fixes bugs and failing tests #1503

Fixes bugs and failing tests #1503

Conversation

MaggieKimani1 commented Dec 13, 2023 • edited Loading

baywet left a comment

Choose a reason for hiding this comment

MaggieKimani1 commented Dec 13, 2023

baywet left a comment

Choose a reason for hiding this comment

sonarqubecloud bot commented Dec 13, 2023

Quality Gate failed

MaggieKimani1 commented Dec 13, 2023 •

edited

Loading