From 7e24ee9631f369a7a61904fdc2455d2bb7390e03 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Tue, 8 Apr 2025 15:04:41 -0400 Subject: [PATCH 1/2] 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 2/2] 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: