Merge branch 'main' into main

Author: ramsessanchez

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

@@ -26,7 +26,7 @@ jobs:
       - name: Enable auto-merge for Dependabot PRs
         # Only if version bump is not a major version change
         if: ${{steps.metadata.outputs.update-type != 'version-update:semver-major'}}
-        run: gh pr merge --auto --merge "$PR_URL"
+        run: gh pr merge --auto -s "$PR_URL"
         env:
           PR_URL: ${{github.event.pull_request.html_url}}
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

.github/workflows/sonarcloud.yml

@@ -6,6 +6,7 @@ on:
       - main
   pull_request:
     types: [opened, synchronize, reopened]
+  merge_group:
 
 permissions:
   contents: read
@@ -32,7 +33,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Set up JDK 21
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: "adopt"
           java-version: 21

.github/workflows/validatePullRequest.yml

@@ -6,7 +6,8 @@ on:
     branches: [ 'feature/*', 'main' ]
   pull_request:
     branches: [ 'feature/*', 'main' ]
-
+  merge_group:
+    
 permissions:
   contents: read #those permissions are required to run the codeql analysis
   actions: read
@@ -15,7 +16,7 @@ permissions:
 jobs:
   build:
     name: Build and Test
-    runs-on: windows-latest
+    runs-on: windows-2022
     env:
       solutionName: Microsoft.Graph.Core.sln
       relativePath: ./src/Microsoft.Graph.Core
@@ -28,7 +29,7 @@ jobs:
           dotnet-version: 6.0.x
 
       - name: Setup JDK for android targets
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'microsoft'
           java-version: '11'
@@ -58,7 +59,7 @@ jobs:
 
   validate-trimming:
     name: Validate Project for Trimming
-    runs-on: windows-latest
+    runs-on: windows-2022
     steps:
       - uses: actions/[email protected]
 

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

@@ -63,16 +63,16 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.6.1" />
+    <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.15.0" />
     <PackageReference Include="Microsoft.IdentityModel.Validators" Version="8.6.1" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.Kiota.Abstractions" Version="1.17.1" />
-    <PackageReference Include="Microsoft.Kiota.Authentication.Azure" Version="1.17.1" />
-    <PackageReference Include="Microsoft.Kiota.Serialization.Json" Version="1.17.1" />
-    <PackageReference Include="Microsoft.Kiota.Serialization.Text" Version="1.17.1" />
-    <PackageReference Include="Microsoft.Kiota.Serialization.Form" Version="1.17.1" />
-    <PackageReference Include="Microsoft.Kiota.Http.HttpClientLibrary" Version="1.17.1" />
-    <PackageReference Include="Microsoft.Kiota.Serialization.Multipart" Version="1.17.1" />
+    <PackageReference Include="Microsoft.Kiota.Abstractions" Version="1.21.1" />
+    <PackageReference Include="Microsoft.Kiota.Authentication.Azure" Version="1.21.1" />
+    <PackageReference Include="Microsoft.Kiota.Serialization.Json" Version="1.21.1" />
+    <PackageReference Include="Microsoft.Kiota.Serialization.Text" Version="1.21.1" />
+    <PackageReference Include="Microsoft.Kiota.Serialization.Form" Version="1.21.1" />
+    <PackageReference Include="Microsoft.Kiota.Http.HttpClientLibrary" Version="1.21.1" />
+    <PackageReference Include="Microsoft.Kiota.Serialization.Multipart" Version="1.21.1" />
     <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.13.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>