Uh oh!
There was an error while loading. Please reload this page.
Fixes bugs and failing tests - #1503
Conversation
Handle number overflow during parsing of min/max values
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] <support@github.com>
…-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] <support@github.com>
Bump Moq from 4.20.69 to 4.20.70
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] <support@github.com>
…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] <support@github.com>
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] <support@github.com>
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] <support@github.com>
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] <support@github.com>
…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
Uh oh!
There was an error while loading. Please reload this page.
Vincent Biret (baywet)
left a comment
There was a problem hiding this comment.
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?
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
Co-authored-by: Vincent Biret <vibiret@microsoft.com>
Co-authored-by: Vincent Biret <vibiret@microsoft.com>
Co-authored-by: Vincent Biret <vibiret@microsoft.com>
Maggie Kimani (MaggieKimani1)
commented
Dec 13, 2023
Actually most of the conflicts I resolved by merging vnext into our v2 branch I committed directly into the v2 branch. |
Uh oh!
There was an error while loading. Please reload this page.
…crosoft/OpenAPI.NET into mk/fix-bugs-and-failing-tests
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
Vincent Biret (baywet)
left a comment
There was a problem hiding this comment.
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.
Uh oh!
There was an error while loading. Please reload this page.
|

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