Skip to content

Update Newtonsoft 13.0.1 referenced to 13.0.3 #805

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Nov 6, 2023
Merged

Update Newtonsoft 13.0.1 referenced to 13.0.3 #805

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
50640bd
Update Newtonsoft 13.0.1 referenced to 13.0.3
MichaelSimons Oct 20, 2023
8b3f951
Update SBE reference to latest
MichaelSimons Oct 20, 2023
36a5f5d
Update nuspecs
MichaelSimons Oct 20, 2023
c53e691
Undo test change
MichaelSimons Oct 20, 2023
d684bcd
Add known exclusion
MichaelSimons Nov 3, 2023
55a4642
Update eng/SourceBuildPrebuiltBaseline.xml
MichaelSimons Nov 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions eng/Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,25 @@
Format:
<DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\Microsoft.Extensions.Options.5.0.0.csproj" />
-->
<DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\NuGet.Frameworks.6.2.4.csproj" />
<DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\NuGet.Common.6.2.4.csproj" />
<DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\NuGet.Versioning.6.2.4.csproj" />
<DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\NuGet.Configuration.6.2.4.csproj" />
<DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\NuGet.Packaging.6.2.4.csproj" />
<DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\NuGet.Protocol.6.2.4.csproj" />
<DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\NuGet.Credentials.6.2.4.csproj" />
<DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\NuGet.DependencyResolver.Core.6.2.4.csproj" />
<DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\NuGet.ProjectModel.6.2.4.csproj" />
<DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\NuGet.Commands.6.2.4.csproj" />

<DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\NuGet.Frameworks.6.6.1.csproj" />
<DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\NuGet.Common.6.6.1.csproj" />
<DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\NuGet.Versioning.6.6.1.csproj" />
<DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\NuGet.Configuration.6.6.1.csproj" />
<DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\NuGet.Packaging.6.6.1.csproj" />
<DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\NuGet.Protocol.6.6.1.csproj" />
<DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\NuGet.Credentials.6.6.1.csproj" />

<DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\NuGet.Frameworks.6.7.0.csproj" />
<DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\NuGet.Common.6.7.0.csproj" />
<DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\NuGet.Versioning.6.7.0.csproj" />
Expand Down
4 changes: 4 additions & 0 deletions eng/SourceBuildPrebuiltBaseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
<UsagePattern IdentityGlob="runtime.linux-x64.Microsoft.NETCore.ILAsm/*" />
<UsagePattern IdentityGlob="runtime.linux-x64.Microsoft.NETCore.ILDAsm/*" />

<!-- Necessary to work around NuGet non-determinism with online builds/feeds. Can be removed once
dependencies on it are removed from the previous-source-built packages. -->
<UsagePattern IdentityGlob="newtonsoft.json/13.0.1" />

<UsagePattern IdentityGlob="Microsoft.SourceBuild.Intermediate.*/*" />

</IgnorePatterns>
Expand Down
4 changes: 2 additions & 2 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.23203.1">
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.23518.1">
<Uri>https://github.com/dotnet/source-build-externals</Uri>
<Sha>33edde07d61cf7606d76ada765335fb81f1cbb71</Sha>
<Sha>3dc05150cf234f76f6936dcb2853d31a0da1f60e</Sha>
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23463.1">
Expand Down
4 changes: 2 additions & 2 deletions ...rosoft.extensions.dependencymodel/3.0.0/Microsoft.Extensions.DependencyModel.3.0.0.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

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

