Skip to content

Commit

Permalink
Newtonsoft.json.dll updates
Browse files Browse the repository at this point in the history
Removed .dll from .gitignore to support inclusion of the Newtonsoft.json.dll
added 'Unblock-File to unblock the Newtonsoft.json.dll so it can be loaded
  • Loading branch information
Mike Fal committed Sep 23, 2018
1 parent 3fa5152 commit 788691d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
###################
*.com
*.class
*.dll
*.exe
*.o
*.so
Expand Down
3 changes: 2 additions & 1 deletion Rubrik/Private/Format-JSON.ps1
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<#
Uses Json.Net https://www.newtonsoft.com/json for increased performance and cross-platform compatibility on PowerShell 6 and later
#>
#>

function ExpandPayload($response) {
Unblock-File "$PSScriptRoot\Newtonsoft.Json.dll"
$asm = [Reflection.Assembly]::LoadFile("$PSScriptRoot\Newtonsoft.Json.dll")
ConvertFrom-JsonNewtonsoft $response.Content
}
Expand Down

0 comments on commit 788691d

Please sign in to comment.