Skip to content

Commit fa4c0e8

Browse files
MichaelSimonsViktorHofer
MichaelSimons
and
ViktorHofer
authored
Update Newtonsoft 13.0.1 referenced to 13.0.3 (#805)
* Update Newtonsoft 13.0.1 referenced to 13.0.3 * Update SBE reference to latest * Update nuspecs * Undo test change * Add known exclusion * Update eng/SourceBuildPrebuiltBaseline.xml Co-authored-by: Viktor Hofer <[email protected]> --------- Co-authored-by: Viktor Hofer <[email protected]>
1 parent b4fa7f2 commit fa4c0e8

11 files changed

+53
-18
lines changed

‎eng/Build.props

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,25 @@
2424
Format:
2525
<DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\Microsoft.Extensions.Options.5.0.0.csproj" />
2626
-->
27+
<DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\NuGet.Frameworks.6.2.4.csproj" />
28+
<DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\NuGet.Common.6.2.4.csproj" />
29+
<DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\NuGet.Versioning.6.2.4.csproj" />
30+
<DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\NuGet.Configuration.6.2.4.csproj" />
31+
<DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\NuGet.Packaging.6.2.4.csproj" />
32+
<DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\NuGet.Protocol.6.2.4.csproj" />
33+
<DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\NuGet.Credentials.6.2.4.csproj" />
34+
<DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\NuGet.DependencyResolver.Core.6.2.4.csproj" />
35+
<DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\NuGet.ProjectModel.6.2.4.csproj" />
36+
<DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\NuGet.Commands.6.2.4.csproj" />
37+
38+
<DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\NuGet.Frameworks.6.6.1.csproj" />
39+
<DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\NuGet.Common.6.6.1.csproj" />
40+
<DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\NuGet.Versioning.6.6.1.csproj" />
41+
<DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\NuGet.Configuration.6.6.1.csproj" />
42+
<DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\NuGet.Packaging.6.6.1.csproj" />
43+
<DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\NuGet.Protocol.6.6.1.csproj" />
44+
<DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\NuGet.Credentials.6.6.1.csproj" />
45+
2746
<DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\NuGet.Frameworks.6.7.0.csproj" />
2847
<DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\NuGet.Common.6.7.0.csproj" />
2948
<DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\NuGet.Versioning.6.7.0.csproj" />

‎eng/SourceBuildPrebuiltBaseline.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77
<UsagePattern IdentityGlob="runtime.linux-x64.Microsoft.NETCore.ILAsm/*" />
88
<UsagePattern IdentityGlob="runtime.linux-x64.Microsoft.NETCore.ILDAsm/*" />
99

10+
<!-- Necessary to work around NuGet non-determinism with online builds/feeds. Can be removed once
11+
dependencies on it are removed from the previous-source-built packages. -->
12+
<UsagePattern IdentityGlob="Newtonsoft.Json/13.0.1" />
13+
1014
<UsagePattern IdentityGlob="Microsoft.SourceBuild.Intermediate.*/*" />
1115

1216
</IgnorePatterns>

‎eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ToolsetDependencies>
4-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.23203.1">
4+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.23518.1">
55
<Uri>https://github.com/dotnet/source-build-externals</Uri>
6-
<Sha>33edde07d61cf7606d76ada765335fb81f1cbb71</Sha>
6+
<Sha>3dc05150cf234f76f6936dcb2853d31a0da1f60e</Sha>
77
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
88
</Dependency>
99
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23463.1">

‎src/referencePackages/src/microsoft.extensions.dependencymodel/3.0.0/Microsoft.Extensions.DependencyModel.3.0.0.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.3'">
1111
<!-- Manually updated version from 9.0.1 to address https://github.com/advisories/GHSA-5crp-9r3c-p9vr -->
12-
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
12+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
1313
<PackageReference Include="System.AppContext" Version="4.1.0" />
1414
<PackageReference Include="System.Diagnostics.Debug" Version="4.0.11" />
1515
<PackageReference Include="System.Dynamic.Runtime" Version="4.0.11" />
@@ -20,7 +20,7 @@
2020

2121
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.6'">
2222
<!-- Manually updated version from 9.0.1 to address https://github.com/advisories/GHSA-5crp-9r3c-p9vr -->
23-
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
23+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
2424
<PackageReference Include="System.AppContext" Version="4.1.0" />
2525
<PackageReference Include="System.Diagnostics.Debug" Version="4.0.11" />
2626
<PackageReference Include="System.Dynamic.Runtime" Version="4.0.11" />

‎src/referencePackages/src/microsoft.extensions.dependencymodel/3.0.0/microsoft.extensions.dependencymodel.nuspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<dependencies>
1616
<group targetFramework=".NETStandard1.3">
1717
<!-- Manually updated version from 9.0.1 to address https://github.com/advisories/GHSA-5crp-9r3c-p9vr -->
18-
<dependency id="Newtonsoft.Json" version="13.0.1" exclude="Build,Analyzers" />
18+
<dependency id="Newtonsoft.Json" version="13.0.3" exclude="Build,Analyzers" />
1919
<dependency id="System.AppContext" version="4.1.0" exclude="Build,Analyzers" />
2020
<dependency id="System.Diagnostics.Debug" version="4.0.11" exclude="Build,Analyzers" />
2121
<dependency id="System.Dynamic.Runtime" version="4.0.11" exclude="Build,Analyzers" />
@@ -25,7 +25,7 @@
2525
</group>
2626
<group targetFramework=".NETStandard1.6">
2727
<!-- Manually updated version from 9.0.1 to address https://github.com/advisories/GHSA-5crp-9r3c-p9vr -->
28-
<dependency id="Newtonsoft.Json" version="13.0.1" exclude="Build,Analyzers" />
28+
<dependency id="Newtonsoft.Json" version="13.0.3" exclude="Build,Analyzers" />
2929
<dependency id="System.AppContext" version="4.1.0" exclude="Build,Analyzers" />
3030
<dependency id="System.Diagnostics.Debug" version="4.0.11" exclude="Build,Analyzers" />
3131
<dependency id="System.Dynamic.Runtime" version="4.0.11" exclude="Build,Analyzers" />

‎src/referencePackages/src/nuget.packaging/6.2.4/NuGet.Packaging.6.2.4.csproj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,17 @@
1010
<ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
1111
<PackageReference Include="NuGet.Configuration" Version="6.2.4" />
1212
<PackageReference Include="NuGet.Versioning" Version="6.2.4" />
13-
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
13+
<!-- Manual updated version from 13.0.1 to the version included in source-build -->
14+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
1415
<PackageReference Include="System.Security.Cryptography.Cng" Version="5.0.0" />
1516
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="5.0.0" />
1617
</ItemGroup>
1718

1819
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
1920
<PackageReference Include="NuGet.Configuration" Version="6.2.4" />
2021
<PackageReference Include="NuGet.Versioning" Version="6.2.4" />
21-
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
22+
<!-- Manual updated version from 13.0.1 to the version included in source-build -->
23+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
2224
<PackageReference Include="System.Security.Cryptography.Cng" Version="5.0.0" />
2325
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="5.0.0" />
2426
</ItemGroup>

‎src/referencePackages/src/nuget.packaging/6.2.4/nuget.packaging.nuspec

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,16 @@
1717
<group targetFramework="net5.0">
1818
<dependency id="NuGet.Configuration" version="6.2.4" exclude="Build,Analyzers" />
1919
<dependency id="NuGet.Versioning" version="6.2.4" exclude="Build,Analyzers" />
20-
<dependency id="Newtonsoft.Json" version="13.0.1" exclude="Build,Analyzers" />
20+
<!-- Manual updated version from 13.0.1 to the version included in source-build -->
21+
<dependency id="Newtonsoft.Json" version="13.0.3" exclude="Build,Analyzers" />
2122
<dependency id="System.Security.Cryptography.Cng" version="5.0.0" exclude="Build,Analyzers" />
2223
<dependency id="System.Security.Cryptography.Pkcs" version="5.0.0" exclude="Build,Analyzers" />
2324
</group>
2425
<group targetFramework=".NETStandard2.0">
2526
<dependency id="NuGet.Configuration" version="6.2.4" exclude="Build,Analyzers" />
2627
<dependency id="NuGet.Versioning" version="6.2.4" exclude="Build,Analyzers" />
27-
<dependency id="Newtonsoft.Json" version="13.0.1" exclude="Build,Analyzers" />
28+
<!-- Manual updated version from 13.0.1 to the version included in source-build -->
29+
<dependency id="Newtonsoft.Json" version="13.0.3" exclude="Build,Analyzers" />
2830
<dependency id="System.Security.Cryptography.Cng" version="5.0.0" exclude="Build,Analyzers" />
2931
<dependency id="System.Security.Cryptography.Pkcs" version="5.0.0" exclude="Build,Analyzers" />
3032
</group>

‎src/referencePackages/src/nuget.packaging/6.6.1/NuGet.Packaging.6.6.1.csproj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,17 @@
1010
<ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
1111
<PackageReference Include="NuGet.Configuration" Version="6.6.1" />
1212
<PackageReference Include="NuGet.Versioning" Version="6.6.1" />
13-
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
13+
<!-- Manual updated version from 13.0.1 to the version included in source-build -->
14+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
1415
<PackageReference Include="System.Security.Cryptography.Cng" Version="5.0.0" />
1516
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="5.0.0" />
1617
</ItemGroup>
1718

1819
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
1920
<PackageReference Include="NuGet.Configuration" Version="6.6.1" />
2021
<PackageReference Include="NuGet.Versioning" Version="6.6.1" />
21-
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
22+
<!-- Manual updated version from 13.0.1 to the version included in source-build -->
23+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
2224
<PackageReference Include="System.Security.Cryptography.Cng" Version="5.0.0" />
2325
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="5.0.0" />
2426
</ItemGroup>

‎src/referencePackages/src/nuget.packaging/6.6.1/nuget.packaging.nuspec

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,16 @@
1717
<group targetFramework="net5.0">
1818
<dependency id="NuGet.Configuration" version="6.6.1" exclude="Build,Analyzers" />
1919
<dependency id="NuGet.Versioning" version="6.6.1" exclude="Build,Analyzers" />
20-
<dependency id="Newtonsoft.Json" version="13.0.1" exclude="Build,Analyzers" />
20+
<!-- Manual updated version from 13.0.1 to the version included in source-build -->
21+
<dependency id="Newtonsoft.Json" version="13.0.3" exclude="Build,Analyzers" />
2122
<dependency id="System.Security.Cryptography.Cng" version="5.0.0" exclude="Build,Analyzers" />
2223
<dependency id="System.Security.Cryptography.Pkcs" version="5.0.0" exclude="Build,Analyzers" />
2324
</group>
2425
<group targetFramework=".NETStandard2.0">
2526
<dependency id="NuGet.Configuration" version="6.6.1" exclude="Build,Analyzers" />
2627
<dependency id="NuGet.Versioning" version="6.6.1" exclude="Build,Analyzers" />
27-
<dependency id="Newtonsoft.Json" version="13.0.1" exclude="Build,Analyzers" />
28+
<!-- Manual updated version from 13.0.1 to the version included in source-build -->
29+
<dependency id="Newtonsoft.Json" version="13.0.3" exclude="Build,Analyzers" />
2830
<dependency id="System.Security.Cryptography.Cng" version="5.0.0" exclude="Build,Analyzers" />
2931
<dependency id="System.Security.Cryptography.Pkcs" version="5.0.0" exclude="Build,Analyzers" />
3032
</group>

‎src/referencePackages/src/nuget.packaging/6.7.0/NuGet.Packaging.6.7.0.csproj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,16 @@
1010
<ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
1111
<PackageReference Include="NuGet.Configuration" Version="6.7.0" />
1212
<PackageReference Include="NuGet.Versioning" Version="6.7.0" />
13-
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
13+
<!-- Manual updated version from 13.0.1 to the version included in source-build -->
14+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
1415
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="6.0.4" />
1516
</ItemGroup>
1617

1718
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
1819
<PackageReference Include="NuGet.Configuration" Version="6.7.0" />
1920
<PackageReference Include="NuGet.Versioning" Version="6.7.0" />
20-
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
21+
<!-- Manual updated version from 13.0.1 to the version included in source-build -->
22+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
2123
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="6.0.4" />
2224
</ItemGroup>
2325

‎src/referencePackages/src/nuget.packaging/6.7.0/nuget.packaging.nuspec

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,15 @@
1717
<group targetFramework="net5.0">
1818
<dependency id="NuGet.Configuration" version="6.7.0" exclude="Build,Analyzers" />
1919
<dependency id="NuGet.Versioning" version="6.7.0" exclude="Build,Analyzers" />
20-
<dependency id="Newtonsoft.Json" version="13.0.1" exclude="Build,Analyzers" />
20+
<!-- Manual updated version from 13.0.1 to the version included in source-build -->
21+
<dependency id="Newtonsoft.Json" version="13.0.3" exclude="Build,Analyzers" />
2122
<dependency id="System.Security.Cryptography.Pkcs" version="6.0.4" exclude="Build,Analyzers" />
2223
</group>
2324
<group targetFramework=".NETStandard2.0">
2425
<dependency id="NuGet.Configuration" version="6.7.0" exclude="Build,Analyzers" />
2526
<dependency id="NuGet.Versioning" version="6.7.0" exclude="Build,Analyzers" />
26-
<dependency id="Newtonsoft.Json" version="13.0.1" exclude="Build,Analyzers" />
27+
<!-- Manual updated version from 13.0.1 to the version included in source-build -->
28+
<dependency id="Newtonsoft.Json" version="13.0.3" exclude="Build,Analyzers" />
2729
<dependency id="System.Security.Cryptography.Pkcs" version="6.0.4" exclude="Build,Analyzers" />
2830
</group>
2931
</dependencies>

0 commit comments

Comments
 (0)