Update NuGet packages. Update APIs.

immense · Feb 19, 2024 · b7011de · b7011de
1 parent e3692c7
commit b7011de
Show file tree

Hide file tree

Showing 29 changed files with 84 additions and 87 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -9,7 +9,7 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build",
-            "program": "${workspaceFolder}/Desktop.Linux/bin/Debug/.net7.0/Remotely_Desktop.dll",
+            "program": "${workspaceFolder}/Desktop.Linux/bin/Debug/.net8.0/Remotely_Desktop.dll",
             "args": [],
             "cwd": "${workspaceFolder}/Desktop.Linux",
             "console": "internalConsole",

diff --git a/Agent/Agent.csproj b/Agent/Agent.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <Copyright>Copyright © 2023 Immense Networks</Copyright>
@@ -24,19 +24,19 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Hosting.WindowsServices" Version="7.0.10" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="7.0.10" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="7.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.EventLog" Version="7.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="7.0.10" />
-    <PackageReference Include="Microsoft.PowerShell.SDK" Version="7.3.6" />
-    <PackageReference Include="Microsoft.WSMan.Management" Version="7.3.6" />
-    <PackageReference Include="Microsoft.WSMan.Runtime" Version="7.3.6" />
-    <PackageReference Include="System.Management.Automation" Version="7.3.6" />
-    <PackageReference Include="System.ServiceProcess.ServiceController" Version="7.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Hosting.WindowsServices" Version="8.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="8.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.EventLog" Version="8.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.2" />
+    <PackageReference Include="Microsoft.PowerShell.SDK" Version="7.4.1" />
+    <PackageReference Include="Microsoft.WSMan.Management" Version="7.4.1" />
+    <PackageReference Include="Microsoft.WSMan.Runtime" Version="7.4.1" />
+    <PackageReference Include="System.Management.Automation" Version="7.4.1" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>

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

diff --git a/Desktop.Linux/Desktop.Linux.csproj b/Desktop.Linux/Desktop.Linux.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ApplicationIcon>Assets\favicon.ico</ApplicationIcon>
     <AssemblyName>Remotely_Desktop</AssemblyName>
     <RootNamespace>Remotely.Desktop.XPlat</RootNamespace>

diff --git 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.
     <PublishProtocol>FileSystem</PublishProtocol>
     <Configuration>Release</Configuration>
     <Platform>x64</Platform>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <PublishDir>..\Server\wwwroot\Content\Linux-x64\</PublishDir>
     <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
     <SelfContained>true</SelfContained>

diff --git a/Desktop.Linux/Properties/PublishProfiles/packaged-linux-x64.pubxml b/Desktop.Linux/Properties/PublishProfiles/packaged-linux-x64.pubxml
@@ -7,7 +7,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <PublishProtocol>FileSystem</PublishProtocol>
     <Configuration>Release</Configuration>
     <Platform>x64</Platform>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <PublishDir>..\Agent\bin\publish\linux-x64\Desktop</PublishDir>
     <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
     <SelfContained>true</SelfContained>

diff --git a/Desktop.Shared/Desktop.Shared.csproj b/Desktop.Shared/Desktop.Shared.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/Desktop.Win/Desktop.Win.csproj b/Desktop.Win/Desktop.Win.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
     <AssemblyName>Remotely_Desktop</AssemblyName>
     <RootNamespace>Remotely.Desktop.Win</RootNamespace>
     <ApplicationIcon>Assets\favicon.ico</ApplicationIcon>
@@ -41,7 +41,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NAudio" Version="2.1.0" />
+    <PackageReference Include="NAudio" Version="2.2.1" />
     <PackageReference Include="SharpDX" Version="4.2.0" />
     <PackageReference Include="SharpDX.Direct3D11" Version="4.2.0" />
     <PackageReference Include="SharpDX.DXGI" Version="4.2.0" />
