diff --git a/Novetus/Novetus.Bootstrapper/Novetus.Bootstrapper.Net6.csproj b/Novetus/Novetus.Bootstrapper/Novetus.Bootstrapper.Net6.csproj index 0cc33e7..ebb8d46 100644 --- a/Novetus/Novetus.Bootstrapper/Novetus.Bootstrapper.Net6.csproj +++ b/Novetus/Novetus.Bootstrapper/Novetus.Bootstrapper.Net6.csproj @@ -14,10 +14,19 @@ $(DefineConstants);BASICLAUNCHER;NOVETUS_APPS + + + + + + + + + \ No newline at end of file diff --git a/Novetus/Novetus.Bootstrapper/Novetus.Bootstrapper.csproj b/Novetus/Novetus.Bootstrapper/Novetus.Bootstrapper.csproj index b6cf6ac..8b92589 100644 --- a/Novetus/Novetus.Bootstrapper/Novetus.Bootstrapper.csproj +++ b/Novetus/Novetus.Bootstrapper/Novetus.Bootstrapper.csproj @@ -38,9 +38,6 @@ app.manifest - - ..\packages\NLog.5.0.4\lib\net35\NLog.dll - diff --git a/Novetus/Novetus.Bootstrapper/packages.config b/Novetus/Novetus.Bootstrapper/packages.config index 9250ec9..e900644 100644 --- a/Novetus/Novetus.Bootstrapper/packages.config +++ b/Novetus/Novetus.Bootstrapper/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Novetus/Novetus.Net6.sln b/Novetus/Novetus.Net6.sln index 6fe1fb7..e6c3a88 100644 --- a/Novetus/Novetus.Net6.sln +++ b/Novetus/Novetus.Net6.sln @@ -37,6 +37,9 @@ Global SolutionGuid = {66CA6CE5-670E-48AA-A2DA-9347371D4CA0} EndGlobalSection GlobalSection(SharedMSBuildProjectFiles) = preSolution + NovetusCore\NovetusCore.projitems*{626d04b8-37a3-439c-bdb0-baa914b37ae5}*SharedItemsImports = 5 + NovetusCore\NovetusCore.projitems*{6bbca84a-28af-4ed3-a692-4b6ec8a5e964}*SharedItemsImports = 5 + NovetusCore\NovetusCore.projitems*{ad1772aa-a03f-4081-8979-b1c7c30c85c2}*SharedItemsImports = 5 NovetusCore\NovetusCore.projitems*{debcc57d-9a3b-4d7c-8693-fa4aec56c8c1}*SharedItemsImports = 13 EndGlobalSection EndGlobal diff --git a/Novetus/NovetusLauncher/Documentation.Designer.cs b/Novetus/NovetusLauncher/Documentation.Designer.cs deleted file mode 100644 index de1e664..0000000 --- a/Novetus/NovetusLauncher/Documentation.Designer.cs +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Created by SharpDevelop. - * User: BITL - * Date: 5/14/2017 - * Time: 9:14 AM - * - * To change this template use Tools | Options | Coding | Edit Standard Headers. - */ -namespace NovetusLauncher -{ - partial class ServerInfo - { - /// - /// Designer variable used to keep track of non-visual components. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Disposes resources used by the form. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing) { - if (components != null) { - components.Dispose(); - } - } - base.Dispose(disposing); - } - - /// - /// This method is required for Windows Forms designer support. - /// Do not change the method contents inside the source code editor. The Forms designer might - /// not be able to load this method if it was changed manually. - /// - private void InitializeComponent() - { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ServerInfo)); - this.textBox1 = new System.Windows.Forms.TextBox(); - this.SuspendLayout(); - // - // textBox1 - // - this.textBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.textBox1.BackColor = System.Drawing.SystemColors.ControlLightLight; - this.textBox1.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.textBox1.Location = new System.Drawing.Point(2, 3); - this.textBox1.Multiline = true; - this.textBox1.Name = "textBox1"; - this.textBox1.ReadOnly = true; - this.textBox1.Size = new System.Drawing.Size(501, 256); - this.textBox1.TabIndex = 0; - // - // ServerInfo - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.AutoScroll = true; - this.BackColor = System.Drawing.SystemColors.ControlLightLight; - this.ClientSize = new System.Drawing.Size(504, 262); - this.Controls.Add(this.textBox1); - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.MaximizeBox = false; - this.MinimumSize = new System.Drawing.Size(520, 300); - this.Name = "ServerInfo"; - this.Text = "Server Info"; - this.Load += new System.EventHandler(this.ServerInfoLoad); - this.ResumeLayout(false); - this.PerformLayout(); - } - private System.Windows.Forms.TextBox textBox1; - } -} diff --git a/Novetus/NovetusLauncher/Forms/LauncherForm/Stylish/LauncherFormStylish.cs b/Novetus/NovetusLauncher/Forms/LauncherForm/Stylish/LauncherFormStylish.cs index 49c5295..5030847 100644 --- a/Novetus/NovetusLauncher/Forms/LauncherForm/Stylish/LauncherFormStylish.cs +++ b/Novetus/NovetusLauncher/Forms/LauncherForm/Stylish/LauncherFormStylish.cs @@ -76,6 +76,11 @@ namespace NovetusLauncher } } + //NET 6 gives us an error, so we're adding this stuff manually. + launcherFormStylishInterface1.styleBox.Items.Add(new StyleListItem("Extended")); + launcherFormStylishInterface1.styleBox.Items.Add(new StyleListItem("Compact")); + launcherFormStylishInterface1.styleBox.Items.Add(new StyleListItem("Stylish")); + LocalVars.launcherInitState = false; CenterToScreen(); } diff --git a/Novetus/NovetusLauncher/Forms/LauncherForm/Stylish/LauncherFormStylishInterface.xaml b/Novetus/NovetusLauncher/Forms/LauncherForm/Stylish/LauncherFormStylishInterface.xaml index 3fa25d3..c8ab22d 100644 --- a/Novetus/NovetusLauncher/Forms/LauncherForm/Stylish/LauncherFormStylishInterface.xaml +++ b/Novetus/NovetusLauncher/Forms/LauncherForm/Stylish/LauncherFormStylishInterface.xaml @@ -867,11 +867,7 @@