Skip to content

Commit

Permalink
Chore/resolve merge conflicts (#2059)
Browse files Browse the repository at this point in the history
* 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)

* update submodules

* update submodules

* Latest dev changes. (#2053)

* 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>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Millicent Achieng <achieng.milli@gmail.com>
Co-authored-by: Charles Wahome <thewahome.cw@gmail.com>
Co-authored-by: shemogumbe <shemogumbe@microsoft.com>
Co-authored-by: Shem Ogumbe <shemnashon@gmail.com>
Co-authored-by: Faith Kangai <fey101@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
7 people authored May 23, 2024
1 parent 4a56925 commit 24c881c
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 24c881c

Please sign in to comment.