Skip to content

Commit

Permalink
Update namespaces.
Browse files Browse the repository at this point in the history
  • Loading branch information
bitbound committed Jul 16, 2024
1 parent 73db96e commit 81641af
Show file tree
Hide file tree
Showing 235 changed files with 521 additions and 586 deletions.
2 changes: 1 addition & 1 deletion Agent/Services/AgentHubConnection.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Immense.RemoteControl.Desktop.Shared.Native.Windows;
using Remotely.Desktop.Shared.Native.Windows;
using Microsoft.AspNetCore.SignalR.Client;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
Expand Down
5 changes: 1 addition & 4 deletions Agent/Services/ConfigService.cs
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
using Immense.RemoteControl.Shared;
using Remotely.Shared;
using Microsoft.Extensions.Logging;
using Remotely.Shared;
using Remotely.Shared.Models;
using Remotely.Shared.Utilities;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Text.Json;

namespace Remotely.Agent.Services;
Expand Down
2 changes: 1 addition & 1 deletion Agent/Services/ScriptExecutor.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Immense.RemoteControl.Shared.Extensions;
using Remotely.Shared.Extensions;
using Microsoft.AspNetCore.SignalR.Client;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
Expand Down
2 changes: 1 addition & 1 deletion Agent/Services/Windows/AppLauncherWin.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Immense.RemoteControl.Desktop.Shared.Native.Windows;
using Remotely.Desktop.Shared.Native.Windows;
using Microsoft.AspNetCore.SignalR.Client;
using Microsoft.Extensions.Logging;
using Remotely.Agent.Interfaces;
Expand Down
2 changes: 1 addition & 1 deletion Agent/Services/Windows/DeviceInfoGeneratorWin.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Immense.RemoteControl.Desktop.Shared.Native.Windows;
using Remotely.Desktop.Shared.Native.Windows;
using Microsoft.Extensions.Logging;
using Remotely.Agent.Interfaces;
using Remotely.Shared.Dtos;
Expand Down
2 changes: 1 addition & 1 deletion Desktop.Linux/Desktop.Linux.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<TargetFramework>net8.0</TargetFramework>
<ApplicationIcon>Assets\favicon.ico</ApplicationIcon>
<AssemblyName>Remotely_Desktop</AssemblyName>
<RootNamespace>Remotely.Desktop.XPlat</RootNamespace>
<RootNamespace>Remotely.Desktop.Linux</RootNamespace>
<Platforms>AnyCPU;x64;x86</Platforms>
</PropertyGroup>
<PropertyGroup>
Expand Down
15 changes: 6 additions & 9 deletions Desktop.Linux/Program.cs
Original file line number Diff line number Diff line change
@@ -1,19 +1,16 @@
using Immense.RemoteControl.Desktop.Shared.Abstractions;
using System.Threading.Tasks;
using Remotely.Desktop.Shared.Abstractions;
using System.Threading;
using System;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Remotely.Shared.Services;
using Immense.RemoteControl.Desktop.Shared.Services;
using Remotely.Desktop.Shared.Services;
using System.Diagnostics;
using Remotely.Shared.Utilities;
using Immense.RemoteControl.Desktop.Shared.Startup;
using System.Linq;
using Immense.RemoteControl.Desktop.Linux.Startup;
using Immense.RemoteControl.Desktop.UI.Services;
using Remotely.Desktop.Shared.Startup;
using Remotely.Desktop.Linux.Startup;
using Remotely.Desktop.UI.Services;
using Avalonia;
using Immense.RemoteControl.Desktop.UI;
using Remotely.Desktop.UI;
using Desktop.Shared.Services;

namespace Remotely.Desktop.XPlat;
Expand Down
12 changes: 6 additions & 6 deletions Desktop.Linux/Services/AppStartup.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
using Immense.RemoteControl.Desktop.Shared.Abstractions;
using Immense.RemoteControl.Desktop.Shared.Enums;
using Immense.RemoteControl.Desktop.Shared.Services;
using Immense.RemoteControl.Desktop.UI.Services;
using Immense.RemoteControl.Shared.Models;
using Remotely.Desktop.Shared.Abstractions;
using Remotely.Desktop.Shared.Enums;
using Remotely.Desktop.Shared.Services;
using Remotely.Desktop.UI.Services;
using Remotely.Shared.Models;
using Microsoft.Extensions.Logging;

namespace Immense.RemoteControl.Desktop.Linux.Services;
namespace Remotely.Desktop.Linux.Services;

