Skip to content

Commit 08989c8

Browse files
authored
Fixed S360 alert: Newtonsoft.Json upgrade (#363)
* Bump Newtonsoft.Json to 13.0.1 * Fixed tests on the path's format * Fixed warnings in tests * Bumped version * Bumped to latest stable version
1 parent 5c8d1fc commit 08989c8

18 files changed

+39
-34
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog
22

3+
## 0.11.0 2025-08-11
4+
5+
- upgraded Newtonsoft.Json from 9.0.1 to 13.0.1
6+
37
## 0.10.14 2025-06-19
48

59
- escaped the input string when construct the autorest command

openapi-diff/src/core/OpenApiDiff.Core/OpenApiDiff.Core.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</ItemGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
20+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
2121
<PackageReference Include="System.Net.Http" Version="4.3.4" />
2222
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0" />
2323
<PackageReference Include="YamlDotNet.Signed" Version="5.0.0" />

openapi-diff/src/core/OpenApiDiff/OpenApiDiff.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
</PropertyGroup>
2020

2121
<ItemGroup>
22-
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
22+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
2323
</ItemGroup>
2424
<ItemGroup>
2525
<ProjectReference Include="$(SolutionDir)src/modeler/AutoRest.Swagger/AutoRest.Swagger.csproj" />

openapi-diff/src/modeler/AutoRest.Swagger.Tests/SwaggerModelerCompareTests.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ public void AddedPaths()
309309
var raw = JToken.Parse(output);
310310
Assert.Equal(JTokenType.Object, raw.Type);
311311
Assert.Equal("new/added_path.json:38:15", raw["new"]["location"].Value<string>());
312-
Assert.Equal("paths./api/Operations.post", raw["new"]["path"].Value<string>());
312+
Assert.Equal("paths['/api/Operations'].post", raw["new"]["path"].Value<string>());
313313
Assert.Null(raw["old"]["location"]);
314314
}
315315

@@ -368,7 +368,7 @@ public void AddedReadOnlyRequiredProperty()
368368
ComparisonMessage[] messages = CompareSwagger("added_readonly_required_property.json").ToArray();
369369
List<ComparisonMessage> addedReqPropMessages = messages.Where(
370370
m => m.Severity == Category.Error && m.Id == ComparisonMessages.AddedRequiredProperty.Id).ToList();
371-
Assert.Equal(0, addedReqPropMessages.Count);
371+
Assert.Empty(addedReqPropMessages);
372372
}
373373

374374
/// <summary>
@@ -842,21 +842,21 @@ public void GlobalResponseTypeConstraintsChanged()
842842
public void RemovedPropertyTest()
843843
{
844844
var messages = CompareSwagger("removed_property.json").ToArray();
845-
Assert.True(messages.Where(m => m.Id == ComparisonMessages.RemovedProperty.Id).Any());
845+
Assert.NotEmpty(messages.Where(m => m.Id == ComparisonMessages.RemovedProperty.Id));
846846
}
847847

848848
[Fact]
849849
public void FormatChanged()
850850
{
851851
var messages = CompareSwagger("format_check_01.json").ToArray();
852-
Assert.True(messages.Where(m => m.Id == ComparisonMessages.TypeFormatChanged.Id).Any());
852+
Assert.NotEmpty(messages.Where(m => m.Id == ComparisonMessages.TypeFormatChanged.Id));
853853
}
854854

855855
[Fact]
856856
public void FormatRemoved()
857857
{
858858
var messages = CompareSwagger("format_check_02.json").ToArray();
859-
Assert.True(messages.Where(m => m.Id == ComparisonMessages.TypeFormatChanged.Id).Any());
859+
Assert.NotEmpty(messages.Where(m => m.Id == ComparisonMessages.TypeFormatChanged.Id));
860860
}
861861

862862
[Fact]
@@ -952,7 +952,7 @@ public void DidNotChangeGlobalParameterOrder()
952952
// of Implicit and Client doesn't matter.
953953
//
954954
// Reference: https://github.com/Azure/autorest/blob/main/docs/extensions/readme.md#x-ms-parameter-location
955-
Assert.Equal(0, messages.Where(m => m.Id == ComparisonMessages.ChangedParameterOrder.Id).Count());
955+
Assert.Empty(messages.Where(m => m.Id == ComparisonMessages.ChangedParameterOrder.Id));
956956
}
957957

