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

Merge branch Dev into Master #2110

Merged
merged 22 commits into from
Jul 24, 2024
Merged

Merge branch Dev into Master #2110

merged 22 commits into from
Jul 24, 2024

Conversation

fey101
Copy link
Contributor

@fey101 fey101 commented Jul 24, 2024 •
edited by microsoft-github-policy-service bot
Loading

  • update script to generate raptor report to login with managed ID
  • Change used pool to 1-es hosted pool
  • Other commits other than 11a5cdc describing changes above

Overview

  • Merge Commits from dev into master branch

Testing Instructions

Among other changes, the below one is expected

  • When Snippet gen pipeline is run with base as master branch, the 3rd stage, 'GenerateCategorizationReport', should run successfully to completion
Microsoft Reviewers: Open in CodeFlow

dependabot bot and others added 22 commits June 13, 2024 09:16
@dependabot
Bump Microsoft.IO.RecyclableMemoryStream from 3.0.0 to 3.0.1 (#2085)
9af7288 
Bumps [Microsoft.IO.RecyclableMemoryStream](https://github.com/Microsoft/Microsoft.IO.RecyclableMemoryStream) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/Microsoft/Microsoft.IO.RecyclableMemoryStream/releases)
- [Changelog](https://github.com/microsoft/Microsoft.IO.RecyclableMemoryStream/blob/master/CHANGES.md)
- [Commits](microsoft/Microsoft.IO.RecyclableMemoryStream@3.0.0...v3.0.1)

---
updated-dependencies:
- dependency-name: Microsoft.IO.RecyclableMemoryStream
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@millicentachieng
Make docs permissions pipeline 1ES compliant (#2084)
2e067de
@dependabot
Bump Microsoft.OpenApi from 1.6.14 to 1.6.15 (#2087)
3737193 
Bumps [Microsoft.OpenApi](https://github.com/Microsoft/OpenAPI.NET) from 1.6.14 to 1.6.15.
- [Release notes](https://github.com/Microsoft/OpenAPI.NET/releases)
- [Commits](microsoft/OpenAPI.NET@1.6.14...1.6.15)

---
updated-dependencies:
- dependency-name: Microsoft.OpenApi
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump Microsoft.OpenApi.Readers from 1.6.14 to 1.6.15 (#2088)
3341519 
Bumps [Microsoft.OpenApi.Readers](https://github.com/Microsoft/OpenAPI.NET) from 1.6.14 to 1.6.15.
- [Release notes](https://github.com/Microsoft/OpenAPI.NET/releases)
- [Commits](microsoft/OpenAPI.NET@1.6.14...1.6.15)

---
updated-dependencies:
- dependency-name: Microsoft.OpenApi.Readers
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@thewahome
Task: Use managed identities to access the blob (#2089)
af0f418
@dependabot
Bump Microsoft.OpenApi.OData from 1.6.6 to 1.6.7 (#2092)
2cd867e 
Bumps [Microsoft.OpenApi.OData](https://github.com/Microsoft/OpenAPI.NET.OData) from 1.6.6 to 1.6.7.
- [Release notes](https://github.com/Microsoft/OpenAPI.NET.OData/releases)
- [Commits](https://github.com/Microsoft/OpenAPI.NET.OData/commits)

---
updated-dependencies:
- dependency-name: Microsoft.OpenApi.OData
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump Microsoft.VisualStudio.Azure.Containers.Tools.Targets (#2094)
20ef076 
Bumps Microsoft.VisualStudio.Azure.Containers.Tools.Targets from 1.20.1 to 1.21.0.

---
updated-dependencies:
- dependency-name: Microsoft.VisualStudio.Azure.Containers.Tools.Targets
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump Microsoft.Graph.Kibali from 0.19.0 to 0.21.0 (#2093)
900bd59 
Bumps [Microsoft.Graph.Kibali](https://github.com/MicrosoftGraph/kibali) from 0.19.0 to 0.21.0.
- [Release notes](https://github.com/MicrosoftGraph/kibali/releases)
- [Commits](https://github.com/MicrosoftGraph/kibali/commits)

---
updated-dependencies:
- dependency-name: Microsoft.Graph.Kibali
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump apidoctor from 7017125 to d45cf16 (#2095)
3178ab7 
Bumps [apidoctor](https://github.com/OneDrive/apidoctor) from `7017125` to `d45cf16`.
- [Commits](OneDrive/apidoctor@7017125...d45cf16)

---
updated-dependencies:
- dependency-name: apidoctor
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump xunit from 2.8.1 to 2.9.0 (#2098)
8bcca23 
Bumps xunit from 2.8.1 to 2.9.0.

---
updated-dependencies:
- dependency-name: xunit
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump System.Text.Json from 8.0.3 to 8.0.4 (#2100)
c833700 
Bumps System.Text.Json from 8.0.3 to 8.0.4.

---
updated-dependencies:
- dependency-name: System.Text.Json
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump Microsoft.Extensions.Configuration.Binder from 8.0.1 to 8.0.2 (#…
dfb0a69 
…2099)

Bumps Microsoft.Extensions.Configuration.Binder from 8.0.1 to 8.0.2.

---
updated-dependencies:
- dependency-name: Microsoft.Extensions.Configuration.Binder
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump Microsoft.AspNetCore.Authentication.JwtBearer from 8.0.6 to 8.0.7 (
1e6c2de 
#2101)

Bumps Microsoft.AspNetCore.Authentication.JwtBearer from 8.0.6 to 8.0.7.

---
updated-dependencies:
- dependency-name: Microsoft.AspNetCore.Authentication.JwtBearer
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump Microsoft.AspNetCore.Authorization from 8.0.6 to 8.0.7 (#2102)
5b28369 
Bumps Microsoft.AspNetCore.Authorization from 8.0.6 to 8.0.7.

---
updated-dependencies:
- dependency-name: Microsoft.AspNetCore.Authorization
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@fey101
update script to generate raptor report to login with managed ID (#2096)
11a5cdc 
* update script to generate raptor report to login with managed ID

* Add the username of managed identity

* Properly set managed identity login

* correctly specify working dir

* Change used pool to 1-es hosted pool

* separate installing of ImportExcel and creation of directory items

* ignore importExcel dependencies for autofit as aesthetics

* Add debug messages

* Debug some more. Working locally

* specify appSettings path explicitly

* fix base for fetching specificError

* make path to appSettings.json absoluteand present

* clean up
@dependabot
Bump Microsoft.VisualStudio.Web.CodeGeneration.Design (#2104)
7843e88 
Bumps Microsoft.VisualStudio.Web.CodeGeneration.Design from 8.0.2 to 8.0.3.

---
updated-dependencies:
- dependency-name: Microsoft.VisualStudio.Web.CodeGeneration.Design
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump Azure.Storage.Blobs from 12.20.0 to 12.21.0 (#2105)
714b3ad 
Bumps [Azure.Storage.Blobs](https://github.com/Azure/azure-sdk-for-net) from 12.20.0 to 12.21.0.
- [Release notes](https://github.com/Azure/azure-sdk-for-net/releases)
- [Commits](Azure/azure-sdk-for-net@Azure.Storage.Blobs_12.20.0...Azure.Storage.Blobs_12.21.0)

---
updated-dependencies:
- dependency-name: Azure.Storage.Blobs
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump MSTest.TestFramework from 3.4.3 to 3.5.0 (#2106)
6c8f20f 
Bumps [MSTest.TestFramework](https://github.com/microsoft/testfx) from 3.4.3 to 3.5.0.
- [Release notes](https://github.com/microsoft/testfx/releases)
- [Changelog](https://github.com/microsoft/testfx/blob/main/docs/Changelog.md)
- [Commits](microsoft/testfx@v3.4.3...v3.5.0)

---
updated-dependencies:
- dependency-name: MSTest.TestFramework
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump xunit.runner.visualstudio from 2.8.1 to 2.8.2 (#2097)
f7f08e5 
Bumps xunit.runner.visualstudio from 2.8.1 to 2.8.2.

---
updated-dependencies:
- dependency-name: xunit.runner.visualstudio
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump apidoctor from d45cf16 to edfb272 (#2107)
0beec28 
Bumps [apidoctor](https://github.com/OneDrive/apidoctor) from `d45cf16` to `edfb272`.
- [Commits](OneDrive/apidoctor@d45cf16...edfb272)

---
updated-dependencies:
- dependency-name: apidoctor
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@irvinesunday
Merge branch 'dev' into is/resolve-merge-conflicts
85965a7
@irvinesunday
Merge pull request #2109 from microsoftgraph/is/resolve-merge-conflicts
61d9e48 
Resolves merge conflicts from dev to master
@fey101 fey101 requested a review from a team as a code owner July 24, 2024 07:58
@fey101 fey101 enabled auto-merge July 24, 2024 07:58
@fey101 fey101 mentioned this pull request Jul 24, 2024
Closed
@sonarqubecloud SonarQubeCloud
Copy link

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

@fey101 fey101 merged commit d041e26 into master Jul 24, 2024
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andrueastman andrueastman andrueastman 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.
5 participants
@fey101 @andrueastman @millicentachieng @thewahome @irvinesunday