Merge pull request #997 from microsoftgraph/dev

dev

Author: baywet

.azure-pipelines/generation-templates/capture-openapi.yml

@@ -45,9 +45,9 @@ jobs:
   - script: echo $(setTargets.targets)
     displayName: "Print settings"
 
-- job: publish_openapi
+- job: convert_openapi
   dependsOn: get_conversion_settings
-  displayName: Publish
+  displayName: Convert
   strategy:
     matrix: $[ dependencies.get_conversion_settings.outputs['setTargets.targets'] ]
   variables:
@@ -61,7 +61,6 @@ jobs:
     persistCredentials: true
 
   - template: checkout-metadata.yml
-  - template: set-user-config.yml
   - template: use-dotnet-sdk.yml
 
   - pwsh: dotnet tool install -g Microsoft.OpenApi.Hidi --prerelease
@@ -95,6 +94,24 @@ jobs:
     displayName: ensure that OpenAPI docs can be parsed
     workingDirectory: $(Build.SourcesDirectory)/msgraph-metadata
 
+
+- job: publish_openapi
+  dependsOn: convert_openapi
+  displayName: Publish
+  steps:
+  # We only need the scripts
+  - checkout: self
+    displayName: checkout generator
+    fetchDepth: 1
+    persistCredentials: true
+
+  - template: checkout-metadata.yml
+  - template: set-user-config.yml
+  - task: DownloadPipelineArtifact@2
+    inputs:
+      path: $(Build.SourcesDirectory)/msgraph-metadata/openapi/${{ parameters.endpoint }}
+      artifact: ${{ parameters.cleanMetadataFolder }}
+
   # Checkin clean metadata into metadata repo or make it an artifact.
   - pwsh: '$(scriptsDirectory)/git-push-cleanmetadata.ps1'