Skip to content

Commit e72b0c2

Browse files
onikolaievonikolaiev
authored
Merge pull request #166 from fscpscollaborative/develop
Release merge
2 parents 16a5bd6 + 57f9ab5 commit e72b0c2

3 files changed

Lines changed: 23 additions & 22 deletions

File tree

‎fscps.tools/fscps.tools.psd1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ RequiredModules = @(@{ModuleName = 'PSFramework'; ModuleVersion = '1.12.346'; },
5555
@{ModuleName = 'Az.Storage'; ModuleVersion = '1.11.0'; },
5656
@{ModuleName = 'd365fo.tools'; ModuleVersion = '0.7.22'; },
5757
@{ModuleName = 'Invoke-MsBuild'; ModuleVersion = '2.7.1'; },
58-
@{ModuleName = 'fscps.ascii'; ModuleVersion = '1.0.15'; })
58+
@{ModuleName = 'fscps.ascii'; ModuleVersion = '1.0.17'; })
5959

6060
# Assemblies that must be loaded prior to importing this module
6161
RequiredAssemblies = 'bin\fscps.tools.dll'

‎fscps.tools/internal/functions/invoke-commercecompile.ps1‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -96,12 +96,12 @@ function Invoke-CommerceCompile {
9696
Debug = If ($PSBoundParameters.Debug -eq $true) { $true } else { $false }
9797
}
9898
$responseObject = [Ordered]@{}
99-
Convert-FSCPSTextToAscii -Text "Reading current FSC-PS settings" -Font "Small" -BorderType DoubleDots -ScreenWigth 80 -HorizontalLayout Fitted
99+
Convert-FSCPSTextToAscii -Text "Reading current FSC-PS settings" -Font "Term" -BorderType DoubleDots -Padding 2 -HorizontalLayout Fitted
100100
$settings = Get-FSCPSSettings @CMDOUT
101101
Write-PSFMessage -Level Important -Message "Complete"
102102
#if($Force)
103103
#{
104-
Convert-FSCPSTextToAscii -Text "Cleanup build folder" -Font "Small" -BorderType DoubleDots -HorizontalLayout Fitted
104+
Convert-FSCPSTextToAscii -Text "Cleanup build folder" -Font "Term" -BorderType DoubleDots -HorizontalLayout Fitted -Padding 2
105105
Remove-Item $BuildFolderPath -Recurse -Force -ErrorAction SilentlyContinue
106106
Write-PSFMessage -Level Important -Message "Complete"
107107
#}
@@ -114,7 +114,7 @@ function Invoke-CommerceCompile {
114114
$artifactDirectory = $settings.artifactsPath
115115
}
116116

117-
Convert-FSCPSTextToAscii -Text "FSCPS $($settings.fscPsVer)" -Font "Big" -BorderType DoubleDots -HorizontalLayout Fitted
117+
Convert-FSCPSTextToAscii -Text "FSCPS $($settings.fscPsVer)" -Font "Big" -BorderType DoubleDots -HorizontalLayout Fitted -Padding 2
118118

