Apply folder and namespace fixes on solution.

immense · Oct 21, 2024 · 0f023d2 · 0f023d2
1 parent bbddfbc
commit 0f023d2
Show file tree

Hide file tree

Showing 236 changed files with 155 additions and 908 deletions.
diff --git a/Agent/Extensions/PowerShellCompletionExtensions.cs b/Agent/Extensions/PowerShellCompletionExtensions.cs
@@ -1,11 +1,7 @@
 using Remotely.Shared.Models;
 using Remotely.Shared.Utilities;
-using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Management.Automation;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Remotely.Agent.Extensions;
 

diff --git a/Agent/Interfaces/IAppLauncher.cs b/Agent/Interfaces/IAppLauncher.cs
@@ -1,5 +1,4 @@
 using Microsoft.AspNetCore.SignalR.Client;
-using System.Collections.Generic;
 using System.Threading.Tasks;
 
 namespace Remotely.Agent.Interfaces;

diff --git a/Agent/Interfaces/IDeviceInformationService.cs b/Agent/Interfaces/IDeviceInformationService.cs
@@ -1,9 +1,4 @@
 using Remotely.Shared.Dtos;
-using Remotely.Shared.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 
 namespace Remotely.Agent.Interfaces;

diff --git a/Agent/Interfaces/IScriptingShell.cs b/Agent/Interfaces/IScriptingShell.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Remotely.Agent.Interfaces;
+namespace Remotely.Agent.Interfaces;
 public interface IScriptingShell
 {
     bool IsDisposed { get; }

diff --git a/Agent/Interfaces/IUpdater.cs b/Agent/Interfaces/IUpdater.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 
 namespace Remotely.Agent.Interfaces;
 

diff --git a/Agent/Services/AgentHubConnection.cs b/Agent/Services/AgentHubConnection.cs
@@ -1,5 +1,4 @@
-using Remotely.Desktop.Shared.Native.Windows;
-using Microsoft.AspNetCore.SignalR.Client;
+using Microsoft.AspNetCore.SignalR.Client;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
@@ -19,6 +18,7 @@
 using System.Threading.Tasks;
 using System.Timers;
 using Timer = System.Timers.Timer;
+using Remotely.Desktop.Native.Windows;
 
 namespace Remotely.Agent.Services;
 

diff --git a/Agent/Services/ChatClientService.cs b/Agent/Services/ChatClientService.cs
@@ -3,7 +3,6 @@
 using Remotely.Agent.Interfaces;
 using Remotely.Agent.Models;
 using Remotely.Shared.Models;
-using Remotely.Shared.Utilities;
 using System;
 using System.Diagnostics;
 using System.IO;

diff --git a/Agent/Services/CpuUtilizationSampler.cs b/Agent/Services/CpuUtilizationSampler.cs
@@ -5,7 +5,6 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 

diff --git a/Agent/Services/DeviceInfoGeneratorBase.cs b/Agent/Services/DeviceInfoGeneratorBase.cs
@@ -4,7 +4,6 @@
 using Remotely.Shared.Utilities;
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Net.NetworkInformation;

diff --git a/Agent/Services/ExternalScriptingShell.cs b/Agent/Services/ExternalScriptingShell.cs
@@ -3,7 +3,6 @@
 using Remotely.Shared.Dtos;
 using Remotely.Shared.Enums;
 using System;
-using System.Collections.Concurrent;
 using System.Diagnostics;
 using System.Linq;
 using System.Threading;

diff --git a/Agent/Services/FileLogsManager.cs b/Agent/Services/FileLogsManager.cs
@@ -1,12 +1,9 @@
-using Microsoft.Extensions.Logging;
-using Remotely.Shared.Services;
-using System;
+using Remotely.Shared.Services;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Runtime.CompilerServices;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 

diff --git a/Agent/Services/Linux/DeviceInfoGeneratorLinux.cs b/Agent/Services/Linux/DeviceInfoGeneratorLinux.cs
@@ -1,13 +1,9 @@
 using Microsoft.Extensions.Logging;
 using Remotely.Agent.Interfaces;
 using Remotely.Shared.Dtos;
-using Remotely.Shared.Models;
 using Remotely.Shared.Services;
-using Remotely.Shared.Utilities;
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 
 namespace Remotely.Agent.Services.Linux;

diff --git a/Agent/Services/Linux/UpdaterLinux.cs b/Agent/Services/Linux/UpdaterLinux.cs
@@ -2,15 +2,12 @@
 using Remotely.Agent.Interfaces;
 using Remotely.Shared.Utilities;
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
-using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Runtime.InteropServices;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 

diff --git a/Agent/Services/MacOS/AppLauncherMac.cs b/Agent/Services/MacOS/AppLauncherMac.cs
@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.SignalR.Client;
 using Remotely.Agent.Interfaces;

diff --git a/Agent/Services/MacOS/DeviceInfoGeneratorMac.cs b/Agent/Services/MacOS/DeviceInfoGeneratorMac.cs
@@ -1,7 +1,6 @@
 using Microsoft.Extensions.Logging;
 using Remotely.Agent.Interfaces;
 using Remotely.Shared.Dtos;
-using Remotely.Shared.Models;
 using Remotely.Shared.Services;
 using System;
 using System.Linq;

diff --git a/Agent/Services/MacOS/UpdaterMac.cs b/Agent/Services/MacOS/UpdaterMac.cs
@@ -2,15 +2,12 @@
 using Remotely.Agent.Interfaces;
 using Remotely.Shared.Utilities;
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
-using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Runtime.InteropServices;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 

diff --git a/Agent/Services/PsCoreShell.cs b/Agent/Services/PsCoreShell.cs
@@ -1,10 +1,8 @@
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging;
 using Remotely.Agent.Interfaces;
 using Remotely.Shared.Dtos;
 using Remotely.Shared.Models;
 using System;
-using System.Collections.Concurrent;
 using System.Diagnostics;
 using System.Linq;
 using System.Management.Automation;

diff --git a/Agent/Services/ScriptExecutor.cs b/Agent/Services/ScriptExecutor.cs
@@ -1,6 +1,4 @@
-using Remotely.Shared.Extensions;
-using Microsoft.AspNetCore.SignalR.Client;
-using Microsoft.Extensions.Hosting;
+using Microsoft.AspNetCore.SignalR.Client;
 using Microsoft.Extensions.Logging;
 using Remotely.Shared;
 using Remotely.Shared.Dtos;

diff --git a/Agent/Services/Uninstaller.cs b/Agent/Services/Uninstaller.cs
@@ -1,5 +1,4 @@
-using Microsoft.Win32;
-using Remotely.Shared.Utilities;
+using Remotely.Shared.Utilities;
 using System;
 using System.Diagnostics;
 using System.IO;

diff --git a/Agent/Services/UpdateDownloader.cs b/Agent/Services/UpdateDownloader.cs
@@ -1,6 +1,5 @@
 using System;
 using System.IO;
-using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
 

diff --git a/Agent/Services/WakeOnLanService.cs b/Agent/Services/WakeOnLanService.cs
@@ -1,9 +1,7 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Net;
 using System.Net.Sockets;
-using System.Text;
 using System.Threading.Tasks;
 
 namespace Remotely.Agent.Services;

diff --git a/Agent/Services/Windows/AppLauncherWin.cs b/Agent/Services/Windows/AppLauncherWin.cs
@@ -1,5 +1,4 @@
-using Remotely.Desktop.Shared.Native.Windows;
-using Microsoft.AspNetCore.SignalR.Client;
+using Microsoft.AspNetCore.SignalR.Client;
 using Microsoft.Extensions.Logging;
 using Remotely.Agent.Interfaces;
 using Remotely.Shared.Models;
@@ -10,6 +9,7 @@
 using System.Runtime.Versioning;
 using System.Security.Principal;
 using System.Threading.Tasks;
+using Remotely.Desktop.Native.Windows;
 
 namespace Remotely.Agent.Services.Windows;
 

diff --git a/Agent/Services/Windows/DeviceInfoGeneratorWin.cs b/Agent/Services/Windows/DeviceInfoGeneratorWin.cs
@@ -1,10 +1,10 @@
-using Remotely.Desktop.Shared.Native.Windows;
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging;
 using Remotely.Agent.Interfaces;
 using Remotely.Shared.Dtos;
 using System;
 using System.Linq;
 using System.Threading.Tasks;
+using Remotely.Desktop.Native.Windows;
 
 namespace Remotely.Agent.Services.Windows;
 

diff --git a/Desktop.Linux/Program.cs b/Desktop.Linux/Program.cs
@@ -11,9 +11,8 @@
 using Remotely.Desktop.UI.Services;
 using Avalonia;
 using Remotely.Desktop.UI;
-using Desktop.Shared.Services;
 
-namespace Remotely.Desktop.XPlat;
+namespace Remotely.Desktop.Linux;
 
 public class Program
 {

diff --git a/Desktop.Linux/Services/AppStartup.cs b/Desktop.Linux/Services/AppStartup.cs
@@ -4,7 +4,6 @@
 using Remotely.Desktop.UI.Services;
 using Remotely.Shared.Models;
 using Microsoft.Extensions.Logging;
-using Desktop.Shared.Services;
 
 namespace Remotely.Desktop.Linux.Services;
 

diff --git a/Desktop.Linux/Services/KeyboardMouseInputLinux.cs b/Desktop.Linux/Services/KeyboardMouseInputLinux.cs
@@ -1,8 +1,8 @@
 using Remotely.Desktop.Shared.Abstractions;
 using Remotely.Desktop.Shared.Enums;
-using Remotely.Desktop.Shared.Native.Linux;
 using Remotely.Desktop.Shared.Services;
 using Microsoft.Extensions.Logging;
+using Remotely.Desktop.Native.Linux;
 
 namespace Remotely.Desktop.Linux.Services;
 

diff --git a/Desktop.Linux/Services/ScreenCapturerLinux.cs b/Desktop.Linux/Services/ScreenCapturerLinux.cs
@@ -1,11 +1,11 @@
 using Remotely.Desktop.Shared.Abstractions;
-using Remotely.Desktop.Shared.Native.Linux;
 using Remotely.Desktop.Shared.Services;
 using Microsoft.Extensions.Logging;
 using Remotely.Shared.Primitives;
 using SkiaSharp;
 using System.Drawing;
 using System.Runtime.InteropServices;
+using Remotely.Desktop.Native.Linux;
 
 namespace Remotely.Desktop.Linux.Services;
 

diff --git a/Desktop.Linux/Startup/IServiceCollectionExtensions.cs b/Desktop.Linux/Startup/IServiceCollectionExtensions.cs
@@ -2,7 +2,6 @@
 using Remotely.Desktop.Shared.Startup;
 using Microsoft.Extensions.DependencyInjection;
 using Remotely.Desktop.Linux.Services;
-using Remotely.Desktop.UI.ViewModels;
 using Remotely.Desktop.UI.Services;
 using Remotely.Desktop.UI.Startup;
 

diff --git a/Desktop.Linux/Usings.cs b/Desktop.Linux/Usings.cs
@@ -1,5 +1,4 @@
 global using System;
 global using System.Collections.Generic;
 global using System.Linq;
-global using System.Text;
 global using System.Threading.Tasks;
diff --git a/Desktop.Native/Linux/LibX11.cs b/Desktop.Native/Linux/LibX11.cs
@@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group.
 
 using System.Runtime.InteropServices;
 
-namespace Remotely.Desktop.Shared.Native.Linux;
+namespace Remotely.Desktop.Native.Linux;
 
 public static unsafe class LibX11
 {

diff --git a/Desktop.Native/Linux/LibXtst.cs b/Desktop.Native/Linux/LibXtst.cs
@@ -1,6 +1,6 @@
 using System.Runtime.InteropServices;
 
-namespace Remotely.Desktop.Shared.Native.Linux;
+namespace Remotely.Desktop.Native.Linux;
 
 public class LibXtst
 {

diff --git a/Desktop.Native/Linux/Libc.cs b/Desktop.Native/Linux/Libc.cs
@@ -1,6 +1,6 @@
 using System.Runtime.InteropServices;
 
-namespace Remotely.Desktop.Shared.Native.Linux;
+namespace Remotely.Desktop.Native.Linux;
 
 public class Libc
 {

diff --git a/Desktop.Native/Linux/libXrandr.cs b/Desktop.Native/Linux/libXrandr.cs
@@ -29,7 +29,7 @@
 
 using System.Runtime.InteropServices;
 
-namespace Remotely.Desktop.Shared.Native.Linux;
+namespace Remotely.Desktop.Native.Linux;
 
 public static class LibXrandr
 {

diff --git a/Desktop.Native/Windows/ADVAPI32.cs b/Desktop.Native/Windows/ADVAPI32.cs
@@ -1,8 +1,7 @@
-using System;
 using System.Runtime.InteropServices;
 using System.Security;
 
-namespace Remotely.Desktop.Shared.Native.Windows;
+namespace Remotely.Desktop.Native.Windows;
 
 public static class ADVAPI32
 {

diff --git a/Desktop.Native/Windows/GDI32.cs b/Desktop.Native/Windows/GDI32.cs
@@ -1,7 +1,6 @@
-using System;
-using System.Runtime.InteropServices;
+using System.Runtime.InteropServices;
 
-namespace Remotely.Desktop.Shared.Native.Windows;
+namespace Remotely.Desktop.Native.Windows;
 
 public static class GDI32
 {

diff --git a/Desktop.Native/Windows/Kernel32.cs b/Desktop.Native/Windows/Kernel32.cs
@@ -1,7 +1,6 @@
-using System;
 using System.Runtime.InteropServices;
 
-namespace Remotely.Desktop.Shared.Native.Windows;
+namespace Remotely.Desktop.Native.Windows;
 
 public static class Kernel32
 {

diff --git a/Desktop.Native/Windows/SECUR32.cs b/Desktop.Native/Windows/SECUR32.cs
@@ -1,8 +1,7 @@
-using Remotely.Desktop.Shared.Native.Windows;
-using Microsoft.Win32.SafeHandles;
-using System;
+using Microsoft.Win32.SafeHandles;
 using System.Runtime.InteropServices;
 using System.Runtime.Versioning;
+using Remotely.Desktop.Native.Windows;
 
 public static class SECUR32
 {

diff --git a/Desktop.Native/Windows/Shlwapi.cs b/Desktop.Native/Windows/Shlwapi.cs
@@ -1,6 +1,6 @@
 using System.Runtime.InteropServices;
 
-namespace Remotely.Desktop.Shared.Native.Windows;
+namespace Remotely.Desktop.Native.Windows;
 
 // https://docs.microsoft.com/en-us/windows/win32/api/shlwapi/nf-shlwapi-isos
 public class Shlwapi

diff --git a/Desktop.Native/Windows/User32.cs b/Desktop.Native/Windows/User32.cs
@@ -1,7 +1,7 @@
 using Microsoft.Win32.SafeHandles;
 using System.Runtime.InteropServices;
 
-namespace Remotely.Desktop.Shared.Native.Windows;
+namespace Remotely.Desktop.Native.Windows;
 
 public static class User32
 {

diff --git a/Desktop.Native/Windows/WTSAPI32.cs b/Desktop.Native/Windows/WTSAPI32.cs
@@ -1,7 +1,6 @@
-using System;
-using System.Runtime.InteropServices;
+using System.Runtime.InteropServices;
 
-namespace Remotely.Desktop.Shared.Native.Windows;
+namespace Remotely.Desktop.Native.Windows;
 
 public static class WTSAPI32
 {