Revert "Merge pull request #1436 from microsoftgraph/chore/kiota-download-in-generation-pipeline"

This reverts commit 6f7fe2e, reversing
changes made to 1895373.

Author: adrian05-ms

.azure-pipelines/generation-pipeline.yml

@@ -97,6 +97,10 @@ resources:
     type: github
     endpoint: microsoftgraph (22)
     name: microsoftgraph/microsoft-graph-docs
+  - repository: kiota
+    type: github
+    endpoint: microsoftkiota
+    name: microsoft/kiota
   - repository: Agents-M365Copilot
     type: github
     endpoint: microsoftkiota
@@ -171,6 +175,8 @@ extends:
   parameters:
     sdl:
       sourceRepositoriesToScan:
+        include:
+        - repository: kiota
         exclude:
         - repository: msgraph-sdk-dotnet
         - repository: msgraph-beta-sdk-dotnet

.azure-pipelines/generation-templates/build-and-publish-kiota.yml

@@ -1,5 +1,18 @@
 steps:
-- pwsh: |
-    dotnet tool install Microsoft.OpenApi.Kiota `
-          --tool-path "$(Build.ArtifactStagingDirectory)"
-  displayName: 'Install Kiota via dotnet tool'
+- template: /.azure-pipelines/generation-templates/use-dotnet-sdk.yml@self
+  parameters:
+    version: "10.x" #kiota uses a net10 target
+
+- checkout: kiota
+  displayName: checkout kiota
+  fetchDepth: 1
+
+- pwsh: dotnet build $(Build.SourcesDirectory)/src/kiota/kiota.csproj --configuration $(buildConfiguration)
+  displayName: 'Build Kiota'
+
+- task: CopyFiles@2
+  inputs:
+    sourceFolder: '$(Build.SourcesDirectory)/src/kiota/bin/$(BuildConfiguration)/net10.0'
+    contents: '**/*'
+    targetFolder: '$(Build.ArtifactStagingDirectory)'
+  displayName: Copy Kiota executable

.azure-pipelines/generation-templates/download-kiota.yml

@@ -0,0 +1,5 @@
+# This Yaml Document has been converted by ESAI Yaml Pipeline Conversion Tool.
+# Please make sure to check all the converted content, it is your team's responsibility to make sure that the pipeline is still valid and functions as expected.
+# The 'DownloadBuildArtifacts@0' tasks have been converted to inputs within the `templateContext` section of each job.
+steps:
+- bash: chmod +x $(Build.SourcesDirectory)/kiota/kiota

.azure-pipelines/generation-templates/language-generation-kiota.yml

@@ -96,7 +96,7 @@ steps:
         Write-Warning "Kiota directory not found: $(kiotaDirectory)"
     }
   displayName: 'List files in Kiota directory'
-- pwsh: '& "$(kiotaDirectory)/kiota" generate --openapi "$(Build.SourcesDirectory)/msgraph-metadata/${{ parameters.cleanMetadataFolder }}/openapi.yaml" --language "${{ parameters.language }}" -o "$(kiotaDirectory)/output" -n "${{ parameters.targetNamespace }}" -c "${{ parameters.targetClassName }}" ${{ parameters.customArguments }} ${{ parameters.pathExclusionArguments }}'
+- pwsh: '& "$(kiotaDirectory)/kiota.exe" generate --openapi "$(Build.SourcesDirectory)/msgraph-metadata/${{ parameters.cleanMetadataFolder }}/openapi.yaml" --language "${{ parameters.language }}" -o "$(kiotaDirectory)/output" -n "${{ parameters.targetNamespace }}" -c "${{ parameters.targetClassName }}" ${{ parameters.customArguments }} ${{ parameters.pathExclusionArguments }}'
   displayName: 'Run Kiota for ${{ parameters.language }} ${{ parameters.version }}'
   env:
     KIOTA_GENERATION:EXPORTPUBLICAPI: ${{ parameters.exportDom }}

.azure-pipelines/generation-templates/set-up-for-generation-kiota.yml

@@ -6,10 +6,7 @@ steps:
 - template: /.azure-pipelines/generation-templates/set-user-config.yml@self
 - template: /.azure-pipelines/generation-templates/use-dotnet-sdk.yml@self
   parameters:
-    version: "10.x"
-
-- pwsh: chmod +x "$(kiotaDirectory)/kiota"
-  displayName: 'Make Kiota executable'
+    version: "10.x" #kiota uses a net10 target
 
 # checkout metadata repo if capture and clean step is skipped
 - checkout: msgraph-metadata