Chore/resolve merge conflicts #2059
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Merge dev into master
Merge dev into master
Merge dev into master
Bump apidoctor from 1708be5 to 1916d8c (#2004) Add use import statements for PHP Snippets (#2000) Bump Microsoft.OpenApi.OData from 1.6.0 to 1.6.1 (#2007) Bump Microsoft.VisualStudio.Azure.Containers.Tools.Targets (#2008) Bump MSTest.TestFramework from 3.2.2 to 3.3.0 (#2009) Bump MSTest.TestFramework from 3.3.0 to 3.3.1 (#2011) Bump Microsoft.VisualStudio.Azure.Containers.Tools.Targets (#2010) Chore: change drop location (#2012)
…snippet_updates Shem/releas python path snippet updates
Merge dev into master
Merge Dev branch Into Master
* update request configuration class (#2034) * Merge dev to master (#2013) Bump apidoctor from 1708be5 to 1916d8c (#2004) Add use import statements for PHP Snippets (#2000) Bump Microsoft.OpenApi.OData from 1.6.0 to 1.6.1 (#2007) Bump Microsoft.VisualStudio.Azure.Containers.Tools.Targets (#2008) Bump MSTest.TestFramework from 3.2.2 to 3.3.0 (#2009) Bump MSTest.TestFramework from 3.3.0 to 3.3.1 (#2011) Bump Microsoft.VisualStudio.Azure.Containers.Tools.Targets (#2010) Chore: change drop location (#2012) * Remove built request configiguation name * Update unit tests for updated request configuration name * Update imports to inlcude base request configuration * update tests --------- Co-authored-by: Millicent Achieng <achieng.milli@gmail.com> Co-authored-by: Charles Wahome <thewahome.cw@gmail.com> * Bump Microsoft.AspNetCore.Authorization from 8.0.4 to 8.0.5 (#2049) Bumps [Microsoft.AspNetCore.Authorization](https://github.com/dotnet/aspnetcore) from 8.0.4 to 8.0.5. - [Release notes](https://github.com/dotnet/aspnetcore/releases) - [Changelog](https://github.com/dotnet/aspnetcore/blob/main/docs/ReleasePlanning.md) - [Commits](dotnet/aspnetcore@v8.0.4...v8.0.5) --- updated-dependencies: - dependency-name: Microsoft.AspNetCore.Authorization dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump Microsoft.AspNetCore.Authentication.JwtBearer from 8.0.4 to 8.0.5 (#2048) Bumps [Microsoft.AspNetCore.Authentication.JwtBearer](https://github.com/dotnet/aspnetcore) from 8.0.4 to 8.0.5. - [Release notes](https://github.com/dotnet/aspnetcore/releases) - [Changelog](https://github.com/dotnet/aspnetcore/blob/main/docs/ReleasePlanning.md) - [Commits](dotnet/aspnetcore@v8.0.4...v8.0.5) --- updated-dependencies: - dependency-name: Microsoft.AspNetCore.Authentication.JwtBearer dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Fix model import paths + Add support for enum imports (#2047) * Initial work on fixing paths. * Remove unused test. * Add imports for DateOnly, TimeOnly and Enums. * Fix issue with spelling. * Do slight refactor to improve style. * Fix more issues with the snippets. * Take care of corner cases. --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Shem Ogumbe <shemnashon@gmail.com> Co-authored-by: Millicent Achieng <achieng.milli@gmail.com> Co-authored-by: Charles Wahome <thewahome.cw@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
andrueastman
approved these changes
May 23, 2024
auto-merge was automatically disabled
May 23, 2024 08:41
Rebase failed
irvinesunday
added a commit
that referenced
this pull request
May 23, 2024
This reverts commit 24c881c.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Overview
Brief description of what this PR does, and why it is needed.
Demo
Optional. Screenshots,
curlexamples, etc.Notes
Optional. Ancillary topics, caveats, alternative strategies that didn't work out, anything else.
Testing Instructions
Microsoft Reviewers: Open in CodeFlow