Skip to content

main refresh #1299

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andrueastman merged 3 commits into from
Nov 18, 2024
+13 −3
Merged

main refresh #1299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
825ce2f
feat: exclude TCP APIs from language generation.
Nov 18, 2024
9fb69b9
fix: delete the folder to ensure passing builds
Nov 18, 2024
ea296f2
Merge pull request #1298 from microsoftgraph/andrueastman/excludeTcpApis
andrueastman Nov 18, 2024
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
6 changes: 5 additions & 1 deletion .azure-pipelines/generation-templates/language-generation-kiota.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@ parameters:
type: boolean
default: true

- name: pathExclusionArguments
type: string
default: "-e '/copilot' -e '/copilot/**'"

steps:
- template: set-up-for-generation-kiota.yml
parameters:
Expand Down Expand Up @@ -82,7 +86,7 @@ steps:
BranchName: ${{ parameters.branchName }}
workingDirectory: ${{ parameters.repoName }}

- bash: '$(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 }}'
- bash: '$(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 }}'
displayName: 'Run Kiota for ${{ parameters.language }} ${{ parameters.version }}'
env:
KIOTA_GENERATION:EXPORTPUBLICAPI: ${{ parameters.exportDom }}
Expand Down
10 changes: 8 additions & 2 deletions scripts/copy-typescript-sdk-models.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,14 @@ Invoke-Expression "$PSScriptRoot\remove-typescript-fluent-api-from-main-package.
$packagesDirectories = Get-ChildItem $targetDirectory -Directory -Exclude $mainPackageDirectoryName | Where-Object { -not($_.Name.EndsWith("-tests")) }
foreach ($directory in $packagesDirectories) {
$fluentAPISegmentName = $directory.Name.Replace("$mainPackageDirectoryName-", "")
Copy-Item (Join-Path $sourceDirectory -ChildPath $fluentAPISegmentName) -Destination $directory.FullName -Recurse -Force
Invoke-Expression "$PSScriptRoot\fix-typescript-fluent-packages-imports.ps1 -targetDirectory $($directory.FullName) -packageName $packageName"
if (Test-Path -Path (Join-Path $sourceDirectory -ChildPath $fluentAPISegmentName)) {
Copy-Item (Join-Path $sourceDirectory -ChildPath $fluentAPISegmentName) -Destination $directory.FullName -Recurse -Force
Invoke-Expression "$PSScriptRoot\fix-typescript-fluent-packages-imports.ps1 -targetDirectory $($directory.FullName) -packageName $packageName"
}
else {
Remove-Item $directory.FullName -Force -Recurse -ErrorAction SilentlyContinue
Write-Host "Removing folder for the fluent API segment: $fluentAPISegmentName as it does not exist in the generated models" -ForegroundColor Yellow
}
}

Write-Host "Copied the generated files into the repo. From: $sourceDirectory to: $targetDirectory" -ForegroundColor Green
Loading