Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
126 changes: 94 additions & 32 deletions .azure-pipelines/generation-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,7 @@ extends:
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')
)
jobs:
Expand Down Expand Up @@ -383,6 +384,7 @@ extends:
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')
)
jobs:
Expand Down Expand Up @@ -425,6 +427,7 @@ extends:
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')
)
jobs:
Expand Down Expand Up @@ -465,6 +468,7 @@ extends:
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')
)
jobs:
Expand Down Expand Up @@ -505,6 +509,7 @@ extends:
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')
)
jobs:
Expand Down Expand Up @@ -547,6 +552,7 @@ extends:
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')
)
jobs:
Expand Down Expand Up @@ -580,26 +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'),
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'
Expand All @@ -608,40 +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'),
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'
Expand All @@ -650,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
Expand All @@ -672,6 +681,7 @@ extends:
and
(
eq(dependencies.stage_build_and_publish_typewriter.result, 'Succeeded'),
eq(dependencies.open_api_v1_approval.result, 'Succeeded'),
in(dependencies.stage_v1_metadata.result, 'Succeeded', 'Skipped')
)
jobs:
Expand Down Expand Up @@ -709,6 +719,7 @@ extends:
and
(
eq(dependencies.stage_build_and_publish_typewriter.result, 'Succeeded'),
eq(dependencies.open_api_beta_approval.result, 'Succeeded'),
in(dependencies.stage_beta_metadata.result, 'Succeeded', 'Skipped')
)
jobs:
Expand Down Expand Up @@ -747,6 +758,7 @@ extends:
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')
)
jobs:
Expand Down Expand Up @@ -790,6 +802,7 @@ extends:
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')
)
jobs:
Expand Down Expand Up @@ -833,6 +846,7 @@ extends:
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')
)
jobs:
Expand Down Expand Up @@ -865,6 +879,7 @@ extends:
parameters:
repoName: msgraph-sdk-python
baseDirectory: msgraph

- stage: stage_python_beta
dependsOn:
- stage_build_and_publish_kiota
Expand All @@ -874,6 +889,7 @@ extends:
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')
)
jobs:
Expand Down Expand Up @@ -906,7 +922,52 @@ extends:
parameters:
repoName: msgraph-beta-sdk-python
baseDirectory: msgraph_beta
- stage: stage_ccs_csharp_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: 'v1'
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
- stage_beta_openapi
Expand All @@ -917,7 +978,7 @@ extends:
in(dependencies.stage_beta_openapi.result, 'Succeeded', 'Skipped')
)
jobs:
- job: csharp_beta_ccs
- job: csharp_beta_agents_m365copilot
templateContext:
inputs:
- input: pipelineArtifact
Expand Down Expand Up @@ -949,7 +1010,8 @@ extends:
parameters:
repoName: 'Agents-M365Copilot/dotnet'
packageName: Microsoft.Agents.M365Copilot.Beta
- stage: stage_ccs_python_beta

- stage: stage_agents_m365copilot_python_beta
dependsOn:
- stage_build_and_publish_kiota
- stage_beta_openapi
Expand All @@ -960,7 +1022,7 @@ extends:
in(dependencies.stage_beta_openapi.result, 'Succeeded', 'Skipped')
)
jobs:
- job: python_beta_ccs
- job: python_beta_agents_m365copilot
templateContext:
inputs:
- input: pipelineArtifact
Expand Down Expand Up @@ -992,7 +1054,7 @@ extends:
parameters:
repoName: 'Agents-M365Copilot/python/packages'
baseDirectory: microsoft_agents_m365copilot_beta/microsoft_agents_m365copilot_beta
- stage: stage_ccs_typescript_beta
- stage: stage_agents_m365copilot_typescript_beta
dependsOn:
- stage_build_and_publish_kiota
- stage_beta_openapi
Expand All @@ -1003,7 +1065,7 @@ extends:
in(dependencies.stage_beta_openapi.result, 'Succeeded', 'Skipped')
)
jobs:
- job: typescript_beta_ccs
- job: typescript_beta_agents_m365copilot
templateContext:
inputs:
- input: pipelineArtifact
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ jobs:
- name: Test
run: dotnet test ./Typewriter.sln --no-build --verbosity normal
- name: Upload languages test output on failure
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v5
if: ${{ failure() }}
with:
name: languages-test-output
path: 'test/Typewriter.Test/bin/Debug/net8.0/OutputDirectory*/**'
- name: Upload unit test output on failure
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v5
if: ${{ failure() }}
with:
name: unit-test-output
Expand Down
Loading