Skip to content

Commit 0df8824

Browse files
authored
correct the spec root (#33561)
1 parent 44fc1e2 commit 0df8824

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

eng/scripts/automation/Invoke-GenerateAndBuild.ps1

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,18 @@ if ($relatedCadlProjectFolder) {
9191
throw "Not provide service name or namespace."
9292
}
9393
$projectFolder = (Join-Path $sdkPath "sdk" $service $namespace)
94+
$specRoot = $swaggerDir
95+
if ((-Not $relatedCadlProjectFolder.Contains("specification")) -And $swaggerDir.Contains("specification"))
96+
{
97+
$relatedCadlProjectFolder = "specification/$relatedCadlProjectFolder"
98+
$specRoot = Split-Path $specRoot
99+
}
94100
New-CADLPackageFolder `
95101
-service $service `
96102
-namespace $namespace `
97103
-sdkPath $sdkPath `
98104
-relatedCadlProjectFolder $relatedCadlProjectFolder `
99-
-specRoot $swaggerDir `
105+
-specRoot $specRoot `
100106
-outputJsonFile $newpackageoutput
101107
$newPackageOutputJson = Get-Content $newPackageOutput -Raw | ConvertFrom-Json
102108
$relativeSdkPath = $newPackageOutputJson.path

0 commit comments

Comments
 (0)