diff --git a/lib/json.ps1 b/lib/json.ps1 index 8c0dcc3b7..f3b6c97f1 100644 --- a/lib/json.ps1 +++ b/lib/json.ps1 @@ -95,7 +95,7 @@ function ConvertToPrettyJson { function json_path([String] $json, [String] $jsonpath, [Hashtable] $substitutions) { Add-Type -Path "$psscriptroot\..\supporting\validator\bin\Newtonsoft.Json.dll" if ($null -ne $substitutions) { - $jsonpath = substitute $jsonpath $substitutions + $jsonpath = substitute $jsonpath $substitutions ($jsonpath -like "*=~*") } try { $obj = [Newtonsoft.Json.Linq.JObject]::Parse($json) diff --git a/supporting/shimexe/packages.config b/supporting/shimexe/packages.config index 076a52e96..64e5e8765 100644 --- a/supporting/shimexe/packages.config +++ b/supporting/shimexe/packages.config @@ -1,4 +1,4 @@  - - \ No newline at end of file + + diff --git a/supporting/shimexe/shim.csproj b/supporting/shimexe/shim.csproj index c2484bc29..a2733e619 100644 --- a/supporting/shimexe/shim.csproj +++ b/supporting/shimexe/shim.csproj @@ -1,7 +1,6 @@ - - + Debug @@ -10,7 +9,7 @@ Exe Scoop.Shim Scoop.Shim - v4.0.0 + v4.5.0 512 true @@ -32,7 +31,6 @@ This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}. - - + diff --git a/supporting/validator/bin/Newtonsoft.Json.Schema.dll b/supporting/validator/bin/Newtonsoft.Json.Schema.dll index 44292af58..1d5aa3b83 100644 Binary files a/supporting/validator/bin/Newtonsoft.Json.Schema.dll and b/supporting/validator/bin/Newtonsoft.Json.Schema.dll differ diff --git a/supporting/validator/bin/Newtonsoft.Json.dll b/supporting/validator/bin/Newtonsoft.Json.dll index 71ba70200..80699020c 100644 Binary files a/supporting/validator/bin/Newtonsoft.Json.dll and b/supporting/validator/bin/Newtonsoft.Json.dll differ diff --git a/supporting/validator/bin/Scoop.Validator.dll b/supporting/validator/bin/Scoop.Validator.dll index 4c4a2034f..d4e13403f 100644 Binary files a/supporting/validator/bin/Scoop.Validator.dll and b/supporting/validator/bin/Scoop.Validator.dll differ diff --git a/supporting/validator/bin/checksum.sha256 b/supporting/validator/bin/checksum.sha256 index 84055541a..1247d597b 100644 --- a/supporting/validator/bin/checksum.sha256 +++ b/supporting/validator/bin/checksum.sha256 @@ -1,4 +1,4 @@ -52cc6ddf77990fbaaae4db593f655610652133ceeadb32262c122d8c9eea1bad *Newtonsoft.Json.dll -8643f860be0e5592e73219b6d5e993265f336d3bf2c93d6db5a2e918d3c3f177 *Newtonsoft.Json.Schema.dll -306de31359895c96e1b91df29a216b65a7aa3f353251ba3e5ad129906fcfc77b *Scoop.Validator.dll +f58c374ffcaae4e36d740d90fbf7fe70d0abb7328cd9af3a0a7b70803e994ba4 *Newtonsoft.Json.dll +4ca0681df3755205cfd178aaa38f7fd6818c183c4d14c77cd77f8d777282a650 *Newtonsoft.Json.Schema.dll +e077a05608126d44938158da04fe2062513afedba666648ed185d3e25b50436e *Scoop.Validator.dll cc82c9659716b564a69690a8b67e5472ea1e8e060b974306314acdd42767bf6d *validator.exe diff --git a/supporting/validator/bin/checksum.sha512 b/supporting/validator/bin/checksum.sha512 index f42ed2013..c2ee0cd94 100644 --- a/supporting/validator/bin/checksum.sha512 +++ b/supporting/validator/bin/checksum.sha512 @@ -1,4 +1,4 @@ -4639a7f77f7a9cafa38c632332dd5085355623f3d84475374241a64bd110569f504086b479b519e90ddbd471d4a5034239418ebc03277424212e0e6698e64418 *Newtonsoft.Json.dll -0c39a3c8e514fde4d629f11f94e6c7acdcd196cd1229c3ef5a6a0455c1cdf4dbf3fda24dd9392b05e917cb85ec745393595086078d1437343dded52f2c0011f3 *Newtonsoft.Json.Schema.dll -d133d47dbeda60571090fc4159e3575b40ddaddef858b56e0103ad531dc4612a9d4bdbee8a6b5dd4e0d5abeb549afadd059767058b568e4d5d31990a42631743 *Scoop.Validator.dll +7cbbbef742f56af80f1012d7da86fe5375ac05813045756fb45d0691c36ef13c069361457500ba4200157d5ee7922fd118bf4c0635e5192e3f8c6183fd580944 *Newtonsoft.Json.dll +2d9c630948c21b325af7b7ad3de9219a3fdcc23fa65270a0cdb78ea9609038434f6b741a968e9758f93782a3bab57efc3072429bdf84f8ad25a94bf5a8c4bc48 *Newtonsoft.Json.Schema.dll +15b0aa8b29f4e7d74ae3ff36ce7d72f6243a9b7f35890df3e549340c27edf37a73a9d16132254baf661a9aadc6fd5870d3b04452b78df79e3ccf9bee1c9bd788 *Scoop.Validator.dll 384d22bfb21b2767de862f95945dca91aefb4b5eca687d20e410dc64059c5402a13c085517cb807635ff07397fee9bda31b0fdc0090c24cb424f62b285ea0477 *validator.exe diff --git a/supporting/validator/build.ps1 b/supporting/validator/build.ps1 index 3e5f62edb..d5255f21e 100644 --- a/supporting/validator/build.ps1 +++ b/supporting/validator/build.ps1 @@ -5,7 +5,7 @@ Write-Host "Install dependencies ..." Invoke-Expression "$psscriptroot\install.ps1" $output = "$psscriptroot\bin" -Get-ChildItem "$psscriptroot\packages\Newtonsoft.*\lib\net40\*.dll" -File | ForEach-Object { Copy-Item $_ $output } +Get-ChildItem "$psscriptroot\packages\Newtonsoft.*\lib\net45\*.dll" -File | ForEach-Object { Copy-Item $_ $output } Write-Output 'Compiling Scoop.Validator.cs ...' & "$psscriptroot\packages\Microsoft.Net.Compilers\tools\csc.exe" /deterministic /platform:anycpu /nologo /optimize /target:library /reference:"$output\Newtonsoft.Json.dll","$output\Newtonsoft.Json.Schema.dll" /out:"$output\Scoop.Validator.dll" Scoop.Validator.cs Write-Output 'Compiling validator.cs ...' diff --git a/supporting/validator/packages.config b/supporting/validator/packages.config index 080c82f97..77bf30dbb 100644 --- a/supporting/validator/packages.config +++ b/supporting/validator/packages.config @@ -1,6 +1,6 @@  - - - - \ No newline at end of file + + + + diff --git a/supporting/validator/validator.csproj b/supporting/validator/validator.csproj index 424582662..fcca6e078 100644 --- a/supporting/validator/validator.csproj +++ b/supporting/validator/validator.csproj @@ -1,7 +1,6 @@ - - + Debug @@ -10,17 +9,17 @@ Exe Scoop.Validator Scoop.Validator - v4.0.0 + v4.5.0 512 true - - packages\Newtonsoft.Json.10.0.3\lib\net40\Newtonsoft.Json.dll + + packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll True - packages\Newtonsoft.Json.Schema.3.0.5\lib\net40\Newtonsoft.Json.Schema.dll + packages\Newtonsoft.Json.Schema.3.0.10\lib\net45\Newtonsoft.Json.Schema.dll True @@ -44,7 +43,6 @@ This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}. - - +