119119
if (Test-Path -Path $artifactDirectory -ErrorAction SilentlyContinue)
120120
{
@@ -157,13 +157,13 @@ function Invoke-CommerceCompile {
157157
if (Test-PSFFunctionInterrupt) { return }
158158
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
159159
try {
160-
Convert-FSCPSTextToAscii -Text "Copy source files to the build folder" -Font "Small" -BorderType DoubleDots -HorizontalLayout Fitted -ScreenWigth 110
160+
Convert-FSCPSTextToAscii -Text "Copy source files to the build folder" -Font "Term" -BorderType DoubleDots -HorizontalLayout Fitted -Padding 2
161161
$null = Test-PathExists -Path $BuildFolderPath -Type Container -Create @CMDOUT
162162
$null = Test-PathExists -Path $SolutionBuildFolderPath -Type Container -Create @CMDOUT
163163
Copy-Item $SourcesPath\* -Destination $SolutionBuildFolderPath -Recurse -Force @CMDOUT
164164
Write-PSFMessage -Level Important -Message "Complete"
165165

166-
Convert-FSCPSTextToAscii -Text "Build the solution" -Font "Small" -BorderType DoubleDots -HorizontalLayout Fitted
166+
Convert-FSCPSTextToAscii -Text "Build the solution" -Font "Term" -BorderType DoubleDots -HorizontalLayout Fitted
167167

168168
$msbuildpath = & "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" -products * -requires Microsoft.Component.MSBuild -property installationPath -latest
169169

@@ -197,7 +197,7 @@ function Invoke-CommerceCompile {
197197
Set-Location $origLocation
198198
if($settings.generatePackages)
199199
{
200-
Convert-FSCPSTextToAscii -Text "Generate package" -Font "Small" -BorderType DoubleDots -HorizontalLayout Fitted
200+
Convert-FSCPSTextToAscii -Text "Generate package" -Font "Term" -BorderType DoubleDots -HorizontalLayout Fitted -Padding 2
201201

202202
switch ($settings.namingStrategy) {
203203
{ $settings.namingStrategy -eq "Default" }
@@ -251,7 +251,7 @@ function Invoke-CommerceCompile {
251251
[System.IO.DirectoryInfo]$sCInstallerPath = Get-ChildItem -Path $SolutionBuildFolderPath -Recurse | Where-Object {$_.FullName -match "bin.*.Release.*StoreCommerce.*.exe$"} | ForEach-Object {$_.FullName}
252252
[System.IO.DirectoryInfo]$sUInstallerPath = Get-ChildItem -Path $SolutionBuildFolderPath -Recurse | Where-Object {$_.FullName -match "bin.*.Release.*ScaleUnit.*.exe$"} | ForEach-Object {$_.FullName}
253253

254-
Convert-FSCPSTextToAscii -Text "Copy packages to the artifacts folder" -Font "Small" -BorderType DoubleDots -HorizontalLayout Fitted
254+
Convert-FSCPSTextToAscii -Text "Copy packages to the artifacts folder" -Font "Term" -BorderType DoubleDots -HorizontalLayout Fitted -Padding 2
255255
if($csuZipPackagePath)
256256
{
257257
Write-PSFMessage -Level Important -Message "CSU Package processing..."
@@ -300,7 +300,7 @@ function Invoke-CommerceCompile {
300300
$responseObject.SU_INSTALLER_PATH = $destinationFullName
301301
}
302302

303-
Convert-FSCPSTextToAscii -Text "Export NuGets" -Font "Small" -BorderType DoubleDots -HorizontalLayout Fitted
303+
Convert-FSCPSTextToAscii -Text "Export NuGets" -Font "Term" -BorderType DoubleDots -HorizontalLayout Fitted -Padding 2
304304
Get-ChildItem -Path $BuildFolderPath -Recurse | Where-Object {$_.FullName -match "bin.*.Release.*.nupkg$"} | ForEach-Object {
305305
if($settings.cleanupNugets)
306306
{

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

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ function Invoke-FSCCompile {
8383
$responseObject = [Ordered]@{}
8484

8585

86-
Convert-FSCPSTextToAscii -Text "Get FSCPS settings" -Font "Small" -BorderType DoubleDots -HorizontalLayout Fitted
86+
Convert-FSCPSTextToAscii -Text "Get FSCPS settings" -Font "Term" -BorderType DoubleDots -HorizontalLayout ControlledSmushing -Padding 2
8787

8888
$isOneBox = "$($Script:IsOnebox)"
8989
if([string]::IsNullOrEmpty($isOneBox)){$isOneBox = $false}
@@ -105,7 +105,7 @@ function Invoke-FSCCompile {
105105
$Version = $settings.buildVersion
106106
}
107107

108-
Convert-FSCPSTextToAscii -Text "FSCPS $($settings.fscPsVer)" -Font "Big" -BorderType DoubleDots -HorizontalLayout Fitted
108+
Convert-FSCPSTextToAscii -Text "FSCPS $($settings.fscPsVer)" -Font "Standard" -BorderType DoubleDots -HorizontalLayout Fitted -Padding 2
109109

110110
if([string]::IsNullOrEmpty($Version))
111111
{
@@ -184,7 +184,7 @@ function Invoke-FSCCompile {
184184
$responseObject.BUILD_OUTPUT_DIRECTORY = $msOutputDirectory
185185
$responseObject.BUILD_FOLDER_PATH = $BuildFolderPath
186186

187-
Convert-FSCPSTextToAscii -Text "Getting the list of models" -Font "Small" -BorderType DoubleDots -HorizontalLayout Fitted -ScreenWigth 115
187+
Convert-FSCPSTextToAscii -Text "Getting the list of models" -Font "Term" -BorderType DoubleDots -HorizontalLayout ControlledSmushing -ScreenWigth 115 -Padding 2
188188

189189
if($($settings.specifyModelsManually) -eq "true")
190190
{
@@ -258,23 +258,23 @@ function Invoke-FSCCompile {
258258
try {
259259
if($Force)
260260
{
261-
Convert-FSCPSTextToAscii -Text "Cleanup build folder" -Font "Small" -BorderType DoubleDots -HorizontalLayout Fitted
261+
Convert-FSCPSTextToAscii -Text "Cleanup build folder" -Font "Term" -BorderType DoubleDots -HorizontalLayout ControlledSmushing -ScreenWigth 115 -Padding 2
262262
Remove-Item $BuildFolderPath -Recurse -Force -ErrorAction SilentlyContinue
263263
}
264264

265-
Convert-FSCPSTextToAscii -Text "Generate solution folder" -Font "Small" -BorderType DoubleDots -HorizontalLayout Fitted -ScreenWigth 115
265+
Convert-FSCPSTextToAscii -Text "Generate solution folder" -Font "Term" -BorderType DoubleDots -HorizontalLayout ControlledSmushing -ScreenWigth 115 -Padding 2
266266
$null = Invoke-GenerateSolution -ModelsList $modelsToBuild -Version "$Version" -MetadataPath $SourceMetadataPath -SolutionFolderPath $BuildFolderPath @CMDOUT
267267
Write-PSFMessage -Level Important -Message "Complete"
268268

269-
Convert-FSCPSTextToAscii -Text "Copy source files to the build folder" -Font "Small" -BorderType DoubleDots -HorizontalLayout Fitted -ScreenWigth 110
269+
Convert-FSCPSTextToAscii -Text "Copy source files to the build folder" -Font "Term" -BorderType DoubleDots -HorizontalLayout ControlledSmushing -ScreenWigth 160 -Padding 2
270270
$null = Test-PathExists -Path $BuildFolderPath -Type Container -Create @CMDOUT
271271
$null = Test-PathExists -Path $SolutionBuildFolderPath -Type Container -Create @CMDOUT
272272
Write-PSFMessage -Level Important -Message "Source folder: $SourcesPath"
273273
Write-PSFMessage -Level Important -Message "Destination folder: $BuildFolderPath"
274274
Copy-Item $SourcesPath\* -Destination $BuildFolderPath -Recurse -Force @CMDOUT
275275
Write-PSFMessage -Level Important -Message "Complete"
276276

277-
Convert-FSCPSTextToAscii -Text "Download NuGet packages" -Font "Small" -BorderType DoubleDots -HorizontalLayout Fitted -ScreenWigth 80
277+
Convert-FSCPSTextToAscii -Text "Download NuGet packages" -Font "Term" -BorderType DoubleDots -HorizontalLayout ControlledSmushing -ScreenWigth 160 -Padding 2
278278
$null = Test-PathExists -Path $NuGetPackagesPath -Type Container -Create @CMDOUT
279279
$null = Get-FSCPSNuget -Version $PlatformVersion -Type PlatformCompilerPackage -Path $NuGetPackagesPath -Force @CMDOUT
280280
$null = Get-FSCPSNuget -Version $PlatformVersion -Type PlatformDevALM -Path $NuGetPackagesPath -Force @CMDOUT
@@ -284,7 +284,7 @@ function Invoke-FSCCompile {
284284
Write-PSFMessage -Level Important -Message "Complete"
285285
$responseObject.NUGETS_FOLDER = $NuGetPackagesPath
286286

287-
Convert-FSCPSTextToAscii -Text "Install NuGet packages" -Font "Small" -BorderType DoubleDots -HorizontalLayout Fitted -ScreenWigth 110
287+
Convert-FSCPSTextToAscii -Text "Install NuGet packages" -Font "Term" -BorderType DoubleDots -HorizontalLayout ControlledSmushing -ScreenWigth 160 -Padding 2
288288
#validata NuGet installation
289289
$nugetPath = Get-PSFConfigValue -FullName "fscps.tools.path.nuget"
290290
if(-not (Test-Path $nugetPath))
@@ -298,13 +298,13 @@ function Invoke-FSCCompile {
298298
$null = (& $nugetPath restore $NuGetPackagesConfigFilePath -PackagesDirectory $NuGetPackagesPath -ConfigFile $NuGetConfigFilePath)
299299
Write-PSFMessage -Level Important -Message "Complete"
300300

301-
Convert-FSCPSTextToAscii -Text "Copy binaries to the build folder" -Font "Small" -BorderType DoubleDots -HorizontalLayout Fitted -ScreenWigth 120
301+
Convert-FSCPSTextToAscii -Text "Copy binaries to the build folder" -Font "Term" -BorderType DoubleDots -HorizontalLayout ControlledSmushing -ScreenWigth 160 -Padding 2
302302
Copy-Filtered -Source $SourceMetadataPath -Target (Join-Path $BuildFolderPath bin) -Filter *.*
303303
Write-PSFMessage -Level Important -Message "Complete"
304304

305305
if($modelsToBuild)
306306
{
307-
Convert-FSCPSTextToAscii -Text "Build the solution" -Font "Small" -BorderType DoubleDots -HorizontalLayout Fitted
307+
Convert-FSCPSTextToAscii -Text "Build the solution" -Font "Term" -BorderType DoubleDots -HorizontalLayout ControlledSmushing -ScreenWigth 160
308308

309309
Set-Content $BuidPropsFile (Get-Content $BuidPropsFile).Replace('ReferenceFolders', $msReferenceFolder)
310310

@@ -324,7 +324,7 @@ function Invoke-FSCCompile {
324324
Write-PSFMessage -Level Host -Message ("Build completed successfully in {0:N1} seconds." -f $msbuildresult.BuildDuration.TotalSeconds)
325325
if($settings.enableBuildCaching)
326326
{
327-
Convert-FSCPSTextToAscii -Text "Upload cached models to the storageaccount" -Font "Small" -BorderType DoubleDots -HorizontalLayout Fitted -ScreenWigth 110
327+
Convert-FSCPSTextToAscii -Text "Upload cached models to the storageaccount" -Font "Term" -BorderType DoubleDots -HorizontalLayout ControlledSmushing -Padding 2
328328
foreach ($model in $modelsToBuild.Split(","))
329329
{
330330
try {
@@ -381,7 +381,7 @@ function Invoke-FSCCompile {
381381
Write-PSFMessage -Level Warning -Message "Current PS version is $($PSVersionTable.PSVersion). The latest PS version acceptable to generate the D365FSC deployable package is 5."
382382
}
383383
else {
384-
Convert-FSCPSTextToAscii -Text "Generate package" -Font "Small" -BorderType DoubleDots -HorizontalLayout Fitted
384+
Convert-FSCPSTextToAscii -Text "Generate package" -Font "Term" -BorderType DoubleDots -HorizontalLayout ControlledSmushing -Padding 2
385385

386386
$createRegularPackage = $settings.createRegularPackage
387387
$createCloudPackage = $settings.createCloudPackage
@@ -617,7 +617,7 @@ function Invoke-FSCCompile {
617617
}
618618
if($settings.exportModel)
619619
{
620-
Convert-FSCPSTextToAscii -Text "Export models" -Font "Small" -BorderType DoubleDots -HorizontalLayout Fitted
620+
Convert-FSCPSTextToAscii -Text "Export models" -Font "Term" -BorderType DoubleDots -HorizontalLayout ControlledSmushing -Padding 2
621621

622622
try {
623623
$axModelFolder = Join-Path $artifactDirectory AxModels
@@ -676,6 +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
679680
}
680681
catch {
681682
Write-PSFMessage -Level Host -Message "Error: " -Exception $PSItem.Exception

0 commit comments

Comments
 (0)