Skip to content

Commit ef3bf14

Browse files
niheavenniheaven
authored
feat(supporting): Update Json to 12.0.3, Json.Schema to 3.0.14 (#3352)
1 parent 5ad8c76 commit ef3bf14

19 files changed

+54
-54
lines changed

‎supporting/shimexe/bin/checksum.sha256

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
cb440b8a08a2095a59666a859b35aa5a1524b140b909ecc760f38f3baccf80e6 *shim.exe
1+
9726c3a429009a5b22bd92cb8ab96724c670e164e7240e83f27b7c8b7bd1ca39 *shim.exe

‎supporting/shimexe/bin/checksum.sha512

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
710aeef5381f96ea0360a27ce6b792f67e018abb91d6dc67fc5c18c15baf611f36268a3f9e70a339b1a1b0e5dbfdaee10d74288352e609764d5b81303409a332 *shim.exe
1+
18a737674afde4d5e7e1647d8d1e98471bb260513c57739651f92fdf1647d76c92f0cd0a9bb458daf4eae4bdab9d31404162acf6d74a041e6415752b75d722e0 *shim.exe

‎supporting/shimexe/bin/shim.exe

0 Bytes
Binary file not shown.

‎supporting/shimexe/build.ps1

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
Param([Switch]$Fast)
2-
Push-Location $psscriptroot
3-
. "$psscriptroot\..\..\lib\install.ps1"
2+
Push-Location $PSScriptRoot
3+
. "$PSScriptRoot\..\..\lib\install.ps1"
44

5-
if(!$Fast) {
5+
if (!$Fast) {
66
Write-Host "Install dependencies ..."
7-
Invoke-Expression "$psscriptroot\install.ps1"
7+
Invoke-Expression "$PSScriptRoot\install.ps1"
88
}
99

10-
$output = "$psscriptroot\bin"
10+
$output = "$PSScriptRoot\bin"
1111
Write-Output 'Compiling shim.cs ...'
12-
& "$psscriptroot\packages\Microsoft.Net.Compilers\tools\csc.exe" /deterministic /platform:anycpu /nologo /optimize /target:exe /out:"$output\shim.exe" shim.cs
12+
& "$PSScriptRoot\packages\Microsoft.Net.Compilers.Toolset\tasks\net472\csc.exe" -deterministic -platform:anycpu -nologo -optimize -target:exe -out:"$output\shim.exe" shim.cs
1313

1414
Write-Output 'Computing checksums ...'
15-
Remove-Item "$psscriptroot\bin\checksum.sha256" -ErrorAction Ignore
16-
Remove-Item "$psscriptroot\bin\checksum.sha512" -ErrorAction Ignore
17-
Get-ChildItem "$psscriptroot\bin\*" -Include *.exe,*.dll | ForEach-Object {
18-
"$(compute_hash $_ 'sha256') *$($_.Name)" | Out-File "$psscriptroot\bin\checksum.sha256" -Append -Encoding oem
19-
"$(compute_hash $_ 'sha512') *$($_.Name)" | Out-File "$psscriptroot\bin\checksum.sha512" -Append -Encoding oem
15+
Remove-Item "$PSScriptRoot\bin\checksum.sha256" -ErrorAction Ignore
16+
Remove-Item "$PSScriptRoot\bin\checksum.sha512" -ErrorAction Ignore
17+
Get-ChildItem "$PSScriptRoot\bin\*" -Include *.exe, *.dll | ForEach-Object {
18+
"$(compute_hash $_ 'sha256') *$($_.Name)" | Out-File "$PSScriptRoot\bin\checksum.sha256" -Append -Encoding oem
19+
"$(compute_hash $_ 'sha512') *$($_.Name)" | Out-File "$PSScriptRoot\bin\checksum.sha512" -Append -Encoding oem
2020
}
2121
Pop-Location

‎supporting/shimexe/install.ps1

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# https://github.com/edymtt/nugetstandalone
2-
$destinationFolder = "$psscriptroot\packages"
3-
if ((Test-Path -path $destinationFolder)) {
2+
$destinationFolder = "$PSScriptRoot\packages"
3+
if ((Test-Path -Path $destinationFolder)) {
44
Remove-Item -Path $destinationFolder -Recurse | Out-Null
55
}
66

‎supporting/shimexe/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.Net.Compilers" version="2.10.0" targetFramework="net45" developmentDependency="true" />
3+
<package id="Microsoft.Net.Compilers.Toolset" version="4.0.1" targetFramework="net45" developmentDependency="true" />
44
</packages>

‎supporting/shimexe/shim.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="packages\Microsoft.Net.Compilers.2.10.0\build\Microsoft.Net.Compilers.props" Condition="Exists('packages\Microsoft.Net.Compilers.2.10.0\build\Microsoft.Net.Compilers.props')" />
3+
<Import Project="packages\Microsoft.Net.Compilers.Toolset.4.0.1\build\Microsoft.Net.Compilers.Toolset.props" Condition="Exists('packages\Microsoft.Net.Compilers.Toolset.4.0.1\build\Microsoft.Net.Compilers.Toolset.props')" />
44
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
55
<PropertyGroup>
66
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -31,6 +31,6 @@
3131
<PropertyGroup>
3232
<ErrorText>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}.</ErrorText>
3333
</PropertyGroup>
34-
<Error Condition="!Exists('packages\Microsoft.Net.Compilers.2.10.0\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Net.Compilers.2.10.0\build\Microsoft.Net.Compilers.props'))" />
34+
<Error Condition="!Exists('packages\Microsoft.Net.Compilers.Toolset.4.0.1\build\Microsoft.Net.Compilers.Toolset.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Net.Compilers.Toolset.4.0.1\build\Microsoft.Net.Compilers.Toolset.props'))" />
3535
</Target>
3636
</Project>

‎supporting/shimexe/update.ps1

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# https://github.com/edymtt/nugetstandalone
2-
$destinationFolder = "$psscriptroot\packages"
3-
if (!(Test-Path -path $destinationFolder)) {
2+
$destinationFolder = "$PSScriptRoot\packages"
3+
if (!(Test-Path -Path $destinationFolder)) {
44
Write-Host -f Red "Run .\install.ps1 first!"
55
exit 1
66
}

‎supporting/validator/bin/Newtonsoft.Json.Schema.dll

60 KB
Binary file not shown.

‎supporting/validator/bin/Newtonsoft.Json.dll

36.9 KB
Binary file not shown.

‎supporting/validator/bin/Scoop.Validator.dll

0 Bytes
Binary file not shown.

‎supporting/validator/bin/checksum.sha256

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
f58c374ffcaae4e36d740d90fbf7fe70d0abb7328cd9af3a0a7b70803e994ba4 *Newtonsoft.Json.dll
2-
4ca0681df3755205cfd178aaa38f7fd6818c183c4d14c77cd77f8d777282a650 *Newtonsoft.Json.Schema.dll
3-
55f1292b42fa2e8a7a4b3eb360fcfffe97be0fe043b4709979fcd37b8a400456 *Scoop.Validator.dll
4-
6dfbe59d9f1c17d362bdd4509975ab40d96e09585aa8d0a1f5527dafbc1c3727 *validator.exe
1+
7f912b28a07c226e0be3acfb2f57f050538aba0100fa1f0bf2c39f1a1f1da814 *Newtonsoft.Json.dll
2+
cff8fc4ce358d7daff84ab47129a776797a4ec819c1586a15bd5e63144f5b73f *Newtonsoft.Json.Schema.dll
3+
0d6b228378cbabff23a30456d22f1a31337c466f90cf8b7997cc48bd171155f3 *Scoop.Validator.dll
4+
40a70bee96d108701f8f2e81392f9b79fd003f1cb4e1653ad2429753153fd7ee *validator.exe

‎supporting/validator/bin/checksum.sha512

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
7cbbbef742f56af80f1012d7da86fe5375ac05813045756fb45d0691c36ef13c069361457500ba4200157d5ee7922fd118bf4c0635e5192e3f8c6183fd580944 *Newtonsoft.Json.dll
2-
2d9c630948c21b325af7b7ad3de9219a3fdcc23fa65270a0cdb78ea9609038434f6b741a968e9758f93782a3bab57efc3072429bdf84f8ad25a94bf5a8c4bc48 *Newtonsoft.Json.Schema.dll
3-
6d89196ce01823093f5c3da98d34d41bc1733316d04e181d6f24982a373cc28487b8e4e74b54f5a665a550ad4a7fa6d7208d99de947b82b20e524747bdb41bdd *Scoop.Validator.dll
4-
e9b2162b3e109291c61005a9088d9ebf30fb0307fa285ccf5c54aef05fb3c02944d9513f2557e75d670682b0f3ba67a4f8df3561c715eaa5daa077b591fb4d54 *validator.exe
1+
3398094ce429ab5dcdecf2ad04803230669bb4accaef7083992e9b87afac55841ba8def2a5168358bd17e60799e55d076b0e5ca44c86b9e6c91150d3dc37c721 *Newtonsoft.Json.dll
2+
298d3d0b656acbb1fe5ed0c3abb49a640c47889184ab7bd4b594e51a7d7f829d5c8685edbd10a286fd56bfd8d601b9f187da463a5a9c8509365eddaea280642f *Newtonsoft.Json.Schema.dll
3+
afabe1df6ab837395a5da5ec8dd12bf3f36a8512b76e6f751c14045544246980e9d4061d437792836db792864b7db2761e84f1bf65bac688657a862b68fc7b45 *Scoop.Validator.dll
4+
d497c27b48f44f4cff270d3c8801b0cecc74108f8786a4a7c40e57541308ae33a69f5456cfc43ae1ce4214038d20da9fbeac1bcf76cc58d972863b58dab18401 *validator.exe

‎supporting/validator/bin/validator.exe

0 Bytes
Binary file not shown.

‎supporting/validator/build.ps1

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
Param([Switch]$Fast)
2-
Push-Location $psscriptroot
3-
. "$psscriptroot\..\..\lib\install.ps1"
2+
Push-Location $PSScriptRoot
3+
. "$PSScriptRoot\..\..\lib\install.ps1"
44

5-
if(!$Fast) {
5+
if (!$Fast) {
66
Write-Host "Install dependencies ..."
7-
Invoke-Expression "$psscriptroot\install.ps1"
7+
Invoke-Expression "$PSScriptRoot\install.ps1"
88
}
99

10-
$output = "$psscriptroot\bin"
11-
if(!$Fast) {
12-
Get-ChildItem "$psscriptroot\packages\Newtonsoft.*\lib\net45\*.dll" -File | ForEach-Object { Copy-Item $_ $output }
10+
$output = "$PSScriptRoot\bin"
11+
if (!$Fast) {
12+
Get-ChildItem "$PSScriptRoot\packages\Newtonsoft.*\lib\net45\*.dll" -File | ForEach-Object { Copy-Item $_ $output }
1313
}
1414
Write-Output 'Compiling Scoop.Validator.cs ...'
15-
& "$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
15+
& "$PSScriptRoot\packages\Microsoft.Net.Compilers.Toolset\tasks\net472\csc.exe" -deterministic -platform:anycpu -nologo -optimize -target:library -reference:"$output\Newtonsoft.Json.dll" -reference:"$output\Newtonsoft.Json.Schema.dll" -out:"$output\Scoop.Validator.dll" Scoop.Validator.cs
1616
Write-Output 'Compiling validator.cs ...'
17-
& "$psscriptroot\packages\Microsoft.Net.Compilers\tools\csc.exe" /deterministic /platform:anycpu /nologo /optimize /target:exe /reference:"$output\Scoop.Validator.dll","$output\Newtonsoft.Json.dll","$output\Newtonsoft.Json.Schema.dll" /out:"$output\validator.exe" validator.cs
17+
& "$PSScriptRoot\packages\Microsoft.Net.Compilers.Toolset\tasks\net472\csc.exe" -deterministic -platform:anycpu -nologo -optimize -target:exe -reference:"$output\Scoop.Validator.dll" -reference:"$output\Newtonsoft.Json.dll" -reference:"$output\Newtonsoft.Json.Schema.dll" -out:"$output\validator.exe" validator.cs
1818

1919
Write-Output 'Computing checksums ...'
20-
Remove-Item "$psscriptroot\bin\checksum.sha256" -ErrorAction Ignore
21-
Remove-Item "$psscriptroot\bin\checksum.sha512" -ErrorAction Ignore
22-
Get-ChildItem "$psscriptroot\bin\*" -Include *.exe,*.dll | ForEach-Object {
23-
"$(compute_hash $_ 'sha256') *$($_.Name)" | Out-File "$psscriptroot\bin\checksum.sha256" -Append -Encoding oem
24-
"$(compute_hash $_ 'sha512') *$($_.Name)" | Out-File "$psscriptroot\bin\checksum.sha512" -Append -Encoding oem
20+
Remove-Item "$PSScriptRoot\bin\checksum.sha256" -ErrorAction Ignore
21+
Remove-Item "$PSScriptRoot\bin\checksum.sha512" -ErrorAction Ignore
22+
Get-ChildItem "$PSScriptRoot\bin\*" -Include *.exe, *.dll | ForEach-Object {
23+
"$(compute_hash $_ 'sha256') *$($_.Name)" | Out-File "$PSScriptRoot\bin\checksum.sha256" -Append -Encoding oem
24+
"$(compute_hash $_ 'sha512') *$($_.Name)" | Out-File "$PSScriptRoot\bin\checksum.sha512" -Append -Encoding oem
2525
}
2626
Pop-Location

‎supporting/validator/install.ps1

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# https://github.com/edymtt/nugetstandalone
2-
$destinationFolder = "$psscriptroot\packages"
3-
if ((Test-Path -path $destinationFolder)) {
2+
$destinationFolder = "$PSScriptRoot\packages"
3+
if ((Test-Path -Path $destinationFolder)) {
44
Remove-Item -Path $destinationFolder -Recurse | Out-Null
55
}
66

‎supporting/validator/packages.config

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net45" />
4-
<package id="Newtonsoft.Json.Schema" version="3.0.10" targetFramework="net45" />
5-
<package id="Microsoft.Net.Compilers" version="2.10.0" targetFramework="net45" developmentDependency="true" />
3+
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net45" />
4+
<package id="Newtonsoft.Json.Schema" version="3.0.14" targetFramework="net45" />
5+
<package id="Microsoft.Net.Compilers.Toolset" version="4.0.1" targetFramework="net45" developmentDependency="true" />
66
</packages>

‎supporting/validator/update.ps1

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# https://github.com/edymtt/nugetstandalone
2-
$destinationFolder = "$psscriptroot\packages"
3-
if (!(Test-Path -path $destinationFolder)) {
2+
$destinationFolder = "$PSScriptRoot\packages"
3+
if (!(Test-Path -Path $destinationFolder)) {
44
Write-Host -f Red "Run .\install.ps1 first!"
55
exit 1
66
}

‎supporting/validator/validator.csproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="packages\Microsoft.Net.Compilers.2.10.0\build\Microsoft.Net.Compilers.props" Condition="Exists('packages\Microsoft.Net.Compilers.2.10.0\build\Microsoft.Net.Compilers.props')" />
3+
<Import Project="packages\Microsoft.Net.Compilers.Toolset.4.0.1\build\Microsoft.Net.Compilers.Toolset.props" Condition="Exists('packages\Microsoft.Net.Compilers.Toolset.4.0.1\build\Microsoft.Net.Compilers.Toolset.props')" />
44
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
55
<PropertyGroup>
66
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -14,12 +14,12 @@
1414
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
1515
</PropertyGroup>
1616
<ItemGroup>
17-
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed">
18-
<HintPath>packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
17+
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed">
18+
<HintPath>packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
1919
<Private>True</Private>
2020
</Reference>
2121
<Reference Include="Newtonsoft.Json.Schema, Version=3.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed">
22-
<HintPath>packages\Newtonsoft.Json.Schema.3.0.10\lib\net45\Newtonsoft.Json.Schema.dll</HintPath>
22+
<HintPath>packages\Newtonsoft.Json.Schema.3.0.14\lib\net45\Newtonsoft.Json.Schema.dll</HintPath>
2323
<Private>True</Private>
2424
</Reference>
2525
<Reference Include="System" />
@@ -43,6 +43,6 @@
4343
<PropertyGroup>
4444
<ErrorText>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}.</ErrorText>
4545
</PropertyGroup>
46-
<Error Condition="!Exists('packages\Microsoft.Net.Compilers.2.10.0\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Net.Compilers.2.10.0\build\Microsoft.Net.Compilers.props'))" />
46+
<Error Condition="!Exists('packages\Microsoft.Net.Compilers.Toolset.4.0.1\build\Microsoft.Net.Compilers.Toolset.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Net.Compilers.Toolset.4.0.1\build\Microsoft.Net.Compilers.Toolset.props'))" />
4747
</Target>
4848
</Project>

0 commit comments

Comments
 (0)