From 9bac510f433d42b1362df9e8a9106e2870464699 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Fri, 4 Apr 2025 08:50:05 -0400 Subject: [PATCH 1/4] ci: remove old reference to objc repo which was archived almost 2 years ago now --- .azure-pipelines/generation-pipeline.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.azure-pipelines/generation-pipeline.yml b/.azure-pipelines/generation-pipeline.yml index 0ec8a4b0f..6486123f5 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) From 5f7a5f24dcfbd8d241b29b4edaecc8efdce108df Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Fri, 4 Apr 2025 08:51:20 -0400 Subject: [PATCH 2/4] ci: removes ruby beta as we never shipped a version Signed-off-by: Vincent Biret --- .azure-pipelines/generation-pipeline.yml | 34 ------------------------ 1 file changed, 34 deletions(-) diff --git a/.azure-pipelines/generation-pipeline.yml b/.azure-pipelines/generation-pipeline.yml index 6486123f5..fe644e7a6 100644 --- a/.azure-pipelines/generation-pipeline.yml +++ b/.azure-pipelines/generation-pipeline.yml @@ -68,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) @@ -404,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 From 7e24ee9631f369a7a61904fdc2455d2bb7390e03 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Tue, 8 Apr 2025 15:04:41 -0400 Subject: [PATCH 3/4] fix: metadata validation is missing hidi installation Signed-off-by: Vincent Biret --- .../generation-templates/capture-metadata.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.azure-pipelines/generation-templates/capture-metadata.yml b/.azure-pipelines/generation-templates/capture-metadata.yml index 5811312f0..0fab1c0c5 100644 --- a/.azure-pipelines/generation-templates/capture-metadata.yml +++ b/.azure-pipelines/generation-templates/capture-metadata.yml @@ -115,6 +115,14 @@ steps: - template: use-dotnet-sdk.yml +# 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 }}" displayName: 'verify whether metadata is parsable as an Edm model' From bf681ce4c68c7c5eb4bc5a9d64a2c4714501c748 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Tue, 8 Apr 2025 15:12:10 -0400 Subject: [PATCH 4/4] chore: makes dotnet versions installation clearer Signed-off-by: Vincent Biret --- .azure-pipelines/generation-templates/capture-metadata.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines/generation-templates/capture-metadata.yml b/.azure-pipelines/generation-templates/capture-metadata.yml index 0fab1c0c5..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,8 +116,6 @@ steps: # Use the clean metadata from the last step to generate DotNet files. -- template: use-dotnet-sdk.yml - # required for the hidi installation validation - template: use-dotnet-sdk.yml parameters: