feat: cleanup and nuget update

asv-soft · Nov 20, 2023 · bcb49a7 · bcb49a7
1 parent 96dc714
commit bcb49a7
Show file tree

Hide file tree

Showing 75 changed files with 12 additions and 149 deletions.
diff --git a/src/Asv.Mavlink.Shell/Asv.Mavlink.Shell.csproj b/src/Asv.Mavlink.Shell/Asv.Mavlink.Shell.csproj
@@ -24,14 +24,14 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Asv.Cfg" Version="1.12.5" />
+    <PackageReference Include="Asv.Cfg" Version="1.13.0" />
     <PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
     <PackageReference Include="DotLiquid" Version="2.2.595" />
     <PackageReference Include="Geodesy" Version="4.1.0" />
     <PackageReference Include="ManyConsole" Version="2.0.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="Newtonsoft.Json.Bson" Version="1.0.2" />
-    <PackageReference Include="NLog" Version="5.1.2" />
+    <PackageReference Include="NLog" Version="5.2.6" />
     <PackageReference Include="System.Reactive.Linq" Version="5.0.0" />
   </ItemGroup>
   <ItemGroup>

diff --git a/src/Asv.Mavlink.Shell/Tests/FTP.cs b/src/Asv.Mavlink.Shell/Tests/FTP.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Asv.Mavlink.V2.Common;

diff --git a/src/Asv.Mavlink.Test/Asv.Mavlink.Test.csproj b/src/Asv.Mavlink.Test/Asv.Mavlink.Test.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-	  <PackageReference Include="Asv.Cfg" Version="1.12.5" />
+	  <PackageReference Include="Asv.Cfg" Version="1.13.0" />
 	  <PackageReference Include="DeepEqual" Version="2.0.0" />
 	  <PackageReference Include="DynamicData" Version="7.13.5" />
 	  <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />

diff --git a/src/Asv.Mavlink.Test/Devices/Base/BaseDevicesTest.cs b/src/Asv.Mavlink.Test/Devices/Base/BaseDevicesTest.cs
@@ -1,14 +1,11 @@
 using System;
 using System.Reactive.Concurrency;
-using System.Reactive.Disposables;
 using System.Reactive.Linq;
-using System.Threading;
 using System.Threading.Tasks;
 using Asv.Common;
 using Asv.Mavlink.V2.Common;
 using Xunit;
 using Xunit.Abstractions;
-using MavCmd = Asv.Mavlink.V2.AsvGbs.MavCmd;
 
 namespace Asv.Mavlink.Test;
 

diff --git a/src/Asv.Mavlink.Test/MavlinkTestHelper.cs b/src/Asv.Mavlink.Test/MavlinkTestHelper.cs
@@ -1,11 +1,4 @@
 using System.Net;
