Skip to content

Commit 6f7fe2e

Browse files
Merge pull request #1436 from microsoftgraph/chore/kiota-download-in-generation-pipeline
chore: kiota is downloaded instead of built during generation
2 parents 1895373 + 90d2bfa commit 6f7fe2e

File tree

6 files changed

+10
-31
lines changed

6 files changed

+10
-31
lines changed

.azure-pipelines/generation-pipeline.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,6 @@ resources:
9797
type: github
9898
endpoint: microsoftgraph (22)
9999
name: microsoftgraph/microsoft-graph-docs
100-
- repository: kiota
101-
type: github
102-
endpoint: microsoftkiota
103-
name: microsoft/kiota
104100
- repository: Agents-M365Copilot
105101
type: github
106102
endpoint: microsoftkiota
@@ -175,8 +171,6 @@ extends:
175171
parameters:
176172
sdl:
177173
sourceRepositoriesToScan:
178-
include:
179-
- repository: kiota
180174
exclude:
181175
- repository: msgraph-sdk-dotnet
182176
- repository: msgraph-beta-sdk-dotnet
Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,5 @@
11
steps:
2-
- template: /.azure-pipelines/generation-templates/use-dotnet-sdk.yml@self
3-
parameters:
4-
version: "10.x" #kiota uses a net10 target
5-
6-
- checkout: kiota
7-
displayName: checkout kiota
8-
fetchDepth: 1
9-
10-
- pwsh: dotnet build $(Build.SourcesDirectory)/src/kiota/kiota.csproj --configuration $(buildConfiguration)
11-
displayName: 'Build Kiota'
12-
13-
- task: CopyFiles@2
14-
inputs:
15-
sourceFolder: '$(Build.SourcesDirectory)/src/kiota/bin/$(BuildConfiguration)/net10.0'
16-
contents: '**/*'
17-
targetFolder: '$(Build.ArtifactStagingDirectory)'
18-
displayName: Copy Kiota executable
2+
- pwsh: |
3+
dotnet tool install Microsoft.OpenApi.Kiota `
4+
--tool-path "$(Build.ArtifactStagingDirectory)"
5+
displayName: 'Install Kiota via dotnet tool'

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

Lines changed: 0 additions & 5 deletions
This file was deleted.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ steps:
9696
Write-Warning "Kiota directory not found: $(kiotaDirectory)"
9797
}
9898
displayName: 'List files in Kiota directory'
99-
- pwsh: '& "$(kiotaDirectory)/kiota.exe" generate --openapi "$(Build.SourcesDirectory)/msgraph-metadata/${{ parameters.cleanMetadataFolder }}/openapi.yaml" --language "${{ parameters.language }}" -o "$(kiotaDirectory)/output" -n "${{ parameters.targetNamespace }}" -c "${{ parameters.targetClassName }}" ${{ parameters.customArguments }} ${{ parameters.pathExclusionArguments }}'
99+
- pwsh: '& "$(kiotaDirectory)/kiota" generate --openapi "$(Build.SourcesDirectory)/msgraph-metadata/${{ parameters.cleanMetadataFolder }}/openapi.yaml" --language "${{ parameters.language }}" -o "$(kiotaDirectory)/output" -n "${{ parameters.targetNamespace }}" -c "${{ parameters.targetClassName }}" ${{ parameters.customArguments }} ${{ parameters.pathExclusionArguments }}'
100100
displayName: 'Run Kiota for ${{ parameters.language }} ${{ parameters.version }}'
101101
env:
102102
KIOTA_GENERATION:EXPORTPUBLICAPI: ${{ parameters.exportDom }}

.azure-pipelines/generation-templates/set-up-for-generation-kiota.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@ steps:
66
- template: /.azure-pipelines/generation-templates/set-user-config.yml@self
77
- template: /.azure-pipelines/generation-templates/use-dotnet-sdk.yml@self
88
parameters:
9-
version: "10.x" #kiota uses a net10 target
9+
version: "10.x"
10+
11+
- pwsh: chmod +x "$(kiotaDirectory)/kiota"
12+
displayName: 'Make Kiota executable'
1013

1114
# checkout metadata repo if capture and clean step is skipped
1215
- checkout: msgraph-metadata

0 commit comments

Comments
 (0)