Skip to content

Consolidate Newtonsoft versions #71402

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 4 commits into from
Jul 11, 2022
Merged

Consolidate Newtonsoft versions #71402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9a85b3b
Consolidate Newtonsoft versions
am11 Jun 28, 2022
21005c8
Set JsonTextReader's MaxDepth to null
am11 Jun 28, 2022
3a1fd4d
Revert NetCoreServer used by xharness
am11 Jun 29, 2022
c8e58b7
Merge dotnet/main into feature/external/newtonsoft-versions
am11 Jul 11, 2022
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
3 changes: 2 additions & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,8 @@
<XUnitAnalyzersVersion>0.12.0-pre.20</XUnitAnalyzersVersion>
<XUnitRunnerVisualStudioVersion>2.4.5</XUnitRunnerVisualStudioVersion>
<CoverletCollectorVersion>3.1.2</CoverletCollectorVersion>
<NewtonsoftJsonVersion>12.0.3</NewtonsoftJsonVersion>
<NewtonsoftJsonVersion>13.0.1</NewtonsoftJsonVersion>
<NewtonsoftJsonBsonVersion>1.0.2</NewtonsoftJsonBsonVersion>
<SQLitePCLRawbundle_greenVersion>2.0.4</SQLitePCLRawbundle_greenVersion>
<MoqVersion>4.12.0</MoqVersion>
<FsCheckVersion>2.14.3</FsCheckVersion>
Expand Down
2 changes: 1 addition & 1 deletion src/installer/tests/Assets/TestProjects/HostApiInvokerApp/HostApiInvokerApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/installer/tests/Assets/TestProjects/LightupLib/LightupLib.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/installer/tests/Assets/TestProjects/PortableApp/PortableApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
</ItemGroup>

<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
Expand Down
2 changes: 1 addition & 1 deletion src/installer/tests/Assets/TestProjects/PortableTestApp/PortableTestApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
<PackageReference Include="xunit.netcore.extensions" Version="1.0.0-prerelease-00206" />
<PackageReference Include="dotnet-test-xunit" Version="1.0.0-rc2-192208-24" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...ller/tests/Assets/TestProjects/SharedFxLookupPortableApp/SharedFxLookupPortableApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/installer/tests/Assets/TestProjects/StandaloneApp/StandaloneApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/installer/tests/Assets/TestProjects/StandaloneApp20/StandaloneApp20.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/installer/tests/Assets/TestProjects/StandaloneApp21/StandaloneApp21.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/installer/tests/Assets/TestProjects/StandaloneTestApp/StandaloneTestApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20170106-08" />
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
<PackageReference Include="xunit.netcore.extensions" Version="1.0.0-prerelease-00206" />
<PackageReference Include="dotnet-test-xunit" Version="1.0.0-rc2-192208-24" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...ller/tests/Assets/TestProjects/StartupHookWithDependency/StartupHookWithDependency.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
</ItemGroup>

</Project>
4 changes: 3 additions & 1 deletion src/installer/tests/Assets/TestUtils/TestProjects.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,7 @@
win-x86 tests that assumed a win-x64 app host RID based on the runner SDK.
-->
<AppHostRuntimeIdentifier>$(TestTargetRid)</AppHostRuntimeIdentifier>

