Skip to content

Fix newtonsoft.json loading #12982

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
VeryEarly merged 2 commits into from
Sep 17, 2020
Merged

Fix newtonsoft.json loading #12982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d976c6b
update newtonsoft.json
Sep 15, 2020
b9f2c10
add exceptions of shared assembly conflict
isra-fel Sep 16, 2020
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
2 changes: 2 additions & 0 deletions tools/StaticAnalysis/Exceptions/Az.DeviceProvisioningServices/SharedAssemblyConflict.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
"Target","AssemblyName","AssemblyVersion","Severity","ProblemId","Description","Remediation"
"File version 12.0 in D:\a\1\s\artifacts\Debug\Az.DeviceProvisioningServices\Newtonsoft.Json.dll, File version 10.0 in D:\a\1\s\artifacts\Debug\Az.Accounts\Newtonsoft.Json.dll","Newtonsoft.Json","12.0.0.0","0","7000","Shared assembly conflict, shared assemblies with the same assembly version have differing file versions","Update the assembly reference for Newtonsoft.Json in one of the referring assemblies"
2 changes: 2 additions & 0 deletions tools/StaticAnalysis/Exceptions/Az.IotHub/SharedAssemblyConflict.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
"Target","AssemblyName","AssemblyVersion","Severity","ProblemId","Description","Remediation"
"File version 12.0 in D:\a\1\s\artifacts\Debug\Az.IotHub\Newtonsoft.Json.dll, File version 10.0 in D:\a\1\s\artifacts\Debug\Az.Accounts\Newtonsoft.Json.dll","Newtonsoft.Json","12.0.0.0","0","7000","Shared assembly conflict, shared assemblies with the same assembly version have differing file versions","Update the assembly reference for Newtonsoft.Json in one of the referring assemblies"
1 change: 1 addition & 0 deletions tools/StaticAnalysis/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ public class Program

static IList<string> ExceptionFileNames = new List<string>()
{
"SharedAssemblyConflict.csv",
"AssemblyVersionConflict.csv",
"BreakingChangeIssues.csv",
"ExtraAssemblies.csv",
Expand Down
2 changes: 1 addition & 1 deletion tools/StaticAnalysis/StaticAnalysis.Netcore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="Microsoft.PowerShell.SDK" Version="6.1.0" />
</ItemGroup>

Expand Down