Libs: json update

ArduPilot · Dec 4, 2024 · 1712aaf · 1712aaf
1 parent 6304d2f
commit 1712aaf
Show file tree

Hide file tree

Showing 26 changed files with 44 additions and 7 deletions.
diff --git a/ExtLibs/AltitudeAngelWings/AltitudeAngelWings.csproj b/ExtLibs/AltitudeAngelWings/AltitudeAngelWings.csproj
@@ -17,6 +17,7 @@
   <ItemGroup>
     <PackageReference Include="Markdig" Version="0.32.0" />
     <PackageReference Include="NetTopologySuite" Version="2.4.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="NodaTime.Serialization.JsonNet" Version="3.0.1" />
     <PackageReference Include="Flurl" Version="3.0.2" />
     <PackageReference Include="Flurl.Http" Version="3.2.0" />

diff --git a/ExtLibs/Antenna/MissionPlanner.Antenna.csproj b/ExtLibs/Antenna/MissionPlanner.Antenna.csproj
@@ -4,6 +4,10 @@
     <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Comms\MissionPlanner.Comms.csproj" />
     <ProjectReference Include="..\Strings\MissionPlanner.Strings.csproj" />

diff --git a/ExtLibs/ArduPilot/MissionPlanner.ArduPilot.csproj b/ExtLibs/ArduPilot/MissionPlanner.ArduPilot.csproj
@@ -24,6 +24,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Asyncify" Version="0.9.7" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="SharpCompress" Version="0.29.0" />
     <PackageReference Include="SharpDX.DirectInput" Version="4.1.0" />
   </ItemGroup>

diff --git a/ExtLibs/Arduino/Arduino.csproj b/ExtLibs/Arduino/Arduino.csproj
@@ -22,6 +22,9 @@
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Comms\MissionPlanner.Comms.csproj" />
   </ItemGroup>

diff --git a/ExtLibs/Comms/MissionPlanner.Comms.csproj b/ExtLibs/Comms/MissionPlanner.Comms.csproj
@@ -38,6 +38,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.Win32.Registry" Version="4.7.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="SocketIOClient" Version="2.0.2.1" />
     <PackageReference Include="System.AppContext" Version="4.3.0" />
     <PackageReference Include="System.IO.Ports" Version="4.7.0" />

diff --git a/ExtLibs/Controls/MissionPlanner.Controls.csproj b/ExtLibs/Controls/MissionPlanner.Controls.csproj
@@ -12,6 +12,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="OpenTK.GLControl" Version="3.1.0" Condition="'$(TargetFramework)' != 'netstandard2.0'" />
     <PackageReference Include="SkiaSharp" Version="2.80.2" />
     <PackageReference Include="SkiaSharp.Views.Desktop.Common" Version="2.80.2" />

diff --git a/ExtLibs/GDAL/GDAL.NET.csproj b/ExtLibs/GDAL/GDAL.NET.csproj
@@ -20,6 +20,7 @@
 
     </PackageReference>
     <PackageReference Include="log4net" Version="2.0.13" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 
     <ProjectReference Include="..\MissionPlanner.Drawing.Common\MissionPlanner.Drawing.Common.csproj" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
     <PackageReference Include="System.Drawing.Common" Version="4.7.2" Condition="'$(TargetFramework)' != 'netstandard2.0'" />

diff --git a/ExtLibs/HIL/MissionPlanner.HIL.csproj b/ExtLibs/HIL/MissionPlanner.HIL.csproj
@@ -6,6 +6,7 @@
 
   <ItemGroup>
     <PackageReference Include="log4net" Version="2.0.13" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/ExtLibs/ImageVisualizer/src/ImageVisualizerPackage/ImageVisualizerSkiaPackage.csproj b/ExtLibs/ImageVisualizer/src/ImageVisualizerPackage/ImageVisualizerSkiaPackage.csproj
@@ -63,6 +63,7 @@
     <PackageReference Include="Microsoft.VSSDK.Vsixsigntool">
       <Version>16.2.29116.78</Version>
     </PackageReference>
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ImageVisualizer16.DebuggeeSide\ImageVisualizer.DebuggeeSide.csproj" />

