From 8b043215645235cf8d982e5978da2bd7577cb06f Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Sun, 22 Dec 2019 15:26:49 -0800 Subject: [PATCH] Core 3 WPF app created. --- .../ViewModels/MainWindowViewModel.cs | 11 +- Desktop.Win/App.config | 82 ----- Desktop.Win/AssemblyInfo.cs | 10 + Desktop.Win/Controls/HostNamePrompt.xaml | 5 +- Desktop.Win/Desktop.Win.csproj | 334 +----------------- Desktop.Win/FodyWeavers.xml | 4 - Desktop.Win/FodyWeavers.xsd | 111 ------ Desktop.Win/MainWindow.xaml | 12 +- Desktop.Win/Properties/AssemblyInfo.cs | 57 --- Desktop.Win/Properties/Resources.Designer.cs | 63 ---- Desktop.Win/Properties/Resources.resx | 117 ------ Desktop.Win/Properties/Settings.Designer.cs | 26 -- Desktop.Win/Properties/Settings.settings | 7 - Desktop.Win/Remotely_Icon.png | Bin 0 -> 4480 bytes Desktop.Win/ViewModels/MainWindowViewModel.cs | 19 +- Desktop.Win/packages.config | 40 --- Remotely.sln | 28 +- ScreenCast.Win/Capture/DXCapture.cs | 3 +- 18 files changed, 52 insertions(+), 877 deletions(-) delete mode 100644 Desktop.Win/App.config create mode 100644 Desktop.Win/AssemblyInfo.cs delete mode 100644 Desktop.Win/FodyWeavers.xml delete mode 100644 Desktop.Win/FodyWeavers.xsd delete mode 100644 Desktop.Win/Properties/AssemblyInfo.cs delete mode 100644 Desktop.Win/Properties/Resources.Designer.cs delete mode 100644 Desktop.Win/Properties/Resources.resx delete mode 100644 Desktop.Win/Properties/Settings.Designer.cs delete mode 100644 Desktop.Win/Properties/Settings.settings create mode 100644 Desktop.Win/Remotely_Icon.png delete mode 100644 Desktop.Win/packages.config diff --git a/Desktop.Linux/ViewModels/MainWindowViewModel.cs b/Desktop.Linux/ViewModels/MainWindowViewModel.cs index 42eeca3b..b8933c89 100644 --- a/Desktop.Linux/ViewModels/MainWindowViewModel.cs +++ b/Desktop.Linux/ViewModels/MainWindowViewModel.cs @@ -190,15 +190,8 @@ namespace Remotely.Desktop.Linux.ViewModels { _ = Task.Run(async () => { - ICapturer capturer = null; - - if (OSUtils.IsLinux) - { - capturer = new X11Capture(); - } - - await Conductor.CasterSocket.SendCursorChange(new CursorInfo(null, Point.Empty, "default"), new List() { screenCastRequest.ViewerID }); - _ = Conductor.ScreenCaster.BeginScreenCasting(screenCastRequest); + await Conductor.CasterSocket.SendCursorChange(new CursorInfo(null, Point.Empty, "default"), new List() { screenCastRequest.ViewerID }); + _ = Conductor.ScreenCaster.BeginScreenCasting(screenCastRequest); }); } }); diff --git a/Desktop.Win/App.config b/Desktop.Win/App.config deleted file mode 100644 index 83b577e1..00000000 --- a/Desktop.Win/App.config +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Desktop.Win/AssemblyInfo.cs b/Desktop.Win/AssemblyInfo.cs new file mode 100644 index 00000000..8b5504ec --- /dev/null +++ b/Desktop.Win/AssemblyInfo.cs @@ -0,0 +1,10 @@ +using System.Windows; + +[assembly: ThemeInfo( + ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located + //(used if a resource is not found in the page, + // or application resource dictionaries) + ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located + //(used if a resource is not found in the page, + // app, or any theme specific resource dictionaries) +)] diff --git a/Desktop.Win/Controls/HostNamePrompt.xaml b/Desktop.Win/Controls/HostNamePrompt.xaml index 8e2f3947..9e9f2de8 100644 --- a/Desktop.Win/Controls/HostNamePrompt.xaml +++ b/Desktop.Win/Controls/HostNamePrompt.xaml @@ -1,12 +1,13 @@  + Title="Remotely Host Name" Height="150" Width="350" WindowStartupLocation="CenterOwner" Icon="/Remotely_Icon.png"> diff --git a/Desktop.Win/Desktop.Win.csproj b/Desktop.Win/Desktop.Win.csproj index 456555c8..f79af2f7 100644 --- a/Desktop.Win/Desktop.Win.csproj +++ b/Desktop.Win/Desktop.Win.csproj @@ -1,336 +1,26 @@ - - - - + + - Debug - AnyCPU - {486A238C-387B-49C5-A361-B86ACDB2572A} WinExe + netcoreapp3.1 + true Remotely.Desktop.Win Remotely_Desktop - v4.8 - 512 - {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 4 - true - true - - - false - - publish\ - true - Disk - false - Background - 7 - Days - false - false - false - https://lucency.co/Contact - https://lucency.co/Contact - Remotely Desktop - Translucency Software - Remotely - 0 - 1.0.0.0 - false - true - true - true - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - favicon.ico - - - TRACE;DEBUG - x64 - true - bin\x64\Debug\ - - - TRACE - x64 - true - true - bin\x64\Release\ - - - true - - - true - bin\x86\Debug\ - DEBUG;TRACE - full - x86 - prompt - MinimumRecommendedRules.ruleset - true - - - bin\x86\Release\ - TRACE - true - pdbonly - x86 - prompt - MinimumRecommendedRules.ruleset - true - - - false - - - 0A723650D9A0A3D7D0E4A15299984A95177F9DBD - + - - ..\packages\Costura.Fody.4.1.0\lib\net40\Costura.dll - - - ..\packages\MessagePack.1.8.80\lib\net47\MessagePack.dll - - - ..\packages\Microsoft.AspNetCore.Connections.Abstractions.3.1.0\lib\netstandard2.0\Microsoft.AspNetCore.Connections.Abstractions.dll - - - ..\packages\Microsoft.AspNetCore.Http.Connections.Client.3.1.0\lib\netstandard2.0\Microsoft.AspNetCore.Http.Connections.Client.dll - - - ..\packages\Microsoft.AspNetCore.Http.Connections.Common.3.1.0\lib\netstandard2.0\Microsoft.AspNetCore.Http.Connections.Common.dll - - - ..\packages\Microsoft.AspNetCore.Http.Features.3.1.0\lib\netstandard2.0\Microsoft.AspNetCore.Http.Features.dll - - - ..\packages\Microsoft.AspNetCore.SignalR.Client.3.1.0\lib\netstandard2.0\Microsoft.AspNetCore.SignalR.Client.dll - - - ..\packages\Microsoft.AspNetCore.SignalR.Client.Core.3.1.0\lib\netstandard2.0\Microsoft.AspNetCore.SignalR.Client.Core.dll - - - ..\packages\Microsoft.AspNetCore.SignalR.Common.3.1.0\lib\netstandard2.0\Microsoft.AspNetCore.SignalR.Common.dll - - - ..\packages\Microsoft.AspNetCore.SignalR.Protocols.Json.3.1.0\lib\netstandard2.0\Microsoft.AspNetCore.SignalR.Protocols.Json.dll - - - ..\packages\Microsoft.AspNetCore.SignalR.Protocols.MessagePack.3.1.0\lib\netstandard2.0\Microsoft.AspNetCore.SignalR.Protocols.MessagePack.dll - - - ..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll - - - ..\packages\Microsoft.Extensions.Configuration.3.1.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll - - - ..\packages\Microsoft.Extensions.Configuration.Abstractions.3.1.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll - - - ..\packages\Microsoft.Extensions.Configuration.Binder.3.1.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll - - - ..\packages\Microsoft.Extensions.DependencyInjection.3.1.0\lib\net461\Microsoft.Extensions.DependencyInjection.dll - - - ..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.1.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll - - - ..\packages\Microsoft.Extensions.Logging.3.1.0\lib\netstandard2.0\Microsoft.Extensions.Logging.dll - - - ..\packages\Microsoft.Extensions.Logging.Abstractions.3.1.0\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll - - - ..\packages\Microsoft.Extensions.Options.3.1.0\lib\netstandard2.0\Microsoft.Extensions.Options.dll - - - ..\packages\Microsoft.Extensions.Primitives.3.1.0\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll - - - - ..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll - - - ..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll - - - - - - - ..\packages\System.Drawing.Common.4.7.0\lib\net461\System.Drawing.Common.dll - - - ..\packages\System.IO.Pipelines.4.7.0\lib\netstandard2.0\System.IO.Pipelines.dll - - - ..\packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll - - - - ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - - ..\packages\System.Runtime.CompilerServices.Unsafe.4.7.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll - - - - ..\packages\System.Runtime.Serialization.Primitives.4.3.0\lib\net46\System.Runtime.Serialization.Primitives.dll - True - True - - - ..\packages\System.Text.Encodings.Web.4.7.0\lib\netstandard2.0\System.Text.Encodings.Web.dll - - - ..\packages\System.Text.Json.4.7.0\lib\net461\System.Text.Json.dll - - - ..\packages\System.Threading.Channels.4.7.0\lib\netstandard2.0\System.Threading.Channels.dll - - - ..\packages\System.Threading.Tasks.Extensions.4.5.3\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll - - - ..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll - - - - - - - - - 4.0 - - - - + + + - - MSBuild:Compile - Designer - - - HostNamePrompt.xaml - - - - - - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - App.xaml - Code - - - MainWindow.xaml - Code - - - - - Code - - - True - True - Resources.resx - - - True - Settings.settings - True - - - ResXFileCodeGenerator - Resources.Designer.cs - - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - - + + + - - - {b04a1728-2e87-491e-bc7f-f575a1754def} - ScreenCast.Core - - - {2dcea1f5-9b64-4edb-9cd0-4d6675d96709} - ScreenCast.Win - - - {3b1b36ae-7a60-4974-a868-1e24894d4149} - Shared - - - - - False - Microsoft .NET Framework 4.8 %28x86 and x64%29 - true - - - False - .NET Framework 3.5 SP1 - false - - - - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - + \ No newline at end of file diff --git a/Desktop.Win/FodyWeavers.xml b/Desktop.Win/FodyWeavers.xml deleted file mode 100644 index a5dcf04f..00000000 --- a/Desktop.Win/FodyWeavers.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/Desktop.Win/FodyWeavers.xsd b/Desktop.Win/FodyWeavers.xsd deleted file mode 100644 index 44a53744..00000000 --- a/Desktop.Win/FodyWeavers.xsd +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - - - - - - - A list of assembly names to exclude from the default action of "embed all Copy Local references", delimited with line breaks - - - - - A list of assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks. - - - - - A list of unmanaged 32 bit assembly names to include, delimited with line breaks. - - - - - A list of unmanaged 64 bit assembly names to include, delimited with line breaks. - - - - - The order of preloaded assemblies, delimited with line breaks. - - - - - - This will copy embedded files to disk before loading them into memory. This is helpful for some scenarios that expected an assembly to be loaded from a physical file. - - - - - Controls if .pdbs for reference assemblies are also embedded. - - - - - Embedded assemblies are compressed by default, and uncompressed when they are loaded. You can turn compression off with this option. - - - - - As part of Costura, embedded assemblies are no longer included as part of the build. This cleanup can be turned off. - - - - - Costura by default will load as part of the module initialization. This flag disables that behavior. Make sure you call CosturaUtility.Initialize() somewhere in your code. - - - - - Costura will by default use assemblies with a name like 'resources.dll' as a satellite resource and prepend the output path. This flag disables that behavior. - - - - - A list of assembly names to exclude from the default action of "embed all Copy Local references", delimited with | - - - - - A list of assembly names to include from the default action of "embed all Copy Local references", delimited with |. - - - - - A list of unmanaged 32 bit assembly names to include, delimited with |. - - - - - A list of unmanaged 64 bit assembly names to include, delimited with |. - - - - - The order of preloaded assemblies, delimited with |. - - - - - - - - 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. - - - - - A comma-separated list of error codes that can be safely ignored in assembly verification. - - - - - 'false' to turn off automatic generation of the XML Schema file. - - - - - \ No newline at end of file diff --git a/Desktop.Win/MainWindow.xaml b/Desktop.Win/MainWindow.xaml index 7b362512..bc907007 100644 --- a/Desktop.Win/MainWindow.xaml +++ b/Desktop.Win/MainWindow.xaml @@ -1,12 +1,16 @@ - + Title="Remotely" Height="250" Width="350" + WindowStyle="None" + ResizeMode="NoResize" + MouseLeftButtonDown="Window_MouseLeftButtonDown" + Loaded="Window_Loaded" Icon="Remotely_Icon.png" > @@ -31,7 +35,7 @@ Remotely -