diff --git a/.vscode/launch.json b/.vscode/launch.json index e0a2830a..2a1d2b81 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -9,7 +9,7 @@ "type": "coreclr", "request": "launch", "preLaunchTask": "build", - "program": "${workspaceFolder}/Desktop.Linux/bin/Debug/net6.0/Remotely_Desktop.dll", + "program": "${workspaceFolder}/Desktop.Linux/bin/Debug/.net7.0/Remotely_Desktop.dll", "args": [], "cwd": "${workspaceFolder}/Desktop.Linux", "console": "internalConsole", diff --git a/Agent/Agent.csproj b/Agent/Agent.csproj index a500508b..9bf238e5 100644 --- a/Agent/Agent.csproj +++ b/Agent/Agent.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 true false Copyright © 2023 Immense Networks diff --git a/Desktop.Core/Desktop.Core.csproj b/Desktop.Core/Desktop.Core.csproj index 2bfba0f6..8f3b3bf0 100644 --- a/Desktop.Core/Desktop.Core.csproj +++ b/Desktop.Core/Desktop.Core.csproj @@ -1,7 +1,7 @@  - net6.0 + .net7.0 Remotely.Desktop.Core Remotely_Desktop.Core AnyCPU;x64;x86 diff --git a/Desktop.Linux/Desktop.Linux.csproj b/Desktop.Linux/Desktop.Linux.csproj index b0c39af3..4bf8414a 100644 --- a/Desktop.Linux/Desktop.Linux.csproj +++ b/Desktop.Linux/Desktop.Linux.csproj @@ -1,7 +1,7 @@  Exe - net6.0 + net7.0 Assets\favicon.ico Remotely_Desktop Remotely.Desktop.XPlat @@ -55,13 +55,8 @@ - - - - - + - - + diff --git a/Desktop.Linux/Program.cs b/Desktop.Linux/Program.cs index 83dd8fe0..b0cdd989 100644 --- a/Desktop.Linux/Program.cs +++ b/Desktop.Linux/Program.cs @@ -7,9 +7,9 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Remotely.Shared.Services; using Immense.RemoteControl.Desktop.Shared.Services; -using Immense.RemoteControl.Desktop.UI.Services; +using Immense.RemoteControl.Desktop.Services; using System.Diagnostics; -using Immense.RemoteControl.Desktop.Linux.Startup; +using Immense.RemoteControl.Desktop.Startup; using Remotely.Shared.Utilities; var version = typeof(Program).Assembly.GetName().Version?.ToString() ?? "0.0.0"; diff --git a/Desktop.Linux/Properties/PublishProfiles/desktop-linux-x64.pubxml b/Desktop.Linux/Properties/PublishProfiles/desktop-linux-x64.pubxml index 572afed5..16aadded 100644 --- a/Desktop.Linux/Properties/PublishProfiles/desktop-linux-x64.pubxml +++ b/Desktop.Linux/Properties/PublishProfiles/desktop-linux-x64.pubxml @@ -7,7 +7,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. FileSystem Release x64 - net6.0 + .net7.0 ..\Server\wwwroot\Content\Linux-x64\ linux-x64 true diff --git a/Desktop.Linux/Properties/PublishProfiles/packaged-linux-x64.pubxml b/Desktop.Linux/Properties/PublishProfiles/packaged-linux-x64.pubxml index e8a2f15d..6e054f37 100644 --- a/Desktop.Linux/Properties/PublishProfiles/packaged-linux-x64.pubxml +++ b/Desktop.Linux/Properties/PublishProfiles/packaged-linux-x64.pubxml @@ -7,8 +7,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121. FileSystem Release x64 - net6.0 - ..\Agent\bin\Release\net6.0\linux-x64\publish\Desktop + .net7.0 + ..\Agent\bin\Release\.net7.0\linux-x64\publish\Desktop linux-x64 true False diff --git a/Desktop.Shared/Desktop.Shared.csproj b/Desktop.Shared/Desktop.Shared.csproj index 0cdf6605..bfa7dc83 100644 --- a/Desktop.Shared/Desktop.Shared.csproj +++ b/Desktop.Shared/Desktop.Shared.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 enable enable diff --git a/Desktop.Win/Desktop.Win.csproj b/Desktop.Win/Desktop.Win.csproj index bd7058a5..595b2e84 100644 --- a/Desktop.Win/Desktop.Win.csproj +++ b/Desktop.Win/Desktop.Win.csproj @@ -2,7 +2,7 @@ WinExe - net6.0-windows + net7.0-windows true true Remotely_Desktop @@ -60,7 +60,7 @@ - + \ No newline at end of file diff --git a/Desktop.Win/Program.cs b/Desktop.Win/Program.cs index e89c7451..e09e4e1d 100644 --- a/Desktop.Win/Program.cs +++ b/Desktop.Win/Program.cs @@ -12,6 +12,7 @@ using Immense.RemoteControl.Desktop.Shared.Services; using System.Diagnostics; using Remotely.Shared.Utilities; using Immense.RemoteControl.Desktop.Windows.Startup; +using Immense.RemoteControl.Desktop.Shared.Startup; var version = typeof(Program).Assembly.GetName().Version?.ToString() ?? "0.0.0"; var logger = new FileLogger("Remotely_Desktop", version, "Program.cs"); @@ -62,7 +63,7 @@ if (appState.ArgDict.TryGetValue("org-id", out var orgId)) orgIdProvider.OrganizationId = orgId; } -var result = await provider.UseRemoteControlClientWindows(args, serverUrl); +var result = await provider.UseRemoteControlClient(args, serverUrl); if (!result.IsSuccess) { diff --git a/Desktop.Win/Properties/PublishProfiles/desktop-win-x64.pubxml b/Desktop.Win/Properties/PublishProfiles/desktop-win-x64.pubxml index b4237aee..e3b9d3e3 100644 --- a/Desktop.Win/Properties/PublishProfiles/desktop-win-x64.pubxml +++ b/Desktop.Win/Properties/PublishProfiles/desktop-win-x64.pubxml @@ -7,7 +7,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. FileSystem Release x64 - net6.0-windows + .net7.0-windows ..\Server\wwwroot\Content\Win-x64\ win10-x64 true diff --git a/Desktop.Win/Properties/PublishProfiles/desktop-win-x86.pubxml b/Desktop.Win/Properties/PublishProfiles/desktop-win-x86.pubxml index 8c6641ae..84a4bd17 100644 --- a/Desktop.Win/Properties/PublishProfiles/desktop-win-x86.pubxml +++ b/Desktop.Win/Properties/PublishProfiles/desktop-win-x86.pubxml @@ -7,7 +7,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. FileSystem Release x86 - net6.0-windows + .net7.0-windows ..\Server\wwwroot\Content\Win-x86\ win10-x86 true diff --git a/Desktop.Win/Properties/PublishProfiles/install-folder.pubxml b/Desktop.Win/Properties/PublishProfiles/install-folder.pubxml index e21b2ae4..9b50279e 100644 --- a/Desktop.Win/Properties/PublishProfiles/install-folder.pubxml +++ b/Desktop.Win/Properties/PublishProfiles/install-folder.pubxml @@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. x64 C:\Program Files\Remotely\Desktop FileSystem - net6.0-windows + .net7.0-windows win-x64 true False diff --git a/Desktop.Win/Properties/PublishProfiles/packaged-win-x64-debug.pubxml b/Desktop.Win/Properties/PublishProfiles/packaged-win-x64-debug.pubxml index f246fa55..ff6e08bf 100644 --- a/Desktop.Win/Properties/PublishProfiles/packaged-win-x64-debug.pubxml +++ b/Desktop.Win/Properties/PublishProfiles/packaged-win-x64-debug.pubxml @@ -7,8 +7,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121. FileSystem Debug x64 - net6.0-windows - ..\Agent\bin\Release\net6.0\win10-x64\publish\Desktop + .net7.0-windows + ..\Agent\bin\Release\.net7.0\win10-x64\publish\Desktop true win10-x64 True diff --git a/Desktop.Win/Properties/PublishProfiles/packaged-win-x64.pubxml b/Desktop.Win/Properties/PublishProfiles/packaged-win-x64.pubxml index 5213808e..86b0d964 100644 --- a/Desktop.Win/Properties/PublishProfiles/packaged-win-x64.pubxml +++ b/Desktop.Win/Properties/PublishProfiles/packaged-win-x64.pubxml @@ -7,8 +7,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121. FileSystem Release x64 - net6.0-windows - ..\Agent\bin\Release\net6.0\win10-x64\publish\Desktop + .net7.0-windows + ..\Agent\bin\Release\.net7.0\win10-x64\publish\Desktop true win10-x64 False diff --git a/Desktop.Win/Properties/PublishProfiles/packaged-win-x86.pubxml b/Desktop.Win/Properties/PublishProfiles/packaged-win-x86.pubxml index 7c1e7c2f..85142335 100644 --- a/Desktop.Win/Properties/PublishProfiles/packaged-win-x86.pubxml +++ b/Desktop.Win/Properties/PublishProfiles/packaged-win-x86.pubxml @@ -7,8 +7,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121. FileSystem Release x86 - net6.0-windows - ..\Agent\bin\Release\net6.0\win10-x86\publish\Desktop + .net7.0-windows + ..\Agent\bin\Release\.net7.0\win10-x86\publish\Desktop win10-x86 true False diff --git a/Desktop.Win/Properties/PublishProfiles/wrapper-x64.pubxml b/Desktop.Win/Properties/PublishProfiles/wrapper-x64.pubxml index 5b47fe8c..f810efbb 100644 --- a/Desktop.Win/Properties/PublishProfiles/wrapper-x64.pubxml +++ b/Desktop.Win/Properties/PublishProfiles/wrapper-x64.pubxml @@ -7,7 +7,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. FileSystem Release x64 - net6.0-windows + .net7.0-windows bin\Release\win-x64\publish\ true win10-x64 diff --git a/Desktop.Win/Properties/PublishProfiles/wrapper-x86.pubxml b/Desktop.Win/Properties/PublishProfiles/wrapper-x86.pubxml index 63544b57..351581e2 100644 --- a/Desktop.Win/Properties/PublishProfiles/wrapper-x86.pubxml +++ b/Desktop.Win/Properties/PublishProfiles/wrapper-x86.pubxml @@ -7,7 +7,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. FileSystem Release x86 - net6.0-windows + .net7.0-windows bin\Release\win-x86\publish\ true win10-x86 diff --git a/Remotely.sln b/Remotely.sln index 0c395f76..edbdd454 100644 --- a/Remotely.sln +++ b/Remotely.sln @@ -61,14 +61,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docker", "Docker", "{963B55 .docker\DockerMain.sh = .docker\DockerMain.sh EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Immense.RemoteControl.Desktop.Linux", "submodules\Immense.RemoteControl\Immense.RemoteControl.Desktop.Linux\Immense.RemoteControl.Desktop.Linux.csproj", "{9E082AD4-AD3F-4C74-9787-F02FD7C064CA}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Immense.RemoteControl.Desktop.Mac", "submodules\Immense.RemoteControl\Immense.RemoteControl.Desktop.Mac\Immense.RemoteControl.Desktop.Mac.csproj", "{8013BDF2-BEBF-4CEF-AB64-6818224AFCAF}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Immense.RemoteControl.Desktop.Shared", "submodules\Immense.RemoteControl\Immense.RemoteControl.Desktop.Shared\Immense.RemoteControl.Desktop.Shared.csproj", "{3EB48B01-A672-4658-868B-8CA21FF73929}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Immense.RemoteControl.Desktop.UI", "submodules\Immense.RemoteControl\Immense.RemoteControl.Desktop.UI\Immense.RemoteControl.Desktop.UI.csproj", "{15E77F4B-1D80-476E-B2A2-3E88B4F98828}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Immense.RemoteControl.Desktop.UI.WPF", "submodules\Immense.RemoteControl\Immense.RemoteControl.Desktop.UI.WPF\Immense.RemoteControl.Desktop.UI.WPF.csproj", "{A6C36B1F-A5EA-4C9C-88E2-FAA05CE89D78}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Immense.RemoteControl.Desktop.Windows", "submodules\Immense.RemoteControl\Immense.RemoteControl.Desktop.Windows\Immense.RemoteControl.Desktop.Windows.csproj", "{7FA4456D-8695-4990-B20A-B897CF9DF0EF}" @@ -77,6 +71,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Immense.RemoteControl.Serve EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Immense.RemoteControl.Shared", "submodules\Immense.RemoteControl\Immense.RemoteControl.Shared\Immense.RemoteControl.Shared.csproj", "{FEF0D431-EB2F-4C08-A125-8DF59AFDA525}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Immense.RemoteControl.Desktop", "..\immybot\submodules\RemoteControl\Immense.RemoteControl.Desktop\Immense.RemoteControl.Desktop.csproj", "{605F98CC-D1DE-4B34-B42D-5738EC4CB0D9}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -207,30 +203,6 @@ Global {38099844-F6B6-4975-BEC5-D58A547145F0}.Release|x64.Build.0 = Release|Any CPU {38099844-F6B6-4975-BEC5-D58A547145F0}.Release|x86.ActiveCfg = Release|Any CPU {38099844-F6B6-4975-BEC5-D58A547145F0}.Release|x86.Build.0 = Release|Any CPU - {9E082AD4-AD3F-4C74-9787-F02FD7C064CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9E082AD4-AD3F-4C74-9787-F02FD7C064CA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9E082AD4-AD3F-4C74-9787-F02FD7C064CA}.Debug|x64.ActiveCfg = Debug|Any CPU - {9E082AD4-AD3F-4C74-9787-F02FD7C064CA}.Debug|x64.Build.0 = Debug|Any CPU - {9E082AD4-AD3F-4C74-9787-F02FD7C064CA}.Debug|x86.ActiveCfg = Debug|Any CPU - {9E082AD4-AD3F-4C74-9787-F02FD7C064CA}.Debug|x86.Build.0 = Debug|Any CPU - {9E082AD4-AD3F-4C74-9787-F02FD7C064CA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9E082AD4-AD3F-4C74-9787-F02FD7C064CA}.Release|Any CPU.Build.0 = Release|Any CPU - {9E082AD4-AD3F-4C74-9787-F02FD7C064CA}.Release|x64.ActiveCfg = Release|Any CPU - {9E082AD4-AD3F-4C74-9787-F02FD7C064CA}.Release|x64.Build.0 = Release|Any CPU - {9E082AD4-AD3F-4C74-9787-F02FD7C064CA}.Release|x86.ActiveCfg = Release|Any CPU - {9E082AD4-AD3F-4C74-9787-F02FD7C064CA}.Release|x86.Build.0 = Release|Any CPU - {8013BDF2-BEBF-4CEF-AB64-6818224AFCAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8013BDF2-BEBF-4CEF-AB64-6818224AFCAF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8013BDF2-BEBF-4CEF-AB64-6818224AFCAF}.Debug|x64.ActiveCfg = Debug|Any CPU - {8013BDF2-BEBF-4CEF-AB64-6818224AFCAF}.Debug|x64.Build.0 = Debug|Any CPU - {8013BDF2-BEBF-4CEF-AB64-6818224AFCAF}.Debug|x86.ActiveCfg = Debug|Any CPU - {8013BDF2-BEBF-4CEF-AB64-6818224AFCAF}.Debug|x86.Build.0 = Debug|Any CPU - {8013BDF2-BEBF-4CEF-AB64-6818224AFCAF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8013BDF2-BEBF-4CEF-AB64-6818224AFCAF}.Release|Any CPU.Build.0 = Release|Any CPU - {8013BDF2-BEBF-4CEF-AB64-6818224AFCAF}.Release|x64.ActiveCfg = Release|Any CPU - {8013BDF2-BEBF-4CEF-AB64-6818224AFCAF}.Release|x64.Build.0 = Release|Any CPU - {8013BDF2-BEBF-4CEF-AB64-6818224AFCAF}.Release|x86.ActiveCfg = Release|Any CPU - {8013BDF2-BEBF-4CEF-AB64-6818224AFCAF}.Release|x86.Build.0 = Release|Any CPU {3EB48B01-A672-4658-868B-8CA21FF73929}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3EB48B01-A672-4658-868B-8CA21FF73929}.Debug|Any CPU.Build.0 = Debug|Any CPU {3EB48B01-A672-4658-868B-8CA21FF73929}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -243,18 +215,6 @@ Global {3EB48B01-A672-4658-868B-8CA21FF73929}.Release|x64.Build.0 = Release|Any CPU {3EB48B01-A672-4658-868B-8CA21FF73929}.Release|x86.ActiveCfg = Release|Any CPU {3EB48B01-A672-4658-868B-8CA21FF73929}.Release|x86.Build.0 = Release|Any CPU - {15E77F4B-1D80-476E-B2A2-3E88B4F98828}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {15E77F4B-1D80-476E-B2A2-3E88B4F98828}.Debug|Any CPU.Build.0 = Debug|Any CPU - {15E77F4B-1D80-476E-B2A2-3E88B4F98828}.Debug|x64.ActiveCfg = Debug|Any CPU - {15E77F4B-1D80-476E-B2A2-3E88B4F98828}.Debug|x64.Build.0 = Debug|Any CPU - {15E77F4B-1D80-476E-B2A2-3E88B4F98828}.Debug|x86.ActiveCfg = Debug|Any CPU - {15E77F4B-1D80-476E-B2A2-3E88B4F98828}.Debug|x86.Build.0 = Debug|Any CPU - {15E77F4B-1D80-476E-B2A2-3E88B4F98828}.Release|Any CPU.ActiveCfg = Release|Any CPU - {15E77F4B-1D80-476E-B2A2-3E88B4F98828}.Release|Any CPU.Build.0 = Release|Any CPU - {15E77F4B-1D80-476E-B2A2-3E88B4F98828}.Release|x64.ActiveCfg = Release|Any CPU - {15E77F4B-1D80-476E-B2A2-3E88B4F98828}.Release|x64.Build.0 = Release|Any CPU - {15E77F4B-1D80-476E-B2A2-3E88B4F98828}.Release|x86.ActiveCfg = Release|Any CPU - {15E77F4B-1D80-476E-B2A2-3E88B4F98828}.Release|x86.Build.0 = Release|Any CPU {A6C36B1F-A5EA-4C9C-88E2-FAA05CE89D78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A6C36B1F-A5EA-4C9C-88E2-FAA05CE89D78}.Debug|Any CPU.Build.0 = Debug|Any CPU {A6C36B1F-A5EA-4C9C-88E2-FAA05CE89D78}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -303,6 +263,18 @@ Global {FEF0D431-EB2F-4C08-A125-8DF59AFDA525}.Release|x64.Build.0 = Release|Any CPU {FEF0D431-EB2F-4C08-A125-8DF59AFDA525}.Release|x86.ActiveCfg = Release|Any CPU {FEF0D431-EB2F-4C08-A125-8DF59AFDA525}.Release|x86.Build.0 = Release|Any CPU + {605F98CC-D1DE-4B34-B42D-5738EC4CB0D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {605F98CC-D1DE-4B34-B42D-5738EC4CB0D9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {605F98CC-D1DE-4B34-B42D-5738EC4CB0D9}.Debug|x64.ActiveCfg = Debug|Any CPU + {605F98CC-D1DE-4B34-B42D-5738EC4CB0D9}.Debug|x64.Build.0 = Debug|Any CPU + {605F98CC-D1DE-4B34-B42D-5738EC4CB0D9}.Debug|x86.ActiveCfg = Debug|Any CPU + {605F98CC-D1DE-4B34-B42D-5738EC4CB0D9}.Debug|x86.Build.0 = Debug|Any CPU + {605F98CC-D1DE-4B34-B42D-5738EC4CB0D9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {605F98CC-D1DE-4B34-B42D-5738EC4CB0D9}.Release|Any CPU.Build.0 = Release|Any CPU + {605F98CC-D1DE-4B34-B42D-5738EC4CB0D9}.Release|x64.ActiveCfg = Release|Any CPU + {605F98CC-D1DE-4B34-B42D-5738EC4CB0D9}.Release|x64.Build.0 = Release|Any CPU + {605F98CC-D1DE-4B34-B42D-5738EC4CB0D9}.Release|x86.ActiveCfg = Release|Any CPU + {605F98CC-D1DE-4B34-B42D-5738EC4CB0D9}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -312,14 +284,12 @@ Global {6C25240C-613D-4A86-A04E-784BA6726094} = {0754E195-7080-4AAC-B5A3-A9923B1283CE} {B6C1030D-1F74-4143-BB70-FC79C0274653} = {0754E195-7080-4AAC-B5A3-A9923B1283CE} {963B5555-30AE-428E-9686-59C4B6FEC052} = {2176596E-12DA-4766-96E1-4D23EA7DBEC8} - {9E082AD4-AD3F-4C74-9787-F02FD7C064CA} = {48C738FB-359E-43DB-B338-FD7CB1CCF6A8} - {8013BDF2-BEBF-4CEF-AB64-6818224AFCAF} = {48C738FB-359E-43DB-B338-FD7CB1CCF6A8} {3EB48B01-A672-4658-868B-8CA21FF73929} = {48C738FB-359E-43DB-B338-FD7CB1CCF6A8} - {15E77F4B-1D80-476E-B2A2-3E88B4F98828} = {48C738FB-359E-43DB-B338-FD7CB1CCF6A8} {A6C36B1F-A5EA-4C9C-88E2-FAA05CE89D78} = {48C738FB-359E-43DB-B338-FD7CB1CCF6A8} {7FA4456D-8695-4990-B20A-B897CF9DF0EF} = {48C738FB-359E-43DB-B338-FD7CB1CCF6A8} {8CBED18D-64A8-44C0-8433-EE14E93B472A} = {48C738FB-359E-43DB-B338-FD7CB1CCF6A8} {FEF0D431-EB2F-4C08-A125-8DF59AFDA525} = {48C738FB-359E-43DB-B338-FD7CB1CCF6A8} + {605F98CC-D1DE-4B34-B42D-5738EC4CB0D9} = {48C738FB-359E-43DB-B338-FD7CB1CCF6A8} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {EAE10B28-119B-437C-9E68-06F0EE3F968A} diff --git a/Server/Server.csproj b/Server/Server.csproj index f72bcdcb..83a16529 100644 --- a/Server/Server.csproj +++ b/Server/Server.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 aspnet-Server-F297B939-4A64-4B42-8C70-E142EBDAA131 Linux remotely @@ -28,7 +28,6 @@ - diff --git a/Shared/Shared.csproj b/Shared/Shared.csproj index 44a4a07c..6704b562 100644 --- a/Shared/Shared.csproj +++ b/Shared/Shared.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 true Remotely_Shared AnyCPU;x64;x86 diff --git a/Tests/Desktop.Win.Tests/Desktop.Win.Tests.csproj b/Tests/Desktop.Win.Tests/Desktop.Win.Tests.csproj index 1d1f7d79..46280706 100644 --- a/Tests/Desktop.Win.Tests/Desktop.Win.Tests.csproj +++ b/Tests/Desktop.Win.Tests/Desktop.Win.Tests.csproj @@ -1,7 +1,7 @@  - net6.0-windows + .net7.0-windows enable enable diff --git a/Tests/LoadTester/LoadTester.csproj b/Tests/LoadTester/LoadTester.csproj index e4b1cc9f..24d910e5 100644 --- a/Tests/LoadTester/LoadTester.csproj +++ b/Tests/LoadTester/LoadTester.csproj @@ -2,15 +2,11 @@ Exe - net6.0-windows + net7.0-windows Remotely.Tests.LoadTester Remotely.Tests.LoadTester - - - - diff --git a/Tests/Server.Tests/AgentHubTests.cs b/Tests/Server.Tests/AgentHubTests.cs index 16d0efad..7936511d 100644 --- a/Tests/Server.Tests/AgentHubTests.cs +++ b/Tests/Server.Tests/AgentHubTests.cs @@ -45,7 +45,7 @@ namespace Remotely.Tests var hub = new AgentHub(DataService, appConfig.Object, serviceSessionCache.Object, viewerHub.Object, circuitManager.Object, expiringTokenService.Object); var hubClients = new Mock(); - var caller = new Mock(); + var caller = new Mock(); hubClients.Setup(x => x.Caller).Returns(caller.Object); hub.Clients = hubClients.Object; @@ -72,7 +72,7 @@ namespace Remotely.Tests var hub = new AgentHub(DataService, appConfig.Object, serviceSessionCache.Object, viewerHub.Object, circuitManager.Object, expiringTokenService.Object); var hubClients = new Mock(); - var caller = new Mock(); + var caller = new Mock(); hubClients.Setup(x => x.Caller).Returns(caller.Object); hub.Clients = hubClients.Object; @@ -107,7 +107,7 @@ namespace Remotely.Tests var agentHubClients = new Mock(); - var agentHubCaller = new Mock(); + var agentHubCaller = new Mock(); var agentClientsProxy = new Mock(); agentHubClients.Setup(x => x.Caller).Returns(agentHubCaller.Object); agentHubClients.Setup(x => x.Clients(It.IsAny>())).Returns(agentClientsProxy.Object); diff --git a/Tests/Server.Tests/Server.Tests.csproj b/Tests/Server.Tests/Server.Tests.csproj index 2be20d35..0229f9c4 100644 --- a/Tests/Server.Tests/Server.Tests.csproj +++ b/Tests/Server.Tests/Server.Tests.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 false diff --git a/Tests/Shared.Tests/Shared.Tests.csproj b/Tests/Shared.Tests/Shared.Tests.csproj index 79e36899..957ccea2 100644 --- a/Tests/Shared.Tests/Shared.Tests.csproj +++ b/Tests/Shared.Tests/Shared.Tests.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable enable diff --git a/Utilities/Publish.ps1 b/Utilities/Publish.ps1 index 3936a009..42604dc7 100644 --- a/Utilities/Publish.ps1 +++ b/Utilities/Publish.ps1 @@ -92,25 +92,25 @@ if ([string]::IsNullOrWhiteSpace($MSBuildPath) -or !(Test-Path -Path $MSBuildPat # Clear publish folders. -if ((Test-Path -Path "$Root\Agent\bin\Release\net6.0\win10-x64\publish") -eq $true) { - Get-ChildItem -Path "$Root\Agent\bin\Release\net6.0\win10-x64\publish" | Remove-Item -Force -Recurse +if ((Test-Path -Path "$Root\Agent\bin\Release\.net7.0\win10-x64\publish") -eq $true) { + Get-ChildItem -Path "$Root\Agent\bin\Release\.net7.0\win10-x64\publish" | Remove-Item -Force -Recurse } -if ((Test-Path -Path "$Root\Agent\bin\Release\net6.0\win10-x86\publish" ) -eq $true) { - Get-ChildItem -Path "$Root\Agent\bin\Release\net6.0\win10-x86\publish" | Remove-Item -Force -Recurse +if ((Test-Path -Path "$Root\Agent\bin\Release\.net7.0\win10-x86\publish" ) -eq $true) { + Get-ChildItem -Path "$Root\Agent\bin\Release\.net7.0\win10-x86\publish" | Remove-Item -Force -Recurse } -if ((Test-Path -Path "$Root\Agent\bin\Release\net6.0\linux-x64\publish") -eq $true) { - Get-ChildItem -Path "$Root\Agent\bin\Release\net6.0\linux-x64\publish" | Remove-Item -Force -Recurse +if ((Test-Path -Path "$Root\Agent\bin\Release\.net7.0\linux-x64\publish") -eq $true) { + Get-ChildItem -Path "$Root\Agent\bin\Release\.net7.0\linux-x64\publish" | Remove-Item -Force -Recurse } # Publish Core clients. -dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime win10-x64 --self-contained --configuration Release --output "$Root\Agent\bin\Release\net6.0\win10-x64\publish" "$Root\Agent" -dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime linux-x64 --self-contained --configuration Release --output "$Root\Agent\bin\Release\net6.0\linux-x64\publish" "$Root\Agent" -dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime win10-x86 --self-contained --configuration Release --output "$Root\Agent\bin\Release\net6.0\win10-x86\publish" "$Root\Agent" +dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime win10-x64 --self-contained --configuration Release --output "$Root\Agent\bin\Release\.net7.0\win10-x64\publish" "$Root\Agent" +dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime linux-x64 --self-contained --configuration Release --output "$Root\Agent\bin\Release\.net7.0\linux-x64\publish" "$Root\Agent" +dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime win10-x86 --self-contained --configuration Release --output "$Root\Agent\bin\Release\.net7.0\win10-x86\publish" "$Root\Agent" -New-Item -Path "$Root\Agent\bin\Release\net6.0\win10-x64\publish\Desktop\" -ItemType Directory -Force -New-Item -Path "$Root\Agent\bin\Release\net6.0\win10-x86\publish\Desktop\" -ItemType Directory -Force -New-Item -Path "$Root\Agent\bin\Release\net6.0\linux-x64\publish\Desktop\" -ItemType Directory -Force +New-Item -Path "$Root\Agent\bin\Release\.net7.0\win10-x64\publish\Desktop\" -ItemType Directory -Force +New-Item -Path "$Root\Agent\bin\Release\.net7.0\win10-x86\publish\Desktop\" -ItemType Directory -Force +New-Item -Path "$Root\Agent\bin\Release\.net7.0\linux-x64\publish\Desktop\" -ItemType Directory -Force # Publish Linux ScreenCaster @@ -155,7 +155,7 @@ if ($SignAssemblies) { } # Compress Core clients. -$PublishDir = "$Root\Agent\bin\Release\net6.0\win10-x64\publish" +$PublishDir = "$Root\Agent\bin\Release\.net7.0\win10-x64\publish" Compress-Archive -Path "$PublishDir\*" -DestinationPath "$PublishDir\Remotely-Win10-x64.zip" -Force while ((Test-Path -Path "$PublishDir\Remotely-Win10-x64.zip") -eq $false){ Write-Host "Waiting for archive to finish: $PublishDir\Remotely-Win10-x64.zip" @@ -163,7 +163,7 @@ while ((Test-Path -Path "$PublishDir\Remotely-Win10-x64.zip") -eq $false){ } Move-Item -Path "$PublishDir\Remotely-Win10-x64.zip" -Destination "$Root\Server\wwwroot\Content\Remotely-Win10-x64.zip" -Force -$PublishDir = "$Root\Agent\bin\Release\net6.0\win10-x86\publish" +$PublishDir = "$Root\Agent\bin\Release\.net7.0\win10-x86\publish" Compress-Archive -Path "$PublishDir\*" -DestinationPath "$PublishDir\Remotely-Win10-x86.zip" -Force while ((Test-Path -Path "$PublishDir\Remotely-Win10-x86.zip") -eq $false){ Write-Host "Waiting for archive to finish: $PublishDir\Remotely-Win10-x86.zip" @@ -171,7 +171,7 @@ while ((Test-Path -Path "$PublishDir\Remotely-Win10-x86.zip") -eq $false){ } Move-Item -Path "$PublishDir\Remotely-Win10-x86.zip" -Destination "$Root\Server\wwwroot\Content\Remotely-Win10-x86.zip" -Force -$PublishDir = "$Root\Agent\bin\Release\net6.0\linux-x64\publish" +$PublishDir = "$Root\Agent\bin\Release\.net7.0\linux-x64\publish" Compress-Archive -Path "$PublishDir\*" -DestinationPath "$PublishDir\Remotely-Linux.zip" -Force while ((Test-Path -Path "$PublishDir\Remotely-Linux.zip") -eq $false){ Write-Host "Waiting for archive to finish: $PublishDir\Remotely-Win10-x86.zip" diff --git a/submodules/Immense.RemoteControl b/submodules/Immense.RemoteControl index 6c007957..dced66cc 160000 --- a/submodules/Immense.RemoteControl +++ b/submodules/Immense.RemoteControl @@ -1 +1 @@ -Subproject commit 6c0079577bd7fdf8379e6b6dc92e9eba67afef53 +Subproject commit dced66ccf956d3d2f84da1fb1045919eecf6024d