diff --git a/CHANGELOG.md b/CHANGELOG.md index caf89b9fca..743d6466fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -60,6 +60,7 @@ ### Builds - **checkver:** Read the private_host config variable ([#5381](https://github.com/ScoopInstaller/Scoop/issues/5381)) +- **supporting:** Update Json to 13.0.3, Json.Schema to 3.0.15 ([#5835](https://github.com/ScoopInstaller/Scoop/issues/5835)) ### Continuous Integration diff --git a/supporting/shimexe/bin/checksum.sha256 b/supporting/shimexe/bin/checksum.sha256 index 2f462bd732..be9604386e 100644 --- a/supporting/shimexe/bin/checksum.sha256 +++ b/supporting/shimexe/bin/checksum.sha256 @@ -1 +1 @@ -1e4a9e4b305ef78b375159b25e2f8a90243584efd56ed6994072a8dfc2147ade *shim.exe +be80df7b3e50671e360eac64b195543ff38d4a6ae4926d71fbde7d4f70195945 *shim.exe diff --git a/supporting/shimexe/bin/checksum.sha512 b/supporting/shimexe/bin/checksum.sha512 index 5344ca9314..ed53cb10f9 100644 --- a/supporting/shimexe/bin/checksum.sha512 +++ b/supporting/shimexe/bin/checksum.sha512 @@ -1 +1 @@ -f580833905e45b02a433c03647fb0caa3692336c8bde9621c286684629c78d1c56a292bea2887ea0ae941b8beec50322f31975c23ab5644c2b85f3c2108f383d *shim.exe +7f2bf0f3870ad00ec24a349e8a1643607da54a414cd0d91f0b4ba0d629e9df2a8ce5658915e4f91738e411eca99ff5625274ed3e072c661755169d7530bf3d9e *shim.exe diff --git a/supporting/shimexe/bin/shim.exe b/supporting/shimexe/bin/shim.exe index 19a7fa36e9..aedc51715d 100644 Binary files a/supporting/shimexe/bin/shim.exe and b/supporting/shimexe/bin/shim.exe differ diff --git a/supporting/shimexe/build.ps1 b/supporting/shimexe/build.ps1 index bf90f720ae..e2ad5d5f9a 100644 --- a/supporting/shimexe/build.ps1 +++ b/supporting/shimexe/build.ps1 @@ -4,7 +4,7 @@ Push-Location $PSScriptRoot . "$PSScriptRoot\..\..\lib\install.ps1" if (!$Fast) { - Write-Host "Install dependencies ..." + Write-Host 'Install dependencies ...' & "$PSScriptRoot\install.ps1" } diff --git a/supporting/shimexe/packages.config b/supporting/shimexe/packages.config index 7d8e9deda3..628240e693 100644 --- a/supporting/shimexe/packages.config +++ b/supporting/shimexe/packages.config @@ -1,4 +1,5 @@  - + diff --git a/supporting/shimexe/shim.csproj b/supporting/shimexe/shim.csproj index 3324f0bb06..3cd82cfc8c 100644 --- a/supporting/shimexe/shim.csproj +++ b/supporting/shimexe/shim.csproj @@ -1,7 +1,10 @@ - - + + Debug AnyCPU @@ -29,8 +32,12 @@ - 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}. + 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 f3abd1fa42..1185cf4503 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 7af125a246..341d08fc8b 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 0b7cc50fcc..d244e70241 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 e5cd51da29..bd4d44ad1b 100644 --- a/supporting/validator/bin/checksum.sha256 +++ b/supporting/validator/bin/checksum.sha256 @@ -1,4 +1,4 @@ -b624949df8b0e3a6153fdfb730a7c6f4990b6592ee0d922e1788433d276610f3 *Newtonsoft.Json.dll -9abb57d73d82a2d77008321a85aff2b62e5ac68bebb54ece8668c96cc112e36b *Newtonsoft.Json.Schema.dll -0318c8221ce4d44806f8def619bcc02886be0902aab80080e6251c50c6ca53a9 *Scoop.Validator.dll -40a70bee96d108701f8f2e81392f9b79fd003f1cb4e1653ad2429753153fd7ee *validator.exe +e1e27af7b07eeedf5ce71a9255f0422816a6fc5849a483c6714e1b472044fa9d *Newtonsoft.Json.dll +9f1a8f06c284a4ee01f704d89003ddc7061846f2008094071e9adf08267849f9 *Newtonsoft.Json.Schema.dll +d11b660612ce821ec03772b73aa3b8884a0479275c70085c7e143913a41a2d28 *Scoop.Validator.dll +87f8f8db2202a3fbef6f431d0b7e20cec9d32095c441927402041f3c4076c1b6 *validator.exe diff --git a/supporting/validator/bin/checksum.sha512 b/supporting/validator/bin/checksum.sha512 index 784d5877f5..0deec2c77b 100644 --- a/supporting/validator/bin/checksum.sha512 +++ b/supporting/validator/bin/checksum.sha512 @@ -1,4 +1,4 @@ -2fdf035661f349206f58ea1feed8805b7f9517a21f9c113e7301c69de160f184c774350a12a710046e3ff6baa37345d319b6f47fd24fbba4e042d54014bee511 *Newtonsoft.Json.dll -855ab2e30c9d523c9f321ae861c5969244185f660fa47e05cec96df8e2970d19843dbd3d89a0fca845544641915d1adf4b4a2145ef568dd99da7791e5064d70e *Newtonsoft.Json.Schema.dll -338793e6127330c0b05728291fcf18441127ffb56e1bd5c0f0588cd7436605f4b852f4bb622f655896a7eb7b1262add142b200fd5f37391b47d1401becb6b81c *Scoop.Validator.dll -d497c27b48f44f4cff270d3c8801b0cecc74108f8786a4a7c40e57541308ae33a69f5456cfc43ae1ce4214038d20da9fbeac1bcf76cc58d972863b58dab18401 *validator.exe +56eb7f070929b239642dab729537dde2c2287bdb852ad9e80b5358c74b14bc2b2dded910d0e3b6304ea27eb587e5f19db0a92e1cbae6a70fb20b4ef05057e4ac *Newtonsoft.Json.dll +551e772fe2ee72b349d5c4ed5d5f8d8957d50cfcbbde7af5d5740d9652bcad626a2c00bc0d9223db7c874962187a90f9160397f243eadee1c594585ba2b155e0 *Newtonsoft.Json.Schema.dll +0a31d192c82bbd8ce50fb75dd5fe813c98bb870d54c112c600ae2e2436063cb2bd94bb206675dfe31ce89922e9a04a3d520ed579ab7198835190b67a6321a74e *Scoop.Validator.dll +58a0c37e98cac17822c7756bf6686a5fb74e711b8d986d13bd2f689f6b3b1f485fcd908d92cbc6a162a0e5974c2c5a43de57d15f1996be0aa405e41ec2ec8393 *validator.exe diff --git a/supporting/validator/bin/validator.exe b/supporting/validator/bin/validator.exe index 3781da1f21..7671654a59 100644 Binary files a/supporting/validator/bin/validator.exe and b/supporting/validator/bin/validator.exe differ diff --git a/supporting/validator/build.ps1 b/supporting/validator/build.ps1 index c61db3313d..d5aaa89046 100644 --- a/supporting/validator/build.ps1 +++ b/supporting/validator/build.ps1 @@ -4,7 +4,7 @@ Push-Location $PSScriptRoot . "$PSScriptRoot\..\..\lib\install.ps1" if (!$Fast) { - Write-Host "Install dependencies ..." + Write-Host 'Install dependencies ...' & "$PSScriptRoot\install.ps1" } diff --git a/supporting/validator/packages.config b/supporting/validator/packages.config index 2210aacff2..333c8a4faf 100644 --- a/supporting/validator/packages.config +++ b/supporting/validator/packages.config @@ -1,6 +1,6 @@  - - - + + + diff --git a/supporting/validator/validator.csproj b/supporting/validator/validator.csproj index ec3718fd25..a2c7978fff 100644 --- a/supporting/validator/validator.csproj +++ b/supporting/validator/validator.csproj @@ -1,7 +1,10 @@ - - + + Debug AnyCPU @@ -14,12 +17,15 @@ true - - packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll + + packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll True - - packages\Newtonsoft.Json.Schema.3.0.15-beta2\lib\net45\Newtonsoft.Json.Schema.dll + + + packages\Newtonsoft.Json.Schema.3.0.15\lib\net45\Newtonsoft.Json.Schema.dll True @@ -41,8 +47,12 @@ - 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}. + 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}. - +