diff --git a/.azure-pipelines/generation-templates/build-and-publish-kiota.yml b/.azure-pipelines/generation-templates/build-and-publish-kiota.yml index 79e91a662..e33ce0e71 100644 --- a/.azure-pipelines/generation-templates/build-and-publish-kiota.yml +++ b/.azure-pipelines/generation-templates/build-and-publish-kiota.yml @@ -1,7 +1,5 @@ steps: - template: use-dotnet-sdk.yml - parameters: - version: '8.x' # Kiota is a NET8 app - checkout: kiota displayName: checkout kiota diff --git a/.azure-pipelines/generation-templates/capture-metadata.yml b/.azure-pipelines/generation-templates/capture-metadata.yml index 247827d91..1ae0958af 100644 --- a/.azure-pipelines/generation-templates/capture-metadata.yml +++ b/.azure-pipelines/generation-templates/capture-metadata.yml @@ -115,7 +115,7 @@ steps: - template: use-dotnet-sdk.yml parameters: - version: '6.x' # verify tool is NET6 app + version: '7.x' # Hidi tool is NET7 app # 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 }}" diff --git a/.azure-pipelines/generation-templates/capture-openapi.yml b/.azure-pipelines/generation-templates/capture-openapi.yml index 4ded0fe6e..8ff29c056 100644 --- a/.azure-pipelines/generation-templates/capture-openapi.yml +++ b/.azure-pipelines/generation-templates/capture-openapi.yml @@ -62,6 +62,8 @@ jobs: - template: checkout-metadata.yml - template: use-dotnet-sdk.yml + parameters: + version: '7.x' # Hidi tool is NET7 app - pwsh: dotnet tool install -g Microsoft.OpenApi.Hidi --prerelease displayName: install hidi diff --git a/.azure-pipelines/generation-templates/set-up-for-generation-kiota.yml b/.azure-pipelines/generation-templates/set-up-for-generation-kiota.yml index f2071f7a7..6956a81a9 100644 --- a/.azure-pipelines/generation-templates/set-up-for-generation-kiota.yml +++ b/.azure-pipelines/generation-templates/set-up-for-generation-kiota.yml @@ -10,8 +10,7 @@ parameters: steps: - template: set-user-config.yml - template: use-dotnet-sdk.yml - parameters: - version: '8.x' # Kiota is a NET8 app + - ${{ parameters.downloadSteps }} # checkout metadata repo if capture and clean step is skipped