internal class AppStartup : IAppStartup
{
Expand Down
4 changes: 2 additions & 2 deletions Desktop.Linux/Services/AudioCapturerLinux.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Immense.RemoteControl.Desktop.Shared.Abstractions;
using Remotely.Desktop.Shared.Abstractions;

namespace Immense.RemoteControl.Desktop.Linux.Services;
namespace Remotely.Desktop.Linux.Services;

public class AudioCapturerLinux : IAudioCapturer
{
Expand Down
6 changes: 3 additions & 3 deletions Desktop.Linux/Services/CursorIconWatcherLinux.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using Immense.RemoteControl.Desktop.Shared.Abstractions;
using Immense.RemoteControl.Shared.Models;
using Remotely.Desktop.Shared.Abstractions;
using Remotely.Shared.Models;
using System.Drawing;

namespace Immense.RemoteControl.Desktop.Linux.Services;
namespace Remotely.Desktop.Linux.Services;

public class CursorIconWatcherLinux : ICursorIconWatcher
{
Expand Down
14 changes: 7 additions & 7 deletions Desktop.Linux/Services/FileTransferServiceLinux.cs
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
using Immense.RemoteControl.Desktop.Shared.Abstractions;
using Immense.RemoteControl.Desktop.Shared.Services;
using Immense.RemoteControl.Desktop.Shared.ViewModels;
using Remotely.Desktop.Shared.Abstractions;
using Remotely.Desktop.Shared.Services;
using Remotely.Desktop.Shared.ViewModels;
using Microsoft.Extensions.Logging;
using System.Collections.Concurrent;
using Immense.RemoteControl.Desktop.UI.Controls.Dialogs;
using Immense.RemoteControl.Desktop.UI.Views;
using Immense.RemoteControl.Desktop.UI.Services;
using Remotely.Desktop.UI.Controls.Dialogs;
using Remotely.Desktop.UI.Views;
using Remotely.Desktop.UI.Services;
using System.Threading;
using System.IO;

namespace Immense.RemoteControl.Desktop.Linux.Services;
namespace Remotely.Desktop.Linux.Services;

public class FileTransferServiceLinux : IFileTransferService
{
Expand Down
10 changes: 5 additions & 5 deletions Desktop.Linux/Services/KeyboardMouseInputLinux.cs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
using Immense.RemoteControl.Desktop.Shared.Abstractions;
using Immense.RemoteControl.Desktop.Shared.Enums;
using Immense.RemoteControl.Desktop.Shared.Native.Linux;
using Immense.RemoteControl.Desktop.Shared.Services;
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;

namespace Immense.RemoteControl.Desktop.Linux.Services;
namespace Remotely.Desktop.Linux.Services;

public class KeyboardMouseInputLinux : IKeyboardMouseInput
{
Expand Down
8 changes: 4 additions & 4 deletions Desktop.Linux/Services/ScreenCapturerLinux.cs
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
using Immense.RemoteControl.Desktop.Shared.Abstractions;
using Immense.RemoteControl.Desktop.Shared.Native.Linux;
using Immense.RemoteControl.Desktop.Shared.Services;
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;

namespace Immense.RemoteControl.Desktop.Linux.Services;
namespace Remotely.Desktop.Linux.Services;

public class ScreenCapturerLinux : IScreenCapturer
{
Expand Down
8 changes: 4 additions & 4 deletions Desktop.Linux/Services/ShutdownServiceLinux.cs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using Immense.RemoteControl.Desktop.Shared.Abstractions;
using Immense.RemoteControl.Desktop.Shared.Services;
using Remotely.Desktop.Shared.Abstractions;
using Remotely.Desktop.Shared.Services;
using Microsoft.Extensions.Logging;
using Immense.RemoteControl.Desktop.UI.Services;
using Remotely.Desktop.UI.Services;

namespace Immense.RemoteControl.Desktop.Linux.Services;
namespace Remotely.Desktop.Linux.Services;

public class ShutdownServiceLinux : IShutdownService
{
Expand Down
14 changes: 7 additions & 7 deletions Desktop.Linux/Startup/IServiceCollectionExtensions.cs
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
using Immense.RemoteControl.Desktop.Shared.Abstractions;
using Immense.RemoteControl.Desktop.Shared.Startup;
using Remotely.Desktop.Shared.Abstractions;
using Remotely.Desktop.Shared.Startup;
using Microsoft.Extensions.DependencyInjection;
using Immense.RemoteControl.Desktop.Linux.Services;
using Immense.RemoteControl.Desktop.UI.ViewModels;
using Immense.RemoteControl.Desktop.UI.Services;
using Immense.RemoteControl.Desktop.UI.Startup;
using Remotely.Desktop.Linux.Services;
using Remotely.Desktop.UI.ViewModels;
using Remotely.Desktop.UI.Services;
using Remotely.Desktop.UI.Startup;

namespace Immense.RemoteControl.Desktop.Linux.Startup;
namespace Remotely.Desktop.Linux.Startup;

public static class IServiceCollectionExtensions
{
Expand Down
2 changes: 1 addition & 1 deletion Desktop.Native/Linux/LibX11.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group.

using System.Runtime.InteropServices;

namespace Immense.RemoteControl.Desktop.Shared.Native.Linux;
namespace Remotely.Desktop.Shared.Native.Linux;

public static unsafe class LibX11
{
Expand Down
2 changes: 1 addition & 1 deletion Desktop.Native/Linux/LibXtst.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.Runtime.InteropServices;

namespace Immense.RemoteControl.Desktop.Shared.Native.Linux;
namespace Remotely.Desktop.Shared.Native.Linux;

public class LibXtst
{
Expand Down
2 changes: 1 addition & 1 deletion Desktop.Native/Linux/Libc.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.Runtime.InteropServices;

namespace Immense.RemoteControl.Desktop.Shared.Native.Linux;
namespace Remotely.Desktop.Shared.Native.Linux;

public class Libc
{
Expand Down
2 changes: 1 addition & 1 deletion Desktop.Native/Linux/libXrandr.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

using System.Runtime.InteropServices;

namespace Immense.RemoteControl.Desktop.Shared.Native.Linux;
namespace Remotely.Desktop.Shared.Native.Linux;

public static class LibXrandr
{
Expand Down
2 changes: 1 addition & 1 deletion Desktop.Native/Windows/ADVAPI32.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using System.Runtime.InteropServices;
using System.Security;

namespace Immense.RemoteControl.Desktop.Shared.Native.Windows;
namespace Remotely.Desktop.Shared.Native.Windows;

public static class ADVAPI32
{
Expand Down
2 changes: 1 addition & 1 deletion Desktop.Native/Windows/GDI32.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System;
using System.Runtime.InteropServices;

namespace Immense.RemoteControl.Desktop.Shared.Native.Windows;
namespace Remotely.Desktop.Shared.Native.Windows;

public static class GDI32
{
Expand Down
2 changes: 1 addition & 1 deletion Desktop.Native/Windows/Kernel32.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System;
using System.Runtime.InteropServices;

namespace Immense.RemoteControl.Desktop.Shared.Native.Windows;
namespace Remotely.Desktop.Shared.Native.Windows;

public static class Kernel32
{
Expand Down
2 changes: 1 addition & 1 deletion Desktop.Native/Windows/SECUR32.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Immense.RemoteControl.Desktop.Shared.Native.Windows;
using Remotely.Desktop.Shared.Native.Windows;
using Microsoft.Win32.SafeHandles;
using System;
using System.Runtime.InteropServices;
Expand Down
2 changes: 1 addition & 1 deletion Desktop.Native/Windows/Shlwapi.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.Runtime.InteropServices;

namespace Immense.RemoteControl.Desktop.Shared.Native.Windows;
namespace Remotely.Desktop.Shared.Native.Windows;

// https://docs.microsoft.com/en-us/windows/win32/api/shlwapi/nf-shlwapi-isos
public class Shlwapi
Expand Down
2 changes: 1 addition & 1 deletion Desktop.Native/Windows/User32.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Microsoft.Win32.SafeHandles;
using System.Runtime.InteropServices;

namespace Immense.RemoteControl.Desktop.Shared.Native.Windows;
namespace Remotely.Desktop.Shared.Native.Windows;

public static class User32
{
Expand Down
2 changes: 1 addition & 1 deletion Desktop.Native/Windows/WTSAPI32.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System;
using System.Runtime.InteropServices;

namespace Immense.RemoteControl.Desktop.Shared.Native.Windows;
namespace Remotely.Desktop.Shared.Native.Windows;

public static class WTSAPI32
{
Expand Down
8 changes: 4 additions & 4 deletions Desktop.Native/Windows/Win32Interop.cs
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
using Immense.RemoteControl.Shared.Models;
using Remotely.Shared.Models;
using System.Diagnostics;
using System.Diagnostics.CodeAnalysis;
using System.Runtime.InteropServices;
using System.Text;
using static Immense.RemoteControl.Desktop.Shared.Native.Windows.ADVAPI32;
using static Immense.RemoteControl.Desktop.Shared.Native.Windows.User32;
using static Remotely.Desktop.Shared.Native.Windows.ADVAPI32;
using static Remotely.Desktop.Shared.Native.Windows.User32;

namespace Immense.RemoteControl.Desktop.Shared.Native.Windows;
namespace Remotely.Desktop.Shared.Native.Windows;

// TODO: Use https://github.com/microsoft/CsWin32 for all p/invokes.
public class Win32Interop
Expand Down
2 changes: 1 addition & 1 deletion Desktop.Shared/Abstractions/IAppStartup.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Immense.RemoteControl.Desktop.Shared.Abstractions;
namespace Remotely.Desktop.Shared.Abstractions;

public interface IAppStartup
{
Expand Down
2 changes: 1 addition & 1 deletion Desktop.Shared/Abstractions/IAudioCapturer.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Immense.RemoteControl.Desktop.Shared.Abstractions;
namespace Remotely.Desktop.Shared.Abstractions;

public interface IAudioCapturer
{
Expand Down
4 changes: 2 additions & 2 deletions Desktop.Shared/Abstractions/IBrandingProvider.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Immense.RemoteControl.Shared.Models;
using Remotely.Shared.Models;
using Remotely.Shared.Entities;

namespace Immense.RemoteControl.Desktop.Shared.Abstractions;
namespace Remotely.Desktop.Shared.Abstractions;

public interface IBrandingProvider
{
Expand Down
2 changes: 1 addition & 1 deletion Desktop.Shared/Abstractions/IChatUiService.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Remotely.Shared.Models;

namespace Immense.RemoteControl.Desktop.Shared.Abstractions;
namespace Remotely.Desktop.Shared.Abstractions;

public interface IChatUiService
{
Expand Down
2 changes: 1 addition & 1 deletion Desktop.Shared/Abstractions/IClipboardService.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Immense.RemoteControl.Desktop.Shared.Abstractions;
namespace Remotely.Desktop.Shared.Abstractions;

public interface IClipboardService
{
Expand Down
4 changes: 2 additions & 2 deletions Desktop.Shared/Abstractions/ICursorIconWatcher.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Immense.RemoteControl.Shared.Models;
using Remotely.Shared.Models;

namespace Immense.RemoteControl.Desktop.Shared.Abstractions;
namespace Remotely.Desktop.Shared.Abstractions;

public interface ICursorIconWatcher
{
Expand Down
6 changes: 3 additions & 3 deletions Desktop.Shared/Abstractions/IFileTransferService.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Immense.RemoteControl.Desktop.Shared.Services;
using Immense.RemoteControl.Desktop.Shared.ViewModels;
using Remotely.Desktop.Shared.Services;
using Remotely.Desktop.Shared.ViewModels;

namespace Immense.RemoteControl.Desktop.Shared.Abstractions;
namespace Remotely.Desktop.Shared.Abstractions;

public interface IFileTransferService
{
Expand Down
6 changes: 3 additions & 3 deletions Desktop.Shared/Abstractions/IKeyboardMouseInput.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Immense.RemoteControl.Desktop.Shared.Enums;
using Immense.RemoteControl.Desktop.Shared.Services;
using Remotely.Desktop.Shared.Enums;
using Remotely.Desktop.Shared.Services;

namespace Immense.RemoteControl.Desktop.Shared.Abstractions;
namespace Remotely.Desktop.Shared.Abstractions;

public interface IKeyboardMouseInput
{
Expand Down
4 changes: 2 additions & 2 deletions Desktop.Shared/Abstractions/IRemoteControlAccessService.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Immense.RemoteControl.Shared.Enums;
using Remotely.Shared.Enums;

namespace Immense.RemoteControl.Desktop.Shared.Abstractions;
namespace Remotely.Desktop.Shared.Abstractions;

public interface IRemoteControlAccessService
{
Expand Down
2 changes: 1 addition & 1 deletion Desktop.Shared/Abstractions/IScreenCapturer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using SkiaSharp;
using System.Drawing;

namespace Immense.RemoteControl.Desktop.Shared.Abstractions;
namespace Remotely.Desktop.Shared.Abstractions;

public interface IScreenCapturer : IDisposable
{
Expand Down
Loading

0 comments on commit 81641af

Please sign in to comment.