Merge pull request #1365 from microsoftgraph/dev

main refresh

Author: baywet

.azure-pipelines/generation-pipeline.yml

@@ -110,6 +110,11 @@ resources:
      type: github
      endpoint: microsoftkiota
      name: microsoft/kiota
+   - repository: Agents-M365Copilot
+     type: github
+     endpoint: microsoftkiota
+     name: microsoft/Agents-M365Copilot
+
 
 pool: 1es-ubuntu-latest-m
 
@@ -766,3 +771,101 @@ stages:
             repoName: msgraph-beta-cli
             projectFile: src/msgraph-beta-cli.csproj
 
+- stage: stage_ccs_csharp_beta
+  dependsOn:
+  - stage_build_and_publish_kiota
+  - stage_beta_openapi
+  condition: |
+    and
+    (
+      eq(dependencies.stage_build_and_publish_kiota.result, 'Succeeded'),
+      in(dependencies.stage_beta_openapi.result, 'Succeeded', 'Skipped')
+    )
+  jobs:
+  - job: csharp_beta_ccs
+    steps:
+    - template: generation-templates/language-generation-kiota.yml
+      parameters:
+        language: 'csharp'
+        version: 'beta'
+        orgName: 'microsoft'
+        repoName: 'Agents-M365Copilot'
+        baseBranchName : 'main'
+        branchName: 'ccs-dotnet/$(betaBranch)'
+        targetClassName: "BaseAgentsM365CopilotBetaServiceClient"
+        targetNamespace: "Microsoft.Agents.M365Copilot.Beta"
+        commitMessagePrefix: "feat(generation): update request builders and models for dotnet beta"
+        customArguments: "-b -i '**/copilot/**'" # Enable the backing store, include only copilot paths
+        cleanMetadataFolder: $(cleanOpenAPIFolderBeta)
+        pathExclusionArguments: ''
+        languageSpecificSteps:
+        - template: generation-templates/dotnet-kiota.yml
+          parameters:
+            repoName: 'Agents-M365Copilot/dotnet'
+            packageName: Microsoft.Agents.M365Copilot.Beta
+
+- stage: stage_ccs_python_beta
+  dependsOn:
+  - stage_build_and_publish_kiota
+  - stage_beta_openapi
+  condition: |
+    and
+    (
+      eq(dependencies.stage_build_and_publish_kiota.result, 'Succeeded'),
+      in(dependencies.stage_beta_openapi.result, 'Succeeded', 'Skipped')
+    )
+  jobs:
+  - job: python_beta_ccs
+    steps:
+    - template: generation-templates/language-generation-kiota.yml
+      parameters:
+        language: 'python'
+        version: 'beta'
+        orgName: 'microsoft'
+        repoName: 'Agents-M365Copilot'
+        baseBranchName : 'main'
+        branchName: 'ccs-python/$(betaBranch)'
+        targetClassName: "BaseAgentsM365CopilotBetaServiceClient"
+        targetNamespace: "microsoft_agents_m365copilot_beta.generated"
+        customArguments: "-b -i '**/copilot/**'" # Enable the backing store, include only copilot paths
+        cleanMetadataFolder: $(cleanOpenAPIFolderBeta)
+        commitMessagePrefix: "feat(generation): update request builders and models for python beta"
+        pathExclusionArguments: ''
+        languageSpecificSteps:
+        - template: generation-templates/python.yml
+          parameters:
+            repoName: 'Agents-M365Copilot/python/packages'
+            baseDirectory: microsoft_agents_m365copilot_beta
+
+- stage: stage_ccs_typescript_beta
+  dependsOn:
+  - stage_build_and_publish_kiota
+  - stage_beta_openapi
+  condition: |
+    and
+    (
+      eq(dependencies.stage_build_and_publish_kiota.result, 'Succeeded'),
+      in(dependencies.stage_beta_openapi.result, 'Succeeded', 'Skipped')
+    )
+  jobs:
+  - job: typescript_beta_ccs
+    steps:
+    - template: generation-templates/language-generation-kiota.yml
+      parameters:
+        language: 'typescript'
+        version: 'beta'
+        orgName: 'microsoft'
+        repoName: 'Agents-M365Copilot'
+        baseBranchName : 'main'
+        branchName: 'ccs-typescript/$(betaBranch)'
+        commitMessagePrefix: "feat(generation): update request builders and models for typescript beta"
+        targetClassName: "BaseAgentsM365CopilotBetaServiceClient"
+        targetNamespace: "github.com/microsoft/Agents-M365Copilot/typescript/"
+        customArguments: "-b -i '**/copilot/**'" # Enable the backing store, include only copilot paths
+        cleanMetadataFolder: $(cleanOpenAPIFolderBeta)
+        pathExclusionArguments: ''
+        languageSpecificSteps:
+        - template: generation-templates/ccs-typescript-sdk.yml
+          parameters:
+            repoName: 'Agents-M365Copilot/typescript'
+            packageName: '@microsoft/agents-m365copilot-beta'

.azure-pipelines/generation-templates/ccs-typescript-sdk.yml

@@ -0,0 +1,13 @@
+parameters:
+  - name: repoName
+    type: string
+  - name: packageName
+    type: string
+    default: '@microsoft/agents-m365copilot'
+
+steps:
+  - pwsh: '$(scriptsDirectory)/clean-typescript-ccs-files.ps1 -targetDirectory "$(Build.SourcesDirectory)/${{ parameters.repoName }}/packages/" -packageName "${{ parameters.packageName }}"'
+    displayName: 'Remove generated models and requests from the repo folder'
+
+  - pwsh: '$(scriptsDirectory)/copy-ccs-typescript-sdk-models.ps1 -sourceDirectory "$(kiotaDirectory)/output/*" -targetDirectory "$(Build.SourcesDirectory)/${{ parameters.repoName }}/packages/" -packageName "${{ parameters.packageName }}"'
+    displayName: "Update models"

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

