Skip to content

Commit ef18cc0

Browse files
author
Kapil Borle
committed
Copy newtonsoft.json.dll if framework is net451
1 parent 3d9e91a commit ef18cc0

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

buildCoreClr.ps1

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,18 @@ if (-not (Test-Path "$solutionDir/global.json"))
2525
}
2626

2727
$itemsToCopyBinaries = @("$solutionDir\Engine\bin\$Configuration\$Framework\Microsoft.Windows.PowerShell.ScriptAnalyzer.dll",
28-
"$solutionDir\Rules\bin\$Configuration\$Framework\Microsoft.Windows.PowerShell.ScriptAnalyzer.BuiltinRules.dll",
29-
"$solutionDir\Rules\bin\$Configuration\$Framework\Newtonsoft.Json.dll")
28+
"$solutionDir\Rules\bin\$Configuration\$Framework\Microsoft.Windows.PowerShell.ScriptAnalyzer.BuiltinRules.dll")
3029

3130
$itemsToCopyCommon = @("$solutionDir\Engine\PSScriptAnalyzer.psd1",
3231
"$solutionDir\Engine\PSScriptAnalyzer.psm1",
3332
"$solutionDir\Engine\ScriptAnalyzer.format.ps1xml",
3433
"$solutionDir\Engine\ScriptAnalyzer.types.ps1xml")
3534

36-
$destinationDir = "$solutionDir/out/PSScriptAnalyzer"
37-
$destinationDirBinaries = "$destinationDir"
35+
$destinationDir = "$solutionDir\out\PSScriptAnalyzer"
36+
$destinationDirBinaries = $destinationDir
3837
if ($Framework -eq "netstandard1.6")
3938
{
40-
$destinationDirBinaries = "$destinationDir/coreclr"
39+
$destinationDirBinaries = "$destinationDir\coreclr"
4140
}
4241

4342
if ($build)
@@ -79,7 +78,13 @@ if ($build)
7978
CopyToDestinationDir $itemsToCopyBinaries $destinationDirBinaries
8079

8180
# Copy Settings File
82-
Copy-Item -Path "$solutionDir/Engine/Settings" -Destination $destinationDir -Force -Recurse -Verbose
81+
Copy-Item -Path "$solutionDir\Engine\Settings" -Destination $destinationDir -Force -Recurse -Verbose
82+
83+
# copy newtonsoft dll if net451 framework
84+
if ($Framework -eq "net451")
85+
{
86+
copy-item -path "$solutionDir\Rules\bin\$Configuration\$Framework\Newtonsoft.Json.dll" -Destination $destinationDir -Verbose
87+
}
8388
}
8489

8590
$modulePath = "$HOME\Documents\WindowsPowerShell\Modules";

0 commit comments

Comments
 (0)