ci: move php beta after v1

Author: MIchaelMainer

.azure-pipelines/generation-pipeline.yml

@@ -586,27 +586,28 @@ extends:
               parameters:
                 repoName: msgraph-beta-sdk-java
                 namespacePath: com/microsoft/graph/beta
-    - stage: stage_php_beta_kiota
+
+    - stage: stage_php_v1_kiota
       dependsOn:
       - stage_build_and_publish_kiota
-      - stage_beta_openapi
-      - open_api_beta_approval
+      - stage_v1_openapi
+      - open_api_v1_approval
       condition: |
         and
         (
           eq(dependencies.stage_build_and_publish_kiota.result, 'Succeeded'),
-          eq(dependencies.open_api_beta_approval.result, 'Succeeded'),
-          in(dependencies.stage_beta_openapi.result, 'Succeeded', 'Skipped')
+          eq(dependencies.open_api_v1_approval.result, 'Succeeded'),
+          in(dependencies.stage_v1_openapi.result, 'Succeeded', 'Skipped')
         )
       jobs:
-      - job: php_beta_kiota
+      - job: php_v1_kiota
         templateContext:
           inputs:
           - input: pipelineArtifact
             displayName: 'Downloading metadata from artifacts'
             buildType: 'current'
-            artifactName: $(cleanOpenAPIFolderBeta)
-            targetPath: '$(Build.SourcesDirectory)/msgraph-metadata/$(cleanOpenAPIFolderBeta)'
+            artifactName: $(cleanOpenAPIFolderV1)
+            targetPath: '$(Build.SourcesDirectory)/msgraph-metadata/$(cleanOpenAPIFolderV1)'
           - input: pipelineArtifact
             buildType: 'current'
             artifactName: 'kiota'
@@ -615,41 +616,41 @@ extends:
         - template: /.azure-pipelines/generation-templates/language-generation-kiota.yml@self
           parameters:
             language: 'php'
-            version: 'beta'
-            repoName: 'msgraph-beta-sdk-php'
-            branchName: 'kiota/$(betaBranch)'
+            version: ''
+            repoName: 'msgraph-sdk-php'
+            branchName: 'kiota/$(v1Branch)'
             targetClassName: "BaseGraphClient"
-            targetNamespace: 'Microsoft\\Graph\\Beta\\Generated'
+            targetNamespace: 'Microsoft\\Graph\\Generated'
             baseBranchName: 'main'
             commitMessagePrefix: "feat(generation): update request builders and models"
-            cleanMetadataFolder: $(cleanOpenAPIFolderBeta)
+            cleanMetadataFolder: $(cleanOpenAPIFolderV1)
             languageSpecificSteps:
             - template: /.azure-pipelines/generation-templates/php-kiota.yml@self
               parameters:
-                repoName: msgraph-beta-sdk-php
+                repoName: msgraph-sdk-php
             customArguments: "-b -e '/me' -e '/me/**'"  # Exclude /me/** and enable backing store
 
-    - stage: stage_php_v1_kiota
+    - stage: stage_php_beta_kiota
       dependsOn:
       - stage_build_and_publish_kiota
-      - stage_v1_openapi
-      - open_api_v1_approval
+      - stage_beta_openapi
+      - open_api_beta_approval
       condition: |
         and
         (
           eq(dependencies.stage_build_and_publish_kiota.result, 'Succeeded'),
-          eq(dependencies.open_api_v1_approval.result, 'Succeeded'),
-          in(dependencies.stage_v1_openapi.result, 'Succeeded', 'Skipped')
+          eq(dependencies.open_api_beta_approval.result, 'Succeeded'),
+          in(dependencies.stage_beta_openapi.result, 'Succeeded', 'Skipped')
         )
       jobs:
-      - job: php_v1_kiota
+      - job: php_beta_kiota
         templateContext:
           inputs:
           - input: pipelineArtifact
             displayName: 'Downloading metadata from artifacts'
             buildType: 'current'
-            artifactName: $(cleanOpenAPIFolderV1)
-            targetPath: '$(Build.SourcesDirectory)/msgraph-metadata/$(cleanOpenAPIFolderV1)'
+            artifactName: $(cleanOpenAPIFolderBeta)
+            targetPath: '$(Build.SourcesDirectory)/msgraph-metadata/$(cleanOpenAPIFolderBeta)'
           - input: pipelineArtifact
             buildType: 'current'
             artifactName: 'kiota'
@@ -658,18 +659,18 @@ extends:
         - template: /.azure-pipelines/generation-templates/language-generation-kiota.yml@self
           parameters:
             language: 'php'
-            version: ''
-            repoName: 'msgraph-sdk-php'
-            branchName: 'kiota/$(v1Branch)'
+            version: 'beta'
+            repoName: 'msgraph-beta-sdk-php'
+            branchName: 'kiota/$(betaBranch)'
             targetClassName: "BaseGraphClient"
-            targetNamespace: 'Microsoft\\Graph\\Generated'
+            targetNamespace: 'Microsoft\\Graph\\Beta\\Generated'
             baseBranchName: 'main'
             commitMessagePrefix: "feat(generation): update request builders and models"
-            cleanMetadataFolder: $(cleanOpenAPIFolderV1)
+            cleanMetadataFolder: $(cleanOpenAPIFolderBeta)
             languageSpecificSteps:
             - template: /.azure-pipelines/generation-templates/php-kiota.yml@self
               parameters:
-                repoName: msgraph-sdk-php
+                repoName: msgraph-beta-sdk-php
             customArguments: "-b -e '/me' -e '/me/**'"  # Exclude /me/** and enable backing store
 
     - stage: stage_typescript_v1