Fix newtonsoft.json loading (Azure#12982)

* update newtonsoft.json * add exceptions of shared assembly conflict Co-authored-by: Yeming Liu <yeliu@microsoft.com>
abhi7860 · Sep 17, 2020 · 39ef51c · 39ef51c
1 parent bd7456b
commit 39ef51c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 1 deletion.
diff --git a/tools/StaticAnalysis/Exceptions/Az.DeviceProvisioningServices/SharedAssemblyConflict.csv b/tools/StaticAnalysis/Exceptions/Az.DeviceProvisioningServices/SharedAssemblyConflict.csv
@@ -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"
diff --git a/tools/StaticAnalysis/Exceptions/Az.IotHub/SharedAssemblyConflict.csv b/tools/StaticAnalysis/Exceptions/Az.IotHub/SharedAssemblyConflict.csv
@@ -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"
diff --git a/tools/StaticAnalysis/Program.cs b/tools/StaticAnalysis/Program.cs
@@ -33,6 +33,7 @@ public class Program
 
         static IList<string> ExceptionFileNames = new List<string>()
         {
+            "SharedAssemblyConflict.csv",
             "AssemblyVersionConflict.csv",
             "BreakingChangeIssues.csv",
             "ExtraAssemblies.csv",

diff --git a/tools/StaticAnalysis/StaticAnalysis.Netcore.csproj b/tools/StaticAnalysis/StaticAnalysis.Netcore.csproj
@@ -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>
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"