Skip to content

Commit 5997274

Browse files
Merge pull request #1401 from microsoftgraph/mmainer/fix-php
ci: fix php generation
2 parents 3ff289b + 25fd012 commit 5997274

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

.azure-pipelines/generation-pipeline.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -620,7 +620,7 @@ extends:
620620
repoName: 'msgraph-sdk-php'
621621
branchName: 'kiota/$(v1Branch)'
622622
targetClassName: "BaseGraphClient"
623-
targetNamespace: 'Microsoft\\Graph\\Generated'
623+
targetNamespace: 'Microsoft\Graph\Generated'
624624
baseBranchName: 'main'
625625
commitMessagePrefix: "feat(generation): update request builders and models"
626626
cleanMetadataFolder: $(cleanOpenAPIFolderV1)
@@ -663,7 +663,7 @@ extends:
663663
repoName: 'msgraph-beta-sdk-php'
664664
branchName: 'kiota/$(betaBranch)'
665665
targetClassName: "BaseGraphClient"
666-
targetNamespace: 'Microsoft\\Graph\\Beta\\Generated'
666+
targetNamespace: 'Microsoft\Graph\Beta\Generated'
667667
baseBranchName: 'main'
668668
commitMessagePrefix: "feat(generation): update request builders and models"
669669
cleanMetadataFolder: $(cleanOpenAPIFolderBeta)
@@ -1110,7 +1110,7 @@ extends:
11101110
in(dependencies.stage_v1_openapi.result, 'Succeeded', 'Skipped')
11111111
)
11121112
jobs:
1113-
- job: typescript_beta_agents_m365copilot
1113+
- job: typescript_v1_agents_m365copilot
11141114
templateContext:
11151115
inputs:
11161116
- input: pipelineArtifact
@@ -1126,7 +1126,7 @@ extends:
11261126
- template: /.azure-pipelines/generation-templates/language-generation-kiota.yml@self
11271127
parameters:
11281128
language: 'typescript'
1129-
version: 'beta'
1129+
version: 'v1'
11301130
orgName: 'microsoft'
11311131
repoName: 'Agents-M365Copilot'
11321132
baseBranchName: 'main'

scripts/clean-typescript-ccs-files.ps1

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,14 @@ param (
22
[Parameter(Mandatory = $true)]
33
[string]
44
$targetDirectory,
5+
[Parameter(Mandatory = $true)]
56
[string]
6-
$packageName = "@microsoft/agents-m365copilot"
7+
$packageName
78
)
89
Push-Location $targetDirectory
910

11+
Write-Host "Starting cleaning operation in target directory: $targetDirectory"
12+
1013
$kiotaLockFileName = "kiota-lock.json"
1114
# Extract folder name from package name (the part after the slash)
1215
$folderToClean = $packageName.Split("/")[1]

scripts/copy-ccs-typescript-sdk-models.ps1

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ param (
55
[Parameter(Mandatory = $true)]
66
[string]
77
$sourceDirectory,
8+
[Parameter(Mandatory = $true)]
89
[string]
9-
$packageName = "@microsoft/copilot-beta-sdk"
10+
$packageName
1011
)
1112

1213
Write-Host "Path to repo models directory: $targetDirectory"

0 commit comments

Comments
 (0)