diff --git a/Desktop.Win/App.config b/Desktop.Win/App.config new file mode 100644 index 00000000..6c6b1769 --- /dev/null +++ b/Desktop.Win/App.config @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Desktop.Win/AssemblyInfo.cs b/Desktop.Win/AssemblyInfo.cs deleted file mode 100644 index 8b5504ec..00000000 --- a/Desktop.Win/AssemblyInfo.cs +++ /dev/null @@ -1,10 +0,0 @@ -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/Desktop.Win.csproj b/Desktop.Win/Desktop.Win.csproj index 60c92438..26e649c9 100644 --- a/Desktop.Win/Desktop.Win.csproj +++ b/Desktop.Win/Desktop.Win.csproj @@ -1,28 +1,300 @@ - - + + + + + Debug + AnyCPU + {36509E38-006A-44B3-BA68-F2D483AB2A48} WinExe - netcoreapp3.1 - true Remotely.Desktop.Win Remotely_Desktop - favicon.ico - app.manifest + v4.8 + 512 + {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + 4 + true + true + + + + + AnyCPU + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + AnyCPU + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + favicon.ico + + + true + bin\x86\Debug\ + DEBUG;TRACE + full + x86 + 7.3 + prompt + MinimumRecommendedRules.ruleset + true + + + bin\x86\Release\ + TRACE + true + pdbonly + x86 + 7.3 + prompt + MinimumRecommendedRules.ruleset + true + + + true + bin\x64\Debug\ + DEBUG;TRACE + full + x64 + 7.3 + prompt + MinimumRecommendedRules.ruleset + true + + + bin\x64\Release\ + TRACE + true + pdbonly + x64 + 7.3 + prompt + MinimumRecommendedRules.ruleset + true - - - + + ..\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 + + + + + + + + MSBuild:Compile + Designer + + + 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 + + + {67eeb0ce-6b9a-4765-be91-89fb574a764d} + ScreenCast.Win + + + {3b1b36ae-7a60-4974-a868-1e24894d4149} + Shared + + + + + + + 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 new file mode 100644 index 00000000..a5dcf04f --- /dev/null +++ b/Desktop.Win/FodyWeavers.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Desktop.Win/FodyWeavers.xsd b/Desktop.Win/FodyWeavers.xsd new file mode 100644 index 00000000..44a53744 --- /dev/null +++ b/Desktop.Win/FodyWeavers.xsd @@ -0,0 +1,111 @@ + + + + + + + + + + + + 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 7043a3ab..bc907007 100644 --- a/Desktop.Win/MainWindow.xaml +++ b/Desktop.Win/MainWindow.xaml @@ -97,6 +97,7 @@ + diff --git a/Desktop.Win/Properties/AssemblyInfo.cs b/Desktop.Win/Properties/AssemblyInfo.cs new file mode 100644 index 00000000..a9b0d810 --- /dev/null +++ b/Desktop.Win/Properties/AssemblyInfo.cs @@ -0,0 +1,55 @@ +using System.Reflection; +using System.Resources; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; +using System.Windows; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("Remotely Desktop")] +[assembly: AssemblyDescription("Desktop client for allowing remote control via the Remotely server.")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("Translucency Software")] +[assembly: AssemblyProduct("Remotely Desktop")] +[assembly: AssemblyCopyright("Copyright © 2019 Translucency Software")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +//In order to begin building localizable applications, set +//CultureYouAreCodingWith in your .csproj file +//inside a . For example, if you are using US english +//in your source files, set the to en-US. Then uncomment +//the NeutralResourceLanguage attribute below. Update the "en-US" in +//the line below to match the UICulture setting in the project file. + +//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)] + + +[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) +)] + + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Desktop.Win/Properties/PublishProfiles/win-x64.pubxml b/Desktop.Win/Properties/PublishProfiles/win-x64.pubxml deleted file mode 100644 index 70fe84fb..00000000 --- a/Desktop.Win/Properties/PublishProfiles/win-x64.pubxml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - FileSystem - Release - Any CPU - netcoreapp3.1 - ..\Server\wwwroot\Downloads\Win-x64\ - win-x64 - false - True - False - - \ No newline at end of file diff --git a/Desktop.Win/Properties/PublishProfiles/win-x86.pubxml b/Desktop.Win/Properties/PublishProfiles/win-x86.pubxml deleted file mode 100644 index 01cbf211..00000000 --- a/Desktop.Win/Properties/PublishProfiles/win-x86.pubxml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - FileSystem - Release - Any CPU - netcoreapp3.1 - ..\Server\wwwroot\Downloads\Win-x86\ - win-x86 - false - True - False - - \ No newline at end of file diff --git a/Desktop.Win/Properties/Resources.Designer.cs b/Desktop.Win/Properties/Resources.Designer.cs new file mode 100644 index 00000000..5af2aa56 --- /dev/null +++ b/Desktop.Win/Properties/Resources.Designer.cs @@ -0,0 +1,63 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Remotely.Desktop.Win.Properties { + using System; + + + /// + /// A strongly-typed resource class, for looking up localized strings, etc. + /// + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() { + } + + /// + /// Returns the cached ResourceManager instance used by this class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Remotely.Desktop.Win.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + } +} diff --git a/Desktop.Win/Properties/Resources.resx b/Desktop.Win/Properties/Resources.resx new file mode 100644 index 00000000..af7dbebb --- /dev/null +++ b/Desktop.Win/Properties/Resources.resx @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Desktop.Win/Properties/Settings.Designer.cs b/Desktop.Win/Properties/Settings.Designer.cs new file mode 100644 index 00000000..260df513 --- /dev/null +++ b/Desktop.Win/Properties/Settings.Designer.cs @@ -0,0 +1,26 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Remotely.Desktop.Win.Properties { + + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.4.0.0")] + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { + + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); + + public static Settings Default { + get { + return defaultInstance; + } + } + } +} diff --git a/Desktop.Win/Properties/Settings.settings b/Desktop.Win/Properties/Settings.settings new file mode 100644 index 00000000..033d7a5e --- /dev/null +++ b/Desktop.Win/Properties/Settings.settings @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/Desktop.Win/ViewModels/MainWindowViewModel.cs b/Desktop.Win/ViewModels/MainWindowViewModel.cs index 63963368..2c1735a9 100644 --- a/Desktop.Win/ViewModels/MainWindowViewModel.cs +++ b/Desktop.Win/ViewModels/MainWindowViewModel.cs @@ -95,6 +95,28 @@ namespace Remotely.Desktop.Win.ViewModels } + public ICommand RestartAsAdminCommand + { + get + { + return new Executor((param) => + { + try + { + var psi = new ProcessStartInfo(Assembly.GetExecutingAssembly().Location); + psi.Verb = "RunAs"; + Process.Start(psi); + Environment.Exit(0); + } + // Exception can be thrown if UAC is dialog is cancelled. + catch { } + }, (param) => + { + return !IsAdministrator; + }); + } + } + public string SessionID { get => sessionID; diff --git a/Desktop.Win/app.manifest b/Desktop.Win/app.manifest deleted file mode 100644 index 65e0cc7d..00000000 --- a/Desktop.Win/app.manifest +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Desktop.Win/packages.config b/Desktop.Win/packages.config new file mode 100644 index 00000000..1e251049 --- /dev/null +++ b/Desktop.Win/packages.config @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/README.md b/README.md index f4f4e7fa..643b98a3 100644 --- a/README.md +++ b/README.md @@ -10,9 +10,8 @@ Public Server: https://tryremotely.lucency.co (not intended for production use) *Notice: Remotely is currently in maintenance mode and will likely stay in a more-or-less prototype state.* ## Client Prerequisites: -* Endpoint devices require the .NET Core runtime to be installed. - * For Windows, the Desktop Runtime is required. - * Download Link: https://dotnet.microsoft.com/download/dotnet-core/current/runtime +* Endpoint devices require the latest .NET Core runtime and .NET Framework 4.8 to be installed. + * Download Link: https://dotnet.microsoft.com/download ## Build Instructions (Windows 10) The following steps will configure your Windows 10 machine for building the Remotely server and clients. diff --git a/Remotely.sln b/Remotely.sln index 53965ae1..2ca48e44 100644 --- a/Remotely.sln +++ b/Remotely.sln @@ -35,10 +35,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Shared", "Shared\Shared.csp EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Desktop.Linux", "Desktop.Linux\Desktop.Linux.csproj", "{FF7FD66A-B3E2-4D39-A457-A00C94EDE9E6}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Desktop.Win", "Desktop.Win\Desktop.Win.csproj", "{90530ADC-69C6-4230-A09B-376B34F66B45}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScreenCast.Win", "ScreenCast.Win\ScreenCast.Win.csproj", "{67EEB0CE-6B9A-4765-BE91-89FB574A764D}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Desktop.Win", "Desktop.Win\Desktop.Win.csproj", "{36509E38-006A-44B3-BA68-F2D483AB2A48}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Folder", "Solution Folder", "{CF0B7B5D-5FAD-42C9-8803-123D2013EC13}" + ProjectSection(SolutionItems) = preProject + LICENSE = LICENSE + README.md = README.md + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -121,18 +127,6 @@ Global {FF7FD66A-B3E2-4D39-A457-A00C94EDE9E6}.Release|x64.Build.0 = Release|x64 {FF7FD66A-B3E2-4D39-A457-A00C94EDE9E6}.Release|x86.ActiveCfg = Release|x86 {FF7FD66A-B3E2-4D39-A457-A00C94EDE9E6}.Release|x86.Build.0 = Release|x86 - {90530ADC-69C6-4230-A09B-376B34F66B45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {90530ADC-69C6-4230-A09B-376B34F66B45}.Debug|Any CPU.Build.0 = Debug|Any CPU - {90530ADC-69C6-4230-A09B-376B34F66B45}.Debug|x64.ActiveCfg = Debug|Any CPU - {90530ADC-69C6-4230-A09B-376B34F66B45}.Debug|x64.Build.0 = Debug|Any CPU - {90530ADC-69C6-4230-A09B-376B34F66B45}.Debug|x86.ActiveCfg = Debug|Any CPU - {90530ADC-69C6-4230-A09B-376B34F66B45}.Debug|x86.Build.0 = Debug|Any CPU - {90530ADC-69C6-4230-A09B-376B34F66B45}.Release|Any CPU.ActiveCfg = Release|Any CPU - {90530ADC-69C6-4230-A09B-376B34F66B45}.Release|Any CPU.Build.0 = Release|Any CPU - {90530ADC-69C6-4230-A09B-376B34F66B45}.Release|x64.ActiveCfg = Release|Any CPU - {90530ADC-69C6-4230-A09B-376B34F66B45}.Release|x64.Build.0 = Release|Any CPU - {90530ADC-69C6-4230-A09B-376B34F66B45}.Release|x86.ActiveCfg = Release|Any CPU - {90530ADC-69C6-4230-A09B-376B34F66B45}.Release|x86.Build.0 = Release|Any CPU {67EEB0CE-6B9A-4765-BE91-89FB574A764D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {67EEB0CE-6B9A-4765-BE91-89FB574A764D}.Debug|Any CPU.Build.0 = Debug|Any CPU {67EEB0CE-6B9A-4765-BE91-89FB574A764D}.Debug|x64.ActiveCfg = Debug|x64 @@ -145,6 +139,18 @@ Global {67EEB0CE-6B9A-4765-BE91-89FB574A764D}.Release|x64.Build.0 = Release|x64 {67EEB0CE-6B9A-4765-BE91-89FB574A764D}.Release|x86.ActiveCfg = Release|x86 {67EEB0CE-6B9A-4765-BE91-89FB574A764D}.Release|x86.Build.0 = Release|x86 + {36509E38-006A-44B3-BA68-F2D483AB2A48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {36509E38-006A-44B3-BA68-F2D483AB2A48}.Debug|Any CPU.Build.0 = Debug|Any CPU + {36509E38-006A-44B3-BA68-F2D483AB2A48}.Debug|x64.ActiveCfg = Debug|x64 + {36509E38-006A-44B3-BA68-F2D483AB2A48}.Debug|x64.Build.0 = Debug|x64 + {36509E38-006A-44B3-BA68-F2D483AB2A48}.Debug|x86.ActiveCfg = Debug|x86 + {36509E38-006A-44B3-BA68-F2D483AB2A48}.Debug|x86.Build.0 = Debug|x86 + {36509E38-006A-44B3-BA68-F2D483AB2A48}.Release|Any CPU.ActiveCfg = Release|Any CPU + {36509E38-006A-44B3-BA68-F2D483AB2A48}.Release|Any CPU.Build.0 = Release|Any CPU + {36509E38-006A-44B3-BA68-F2D483AB2A48}.Release|x64.ActiveCfg = Release|x64 + {36509E38-006A-44B3-BA68-F2D483AB2A48}.Release|x64.Build.0 = Release|x64 + {36509E38-006A-44B3-BA68-F2D483AB2A48}.Release|x86.ActiveCfg = Release|x86 + {36509E38-006A-44B3-BA68-F2D483AB2A48}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/ScreenCast.Win/Capture/DXCapture.cs b/ScreenCast.Win/Capture/DXCapture.cs index bb7bec23..6302f52d 100644 --- a/ScreenCast.Win/Capture/DXCapture.cs +++ b/ScreenCast.Win/Capture/DXCapture.cs @@ -54,7 +54,7 @@ namespace Remotely.ScreenCast.Win.Capture OutputDuplicateFrameInformation duplicateFrameInformation; // Try to get duplicated frame within given time is ms - duplicatedOutput.TryAcquireNextFrame(100, out duplicateFrameInformation, out screenResource); + duplicatedOutput.AcquireNextFrame(100, out duplicateFrameInformation, out screenResource); if (duplicateFrameInformation.AccumulatedFrames == 0) { diff --git a/ScreenCast.Win/Properties/AssemblyInfo.cs b/ScreenCast.Win/Properties/AssemblyInfo.cs index 69fec662..2bdfb41d 100644 --- a/ScreenCast.Win/Properties/AssemblyInfo.cs +++ b/ScreenCast.Win/Properties/AssemblyInfo.cs @@ -5,12 +5,12 @@ using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("ScreenCast.Win")] -[assembly: AssemblyDescription("")] +[assembly: AssemblyTitle("Remotely ScreenCast")] +[assembly: AssemblyDescription("Allows unattended remote control via the Remotely server.")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("ScreenCast.Win")] -[assembly: AssemblyCopyright("Copyright © 2019")] +[assembly: AssemblyCompany("Translucency Software")] +[assembly: AssemblyProduct("Remotely ScreenCast")] +[assembly: AssemblyCopyright("Copyright © 2019 Translucency Software")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/ScreenCast.Win/packages.config b/ScreenCast.Win/packages.config index 91ed09fd..9ea38605 100644 --- a/ScreenCast.Win/packages.config +++ b/ScreenCast.Win/packages.config @@ -1,6 +1,7 @@  + diff --git a/Utilities/Publish.ps1 b/Utilities/Publish.ps1 index 3d6f52de..fe12e902 100644 --- a/Utilities/Publish.ps1 +++ b/Utilities/Publish.ps1 @@ -145,7 +145,7 @@ Get-ChildItem -Path "$Root\ScreenCast.Win\bin\x64\Release\" -Exclude "*.xml" | C # Build Windows GUI App (64-bit) &"$MSBuildPath" "$Root\Desktop.Win" /t:Build /p:Configuration=Release /p:Platform=x64 -Move-Item -Path "$Root\Desktop.Win\bin\x86\Release\Remotely_Desktop.exe" -Destination "$Root\Server\wwwroot\Downloads\Win-x64\Remotely_Desktop.exe" -Force +Move-Item -Path "$Root\Desktop.Win\bin\x64\Release\Remotely_Desktop.exe" -Destination "$Root\Server\wwwroot\Downloads\Win-x64\Remotely_Desktop.exe" -Force if ($SignAssemblies) { &"$Root\Utilities\signtool.exe" sign /f "$CertificatePath" /p $CertificatePassword /t http://timestamp.digicert.com "$Root\Server\wwwroot\Downloads\Win-x64\Remotely_Desktop.exe" }