Merge pull request #619 from immense/jaredg-617-fix-linux-desktop-client

Fix linux desktop client.

.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

.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"
+        }
+    ]
+}

.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"
+        }
+    ]
+}

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,9 +14,9 @@ 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 ? "https://localhost:5001" : string.Empty;
+var serverUrl = Debugger.IsAttached ? "http://localhost:5000" : string.Empty;
 var getEmbeddedResult = await EmbeddedServerDataSearcher.Instance.TryGetEmbeddedData(filePath);
 if (getEmbeddedResult.IsSuccess)
 {
@@ -40,7 +40,7 @@ var provider = await Startup.UseRemoteControlClient(
 #if DEBUG
             builder.SetMinimumLevel(LogLevel.Debug);
 #endif
-            builder.AddProvider(new FileLoggerProvider("Remotely_Deskt"));
+            builder.AddProvider(new FileLoggerProvider("Remotely_Desktop"));
         });
 
         services.AddSingleton<IOrganizationIdProvider, OrganizationIdProvider>();

Desktop.Win/Desktop.Win.csproj

@@ -18,7 +18,10 @@
     <Platforms>AnyCPU;x86;x64</Platforms>
     <StartupObject></StartupObject>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <ApplicationManifest>app.manifest</ApplicationManifest>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)'=='Release'">
+  	<ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

README.md

@@ -172,7 +172,6 @@ You can change database by changing `DBProvider` in `ApplicationOptions` to `SQL
     * libx11-dev
 	* libxrandr-dev
     * libc6-dev
-    * libgdiplus
     * libxtst-dev
     * xclip
 

Server/appsettings.Development.json

@@ -6,5 +6,35 @@
       "Microsoft": "Warning",
       "Microsoft.Hosting.Lifetime": "Information"
     }
+  },
+  "ApplicationOptions": {
+    "AllowApiLogin": false,
+    "BannedDevices": [],
+    "DataRetentionInDays": 90,
+    "DBProvider": "SQLite",
+    "EnableWindowsEventLog": false,
+    "EnforceAttendedAccess": false,
+    "ForceClientHttps": false,
+    "KnownProxies": [],
+    "MaxConcurrentUpdates": 10,
+    "MaxOrganizationCount": 1,
+    "MessageOfTheDay": "",
+    "RedirectToHttps": true,
+    "RemoteControlNotifyUser": true,
+    "RemoteControlRequiresAuthentication": false,
+    "RemoteControlSessionLimit": 3,
+    "Require2FA": false,
+    "SmtpDisplayName": "",
+    "SmtpEmail": "",
+    "SmtpHost": "",
+    "SmtpLocalDomain": "",
+    "SmtpCheckCertificateRevocation": true,
+    "SmtpPassword": "",
+    "SmtpPort": 587,
+    "SmtpUserName": "",
+    "Theme": "Dark",
+    "TrustedCorsOrigins": [],
+    "UseHsts": false,
+    "UseHttpLogging": false
   }
 }

Server/wwwroot/Content/Install-MacOS-arm64.sh

@@ -44,9 +44,6 @@ su - $Owner -c "brew update"
 # Install .NET Runtime
 su - $Owner -c "brew install --cask dotnet"
 
-# Install dependency for System.Drawing.Common
-su - $Owner -c "brew install mono-libgdiplus"
-
 # Install other dependencies
 su - $Owner -c "brew install curl"
 su - $Owner -c "brew install jq"

Server/wwwroot/Content/Install-MacOS-x64.sh

@@ -44,9 +44,6 @@ su - $Owner -c "brew update"
 # Install .NET Runtime
 su - $Owner -c "brew install --cask dotnet"
 
-# Install dependency for System.Drawing.Common
-su - $Owner -c "brew install mono-libgdiplus"
-
 # Install other dependencies
 su - $Owner -c "brew install curl"
 su - $Owner -c "brew install jq"

submodules/Immense.RemoteControl

@@ -1 +1 @@
-Subproject commit a2b9a545671c05ad156404ca82879c9de0f0c0f8
+Subproject commit 345c43e03dc8e32cb0d3519a9767dd654ad420ba