From d83b2b438e0b0b555904a7e379f632e9a82e980b Mon Sep 17 00:00:00 2001 From: Bitl Date: Fri, 11 Oct 2019 09:03:35 -0700 Subject: [PATCH] Using VS 2015 now! NovetusShared is now a proper Shared project (NovetusFuncs) --- NovetusLauncher/.vs/NovetusLauncher/v14/.suo | Bin 0 -> 78848 bytes NovetusLauncher/NovetusCMD/NovetusCMD.csproj | 7 +- NovetusLauncher/NovetusCMD/Program.cs | 5 +- .../ClientScript.cs | 0 .../CodeExtensions.cs | 3 +- .../CryptoRandom.cs | 1 - .../DiscordRpc.cs | 2 - .../GlobalVars.cs | 1 - .../IniFile.cs | 2 - .../LauncherFuncs.cs | 4 - .../NovetusFuncs/NovetusFuncs.projitems | 27 +++++++ .../NovetusFuncs/NovetusFuncs.shproj | 13 ++++ .../ScriptGenerator.cs | 1 - .../SecurityFuncs.cs | 0 .../SplashReader.cs | 1 - .../TextLineRemover.cs | 1 - .../TreeNodeHelper.cs | 1 - .../{NovetusShared => NovetusFuncs}/UPnP.cs | 1 - .../WebServer.cs | 1 - NovetusLauncher/NovetusLauncher.sln | 21 +++-- .../NovetusLauncher/CharacterCustomization.cs | 6 +- .../ClientScriptDocumentation.cs | 3 +- .../NovetusLauncher/ClientinfoCreator.cs | 5 +- NovetusLauncher/NovetusLauncher/ItemMaker.cs | 6 +- NovetusLauncher/NovetusLauncher/LoaderForm.cs | 6 +- NovetusLauncher/NovetusLauncher/MainForm.cs | 2 +- .../NovetusLauncher/NovetusLauncher.csproj | 39 ++++++---- NovetusLauncher/NovetusLauncher/Program.cs | 2 +- .../NovetusLauncher/QuickConfigure.cs | 7 +- NovetusLauncher/NovetusLauncher/ServerInfo.cs | 3 +- .../NovetusShared/NovetusShared.csproj | 72 ------------------ .../NovetusShared/NovetusShared.sln | 18 ----- .../NovetusShared/Properties/AssemblyInfo.cs | 31 -------- NovetusLauncher/NovetusShared/packages.config | 4 - 34 files changed, 91 insertions(+), 205 deletions(-) create mode 100644 NovetusLauncher/.vs/NovetusLauncher/v14/.suo rename NovetusLauncher/{NovetusShared => NovetusFuncs}/ClientScript.cs (100%) rename NovetusLauncher/{NovetusShared => NovetusFuncs}/CodeExtensions.cs (97%) rename NovetusLauncher/{NovetusShared => NovetusFuncs}/CryptoRandom.cs (98%) rename NovetusLauncher/{NovetusShared => NovetusFuncs}/DiscordRpc.cs (98%) rename NovetusLauncher/{NovetusShared => NovetusFuncs}/GlobalVars.cs (99%) rename NovetusLauncher/{NovetusShared => NovetusFuncs}/IniFile.cs (97%) rename NovetusLauncher/{NovetusShared => NovetusFuncs}/LauncherFuncs.cs (99%) create mode 100644 NovetusLauncher/NovetusFuncs/NovetusFuncs.projitems create mode 100644 NovetusLauncher/NovetusFuncs/NovetusFuncs.shproj rename NovetusLauncher/{NovetusShared => NovetusFuncs}/ScriptGenerator.cs (99%) rename NovetusLauncher/{NovetusShared => NovetusFuncs}/SecurityFuncs.cs (100%) rename NovetusLauncher/{NovetusShared => NovetusFuncs}/SplashReader.cs (99%) rename NovetusLauncher/{NovetusShared => NovetusFuncs}/TextLineRemover.cs (99%) rename NovetusLauncher/{NovetusShared => NovetusFuncs}/TreeNodeHelper.cs (99%) rename NovetusLauncher/{NovetusShared => NovetusFuncs}/UPnP.cs (98%) rename NovetusLauncher/{NovetusShared => NovetusFuncs}/WebServer.cs (99%) delete mode 100644 NovetusLauncher/NovetusShared/NovetusShared.csproj delete mode 100644 NovetusLauncher/NovetusShared/NovetusShared.sln delete mode 100644 NovetusLauncher/NovetusShared/Properties/AssemblyInfo.cs delete mode 100644 NovetusLauncher/NovetusShared/packages.config diff --git a/NovetusLauncher/.vs/NovetusLauncher/v14/.suo b/NovetusLauncher/.vs/NovetusLauncher/v14/.suo new file mode 100644 index 0000000000000000000000000000000000000000..932eea9345fd40164831dcc01ef8a124ee9b4ed3 GIT binary patch literal 78848 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 - - - {759bfc2b-c130-4a2a-a01f-65abfee85b4c} - NovetusShared - - + \ No newline at end of file diff --git a/NovetusLauncher/NovetusCMD/Program.cs b/NovetusLauncher/NovetusCMD/Program.cs index 0bec9b9..d3dcdf6 100644 --- a/NovetusLauncher/NovetusCMD/Program.cs +++ b/NovetusLauncher/NovetusCMD/Program.cs @@ -8,11 +8,10 @@ */ using System; using Mono.Nat; -using NovetusShared; + using System.Diagnostics; using System.IO; -using System.ComponentModel; -using System.Reflection; + namespace NovetusCMD { diff --git a/NovetusLauncher/NovetusShared/ClientScript.cs b/NovetusLauncher/NovetusFuncs/ClientScript.cs similarity index 100% rename from NovetusLauncher/NovetusShared/ClientScript.cs rename to NovetusLauncher/NovetusFuncs/ClientScript.cs diff --git a/NovetusLauncher/NovetusShared/CodeExtensions.cs b/NovetusLauncher/NovetusFuncs/CodeExtensions.cs similarity index 97% rename from NovetusLauncher/NovetusShared/CodeExtensions.cs rename to NovetusLauncher/NovetusFuncs/CodeExtensions.cs index 42cdc75..16bfe8b 100644 --- a/NovetusLauncher/NovetusShared/CodeExtensions.cs +++ b/NovetusLauncher/NovetusFuncs/CodeExtensions.cs @@ -6,12 +6,11 @@ * * To change this template use Tools | Options | Coding | Edit Standard Headers. */ - + using System; using System.Drawing; using System.Windows.Forms; using System.Diagnostics; -using System.Linq; public static class RichTextBoxExtensions { diff --git a/NovetusLauncher/NovetusShared/CryptoRandom.cs b/NovetusLauncher/NovetusFuncs/CryptoRandom.cs similarity index 98% rename from NovetusLauncher/NovetusShared/CryptoRandom.cs rename to NovetusLauncher/NovetusFuncs/CryptoRandom.cs index cd3398a..4712c7c 100644 --- a/NovetusLauncher/NovetusShared/CryptoRandom.cs +++ b/NovetusLauncher/NovetusFuncs/CryptoRandom.cs @@ -9,7 +9,6 @@ using System; using System.Security.Cryptography; -using System.Linq; public class CryptoRandom : RandomNumberGenerator { diff --git a/NovetusLauncher/NovetusShared/DiscordRpc.cs b/NovetusLauncher/NovetusFuncs/DiscordRpc.cs similarity index 98% rename from NovetusLauncher/NovetusShared/DiscordRpc.cs rename to NovetusLauncher/NovetusFuncs/DiscordRpc.cs index 582d0b7..68ec8e9 100644 --- a/NovetusLauncher/NovetusShared/DiscordRpc.cs +++ b/NovetusLauncher/NovetusFuncs/DiscordRpc.cs @@ -7,9 +7,7 @@ * To change this template use Tools | Options | Coding | Edit Standard Headers. */ -using System; using System.Runtime.InteropServices; -using System.Linq; //Discord Rich Presence Integration :D public class DiscordRpc diff --git a/NovetusLauncher/NovetusShared/GlobalVars.cs b/NovetusLauncher/NovetusFuncs/GlobalVars.cs similarity index 99% rename from NovetusLauncher/NovetusShared/GlobalVars.cs rename to NovetusLauncher/NovetusFuncs/GlobalVars.cs index 0907d86..95169c5 100644 --- a/NovetusLauncher/NovetusShared/GlobalVars.cs +++ b/NovetusLauncher/NovetusFuncs/GlobalVars.cs @@ -10,7 +10,6 @@ using System; using System.IO; using System.Reflection; -using System.Linq; public static class GlobalVars { diff --git a/NovetusLauncher/NovetusShared/IniFile.cs b/NovetusLauncher/NovetusFuncs/IniFile.cs similarity index 97% rename from NovetusLauncher/NovetusShared/IniFile.cs rename to NovetusLauncher/NovetusFuncs/IniFile.cs index a77a414..b4d46ba 100644 --- a/NovetusLauncher/NovetusShared/IniFile.cs +++ b/NovetusLauncher/NovetusFuncs/IniFile.cs @@ -7,10 +7,8 @@ * To change this template use Tools | Options | Coding | Edit Standard Headers. */ -using System; using System.Text; using System.Runtime.InteropServices; -using System.Linq; //credit to BLaZiNiX public class IniFile diff --git a/NovetusLauncher/NovetusShared/LauncherFuncs.cs b/NovetusLauncher/NovetusFuncs/LauncherFuncs.cs similarity index 99% rename from NovetusLauncher/NovetusShared/LauncherFuncs.cs rename to NovetusLauncher/NovetusFuncs/LauncherFuncs.cs index b8a2146..a0eebbe 100644 --- a/NovetusLauncher/NovetusShared/LauncherFuncs.cs +++ b/NovetusLauncher/NovetusFuncs/LauncherFuncs.cs @@ -8,11 +8,7 @@ */ using System; using System.IO; -using System.Linq; -/// -/// Description of LauncherFuncs. -/// public class LauncherFuncs { public LauncherFuncs() diff --git a/NovetusLauncher/NovetusFuncs/NovetusFuncs.projitems b/NovetusLauncher/NovetusFuncs/NovetusFuncs.projitems new file mode 100644 index 0000000..76341db --- /dev/null +++ b/NovetusLauncher/NovetusFuncs/NovetusFuncs.projitems @@ -0,0 +1,27 @@ + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + true + 54856a61-1ee2-40c3-85ae-c54b8de7cc30 + + + NovetusFuncs + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/NovetusLauncher/NovetusFuncs/NovetusFuncs.shproj b/NovetusLauncher/NovetusFuncs/NovetusFuncs.shproj new file mode 100644 index 0000000..301b419 --- /dev/null +++ b/NovetusLauncher/NovetusFuncs/NovetusFuncs.shproj @@ -0,0 +1,13 @@ + + + + 54856a61-1ee2-40c3-85ae-c54b8de7cc30 + 14.0 + + + + + + + + diff --git a/NovetusLauncher/NovetusShared/ScriptGenerator.cs b/NovetusLauncher/NovetusFuncs/ScriptGenerator.cs similarity index 99% rename from NovetusLauncher/NovetusShared/ScriptGenerator.cs rename to NovetusLauncher/NovetusFuncs/ScriptGenerator.cs index e5492f7..ef8a57a 100644 --- a/NovetusLauncher/NovetusShared/ScriptGenerator.cs +++ b/NovetusLauncher/NovetusFuncs/ScriptGenerator.cs @@ -12,7 +12,6 @@ using System.Collections.Generic; using System.IO; using System.Reflection; using System.Text.RegularExpressions; -using System.Linq; /* * so, in order for us to generate a good script, we have to: diff --git a/NovetusLauncher/NovetusShared/SecurityFuncs.cs b/NovetusLauncher/NovetusFuncs/SecurityFuncs.cs similarity index 100% rename from NovetusLauncher/NovetusShared/SecurityFuncs.cs rename to NovetusLauncher/NovetusFuncs/SecurityFuncs.cs diff --git a/NovetusLauncher/NovetusShared/SplashReader.cs b/NovetusLauncher/NovetusFuncs/SplashReader.cs similarity index 99% rename from NovetusLauncher/NovetusShared/SplashReader.cs rename to NovetusLauncher/NovetusFuncs/SplashReader.cs index 6ffef34..cbdb7e9 100644 --- a/NovetusLauncher/NovetusShared/SplashReader.cs +++ b/NovetusLauncher/NovetusFuncs/SplashReader.cs @@ -9,7 +9,6 @@ using System; using System.IO; -using System.Linq; public static class SplashReader { diff --git a/NovetusLauncher/NovetusShared/TextLineRemover.cs b/NovetusLauncher/NovetusFuncs/TextLineRemover.cs similarity index 99% rename from NovetusLauncher/NovetusShared/TextLineRemover.cs rename to NovetusLauncher/NovetusFuncs/TextLineRemover.cs index 1104f1e..9b9c351 100644 --- a/NovetusLauncher/NovetusShared/TextLineRemover.cs +++ b/NovetusLauncher/NovetusFuncs/TextLineRemover.cs @@ -10,7 +10,6 @@ using System; using System.Collections.Generic; using System.IO; -using System.Linq; public static class TextLineRemover { diff --git a/NovetusLauncher/NovetusShared/TreeNodeHelper.cs b/NovetusLauncher/NovetusFuncs/TreeNodeHelper.cs similarity index 99% rename from NovetusLauncher/NovetusShared/TreeNodeHelper.cs rename to NovetusLauncher/NovetusFuncs/TreeNodeHelper.cs index 6f771d1..03af94d 100644 --- a/NovetusLauncher/NovetusShared/TreeNodeHelper.cs +++ b/NovetusLauncher/NovetusFuncs/TreeNodeHelper.cs @@ -11,7 +11,6 @@ using System; using System.Collections.Generic; using System.Windows.Forms; using System.IO; -using System.Linq; public static class TreeNodeHelper { diff --git a/NovetusLauncher/NovetusShared/UPnP.cs b/NovetusLauncher/NovetusFuncs/UPnP.cs similarity index 98% rename from NovetusLauncher/NovetusShared/UPnP.cs rename to NovetusLauncher/NovetusFuncs/UPnP.cs index 8a004e7..cb7d141 100644 --- a/NovetusLauncher/NovetusShared/UPnP.cs +++ b/NovetusLauncher/NovetusFuncs/UPnP.cs @@ -8,7 +8,6 @@ */ using System; -using System.Linq; using Mono.Nat; public static class UPnP diff --git a/NovetusLauncher/NovetusShared/WebServer.cs b/NovetusLauncher/NovetusFuncs/WebServer.cs similarity index 99% rename from NovetusLauncher/NovetusShared/WebServer.cs rename to NovetusLauncher/NovetusFuncs/WebServer.cs index 829a32a..c3689bc 100644 --- a/NovetusLauncher/NovetusShared/WebServer.cs +++ b/NovetusLauncher/NovetusFuncs/WebServer.cs @@ -13,7 +13,6 @@ using System.IO; using System.Diagnostics; using System.Threading; using System.Text; -using System.Linq; using System.Net.Sockets; using System.Net; diff --git a/NovetusLauncher/NovetusLauncher.sln b/NovetusLauncher/NovetusLauncher.sln index b84b65e..bdcc1bb 100644 --- a/NovetusLauncher/NovetusLauncher.sln +++ b/NovetusLauncher/NovetusLauncher.sln @@ -1,14 +1,20 @@  -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -# SharpDevelop 5.1 +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 14 +VisualStudioVersion = 14.0.25420.1 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NovetusLauncher", "NovetusLauncher\NovetusLauncher.csproj", "{F92FFBED-2767-4676-9711-BB89CDA58A43}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NovetusCMD", "NovetusCMD\NovetusCMD.csproj", "{BAC99C87-F6C1-4ED0-AA2E-05C6AE8979EA}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NovetusShared", "NovetusShared\NovetusShared.csproj", "{759BFC2B-C130-4A2A-A01F-65ABFEE85B4C}" +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "NovetusFuncs", "NovetusFuncs\NovetusFuncs.shproj", "{54856A61-1EE2-40C3-85AE-C54B8DE7CC30}" EndProject Global + GlobalSection(SharedMSBuildProjectFiles) = preSolution + NovetusFuncs\NovetusFuncs.projitems*{54856a61-1ee2-40c3-85ae-c54b8de7cc30}*SharedItemsImports = 13 + NovetusFuncs\NovetusFuncs.projitems*{bac99c87-f6c1-4ed0-aa2e-05c6ae8979ea}*SharedItemsImports = 4 + NovetusFuncs\NovetusFuncs.projitems*{f92ffbed-2767-4676-9711-bb89cda58a43}*SharedItemsImports = 4 + EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU @@ -22,9 +28,8 @@ 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 - {759BFC2B-C130-4A2A-A01F-65ABFEE85B4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {759BFC2B-C130-4A2A-A01F-65ABFEE85B4C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {759BFC2B-C130-4A2A-A01F-65ABFEE85B4C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {759BFC2B-C130-4A2A-A01F-65ABFEE85B4C}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE EndGlobalSection EndGlobal diff --git a/NovetusLauncher/NovetusLauncher/CharacterCustomization.cs b/NovetusLauncher/NovetusLauncher/CharacterCustomization.cs index 7c7d30d..abd289f 100644 --- a/NovetusLauncher/NovetusLauncher/CharacterCustomization.cs +++ b/NovetusLauncher/NovetusLauncher/CharacterCustomization.cs @@ -10,13 +10,9 @@ using System; using System.Drawing; using System.Windows.Forms; using System.IO; -using System.Reflection; -using System.Security.Cryptography; -using System.Text; -using System.Text.RegularExpressions; using System.Diagnostics; using System.ComponentModel; -using NovetusShared; + namespace NovetusLauncher { diff --git a/NovetusLauncher/NovetusLauncher/ClientScriptDocumentation.cs b/NovetusLauncher/NovetusLauncher/ClientScriptDocumentation.cs index a807486..e30d306 100644 --- a/NovetusLauncher/NovetusLauncher/ClientScriptDocumentation.cs +++ b/NovetusLauncher/NovetusLauncher/ClientScriptDocumentation.cs @@ -7,10 +7,9 @@ * To change this template use Tools | Options | Coding | Edit Standard Headers. */ using System; -using System.Drawing; using System.Windows.Forms; using System.IO; -using NovetusShared; + namespace NovetusLauncher { diff --git a/NovetusLauncher/NovetusLauncher/ClientinfoCreator.cs b/NovetusLauncher/NovetusLauncher/ClientinfoCreator.cs index 2daa1fb..0962f43 100644 --- a/NovetusLauncher/NovetusLauncher/ClientinfoCreator.cs +++ b/NovetusLauncher/NovetusLauncher/ClientinfoCreator.cs @@ -7,12 +7,9 @@ * To change this template use Tools | Options | Coding | Edit Standard Headers. */ using System; -using System.Drawing; using System.Windows.Forms; using System.IO; -using System.Diagnostics; -using System.Threading; -using NovetusShared; + namespace NovetusLauncher { diff --git a/NovetusLauncher/NovetusLauncher/ItemMaker.cs b/NovetusLauncher/NovetusLauncher/ItemMaker.cs index ec3d33d..4888611 100644 --- a/NovetusLauncher/NovetusLauncher/ItemMaker.cs +++ b/NovetusLauncher/NovetusLauncher/ItemMaker.cs @@ -7,13 +7,9 @@ * To change this template use Tools | Options | Coding | Edit Standard Headers. */ using System; -using System.Drawing; using System.Windows.Forms; -using System.Net; -using System.IO; -using System.Reflection; using System.ComponentModel; -using NovetusShared; + namespace NovetusLauncher { diff --git a/NovetusLauncher/NovetusLauncher/LoaderForm.cs b/NovetusLauncher/NovetusLauncher/LoaderForm.cs index d13bc81..397204e 100644 --- a/NovetusLauncher/NovetusLauncher/LoaderForm.cs +++ b/NovetusLauncher/NovetusLauncher/LoaderForm.cs @@ -10,13 +10,9 @@ using System; using System.IO; using System.Diagnostics; using System.Threading; -using System.Drawing; using System.Windows.Forms; using System.Reflection; -using System.Security.Cryptography; -using System.Text; -using System.Text.RegularExpressions; -using NovetusShared; + namespace NovetusLauncher { diff --git a/NovetusLauncher/NovetusLauncher/MainForm.cs b/NovetusLauncher/NovetusLauncher/MainForm.cs index bd0a795..2f9361f 100644 --- a/NovetusLauncher/NovetusLauncher/MainForm.cs +++ b/NovetusLauncher/NovetusLauncher/MainForm.cs @@ -15,7 +15,7 @@ using System.Diagnostics; using System.ComponentModel; using System.Reflection; using Mono.Nat; -using NovetusShared; + namespace NovetusLauncher { diff --git a/NovetusLauncher/NovetusLauncher/NovetusLauncher.csproj b/NovetusLauncher/NovetusLauncher/NovetusLauncher.csproj index 8d35410..861aa47 100644 --- a/NovetusLauncher/NovetusLauncher/NovetusLauncher.csproj +++ b/NovetusLauncher/NovetusLauncher/NovetusLauncher.csproj @@ -68,35 +68,51 @@ - + + Form + CharacterCustomization.cs - + + Form + ClientinfoCreator.cs - + + Form + ClientScriptDocumentation.cs - + + Form + ItemMaker.cs - + + Form + LoaderForm.cs - + + Form + QuickConfigure.cs - + + Form + ServerInfo.cs - + + Form + MainForm.cs @@ -133,11 +149,6 @@ - - - {759bfc2b-c130-4a2a-a01f-65abfee85b4c} - NovetusShared - - + \ No newline at end of file diff --git a/NovetusLauncher/NovetusLauncher/Program.cs b/NovetusLauncher/NovetusLauncher/Program.cs index f723525..85afaf5 100644 --- a/NovetusLauncher/NovetusLauncher/Program.cs +++ b/NovetusLauncher/NovetusLauncher/Program.cs @@ -8,7 +8,7 @@ */ using System; using System.Windows.Forms; -using NovetusShared; + namespace NovetusLauncher { diff --git a/NovetusLauncher/NovetusLauncher/QuickConfigure.cs b/NovetusLauncher/NovetusLauncher/QuickConfigure.cs index 93a693c..2e1d194 100644 --- a/NovetusLauncher/NovetusLauncher/QuickConfigure.cs +++ b/NovetusLauncher/NovetusLauncher/QuickConfigure.cs @@ -7,15 +7,10 @@ * To change this template use Tools | Options | Coding | Edit Standard Headers. */ using System; -using System.Drawing; using System.Windows.Forms; -using System.Reflection; -using System.Security.Cryptography; -using System.Text; -using System.Text.RegularExpressions; using System.IO; using System.ComponentModel; -using NovetusShared; + namespace NovetusLauncher { diff --git a/NovetusLauncher/NovetusLauncher/ServerInfo.cs b/NovetusLauncher/NovetusLauncher/ServerInfo.cs index 6b48984..a417331 100644 --- a/NovetusLauncher/NovetusLauncher/ServerInfo.cs +++ b/NovetusLauncher/NovetusLauncher/ServerInfo.cs @@ -7,10 +7,9 @@ * To change this template use Tools | Options | Coding | Edit Standard Headers. */ using System; -using System.Drawing; using System.Windows.Forms; using System.Net; -using NovetusShared; + namespace NovetusLauncher { diff --git a/NovetusLauncher/NovetusShared/NovetusShared.csproj b/NovetusLauncher/NovetusShared/NovetusShared.csproj deleted file mode 100644 index d7c4fa4..0000000 --- a/NovetusLauncher/NovetusShared/NovetusShared.csproj +++ /dev/null @@ -1,72 +0,0 @@ - - - - {759BFC2B-C130-4A2A-A01F-65ABFEE85B4C} - {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Release - AnyCPU - Library - NovetusShared - NovetusShared - v4.0 - Properties - - - AnyCPU - - - bin\Debug\ - True - Full - False - True - DEBUG;TRACE - - - bin\Release\ - False - None - True - False - TRACE - - - - 4.0 - - - ..\packages\Mono.Nat.1.2.24.0\lib\net40\Mono.Nat.dll - - - - 3.5 - - - - - - 3.5 - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/NovetusLauncher/NovetusShared/NovetusShared.sln b/NovetusLauncher/NovetusShared/NovetusShared.sln deleted file mode 100644 index 77255f4..0000000 --- a/NovetusLauncher/NovetusShared/NovetusShared.sln +++ /dev/null @@ -1,18 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -# SharpDevelop 5.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NovetusShared", "NovetusShared.csproj", "{759BFC2B-C130-4A2A-A01F-65ABFEE85B4C}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {759BFC2B-C130-4A2A-A01F-65ABFEE85B4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {759BFC2B-C130-4A2A-A01F-65ABFEE85B4C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {759BFC2B-C130-4A2A-A01F-65ABFEE85B4C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {759BFC2B-C130-4A2A-A01F-65ABFEE85B4C}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection -EndGlobal diff --git a/NovetusLauncher/NovetusShared/Properties/AssemblyInfo.cs b/NovetusLauncher/NovetusShared/Properties/AssemblyInfo.cs deleted file mode 100644 index a4be006..0000000 --- a/NovetusLauncher/NovetusShared/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,31 +0,0 @@ -#region Using directives - -using System; -using System.Reflection; -using System.Runtime.InteropServices; - -#endregion - -// 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("NovetusShared")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("NovetusShared")] -[assembly: AssemblyCopyright("Copyright 2019")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// This sets the default COM visibility of types in the assembly to invisible. -// If you need to expose a type to COM, use [ComVisible(true)] on that type. -[assembly: ComVisible(false)] - -// The assembly version has following format : -// -// Major.Minor.Build.Revision -// -// You can specify all the values or you can use the default the Revision and -// Build Numbers by using the '*' as shown below: -[assembly: AssemblyVersion("1.0.*")] diff --git a/NovetusLauncher/NovetusShared/packages.config b/NovetusLauncher/NovetusShared/packages.config deleted file mode 100644 index 08e33ab..0000000 --- a/NovetusLauncher/NovetusShared/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file