Skip to content

Commit e9daf5a

Browse files
committed
fix: script path for ts changes merge
Signed-off-by: Vincent Biret <[email protected]>
1 parent bd436e0 commit e9daf5a

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ parameters:
3030
default: 'tsp-output'
3131
- name: metadataAnnotationsCopyScriptPath
3232
type: string
33-
default: '$(metadataTypeSpecAnnotationsSource)/../scripts/copy-annotations-to-csdl.ps1'
33+
default: $[format('{0}/../scripts/copy-annotations-to-csdl.ps1', parameters['metadataTypeSpecAnnotationsSource'])]
3434
- name: sanitizedEndpoint
3535
type: string
3636
default: $[replace(parameters['endpoint'], '/', ''))]
@@ -99,7 +99,7 @@ steps:
9999
endpointVersion: ${{ parameters.endpoint }}
100100
displayName: 'run Typewriter to clean ${{ parameters.endpoint }} metadata'
101101

102-
- pwsh: '$(metadataAnnotationsCopyScriptPath) -targetCsdlPath "$(Build.SourcesDirectory)/msgraph-metadata/clean_${{ parameters.sanitizedEndpoint }}_metadata/cleanMetadataWithDescriptions${{ parameters.endpoint }}.xml" -sourceCsdlDirectoryPath "$(metadataTypeSpecAnnotationsSource)/$(metadataTypeSpecAnnotationsOutputDir)"'
102+
- pwsh: '$[parameters[''metadataAnnotationsCopyScriptPath'']] -targetCsdlPath "$(Build.SourcesDirectory)/msgraph-metadata/clean_${{ parameters.sanitizedEndpoint }}_metadata/cleanMetadataWithDescriptions${{ parameters.endpoint }}.xml" -sourceCsdlDirectoryPath "$(metadataTypeSpecAnnotationsSource)/$(metadataTypeSpecAnnotationsOutputDir)"'
103103

104104
## Only run if the previous step was successful
105105
- pwsh: '$(scriptsDirectory)/run-typewriter-clean-metadata.ps1'
@@ -116,7 +116,7 @@ steps:
116116
OutputMetadataFileName: 'cleanMetadataWithDescriptionsAndAnnotations'
117117
displayName: 'run Typewriter to clean ${{ parameters.endpoint }} metadata and keep capability annotations'
118118

119-
- pwsh: '$(metadataAnnotationsCopyScriptPath) -targetCsdlPath "$(Build.SourcesDirectory)/msgraph-metadata/clean_$(sanitizedEndpoint)_metadata/cleanMetadataWithDescriptionsAndAnnotations${{ parameters.endpoint }}.xml" -sourceCsdlDirectoryPath "$(metadataTypeSpecAnnotationsSource)/$(metadataTypeSpecAnnotationsOutputDir)"'
119+
- pwsh: '$[parameters[''metadataAnnotationsCopyScriptPath'']] -targetCsdlPath "$(Build.SourcesDirectory)/msgraph-metadata/clean_$(sanitizedEndpoint)_metadata/cleanMetadataWithDescriptionsAndAnnotations${{ parameters.endpoint }}.xml" -sourceCsdlDirectoryPath "$(metadataTypeSpecAnnotationsSource)/$(metadataTypeSpecAnnotationsOutputDir)"'
120120

121121
## Only run if the previous step was successful
122122
- pwsh: '$(scriptsDirectory)/run-typewriter-clean-metadata.ps1'
@@ -134,7 +134,7 @@ steps:
134134
OutputMetadataFileName: 'cleanMetadataWithDescriptionsAndAnnotationsAndErrors'
135135
displayName: 'run Typewriter to clean ${{ parameters.endpoint }} metadata and keep capability annotations and include error information'
136136

137-
- pwsh: '$(metadataAnnotationsCopyScriptPath) -targetCsdlPath "$(Build.SourcesDirectory)/msgraph-metadata/clean_$(sanitizedEndpoint)_metadata/cleanMetadataWithDescriptionsAndAnnotationsAndErrors${{ parameters.endpoint }}.xml" -sourceCsdlDirectoryPath "$(metadataTypeSpecAnnotationsSource)/$(metadataTypeSpecAnnotationsOutputDir)"'
137+
- pwsh: '$[parameters[''metadataAnnotationsCopyScriptPath'']] -targetCsdlPath "$(Build.SourcesDirectory)/msgraph-metadata/clean_$(sanitizedEndpoint)_metadata/cleanMetadataWithDescriptionsAndAnnotationsAndErrors${{ parameters.endpoint }}.xml" -sourceCsdlDirectoryPath "$(metadataTypeSpecAnnotationsSource)/$(metadataTypeSpecAnnotationsOutputDir)"'
138138

139139

140140
# publish metadata as an artifact

0 commit comments

Comments
 (0)