Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merges dev into master #1612

Merged
merged 12 commits into from
Jun 23, 2023
Merged

Merges dev into master #1612

merged 12 commits into from
Jun 23, 2023

Conversation

irvinesunday
Copy link
Collaborator

No description provided.

Onokaev and others added 6 commits June 19, 2023 17:12
@Onokaev @andrueastman
Fix: Use pascal case for issue property key (#1603)
b2d736a 
* Use pascal case for issue propety key

* Update GraphWebApi/Controllers/KnownIssuesController.cs

Co-authored-by: Eastman <andrueastman@users.noreply.github.com>

---------

Co-authored-by: Eastman <andrueastman@users.noreply.github.com>
@andrueastman
Lookup schema with discriminator in OpenAPI snippets (#1604)
846a08e 
* Use shared base to reduce code repetition

* Looks up dereived types from schema list

* Fixes template matching for collections with functions

* Fixes Guid parsing

* Fixes enum parsing in path parameters

* Fix incorrect schema names when looked up from collections

* Fix namespaces lookup for collections

* Fix code smells
@dependabot
Bump Microsoft.OpenApi from 1.6.4 to 1.6.5 (#1606)
b29fe07 
Bumps [Microsoft.OpenApi](https://github.com/Microsoft/OpenAPI.NET) from 1.6.4 to 1.6.5.
- [Release notes](https://github.com/Microsoft/OpenAPI.NET/releases)
- [Commits](microsoft/OpenAPI.NET@1.6.4...1.6.5)

---
updated-dependencies:
- dependency-name: Microsoft.OpenApi
  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>
@dependabot
Bump Microsoft.OpenApi.Readers from 1.6.4 to 1.6.5 (#1605)
2956c8d 
Bumps [Microsoft.OpenApi.Readers](https://github.com/Microsoft/OpenAPI.NET) from 1.6.4 to 1.6.5.
- [Release notes](https://github.com/Microsoft/OpenAPI.NET/releases)
- [Commits](microsoft/OpenAPI.NET@1.6.4...1.6.5)

---
updated-dependencies:
- dependency-name: Microsoft.OpenApi.Readers
  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>
@dependabot
Bump Serilog from 2.12.0 to 3.0.0 (#1610)
7e84175 
Bumps [Serilog](https://github.com/serilog/serilog) from 2.12.0 to 3.0.0.
- [Release notes](https://github.com/serilog/serilog/releases)
- [Changelog](https://github.com/serilog/serilog/blob/dev/CHANGES.md)
- [Commits](serilog/serilog@v2.12.0...v3.0.0)

---
updated-dependencies:
- dependency-name: Serilog
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@Onokaev
Decouple wiql from class instance (#1609)
f5aab6d
@irvinesunday irvinesunday requested a review from a team as a code owner June 22, 2023 12:02
@baywet
Copy link
Member

baywet commented Jun 22, 2023

@irvinesunday this one is conflicting, you'd need to:

  1. switch to master
  2. pull
  3. create a branch from master
  4. switch to dev
  5. pull
  6. switch to the new branch
  7. merge dev (resolve the conflicts)
  8. PR from that branch to dev
  9. once that's merged, this PR won't be conflicting anymore.

@millicentachieng
Copy link
Contributor

@baywet Here's the PR #1613

dependabot bot and others added 5 commits June 22, 2023 17:04
@dependabot
Bump Microsoft.AspNetCore.Authentication.JwtBearer from 7.0.7 to 7.0.8 (
39393fa 
#1618)

Bumps [Microsoft.AspNetCore.Authentication.JwtBearer](https://github.com/dotnet/aspnetcore) from 7.0.7 to 7.0.8.
- [Release notes](https://github.com/dotnet/aspnetcore/releases)
- [Changelog](https://github.com/dotnet/aspnetcore/blob/main/docs/ReleasePlanning.md)
- [Commits](https://github.com/dotnet/aspnetcore/commits)

---
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>
@dependabot
Bump Microsoft.AspNetCore.Mvc.NewtonsoftJson from 7.0.7 to 7.0.8 (#1619)
5972f3a 
Bumps [Microsoft.AspNetCore.Mvc.NewtonsoftJson](https://github.com/dotnet/aspnetcore) from 7.0.7 to 7.0.8.
- [Release notes](https://github.com/dotnet/aspnetcore/releases)
- [Changelog](https://github.com/dotnet/aspnetcore/blob/main/docs/ReleasePlanning.md)
- [Commits](https://github.com/dotnet/aspnetcore/commits)

---
updated-dependencies:
- dependency-name: Microsoft.AspNetCore.Mvc.NewtonsoftJson
  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>
@dependabot
Bump Serilog from 3.0.0 to 3.0.1 (#1620)
15ba3f2 
Bumps [Serilog](https://github.com/serilog/serilog) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/serilog/serilog/releases)
- [Changelog](https://github.com/serilog/serilog/blob/dev/CHANGES.md)
- [Commits](serilog/serilog@v3.0.0...v3.0.1)

---
updated-dependencies:
- dependency-name: Serilog
  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>
@dependabot
Bump Microsoft.AspNetCore.Authorization from 7.0.7 to 7.0.8 (#1617)
79c054f 
Bumps [Microsoft.AspNetCore.Authorization](https://github.com/dotnet/aspnetcore) from 7.0.7 to 7.0.8.
- [Release notes](https://github.com/dotnet/aspnetcore/releases)
- [Changelog](https://github.com/dotnet/aspnetcore/blob/main/docs/ReleasePlanning.md)
- [Commits](https://github.com/dotnet/aspnetcore/commits)

---
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>
@irvinesunday
Merge pull request #1613 from microsoftgraph/merge-master-to-dev
c906340 
Merge master to dev
@sonarcloud
Copy link

sonarcloud bot commented Jun 23, 2023

SonarCloud Quality Gate failed.    Quality Gate failed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

69.2% 69.2% Coverage
0.0% 0.0% Duplication

idea Catch issues before they fail your Quality Gate with our IDE extension sonarlint SonarLint

@millicentachieng millicentachieng merged commit c19ac50 into master Jun 23, 2023
10 of 11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@millicentachieng millicentachieng millicentachieng approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@irvinesunday @baywet @millicentachieng @Onokaev @andrueastman