<NewtonsoftJsonVersion>13.0.1</NewtonsoftJsonVersion>
</PropertyGroup>
</Project>
</Project>
4 changes: 2 additions & 2 deletions ...installer/tests/HostActivation.Tests/DependencyResolution/ResolveComponentDependencies.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,9 +449,9 @@ public TestApp CreateComponentWithDependencies(Action<NetCoreAppBuilder> customi
NetCoreAppBuilder builder = NetCoreAppBuilder.PortableForNETCoreApp(componentWithDependencies)
.WithProject(p => p.WithAssemblyGroup(null, g => g.WithMainAssembly()))
.WithProject("ComponentDependency", "1.0.0", p => p.WithAssemblyGroup(null, g => g.WithAsset("ComponentDependency.dll")))
.WithPackage("Newtonsoft.Json", "9.0.1", p => p.WithAssemblyGroup(null, g => g
.WithPackage("Newtonsoft.Json", "13.0.1", p => p.WithAssemblyGroup(null, g => g
.WithAsset("lib/netstandard1.0/Newtonsoft.Json.dll", f => f
.WithVersion("9.0.0.0", "9.0.1.19813")
.WithVersion("13.0.0.0", "13.0.1.25517")
.WithFileOnDiskPath("Newtonsoft.Json.dll"))))
.WithPackage("Libuv", "1.9.1", p => p
.WithNativeLibraryGroup("debian-x64", g => g.WithAsset("runtimes/debian-x64/native/libuv.so"))
Expand Down
4 changes: 2 additions & 2 deletions ...ests/Microsoft.NET.HostModel.Tests/Microsoft.NET.HostModel.ComHost.Tests/ClsidMapTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public class ClsidMapTests : IClassFixture<ClsidMapTests.SharedTestState>

public ClsidMapTests(SharedTestState fixture)
{
sharedTestState = fixture;
sharedTestState = fixture;
}

[Fact]
Expand Down Expand Up @@ -122,7 +122,7 @@ private JObject CreateClsidMap(TestProjectFixture project)
}

using (var clsidMapFile = File.OpenText(clsidMapPath))
using (var clsidMapReader = new JsonTextReader(clsidMapFile))
using (var clsidMapReader = new JsonTextReader(clsidMapFile) { MaxDepth = null })
{
return JObject.Load(clsidMapReader);
}
Expand Down
2 changes: 1 addition & 1 deletion src/installer/tests/TestUtils/RuntimeConfig.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ public static RuntimeConfig FromFile(string path)
if (File.Exists(path))
{
using (TextReader textReader = File.OpenText(path))
using (JsonTextReader reader = new JsonTextReader(textReader))
using (var reader = new JsonTextReader(textReader) { MaxDepth = null })
{
JObject root = (JObject)JToken.ReadFrom(reader);
JObject runtimeOptions = (JObject)root["runtimeOptions"];
Expand Down
2 changes: 1 addition & 1 deletion src/installer/tests/TestUtils/TestUtils.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<PackageReference Include="FluentAssertions" Version="4.19.4" />
<PackageReference Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsVersion)" />
<PackageReference Include="xunit.core" Version="$(XUnitVersion)" ExcludeAssets="build" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelVersion)" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/libraries/Microsoft.Extensions.DependencyModel/tests/DependencyContextJsonWriterTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public JObject Save(DependencyContext dependencyContext)
{
using (var textReader = new StreamReader(readStream))
{
using (var reader = new JsonTextReader(textReader))
using (var reader = new JsonTextReader(textReader) { MaxDepth = null })
{
return JObject.Load(reader);
}
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/Microsoft.NETCore.Platforms/src/GenerateRuntimeGraph.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ private static IDictionary<string, IEnumerable<string>> ReadCompatibilityMap(str
{
var serializer = new JsonSerializer();
using (var file = File.OpenText(mapFile))
using (var jsonTextReader = new JsonTextReader(file))
using (var jsonTextReader = new JsonTextReader(file) { MaxDepth = null })
{
return serializer.Deserialize<IDictionary<string, IEnumerable<string>>>(jsonTextReader);
}
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/System.Text.Json/tests/System.Text.Json.Tests/JsonDocumentTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,7 @@ private static async Task ParseJsonAsync(

using (var stream = new MemoryStream(dataUtf8))
using (var streamReader = new StreamReader(stream, Encoding.UTF8, false, 1024, true))
using (JsonTextReader jsonReader = new JsonTextReader(streamReader))
using (var jsonReader = new JsonTextReader(streamReader) { MaxDepth = null })
{
JToken jToken = JToken.ReadFrom(jsonReader);

Expand Down Expand Up @@ -3656,7 +3656,7 @@ private static string GetCompactJson(TestCaseType testCaseType, string jsonStrin
return existing;
}

using (JsonTextReader jsonReader = new JsonTextReader(new StringReader(jsonString)))
using (var jsonReader = new JsonTextReader(new StringReader(jsonString)) { MaxDepth = null })
{
jsonReader.FloatParseHandling = FloatParseHandling.Decimal;
JToken jtoken = JToken.ReadFrom(jsonReader);
Expand Down
10 changes: 5 additions & 5 deletions src/libraries/System.Text.Json/tests/System.Text.Json.Tests/JsonTestHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ internal static partial class JsonTestHelper
public static string NewtonsoftReturnStringHelper(TextReader reader)
{
var sb = new StringBuilder();
var json = new JsonTextReader(reader);
var json = new JsonTextReader(reader) { MaxDepth = null };
while (json.Read())
{
if (json.Value != null)
Expand Down Expand Up @@ -358,7 +358,7 @@ public static string InsertCommentsEverywhere(string jsonString)
{
writer.Formatting = Formatting.Indented;

var newtonsoft = new JsonTextReader(new StringReader(jsonString));
var newtonsoft = new JsonTextReader(new StringReader(jsonString)) { MaxDepth = null };
writer.WriteComment("comment");
while (newtonsoft.Read())
{
Expand All @@ -372,7 +372,7 @@ public static string InsertCommentsEverywhere(string jsonString)

public static List<JsonTokenType> GetTokenTypes(string jsonString)
{
var newtonsoft = new JsonTextReader(new StringReader(jsonString));
var newtonsoft = new JsonTextReader(new StringReader(jsonString)) { MaxDepth = null };
int totalReads = 0;
while (newtonsoft.Read())
{
Expand All @@ -383,7 +383,7 @@ public static List<JsonTokenType> GetTokenTypes(string jsonString)

for (int i = 0; i < totalReads; i++)
{
newtonsoft = new JsonTextReader(new StringReader(jsonString));
newtonsoft = new JsonTextReader(new StringReader(jsonString)) { MaxDepth = null };
for (int j = 0; j < i; j++)
{
Assert.True(newtonsoft.Read());
Expand Down Expand Up @@ -703,7 +703,7 @@ public static decimal NextDecimal(Random random, double minValue, double maxValu

public static string GetCompactString(string jsonString)
{
using (JsonTextReader jsonReader = new JsonTextReader(new StringReader(jsonString)))
using (var jsonReader = new JsonTextReader(new StringReader(jsonString)) { MaxDepth = null })
{
jsonReader.FloatParseHandling = FloatParseHandling.Decimal;
JToken jtoken = JToken.ReadFrom(jsonReader);
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.Text.Json/tests/System.Text.Json.Tests/Utf8JsonReaderTests.TryGet.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1026,7 +1026,7 @@ public static void TestingGetString(string jsonString)
var expectedPropertyNames = new List<string>();
var expectedValues = new List<string>();

var jsonNewtonsoft = new JsonTextReader(new StringReader(jsonString));
var jsonNewtonsoft = new JsonTextReader(new StringReader(jsonString)) { MaxDepth = null };
while (jsonNewtonsoft.Read())
{
if (jsonNewtonsoft.TokenType == JsonToken.String)
Expand Down
2 changes: 1 addition & 1 deletion src/mono/wasm/debugger/BrowserDebugProxy/BrowserDebugProxy.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="3.7.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.7" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.7.0" />
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions src/tests/Common/external/external.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@
<PackageReference Include="Microsoft.CodeAnalysis.Compilers" Version="1.1.1" />
<PackageReference Include="CommandLineParser" Version="2.1.1-beta" />
<PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="$(TraceEventVersion)" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
<PackageReference Include="Newtonsoft.Json.Bson" Version="1.0.2" />
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
<PackageReference Include="Newtonsoft.Json.Bson" Version="$(NewtonsoftJsonBsonVersion)" />
<PackageReference Include="xunit" Version="$(XUnitVersion)" />
<PackageReference Include="Microsoft.DotNet.XUnitConsoleRunner" Version="$(MicrosoftDotNetXUnitConsoleRunnerVersion)" GeneratePathProperty="True" />
<PackageReference Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsVersion)" />
Expand Down
2 changes: 1 addition & 1 deletion src/tests/ilverify/ILVerificationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<Import Project="..\..\coreclr\tools\ILVerification\ILVerification.projitems" />

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
</ItemGroup>

<ItemGroup>
Expand Down