mirrors/Remotely
3
0
Fork 0
mirror of https://github.com/immense/Remotely.git synced 2025-10-26 11:27:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to .NET 7.

Browse Source
This commit is contained in:
Jared Goodwin 2023-04-21 06:50:14 -07:00
parent 9a538de5e5
commit 820cb53947
28 changed files with 67 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.vscode/launch.json vendored
View File

@ -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",

2
Agent/Agent.csproj
View File

@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<Copyright>Copyright © 2023 Immense Networks</Copyright>

2
Desktop.Core/Desktop.Core.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>.net7.0</TargetFramework>
<RootNamespace>Remotely.Desktop.Core</RootNamespace>
<AssemblyName>Remotely_Desktop.Core</AssemblyName>
<Platforms>AnyCPU;x64;x86</Platforms>

11
Desktop.Linux/Desktop.Linux.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<ApplicationIcon>Assets\favicon.ico</ApplicationIcon>
<AssemblyName>Remotely_Desktop</AssemblyName>
<RootNamespace>Remotely.Desktop.XPlat</RootNamespace>
@ -55,13 +55,8 @@
<EmbeddedResource Include="Assets\Remotely_Icon.png" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Avalonia" Version="0.10.18" />
<PackageReference Include="Avalonia.Desktop" Version="0.10.18" />
<PackageReference Include="Avalonia.ReactiveUI" Version="0.10.18" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\immybot\submodules\RemoteControl\Immense.RemoteControl.Desktop\Immense.RemoteControl.Desktop.csproj" />
<ProjectReference Include="..\Desktop.Shared\Desktop.Shared.csproj" />
<ProjectReference Include="..\Shared\Shared.csproj" />
<ProjectReference Include="..\submodules\Immense.RemoteControl\Immense.RemoteControl.Desktop.Linux\Immense.RemoteControl.Desktop.Linux.csproj" />
<ProjectReference Include="..\submodules\Immense.RemoteControl\Immense.RemoteControl.Desktop.Shared\Immense.RemoteControl.Desktop.Shared.csproj" />
</ItemGroup>
</Project>

4
Desktop.Linux/Program.cs
View File

@ -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";

2
Desktop.Linux/Properties/PublishProfiles/desktop-linux-x64.pubxml
View File

@ -7,7 +7,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<PublishProtocol>FileSystem</PublishProtocol>
<Configuration>Release</Configuration>
<Platform>x64</Platform>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>.net7.0</TargetFramework>
<PublishDir>..\Server\wwwroot\Content\Linux-x64\</PublishDir>
<RuntimeIdentifier>linux-x64</RuntimeIdentifier>
<SelfContained>true</SelfContained>

4
Desktop.Linux/Properties/PublishProfiles/packaged-linux-x64.pubxml
View File

@ -7,8 +7,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<PublishProtocol>FileSystem</PublishProtocol>
<Configuration>Release</Configuration>
<Platform>x64</Platform>
<TargetFramework>net6.0</TargetFramework>
<PublishDir>..\Agent\bin\Release\net6.0\linux-x64\publish\Desktop</PublishDir>
<TargetFramework>.net7.0</TargetFramework>
<PublishDir>..\Agent\bin\Release\.net7.0\linux-x64\publish\Desktop</PublishDir>
<RuntimeIdentifier>linux-x64</RuntimeIdentifier>
<SelfContained>true</SelfContained>
<PublishSingleFile>False</PublishSingleFile>

2
Desktop.Shared/Desktop.Shared.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>

4
Desktop.Win/Desktop.Win.csproj
View File

