From 0bc345a1609089f652126d61799e72b7c86eae0b Mon Sep 17 00:00:00 2001 From: "Michael Mainer (from Dev Box)" <8527305+MIchaelMainer@users.noreply.github.com> Date: Thu, 13 Nov 2025 14:31:33 -0800 Subject: [PATCH 1/2] ci: fix target endpoint, fix non escaped sequence for php --- .azure-pipelines/generation-pipeline.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.azure-pipelines/generation-pipeline.yml b/.azure-pipelines/generation-pipeline.yml index c9c86140e..749de5c4e 100644 --- a/.azure-pipelines/generation-pipeline.yml +++ b/.azure-pipelines/generation-pipeline.yml @@ -620,7 +620,7 @@ extends: repoName: 'msgraph-sdk-php' branchName: 'kiota/$(v1Branch)' targetClassName: "BaseGraphClient" - targetNamespace: 'Microsoft\\Graph\\Generated' + targetNamespace: 'Microsoft\Graph\Generated' baseBranchName: 'main' commitMessagePrefix: "feat(generation): update request builders and models" cleanMetadataFolder: $(cleanOpenAPIFolderV1) @@ -663,7 +663,7 @@ extends: repoName: 'msgraph-beta-sdk-php' branchName: 'kiota/$(betaBranch)' targetClassName: "BaseGraphClient" - targetNamespace: 'Microsoft\\Graph\\Beta\\Generated' + targetNamespace: 'Microsoft\Graph\Beta\Generated' baseBranchName: 'main' commitMessagePrefix: "feat(generation): update request builders and models" cleanMetadataFolder: $(cleanOpenAPIFolderBeta) @@ -1110,7 +1110,7 @@ extends: in(dependencies.stage_v1_openapi.result, 'Succeeded', 'Skipped') ) jobs: - - job: typescript_beta_agents_m365copilot + - job: typescript_v1_agents_m365copilot templateContext: inputs: - input: pipelineArtifact @@ -1126,7 +1126,7 @@ extends: - template: /.azure-pipelines/generation-templates/language-generation-kiota.yml@self parameters: language: 'typescript' - version: 'beta' + version: 'v1' orgName: 'microsoft' repoName: 'Agents-M365Copilot' baseBranchName: 'main' From 25fd012cd6ce8a0091a892a3946eb237a0637697 Mon Sep 17 00:00:00 2001 From: "Michael Mainer (from Dev Box)" <8527305+MIchaelMainer@users.noreply.github.com> Date: Thu, 13 Nov 2025 14:31:46 -0800 Subject: [PATCH 2/2] ci: make parameter mandatory --- scripts/clean-typescript-ccs-files.ps1 | 5 ++++- scripts/copy-ccs-typescript-sdk-models.ps1 | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/clean-typescript-ccs-files.ps1 b/scripts/clean-typescript-ccs-files.ps1 index 7698c9e47..7b7bf37fc 100644 --- a/scripts/clean-typescript-ccs-files.ps1 +++ b/scripts/clean-typescript-ccs-files.ps1 @@ -2,11 +2,14 @@ param ( [Parameter(Mandatory = $true)] [string] $targetDirectory, + [Parameter(Mandatory = $true)] [string] - $packageName = "@microsoft/agents-m365copilot" + $packageName ) Push-Location $targetDirectory +Write-Host "Starting cleaning operation in target directory: $targetDirectory" + $kiotaLockFileName = "kiota-lock.json" # Extract folder name from package name (the part after the slash) $folderToClean = $packageName.Split("/")[1] diff --git a/scripts/copy-ccs-typescript-sdk-models.ps1 b/scripts/copy-ccs-typescript-sdk-models.ps1 index 8fae6b6b3..f6a0edbf3 100644 --- a/scripts/copy-ccs-typescript-sdk-models.ps1 +++ b/scripts/copy-ccs-typescript-sdk-models.ps1 @@ -5,8 +5,9 @@ param ( [Parameter(Mandatory = $true)] [string] $sourceDirectory, + [Parameter(Mandatory = $true)] [string] - $packageName = "@microsoft/copilot-beta-sdk" + $packageName ) Write-Host "Path to repo models directory: $targetDirectory"