From 4cba2974a1d4b6955f275f1d32f730e822ade751 Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Sun, 16 Apr 2023 10:49:56 -0700 Subject: [PATCH] Fix unattended session in Linux. --- .gitignore | 2 ++ .vscode/launch.json | 24 +++++++++++++++++++ .vscode/tasks.json | 41 ++++++++++++++++++++++++++++++++ Desktop.Linux/Program.cs | 4 ++-- submodules/Immense.RemoteControl | 2 +- 5 files changed, 70 insertions(+), 3 deletions(-) create mode 100644 .vscode/launch.json create mode 100644 .vscode/tasks.json diff --git a/.gitignore b/.gitignore index d8b8da9a..7335d555 100644 --- a/.gitignore +++ b/.gitignore @@ -293,3 +293,5 @@ Server/.config/dotnet-tools.json Server.Installer/Properties/launchSettings.json .DS_Store /Server/wwwroot/Content/Linux-x64/Remotely_Desktop +!/.vscode/launch.json +!/.vscode/tasks.json \ No newline at end of file diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 00000000..e0a2830a --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,24 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "name": "Linux Desktop", + "type": "coreclr", + "request": "launch", + "preLaunchTask": "build", + "program": "${workspaceFolder}/Desktop.Linux/bin/Debug/net6.0/Remotely_Desktop.dll", + "args": [], + "cwd": "${workspaceFolder}/Desktop.Linux", + "console": "internalConsole", + "stopAtEntry": false + }, + { + "name": ".NET Core Attach", + "type": "coreclr", + "request": "attach" + } + ] +} \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 00000000..aecf4a76 --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,41 @@ +{ + "version": "2.0.0", + "tasks": [ + { + "label": "build", + "command": "dotnet", + "type": "process", + "args": [ + "build", + "${workspaceFolder}/Desktop.Linux/Desktop.Linux.csproj", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "publish", + "command": "dotnet", + "type": "process", + "args": [ + "publish", + "${workspaceFolder}/Desktop.Linux/Desktop.Linux.csproj", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "watch", + "command": "dotnet", + "type": "process", + "args": [ + "watch", + "run", + "--project", + "${workspaceFolder}/Desktop.Linux/Desktop.Linux.csproj" + ], + "problemMatcher": "$msCompile" + } + ] +} \ No newline at end of file diff --git a/Desktop.Linux/Program.cs b/Desktop.Linux/Program.cs index a4a931fa..44f6d1d0 100644 --- a/Desktop.Linux/Program.cs +++ b/Desktop.Linux/Program.cs @@ -2,7 +2,7 @@ using System.Threading.Tasks; using System.Threading; using System; -using Immense.RemoteControl.Desktop.Windows; +using Immense.RemoteControl.Desktop.Linux; using Remotely.Desktop.Shared.Services; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; @@ -14,7 +14,7 @@ using Immense.RemoteControl.Desktop.UI.Services; using Remotely.Shared; using System.Diagnostics; -var logger = new FileLogger("Remotely_Deskt", "Program.cs"); +var logger = new FileLogger("Remotely_Desktop", "Program.cs"); var filePath = Process.GetCurrentProcess()?.MainModule?.FileName; var serverUrl = Debugger.IsAttached ? "http://localhost:5000" : string.Empty; var getEmbeddedResult = await EmbeddedServerDataSearcher.Instance.TryGetEmbeddedData(filePath); diff --git a/submodules/Immense.RemoteControl b/submodules/Immense.RemoteControl index 7de47a5b..fcbcde90 160000 --- a/submodules/Immense.RemoteControl +++ b/submodules/Immense.RemoteControl @@ -1 +1 @@ -Subproject commit 7de47a5b2eb160ff24254bfb6aab4c504b818a99 +Subproject commit fcbcde9022dea18ab15ba468f2f3d1832f1a2b9e