<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.6'">
<!-- Manually updated version from 9.0.1 to address https://github.com/advisories/GHSA-5crp-9r3c-p9vr -->
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="System.AppContext" Version="4.1.0" />
<PackageReference Include="System.Diagnostics.Debug" Version="4.0.11" />
<PackageReference Include="System.Dynamic.Runtime" Version="4.0.11" />
Expand Down
4 changes: 2 additions & 2 deletions ...rc/microsoft.extensions.dependencymodel/3.0.0/microsoft.extensions.dependencymodel.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<dependencies>
<group targetFramework=".NETStandard1.3">
<!-- Manually updated version from 9.0.1 to address https://github.com/advisories/GHSA-5crp-9r3c-p9vr -->
<dependency id="Newtonsoft.Json" version="13.0.1" exclude="Build,Analyzers" />
<dependency id="Newtonsoft.Json" version="13.0.3" exclude="Build,Analyzers" />
<dependency id="System.AppContext" version="4.1.0" exclude="Build,Analyzers" />
<dependency id="System.Diagnostics.Debug" version="4.0.11" exclude="Build,Analyzers" />
<dependency id="System.Dynamic.Runtime" version="4.0.11" exclude="Build,Analyzers" />
Expand All @@ -25,7 +25,7 @@
</group>
<group targetFramework=".NETStandard1.6">
<!-- Manually updated version from 9.0.1 to address https://github.com/advisories/GHSA-5crp-9r3c-p9vr -->
<dependency id="Newtonsoft.Json" version="13.0.1" exclude="Build,Analyzers" />
<dependency id="Newtonsoft.Json" version="13.0.3" exclude="Build,Analyzers" />
<dependency id="System.AppContext" version="4.1.0" exclude="Build,Analyzers" />
<dependency id="System.Diagnostics.Debug" version="4.0.11" exclude="Build,Analyzers" />
<dependency id="System.Dynamic.Runtime" version="4.0.11" exclude="Build,Analyzers" />
Expand Down
6 changes: 4 additions & 2 deletions src/referencePackages/src/nuget.packaging/6.2.4/NuGet.Packaging.6.2.4.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,17 @@
<ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
<PackageReference Include="NuGet.Configuration" Version="6.2.4" />
<PackageReference Include="NuGet.Versioning" Version="6.2.4" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<!-- Manual updated version from 13.0.1 to the version included in source-build -->
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="System.Security.Cryptography.Cng" Version="5.0.0" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="5.0.0" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="NuGet.Configuration" Version="6.2.4" />
<PackageReference Include="NuGet.Versioning" Version="6.2.4" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<!-- Manual updated version from 13.0.1 to the version included in source-build -->
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="System.Security.Cryptography.Cng" Version="5.0.0" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="5.0.0" />
</ItemGroup>
Expand Down
6 changes: 4 additions & 2 deletions src/referencePackages/src/nuget.packaging/6.2.4/nuget.packaging.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,16 @@
<group targetFramework="net5.0">
<dependency id="NuGet.Configuration" version="6.2.4" exclude="Build,Analyzers" />
<dependency id="NuGet.Versioning" version="6.2.4" exclude="Build,Analyzers" />
<dependency id="Newtonsoft.Json" version="13.0.1" exclude="Build,Analyzers" />
<!-- Manual updated version from 13.0.1 to the version included in source-build -->
<dependency id="Newtonsoft.Json" version="13.0.3" exclude="Build,Analyzers" />
<dependency id="System.Security.Cryptography.Cng" version="5.0.0" exclude="Build,Analyzers" />
<dependency id="System.Security.Cryptography.Pkcs" version="5.0.0" exclude="Build,Analyzers" />
</group>
<group targetFramework=".NETStandard2.0">
<dependency id="NuGet.Configuration" version="6.2.4" exclude="Build,Analyzers" />
<dependency id="NuGet.Versioning" version="6.2.4" exclude="Build,Analyzers" />
<dependency id="Newtonsoft.Json" version="13.0.1" exclude="Build,Analyzers" />
<!-- Manual updated version from 13.0.1 to the version included in source-build -->
<dependency id="Newtonsoft.Json" version="13.0.3" exclude="Build,Analyzers" />
<dependency id="System.Security.Cryptography.Cng" version="5.0.0" exclude="Build,Analyzers" />
<dependency id="System.Security.Cryptography.Pkcs" version="5.0.0" exclude="Build,Analyzers" />
</group>
Expand Down
6 changes: 4 additions & 2 deletions src/referencePackages/src/nuget.packaging/6.6.1/NuGet.Packaging.6.6.1.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,17 @@
<ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
<PackageReference Include="NuGet.Configuration" Version="6.6.1" />
<PackageReference Include="NuGet.Versioning" Version="6.6.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<!-- Manual updated version from 13.0.1 to the version included in source-build -->
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="System.Security.Cryptography.Cng" Version="5.0.0" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="5.0.0" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="NuGet.Configuration" Version="6.6.1" />
<PackageReference Include="NuGet.Versioning" Version="6.6.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<!-- Manual updated version from 13.0.1 to the version included in source-build -->
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="System.Security.Cryptography.Cng" Version="5.0.0" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="5.0.0" />
</ItemGroup>
Expand Down
6 changes: 4 additions & 2 deletions src/referencePackages/src/nuget.packaging/6.6.1/nuget.packaging.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,16 @@
<group targetFramework="net5.0">
<dependency id="NuGet.Configuration" version="6.6.1" exclude="Build,Analyzers" />
<dependency id="NuGet.Versioning" version="6.6.1" exclude="Build,Analyzers" />
<dependency id="Newtonsoft.Json" version="13.0.1" exclude="Build,Analyzers" />
<!-- Manual updated version from 13.0.1 to the version included in source-build -->
<dependency id="Newtonsoft.Json" version="13.0.3" exclude="Build,Analyzers" />
<dependency id="System.Security.Cryptography.Cng" version="5.0.0" exclude="Build,Analyzers" />
<dependency id="System.Security.Cryptography.Pkcs" version="5.0.0" exclude="Build,Analyzers" />
</group>
<group targetFramework=".NETStandard2.0">
<dependency id="NuGet.Configuration" version="6.6.1" exclude="Build,Analyzers" />
<dependency id="NuGet.Versioning" version="6.6.1" exclude="Build,Analyzers" />
<dependency id="Newtonsoft.Json" version="13.0.1" exclude="Build,Analyzers" />
<!-- Manual updated version from 13.0.1 to the version included in source-build -->
<dependency id="Newtonsoft.Json" version="13.0.3" exclude="Build,Analyzers" />
<dependency id="System.Security.Cryptography.Cng" version="5.0.0" exclude="Build,Analyzers" />
<dependency id="System.Security.Cryptography.Pkcs" version="5.0.0" exclude="Build,Analyzers" />
</group>
Expand Down
6 changes: 4 additions & 2 deletions src/referencePackages/src/nuget.packaging/6.7.0/NuGet.Packaging.6.7.0.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,16 @@
<ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
<PackageReference Include="NuGet.Configuration" Version="6.7.0" />
<PackageReference Include="NuGet.Versioning" Version="6.7.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<!-- Manual updated version from 13.0.1 to the version included in source-build -->
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="6.0.4" />
</ItemGroup>

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