@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net7.0-windows</TargetFramework>
<UseWPF>true</UseWPF>
<UseWindowsForms>true</UseWindowsForms>
<AssemblyName>Remotely_Desktop</AssemblyName>
@ -60,7 +60,7 @@
</ItemGroup>
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
<Exec Command="if $(SolutionDir) == *Undefined* (&#xD;&#xA; exit 0&#xD;&#xA;)&#xD;&#xA;if $(ConfigurationName) == Debug (&#xD;&#xA; if $(PlatformName) == AnyCPU (&#xD;&#xA; md &quot;$(SolutionDir)Agent\bin\Debug\net6.0\Desktop\&quot;&#xD;&#xA; xcopy &quot;$(TargetDir)*&quot; &quot;$(SolutionDir)Agent\bin\Debug\net6.0\Desktop\&quot; /y /e /i&#xD;&#xA; )&#xD;&#xA; if $(PlatformName) == x64 (&#xD;&#xA; md &quot;$(SolutionDir)Agent\bin\x64\Debug\net6.0\Desktop\&quot;&#xD;&#xA; xcopy &quot;$(TargetDir)*&quot; &quot;$(SolutionDir)Agent\bin\x64\Debug\net6.0\Desktop\&quot; /y /e /i&#xD;&#xA; )&#xD;&#xA; if $(PlatformName) == x86 (&#xD;&#xA; md &quot;$(SolutionDir)Agent\bin\x86\Debug\net6.0\Desktop\&quot;&#xD;&#xA; xcopy &quot;$(TargetDir)*&quot; &quot;$(SolutionDir)Agent\bin\x86\Debug\net6.0\Desktop\&quot; /y /e /i&#xD;&#xA; )&#xD;&#xA;)" />
<Exec Command="if $(SolutionDir) == *Undefined* (&#xD;&#xA; exit 0&#xD;&#xA;)&#xD;&#xA;if $(ConfigurationName) == Debug (&#xD;&#xA; if $(PlatformName) == AnyCPU (&#xD;&#xA; md &quot;$(SolutionDir)Agent\bin\Debug\.net7.0\Desktop\&quot;&#xD;&#xA; xcopy &quot;$(TargetDir)*&quot; &quot;$(SolutionDir)Agent\bin\Debug\.net7.0\Desktop\&quot; /y /e /i&#xD;&#xA; )&#xD;&#xA; if $(PlatformName) == x64 (&#xD;&#xA; md &quot;$(SolutionDir)Agent\bin\x64\Debug\.net7.0\Desktop\&quot;&#xD;&#xA; xcopy &quot;$(TargetDir)*&quot; &quot;$(SolutionDir)Agent\bin\x64\Debug\.net7.0\Desktop\&quot; /y /e /i&#xD;&#xA; )&#xD;&#xA; if $(PlatformName) == x86 (&#xD;&#xA; md &quot;$(SolutionDir)Agent\bin\x86\Debug\.net7.0\Desktop\&quot;&#xD;&#xA; xcopy &quot;$(TargetDir)*&quot; &quot;$(SolutionDir)Agent\bin\x86\Debug\.net7.0\Desktop\&quot; /y /e /i&#xD;&#xA; )&#xD;&#xA;)" />
</Target>
</Project>

3
Desktop.Win/Program.cs
View File

@ -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)
{

2
Desktop.Win/Properties/PublishProfiles/desktop-win-x64.pubxml
View File

@ -7,7 +7,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<PublishProtocol>FileSystem</PublishProtocol>
<Configuration>Release</Configuration>
<Platform>x64</Platform>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>.net7.0-windows</TargetFramework>
<PublishDir>..\Server\wwwroot\Content\Win-x64\</PublishDir>
<RuntimeIdentifier>win10-x64</RuntimeIdentifier>
<SelfContained>true</SelfContained>

2
Desktop.Win/Properties/PublishProfiles/desktop-win-x86.pubxml
View File

@ -7,7 +7,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<PublishProtocol>FileSystem</PublishProtocol>
<Configuration>Release</Configuration>
<Platform>x86</Platform>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>.net7.0-windows</TargetFramework>
<PublishDir>..\Server\wwwroot\Content\Win-x86\</PublishDir>
<RuntimeIdentifier>win10-x86</RuntimeIdentifier>
<SelfContained>true</SelfContained>

2
Desktop.Win/Properties/PublishProfiles/install-folder.pubxml
View File

@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<Platform>x64</Platform>
<PublishDir>C:\Program Files\Remotely\Desktop</PublishDir>
<PublishProtocol>FileSystem</PublishProtocol>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>.net7.0-windows</TargetFramework>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
<SelfContained>true</SelfContained>
<PublishSingleFile>False</PublishSingleFile>

4
Desktop.Win/Properties/PublishProfiles/packaged-win-x64-debug.pubxml
View File

@ -7,8 +7,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<PublishProtocol>FileSystem</PublishProtocol>
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
<TargetFramework>net6.0-windows</TargetFramework>
<PublishDir>..\Agent\bin\Release\net6.0\win10-x64\publish\Desktop</PublishDir>
<TargetFramework>.net7.0-windows</TargetFramework>
<PublishDir>..\Agent\bin\Release\.net7.0\win10-x64\publish\Desktop</PublishDir>
<SelfContained>true</SelfContained>
<RuntimeIdentifier>win10-x64</RuntimeIdentifier>
<PublishSingleFile>True</PublishSingleFile>

4
Desktop.Win/Properties/PublishProfiles/packaged-win-x64.pubxml
View File

@ -7,8 +7,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<PublishProtocol>FileSystem</PublishProtocol>
<Configuration>Release</Configuration>
<Platform>x64</Platform>
<TargetFramework>net6.0-windows</TargetFramework>
<PublishDir>..\Agent\bin\Release\net6.0\win10-x64\publish\Desktop</PublishDir>
<TargetFramework>.net7.0-windows</TargetFramework>
<PublishDir>..\Agent\bin\Release\.net7.0\win10-x64\publish\Desktop</PublishDir>
<SelfContained>true</SelfContained>
<RuntimeIdentifier>win10-x64</RuntimeIdentifier>
<PublishSingleFile>False</PublishSingleFile>

4
Desktop.Win/Properties/PublishProfiles/packaged-win-x86.pubxml
View File

@ -7,8 +7,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<PublishProtocol>FileSystem</PublishProtocol>
<Configuration>Release</Configuration>
<Platform>x86</Platform>
<TargetFramework>net6.0-windows</TargetFramework>
<PublishDir>..\Agent\bin\Release\net6.0\win10-x86\publish\Desktop</PublishDir>
<TargetFramework>.net7.0-windows</TargetFramework>
<PublishDir>..\Agent\bin\Release\.net7.0\win10-x86\publish\Desktop</PublishDir>
<RuntimeIdentifier>win10-x86</RuntimeIdentifier>
<SelfContained>true</SelfContained>
<PublishSingleFile>False</PublishSingleFile>

2
Desktop.Win/Properties/PublishProfiles/wrapper-x64.pubxml
View File

@ -7,7 +7,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<PublishProtocol>FileSystem</PublishProtocol>
<Configuration>Release</Configuration>
<Platform>x64</Platform>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>.net7.0-windows</TargetFramework>
<PublishDir>bin\Release\win-x64\publish\</PublishDir>
<SelfContained>true</SelfContained>
<RuntimeIdentifier>win10-x64</RuntimeIdentifier>

2
Desktop.Win/Properties/PublishProfiles/wrapper-x86.pubxml
View File

@ -7,7 +7,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<PublishProtocol>FileSystem</PublishProtocol>
<Configuration>Release</Configuration>
<Platform>x86</Platform>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>.net7.0-windows</TargetFramework>
<PublishDir>bin\Release\win-x86\publish\</PublishDir>
<SelfContained>true</SelfContained>
<RuntimeIdentifier>win10-x86</RuntimeIdentifier>

60
Remotely.sln
View File

@ -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}