@@ -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\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;)" />
+    <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\net8.0\Desktop\&quot;&#xD;&#xA;      xcopy &quot;$(TargetDir)*&quot; &quot;$(SolutionDir)Agent\bin\Debug\net8.0\Desktop\&quot; /y /e /i&#xD;&#xA;  )&#xD;&#xA;  if $(PlatformName) == x64 (&#xD;&#xA;      md &quot;$(SolutionDir)Agent\bin\x64\Debug\net8.0\Desktop\&quot;&#xD;&#xA;      xcopy &quot;$(TargetDir)*&quot; &quot;$(SolutionDir)Agent\bin\x64\Debug\net8.0\Desktop\&quot; /y /e /i&#xD;&#xA;  )&#xD;&#xA;  if $(PlatformName) == x86 (&#xD;&#xA;      md &quot;$(SolutionDir)Agent\bin\x86\Debug\net8.0\Desktop\&quot;&#xD;&#xA;      xcopy &quot;$(TargetDir)*&quot; &quot;$(SolutionDir)Agent\bin\x86\Debug\net8.0\Desktop\&quot; /y /e /i&#xD;&#xA;  )&#xD;&#xA;)" />
   </Target>
 
 </Project>
diff --git 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.
     <PublishProtocol>FileSystem</PublishProtocol>
     <Configuration>Release</Configuration>
     <Platform>x64</Platform>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <PublishDir>..\Server\wwwroot\Content\Win-x64\</PublishDir>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <SelfContained>true</SelfContained>

diff --git 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.
     <PublishProtocol>FileSystem</PublishProtocol>
     <Configuration>Release</Configuration>
     <Platform>x86</Platform>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <PublishDir>..\Server\wwwroot\Content\Win-x86\</PublishDir>
     <RuntimeIdentifier>win-x86</RuntimeIdentifier>
     <SelfContained>true</SelfContained>

diff --git 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.
     <Platform>x64</Platform>
     <PublishDir>C:\Program Files\Remotely\Desktop</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>False</PublishSingleFile>

diff --git a/Desktop.Win/Properties/PublishProfiles/packaged-win-x64-debug.pubxml b/Desktop.Win/Properties/PublishProfiles/packaged-win-x64-debug.pubxml
@@ -7,7 +7,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <PublishProtocol>FileSystem</PublishProtocol>
     <Configuration>Debug</Configuration>
     <Platform>x64</Platform>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <PublishDir>..\Agent\bin\publish\win-x64\Desktop</PublishDir>
     <SelfContained>true</SelfContained>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>

diff --git a/Desktop.Win/Properties/PublishProfiles/packaged-win-x64.pubxml b/Desktop.Win/Properties/PublishProfiles/packaged-win-x64.pubxml
@@ -7,7 +7,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <PublishProtocol>FileSystem</PublishProtocol>
     <Configuration>Release</Configuration>
     <Platform>x64</Platform>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <PublishDir>..\Agent\bin\publish\win-x64\Desktop</PublishDir>
     <SelfContained>true</SelfContained>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>

diff --git a/Desktop.Win/Properties/PublishProfiles/packaged-win-x86.pubxml b/Desktop.Win/Properties/PublishProfiles/packaged-win-x86.pubxml
@@ -7,7 +7,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <PublishProtocol>FileSystem</PublishProtocol>
     <Configuration>Release</Configuration>
     <Platform>x86</Platform>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <PublishDir>..\Agent\bin\publish\win-x86\Desktop</PublishDir>
     <RuntimeIdentifier>win-x86</RuntimeIdentifier>
     <SelfContained>true</SelfContained>

diff --git a/Server/Components/Devices/ChatCard.razor.cs b/Server/Components/Devices/ChatCard.razor.cs
@@ -12,7 +12,7 @@
 
 namespace Remotely.Server.Components.Devices;
 
