From cc65d1103869f14e6984641456439759b9be9807 Mon Sep 17 00:00:00 2001 From: Brice Lambson Date: Wed, 19 Aug 2020 14:21:59 -0700 Subject: [PATCH] PMC Tools: Work around PowerShell/PowerShell#3424 (#22134) --- src/EFCore.Tools/tools/EntityFrameworkCore.psm1 | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/EFCore.Tools/tools/EntityFrameworkCore.psm1 b/src/EFCore.Tools/tools/EntityFrameworkCore.psm1 index a9a1cafa1ee..7a3de94250b 100644 --- a/src/EFCore.Tools/tools/EntityFrameworkCore.psm1 +++ b/src/EFCore.Tools/tools/EntityFrameworkCore.psm1 @@ -211,7 +211,8 @@ function Get-DbContext { $params = 'dbcontext', 'list', '--json' # NB: -join is here to support ConvertFrom-Json on PowerShell 3.0 - return (EF $dteProject $dteStartupProject $params $Args) -join "`n" | ConvertFrom-Json | Format-Table -Property safeName -HideTableHeaders + # NB: Write-Output is here to break the JSON array into individual items + return (EF $dteProject $dteStartupProject $params $Args) -join "`n" | ConvertFrom-Json | Write-Output | Format-Table -Property safeName -HideTableHeaders } } @@ -284,7 +285,8 @@ function Get-Migration $params += GetParams $Context # NB: -join is here to support ConvertFrom-Json on PowerShell 3.0 - return (EF $dteProject $dteStartupProject $params $Args) -join "`n" | ConvertFrom-Json + # NB: Write-Output is here to break the JSON array into individual items + return (EF $dteProject $dteStartupProject $params $Args) -join "`n" | ConvertFrom-Json | Write-Output } # @@ -821,7 +823,8 @@ function GetContextTypes($projectName, $startupProjectName) $params = 'dbcontext', 'list', '--json' # NB: -join is here to support ConvertFrom-Json on PowerShell 3.0 - $result = (EF $project $startupProject $params $null -skipBuild) -join "`n" | ConvertFrom-Json + # NB: Write-Output is here to break the JSON array into individual items + $result = (EF $project $startupProject $params $null -skipBuild) -join "`n" | ConvertFrom-Json | Write-Output return $result | %{ $_.safeName } } @@ -835,7 +838,8 @@ function GetMigrations($context, $projectName, $startupProjectName) $params += GetParams $context # NB: -join is here to support ConvertFrom-Json on PowerShell 3.0 - $result = (EF $project $startupProject $params $null -skipBuild) -join "`n" | ConvertFrom-Json + # NB: Write-Output is here to break the JSON array into individual items + $result = (EF $project $startupProject $params $null -skipBuild) -join "`n" | ConvertFrom-Json | Write-Output return $result | %{ $_.safeName } }