diff --git a/Remotely.sln b/Remotely.sln index fbc1e0f5..e56a1109 100644 --- a/Remotely.sln +++ b/Remotely.sln @@ -1,7 +1,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27703.2000 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.28606.126 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Remotely_Agent", "Remotely_Agent\Remotely_Agent.csproj", "{98A8DF30-0993-4B49-822E-244A70AB8C4D}" ProjectSection(ProjectDependencies) = postProject diff --git a/Remotely_Agent/Program.cs b/Remotely_Agent/Program.cs index 42585536..66044bf0 100644 --- a/Remotely_Agent/Program.cs +++ b/Remotely_Agent/Program.cs @@ -44,14 +44,14 @@ namespace Remotely_Agent { #if DEBUG IsDebug = true; - ClientSocket.Connect(); + DeviceSocket.Connect(); #else ServiceBase.Run(new WindowsService()); #endif } else { - ClientSocket.Connect(); + DeviceSocket.Connect(); } while (true) diff --git a/Remotely_Agent/Resources/Remotely_ScreenCapture.exe b/Remotely_Agent/Resources/Remotely_ScreenCapture.exe index 2518b05f..5b458b50 100644 Binary files a/Remotely_Agent/Resources/Remotely_ScreenCapture.exe and b/Remotely_Agent/Resources/Remotely_ScreenCapture.exe differ diff --git a/Remotely_Agent/Services/ClientSocket.cs b/Remotely_Agent/Services/DeviceSocket.cs similarity index 99% rename from Remotely_Agent/Services/ClientSocket.cs rename to Remotely_Agent/Services/DeviceSocket.cs index b6fe3868..e64a3347 100644 --- a/Remotely_Agent/Services/ClientSocket.cs +++ b/Remotely_Agent/Services/DeviceSocket.cs @@ -18,7 +18,7 @@ using System.Reflection; namespace Remotely_Agent.Services { - public static class ClientSocket + public static class DeviceSocket { public static Timer HeartbeatTimer { get; private set; } public static bool IsServerVerified { get; set; } diff --git a/Remotely_Agent/Services/WindowsService.cs b/Remotely_Agent/Services/WindowsService.cs index 2b028ddc..46b8d918 100644 --- a/Remotely_Agent/Services/WindowsService.cs +++ b/Remotely_Agent/Services/WindowsService.cs @@ -29,7 +29,7 @@ namespace Remotely_Agent.Services var subkey = Microsoft.Win32.Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System", true); subkey.SetValue("SoftwareSASGeneration", "3", Microsoft.Win32.RegistryValueKind.DWord); } - ClientSocket.Connect(); + DeviceSocket.Connect(); } catch (Exception ex) { diff --git a/Remotely_Server/Pages/Error.cshtml.cs b/Remotely_Server/Pages/Error.cshtml.cs index 49e1dca8..f90e4114 100644 --- a/Remotely_Server/Pages/Error.cshtml.cs +++ b/Remotely_Server/Pages/Error.cshtml.cs @@ -11,6 +11,7 @@ using Microsoft.AspNetCore.Mvc.RazorPages; namespace Remotely_Server.Pages { + [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)] public class ErrorModel : PageModel { public ErrorModel(DataService dataService) @@ -23,7 +24,6 @@ namespace Remotely_Server.Pages private DataService DataService { get; } - [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)] public void OnGet() { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier; diff --git a/Remotely_Server/Services/RCDeviceSocketHub.cs b/Remotely_Server/Services/RCDeviceSocketHub.cs index 50490941..e2ad801e 100644 --- a/Remotely_Server/Services/RCDeviceSocketHub.cs +++ b/Remotely_Server/Services/RCDeviceSocketHub.cs @@ -103,10 +103,6 @@ namespace Remotely_Server.Services { await RCBrowserHub.Clients.Client(rcBrowserConnectionID).SendAsync("DesktopSwitchFailed"); } - public async Task GetIceConfiguration() - { - //await Clients.Caller.SendAsync("IceConfiguration", AppConfig.IceConfiguration); - } public async Task GetSessionID() { var random = new Random(); diff --git a/Remotely_Server/wwwroot/scripts/ResultsParser.js b/Remotely_Server/wwwroot/scripts/ResultsParser.js index 9aa7f403..ff7c571b 100644 --- a/Remotely_Server/wwwroot/scripts/ResultsParser.js +++ b/Remotely_Server/wwwroot/scripts/ResultsParser.js @@ -1,7 +1,7 @@ import * as DataGrid from "./DataGrid.js"; import { TabContentWrapper } from "./UI.js"; export function CreateCommandHarness(context) { - var collapseClass = context.TargetDeviceIDs.length > 1 ? "collapse" : "collapse in"; + var collapseClass = context.TargetDeviceIDs.length > 1 ? "collapse" : "collapse show"; var commandHarness = document.createElement("div"); commandHarness.id = context.ID; commandHarness.classList.add("command-harness"); @@ -23,7 +23,7 @@ export function AddPSCoreResultsHarness(result) { var deviceName = DataGrid.DataSource.find(x => x.ID == result.DeviceID).DeviceName; var resultsWrapper = document.getElementById(result.CommandContextID + "-results"); var totalDevices = parseInt(document.getElementById(result.CommandContextID + "-totaldevices").innerText); - var collapseClass = totalDevices > 1 ? "collapse" : "collapse in"; + var collapseClass = totalDevices > 1 ? "collapse" : "collapse show"; var resultDiv = document.createElement("div"); resultDiv.innerHTML = `