Skip to content

Commit bb461ee

Browse files
authored
Merge pull request #168 from fscpscollaborative/develop
Release merge
2 parents e72b0c2 + 3cf2a77 commit bb461ee

4 files changed

Lines changed: 40 additions & 586 deletions

File tree

fscps.tools/fscps.tools.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ RequiredAssemblies = 'bin\fscps.tools.dll'
6464
# ScriptsToProcess = @()
6565

6666
# Type files (.ps1xml) to be loaded when importing this module
67-
# TypesToProcess = @()
67+
# TypesToProcess = 'xml\fscps.tools.Types.ps1xml'
6868

6969
# Format files (.ps1xml) to be loaded when importing this module
7070
FormatsToProcess = 'xml\fscps.tools.Format.ps1xml'

fscps.tools/functions/get-fscpssystemupdatepackage.ps1

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ function Get-FSCPSSystemUpdatePackage {
8585
Set-FSCPSActiveAzureStorageConfig -Name $StorageAccountConfig -Temporary
8686
}
8787
}
88-
8988
# Set the destination file name based on the UpdateType
9089
if ($UpdateType -eq [UpdateType]::SystemUpdate) {
9190
$destinationFileName = "Service Update - $D365FSCVersion"
@@ -108,12 +107,11 @@ function Get-FSCPSSystemUpdatePackage {
108107
try {
109108

110109
$download = (-not(Test-Path $destinationFilePath))
111-
112110
if(!$download)
113111
{
114112
Write-PSFMessage -Level Host -Message $destinationFileName
115113
try {
116-
$blobFile = Get-FSCPSAzureStorageFile -Name $destinationFileName
114+
$blobFile = Get-FSCPSAzureStorageFile -Name "*$destinationFileName*"
117115
}
118116
catch {
119117
Write-PSFMessage -Level Error -Message "File $destinationFileName is not found at $($azureDetails.Container)"

fscps.tools/internal/functions/invoke-fsccompile.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -676,7 +676,7 @@ function Invoke-FSCCompile {
676676
}
677677

678678
$responseObject.ARTIFACTS_LIST = $artifacts
679-
Convert-FSCPSTextToAscii -Text "Done" -Font "Term" -BorderType DoubleDots -HorizontalLayout ControlledSmushing -ScreenWigth 105 -Padding 2
679+
Convert-FSCPSTextToAscii -Text "Compilation complete." -Font "Term" -BorderType DoubleDots -HorizontalLayout ControlledSmushing -ScreenWigth 105 -Padding 2
680680
}
681681
catch {
682682
Write-PSFMessage -Level Host -Message "Error: " -Exception $PSItem.Exception

0 commit comments

Comments
 (0)