Skip to content

Commit 3626596

Browse files
author
Freddy Kristiansen
authored
Merge pull request #2761 from microsoft/dev
Add copyInstalledAppToDependencies
2 parents 95758d0 + cc99eb6 commit 3626596

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

AppHandling/Run-AlPipeline.ps1

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1038,7 +1038,12 @@ Measure-Command {
10381038
"tenant" = $tenant
10391039
"missingDependencies" = @($unknownAppDependencies | Where-Object { $missingAppDependencies -contains "$_".Split(':')[0] })
10401040
}
1041-
Invoke-Command -ScriptBlock $InstallMissingDependencies -ArgumentList $Parameters
1041+
if ($generateDependencyArtifact -and !($testCountry)) {
1042+
$parameters += @{
1043+
"CopyInstalledAppsToFolder" = Join-Path $buildArtifactFolder "Dependencies"
1044+
}
1045+
}
1046+
Invoke-Command -ScriptBlock $InstallMissingDependencies -ArgumentList $Parameters
10421047
} | ForEach-Object { Write-Host -ForegroundColor Yellow "`nInstalling app dependencies took $([int]$_.TotalSeconds) seconds" }
10431048
if ($gitHubActions) { Write-Host "::endgroup::" }
10441049
}

NuGet/Publish-BcNuGetPackageToContainer.ps1

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ Function Publish-BcNuGetPackageToContainer {
1717
[string] $containerName = $bcContainerHelperConfig.defaultContainerName,
1818
[Parameter(Mandatory=$false)]
1919
[string] $tenant = "default",
20+
[string] $copyInstalledAppsToFolder = "",
2021
[switch] $skipVerification
2122
)
2223

@@ -25,10 +26,10 @@ Function Publish-BcNuGetPackageToContainer {
2526
if ($package) {
2627
$manifest = [xml](Get-Content (Join-Path $package 'manifest.nuspec') -Encoding UTF8)
2728
$manifest.package.metadata.dependencies.GetEnumerator() | ForEach-Object {
28-
Publish-BcNuGetPackageToContainer -nuGetServerUrl $nuGetServerUrl -nuGetToken $nuGetToken -packageName $_.id -version $_.version -containerName $containerName -tenant $tenant -skipVerification:$skipVerification
29+
Publish-BcNuGetPackageToContainer -nuGetServerUrl $nuGetServerUrl -nuGetToken $nuGetToken -packageName $_.id -version $_.version -containerName $containerName -tenant $tenant -skipVerification:$skipVerification -copyInstalledAppsToFolder $copyInstalledAppsToFolder
2930
}
3031
$appFiles = (Get-Item -Path (Join-Path $package '*.app')).FullName
31-
Publish-BcContainerApp -containerName $containerName -tenant $tenant -appFile $appFiles -sync -install -upgrade -checkAlreadyInstalled -skipVerification
32+
Publish-BcContainerApp -containerName $containerName -tenant $tenant -appFile $appFiles -sync -install -upgrade -checkAlreadyInstalled -skipVerification -copyInstalledAppsToFolder $copyInstalledAppsToFolder
3233
}
3334
}
3435
Export-ModuleMember -Function Publish-BcNuGetPackageToContainer

0 commit comments

Comments
 (0)