diff --git a/NovetusLauncher/NovetusCMD/NovetusCMD.csproj b/NovetusLauncher/NovetusCMD/NovetusCMD.csproj index 0b154e1..9c565ce 100644 --- a/NovetusLauncher/NovetusCMD/NovetusCMD.csproj +++ b/NovetusLauncher/NovetusCMD/NovetusCMD.csproj @@ -51,24 +51,12 @@ false - - ..\packages\GitHubUpdate.1.2.0.0\lib\net45\GitHubUpdate.dll - True - 4.0 ..\packages\Mono.Nat.1.2.24.0\lib\net40\Mono.Nat.dll - - ..\packages\Octokit.0.3.4\lib\net45\Octokit.dll - True - - - ..\packages\semver.1.1.2\lib\net45\Semver.dll - True - 3.5 diff --git a/NovetusLauncher/NovetusCMD/packages.config b/NovetusLauncher/NovetusCMD/packages.config index d7c4187..08e33ab 100644 --- a/NovetusLauncher/NovetusCMD/packages.config +++ b/NovetusLauncher/NovetusCMD/packages.config @@ -1,7 +1,4 @@  - - - \ No newline at end of file diff --git a/NovetusLauncher/NovetusFuncs/NovetusFuncs.projitems b/NovetusLauncher/NovetusFuncs/NovetusFuncs.projitems index f94d9e3..846caf7 100644 --- a/NovetusLauncher/NovetusFuncs/NovetusFuncs.projitems +++ b/NovetusLauncher/NovetusFuncs/NovetusFuncs.projitems @@ -27,7 +27,6 @@ - diff --git a/NovetusLauncher/NovetusFuncs/Updater.cs b/NovetusLauncher/NovetusFuncs/Updater.cs deleted file mode 100644 index 37b5db7..0000000 --- a/NovetusLauncher/NovetusFuncs/Updater.cs +++ /dev/null @@ -1,44 +0,0 @@ -using GitHubUpdate; -using System.Windows.Forms; - -public class Updater -{ - private string GitHubName = ""; - private string GitHubRepo = ""; - - public Updater() - { - } - - public void setName(string text) - { - GitHubName = text; - } - - public void setRepo(string text) - { - GitHubRepo = text; - } - - public async void UpdateNovetus() - { - var checker = new UpdateChecker(GitHubName, GitHubRepo, GlobalVars.Version); - - UpdateType update = await checker.CheckUpdate(); - - if (update != UpdateType.None) - { - // Ask the user if he wants to update - // You can use the prebuilt form for this if you want (it's really pretty!) - var result = new UpdateNotifyDialog(checker).ShowDialog(); - if (result == DialogResult.Yes) - { - checker.DownloadAsset("Release-" + checker.getCurrentRelease().TagName + ".zip"); // opens it in the user's browser - if (!string.IsNullOrWhiteSpace(checker.getDownloadOutcome())) - { - MessageBox.Show(checker.getDownloadOutcome(), "Novetus Updater", MessageBoxButtons.OK, MessageBoxIcon.Information); - } - } - } - } -} diff --git a/NovetusLauncher/NovetusLauncher.sln b/NovetusLauncher/NovetusLauncher.sln index bdcc1bb..8af3024 100644 --- a/NovetusLauncher/NovetusLauncher.sln +++ b/NovetusLauncher/NovetusLauncher.sln @@ -9,6 +9,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NovetusCMD", "NovetusCMD\No EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "NovetusFuncs", "NovetusFuncs\NovetusFuncs.shproj", "{54856A61-1EE2-40C3-85AE-C54B8DE7CC30}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NovetusLauncher2_0", "NovetusLauncher2_0\NovetusLauncher2_0.csproj", "{4403821F-B3C8-4DCF-866C-7EAC6541C204}" +EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution NovetusFuncs\NovetusFuncs.projitems*{54856a61-1ee2-40c3-85ae-c54b8de7cc30}*SharedItemsImports = 13 @@ -28,6 +30,10 @@ Global {BAC99C87-F6C1-4ED0-AA2E-05C6AE8979EA}.Debug|Any CPU.Build.0 = Debug|Any CPU {BAC99C87-F6C1-4ED0-AA2E-05C6AE8979EA}.Release|Any CPU.ActiveCfg = Release|Any CPU {BAC99C87-F6C1-4ED0-AA2E-05C6AE8979EA}.Release|Any CPU.Build.0 = Release|Any CPU + {4403821F-B3C8-4DCF-866C-7EAC6541C204}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4403821F-B3C8-4DCF-866C-7EAC6541C204}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4403821F-B3C8-4DCF-866C-7EAC6541C204}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4403821F-B3C8-4DCF-866C-7EAC6541C204}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/NovetusLauncher/NovetusLauncher/NovetusLauncher.csproj b/NovetusLauncher/NovetusLauncher/NovetusLauncher.csproj index 22db203..e510194 100644 --- a/NovetusLauncher/NovetusLauncher/NovetusLauncher.csproj +++ b/NovetusLauncher/NovetusLauncher/NovetusLauncher.csproj @@ -55,21 +55,9 @@ false - - ..\packages\GitHubUpdate.1.2.0.0\lib\net45\GitHubUpdate.dll - True - ..\packages\Mono.Nat.1.2.24.0\lib\net40\Mono.Nat.dll - - ..\packages\Octokit.0.3.4\lib\net45\Octokit.dll - True - - - ..\packages\semver.1.1.2\lib\net45\Semver.dll - True - 3.5 diff --git a/NovetusLauncher/NovetusLauncher/packages.config b/NovetusLauncher/NovetusLauncher/packages.config index d7c4187..08e33ab 100644 --- a/NovetusLauncher/NovetusLauncher/packages.config +++ b/NovetusLauncher/NovetusLauncher/packages.config @@ -1,7 +1,4 @@  - - - \ No newline at end of file diff --git a/NovetusLauncher/NovetusLauncher2_0/App.config b/NovetusLauncher/NovetusLauncher2_0/App.config new file mode 100644 index 0000000..88fa402 --- /dev/null +++ b/NovetusLauncher/NovetusLauncher2_0/App.config @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/NovetusLauncher/NovetusLauncher2_0/App.xaml b/NovetusLauncher/NovetusLauncher2_0/App.xaml new file mode 100644 index 0000000..0f8b847 --- /dev/null +++ b/NovetusLauncher/NovetusLauncher2_0/App.xaml @@ -0,0 +1,9 @@ + + + + + diff --git a/NovetusLauncher/NovetusLauncher2_0/App.xaml.cs b/NovetusLauncher/NovetusLauncher2_0/App.xaml.cs new file mode 100644 index 0000000..0038db7 --- /dev/null +++ b/NovetusLauncher/NovetusLauncher2_0/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 NovetusLauncher2_0 +{ + /// + /// Interaction logic for App.xaml + /// + public partial class App : Application + { + } +} diff --git a/NovetusLauncher/NovetusLauncher2_0/MainWindow.xaml b/NovetusLauncher/NovetusLauncher2_0/MainWindow.xaml new file mode 100644 index 0000000..9b59d07 --- /dev/null +++ b/NovetusLauncher/NovetusLauncher2_0/MainWindow.xaml @@ -0,0 +1,12 @@ + + + + + diff --git a/NovetusLauncher/NovetusLauncher2_0/MainWindow.xaml.cs b/NovetusLauncher/NovetusLauncher2_0/MainWindow.xaml.cs new file mode 100644 index 0000000..c9b1e31 --- /dev/null +++ b/NovetusLauncher/NovetusLauncher2_0/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 NovetusLauncher2_0 +{ + /// + /// Interaction logic for MainWindow.xaml + /// + public partial class MainWindow : Window + { + public MainWindow() + { + InitializeComponent(); + } + } +} diff --git a/NovetusLauncher/NovetusLauncher2_0/NovetusLauncher2_0.csproj b/NovetusLauncher/NovetusLauncher2_0/NovetusLauncher2_0.csproj new file mode 100644 index 0000000..4465ee6 --- /dev/null +++ b/NovetusLauncher/NovetusLauncher2_0/NovetusLauncher2_0.csproj @@ -0,0 +1,106 @@ + + + + + Debug + AnyCPU + {4403821F-B3C8-4DCF-866C-7EAC6541C204} + WinExe + Properties + NovetusLauncher2_0 + NovetusLauncher2_0 + v4.5.2 + 512 + {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + 4 + 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/NovetusLauncher/NovetusLauncher2_0/Properties/AssemblyInfo.cs b/NovetusLauncher/NovetusLauncher2_0/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..50b07c4 --- /dev/null +++ b/NovetusLauncher/NovetusLauncher2_0/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("NovetusLauncher2_0")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("NovetusLauncher2_0")] +[assembly: AssemblyCopyright("Copyright © 2020")] +[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/NovetusLauncher/NovetusLauncher2_0/Properties/Resources.Designer.cs b/NovetusLauncher/NovetusLauncher2_0/Properties/Resources.Designer.cs new file mode 100644 index 0000000..ea30d90 --- /dev/null +++ b/NovetusLauncher/NovetusLauncher2_0/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 NovetusLauncher2_0.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("NovetusLauncher2_0.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/NovetusLauncher/NovetusLauncher2_0/Properties/Resources.resx b/NovetusLauncher/NovetusLauncher2_0/Properties/Resources.resx new file mode 100644 index 0000000..af7dbeb --- /dev/null +++ b/NovetusLauncher/NovetusLauncher2_0/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/NovetusLauncher/NovetusLauncher2_0/Properties/Settings.Designer.cs b/NovetusLauncher/NovetusLauncher2_0/Properties/Settings.Designer.cs new file mode 100644 index 0000000..f9056e8 --- /dev/null +++ b/NovetusLauncher/NovetusLauncher2_0/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 NovetusLauncher2_0.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/NovetusLauncher/NovetusLauncher2_0/Properties/Settings.settings b/NovetusLauncher/NovetusLauncher2_0/Properties/Settings.settings new file mode 100644 index 0000000..033d7a5 --- /dev/null +++ b/NovetusLauncher/NovetusLauncher2_0/Properties/Settings.settings @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file