Support artifacts published from any location #6268
Conversation
| $oldAppPackagePath = Join-Path $oldDropLocation $newAppPackagePath.SubString((Get-VstsTaskVariable -Name Build.SourcesDirectory -Require).Length + 1) | ||
| if (-not $newAppPackagePath.StartsWith($pkgArtifactPath)) | ||
| { | ||
| Write-Error (Get-VstsLocString -Key PackageIsNotUnderArtifact -ArgumentList @($newAppPackagePath, $pkgArtifactPath)) |
There was a problem hiding this comment.
Write-Error effectively throws an exception an halts execution
| @@ -57,20 +62,26 @@ | |||
|
|
|||
| Write-Host (Get-VstsLocString -Key SearchingApplicationType -ArgumentList $appTypeName) | |||
|
|
|||
| $oldAppPackagePath = Join-Path $oldDropLocation $newAppPackagePath.SubString((Get-VstsTaskVariable -Name Build.SourcesDirectory -Require).Length + 1) | |||
| if (-not $newAppPackagePath.StartsWith($pkgArtifactPath)) | |||
There was a problem hiding this comment.
It is very difficult to make user understand about this new mandatory input. Can we think of any alternative without additional input. Can we parse $newAppPackagePath to check if it contains a path fragment which matches path inside $oldPackagePath. For example, if new path is C:\a\b\c\ApplicationPackage.xml then we can iterate whether old package contains any of following path:
- a\b\c\ApplicationPackage.xml
- b\c\ApplicationPackage.xml
- c\ApplicationPackage.xml
- ApplicationPackage.xml
|
@NCarlsonMSFT are you planning to take this PR forward? |
|
@bishal-pdMSFT I'd like to, I was waiting on you to review the updates per your comments. |
|
@bishal-pdMSFT are there any other questions/concerns you have before merging this? |
| $oldAppManifestPath = Join-Path $oldAppPackagePath $appManifestName | ||
| if (Test-Path $oldAppManifestPath) | ||
| # Try and find the old app package path by finding the largest substring of the path that exists in the artifact path | ||
| $relativePath = $newAppPackagePath |
There was a problem hiding this comment.
Shouldn't we start with Build.SourcesDirectory directory rather than root?
There was a problem hiding this comment.
Generally this would actually be under Build.StagingDirectory, but there is no guarantee of that.
| $relativePath.Trim([System.IO.Path]::DirectorySeparatorChar) | ||
| $oldAppPackagePath = Join-Path $oldDropLocation $relativePath | ||
| while(!(Test-Path $oldAppPackagePath)) | ||
| { |
There was a problem hiding this comment.
Would be good to have UTs for this non-trivial logic
Fixes #5736