Skip to content

Commit fceebbf

Browse files
authored
Fix package props to support paths with spaces (Azure#49780)
1 parent c947a74 commit fceebbf

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

eng/scripts/Language-Settings.ps1

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,15 @@ function Get-AllPackageInfoFromRepo($serviceDirectory)
4242
# Save-Package-Properties.ps1
4343
$shouldAddDevVersion = Get-Variable -Name 'addDevVersion' -ValueOnly -ErrorAction 'Ignore'
4444
$ServiceProj = Join-Path -Path $EngDir -ChildPath "service.proj"
45-
Write-Host "Get-AllPackageInfoFromRepo::Executing msbuild"
46-
Write-Host "dotnet msbuild /nologo /t:GetPackageInfo $ServiceProj /p:ServiceDirectory=$serviceDirectory /p:AddDevVersion=$shouldAddDevVersion"
45+
Write-Host "dotnet msbuild /nologo /t:GetPackageInfo ""$ServiceProj"" /p:ServiceDirectory=$serviceDirectory /p:AddDevVersion=$shouldAddDevVersion -tl:off"
4746

4847
$msbuildOutput = dotnet msbuild `
4948
/nologo `
5049
/t:GetPackageInfo `
51-
$ServiceProj `
50+
"$ServiceProj" `
5251
/p:ServiceDirectory=$serviceDirectory `
53-
/p:AddDevVersion=$shouldAddDevVersion
52+
/p:AddDevVersion=$shouldAddDevVersion `
53+
-tl:off
5454

5555
foreach ($projectOutput in $msbuildOutput)
5656
{
@@ -59,7 +59,7 @@ function Get-AllPackageInfoFromRepo($serviceDirectory)
5959
continue
6060
}
6161

62-
$pkgPath, $serviceDirectory, $pkgName, $pkgVersion, $sdkType, $isNewSdk, $dllFolder = $projectOutput.Split(' ',[System.StringSplitOptions]::RemoveEmptyEntries).Trim("'")
62+
$pkgPath, $serviceDirectory, $pkgName, $pkgVersion, $sdkType, $isNewSdk, $dllFolder = $projectOutput.Split("' '", [System.StringSplitOptions]::RemoveEmptyEntries).Trim("' ")
6363
if(!(Test-Path $pkgPath)) {
6464
Write-Host "Parsed package path `$pkgPath` does not exist so skipping the package line '$projectOutput'."
6565
continue

0 commit comments

Comments
 (0)