From d832bca13bd5a809b69b5a676d3a43943b9b8e9c Mon Sep 17 00:00:00 2001 From: Andrew Omondi Date: Tue, 5 Mar 2024 14:42:30 +0300 Subject: [PATCH 1/3] Bumps version --- .azure-pipelines/generation-templates/capture-metadata.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 }}" From f45215bada0d5e51a83e3f6380e489b01e5348c1 Mon Sep 17 00:00:00 2001 From: Andrew Omondi Date: Tue, 5 Mar 2024 14:45:13 +0300 Subject: [PATCH 2/3] Hidi is a Net 7.0 app --- .azure-pipelines/generation-templates/capture-openapi.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.azure-pipelines/generation-templates/capture-openapi.yml b/.azure-pipelines/generation-templates/capture-openapi.yml index 4ded0fe6e..126504110 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 From 8327763e17e3f6249c4b453b5f5a8a4b08219e1b Mon Sep 17 00:00:00 2001 From: Andrew Omondi Date: Tue, 5 Mar 2024 14:48:29 +0300 Subject: [PATCH 3/3] Fixes generation defaults --- .../generation-templates/build-and-publish-kiota.yml | 2 -- .azure-pipelines/generation-templates/capture-openapi.yml | 2 +- .../generation-templates/set-up-for-generation-kiota.yml | 3 +-- 3 files changed, 2 insertions(+), 5 deletions(-) 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-openapi.yml b/.azure-pipelines/generation-templates/capture-openapi.yml index 126504110..8ff29c056 100644 --- a/.azure-pipelines/generation-templates/capture-openapi.yml +++ b/.azure-pipelines/generation-templates/capture-openapi.yml @@ -63,7 +63,7 @@ jobs: - template: checkout-metadata.yml - template: use-dotnet-sdk.yml parameters: - version: '7.x' # Hidi tool is NET7 app + 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