Skip to content

Commit 76c3bcd

Browse files
niheavenniheaven
authored
builds(json): Update Newton.Json to 13.0.1 (#5026)
1 parent 794f8a5 commit 76c3bcd

9 files changed

Lines changed: 83 additions & 82 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
- **checkver,auto-pr:** Allow passing file path ([#5019](https://github.com/ScoopInstaller/Scoop/issues/5019))
2323
- **checkver:** Exit routine earlier if error ([#5025](https://github.com/ScoopInstaller/Scoop/issues/5025))
24+
- **json:** Update Newton.Json to 13.0.1 ([#5026](https://github.com/ScoopInstaller/Scoop/issues/5026))
2425

2526
### Tests
2627

‎supporting/shimexe/packages.config‎

Lines changed: 1 addition & 1 deletion
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.Toolset" version="4.0.1" targetFramework="net45" developmentDependency="true" />
3+
<package id="Microsoft.Net.Compilers.Toolset" version="4.2.0" targetFramework="net45" developmentDependency="true" />
44
</packages>

‎supporting/shimexe/shim.csproj‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
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.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')" />
4-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
5-
<PropertyGroup>
6-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
7-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
8-
<ProjectGuid>{381F9D2E-2355-4F84-9206-06BB9175F97B}</ProjectGuid>
9-
<OutputType>Exe</OutputType>
10-
<RootNamespace>Scoop.Shim</RootNamespace>
11-
<AssemblyName>Scoop.Shim</AssemblyName>
12-
<TargetFrameworkVersion>v4.5.0</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
15-
</PropertyGroup>
16-
<ItemGroup>
17-
<Reference Include="System" />
18-
<Reference Include="System.Core" />
19-
<Reference Include="System.Xml.Linq" />
20-
<Reference Include="System.Data.DataSetExtensions" />
21-
<Reference Include="Microsoft.CSharp" />
22-
<Reference Include="System.Data" />
23-
<Reference Include="System.Net.Http" />
24-
<Reference Include="System.Xml" />
25-
</ItemGroup>
26-
<ItemGroup>
27-
<Compile Include="shim.cs" />
28-
</ItemGroup>
29-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
30-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
3+
<Import Project="packages\Microsoft.Net.Compilers.Toolset.4.2.0\build\Microsoft.Net.Compilers.Toolset.props" Condition="Exists('packages\Microsoft.Net.Compilers.Toolset.4.2.0\build\Microsoft.Net.Compilers.Toolset.props')" />
4+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
315
<PropertyGroup>
32-
<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>
6+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
7+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
8+
<ProjectGuid>{381F9D2E-2355-4F84-9206-06BB9175F97B}</ProjectGuid>
9+
<OutputType>Exe</OutputType>
10+
<RootNamespace>Scoop.Shim</RootNamespace>
11+
<AssemblyName>Scoop.Shim</AssemblyName>
12+
<TargetFrameworkVersion>v4.5.0</TargetFrameworkVersion>
13+
<FileAlignment>512</FileAlignment>
14+
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
3315
</PropertyGroup>
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'))" />
35-
</Target>
16+
<ItemGroup>
17+
<Reference Include="System" />
18+
<Reference Include="System.Core" />
19+
<Reference Include="System.Xml.Linq" />
20+
<Reference Include="System.Data.DataSetExtensions" />
21+
<Reference Include="Microsoft.CSharp" />
22+
<Reference Include="System.Data" />
23+
<Reference Include="System.Net.Http" />
24+
<Reference Include="System.Xml" />
25+
</ItemGroup>
26+
<ItemGroup>
27+
<Compile Include="shim.cs" />
28+
</ItemGroup>
29+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
30+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
31+
<PropertyGroup>
32+
<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>
33+
</PropertyGroup>
34+
<Error Condition="!Exists('packages\Microsoft.Net.Compilers.Toolset.4.2.0\build\Microsoft.Net.Compilers.Toolset.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Net.Compilers.Toolset.4.2.0\build\Microsoft.Net.Compilers.Toolset.props'))" />
35+
</Target>
3636
</Project>

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

1.62 KB
Binary file not shown.

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

0 Bytes
Binary file not shown.

‎supporting/validator/bin/checksum.sha256‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
7f912b28a07c226e0be3acfb2f57f050538aba0100fa1f0bf2c39f1a1f1da814 *Newtonsoft.Json.dll
1+
b624949df8b0e3a6153fdfb730a7c6f4990b6592ee0d922e1788433d276610f3 *Newtonsoft.Json.dll
22
cff8fc4ce358d7daff84ab47129a776797a4ec819c1586a15bd5e63144f5b73f *Newtonsoft.Json.Schema.dll
3-
0d6b228378cbabff23a30456d22f1a31337c466f90cf8b7997cc48bd171155f3 *Scoop.Validator.dll
3+
0318c8221ce4d44806f8def619bcc02886be0902aab80080e6251c50c6ca53a9 *Scoop.Validator.dll
44
40a70bee96d108701f8f2e81392f9b79fd003f1cb4e1653ad2429753153fd7ee *validator.exe

‎supporting/validator/bin/checksum.sha512‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
3398094ce429ab5dcdecf2ad04803230669bb4accaef7083992e9b87afac55841ba8def2a5168358bd17e60799e55d076b0e5ca44c86b9e6c91150d3dc37c721 *Newtonsoft.Json.dll
1+
2fdf035661f349206f58ea1feed8805b7f9517a21f9c113e7301c69de160f184c774350a12a710046e3ff6baa37345d319b6f47fd24fbba4e042d54014bee511 *Newtonsoft.Json.dll
22
298d3d0b656acbb1fe5ed0c3abb49a640c47889184ab7bd4b594e51a7d7f829d5c8685edbd10a286fd56bfd8d601b9f187da463a5a9c8509365eddaea280642f *Newtonsoft.Json.Schema.dll
3-
afabe1df6ab837395a5da5ec8dd12bf3f36a8512b76e6f751c14045544246980e9d4061d437792836db792864b7db2761e84f1bf65bac688657a862b68fc7b45 *Scoop.Validator.dll
3+
338793e6127330c0b05728291fcf18441127ffb56e1bd5c0f0588cd7436605f4b852f4bb622f655896a7eb7b1262add142b200fd5f37391b47d1401becb6b81c *Scoop.Validator.dll
44
d497c27b48f44f4cff270d3c8801b0cecc74108f8786a4a7c40e57541308ae33a69f5456cfc43ae1ce4214038d20da9fbeac1bcf76cc58d972863b58dab18401 *validator.exe

‎supporting/validator/packages.config‎

Lines changed: 3 additions & 3 deletions
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="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" />
3+
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net45" />
4+
<package id="Newtonsoft.Json.Schema" version="3.0.14" targetFramework="net45" />
5+
<package id="Microsoft.Net.Compilers.Toolset" version="4.2.0" targetFramework="net45" developmentDependency="true" />
66
</packages>

‎supporting/validator/validator.csproj‎

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,48 @@
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.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')" />
4-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
5-
<PropertyGroup>
6-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
7-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
8-
<ProjectGuid>{8EB9B38A-1BAB-4D89-B4CB-ACE5E7C1073B}</ProjectGuid>
9-
<OutputType>Exe</OutputType>
10-
<RootNamespace>Scoop.Validator</RootNamespace>
11-
<AssemblyName>Scoop.Validator</AssemblyName>
12-
<TargetFrameworkVersion>v4.5.0</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
15-
</PropertyGroup>
16-
<ItemGroup>
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>
19-
<Private>True</Private>
20-
</Reference>
21-
<Reference Include="Newtonsoft.Json.Schema, Version=3.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed">
22-
<HintPath>packages\Newtonsoft.Json.Schema.3.0.14\lib\net45\Newtonsoft.Json.Schema.dll</HintPath>
23-
<Private>True</Private>
24-
</Reference>
25-
<Reference Include="System" />
26-
<Reference Include="System.Core" />
27-
<Reference Include="System.Xml.Linq" />
28-
<Reference Include="System.Data.DataSetExtensions" />
29-
<Reference Include="Microsoft.CSharp" />
30-
<Reference Include="System.Data" />
31-
<Reference Include="System.Net.Http" />
32-
<Reference Include="System.Xml" />
33-
</ItemGroup>
34-
<ItemGroup>
35-
<Compile Include="validator.cs" />
36-
<Compile Include="Scoop.Validator.cs" />
37-
</ItemGroup>
38-
<ItemGroup>
39-
<None Include="packages.config" />
40-
</ItemGroup>
41-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
42-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
3+
<Import Project="packages\Microsoft.Net.Compilers.Toolset.4.2.0\build\Microsoft.Net.Compilers.Toolset.props" Condition="Exists('packages\Microsoft.Net.Compilers.Toolset.4.2.0\build\Microsoft.Net.Compilers.Toolset.props')" />
4+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
435
<PropertyGroup>
44-
<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>
6+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
7+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
8+
<ProjectGuid>{8EB9B38A-1BAB-4D89-B4CB-ACE5E7C1073B}</ProjectGuid>
9+
<OutputType>Exe</OutputType>
10+
<RootNamespace>Scoop.Validator</RootNamespace>
11+
<AssemblyName>Scoop.Validator</AssemblyName>
12+
<TargetFrameworkVersion>v4.5.0</TargetFrameworkVersion>
13+
<FileAlignment>512</FileAlignment>
14+
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
4515
</PropertyGroup>
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'))" />
47-
</Target>
16+
<ItemGroup>
17+
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed">
18+
<HintPath>packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
19+
<Private>True</Private>
20+
</Reference>
21+
<Reference Include="Newtonsoft.Json.Schema, Version=3.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed">
22+
<HintPath>packages\Newtonsoft.Json.Schema.3.0.14\lib\net45\Newtonsoft.Json.Schema.dll</HintPath>
23+
<Private>True</Private>
24+
</Reference>
25+
<Reference Include="System" />
26+
<Reference Include="System.Core" />
27+
<Reference Include="System.Xml.Linq" />
28+
<Reference Include="System.Data.DataSetExtensions" />
29+
<Reference Include="Microsoft.CSharp" />
30+
<Reference Include="System.Data" />
31+
<Reference Include="System.Net.Http" />
32+
<Reference Include="System.Xml" />
33+
</ItemGroup>
34+
<ItemGroup>
35+
<Compile Include="validator.cs" />
36+
<Compile Include="Scoop.Validator.cs" />
37+
</ItemGroup>
38+
<ItemGroup>
39+
<None Include="packages.config" />
40+
</ItemGroup>
41+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
42+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
43+
<PropertyGroup>
44+
<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>
45+
</PropertyGroup>
46+
<Error Condition="!Exists('packages\Microsoft.Net.Compilers.Toolset.4.2.0\build\Microsoft.Net.Compilers.Toolset.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Net.Compilers.Toolset.4.2.0\build\Microsoft.Net.Compilers.Toolset.props'))" />
47+
</Target>
4848
</Project>

0 commit comments

Comments
 (0)
⚡