Skip to content

Commit 99d561f

Browse files
author
devizer
committed
Module: Brush up tests, 8th
1 parent 9176678 commit 99d561f

2 files changed

Lines changed: 30 additions & 4 deletions

File tree

Install-SqlServer-Version-Management.ps1

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Param(
44
)
55

66
$ModuleName = 'SqlServer-Version-Management';
7-
$ModuleVersion = '2.1.169';
7+
$ModuleVersion = '2.1.170';
88
$ModuleFiles = @(
99
@{
1010
FileName = 'SqlServer-Version-Management\SqlServer-Version-Management.psd1';
@@ -15,7 +15,7 @@ $ModuleFiles = @(
1515
" ModuleToProcess = @('SqlServer-Version-Management.psm1')",
1616
"",
1717
" # Version below is automatically incremented on build",
18-
" ModuleVersion = `"2.1.169`"",
18+
" ModuleVersion = `"2.1.170`"",
1919
"",
2020
" GUID = 'dd03b53d-575a-4056-ae08-e6dfea3384ea'",
2121
"",
@@ -1946,13 +1946,26 @@ $ModuleFiles = @(
19461946
" return ",
19471947
" }",
19481948
"",
1949-
" Write-Host `"```"`$exe```" `$arguments`" -ForegroundColor Yellow",
1949+
" # Write-Host `"```"`$exe```" `$arguments`" -ForegroundColor Yellow",
1950+
" Write-Host `"`$(Format-Command-Line `"^`" `"`$exe`" `$arguments)`" -ForegroundColor Yellow",
19501951
" # Write-Host `"`$(`$arguments -join `"``r``n`")`" -ForegroundColor Magenta",
19511952
" if (`$arguments -and (`$arguments.Length -gt 0)) { `$__ = Start-Process `$exe -ArgumentList @(`$arguments | ? { `$_ }) } Else { `$__ = Start-Process `$exe }",
19521953
" # wating for bootstrapper.exe forward control to setup.exe",
19531954
" return Wait-For-VisualStudio-Setup-Is-Running -Timeout (5*60*1000)",
19541955
"}",
19551956
"",
1957+
"function Format-Command-Line([string] `$newLine, [string] `$command, [string[]] `$parts) {",
1958+
" `$parts = @(`"```"`$(`$command)```"`") + (`$parts)",
1959+
" `$ret = `"`"; `$len = 0;",
1960+
" foreach(`$part in `$parts) {",
1961+
" if (`$len -gt 180) { `$ret += `"`$(`$newLine)`$([Environment]::NewLine) `"; `$len=4 }",
1962+
" `$ret += `"`$part `"; `$len += `"`$part`".Length + 1;",
1963+
" }",
1964+
" return `"`$ret`".TrimEnd()",
1965+
"}",
1966+
"# Format-Command-Line `"^`" `"\xxx\yyy\cmd`" `"-aasdasdasd`", `"-dfhgfhfhg`", `"-bnmbmbmbnmbnm`", `"-aasdasdasd`", `"-dfhgfhfhg`", `"-bnmbmbmbnmbnm`", `"-aasdasdasd`", `"-dfhgfhfhg`", `"-bnmbmbmbnmbnm`", `"-aasdasdasd`", `"-dfhgfhfhg`", `"-bnmbmbmbnmbnm`", `"-aasdasdasd`", `"-dfhgfhfhg`", `"-bnmbmbmbnmbnm`", `"-aasdasdasd`", `"-dfhgfhfhg`", `"-bnmbmbmbnmbnm`", `"-bnmbmbmbnmbnm`", `"-aasdasdasd`", `"-dfhgfhfhg`", `"-bnmbmbmbnmbnm`", `"-aasdasdasd`", `"-dfhgfhfhg`", `"-bnmbmbmbnmbnm`", `"-aasdasdasd`", `"-dfhgfhfhg`", `"-bnmbmbmbnmbnm`", `"-aasdasdasd`", `"-dfhgfhfhg`", `"-bnmbmbmbnmbnm`", `"-bnmbmbmbnmbnm`", `"-aasdasdasd`", `"-dfhgfhfhg`", `"-bnmbmbmbnmbnm`", `"-aasdasdasd`", `"-dfhgfhfhg`", `"-bnmbmbmbnmbnm`", `"-aasdasdasd`", `"-dfhgfhfhg`", `"-bnmbmbmbnmbnm`", `"-aasdasdasd`", `"-dfhgfhfhg`", `"-bnmbmbmbnmbnm`"",
1967+
"",
1968+
"",
19561969
"function Find-VisualStudio-Installed-Products() {",
19571970
" @(Get-Speedy-Software-Product-List | ? { `$_.Vendor -match `"Microsoft`" -and `$_.Name -like `"Visual*`" -and `$_.Name -match `"Studio`" } | Select-Object -Property Name, Version)",
19581971
"}",

SqlServer-Version-Management.ps1

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1847,13 +1847,26 @@ function Setup-VisualStudio([string] $VSID, [string[]] $arguments) {
18471847
return
18481848
}
18491849

1850-
Write-Host "`"$exe`" $arguments" -ForegroundColor Yellow
1850+
# Write-Host "`"$exe`" $arguments" -ForegroundColor Yellow
1851+
Write-Host "$(Format-Command-Line "^" "$exe" $arguments)" -ForegroundColor Yellow
18511852
# Write-Host "$($arguments -join "`r`n")" -ForegroundColor Magenta
18521853
if ($arguments -and ($arguments.Length -gt 0)) { $__ = Start-Process $exe -ArgumentList @($arguments | ? { $_ }) } Else { $__ = Start-Process $exe }
18531854
# wating for bootstrapper.exe forward control to setup.exe
18541855
return Wait-For-VisualStudio-Setup-Is-Running -Timeout (5*60*1000)
18551856
}
18561857

1858+
function Format-Command-Line([string] $newLine, [string] $command, [string[]] $parts) {
1859+
$parts = @("`"$($command)`"") + ($parts)
1860+
$ret = ""; $len = 0;
1861+
foreach($part in $parts) {
1862+
if ($len -gt 180) { $ret += "$($newLine)$([Environment]::NewLine) "; $len=4 }
1863+
$ret += "$part "; $len += "$part".Length + 1;
1864+
}
1865+
return "$ret".TrimEnd()
1866+
}
1867+
# Format-Command-Line "^" "\xxx\yyy\cmd" "-aasdasdasd", "-dfhgfhfhg", "-bnmbmbmbnmbnm", "-aasdasdasd", "-dfhgfhfhg", "-bnmbmbmbnmbnm", "-aasdasdasd", "-dfhgfhfhg", "-bnmbmbmbnmbnm", "-aasdasdasd", "-dfhgfhfhg", "-bnmbmbmbnmbnm", "-aasdasdasd", "-dfhgfhfhg", "-bnmbmbmbnmbnm", "-aasdasdasd", "-dfhgfhfhg", "-bnmbmbmbnmbnm", "-bnmbmbmbnmbnm", "-aasdasdasd", "-dfhgfhfhg", "-bnmbmbmbnmbnm", "-aasdasdasd", "-dfhgfhfhg", "-bnmbmbmbnmbnm", "-aasdasdasd", "-dfhgfhfhg", "-bnmbmbmbnmbnm", "-aasdasdasd", "-dfhgfhfhg", "-bnmbmbmbnmbnm", "-bnmbmbmbnmbnm", "-aasdasdasd", "-dfhgfhfhg", "-bnmbmbmbnmbnm", "-aasdasdasd", "-dfhgfhfhg", "-bnmbmbmbnmbnm", "-aasdasdasd", "-dfhgfhfhg", "-bnmbmbmbnmbnm", "-aasdasdasd", "-dfhgfhfhg", "-bnmbmbmbnmbnm"
1868+
1869+
18571870
function Find-VisualStudio-Installed-Products() {
18581871
@(Get-Speedy-Software-Product-List | ? { $_.Vendor -match "Microsoft" -and $_.Name -like "Visual*" -and $_.Name -match "Studio" } | Select-Object -Property Name, Version)
18591872
}

0 commit comments

Comments
 (0)