-public partial class ChatCard : AuthComponentBase, IAsyncDisposable
+public partial class ChatCard : AuthComponentBase
 {
     private ElementReference _chatMessagesWindow;
 
@@ -44,7 +44,7 @@ await Register<ChatReceivedMessage, string>(
             HandleChatMessageReceived);
     }
 
-    private async Task HandleChatMessageReceived(ChatReceivedMessage message)
+    private async Task HandleChatMessageReceived(object subscriber, ChatReceivedMessage message)
     {
         if (message.DeviceId != Session.DeviceId)
         {

diff --git a/Server/Components/Devices/ChatFrame.razor.cs b/Server/Components/Devices/ChatFrame.razor.cs
@@ -14,7 +14,7 @@
 
 namespace Remotely.Server.Components.Devices;
 
-public partial class ChatFrame : AuthComponentBase, IAsyncDisposable
+public partial class ChatFrame : AuthComponentBase
 {
     private ICollection<ChatSession> _chatSessions = Array.Empty<ChatSession>();
 
@@ -40,7 +40,7 @@ await Register<ChatReceivedMessage, string>(
         await base.OnInitializedAsync();
     }
 
-    private async Task HandleChatMessageReceived(ChatReceivedMessage message)
+    private async Task HandleChatMessageReceived(object subscriber, ChatReceivedMessage message)
     {
         if (message.DidDisconnect ||
             ChatCache.ContainsKey(message.DeviceId))
@@ -66,7 +66,7 @@ private async Task HandleChatMessageReceived(ChatReceivedMessage message)
         await Messenger.Send(new ChatSessionsChangedMessage(), CircuitConnection.ConnectionId);
     }
 
-    private async Task HandleChatSessionsChanged(ChatSessionsChangedMessage message)
+    private async Task HandleChatSessionsChanged(object subscriber, ChatSessionsChangedMessage message)
     {
         _chatSessions = ChatCache.GetAllSessions();
         await InvokeAsync(StateHasChanged);

diff --git a/Server/Components/Devices/DeviceCard.razor.cs b/Server/Components/Devices/DeviceCard.razor.cs
@@ -90,7 +90,7 @@ await Register<DeviceStateChangedMessage, string>(
             HandleDeviceStateChanged);
     }
 
-    private async Task HandleDeviceCardStateChanged(DeviceCardStateChangedMessage message)
+    private async Task HandleDeviceCardStateChanged(object subscriber, DeviceCardStateChangedMessage message)
     {
         if (message.DeviceId == Device.ID)
         {
@@ -113,7 +113,7 @@ private async Task HandleDeviceCardStateChanged(DeviceCardStateChangedMessage me
         }
     }
 
-    private async Task HandleDeviceStateChanged(DeviceStateChangedMessage message)
+    private async Task HandleDeviceStateChanged(object subscriber, DeviceStateChangedMessage message)
     {
         if (message.Device.ID != Device.ID)
         {

diff --git a/Server/Components/Devices/DevicesFrame.razor.cs b/Server/Components/Devices/DevicesFrame.razor.cs
@@ -250,7 +250,7 @@ private string GetSortIcon()
         return $"oi-sort-{_sortDirection.ToString().ToLower()}";
     }
 
-    private async Task HandleDeviceStateChangedMessage(DeviceStateChangedMessage message)
+    private async Task HandleDeviceStateChangedMessage(object subscriber, DeviceStateChangedMessage message)
     {
         await _devicesLock.WaitAsync();
 
@@ -286,7 +286,7 @@ private async Task HandleDeviceStateChangedMessage(DeviceStateChangedMessage mes
         }
     }
 
-    private async Task HandleDisplayNotificationMessage(DisplayNotificationMessage message)
+    private async Task HandleDisplayNotificationMessage(object subscriber, DisplayNotificationMessage message)
     {
         TerminalStore.AddTerminalLine(message.ConsoleText);
         ToastService.ShowToast(message.ToastText, classString: message.ClassName);
@@ -298,7 +298,7 @@ private async Task HandleRefreshClicked()
         ToastService.ShowToast("Devices refreshed.");
     }
 
-    private async Task HandleScriptResultMessage(ScriptResultMessage message)
+    private async Task HandleScriptResultMessage(object subscriber, ScriptResultMessage message)
     {
         await AddScriptResult(message.ScriptResult);
     }

diff --git a/Server/Components/Devices/Terminal.razor.cs b/Server/Components/Devices/Terminal.razor.cs
@@ -251,7 +251,7 @@ private async Task GetNextCompletion(bool forward)
         await CircuitConnection.GetPowerShellCompletions(_lastCompletionInput, _lastCursorIndex, CompletionIntent.NextResult, forward);
     }
 
-    private async Task HandlePowerShellCompletionsMessage(PowerShellCompletionsMessage message)
+    private async Task HandlePowerShellCompletionsMessage(object subscriber, PowerShellCompletionsMessage message)
     {
         var completion = message.Completion;
         var intent = message.Intent;

diff --git a/Server/Components/LoaderHarness.razor b/Server/Components/LoaderHarness.razor
@@ -17,7 +17,7 @@
         await Register<ShowLoaderMessage>(HandleShowLoaderMessage);
     }
 
-    private async Task HandleShowLoaderMessage(ShowLoaderMessage message)
+    private async Task HandleShowLoaderMessage(object subscriber, ShowLoaderMessage message)
     {
         _loaderShown = message.IsShown;
         _statusMessage = message.StatusMessage;

diff --git a/Server/Components/MessengerSubscriber.cs b/Server/Components/MessengerSubscriber.cs
@@ -8,38 +8,40 @@
 
 namespace Remotely.Server.Components;
 
-public class MessengerSubscriber : ComponentBase, IAsyncDisposable
+public class MessengerSubscriber : ComponentBase, IDisposable
 {
-    protected readonly ConcurrentQueue<IAsyncDisposable> _registrations = new();
+    protected readonly ConcurrentQueue<IDisposable> _registrations = new();
 
     [Inject]
     protected IMessenger Messenger { get; init; } = null!;
 
-    public async ValueTask DisposeAsync()
+    public void Dispose()
     {
         while (_registrations.TryDequeue(out var registration))
         {
             try
             {
-                await registration.DisposeAsync();
+                registration.Dispose();
             }
             catch { }
         }
         GC.SuppressFinalize(this);
     }
 
-    protected async Task Register<TMessage, TChannel>(TChannel channel, Func<TMessage, Task> handler)
+    protected Task Register<TMessage, TChannel>(TChannel channel, RegistrationCallback<TMessage> handler)
         where TMessage : class 
         where TChannel : IEquatable<TChannel>
     {
-        var registration = await Messenger.Register(this, channel, handler);
+        var registration = Messenger.Register(this, channel, handler);
         _registrations.Enqueue(registration);
+        return Task.CompletedTask;
     }
 
-    protected async Task Register<TMessage>(Func<TMessage, Task> handler)
+    protected Task Register<TMessage>(RegistrationCallback<TMessage> handler)
            where TMessage : class
     {
-        var registration = await Messenger.Register(this, handler);
+        var registration = Messenger.Register(this, handler);
         _registrations.Enqueue(registration);
+        return Task.CompletedTask;
     }
 }
diff --git a/Server/Pages/DeviceDetails.razor.cs b/Server/Pages/DeviceDetails.razor.cs
@@ -83,7 +83,7 @@ await Register<ReceiveLogsMessage, string>(
         _isLoading = false;
     }
 
-    private async Task HandleReceiveLogsMessage(ReceiveLogsMessage message)
+    private async Task HandleReceiveLogsMessage(object subscriber, ReceiveLogsMessage message)
     {
         _logLines.Enqueue(message.LogChunk);
         await InvokeAsync(StateHasChanged);