diff --git a/.azure-pipelines/generation-pipeline.yml b/.azure-pipelines/generation-pipeline.yml index 0ec8a4b0f..fe644e7a6 100644 --- a/.azure-pipelines/generation-pipeline.yml +++ b/.azure-pipelines/generation-pipeline.yml @@ -43,11 +43,6 @@ resources: endpoint: microsoftgraph (22) name: microsoftgraph/msgraph-beta-typescript-typings ref: main - - repository: msgraph-sdk-objc-models - type: github - endpoint: microsoftgraph (22) - name: microsoftgraph/msgraph-sdk-objc-models - ref: dev - repository: msgraph-sdk-java type: github endpoint: microsoftgraph (22) @@ -73,11 +68,6 @@ resources: endpoint: microsoftgraph (22) name: microsoftgraph/msgraph-sdk-ruby ref: main - - repository: msgraph-beta-sdk-ruby - type: github - endpoint: microsoftgraph (22) - name: microsoftgraph/msgraph-beta-sdk-ruby - ref: main - repository: msgraph-sdk-typescript type: github endpoint: microsoftgraph (22) @@ -409,35 +399,6 @@ stages: repoName: msgraph-sdk-ruby barrelFileName: microsoft_graph.rb -- stage: stage_ruby_beta - dependsOn: - - stage_build_and_publish_kiota - - stage_beta_openapi - condition: | - and - ( - eq(dependencies.stage_build_and_publish_kiota.result, 'Succeeded'), - in(dependencies.stage_beta_openapi.result, 'Succeeded', 'Skipped') - ) - jobs: - - job: ruby_beta - steps: - - template: generation-templates/language-generation-kiota.yml - parameters: - language: 'ruby' - version: 'beta' - repoName: 'msgraph-beta-sdk-ruby' - branchName: $(betaBranch) - targetClassName: "GraphBaseServiceClient" - targetNamespace: "MicrosoftGraphBeta" - cleanMetadataFolder: $(cleanOpenAPIFolderBeta) - customArguments: "-e '/me' -e '/me/**'" # Exclude me - languageSpecificSteps: - - template: generation-templates/ruby.yml - parameters: - repoName: msgraph-beta-sdk-ruby - barrelFileName: microsoft_graph_beta.rb - - stage: stage_java_v1_kiota dependsOn: - stage_build_and_publish_kiota diff --git a/.azure-pipelines/generation-templates/capture-metadata.yml b/.azure-pipelines/generation-templates/capture-metadata.yml index 5811312f0..2e0812046 100644 --- a/.azure-pipelines/generation-templates/capture-metadata.yml +++ b/.azure-pipelines/generation-templates/capture-metadata.yml @@ -52,7 +52,10 @@ steps: - template: download-typewriter.yml +# required for typewriter - template: use-dotnet-sdk.yml + parameters: + version: '8.x' ## Only run if the previous step was successful - pwsh: '$(scriptsDirectory)/run-typewriter-clean-metadata.ps1' @@ -113,7 +116,13 @@ steps: # Use the clean metadata from the last step to generate DotNet files. +# required for the hidi installation validation - template: use-dotnet-sdk.yml + parameters: + version: '9.x' + +- pwsh: dotnet tool install -g Microsoft.OpenApi.Hidi + displayName: 'Install hidi tool' # verify that generated metadata is parsable as an Edm model - pwsh: $(Build.SourcesDirectory)/msgraph-metadata/scripts/run-metadata-validation.ps1 -repoDirectory "$(Build.SourcesDirectory)/msgraph-metadata/" -version "${{ parameters.endpoint }}"