From d51aa7cbef8b9f26536d74cc5f4e2f6a9ffea3bb Mon Sep 17 00:00:00 2001
From: "Michael Mainer (from Dev Box)"
 <8527305+MIchaelMainer@users.noreply.github.com>
Date: Fri, 24 Oct 2025 13:58:49 -0700
Subject: [PATCH 1/3] ci: move php beta after v1

---
 .azure-pipelines/generation-pipeline.yml | 57 ++++++++++++------------
 1 file changed, 29 insertions(+), 28 deletions(-)

diff --git a/.azure-pipelines/generation-pipeline.yml b/.azure-pipelines/generation-pipeline.yml
index 787ef9776..14ae4f442 100644
--- a/.azure-pipelines/generation-pipeline.yml
+++ b/.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

From 77d4a6b2dddf15463c6ae3b074c615d350beacae Mon Sep 17 00:00:00 2001
From: "Michael Mainer (from Dev Box)"
 <8527305+MIchaelMainer@users.noreply.github.com>
Date: Fri, 24 Oct 2025 15:37:21 -0700
Subject: [PATCH 2/3] ci: add generation stage for v1 copilot

---
 .azure-pipelines/generation-pipeline.yml | 47 ++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/.azure-pipelines/generation-pipeline.yml b/.azure-pipelines/generation-pipeline.yml
index 14ae4f442..3e084179c 100644
--- a/.azure-pipelines/generation-pipeline.yml
+++ b/.azure-pipelines/generation-pipeline.yml
@@ -879,6 +879,7 @@ extends:
               parameters:
                 repoName: msgraph-sdk-python
                 baseDirectory: msgraph
+
     - stage: stage_python_beta
       dependsOn:
       - stage_build_and_publish_kiota
@@ -921,6 +922,51 @@ extends:
               parameters:
                 repoName: msgraph-beta-sdk-python
                 baseDirectory: msgraph_beta
+
+    - stage: stage_agents_m365copilot_csharp_v1
+      dependsOn:
+      - stage_build_and_publish_kiota
+      - stage_v1_openapi
+      condition: |
+        and
+        (
+          eq(dependencies.stage_build_and_publish_kiota.result, 'Succeeded'),
+          in(dependencies.stage_v1_openapi.result, 'Succeeded', 'Skipped')
+        )
+      jobs:
+      - job: csharp_v1_agents_m365copilot
+        templateContext:
+          inputs:
+          - input: pipelineArtifact
+            displayName: 'Downloading metadata from artifacts'
+            buildType: 'current'
+            artifactName: $(cleanOpenAPIFolderV1)
+            targetPath: '$(Build.SourcesDirectory)/msgraph-metadata/$(cleanOpenAPIFolderV1)'
+          - input: pipelineArtifact
+            buildType: 'current'
+            artifactName: 'kiota'
+            targetPath: '$(kiotaDirectory)'
+        steps:
+        - template: /.azure-pipelines/generation-templates/language-generation-kiota.yml@self
+          parameters:
+            language: 'csharp'
+            version: ''
+            orgName: 'microsoft'
+            repoName: 'Agents-M365Copilot'
+            baseBranchName: 'main'
+            branchName: 'ccs-dotnet/$(v1Branch)'
+            targetClassName: "BaseAgentsM365CopilotServiceClient"
+            targetNamespace: "Microsoft.Agents.M365Copilot"
+            commitMessagePrefix: "feat(generation): update request builders and models for dotnet v1"
+            customArguments: "-b -i '**/copilot/**'" # Enable the backing store, include only copilot paths
+            cleanMetadataFolder: $(cleanOpenAPIFolderV1)
+            pathExclusionArguments: ''
+            languageSpecificSteps:
+            - template: /.azure-pipelines/generation-templates/dotnet-kiota.yml@self
+              parameters:
+                repoName: 'Agents-M365Copilot/dotnet'
+                packageName: Microsoft.Agents.M365Copilot
+
     - stage: stage_agents_m365copilot_csharp_beta
       dependsOn:
       - stage_build_and_publish_kiota
@@ -964,6 +1010,7 @@ extends:
               parameters:
                 repoName: 'Agents-M365Copilot/dotnet'
                 packageName: Microsoft.Agents.M365Copilot.Beta
+
     - stage: stage_agents_m365copilot_python_beta
       dependsOn:
       - stage_build_and_publish_kiota

From efd9d8d3a23c07b1be24771f62b8449c3ae1a313 Mon Sep 17 00:00:00 2001
From: "Michael Mainer (from Dev Box)"
 <8527305+MIchaelMainer@users.noreply.github.com>
Date: Tue, 28 Oct 2025 16:12:17 -0700
Subject: [PATCH 3/3] ci: add version name for better PR info

---
 .azure-pipelines/generation-pipeline.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.azure-pipelines/generation-pipeline.yml b/.azure-pipelines/generation-pipeline.yml
index 3e084179c..6000b3f6a 100644
--- a/.azure-pipelines/generation-pipeline.yml
+++ b/.azure-pipelines/generation-pipeline.yml
@@ -950,7 +950,7 @@ extends:
         - template: /.azure-pipelines/generation-templates/language-generation-kiota.yml@self
           parameters:
             language: 'csharp'
-            version: ''
+            version: 'v1'
             orgName: 'microsoft'
             repoName: 'Agents-M365Copilot'
             baseBranchName: 'main'