-using System.Net.Sockets;
-using System.Reactive.Concurrency;
-using System.Reactive.Linq;
-using Asv.Common;
-using Asv.IO;
-using Asv.Mavlink.Server;
-using Asv.Mavlink.V2.Common;
 
 namespace Asv.Mavlink.Test
 {

diff --git a/src/Asv.Mavlink.Test/Microservices/AsvGbs/AsvGbsTest.cs b/src/Asv.Mavlink.Test/Microservices/AsvGbs/AsvGbsTest.cs
@@ -3,11 +3,10 @@
 using System.Reactive.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Asv.Cfg.ImMemory;
+using Asv.Cfg;
 using Asv.Common;
 using Asv.Mavlink.V2.AsvGbs;
 using Asv.Mavlink.V2.Common;
-using Moq;
 using Xunit;
 using Xunit.Abstractions;
 

diff --git a/src/Asv.Mavlink.Test/Microservices/AsvSdr/AsvSdrStoreTest.cs b/src/Asv.Mavlink.Test/Microservices/AsvSdr/AsvSdrStoreTest.cs
@@ -2,7 +2,6 @@
 using System.IO;
 using System.Linq;
 using Asv.Mavlink.V2.AsvSdr;
-using Newtonsoft.Json;
 using Xunit;
 
 namespace Asv.Mavlink.Test;

diff --git a/src/Asv.Mavlink.Test/Microservices/AsvSdr/AsvSdrTest.cs b/src/Asv.Mavlink.Test/Microservices/AsvSdr/AsvSdrTest.cs
@@ -1,7 +1,5 @@
 using System;
-using System.Linq;
 using System.Reactive.Concurrency;
-using System.Reactive.Linq;
 using System.Threading.Tasks;
 using Asv.Mavlink.V2.AsvSdr;
 using Asv.Mavlink.V2.Common;

diff --git a/src/Asv.Mavlink.Test/Microservices/DebugSvc/DebugTest.cs b/src/Asv.Mavlink.Test/Microservices/DebugSvc/DebugTest.cs
@@ -1,9 +1,6 @@
 using System;
-using System.Linq;
 using System.Reactive.Concurrency;
-using System.Reactive.Linq;
 using System.Threading.Tasks;
-using Asv.Mavlink.V2.AsvSdr;
 using Xunit;
 
 namespace Asv.Mavlink.Test;

diff --git a/src/Asv.Mavlink.Test/Microservices/Heartbeat/HeartbeatMicroserviceTest.cs b/src/Asv.Mavlink.Test/Microservices/Heartbeat/HeartbeatMicroserviceTest.cs
@@ -2,7 +2,6 @@
 using System.Reactive.Linq;
 using System.Threading.Tasks;
 using Asv.Common;
-using Asv.Mavlink.V2.Common;
 using Asv.Mavlink.V2.Minimal;
 using Xunit;
 

diff --git a/src/Asv.Mavlink.Test/Microservices/Params/MavParamEncodingTest.cs b/src/Asv.Mavlink.Test/Microservices/Params/MavParamEncodingTest.cs
@@ -1,4 +1,3 @@
-using Asv.Mavlink.V2.Common;
 using Xunit;
 
 namespace Asv.Mavlink.Test;

diff --git a/src/Asv.Mavlink.Test/Microservices/Params/MavParamValueTest.cs b/src/Asv.Mavlink.Test/Microservices/Params/MavParamValueTest.cs
@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Reactive.Concurrency;
-using System.Threading.Tasks;
-using Asv.Cfg.ImMemory;
 using Asv.Mavlink.V2.Common;
 using Xunit;
 using Xunit.Abstractions;

diff --git a/src/Asv.Mavlink.Test/Microservices/Params/ParamsMicroserviceTest.cs b/src/Asv.Mavlink.Test/Microservices/Params/ParamsMicroserviceTest.cs
@@ -1,11 +1,8 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Reactive.Concurrency;
-using System.Threading;
 using System.Threading.Tasks;
-using Asv.Cfg.ImMemory;
-using Asv.Common;
+using Asv.Cfg;
 using Asv.Mavlink.V2.Common;
 using DynamicData;
 using Xunit;

diff --git a/src/Asv.Mavlink.Test/Tools/ListDataFileTest.cs b/src/Asv.Mavlink.Test/Tools/ListDataFileTest.cs
@@ -1,6 +1,5 @@
 using System;
 using System.IO;
-using System.Text;
 using Asv.Mavlink.V2.AsvSdr;
 using Asv.Mavlink.V2.Common;
 using DeepEqual.Syntax;

diff --git a/src/Asv.Mavlink/Asv.Mavlink.csproj b/src/Asv.Mavlink/Asv.Mavlink.csproj
@@ -46,12 +46,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Asv.Cfg" Version="1.12.5" />
-    <PackageReference Include="Asv.Common" Version="1.12.7" />
-    <PackageReference Include="Asv.IO" Version="1.12.5" />
+    <PackageReference Include="Asv.Cfg" Version="1.13.0" />
+    <PackageReference Include="Asv.Common" Version="1.13.0" />
+    <PackageReference Include="Asv.IO" Version="1.13.0" />
     <PackageReference Include="DynamicData" Version="7.13.5" />
     <PackageReference Include="Geodesy" Version="4.1.0" />
-    <PackageReference Include="NLog" Version="5.1.2" />
+    <PackageReference Include="NLog" Version="5.2.6" />
     <PackageReference Include="System.Reactive" Version="5.0.0" />
   </ItemGroup>
   <ItemGroup>

diff --git a/src/Asv.Mavlink/Devices/Adsb/Client/AdsbClientDevice.cs b/src/Asv.Mavlink/Devices/Adsb/Client/AdsbClientDevice.cs
@@ -1,6 +1,5 @@
 #nullable enable
 using System.Reactive.Concurrency;
-using System.Threading;
 using System.Threading.Tasks;
 using Asv.Common;
 

diff --git a/src/Asv.Mavlink/Devices/Adsb/Client/IAdsbClientDevice.cs b/src/Asv.Mavlink/Devices/Adsb/Client/IAdsbClientDevice.cs
@@ -1,6 +1,4 @@
-using System.Windows.Input;
-
-namespace Asv.Mavlink;
+namespace Asv.Mavlink;
 
 public interface IAdsbClientDevice : IClientDevice
 {

diff --git a/src/Asv.Mavlink/Devices/Adsb/Server/AdsbServerDevice.cs b/src/Asv.Mavlink/Devices/Adsb/Server/AdsbServerDevice.cs
@@ -1,6 +1,5 @@
 using System.Reactive.Concurrency;
 using Asv.Common;
-using Asv.Mavlink.V2.Common;
 using Asv.Mavlink.V2.Minimal;
 
 namespace Asv.Mavlink;

diff --git a/src/Asv.Mavlink/Devices/Adsb/Server/IAdsbServerDevice.cs b/src/Asv.Mavlink/Devices/Adsb/Server/IAdsbServerDevice.cs
@@ -1,6 +1,4 @@
-using Asv.Mavlink.V2.Common;
-
-namespace Asv.Mavlink;
+namespace Asv.Mavlink;
 
 public interface IAdsbServerDevice : IServerDevice
 {

diff --git a/src/Asv.Mavlink/Devices/Base/Client/IClientDevice.cs b/src/Asv.Mavlink/Devices/Base/Client/IClientDevice.cs
@@ -1,4 +1,3 @@
-using System.Reactive.Concurrency;
 using System.Reactive.Linq;
 using Asv.Common;
 

diff --git a/src/Asv.Mavlink/Devices/Gbs/Client/GbsClientDevice.cs b/src/Asv.Mavlink/Devices/Gbs/Client/GbsClientDevice.cs
@@ -2,7 +2,6 @@
 using System;
 using System.Reactive.Concurrency;
 using System.Reactive.Linq;
-using System.Threading;
 using System.Threading.Tasks;
 using Asv.Common;
 using NLog;

diff --git a/src/Asv.Mavlink/Devices/Sdr/Client/SdrClientDevice.cs b/src/Asv.Mavlink/Devices/Sdr/Client/SdrClientDevice.cs
@@ -2,7 +2,6 @@
 using System;
 using System.Reactive.Concurrency;
 using System.Reactive.Linq;
-using System.Threading;
 using System.Threading.Tasks;
 using Asv.Common;
 using NLog;

diff --git a/src/Asv.Mavlink/Devices/Sdr/Server/SdrServerDevice.cs b/src/Asv.Mavlink/Devices/Sdr/Server/SdrServerDevice.cs
@@ -4,7 +4,6 @@
 using Asv.Cfg;
 using Asv.Common;
 using Asv.Mavlink.V2.Common;
-using NLog;
 
 namespace Asv.Mavlink;
 

diff --git a/src/Asv.Mavlink/Devices/Vehicles/Client/Ardupilot/ArduPlaneClient.cs b/src/Asv.Mavlink/Devices/Vehicles/Client/Ardupilot/ArduPlaneClient.cs
@@ -3,12 +3,10 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reactive.Concurrency;
-using System.Reactive.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Asv.Common;
 using Asv.Mavlink.V2.Ardupilotmega;
-using Asv.Mavlink.V2.Common;
 using Asv.Mavlink.V2.Minimal;
 
 namespace Asv.Mavlink;

diff --git a/src/Asv.Mavlink/Devices/Vehicles/Client/Ardupilot/ArduVehicle.cs b/src/Asv.Mavlink/Devices/Vehicles/Client/Ardupilot/ArduVehicle.cs
@@ -1,7 +1,4 @@
 using System.Reactive.Concurrency;
-using System.Threading;
-using System.Threading.Tasks;
-using Asv.Mavlink.V2.Common;
 
 namespace Asv.Mavlink;
 

diff --git a/src/Asv.Mavlink/Devices/Vehicles/Client/Ardupilot/ArducopterClient.cs b/src/Asv.Mavlink/Devices/Vehicles/Client/Ardupilot/ArducopterClient.cs
@@ -1,15 +1,13 @@
 #nullable enable
 using System;
 using System.Collections.Generic;
-using System.Collections.Immutable;
 using System.Linq;
 using System.Reactive.Concurrency;
 using System.Reactive.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Asv.Common;
 using Asv.Mavlink.V2.Ardupilotmega;
-using Asv.Mavlink.V2.Common;
 using Asv.Mavlink.V2.Minimal;
 using NLog;
 

diff --git a/src/Asv.Mavlink/Devices/Vehicles/Client/IVehicleClient.cs b/src/Asv.Mavlink/Devices/Vehicles/Client/IVehicleClient.cs
@@ -1,11 +1,8 @@
 #nullable enable
-using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using Asv.Common;
-using Asv.Mavlink.V2.Ardupilotmega;
-using Asv.Mavlink.V2.Common;
 
 namespace Asv.Mavlink;
 

diff --git a/src/Asv.Mavlink/Devices/Vehicles/Client/IVehicleMode.cs b/src/Asv.Mavlink/Devices/Vehicles/Client/IVehicleMode.cs
@@ -1,6 +1,4 @@
 #nullable enable
-using Asv.Mavlink.V2.Common;
-
 namespace Asv.Mavlink;
 
 public interface IVehicleMode

diff --git a/src/Asv.Mavlink/Devices/Vehicles/Client/Px4/PxModeMap.cs b/src/Asv.Mavlink/Devices/Vehicles/Client/Px4/PxModeMap.cs
@@ -1,5 +1,4 @@
 using System;
-using Asv.Mavlink.V2.Common;
 using Asv.Mavlink.V2.Minimal;
 
 namespace Asv.Mavlink

diff --git a/src/Asv.Mavlink/Microservices/AsvSdr/Client/Ex/AsvSdrClientEx.cs b/src/Asv.Mavlink/Microservices/AsvSdr/Client/Ex/AsvSdrClientEx.cs
@@ -1,14 +1,12 @@
 #nullable enable
 using System;
-using System.Linq;
 using System.Reactive.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Asv.Common;
 using Asv.Mavlink.V2.AsvSdr;
 using Asv.Mavlink.V2.Common;
 using DynamicData;
-using MavCmd = Asv.Mavlink.V2.AsvSdr.MavCmd;
 
 namespace Asv.Mavlink;
 

diff --git a/src/Asv.Mavlink/Microservices/AsvSdr/Client/Ex/AsvSdrClientRecord.cs b/src/Asv.Mavlink/Microservices/AsvSdr/Client/Ex/AsvSdrClientRecord.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Linq;
 using System.Reactive.Linq;
 using System.Threading;
 using System.Threading.Tasks;

diff --git a/src/Asv.Mavlink/Microservices/AsvSdr/Client/Ex/AsvSdrClientRecordTag.cs b/src/Asv.Mavlink/Microservices/AsvSdr/Client/Ex/AsvSdrClientRecordTag.cs
@@ -1,4 +1,3 @@
-using System;
 using Asv.Mavlink.V2.AsvSdr;
 
 namespace Asv.Mavlink;

diff --git a/src/Asv.Mavlink/Microservices/AsvSdr/Server/Ex/AsvSdrServerEx.cs b/src/Asv.Mavlink/Microservices/AsvSdr/Server/Ex/AsvSdrServerEx.cs
@@ -1,7 +1,5 @@
 #nullable enable
 using System;
-using System.Collections.Generic;
-using System.Globalization;
 using System.Reactive.Linq;
 using System.Threading;
 using System.Threading.Tasks;

diff --git a/src/Asv.Mavlink/Microservices/AsvSdr/Server/Ex/ServerRecordTag.cs b/src/Asv.Mavlink/Microservices/AsvSdr/Server/Ex/ServerRecordTag.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Text;
 using Asv.IO;
 using Asv.Mavlink.V2.AsvSdr;
 

diff --git a/src/Asv.Mavlink/Microservices/AsvSdr/Store/AsvSdrRecordFileHelper.cs b/src/Asv.Mavlink/Microservices/AsvSdr/Store/AsvSdrRecordFileHelper.cs
@@ -1,6 +1,5 @@
 #nullable enable
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using Asv.IO;

diff --git a/src/Asv.Mavlink/Microservices/DebugSvc/Client/IDebugClient.cs b/src/Asv.Mavlink/Microservices/DebugSvc/Client/IDebugClient.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using Asv.Common;
 using Asv.Mavlink.V2.Common;
 
 namespace Asv.Mavlink

diff --git a/src/Asv.Mavlink/Microservices/DebugSvc/Server/DebugServer.cs b/src/Asv.Mavlink/Microservices/DebugSvc/Server/DebugServer.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Reactive.Concurrency;
-using System.Threading;
 using System.Threading.Tasks;
 using Asv.Mavlink.V2.Common;
 

diff --git a/src/Asv.Mavlink/Microservices/Heartbeat/Client/HeartbeatClient.cs b/src/Asv.Mavlink/Microservices/Heartbeat/Client/HeartbeatClient.cs
@@ -1,15 +1,12 @@
 #nullable enable
 using System;
-using System.Collections.Concurrent;
 using System.Collections.Generic;
-using System.Collections.Immutable;
 using System.Diagnostics;
 using System.Linq;
 using System.Reactive.Concurrency;
 using System.Reactive.Linq;
 using System.Threading;
 using Asv.Common;
-using Asv.Mavlink.V2.Common;
 using Asv.Mavlink.V2.Minimal;
 using NLog;
 

diff --git a/src/Asv.Mavlink/Microservices/Heartbeat/Client/IHeartbeatClient.cs b/src/Asv.Mavlink/Microservices/Heartbeat/Client/IHeartbeatClient.cs
@@ -1,6 +1,5 @@
 using System;
 using Asv.Common;
-using Asv.Mavlink.V2.Common;
 using Asv.Mavlink.V2.Minimal;
 
 namespace Asv.Mavlink

diff --git a/src/Asv.Mavlink/Microservices/Heartbeat/Server/HeartbeatServer.cs b/src/Asv.Mavlink/Microservices/Heartbeat/Server/HeartbeatServer.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Reactive.Concurrency;
 using Asv.Common;
-using Asv.Mavlink.V2.Common;
 using Asv.Mavlink.V2.Minimal;
 
 namespace Asv.Mavlink

diff --git a/src/Asv.Mavlink/Microservices/Heartbeat/Server/IHeartbeatServer.cs b/src/Asv.Mavlink/Microservices/Heartbeat/Server/IHeartbeatServer.cs
@@ -1,5 +1,4 @@
 using System;
-using Asv.Mavlink.V2.Common;
 using Asv.Mavlink.V2.Minimal;
 
 namespace Asv.Mavlink

diff --git a/src/Asv.Mavlink/Microservices/Logging/Server/LoggingServer.cs b/src/Asv.Mavlink/Microservices/Logging/Server/LoggingServer.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Reactive.Concurrency;
-using System.Threading;
 using System.Threading.Tasks;
 using Asv.Mavlink.V2.Common;
 

diff --git a/src/Asv.Mavlink/Microservices/Missions/Server/Ex/IMissionServerEx.cs b/src/Asv.Mavlink/Microservices/Missions/Server/Ex/IMissionServerEx.cs
@@ -1,6 +1,5 @@
 using System;
 using Asv.Common;
-using Asv.Mavlink.V2.Common;
 using DynamicData;
 
 namespace Asv.Mavlink;

diff --git a/src/Asv.Mavlink/Microservices/Missions/Server/Ex/MissionServerEx.cs b/src/Asv.Mavlink/Microservices/Missions/Server/Ex/MissionServerEx.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Reactive.Concurrency;
-using System.Reactive.Linq;
 using System.Threading;
 using Asv.Common;
 using Asv.Mavlink.V2.Common;