Expand Down
6 changes: 4 additions & 2 deletions src/referencePackages/src/nuget.packaging/6.7.0/nuget.packaging.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,15 @@
<group targetFramework="net5.0">
<dependency id="NuGet.Configuration" version="6.7.0" exclude="Build,Analyzers" />
<dependency id="NuGet.Versioning" version="6.7.0" exclude="Build,Analyzers" />
<dependency id="Newtonsoft.Json" version="13.0.1" exclude="Build,Analyzers" />
<!-- Manual updated version from 13.0.1 to the version included in source-build -->
<dependency id="Newtonsoft.Json" version="13.0.3" exclude="Build,Analyzers" />
<dependency id="System.Security.Cryptography.Pkcs" version="6.0.4" exclude="Build,Analyzers" />
</group>
<group targetFramework=".NETStandard2.0">
<dependency id="NuGet.Configuration" version="6.7.0" exclude="Build,Analyzers" />
<dependency id="NuGet.Versioning" version="6.7.0" exclude="Build,Analyzers" />
<dependency id="Newtonsoft.Json" version="13.0.1" exclude="Build,Analyzers" />
<!-- Manual updated version from 13.0.1 to the version included in source-build -->
<dependency id="Newtonsoft.Json" version="13.0.3" exclude="Build,Analyzers" />
<dependency id="System.Security.Cryptography.Pkcs" version="6.0.4" exclude="Build,Analyzers" />
</group>
</dependencies>
Expand Down