diff --git a/ExtLibs/Maps/MissionPlanner.Maps.csproj b/ExtLibs/Maps/MissionPlanner.Maps.csproj
@@ -18,6 +18,7 @@
 
   <ItemGroup>
     <PackageReference Include="BruTile" Version="4.0.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="System.Drawing.Common" Version="4.7.2" Condition="'$(TargetFramework)' != 'netstandard2.0'" />
     <PackageReference Include="System.Resources.Extensions" Version="6.0.0" />
 

diff --git a/ExtLibs/Mavlink/MAVLink.csproj b/ExtLibs/Mavlink/MAVLink.csproj
@@ -56,7 +56,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
 

diff --git a/ExtLibs/NMEA2000/NMEA2000.csproj b/ExtLibs/NMEA2000/NMEA2000.csproj
@@ -21,7 +21,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/ExtLibs/Onvif/Onvif.csproj b/ExtLibs/Onvif/Onvif.csproj
@@ -5,6 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="Onvif.Core" Version="2.2.2" />
     <PackageReference Include="System.ServiceModel.Duplex" Version="4.8.1" />
     <PackageReference Include="System.ServiceModel.Http" Version="4.8.1" />

diff --git a/ExtLibs/Utilities/MissionPlanner.Utilities.csproj b/ExtLibs/Utilities/MissionPlanner.Utilities.csproj
@@ -49,7 +49,7 @@
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.1.13" />
     <PackageReference Include="MP.DotSpatial.Projections" Version="4.0.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="SharpCompress" Version="0.29.0" />
     <PackageReference Include="SixLabors.ImageSharp" Version="2.1.9" />
     <PackageReference Include="SkiaSharp" Version="2.80.2" />

diff --git a/ExtLibs/WebAPIs/MissionPlanner.WebAPIs.csproj b/ExtLibs/WebAPIs/MissionPlanner.WebAPIs.csproj
@@ -48,7 +48,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="RestSharp" Version="106.12.0" />
     <PackageReference Include="SuperSocket.ClientEngine.Core" Version="0.10.0"></PackageReference>
     <PackageReference Include="WebSocket4Net" Version="0.15.2" ExcludeAssets="Compile" GeneratePathProperty="true" />

diff --git a/ExtLibs/Xamarin/GDAL/GDALMPAndroid.csproj b/ExtLibs/Xamarin/GDAL/GDALMPAndroid.csproj
@@ -57,6 +57,9 @@
     <PackageReference Include="log4net">
       <Version>2.0.13</Version>
     </PackageReference>
+    <PackageReference Include="Newtonsoft.Json">
+      <Version>13.0.3</Version>
+    </PackageReference>
     <PackageReference Include="System.Drawing.Primitives">
       <Version>4.3.0</Version>
     </PackageReference>

diff --git a/ExtLibs/Xamarin/SkiaTest/SkiaTest.csproj b/ExtLibs/Xamarin/SkiaTest/SkiaTest.csproj
@@ -30,7 +30,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="NetCoreEx.Geometry" Version="3.0.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="SkiaSharp" Version="2.80.4" />
     <PackageReference Include="SkiaSharp.Views.Desktop.Common" Version="2.80.2" />
     <PackageReference Include="System.Drawing.Common" Version="4.7.2">

diff --git a/ExtLibs/Xamarin/Xamarin.Android/Xamarin.Android.csproj b/ExtLibs/Xamarin/Xamarin.Android/Xamarin.Android.csproj
@@ -112,6 +112,9 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json">
+      <Version>13.0.3</Version>
+    </PackageReference>
     <PackageReference Include="SkiaSharp.Views">
       <Version>2.80.2</Version>
     </PackageReference>
@@ -260,7 +263,7 @@
   </PropertyGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties TriggeredFromHotReload="False" XamarinHotReloadDebuggerTimeoutExceptionXamarinAndroidHideInfoBar="True" />
