From d586c8e2d97ce9cb0cbb445c1724cee98c50bf75 Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Mon, 11 Mar 2019 07:40:53 -0700 Subject: [PATCH] Script updates. Added Desktop project. --- Remotely.sln | 14 +++ Remotely_Desktop/App.config | 6 + Remotely_Desktop/App.xaml | 9 ++ Remotely_Desktop/App.xaml.cs | 17 +++ Remotely_Desktop/MainWindow.xaml | 12 ++ Remotely_Desktop/MainWindow.xaml.cs | 28 +++++ Remotely_Desktop/Properties/AssemblyInfo.cs | 55 ++++++++ .../Properties/Resources.Designer.cs | 71 +++++++++++ Remotely_Desktop/Properties/Resources.resx | 117 ++++++++++++++++++ .../Properties/Settings.Designer.cs | 30 +++++ Remotely_Desktop/Properties/Settings.settings | 7 ++ Remotely_Desktop/Remotely_Desktop.csproj | 98 +++++++++++++++ Utilities/Publish.ps1 | 1 - Utilities/Remotely_Server_Install.sh | 2 +- Utilities/Setup_Ubuntu_Builder.sh | 28 +---- 15 files changed, 467 insertions(+), 28 deletions(-) create mode 100644 Remotely_Desktop/App.config create mode 100644 Remotely_Desktop/App.xaml create mode 100644 Remotely_Desktop/App.xaml.cs create mode 100644 Remotely_Desktop/MainWindow.xaml create mode 100644 Remotely_Desktop/MainWindow.xaml.cs create mode 100644 Remotely_Desktop/Properties/AssemblyInfo.cs create mode 100644 Remotely_Desktop/Properties/Resources.Designer.cs create mode 100644 Remotely_Desktop/Properties/Resources.resx create mode 100644 Remotely_Desktop/Properties/Settings.Designer.cs create mode 100644 Remotely_Desktop/Properties/Settings.settings create mode 100644 Remotely_Desktop/Remotely_Desktop.csproj diff --git a/Remotely.sln b/Remotely.sln index e56a1109..8fdd9623 100644 --- a/Remotely.sln +++ b/Remotely.sln @@ -33,6 +33,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Remotely_Library", "Remotel EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Remotely_ScreenCast", "Remotely_ScreenCast\Remotely_ScreenCast.csproj", "{2DCEA1F5-9B64-4EDB-9CD0-4D6675D96709}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Remotely_Desktop", "Remotely_Desktop\Remotely_Desktop.csproj", "{486A238C-387B-49C5-A361-B86ACDB2572A}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -91,6 +93,18 @@ Global {2DCEA1F5-9B64-4EDB-9CD0-4D6675D96709}.Release|x64.Build.0 = Release|Any CPU {2DCEA1F5-9B64-4EDB-9CD0-4D6675D96709}.Release|x86.ActiveCfg = Release|Any CPU {2DCEA1F5-9B64-4EDB-9CD0-4D6675D96709}.Release|x86.Build.0 = Release|Any CPU + {486A238C-387B-49C5-A361-B86ACDB2572A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {486A238C-387B-49C5-A361-B86ACDB2572A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {486A238C-387B-49C5-A361-B86ACDB2572A}.Debug|x64.ActiveCfg = Debug|Any CPU + {486A238C-387B-49C5-A361-B86ACDB2572A}.Debug|x64.Build.0 = Debug|Any CPU + {486A238C-387B-49C5-A361-B86ACDB2572A}.Debug|x86.ActiveCfg = Debug|Any CPU + {486A238C-387B-49C5-A361-B86ACDB2572A}.Debug|x86.Build.0 = Debug|Any CPU + {486A238C-387B-49C5-A361-B86ACDB2572A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {486A238C-387B-49C5-A361-B86ACDB2572A}.Release|Any CPU.Build.0 = Release|Any CPU + {486A238C-387B-49C5-A361-B86ACDB2572A}.Release|x64.ActiveCfg = Release|Any CPU + {486A238C-387B-49C5-A361-B86ACDB2572A}.Release|x64.Build.0 = Release|Any CPU + {486A238C-387B-49C5-A361-B86ACDB2572A}.Release|x86.ActiveCfg = Release|Any CPU + {486A238C-387B-49C5-A361-B86ACDB2572A}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Remotely_Desktop/App.config b/Remotely_Desktop/App.config new file mode 100644 index 00000000..56efbc7b --- /dev/null +++ b/Remotely_Desktop/App.config @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Remotely_Desktop/App.xaml b/Remotely_Desktop/App.xaml new file mode 100644 index 00000000..3ecfb3dd --- /dev/null +++ b/Remotely_Desktop/App.xaml @@ -0,0 +1,9 @@ + + + + + diff --git a/Remotely_Desktop/App.xaml.cs b/Remotely_Desktop/App.xaml.cs new file mode 100644 index 00000000..02ccdb49 --- /dev/null +++ b/Remotely_Desktop/App.xaml.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Configuration; +using System.Data; +using System.Linq; +using System.Threading.Tasks; +using System.Windows; + +namespace Remotely_Desktop +{ + /// + /// Interaction logic for App.xaml + /// + public partial class App : Application + { + } +} diff --git a/Remotely_Desktop/MainWindow.xaml b/Remotely_Desktop/MainWindow.xaml new file mode 100644 index 00000000..23fd530d --- /dev/null +++ b/Remotely_Desktop/MainWindow.xaml @@ -0,0 +1,12 @@ + + + + + diff --git a/Remotely_Desktop/MainWindow.xaml.cs b/Remotely_Desktop/MainWindow.xaml.cs new file mode 100644 index 00000000..2e6ab9c1 --- /dev/null +++ b/Remotely_Desktop/MainWindow.xaml.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace Remotely_Desktop +{ + /// + /// Interaction logic for MainWindow.xaml + /// + public partial class MainWindow : Window + { + public MainWindow() + { + InitializeComponent(); + } + } +} diff --git a/Remotely_Desktop/Properties/AssemblyInfo.cs b/Remotely_Desktop/Properties/AssemblyInfo.cs new file mode 100644 index 00000000..71c74559 --- /dev/null +++ b/Remotely_Desktop/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("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("Remotely_Desktop")] +[assembly: AssemblyCopyright("Copyright © 2019")] +[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/Remotely_Desktop/Properties/Resources.Designer.cs b/Remotely_Desktop/Properties/Resources.Designer.cs new file mode 100644 index 00000000..5b3a63da --- /dev/null +++ b/Remotely_Desktop/Properties/Resources.Designer.cs @@ -0,0 +1,71 @@ +//------------------------------------------------------------------------------ +// +// 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.Properties +{ + + + /// + /// 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", "4.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 ((resourceMan == null)) + { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Remotely_Desktop.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/Remotely_Desktop/Properties/Resources.resx b/Remotely_Desktop/Properties/Resources.resx new file mode 100644 index 00000000..af7dbebb --- /dev/null +++ b/Remotely_Desktop/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/Remotely_Desktop/Properties/Settings.Designer.cs b/Remotely_Desktop/Properties/Settings.Designer.cs new file mode 100644 index 00000000..e2382e7a --- /dev/null +++ b/Remotely_Desktop/Properties/Settings.Designer.cs @@ -0,0 +1,30 @@ +//------------------------------------------------------------------------------ +// +// 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.Properties +{ + + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.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/Remotely_Desktop/Properties/Settings.settings b/Remotely_Desktop/Properties/Settings.settings new file mode 100644 index 00000000..033d7a5e --- /dev/null +++ b/Remotely_Desktop/Properties/Settings.settings @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/Remotely_Desktop/Remotely_Desktop.csproj b/Remotely_Desktop/Remotely_Desktop.csproj new file mode 100644 index 00000000..dc85216e --- /dev/null +++ b/Remotely_Desktop/Remotely_Desktop.csproj @@ -0,0 +1,98 @@ + + + + + Debug + AnyCPU + {486A238C-387B-49C5-A361-B86ACDB2572A} + WinExe + Remotely_Desktop + Remotely_Desktop + v4.7.2 + 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 + + + + + + + + + + + + 4.0 + + + + + + + + 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 + + + + + + + \ No newline at end of file diff --git a/Utilities/Publish.ps1 b/Utilities/Publish.ps1 index 4965b5bb..043bdf72 100644 --- a/Utilities/Publish.ps1 +++ b/Utilities/Publish.ps1 @@ -39,7 +39,6 @@ if ($args.Count -eq 0){ } else { $ArgList.Add("c") - $ArgList.Add("d") $ArgList.Add("s") for ($i = 0; $i -lt $args.Count; $i++) { diff --git a/Utilities/Remotely_Server_Install.sh b/Utilities/Remotely_Server_Install.sh index 8c925199..64f4b877 100644 --- a/Utilities/Remotely_Server_Install.sh +++ b/Utilities/Remotely_Server_Install.sh @@ -55,7 +55,7 @@ Description=Remotely Server [Service] WorkingDirectory=$appRoot -ExecStart=/usr/bin/dotnet $appRoot/Server.dll +ExecStart=/usr/bin/dotnet $appRoot/Remotely_Server.dll Restart=always # Restart service after 10 seconds if the dotnet service crashes: RestartSec=10 diff --git a/Utilities/Setup_Ubuntu_Builder.sh b/Utilities/Setup_Ubuntu_Builder.sh index 428c9f9a..260fbc4c 100644 --- a/Utilities/Setup_Ubuntu_Builder.sh +++ b/Utilities/Setup_Ubuntu_Builder.sh @@ -3,34 +3,10 @@ apt-get update wget -q https://packages.microsoft.com/config/ubuntu/18.04/packages-microsoft-prod.deb dpkg -i packages-microsoft-prod.deb apt-get install apt-transport-https +apt-get update apt-get install dotnet-sdk-2.2 apt-get install git - -cd ~/Downloads -wget -qO- https://deb.nodesource.com/setup_10.x | sudo -E bash - -apt-get install -y nodejs - -apt-get install libxtst-dev libpng++-dev - -apt-get install gcc - -apt-get install python2.7 - -apt-get install make - -apt-get install g++ - -apt-get install wine-stable - -apt-get install powershell - -npm install -g electron --unsafe-perm=true --allow-root - -npm install -g typescript - -npm install -g electron-builder - mkdir ~/Downloads/Remotely cd ~/Downloads/Remotely -git clone https://github.com/Jay-Rad/Remotely.git +git clone https://github.com/Jay-Rad/Remotely.git \ No newline at end of file