Fix namespace-folder match.

immense · Aug 17, 2023 · 1628af6 · 1628af6
1 parent 2cb8196
commit 1628af6
Show file tree

Hide file tree

Showing 12 changed files with 20 additions and 22 deletions.
diff --git a/Agent/Services/AgentHubConnection.cs b/Agent/Services/AgentHubConnection.cs
@@ -9,7 +9,6 @@
 using Remotely.Shared.Enums;
 using Remotely.Shared.Interfaces;
 using Remotely.Shared.Models;
-using Remotely.Shared.Services;
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;

diff --git a/Agent/Services/FileLogsManager.cs b/Agent/Services/FileLogsManager.cs
@@ -1,4 +1,5 @@
 using Microsoft.Extensions.Logging;
+using Remotely.Shared.Services;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -9,7 +10,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Remotely.Shared.Services;
+namespace Remotely.Agent.Services;
 
 public interface IFileLogsManager
 {

diff --git a/Desktop.Linux/Program.cs b/Desktop.Linux/Program.cs
@@ -2,7 +2,6 @@
 using System.Threading.Tasks;
 using System.Threading;
 using System;
-using Remotely.Desktop.Shared.Services;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Remotely.Shared.Services;
@@ -15,6 +14,7 @@
 using Immense.RemoteControl.Desktop.UI.Services;
 using Avalonia;
 using Immense.RemoteControl.Desktop.UI;
+using Desktop.Shared.Services;
 
 public class Program
 {

diff --git a/Desktop.Shared/Services/BrandingProvider.cs b/Desktop.Shared/Services/BrandingProvider.cs
@@ -18,7 +18,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Remotely.Desktop.Shared.Services;
+namespace Desktop.Shared.Services;
 
 public class BrandingProvider : IBrandingProvider
 {
@@ -32,8 +32,8 @@ public class BrandingProvider : IBrandingProvider
     };
 
     public BrandingProvider(
-        IAppState appState, 
-        IOrganizationIdProvider orgIdProvider, 
+        IAppState appState,
+        IOrganizationIdProvider orgIdProvider,
         IEmbeddedServerDataSearcher embeddedServerDataSearcher,
         ILogger<BrandingProvider> logger)
     {

diff --git a/Desktop.Shared/Services/OrganizationIdProvider.cs b/Desktop.Shared/Services/OrganizationIdProvider.cs
@@ -1,5 +1,4 @@
-
-namespace Remotely.Desktop.Shared.Services;
+namespace Desktop.Shared.Services;
 
 public interface IOrganizationIdProvider
 {

diff --git a/Desktop.Win/Program.cs b/Desktop.Win/Program.cs
@@ -1,7 +1,6 @@
 using System.Threading.Tasks;
 using System.Threading;
 using System;
-using Remotely.Desktop.Shared.Services;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Remotely.Shared.Services;
@@ -14,6 +13,7 @@
 using Immense.RemoteControl.Desktop.UI.Services;
 using Avalonia;
 using Immense.RemoteControl.Desktop.UI;
+using Desktop.Shared.Services;
 
 public class Program
 {

diff --git a/Tests/Server.Tests/AgentHubTests.cs b/Tests/Server.Tests/AgentHubTests.cs
@@ -14,7 +14,6 @@
 using System.Threading.Tasks;
 using Remotely.Shared.Interfaces;
 using Immense.SimpleMessenger;
-using Remotely.Tests;
 
 namespace Remotely.Server.Tests;
 

diff --git a/Tests/Server.Tests/CircuitConnectionTests.cs b/Tests/Server.Tests/CircuitConnectionTests.cs
@@ -11,7 +11,6 @@
 using Remotely.Server.Tests.Mocks;
 using Remotely.Shared.Extensions;
 using Remotely.Shared.Interfaces;
-using Remotely.Tests;
 using System.Threading.Tasks;
 
 namespace Remotely.Server.Tests;

diff --git a/Tests/Server.Tests/DataServiceTests.cs b/Tests/Server.Tests/DataServiceTests.cs
@@ -4,14 +4,15 @@
 using Remotely.Server.Services;
 using Remotely.Shared.Dtos;
 using Remotely.Shared.Entities;
+using Remotely.Shared.Enums;
 using Remotely.Shared.Models;
 using Remotely.Shared.Utilities;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace Remotely.Tests;
+namespace Remotely.Server.Tests;
 
 [TestClass]
 public class DataServiceTests
@@ -132,15 +133,15 @@ public async Task GetPendingScriptRuns_GivenMultipleRunsQueued_ReturnsOnlyLatest
             Name = "GCI",
             Organization = _testData.Org1Admin1.Organization,
             OrganizationID = _testData.Org1Id,
-            Shell = Shared.Enums.ScriptingShell.PSCore
+            Shell = ScriptingShell.PSCore
         };
 
         await _dataService.AddOrUpdateSavedScript(savedScript, _testData.Org1Admin1.Id);
 
         var scriptRun = new ScriptRun()
         {
             Devices = new() { _testData.Org1Device1 },
-            InputType = Shared.Enums.ScriptInputType.ScheduledScript,
+            InputType = ScriptInputType.ScheduledScript,
             SavedScriptId = savedScript.Id,
             Initiator = _testData.Org1Admin1.UserName,
             RunAt = now,
@@ -166,10 +167,10 @@ public async Task GetPendingScriptRuns_GivenMultipleRunsQueued_ReturnsOnlyLatest
         var dto = new ScriptResultDto()
         {
             DeviceID = _testData.Org1Device1.ID,
-            InputType = Shared.Enums.ScriptInputType.ScheduledScript,
+            InputType = ScriptInputType.ScheduledScript,
             SavedScriptId = savedScript.Id,
             ScriptRunId = scriptRun.Id,
-            Shell = Shared.Enums.ScriptingShell.PSCore,
+            Shell = ScriptingShell.PSCore,
             ScriptInput = "echo test"
         };
 

diff --git a/Tests/Server.Tests/IoCActivator.cs b/Tests/Server.Tests/IoCActivator.cs
@@ -16,7 +16,7 @@
 using System.Collections.Generic;
 using System.Configuration;
 
-namespace Remotely.Tests;
+namespace Remotely.Server.Tests;
 
 [TestClass]
 public class IoCActivator

diff --git a/Tests/Server.Tests/ScriptScheduleDispatcherTests.cs b/Tests/Server.Tests/ScriptScheduleDispatcherTests.cs
@@ -14,7 +14,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Remotely.Tests;
+namespace Remotely.Server.Tests;
 
 [TestClass]
 public class ScriptScheduleDispatcherTests
@@ -68,7 +68,7 @@ public async Task Init()
         };
 
         var scriptSchedules = new List<ScriptSchedule>()
-        { 
+        {
             _schedule1
         };
 
@@ -108,9 +108,9 @@ public async Task DispatchPendingScriptRuns_GivenSchedulesDue_CreatesScriptRuns(
 
         _dataService.Verify(x => x.GetScriptSchedulesDue(), Times.Once);
         _dataService.Verify(x => x.AddOrUpdateScriptSchedule(_schedule1), Times.Once);
-        _dataService.Verify(x => x.GetDevices(It.Is<IEnumerable<string>>(x => 
+        _dataService.Verify(x => x.GetDevices(It.Is<IEnumerable<string>>(x =>
             x.Contains(_schedule1.Devices.First().ID))));
-        _dataService.Verify(x => x.AddScriptRun(It.Is<ScriptRun>(x => 
+        _dataService.Verify(x => x.AddScriptRun(It.Is<ScriptRun>(x =>
             x.ScheduleId == _schedule1.Id &&
             x.Devices!.Exists(d => d.ID == _testData.Org1Device1.ID) &&
             x.Devices!.Exists(d => d.ID == _testData.Org1Device2.ID))));

diff --git a/Tests/Server.Tests/TestData.cs b/Tests/Server.Tests/TestData.cs
@@ -13,7 +13,7 @@
 using System.Net.Http;
 using System.Threading.Tasks;
 
-namespace Remotely.Tests;
+namespace Remotely.Server.Tests;
 
 public class TestData
 {