Skip to content

Commit a038052

Browse files
Merge branch 'main' into dependabot/github_actions/actions/cache-5
2 parents 90495fe + 22fc476 commit a038052

File tree

4 files changed

+12
-10
lines changed

4 files changed

+12
-10
lines changed

.github/workflows/auto-merge-dependabot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- name: Enable auto-merge for Dependabot PRs
2727
# Only if version bump is not a major version change
2828
if: ${{steps.metadata.outputs.update-type != 'version-update:semver-major'}}
29-
run: gh pr merge --auto --merge "$PR_URL"
29+
run: gh pr merge --auto -s "$PR_URL"
3030
env:
3131
PR_URL: ${{github.event.pull_request.html_url}}
3232
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

.github/workflows/sonarcloud.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66
- main
77
pull_request:
88
types: [opened, synchronize, reopened]
9+
merge_group:
910

1011
permissions:
1112
contents: read

.github/workflows/validatePullRequest.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ on:
66
branches: [ 'feature/*', 'main' ]
77
pull_request:
88
branches: [ 'feature/*', 'main' ]
9-
9+
merge_group:
10+
1011
permissions:
1112
contents: read #those permissions are required to run the codeql analysis
1213
actions: read

src/Microsoft.Graph.Core/Microsoft.Graph.Core.csproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,16 +63,16 @@
6363
</None>
6464
</ItemGroup>
6565
<ItemGroup>
66-
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.6.1" />
66+
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.15.0" />
6767
<PackageReference Include="Microsoft.IdentityModel.Validators" Version="8.6.1" />
6868
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
69-
<PackageReference Include="Microsoft.Kiota.Abstractions" Version="1.17.1" />
70-
<PackageReference Include="Microsoft.Kiota.Authentication.Azure" Version="1.17.1" />
71-
<PackageReference Include="Microsoft.Kiota.Serialization.Json" Version="1.17.1" />
72-
<PackageReference Include="Microsoft.Kiota.Serialization.Text" Version="1.17.1" />
73-
<PackageReference Include="Microsoft.Kiota.Serialization.Form" Version="1.17.1" />
74-
<PackageReference Include="Microsoft.Kiota.Http.HttpClientLibrary" Version="1.17.1" />
75-
<PackageReference Include="Microsoft.Kiota.Serialization.Multipart" Version="1.17.1" />
69+
<PackageReference Include="Microsoft.Kiota.Abstractions" Version="1.21.1" />
70+
<PackageReference Include="Microsoft.Kiota.Authentication.Azure" Version="1.21.1" />
71+
<PackageReference Include="Microsoft.Kiota.Serialization.Json" Version="1.21.1" />
72+
<PackageReference Include="Microsoft.Kiota.Serialization.Text" Version="1.21.1" />
73+
<PackageReference Include="Microsoft.Kiota.Serialization.Form" Version="1.21.1" />
74+
<PackageReference Include="Microsoft.Kiota.Http.HttpClientLibrary" Version="1.21.1" />
75+
<PackageReference Include="Microsoft.Kiota.Serialization.Multipart" Version="1.21.1" />
7676
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.13.2">
7777
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
7878
<PrivateAssets>all</PrivateAssets>

0 commit comments

Comments
 (0)