Merge pull request #1122 from microsoftgraph/dev

Merge to Main

Author: ramsessanchez

.azure-pipelines/generation-pipeline.yml

@@ -502,6 +502,7 @@ stages:
         - template: generation-templates/java-kiota.yml
           parameters:
             repoName: msgraph-sdk-java
+            namespacePath: com/microsoft/graph
 
 - stage: stage_java_beta_kiota
   dependsOn:
@@ -524,13 +525,15 @@ stages:
         baseBranchName: 'feature/6.0'
         branchName: 'kiota/$(betaBranch)'
         targetClassName: "BaseGraphServiceClient"
-        targetNamespace: "com.Microsoft.Graph"
+        targetNamespace: "com.Microsoft.Graph.Beta"
         cleanMetadataFolder: $(cleanOpenAPIFolderBeta)
         customArguments: "-b -e '/me' -e '/me/**'" # Exclude /me/** and enable backing store
         languageSpecificSteps:
         - template: generation-templates/java-kiota.yml
           parameters:
             repoName: msgraph-beta-sdk-java
+            namespacePath: com/microsoft/graph/beta
+
 
 - stage: stage_php_beta_kiota
   dependsOn:

.azure-pipelines/generation-templates/java-kiota.yml

@@ -1,16 +1,18 @@
 parameters: 
 - name: repoName 
   type: string
+- name: namespacePath
+  type: string
 
 steps:
 - pwsh: '$(scriptsDirectory)/clean-java-files-kiota.ps1'
   displayName: 'Remove generated models and requests from the repo'
   env:
-    MainDirectory: $(Build.SourcesDirectory)/${{ parameters.repoName }}/src/main/java/com/microsoft/graph/
+    MainDirectory: $(Build.SourcesDirectory)/${{ parameters.repoName }}/src/main/java/${{ parameters.namespacePath }}/generated/
 
 - pwsh: '$(scriptsDirectory)/copy-java-models-kiota.ps1'
   displayName: 'Update with new models'
   env: 
     BuildConfiguration: $(buildConfiguration) 
-    OutputFullPath: $(kiotaDirectory)/output/*
-    RepoModelsDir: $(Build.SourcesDirectory)/${{ parameters.repoName }}/src/main/java/
+    OutputFullPath: $(kiotaDirectory)/output/${{ parameters.namespacePath }}/*
+    RepoModelsDir: $(Build.SourcesDirectory)/${{ parameters.repoName }}/src/main/java/${{ parameters.namespacePath }}/generated/

.github/workflows/dotnet.yml

@@ -16,7 +16,7 @@ jobs:
       with:
         submodules: recursive
     - name: Setup .NET
-      uses: actions/setup-dotnet@v3.2.0
+      uses: actions/setup-dotnet@v4.0.0
       with:
         dotnet-version: 7.0.x
     - name: Restore dependencies