@@ -2,11 +2,15 @@ parameters:
   - name: repoName
     type: string
 
+  - name: packageName
+    type: string
+    default: Microsoft.Graph
+
 steps:
-- pwsh: '$(scriptsDirectory)/copy-dotnet-models-kiota.ps1'
-  displayName: 'Update models'
-  env:
-    BuildConfiguration: $(buildConfiguration)
-    OutputFullPath: $(kiotaDirectory)/output/*
-    RepoModelsDir: $(Build.SourcesDirectory)/${{ parameters.repoName }}/src/Microsoft.Graph/Generated/
+  - pwsh: "$(scriptsDirectory)/copy-dotnet-models-kiota.ps1"
+    displayName: "Update models"
+    env:
+      BuildConfiguration: $(buildConfiguration)
+      OutputFullPath: $(kiotaDirectory)/output/*
+      RepoModelsDir: $(Build.SourcesDirectory)/${{ parameters.repoName }}/src/${{ parameters.packageName }}/Generated/
 

.azure-pipelines/generation-templates/dotnet.yml

@@ -5,13 +5,17 @@ parameters:
   - name: dllName
     type: string
 
+  - name: packageName
+    type: string
+    default: Microsoft.Graph
+
 steps:
 - pwsh: '$(scriptsDirectory)/copy-dotnet-models.ps1'
   displayName: 'Update .NET models - ${{ parameters.repoName }}'
   env:
     BuildConfiguration: $(buildConfiguration)
     OutputFullPath: $(typewriterDirectory)/output
-    RepoModelsDir: $(Build.SourcesDirectory)/${{ parameters.repoName }}/src/Microsoft.Graph/Generated/
+    RepoModelsDir: $(Build.SourcesDirectory)/${{ parameters.repoName }}/src/{{ parameters.packageName}}/Generated/
 
-- pwsh: dotnet build ${{ parameters.repoName }}/src/Microsoft.Graph/ --configuration $(buildConfiguration)
+- pwsh: dotnet build ${{ parameters.repoName }}/src/{{ parameters.packageName}}/ --configuration $(buildConfiguration)
   displayName: smoke test - build dll for ${{ parameters.dllName }}

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

@@ -15,6 +15,10 @@ parameters:
 - name: repoName
   type: string
 
+- name: orgName
+  type: string
+  default: microsoftgraph # the assumption is that repo is in the microsoftgraph org
+
 - name: branchName
   type: string
 
@@ -117,7 +121,7 @@ steps:
     GhAppId: $(microsoft-graph-devx-bot-appid)
     GhAppKey: $(microsoft-graph-devx-bot-privatekey)
     OverrideSkipCI: $(overrideSkipCI)
-    RepoName: 'microsoftgraph/${{ parameters.repoName}}' # the assumption is that repo in the microsoftgraph org
+    RepoName: '${{ parameters.orgName }}/${{ parameters.repoName}}'
     ScriptsDirectory: $(scriptsDirectory)
     Version: ${{ parameters.version }}
   workingDirectory: ${{ parameters.repoName }}

.azure-pipelines/generation-templates/objc.yml

@@ -0,0 +1,32 @@
+param (
+    [Parameter(Mandatory = $true)]
+    [string]
+    $targetDirectory,
+    [string]
+    $packageName = "@microsoft/agents-m365copilot"
+)
+Push-Location $targetDirectory
+
+$kiotaLockFileName = "kiota-lock.json"
+# Extract folder name from package name (the part after the slash)
+$folderToClean = $packageName.Split("/")[1]
+$folderToCleanPath = Join-Path $targetDirectory -ChildPath $folderToClean -AdditionalChildPath "generated"
+
+# Check if the folder to clean exists
+if (Test-Path $folderToCleanPath) {
+    Write-Host "Cleaning contents in: $folderToClean" -ForegroundColor Cyan
+    Push-Location $folderToCleanPath
+    # Clean directories
+    Get-ChildItem -Directory | ForEach-Object { Remove-Item -r $_.FullName }
+    # Clean TypeScript files except index.ts
+    Remove-Item *.ts -Exclude "index.ts"
+    # Remove kiota lock file
+    Remove-Item $kiotaLockFileName -ErrorAction SilentlyContinue -Verbose
+    Pop-Location
+    Write-Host "Successfully cleaned contents in: $folderToClean" -ForegroundColor Green
+} else {
+    Write-Host "Warning: Folder '$folderToClean' does not exist in the target directory." -ForegroundColor Yellow
+}
+
+Pop-Location
+Write-Host "Cleaning operation completed for target: $folderToClean derived from package: $packageName" -ForegroundColor Green

apidoctor

@@ -0,0 +1,15 @@
+param (
+    [Parameter(Mandatory = $true)]
+    [string]
+    $targetDirectory,
+    [Parameter(Mandatory = $true)]
+    [string]
+    $sourceDirectory,
+    [string]
+    $packageName = "@microsoft/copilot-beta-sdk"
+)
+
+Write-Host "Path to repo models directory: $targetDirectory"
+$mainPackageDirectoryName = $packageName.Split("/")[1]
+$modelsPackagePath = Join-Path $targetDirectory -ChildPath $mainPackageDirectoryName -AdditionalChildPath "generated"
+Copy-Item $sourceDirectory -Destination $modelsPackagePath -Recurse -Force