958958
[Fact]
@@ -1047,11 +1047,11 @@ public void ParameterRemoved()
10471047

10481048
foreach (var reqParamName in reqParamNames)
10491049
{
1050-
Assert.True(reqParamMessageStrings.Any(str => str.Contains(reqParamName)));
1050+
Assert.Contains(reqParamMessageStrings, str => str.Contains(reqParamName));
10511051
}
10521052
foreach (var optParamName in optParamNames)
10531053
{
1054-
Assert.True(optParamMessageStrings.Any(str => str.Contains(optParamName)));
1054+
Assert.Contains(optParamMessageStrings, str => str.Contains(optParamName));
10551055
}
10561056
}
10571057
}

openapi-diff/src/modeler/AutoRest.Swagger/AutoRest.Swagger.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
<LangVersion>7.3</LangVersion>
1111
</PropertyGroup>
1212
<ItemGroup>
13-
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
13+
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
14+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
1415
</ItemGroup>
1516
<ItemGroup>
1617
<ProjectReference Include="..\..\core\OpenApiDiff.Core\OpenApiDiff.Core.csproj" />

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@azure/oad",
3-
"version": "0.10.14",
3+
"version": "0.11.0",
44
"author": {
55
"name": "Microsoft Corporation",
66
"email": "azsdkteam@microsoft.com",

src/test/additionalPropertiesIsBooleanTest.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ test("Additional Properties is boolean", async () => {
3838
mode: "Addition",
3939
new: {
4040
location: ``,
41-
path: "paths./api/Operations.get.parameters",
41+
path: "paths['/api/Operations'].get.parameters",
4242
ref: ``
4343
},
4444
old: {},

src/test/commonParametersTest.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ test("common-parameters", async () => {
3939
new: {},
4040
old: {
4141
location: "",
42-
path: "paths./api/Operations.get.parameters",
42+
path: "paths['/api/Operations'].get.parameters",
4343
ref: ""
4444
},
4545
type: "Error"
@@ -52,7 +52,7 @@ test("common-parameters", async () => {
5252
mode: "Addition",
5353
new: {
5454
location: "",
55-
path: "paths./api/Operations.get.parameters",
55+
path: "paths['/api/Operations'].get.parameters",
5656
ref: ""
5757
},
5858
old: {},

src/test/expandsAllOfFullCoversTest.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ test("expands allOf full covers", async () => {
3636
message: "The new version has a different 'allOf' property than the previous one.",
3737
old: {
3838
ref: `${oldFilePath}#/paths/~1api~1Parameters/put/parameters/0/schema`,
39-
path: "paths./api/Parameters.put.parameters[0].schema",
39+
path: "paths['/api/Parameters'].put.parameters[0].schema",
4040
location: `${oldFilePath}:22:13`
4141
},
4242
new: {
4343
ref: `${newFilePath}#/paths/~1api~1Parameters/put/parameters/0/schema`,
44-
path: "paths./api/Parameters.put.parameters[0].schema",
44+
path: "paths['/api/Parameters'].put.parameters[0].schema",
4545
location: `${newFilePath}:22:13`
4646
},
4747
type: "Error",
@@ -109,12 +109,12 @@ test("expands allOf full covers", async () => {
109109
"The new version lists new non-read-only properties as required: 'a'. These properties were not listed as required in the old version.",
110110
old: {
111111
ref: `${oldFilePath}#/paths/~1api~1Parameters/put/parameters/0/schema`,
112-
path: "paths./api/Parameters.put.parameters[0].schema",
112+
path: "paths['/api/Parameters'].put.parameters[0].schema",
113113
location: `${oldFilePath}:22:13`
114114
},
115115
new: {
116116
ref: `${newFilePath}#/paths/~1api~1Parameters/put/parameters/0/schema`,
117-
path: "paths./api/Parameters.put.parameters[0].schema",
117+
path: "paths['/api/Parameters'].put.parameters[0].schema",
118118
location: `${newFilePath}:22:13`
119119
},
120120
type: "Error",

0 commit comments

Comments
 (0)