From 949138ca4b0efac7766a58fc3a1dd4a8344486b5 Mon Sep 17 00:00:00 2001 From: Bitl Date: Tue, 20 Dec 2022 07:17:42 -0700 Subject: [PATCH] prune old files. deprecate net 4.0 --- .../Novetus.Bootstrapper.Net481.csproj | 120 ----- .../Novetus.Bootstrapper.csproj | 13 +- .../Novetus.ClientScriptTester.Net481.csproj | 113 ----- .../Novetus.ClientScriptTester.csproj | 10 +- Novetus/Novetus.Net481.sln | 45 -- .../ReleasePreparer.cs | 123 +---- Novetus/Novetus.Tools.Net481.sln | 31 -- Novetus/Novetus.Tools.sln | 6 + Novetus/Novetus.sln | 48 +- .../Novetus.Launcher.Net481.csproj | 471 ------------------ .../NovetusLauncher/Novetus.Launcher.csproj | 71 +-- Novetus/NovetusURI/Novetus.URI.Net481.csproj | 223 --------- Novetus/NovetusURI/Novetus.URI.csproj | 61 ++- Novetus_SolutionLoader.bat | 43 -- README.md | 4 +- changelog.txt | 17 +- old/query.php | 83 --- .../Novetus_dependency_installer_4.0.bat | 104 ---- scripts/batch/create_lite.bat | 4 - scripts/batch/dev_menu.bat | 52 +- scripts/batch/github_sync.bat | 3 - scripts/batch/liteexclude.txt | 1 - scripts/batch/old/itch_loadNovetusCMDHelp.bat | 1 - scripts/batch/old/itch_loadNovetusSDK.bat | 3 - scripts/batch/old/itch_loadNovetusURI.bat | 27 - scripts/launcher/info.ini | 2 +- scripts/launcher/splashes.txt | 6 +- scripts/old/NovetusSetup.iss | 65 --- scripts/old/index.php | 13 - 29 files changed, 179 insertions(+), 1584 deletions(-) delete mode 100644 Novetus/Novetus.Bootstrapper/Novetus.Bootstrapper.Net481.csproj delete mode 100644 Novetus/Novetus.ClientScriptTester/Novetus.ClientScriptTester.Net481.csproj delete mode 100644 Novetus/Novetus.Net481.sln delete mode 100644 Novetus/Novetus.Tools.Net481.sln delete mode 100644 Novetus/NovetusLauncher/Novetus.Launcher.Net481.csproj delete mode 100644 Novetus/NovetusURI/Novetus.URI.Net481.csproj delete mode 100644 Novetus_SolutionLoader.bat delete mode 100644 old/query.php delete mode 100644 scripts/batch/Novetus_dependency_installer_4.0.bat delete mode 100644 scripts/batch/create_lite.bat delete mode 100644 scripts/batch/liteexclude.txt delete mode 100644 scripts/batch/old/itch_loadNovetusCMDHelp.bat delete mode 100644 scripts/batch/old/itch_loadNovetusSDK.bat delete mode 100644 scripts/batch/old/itch_loadNovetusURI.bat delete mode 100644 scripts/old/NovetusSetup.iss delete mode 100644 scripts/old/index.php diff --git a/Novetus/Novetus.Bootstrapper/Novetus.Bootstrapper.Net481.csproj b/Novetus/Novetus.Bootstrapper/Novetus.Bootstrapper.Net481.csproj deleted file mode 100644 index ccc557d..0000000 --- a/Novetus/Novetus.Bootstrapper/Novetus.Bootstrapper.Net481.csproj +++ /dev/null @@ -1,120 +0,0 @@ - - - - - Debug - AnyCPU - {8D030E72-BBF0-42E2-9DFB-C29E9E2A7E80} - WinExe - Novetus.Bootstrapper - NovetusBootstrapper - v4.8 - 512 - false - - - - AnyCPU - true - full - false - bin\Debug\ - TRACE;DEBUG;BASICLAUNCHER;NOVETUS_APPS;NET481 - prompt - 4 - false - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE;BASICLAUNCHER;NOVETUS_APPS;NET481 - prompt - 4 - false - - - NovetusIcon.ico - - - app.manifest - - - - ..\packages\NLog.5.0.5\lib\net35\NLog.dll - - - - - - - - - - - - - - - - - - - - - - - Form - - - NovetusLaunchForm.cs - - - - - NovetusLaunchForm.cs - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - True - Resources.resx - True - - - - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - Settings.settings - True - - - - - - - - - - SET path=$(SolutionDir)build -if not exist "%25path%25" mkdir "%25path%25" -copy $(ProjectDir)$(OutDir) "%25path%25"\* -del "%25path%25"\$(TargetName).vshost.exe -del "%25path%25"\$(TargetName).vshost.exe.config -del "%25path%25"\$(TargetName).vshost.exe.manifest -del "%25path%25"\$(TargetName).xml - - - - - - \ No newline at end of file diff --git a/Novetus/Novetus.Bootstrapper/Novetus.Bootstrapper.csproj b/Novetus/Novetus.Bootstrapper/Novetus.Bootstrapper.csproj index 95d5a23..ccc557d 100644 --- a/Novetus/Novetus.Bootstrapper/Novetus.Bootstrapper.csproj +++ b/Novetus/Novetus.Bootstrapper/Novetus.Bootstrapper.csproj @@ -4,13 +4,14 @@ Debug AnyCPU - {D7B467EE-A4B9-42FB-AA83-F487DA0F5CB1} + {8D030E72-BBF0-42E2-9DFB-C29E9E2A7E80} WinExe Novetus.Bootstrapper NovetusBootstrapper - v4.0 + v4.8 512 false + AnyCPU @@ -18,18 +19,20 @@ full false bin\Debug\ - TRACE;DEBUG;BASICLAUNCHER;NOVETUS_APPS;NET4 + TRACE;DEBUG;BASICLAUNCHER;NOVETUS_APPS;NET481 prompt 4 + false AnyCPU pdbonly true bin\Release\ - TRACE;BASICLAUNCHER;NOVETUS_APPS;NET4 + TRACE;BASICLAUNCHER;NOVETUS_APPS;NET481 prompt 4 + false NovetusIcon.ico @@ -45,6 +48,7 @@ + @@ -81,6 +85,7 @@ Resources.resx True + diff --git a/Novetus/Novetus.ClientScriptTester/Novetus.ClientScriptTester.Net481.csproj b/Novetus/Novetus.ClientScriptTester/Novetus.ClientScriptTester.Net481.csproj deleted file mode 100644 index bb378aa..0000000 --- a/Novetus/Novetus.ClientScriptTester/Novetus.ClientScriptTester.Net481.csproj +++ /dev/null @@ -1,113 +0,0 @@ - - - - - Debug - AnyCPU - {83B08607-65B8-4F9C-8D0F-AB1C8EEFFAE0} - WinExe - Novetus.ClientScriptTester - ClientScriptTester - v4.8 - 512 - - - - AnyCPU - true - full - false - bin\Debug\ - TRACE;DEBUG;TESTER;NOVETUS_APPS - prompt - 4 - false - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE;TESTER;NOVETUS_APPS;NET481 - prompt - 4 - false - - - NovetusIcon.ico - - - app.manifest - - - - - - - - - - - - - - - - - - - - - - Form - - - ClientScriptTestForm.cs - - - - - ClientScriptTestForm.cs - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - True - Resources.resx - True - - - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - Settings.settings - True - - - - - - - - SET path=$(SolutionDir)build -if not exist "%25path%25" mkdir "%25path%25" -SET path2=%25path%25\ClientScriptTester -if not exist "%25path2%25" mkdir "%25path2%25" -copy $(ProjectDir)$(OutDir) "%25path2%25"\* -del "%25path%25"\$(TargetName).vshost.exe -del "%25path%25"\$(TargetName).vshost.exe.config -del "%25path%25"\$(TargetName).vshost.exe.manifest -del "%25path%25"\$(TargetName).xml - - - - - - \ No newline at end of file diff --git a/Novetus/Novetus.ClientScriptTester/Novetus.ClientScriptTester.csproj b/Novetus/Novetus.ClientScriptTester/Novetus.ClientScriptTester.csproj index 43718c9..bb378aa 100644 --- a/Novetus/Novetus.ClientScriptTester/Novetus.ClientScriptTester.csproj +++ b/Novetus/Novetus.ClientScriptTester/Novetus.ClientScriptTester.csproj @@ -8,8 +8,9 @@ WinExe Novetus.ClientScriptTester ClientScriptTester - v4.0 + v4.8 512 + AnyCPU @@ -17,18 +18,20 @@ full false bin\Debug\ - TRACE;DEBUG;TESTER;NOVETUS_APPS;NET4 + TRACE;DEBUG;TESTER;NOVETUS_APPS prompt 4 + false AnyCPU pdbonly true bin\Release\ - TRACE;TESTER;NOVETUS_APPS;NET4 + TRACE;TESTER;NOVETUS_APPS;NET481 prompt 4 + false NovetusIcon.ico @@ -74,6 +77,7 @@ True Resources.resx + True diff --git a/Novetus/Novetus.Net481.sln b/Novetus/Novetus.Net481.sln deleted file mode 100644 index c570c9f..0000000 --- a/Novetus/Novetus.Net481.sln +++ /dev/null @@ -1,45 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.2.32630.192 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Novetus.Core", "NovetusCore\Novetus.Core.shproj", "{DEBCC57D-9A3B-4D7C-8693-FA4AEC56C8C1}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Novetus.Bootstrapper.Net481", "Novetus.Bootstrapper\Novetus.Bootstrapper.Net481.csproj", "{8D030E72-BBF0-42E2-9DFB-C29E9E2A7E80}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Novetus.Launcher.Net481", "NovetusLauncher\Novetus.Launcher.Net481.csproj", "{78EE2921-681F-411A-90F2-773A5CE96B7E}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Novetus.URI.Net481", "NovetusURI\Novetus.URI.Net481.csproj", "{917B30DE-F2C0-4955-B3B9-5BF90C3D01E9}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {8D030E72-BBF0-42E2-9DFB-C29E9E2A7E80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8D030E72-BBF0-42E2-9DFB-C29E9E2A7E80}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8D030E72-BBF0-42E2-9DFB-C29E9E2A7E80}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8D030E72-BBF0-42E2-9DFB-C29E9E2A7E80}.Release|Any CPU.Build.0 = Release|Any CPU - {78EE2921-681F-411A-90F2-773A5CE96B7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {78EE2921-681F-411A-90F2-773A5CE96B7E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {78EE2921-681F-411A-90F2-773A5CE96B7E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {78EE2921-681F-411A-90F2-773A5CE96B7E}.Release|Any CPU.Build.0 = Release|Any CPU - {917B30DE-F2C0-4955-B3B9-5BF90C3D01E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {917B30DE-F2C0-4955-B3B9-5BF90C3D01E9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {917B30DE-F2C0-4955-B3B9-5BF90C3D01E9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {917B30DE-F2C0-4955-B3B9-5BF90C3D01E9}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {66CA6CE5-670E-48AA-A2DA-9347371D4CA0} - EndGlobalSection - GlobalSection(SharedMSBuildProjectFiles) = preSolution - NovetusCore\NovetusCore.projitems*{78ee2921-681f-411a-90f2-773a5ce96b7e}*SharedItemsImports = 4 - NovetusCore\NovetusCore.projitems*{8d030e72-bbf0-42e2-9dfb-c29e9e2a7e80}*SharedItemsImports = 4 - GNovetusCore\NovetusCore.projitems*{917b30de-f2c0-4955-b3b9-5bf90c3d01e9}*SharedItemsImports = 4 - NovetusCore\NovetusCore.projitems*{debcc57d-9a3b-4d7c-8693-fa4aec56c8c1}*SharedItemsImports = 13 - EndGlobalSection -EndGlobal diff --git a/Novetus/Novetus.ReleasePreparer/ReleasePreparer.cs b/Novetus/Novetus.ReleasePreparer/ReleasePreparer.cs index 98a456d..3680341 100644 --- a/Novetus/Novetus.ReleasePreparer/ReleasePreparer.cs +++ b/Novetus/Novetus.ReleasePreparer/ReleasePreparer.cs @@ -14,89 +14,11 @@ namespace Novetus.ReleasePreparer { static void Main(string[] args) { + string novpath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + @"\\Novetus"; + if (args.Length > 0) { - string novpath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + @"\\Novetus"; - - if (args.Contains("-Net40")) - { - string litepath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + @"\\Novetus-Net40"; - - if (!Directory.Exists(litepath)) - { - Console.WriteLine("Novetus Net 4.0 does not exist. Creating " + litepath); - Directory.CreateDirectory(litepath); - } - - List liteExcludeList = new List(); - - string liteExcludeFile = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + @"\\Net40exclude.txt"; - Console.WriteLine("Reading exclusion list..."); - bool noExclusionList = false; - - if (File.Exists(liteExcludeFile)) - { - string[] liteExcludeArray = File.ReadAllLines(liteExcludeFile); - liteExcludeList.AddRange(liteExcludeArray); - } - else - { - noExclusionList = true; - } - - if (!noExclusionList) - { - //https://stackoverflow.com/questions/58744/copy-the-entire-contents-of-a-directory-in-c-sharp - - Console.WriteLine("Creating directories..."); - //Now Create all of the directories - foreach (string dirPath in Directory.GetDirectories(novpath, "*", SearchOption.AllDirectories)) - { - if (!liteExcludeList.Any(s => dirPath.Contains(s))) - { - Directory.CreateDirectory(dirPath.Replace(novpath, litepath)); - Console.WriteLine("D: " + dirPath.Replace(novpath, litepath)); - } - } - - Console.WriteLine("Copying files..."); - //Copy all the files & Replaces any files with the same name - foreach (string newPath in Directory.GetFiles(novpath, "*.*", SearchOption.AllDirectories)) - { - if (!liteExcludeList.Any(s => newPath.Contains(s))) - { - FixedFileCopy(newPath, newPath.Replace(novpath, litepath), true); - Console.WriteLine("F: " + newPath.Replace(novpath, litepath)); - } - } - - Console.WriteLine("Overwriting files with Net 4.0 alternatives..."); - string litefiles = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + @"\\Net40files"; - - foreach (string newPath in Directory.GetFiles(litefiles, "*.*", SearchOption.AllDirectories)) - { - FixedFileCopy(newPath, newPath.Replace(litefiles, litepath), true); - Console.WriteLine("OW: " + newPath.Replace(litefiles, litepath)); - } - - string infopath = novpath + @"\\config\\info.ini"; - string currbranch = GetBranch(infopath); - TurnOnInitialSequence(infopath); - - string pathlite = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + @"\\releasenomapsversion.txt"; - Console.WriteLine("Creating " + pathlite); - if (!File.Exists(pathlite)) - { - // Create a file to write to. - using (StreamWriter sw = File.CreateText(pathlite)) - { - sw.Write(currbranch); - } - } - Console.WriteLine("Created " + pathlite); - } - } - else if (args.Contains("-snapshot")) + if (args.Contains("-snapshot")) { string infopath = novpath + @"\\config\\info.ini"; string currver = GetBranch(infopath); @@ -116,23 +38,32 @@ namespace Novetus.ReleasePreparer } else if (args.Contains("-release")) { - string infopath = novpath + @"\\config\\info.ini"; - string currbranch = GetBranch(infopath); - TurnOnInitialSequence(infopath); - - string path = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + @"\\releaseversion.txt"; - Console.WriteLine("Creating " + path); - if (!File.Exists(path)) - { - // Create a file to write to. - using (StreamWriter sw = File.CreateText(path)) - { - sw.Write(currbranch); - } - } - Console.WriteLine("Created " + path); + DoRelease(novpath); } } + else + { + DoRelease(novpath); + } + } + + public static void DoRelease(string novpath) + { + string infopath = novpath + @"\\config\\info.ini"; + string currbranch = GetBranch(infopath); + TurnOnInitialSequence(infopath); + + string path = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + @"\\releaseversion.txt"; + Console.WriteLine("Creating " + path); + if (!File.Exists(path)) + { + // Create a file to write to. + using (StreamWriter sw = File.CreateText(path)) + { + sw.Write(currbranch); + } + } + Console.WriteLine("Created " + path); } public static void FixedFileCopy(string src, string dest, bool overwrite) diff --git a/Novetus/Novetus.Tools.Net481.sln b/Novetus/Novetus.Tools.Net481.sln deleted file mode 100644 index f0dd5b4..0000000 --- a/Novetus/Novetus.Tools.Net481.sln +++ /dev/null @@ -1,31 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.2.32630.192 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Novetus.Internal.ReleasePreparer", "Novetus.ReleasePreparer\Novetus.Internal.ReleasePreparer.csproj", "{64A99062-3C1C-4D2E-99E4-D6D92443AC98}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Novetus.ClientScriptTester.Net481", "Novetus.ClientScriptTester\Novetus.ClientScriptTester.Net481.csproj", "{83B08607-65B8-4F9C-8D0F-AB1C8EEFFAE0}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {64A99062-3C1C-4D2E-99E4-D6D92443AC98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {64A99062-3C1C-4D2E-99E4-D6D92443AC98}.Debug|Any CPU.Build.0 = Debug|Any CPU - {64A99062-3C1C-4D2E-99E4-D6D92443AC98}.Release|Any CPU.ActiveCfg = Release|Any CPU - {64A99062-3C1C-4D2E-99E4-D6D92443AC98}.Release|Any CPU.Build.0 = Release|Any CPU - {83B08607-65B8-4F9C-8D0F-AB1C8EEFFAE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {83B08607-65B8-4F9C-8D0F-AB1C8EEFFAE0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {83B08607-65B8-4F9C-8D0F-AB1C8EEFFAE0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {83B08607-65B8-4F9C-8D0F-AB1C8EEFFAE0}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {66CA6CE5-670E-48AA-A2DA-9347371D4CA0} - EndGlobalSection -EndGlobal diff --git a/Novetus/Novetus.Tools.sln b/Novetus/Novetus.Tools.sln index b335a94..f90a1a5 100644 --- a/Novetus/Novetus.Tools.sln +++ b/Novetus/Novetus.Tools.sln @@ -3,6 +3,8 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.2.32630.192 MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Novetus.Internal.ReleasePreparer", "Novetus.ReleasePreparer\Novetus.Internal.ReleasePreparer.csproj", "{64A99062-3C1C-4D2E-99E4-D6D92443AC98}" +EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Novetus.ClientScriptTester", "Novetus.ClientScriptTester\Novetus.ClientScriptTester.csproj", "{83B08607-65B8-4F9C-8D0F-AB1C8EEFFAE0}" EndProject Global @@ -11,6 +13,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {64A99062-3C1C-4D2E-99E4-D6D92443AC98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {64A99062-3C1C-4D2E-99E4-D6D92443AC98}.Debug|Any CPU.Build.0 = Debug|Any CPU + {64A99062-3C1C-4D2E-99E4-D6D92443AC98}.Release|Any CPU.ActiveCfg = Release|Any CPU + {64A99062-3C1C-4D2E-99E4-D6D92443AC98}.Release|Any CPU.Build.0 = Release|Any CPU {83B08607-65B8-4F9C-8D0F-AB1C8EEFFAE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {83B08607-65B8-4F9C-8D0F-AB1C8EEFFAE0}.Debug|Any CPU.Build.0 = Debug|Any CPU {83B08607-65B8-4F9C-8D0F-AB1C8EEFFAE0}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/Novetus/Novetus.sln b/Novetus/Novetus.sln index 20d3b35..06e002e 100644 --- a/Novetus/Novetus.sln +++ b/Novetus/Novetus.sln @@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.2.32630.192 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Novetus.Launcher", "NovetusLauncher\Novetus.Launcher.csproj", "{F92FFBED-2767-4676-9711-BB89CDA58A43}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Novetus.URI", "NovetusURI\Novetus.URI.csproj", "{2070EAA6-7606-4006-A628-5705C24A3644}" -EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Novetus.Core", "NovetusCore\Novetus.Core.shproj", "{DEBCC57D-9A3B-4D7C-8693-FA4AEC56C8C1}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Novetus.Bootstrapper", "Novetus.Bootstrapper\Novetus.Bootstrapper.csproj", "{D7B467EE-A4B9-42FB-AA83-F487DA0F5CB1}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Novetus.Bootstrapper", "Novetus.Bootstrapper\Novetus.Bootstrapper.csproj", "{8D030E72-BBF0-42E2-9DFB-C29E9E2A7E80}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Novetus.Launcher", "NovetusLauncher\Novetus.Launcher.csproj", "{78EE2921-681F-411A-90F2-773A5CE96B7E}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Novetus.URI", "NovetusURI\Novetus.URI.csproj", "{917B30DE-F2C0-4955-B3B9-5BF90C3D01E9}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -17,26 +17,18 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {F92FFBED-2767-4676-9711-BB89CDA58A43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F92FFBED-2767-4676-9711-BB89CDA58A43}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F92FFBED-2767-4676-9711-BB89CDA58A43}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F92FFBED-2767-4676-9711-BB89CDA58A43}.Release|Any CPU.Build.0 = Release|Any CPU - {2070EAA6-7606-4006-A628-5705C24A3644}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2070EAA6-7606-4006-A628-5705C24A3644}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2070EAA6-7606-4006-A628-5705C24A3644}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2070EAA6-7606-4006-A628-5705C24A3644}.Release|Any CPU.Build.0 = Release|Any CPU - {83B08607-65B8-4F9C-8D0F-AB1C8EEFFAE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {83B08607-65B8-4F9C-8D0F-AB1C8EEFFAE0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {83B08607-65B8-4F9C-8D0F-AB1C8EEFFAE0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {83B08607-65B8-4F9C-8D0F-AB1C8EEFFAE0}.Release|Any CPU.Build.0 = Release|Any CPU - {64A99062-3C1C-4D2E-99E4-D6D92443AC98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {64A99062-3C1C-4D2E-99E4-D6D92443AC98}.Debug|Any CPU.Build.0 = Debug|Any CPU - {64A99062-3C1C-4D2E-99E4-D6D92443AC98}.Release|Any CPU.ActiveCfg = Release|Any CPU - {64A99062-3C1C-4D2E-99E4-D6D92443AC98}.Release|Any CPU.Build.0 = Release|Any CPU - {D7B467EE-A4B9-42FB-AA83-F487DA0F5CB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D7B467EE-A4B9-42FB-AA83-F487DA0F5CB1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D7B467EE-A4B9-42FB-AA83-F487DA0F5CB1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D7B467EE-A4B9-42FB-AA83-F487DA0F5CB1}.Release|Any CPU.Build.0 = Release|Any CPU + {8D030E72-BBF0-42E2-9DFB-C29E9E2A7E80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8D030E72-BBF0-42E2-9DFB-C29E9E2A7E80}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8D030E72-BBF0-42E2-9DFB-C29E9E2A7E80}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8D030E72-BBF0-42E2-9DFB-C29E9E2A7E80}.Release|Any CPU.Build.0 = Release|Any CPU + {78EE2921-681F-411A-90F2-773A5CE96B7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {78EE2921-681F-411A-90F2-773A5CE96B7E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {78EE2921-681F-411A-90F2-773A5CE96B7E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {78EE2921-681F-411A-90F2-773A5CE96B7E}.Release|Any CPU.Build.0 = Release|Any CPU + {917B30DE-F2C0-4955-B3B9-5BF90C3D01E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {917B30DE-F2C0-4955-B3B9-5BF90C3D01E9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {917B30DE-F2C0-4955-B3B9-5BF90C3D01E9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {917B30DE-F2C0-4955-B3B9-5BF90C3D01E9}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -45,9 +37,9 @@ Global SolutionGuid = {66CA6CE5-670E-48AA-A2DA-9347371D4CA0} EndGlobalSection GlobalSection(SharedMSBuildProjectFiles) = preSolution - NovetusCore\NovetusCore.projitems*{2070eaa6-7606-4006-a628-5705c24a3644}*SharedItemsImports = 4 - NovetusCore\NovetusCore.projitems*{d7b467ee-a4b9-42fb-aa83-f487da0f5cb1}*SharedItemsImports = 4 + NovetusCore\NovetusCore.projitems*{78ee2921-681f-411a-90f2-773a5ce96b7e}*SharedItemsImports = 4 + NovetusCore\NovetusCore.projitems*{8d030e72-bbf0-42e2-9dfb-c29e9e2a7e80}*SharedItemsImports = 4 + NovetusCore\NovetusCore.projitems*{917b30de-f2c0-4955-b3b9-5bf90c3d01e9}*SharedItemsImports = 4 NovetusCore\NovetusCore.projitems*{debcc57d-9a3b-4d7c-8693-fa4aec56c8c1}*SharedItemsImports = 13 - NovetusCore\NovetusCore.projitems*{f92ffbed-2767-4676-9711-bb89cda58a43}*SharedItemsImports = 4 EndGlobalSection EndGlobal diff --git a/Novetus/NovetusLauncher/Novetus.Launcher.Net481.csproj b/Novetus/NovetusLauncher/Novetus.Launcher.Net481.csproj deleted file mode 100644 index 7c04c47..0000000 --- a/Novetus/NovetusLauncher/Novetus.Launcher.Net481.csproj +++ /dev/null @@ -1,471 +0,0 @@ - - - - {78EE2921-681F-411A-90F2-773A5CE96B7E} - Debug - AnyCPU - WinExe - NovetusLauncher - Novetus - v4.8 - - - Properties - NovetusIcon.ico - False - False - False - obj\$(Configuration)\ - {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 4 - False - False - OnBuildSuccess - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - - - - x86 - 4194304 - False - Auto - 4096 - - - bin\Debug\ - True - Full - False - True - DEBUG;TRACE;LAUNCHER;NOVETUS_APPS;NET481 - obj\ - - - bin\Release\ - False - None - True - True - TRACE;LAUNCHER;NOVETUS_APPS;NET481 - obj\ - Project - - - false - x86 - TRACE;DEBUG;LAUNCHER;NOVETUS_APPS;NET481 - bin\Debug\ - - - false - x86 - pdbonly - true - TRACE;LAUNCHER;NOVETUS_APPS;NET481 - bin\Release\ - - - app.manifest - - - - - - - C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\Portable.BouncyCastle.1.8.8\lib\net40\BouncyCastle.Crypto.dll - - - C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\BrotliSharpLib.0.3.3\lib\net451\BrotliSharpLib.dll - - - ..\packages\DotNetZip.1.16.0\lib\net40\DotNetZip.dll - - - - C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\Microsoft.Win32.Registry.5.0.0\lib\net461\Microsoft.Win32.Registry.dll - - - ..\packages\Mono.Nat.1.2.24.0\lib\net40\Mono.Nat.dll - - - ..\packages\NLog.5.0.5\lib\net35\NLog.dll - - - - - - - C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll - - - - 3.5 - - - - 3.5 - - - - - C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll - - - - - C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - - C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - - - - C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\System.Security.AccessControl.5.0.0\lib\net461\System.Security.AccessControl.dll - - - C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll - - - - C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll - - - - - - - - 3.5 - - - C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\Titanium.Web.Proxy.3.1.1450\lib\net461\Titanium.Web.Proxy.dll - - - - - - - - - Forms\CharCustom\CharacterCustomizationShared.cs - - - Forms\CharCustom\Compact\CharacterCustomizationCompact.cs - Form - - - Forms\CharCustom\Compact\CharacterCustomizationCompact.designer.cs - CharacterCustomizationCompact.cs - - - Forms\CharCustom\Extended\CharacterCustomizationExtended.cs - Form - - - Forms\CharCustom\Extended\CharacterCustomizationExtended.designer.cs - CharacterCustomizationExtended.cs - - - - - - - Form - - - Decoder.cs - - - Form - - - CustomGraphicsOptions.cs - - - - Form - - - LauncherFormCompact.cs - - - Form - - - LauncherFormSettings.cs - - - Form - - - LauncherFormStylish.cs - - - LauncherFormStylishInterface.xaml - - - Form - - - NovetusConsole.cs - - - Form - - - ModCreator.cs - - - Form - - - AssetDownloader.cs - - - Form - - - AssetFixer.cs - - - Form - - - MeshConverter.cs - - - Form - - - ClientinfoCreator.cs - - - Form - - - ClientScriptDocumentation.cs - - - Form - - - ClientinfoCreatorValidatePathForm.cs - - - Form - - - DiogenesEditor.cs - - - Form - - - ItemCreationSDK.cs - - - Form - - - ItemCreationSDKColorMenu.cs - - - Form - - - NovetusSDK.cs - - - Form - - - SplashTester.cs - - - Form - - - XMLContentEditor.cs - - - Form - - - ServerBrowser.cs - - - True - True - Resources.resx - - - Form - - - LauncherFormExtended.cs - - - - - - - Forms\CharCustom\Compact\CharacterCustomizationCompact.resx - CharacterCustomizationCompact.cs - - - Forms\CharCustom\Extended\CharacterCustomizationExtended.resx - CharacterCustomizationExtended.cs - - - CustomGraphicsOptions.cs - - - Decoder.cs - - - LauncherFormCompact.cs - - - LauncherFormSettings.cs - - - LauncherFormExtended.cs - - - LauncherFormStylish.cs - - - NovetusConsole.cs - - - ModCreator.cs - - - AssetDownloader.cs - - - AssetFixer.cs - - - MeshConverter.cs - - - ClientinfoCreator.cs - - - ClientScriptDocumentation.cs - - - ClientinfoCreatorValidatePathForm.cs - - - DiogenesEditor.cs - - - ItemCreationSDK.cs - - - ItemCreationSDKColorMenu.cs - - - NovetusSDK.cs - - - SplashTester.cs - - - XMLContentEditor.cs - - - ServerBrowser.cs - - - PublicResXFileCodeGenerator - Resources.Designer.cs - - - - - - - - - - False - Microsoft .NET Framework 4 %28x86 and x64%29 - true - - - False - .NET Framework 3.5 SP1 - false - - - False - Windows Installer 4.5 - true - - - - - - - - - - - - - - - - - - - - - - - - - - Designer - MSBuild:Compile - - - - - - SET path=$(SolutionDir)build -if not exist "%25path%25" mkdir "%25path%25" -SET path2=%25path%25\Launcher -if not exist "%25path2%25" mkdir "%25path2%25" -copy $(ProjectDir)$(OutDir) "%25path2%25"\* -del "%25path%25"\$(TargetName).vshost.exe -del "%25path%25"\$(TargetName).vshost.exe.config -del "%25path%25"\$(TargetName).vshost.exe.manifest -del "%25path%25"\$(TargetName).xml -if not exist "%25path%25"\bin mkdir "%25path%25"\bin -move "%25path2%25"\* "%25path%25"\bin -rd /s /q "%25path2%25" - - - - - - \ No newline at end of file diff --git a/Novetus/NovetusLauncher/Novetus.Launcher.csproj b/Novetus/NovetusLauncher/Novetus.Launcher.csproj index c44437a..7c04c47 100644 --- a/Novetus/NovetusLauncher/Novetus.Launcher.csproj +++ b/Novetus/NovetusLauncher/Novetus.Launcher.csproj @@ -1,13 +1,13 @@  - + - {F92FFBED-2767-4676-9711-BB89CDA58A43} + {78EE2921-681F-411A-90F2-773A5CE96B7E} Debug AnyCPU WinExe NovetusLauncher Novetus - v4.0 + v4.8 Properties @@ -52,7 +52,7 @@ Full False True - DEBUG;TRACE;LAUNCHER;NOVETUS_APPS;NET4 + DEBUG;TRACE;LAUNCHER;NOVETUS_APPS;NET481 obj\ @@ -61,20 +61,23 @@ None True True - TRACE;LAUNCHER;NOVETUS_APPS;NET4 + TRACE;LAUNCHER;NOVETUS_APPS;NET481 obj\ Project false x86 + TRACE;DEBUG;LAUNCHER;NOVETUS_APPS;NET481 + bin\Debug\ false x86 pdbonly true - TRACE;LAUNCHER;NOVETUS_APPS;NET4 + TRACE;LAUNCHER;NOVETUS_APPS;NET481 + bin\Release\ app.manifest @@ -83,21 +86,18 @@ + + C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\Portable.BouncyCastle.1.8.8\lib\net40\BouncyCastle.Crypto.dll + + + C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\BrotliSharpLib.0.3.3\lib\net451\BrotliSharpLib.dll + ..\packages\DotNetZip.1.16.0\lib\net40\DotNetZip.dll - - ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll - True - - - ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll - True - - - ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll - True + + C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\Microsoft.Win32.Registry.5.0.0\lib\net461\Microsoft.Win32.Registry.dll ..\packages\Mono.Nat.1.2.24.0\lib\net40\Mono.Nat.dll @@ -109,6 +109,9 @@ + + C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll + 3.5 @@ -118,18 +121,28 @@ 3.5 - - ..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.IO.dll - + + C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll + - - ..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.Runtime.dll + + + C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll + + + C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + + C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\System.Security.AccessControl.5.0.0\lib\net461\System.Security.AccessControl.dll + + + C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll + - - ..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.Threading.Tasks.dll + + C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll @@ -139,6 +152,9 @@ 3.5 + + C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\Titanium.Web.Proxy.3.1.1450\lib\net461\Titanium.Web.Proxy.dll + @@ -448,13 +464,6 @@ if not exist "%25path%25"\bin mkdir "%25path%25"\bin move "%25path2%25"\* "%25path%25"\bin rd /s /q "%25path2%25" - - - - 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}. - - - diff --git a/Novetus/NovetusURI/Novetus.URI.Net481.csproj b/Novetus/NovetusURI/Novetus.URI.Net481.csproj deleted file mode 100644 index 3c38e3c..0000000 --- a/Novetus/NovetusURI/Novetus.URI.Net481.csproj +++ /dev/null @@ -1,223 +0,0 @@ - - - - - Debug - AnyCPU - {917B30DE-F2C0-4955-B3B9-5BF90C3D01E9} - WinExe - Properties - NovetusURI - NovetusURI - v4.8 - 512 - true - - - - - - x86 - true - full - false - bin\Debug\ - TRACE;DEBUG;URI;NOVETUS_APPS;NET481 - none - 4 - 4096 - false - - - x86 - pdbonly - true - bin\Release\ - TRACE;URI;NOVETUS_APPS;NET481 - none - 4 - false - 4096 - true - - - NovetusIcon.ico - - - app.manifest - - - - C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\Portable.BouncyCastle.1.8.8\lib\net40\BouncyCastle.Crypto.dll - - - C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\BrotliSharpLib.0.3.3\lib\net451\BrotliSharpLib.dll - - - C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\Microsoft.Win32.Registry.5.0.0\lib\net461\Microsoft.Win32.Registry.dll - - - ..\packages\Mono.Nat.1.2.24.0\lib\net40\Mono.Nat.dll - - - ..\packages\NLog.5.0.5\lib\net35\NLog.dll - - - - C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll - - - - - - C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll - - - - - C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - - C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - - - - C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\System.Security.AccessControl.5.0.0\lib\net461\System.Security.AccessControl.dll - - - C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll - - - - C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll - - - - - - - - - - - - - C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\Titanium.Web.Proxy.3.1.1450\lib\net461\Titanium.Web.Proxy.dll - - - - - Forms\CharCustom\CharacterCustomizationShared.cs - - - Forms\CharCustom\Compact\CharacterCustomizationCompact.cs - Form - - - Forms\CharCustom\Compact\CharacterCustomizationCompact.designer.cs - CharacterCustomizationCompact.cs - - - Forms\CharCustom\Extended\CharacterCustomizationExtended.cs - Form - - - Forms\CharCustom\Extended\CharacterCustomizationExtended.designer.cs - CharacterCustomizationExtended.cs - - - - - Form - - - InstallForm.cs - - - - - - Form - - - LoaderForm.cs - - - Form - - - QuickConfigure.cs - - - Forms\CharCustom\Compact\CharacterCustomizationCompact.resx - CharacterCustomizationCompact.cs - - - Forms\CharCustom\Extended\CharacterCustomizationExtended.resx - CharacterCustomizationExtended.cs - - - InstallForm.cs - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - True - Resources.resx - True - - - LoaderForm.cs - - - QuickConfigure.cs - - - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - Settings.settings - True - - - - - - - - - - - - SET path=$(SolutionDir)build -if not exist "%25path%25" mkdir "%25path%25" -SET path2=%25path%25\URI -if not exist "%25path2%25" mkdir "%25path2%25" -copy $(ProjectDir)$(OutDir) "%25path2%25"\* -del "%25path%25"\$(TargetName).vshost.exe -del "%25path%25"\$(TargetName).vshost.exe.config -del "%25path%25"\$(TargetName).vshost.exe.manifest -del "%25path%25"\$(TargetName).xml -if not exist "%25path%25"\bin mkdir "%25path%25"\bin -move "%25path2%25"\* "%25path%25"\bin -rd /s /q "%25path2%25" - - - - - - - \ No newline at end of file diff --git a/Novetus/NovetusURI/Novetus.URI.csproj b/Novetus/NovetusURI/Novetus.URI.csproj index 6d03684..3c38e3c 100644 --- a/Novetus/NovetusURI/Novetus.URI.csproj +++ b/Novetus/NovetusURI/Novetus.URI.csproj @@ -4,12 +4,12 @@ Debug AnyCPU - {2070EAA6-7606-4006-A628-5705C24A3644} + {917B30DE-F2C0-4955-B3B9-5BF90C3D01E9} WinExe Properties NovetusURI NovetusURI - v4.0 + v4.8 512 true @@ -22,17 +22,18 @@ full false bin\Debug\ - TRACE;DEBUG;URI;NOVETUS_APPS;NET4 + TRACE;DEBUG;URI;NOVETUS_APPS;NET481 none 4 4096 + false x86 pdbonly true bin\Release\ - TRACE;URI;NOVETUS_APPS;NET4 + TRACE;URI;NOVETUS_APPS;NET481 none 4 false @@ -46,17 +47,14 @@ app.manifest - - ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll - True + + C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\Portable.BouncyCastle.1.8.8\lib\net40\BouncyCastle.Crypto.dll - - ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll - True + + C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\BrotliSharpLib.0.3.3\lib\net451\BrotliSharpLib.dll - - ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll - True + + C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\Microsoft.Win32.Registry.5.0.0\lib\net461\Microsoft.Win32.Registry.dll ..\packages\Mono.Nat.1.2.24.0\lib\net40\Mono.Nat.dll @@ -65,20 +63,33 @@ ..\packages\NLog.5.0.5\lib\net35\NLog.dll + + C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll + - - ..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.IO.dll - + + C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll + - - ..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.Runtime.dll + + + C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll + + + C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + + C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\System.Security.AccessControl.5.0.0\lib\net461\System.Security.AccessControl.dll + + + C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll + - - ..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.Threading.Tasks.dll + + C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll @@ -90,6 +101,9 @@ + + C:\Users\Bitl\Documents\GitHub\Novetus\Novetus_src\Novetus\packages\Titanium.Web.Proxy.3.1.1450\lib\net461\Titanium.Web.Proxy.dll + @@ -195,13 +209,6 @@ if not exist "%25path%25"\bin mkdir "%25path%25"\bin move "%25path2%25"\* "%25path%25"\bin rd /s /q "%25path2%25" - - - - 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}. - - - diff --git a/Novetus_SolutionLoader.bat b/Novetus_SolutionLoader.bat deleted file mode 100644 index c2f1763..0000000 --- a/Novetus_SolutionLoader.bat +++ /dev/null @@ -1,43 +0,0 @@ -@ECHO OFF -:CLEAN -CLS -echo Cleaning build directory -rd /s /q "%cd%\Novetus\build" - -echo Cleaning Novetus.Bootstrapper -rd /s /q "%cd%\Novetus\Novetus.Bootstrapper\bin" -rd /s /q "%cd%\Novetus\Novetus.Bootstrapper\obj" - -echo Cleaning Novetus.ClientScriptTester -rd /s /q "%cd%\Novetus\Novetus.ClientScriptTester\bin" -rd /s /q "%cd%\Novetus\Novetus.ClientScriptTester\obj" - -echo Cleaning Novetus.ReleasePreparer -rd /s /q "%cd%\Novetus\Novetus.ReleasePreparer\bin" -rd /s /q "%cd%\Novetus\Novetus.ReleasePreparer\obj" - -echo Cleaning NovetusLauncher -rd /s /q "%cd%\Novetus\NovetusLauncher\bin" -rd /s /q "%cd%\Novetus\NovetusLauncher\obj" - -echo Cleaning NovetusURI -rd /s /q "%cd%\Novetus\NovetusURI\bin" -rd /s /q "%cd%\Novetus\NovetusURI\obj" -goto MENU - -:MENU -CLS -ECHO Which solution do you wish to load? -ECHO. -ECHO 1 - Novetus (.NET Framework 4.0) -ECHO 2 - Novetus.Tools (.NET Framework 4.0) -ECHO 3 - Novetus (.NET Framework 4.8) -ECHO 4 - Novetus.Tools (.NET Framework 4.8) -ECHO 5 - EXIT -ECHO. -SET /P M=Option: -IF %M%==1 start "" "%cd%\Novetus\Novetus.sln" -IF %M%==2 start "" "%cd%\Novetus\Novetus.Tools.sln" -IF %M%==3 start "" "%cd%\Novetus\Novetus.Net481.sln" -IF %M%==4 start "" "%cd%\Novetus\Novetus.Tools.Net481.sln" -IF %M%==5 EXIT \ No newline at end of file diff --git a/README.md b/README.md index f5407b3..d5c71d1 100644 --- a/README.md +++ b/README.md @@ -9,9 +9,7 @@ If you want to look at test applications built for Novetus' development, look he ## Building (Windows) To build, this project requires Visual Studio 2017 or over. Modern versions of Novetus are compiled with Visual Studio 2022. - -Open "Novetus_SolutionLoader.bat" and choose a solution. Then, right click the solution and click "Restore Nuget Packages" before compiling. -This batch file is used to clean and load solutions due to the move to .NET 6 conflicting with some files. +Open either "Novetus/Novetus.sln" or "Novetus/Novetus.Tools.sln". Then, right click the solution and click "Restore Nuget Packages" before compiling. ## Legal info: diff --git a/changelog.txt b/changelog.txt index 2f7e922..28b4352 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,18 @@ +1.3 Snapshot v22.8342.20628.1 +Enhancements: +Fixes: +- Fixed bullets arcing in Rise of the Killbots (credits to Ae1ouRed) +- Remastered audio in Rise of the Killbots to be less loud. +---------------------------------------------------------------------------- +1.3 Snapshot v22.8342.20628.1 +Enhancements: +- Added some of my original places from 2009-2011 as Novetus Exclusives! +- 2012M is now considered finished! + +Fixes: +- Fixed the UI in the Extended style on the .NET Framework 4.8 version. +- Fixed issues in 2010L-2012M where assetdelivery URLs didn't function reliably. +---------------------------------------------------------------------------- 1.3 Snapshot v22.8341.26380.2 Fixes: - Fixed 2011M not being able to load. @@ -263,7 +278,7 @@ Fixes: - Fixed 2010L server joining not working. - Fixed 2007E based clients not loading all customized parts properly. - Fixed master server pings making the launcher/CMD unresponsive. -- Rise of the Killbots: Fixed bullets not disappearing after a specified amount of time, causing soem optimization issues (https://itch.io/t/2277693/issues-with-bullets-in-rise-of-killbots) +- Rise of the Killbots: Fixed bullets not disappearing after a specified amount of time, causing some optimization issues (https://itch.io/t/2277693/issues-with-bullets-in-rise-of-killbots) ---------------------------------------------------------------------------- 1.3 Snapshot v22.8253.19867.1 Enhancements: diff --git a/old/query.php b/old/query.php deleted file mode 100644 index 6d9215d..0000000 --- a/old/query.php +++ /dev/null @@ -1,83 +0,0 @@ -. -*/ - -//NOVETUS MASTER SERVER QUERY CODE -//thanks to idkwhatnametoget for the port fix - -//name -$name = $_GET["name"]; -//port -$port = $_GET["port"]; -//client -$client = $_GET["client"]; -//version -$version = $_GET["version"]; - -if (!empty($port) and $port < 65535 and is_numeric($port) and !empty($name) and !empty($client) and !empty($version)) -{ - //server ip - $ip = $_GET["ip"]; - //online status - $online = $_GET["online"]; - - //strings - $deleteentry = 1; - $status = "Offline"; - - $file = 'serverlist.txt'; - - //ONLY the $name and $client arguments will show up in the master server! - $text = base64_encode(base64_encode($name).'|'.base64_encode($ip).'|'.base64_encode($port).'|'.base64_encode($client).'|'.base64_encode($version))."\r\n"; - - if ($online == 1) - { - $deleteentry = 0; - - foreach(file($file) as $line) - { - if (strpos($line, $text) !== false) - { - $file_contents = file_get_contents($file); - $contents = str_replace($line, '', $file_contents); - file_put_contents($file, $contents); - } - } - - file_put_contents($file, $text, FILE_APPEND); - - $status = "Online"; - } - - if ($deleteentry == 1) - { - foreach(file($file) as $line) - { - if (strpos($line, $text) !== false) - { - $file_contents = file_get_contents($file); - $contents = str_replace($line, '', $file_contents); - file_put_contents($file, $contents); - } - } - } - - // Display the server info to browsers. - echo "" . htmlspecialchars($name) . ". A " . htmlspecialchars($client) . " server running on ". htmlspecialchars($version) .". Server Status: " . htmlspecialchars($status) . ""; -} -?> \ No newline at end of file diff --git a/scripts/batch/Novetus_dependency_installer_4.0.bat b/scripts/batch/Novetus_dependency_installer_4.0.bat deleted file mode 100644 index fcac863..0000000 --- a/scripts/batch/Novetus_dependency_installer_4.0.bat +++ /dev/null @@ -1,104 +0,0 @@ -@ECHO OFF -setlocal -cd /d %~dp0 -:REDISTINSTALLER -TITLE NOVETUS DEPENDENCY INSTALLER -ECHO --------------------------------------------------------------------------- -ECHO NhhhhhhhhhhN hsssoosssd -ECHO NyyyyhhhhyyhdN hoo++++++h -ECHO NyyyyyhhhhyyyhN hoo+++///h -ECHO NssssyyyyyhyyyhdN hoo+++///h -ECHO Nsossssyyyyyyyyyhm hsoo++///h -ECHO NsssssssssyyyyyyyhdN hssoo++//h -ECHO Nsssssssssssyyyyhhhdm hsssoo+++h -ECHO NyssssssssysyyyyhhhhhdN NNNNNmmmmdddddhhysoooo+++ymNN -ECHO Nhyyssssssmdyyyyhhhhhyhyysssssooooooooosssooooo++osssyhdmN -ECHO Nhyyyyssssddhyyyhhyyysssosyyhhhddmmmmmmmyooooo+++yhyssoosydN -ECHO NdhhyyyysssoosyhyyyssooooydN y++++++++hN NNdhsoohN -ECHO NmdhhhyyyysyhddmNmhyssooooooshN s++++++++h doosm -ECHO NNdhysoyyyysssssm NdsoooooooooydN s/////+++h NmyooyN -ECHO Ndysoosyhyysssooosm myooooooososhN s///////+h Ndhsoshm -ECHO mhsoosydmNmysooooooom NdssssssssooydN s////////hdhssosydN -ECHO NhsosydN Nsoooo+++om mhssssssoooohm y++/////+soosyhmN -ECHO NhoosdN Nsooo+++oom NdyssssooooosdN Ny++++oooosydmN -ECHO msood Noooooooosm Nhssooooooooydhysoooo++++hN -ECHO NhooshmN Nsoooooossm Nmhsoooooooooooso++////++h -ECHO Nhysossyhhdddoooooooosdmmmmmdddhhhyysssoooooooooo++ss++//++++h -ECHO Nmhyyssooooooooooooosssooooooossssyyhhdds+++++++++++++++oood -ECHO NNmmmddssooooooohhhhddddmmmNNNN Ny+++++++++++++osssd -ECHO Nyyssssoosm Nds+++++++++oosssyd -ECHO Nhyyysssssm Nho++++++oossssyd -ECHO Nyyyyyssssm ms+++++ooossssd -ECHO Nyyyssssssm Nho+++ooossssd -ECHO Nhyyyyyyyym mysssssyyyyd -ECHO --------------------------------------------------------------------------- -ECHO. -ECHO NOVETUS DEPENDENCY INSTALLER -ECHO. -ECHO Please install the following if you haven't already: -ECHO 1 - Microsoft .NET Framework 2.0 (REQUIRED for the ROBLOX Script Generator SDK tool) -ECHO 2 - Microsoft .NET Framework 4.0 (REQUIRED for the Novetus Launcher) -ECHO 3 - .NET 4.0 Update (KB2468871, REQUIRED for Windows XP and Vista) -ECHO 4 - Microsoft Visual C++ Redistributables 2005 (32-bit, REQUIRED for 2007) -ECHO 5 - Microsoft Visual C++ Redistributables 2008 (32-bit, REQUIRED for 2008 and above) -ECHO 6 - Windows Media Player (REQUIRED for 2010L+) -ECHO 7 - Exit -ECHO. -SET /P M=Choose an option by typing the number corresponding to which depenency you want to install: -IF %M%==1 goto net2 -IF %M%==2 goto net4 -IF %M%==3 goto net4update -IF %M%==4 goto vc2005 -IF %M%==5 goto vc2008 -IF %M%==6 goto mfp -IF %M%==7 EXIT -EXIT - -:net2 -CLS -echo Installing Microsoft .NET Framework 2.0... -reg Query "HKLM\Hardware\Description\System\CentralProcessor\0" | find /i "x86" > NUL && set OS=32BIT || set OS=64BIT - -if %OS%==32BIT "%CD%/_redist/NET Framework/NetFx20SP2_x86.exe" -if %OS%==64BIT "%CD%/_redist/NET Framework/NetFx20SP2_x64.exe" -pause -goto REDISTINSTALLER - -:net4 -CLS -echo Installing Microsoft .NET Framework 4.0... -"%CD%/_redist/NET Framework/dotNetFx40_Full_x86_x64.exe" -pause -goto REDISTINSTALLER - -:net4update -CLS -echo Installing .NET 4.0 Update (KB2468871)... -reg Query "HKLM\Hardware\Description\System\CentralProcessor\0" | find /i "x86" > NUL && set OS=32BIT || set OS=64BIT - -if %OS%==32BIT "%CD%/_redist/NET Framework/NDP40-KB2468871-v2-x86 (XP and Vista Only).exe" -if %OS%==64BIT "%CD%/_redist/NET Framework/NDP40-KB2468871-v2-x64 (XP and Vista Only).exe" -pause -goto REDISTINSTALLER - -:vc2005 -CLS -echo Installing Microsoft Visual C++ Redistributables 2005 (32-bit)... -"%CD%/_redist/Visual C++ Redistributables/vcredist2005_x86.exe" -pause -goto REDISTINSTALLER - -:vc2008 -CLS -echo Installing Microsoft Visual C++ Redistributables 2008 (32-bit)... -"%CD%/_redist/Visual C++ Redistributables/vcredist2008_x86.exe" -pause -goto REDISTINSTALLER - -:mfp -CLS -echo Please install the Windows Media Player through Windows' "Add a feature" utility. -echo Windows 7+: Go to the Control Panel, Programs and Features, go to "Turn Windows features on and off", and enable Windows Media Player in Media Features. -echo Windows 10+: Go to the Settings app, Apps, Optional Features, then search "Windows Media Player", then select it and press Install. -pause -goto REDISTINSTALLER \ No newline at end of file diff --git a/scripts/batch/create_lite.bat b/scripts/batch/create_lite.bat deleted file mode 100644 index 74c4c7f..0000000 --- a/scripts/batch/create_lite.bat +++ /dev/null @@ -1,4 +0,0 @@ -@ECHO OFF -call clean_junk.bat -ReleasePreparer.exe -Net40 -pause \ No newline at end of file diff --git a/scripts/batch/dev_menu.bat b/scripts/batch/dev_menu.bat index 2efa90d..1800575 100644 --- a/scripts/batch/dev_menu.bat +++ b/scripts/batch/dev_menu.bat @@ -8,25 +8,22 @@ ECHO ----------------------------------------------- ECHO Novetus Release Utility ECHO ----------------------------------------------- ECHO. -ECHO 1 - Release (4.8) +ECHO 1 - Release ECHO 2 - Release Beta -ECHO 3 - Release (4.0) -ECHO 4 - Validate manifest -ECHO 5 - itch.io build status. -ECHO 6 - Push File List. -ECHO 7 - EXIT +ECHO 3 - Validate manifest +ECHO 4 - itch.io build status. +ECHO 5 - Push File List. +ECHO 6 - EXIT ECHO. SET /P M=Option: IF %M%==1 SET releaseoption=1 IF %M%==1 GOTO CLEANUP IF %M%==2 SET releaseoption=2 IF %M%==2 GOTO CLEANUP -IF %M%==3 SET releaseoption=3 -IF %M%==3 GOTO CLEANUP -IF %M%==4 GOTO VALIDATE -IF %M%==5 GOTO STATUS -IF %M%==6 GOTO PUSHFILELISTMENU -IF %M%==7 EXIT +IF %M%==3 GOTO VALIDATE +IF %M%==4 GOTO STATUS +IF %M%==5 GOTO PUSHFILELISTMENU +IF %M%==6 EXIT :PUSHFILELISTMENU CLS @@ -34,19 +31,16 @@ ECHO ----------------------------------------------- ECHO Push File List for: ECHO ----------------------------------------------- ECHO. -ECHO 1 - Release (4.8) +ECHO 1 - Release ECHO 2 - Release Beta -ECHO 3 - Release (4.0) -ECHO 4 - Back +ECHO 3 - Back ECHO. SET /P M=Option: IF %M%==1 SET checkoption=1 IF %M%==1 GOTO CLEANUP_DRY IF %M%==2 SET checkoption=2 IF %M%==2 GOTO CLEANUP_DRY -IF %M%==3 SET checkoption=3 -IF %M%==3 GOTO CLEANUP_DRY -IF %M%==4 GOTO MENU +IF %M%==3 GOTO MENU :CLEANJUNK call clean_junk.bat @@ -63,11 +57,9 @@ GOTO CLEANJUNK :POSTCLEANUP IF %releaseoption%==1 echo Press any key to push Release build IF %releaseoption%==2 echo Press any key to push Beta build -IF %releaseoption%==3 echo Press any key to push Release Lite build pause IF %releaseoption%==1 GOTO RELEASE IF %releaseoption%==2 GOTO BETA -IF %releaseoption%==3 GOTO RELEASENOMAPS :CLEANUP_DRY CLS @@ -77,10 +69,8 @@ GOTO CLEANJUNK :POSTCLEANUP_DRY IF %checkoption%==1 echo Press any key to check Release build IF %checkoption%==2 echo Press any key to check Beta build -IF %checkoption%==3 echo Press any key to check Release Lite build IF %checkoption%==1 GOTO RELEASE_DRY IF %checkoption%==2 GOTO BETA_DRY -IF %checkoption%==3 GOTO RELEASENOMAPS_DRY :RELEASE CLS @@ -89,13 +79,6 @@ butler push Novetus bitl/novetus:windows --if-changed --userversion-file release pause GOTO MENU -:RELEASENOMAPS -CLS -ReleasePreparer.exe -Net40 -butler push Novetus-Lite bitl/novetus:windows-lite --if-changed --userversion-file releasenomapsversion.txt -pause -GOTO MENU - :BETA CLS ReleasePreparer.exe -snapshot @@ -110,13 +93,6 @@ butler push Novetus bitl/novetus:windows --if-changed --userversion-file release pause GOTO MENU -:RELEASENOMAPS_DRY -CLS -ReleasePreparer.exe -Net40 -butler push Novetus-Lite bitl/novetus:windows-lite --if-changed --userversion-file releasenomapsversion.txt --dry-run -pause -GOTO MENU - :BETA_DRY CLS ReleasePreparer.exe -snapshot @@ -132,10 +108,8 @@ GOTO MENU :STATUS CLS -echo RELEASE NET48 +echo RELEASE butler status bitl/novetus:windows -echo RELEASE NET40 -butler status bitl/novetus:windows-lite echo BETA butler status bitl/novetus:windows-beta pause diff --git a/scripts/batch/github_sync.bat b/scripts/batch/github_sync.bat index 231e36f..0004d34 100644 --- a/scripts/batch/github_sync.bat +++ b/scripts/batch/github_sync.bat @@ -144,11 +144,8 @@ if not exist "%dest%\scripts\batch" mkdir "%scriptsdir%\batch" XCOPY "%cd%\dev_menu.bat" "%scriptsdir%\batch" /y XCOPY "%cd%\clean_junk.bat" "%scriptsdir%\batch" /y XCOPY "%cd%\github_sync.bat" "%scriptsdir%\batch" /y -XCOPY "%cd%\create_lite.bat" "%scriptsdir%\batch" /y -XCOPY "%cd%\liteexclude.txt" "%scriptsdir%\batch" /y XCOPY "%cd%\assetfixer_gauntlet.lua" "%scriptsdir%" /y XCOPY "%cd%\Novetus\Novetus_dependency_installer.bat" "%scriptsdir%\batch" /y -XCOPY "%cd%\Net40files\Novetus_dependency_installer.bat" "%scriptsdir%\batch\Novetus_dependency_installer_4.0.bat*" /y XCOPY "%cd%\Novetus\Novetus_launcher_legacy.bat" "%scriptsdir%\batch" /y XCOPY "%cd%\Novetus\documentation.txt" "%dest%" /y XCOPY "%cd%\Novetus\consolehelp.txt" "%dest%" /y diff --git a/scripts/batch/liteexclude.txt b/scripts/batch/liteexclude.txt deleted file mode 100644 index b0c2e2c..0000000 --- a/scripts/batch/liteexclude.txt +++ /dev/null @@ -1 +0,0 @@ -ndp48-x86-x64-allos-enu.exe \ No newline at end of file diff --git a/scripts/batch/old/itch_loadNovetusCMDHelp.bat b/scripts/batch/old/itch_loadNovetusCMDHelp.bat deleted file mode 100644 index 980d276..0000000 --- a/scripts/batch/old/itch_loadNovetusCMDHelp.bat +++ /dev/null @@ -1 +0,0 @@ -"bin/NovetusCMD.exe" -help \ No newline at end of file diff --git a/scripts/batch/old/itch_loadNovetusSDK.bat b/scripts/batch/old/itch_loadNovetusSDK.bat deleted file mode 100644 index ec7cc05..0000000 --- a/scripts/batch/old/itch_loadNovetusSDK.bat +++ /dev/null @@ -1,3 +0,0 @@ -@ECHO OFF -start "" "%CD%/bin/Novetus.exe" -sdk -EXIT \ No newline at end of file diff --git a/scripts/batch/old/itch_loadNovetusURI.bat b/scripts/batch/old/itch_loadNovetusURI.bat deleted file mode 100644 index eb15740..0000000 --- a/scripts/batch/old/itch_loadNovetusURI.bat +++ /dev/null @@ -1,27 +0,0 @@ -@ECHO OFF -REM --> https://superuser.com/questions/705813/batch-file-with-commands-to-run-as-administrator-and-standard-user -:: BatchGotAdmin -:------------------------------------- -REM --> Check for permissions ->nul 2>&1 "%SYSTEMROOT%\system32\cacls.exe" "%SYSTEMROOT%\system32\config\system" - -REM --> If error flag set, we do not have admin. -if '%errorlevel%' NEQ '0' ( - echo Requesting administrative privileges... - goto UACPrompt -) else ( goto gotAdmin ) - -:UACPrompt - echo Set UAC = CreateObject^("Shell.Application"^) > "%temp%\getadmin.vbs" - echo UAC.ShellExecute "%~s0", "", "", "runas", 1 >> "%temp%\getadmin.vbs" - - "%temp%\getadmin.vbs" - exit /B - -:gotAdmin - if exist "%temp%\getadmin.vbs" ( del "%temp%\getadmin.vbs" ) - pushd "%CD%" - CD /D "%~dp0" - -start "" "%CD%/bin/NovetusURI.exe" -EXIT \ No newline at end of file diff --git a/scripts/launcher/info.ini b/scripts/launcher/info.ini index 038d3c0..ff02e34 100644 --- a/scripts/launcher/info.ini +++ b/scripts/launcher/info.ini @@ -8,6 +8,6 @@ ExtendedVersionNumber=True ExtendedVersionEditChangelog=True //ExtendedVersionTemplate=%version% v11.2022.%extended-revision%%lite% ExtendedVersionTemplate=%version% Snapshot v22.%build%.%revision%.%extended-revision% -ExtendedVersionRevision=2 +ExtendedVersionRevision=1 InitialBootup=False IsLite=False diff --git a/scripts/launcher/splashes.txt b/scripts/launcher/splashes.txt index 2a9de16..9705de1 100644 --- a/scripts/launcher/splashes.txt +++ b/scripts/launcher/splashes.txt @@ -239,4 +239,8 @@ Don't fence me in! Pick it Up!|Ima Say Ma Namowa Put it Down!|Ima Say Ma Namowa Down with Monogon! -allows the user to use W... \ No newline at end of file +allows the user to use W... +[stylish]I DROPPED MY PHONE IN MCDONALD'S SPRITE...|...AND THAT MOTHERFUCKER STARTED CHARGING!! +[normal]I'm the Toa of... of... Anarchy. +[stylish]My name is... ah... Toa Vezon. I'm the Toa of... of... Anarchy. +Your System ate a SPARC! Gah! \ No newline at end of file diff --git a/scripts/old/NovetusSetup.iss b/scripts/old/NovetusSetup.iss deleted file mode 100644 index 22deab7..0000000 --- a/scripts/old/NovetusSetup.iss +++ /dev/null @@ -1,65 +0,0 @@ -; Script generated by the Inno Script Studio Wizard. -; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! - -#define AppVer "1.0.0" - -[Setup] -; NOTE: The value of AppId uniquely identifies this application. -; Do not use the same AppId value in installers for other applications. -; (To generate a new GUID, click Tools | Generate GUID inside the IDE.) -AppId={{AC107FB8-A904-4D2C-8E4D-049808EB136E} -AppName=Novetus {#AppVer} -AppVersion={#AppVer} -AppVerName=Novetus {#AppVer} -AppPublisher=Bitl -DefaultDirName=C:\Novetus\{#AppVer} -DefaultGroupName=Novetus\{#AppVer} -AllowNoIcons=yes -OutputDir=. -OutputBaseFilename=NovetusSetup_{#AppVer} -SetupIconFile=Novetus\NovetusIcon.ico -Compression=lzma2/ultra64 -SolidCompression=yes - -[Languages] -Name: "english"; MessagesFile: "compiler:Default.isl" - -[Tasks] -Name: "desktopicon"; Description: "Create a icon on your Desktop"; GroupDescription: "Icons" -Name: "quicklaunchicon"; Description: "Create a icon on your Quick Launch Menu"; GroupDescription: "Icons"; Flags: unchecked; OnlyBelowVersion: 0,6.1 - -[Files] -Source: "Novetus\Novetus.exe"; DestDir: "{app}"; Flags: ignoreversion -Source: "Novetus\Novetus.exe.config"; DestDir: "{app}"; Flags: ignoreversion -Source: "Novetus\NovetusCMD.exe"; DestDir: "{app}"; Flags: ignoreversion -Source: "Novetus\NovetusCMD.exe.config"; DestDir: "{app}"; Flags: ignoreversion -Source: "Novetus\NovetusSDK.bat"; DestDir: "{app}"; Flags: ignoreversion -Source: "Novetus\discord-rpc.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "Novetus\Mono.Nat.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "Novetus\README.TXT"; DestDir: "{app}"; Flags: ignoreversion -Source: "Novetus\changelog.txt"; DestDir: "{app}"; Flags: ignoreversion -Source: "Novetus\documentation.txt"; DestDir: "{app}"; Flags: ignoreversion -Source: "Novetus\LICENCE.txt"; DestDir: "{app}"; Flags: ignoreversion -Source: "Novetus\novetus_steamartwork.png"; DestDir: "{app}"; Flags: ignoreversion -Source: "Novetus\clients\*"; DestDir: "{app}\clients"; Flags: ignoreversion recursesubdirs createallsubdirs -Source: "Novetus\maps\*"; DestDir: "{app}\maps"; Flags: ignoreversion recursesubdirs createallsubdirs -Source: "Novetus\models\*"; DestDir: "{app}\models"; Flags: ignoreversion recursesubdirs createallsubdirs -Source: "Novetus\config\*"; DestDir: "{app}\config"; Flags: ignoreversion recursesubdirs createallsubdirs -Source: "Novetus\shareddata\*"; DestDir: "{app}\shareddata"; Flags: ignoreversion recursesubdirs createallsubdirs -Source: "Novetus\_redist\*"; DestDir: "{app}\_redist"; Flags: ignoreversion recursesubdirs createallsubdirs - -[Icons] -Name: "{group}\Novetus {#AppVer}"; Filename: "{app}\Novetus.exe" -Name: "{group}\Utilities\Novetus SDK"; Filename: "{app}\Novetus.exe"; Parameters: "-sdk" -Name: "{group}\Uninstall Novetus {#AppVer}"; Filename: "{uninstallexe}" -Name: "{commondesktop}\Novetus {#AppVer}"; Filename: "{app}\Novetus.exe"; Tasks: desktopicon -Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\Novetus {#AppVer}"; Filename: "{app}\Novetus.exe"; Tasks: quicklaunchicon - -[Run] -Filename: "{app}\_redist\dotnetfx45_full_x86_x64.exe"; Description: "Install Microsoft .NET Framework 4.5"; Flags: nowait postinstall skipifsilent -Filename: "{app}\_redist\vcredist2005_x86.exe"; Description: "Install Microsoft Visual C++ 2005 Redistributable (32-bit)"; Flags: nowait postinstall skipifsilent -Filename: "{app}\_redist\vcredist2008_x86.exe"; Description: "Install Microsoft Visual C++ 2008 Redistributable (32-bit)"; Flags: nowait postinstall skipifsilent -Filename: "{app}\Novetus.exe"; Description: "Play Novetus"; Flags: nowait postinstall skipifsilent unchecked -Filename: "{app}\Novetus.exe"; Description: "Open the Novetus SDK"; Parameters: "-sdk"; Flags: nowait postinstall skipifsilent unchecked -Filename: "{app}\README.TXT"; Description: "View the README file"; Flags: postinstall shellexec skipifsilent unchecked -Filename: "{app}\changelog.txt"; Description: "View the changelog"; Flags: postinstall shellexec skipifsilent unchecked \ No newline at end of file diff --git a/scripts/old/index.php b/scripts/old/index.php deleted file mode 100644 index 63ee993..0000000 --- a/scripts/old/index.php +++ /dev/null @@ -1,13 +0,0 @@ - -Novetus Webserver Test Page - -
FUCKING HORSES!!!!!!!!
- - - - - \ No newline at end of file