+      <UserProperties XamarinHotReloadDebuggerTimeoutExceptionXamarinAndroidHideInfoBar="True" TriggeredFromHotReload="False" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
diff --git a/ExtLibs/Xamarin/Xamarin.MacOS/Xamarin.MacOS.csproj b/ExtLibs/Xamarin/Xamarin.MacOS/Xamarin.MacOS.csproj
@@ -154,6 +154,9 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json">
+      <Version>13.0.3</Version>
+    </PackageReference>
     <PackageReference Include="SkiaSharp.Views.Forms">
       <Version>2.80.2</Version>
     </PackageReference>

diff --git a/ExtLibs/Xamarin/Xamarin.UWP/Xamarin.UWP.csproj b/ExtLibs/Xamarin/Xamarin.UWP/Xamarin.UWP.csproj
@@ -149,6 +149,9 @@
     <PackageReference Include="DotNetZip">
       <Version>1.16.0</Version>
     </PackageReference>
+    <PackageReference Include="Newtonsoft.Json">
+      <Version>13.0.3</Version>
+    </PackageReference>
     <PackageReference Include="System.Drawing.Primitives">
       <Version>4.3.0</Version>
     </PackageReference>

diff --git a/ExtLibs/Xamarin/Xamarin.iOS/Xamarin.iOS.csproj b/ExtLibs/Xamarin/Xamarin.iOS/Xamarin.iOS.csproj
@@ -166,6 +166,9 @@
     <Reference Include="Xamarin.iOS" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json">
+      <Version>13.0.3</Version>
+    </PackageReference>
     <PackageReference Include="SkiaSharp">
       <Version>2.80.2</Version>
     </PackageReference>

diff --git a/ExtLibs/Xamarin/Xamarin/Xamarin.csproj b/ExtLibs/Xamarin/Xamarin/Xamarin.csproj
@@ -67,6 +67,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="NLog" Version="4.7.4" />
     <PackageReference Include="SkiaSharp.Views.Forms" Version="2.80.2" />
     <PackageReference Include="System.Drawing.Primitives" Version="4.3.0" />

diff --git a/ExtLibs/px4uploader/px4uploader.csproj b/ExtLibs/px4uploader/px4uploader.csproj
@@ -33,6 +33,7 @@
 
   <ItemGroup>
     <PackageReference Include="BouncyCastle.Cryptography" Version="2.4.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="System.Reflection.Emit.ILGeneration" Version="4.7.0" />
     <PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />
     <PackageReference Include="System.Reflection.Primitives" Version="4.3.0" />

diff --git a/ExtLibs/solo/solo.csproj b/ExtLibs/solo/solo.csproj
@@ -26,6 +26,7 @@
     <PackageReference Include="Flurl" Version="3.0.2" />
     <PackageReference Include="Flurl.Http" Version="3.2.0" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="SSH.NET" Version="2020.0.2" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
     <PackageReference Include="System.Net.NameResolution" Version="4.3.0" />

diff --git a/ExtLibs/tlogThumbnailHandler/tlogThumbnailHandler.csproj b/ExtLibs/tlogThumbnailHandler/tlogThumbnailHandler.csproj
@@ -30,6 +30,9 @@
   <ItemGroup>
     <None Include="GMapImage.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Maps\MissionPlanner.Maps.csproj" />
     <ProjectReference Include="..\MissionPlanner.Drawing\MissionPlanner.Drawing.csproj" Condition="'$(TargetFramework)' != 'netstandard2.0'">

diff --git a/MissionPlanner.csproj b/MissionPlanner.csproj
@@ -219,7 +219,7 @@
     <PackageReference Include="NETStandard.Library">
       <Version>2.0.3</Version>
     </PackageReference>
-    <PackageReference Include="Newtonsoft.Json" version="13.0.2" targetFramework="net462" />
+    <PackageReference Include="Newtonsoft.Json" version="13.0.3" targetFramework="net462" />
     <PackageReference Include="OpenTK">
       <Version>3.1.0</Version>
     </PackageReference>