3
Server/Server.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<UserSecretsId>aspnet-Server-F297B939-4A64-4B42-8C70-E142EBDAA131</UserSecretsId>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
<DockerfileTag>remotely</DockerfileTag>
@ -28,7 +28,6 @@
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="6.0.9" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.9" />
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="6.0.9" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="6.0.9" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.9" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.9" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.9" />

2
Shared/Shared.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
<AssemblyName>Remotely_Shared</AssemblyName>
<Platforms>AnyCPU;x64;x86</Platforms>

2
Tests/Desktop.Win.Tests/Desktop.Win.Tests.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>.net7.0-windows</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>

6
Tests/LoadTester/LoadTester.csproj
View File

@ -2,15 +2,11 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net7.0-windows</TargetFramework>
<AssemblyName>Remotely.Tests.LoadTester</AssemblyName>
<RootNamespace>Remotely.Tests.LoadTester</RootNamespace>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="6.0.9" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Agent\Agent.csproj" />
<ProjectReference Include="..\..\Desktop.Win\Desktop.Win.csproj" />

6
Tests/Server.Tests/AgentHubTests.cs
View File

@ -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<IHubCallerClients>();
var caller = new Mock<IClientProxy>();
var caller = new Mock<ISingleClientProxy>();
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<IHubCallerClients>();
var caller = new Mock<IClientProxy>();
var caller = new Mock<ISingleClientProxy>();
hubClients.Setup(x => x.Caller).Returns(caller.Object);
hub.Clients = hubClients.Object;
@ -107,7 +107,7 @@ namespace Remotely.Tests
var agentHubClients = new Mock<IHubCallerClients>();
var agentHubCaller = new Mock<IClientProxy>();
var agentHubCaller = new Mock<ISingleClientProxy>();
var agentClientsProxy = new Mock<IClientProxy>();
agentHubClients.Setup(x => x.Caller).Returns(agentHubCaller.Object);
agentHubClients.Setup(x => x.Clients(It.IsAny<IReadOnlyList<string>>())).Returns(agentClientsProxy.Object);

2
Tests/Server.Tests/Server.Tests.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<IsPackable>false</IsPackable>

2
Tests/Shared.Tests/Shared.Tests.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>

30
Utilities/Publish.ps1
View File

@ -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"

2
submodules/Immense.RemoteControl

@ -1 +1 @@
Subproject commit 6c0079577bd7fdf8379e6b6dc92e9eba67afef53
Subproject commit dced66ccf956d3d2f84da1fb1045919eecf6024d