diff --git a/Novetus/Novetus.Bootstrapper/Novetus.Bootstrapper.Net481.csproj b/Novetus/Novetus.Bootstrapper/Novetus.Bootstrapper.Net481.csproj new file mode 100644 index 0000000..016f089 --- /dev/null +++ b/Novetus/Novetus.Bootstrapper/Novetus.Bootstrapper.Net481.csproj @@ -0,0 +1,119 @@ + + + + + Debug + AnyCPU + {8D030E72-BBF0-42E2-9DFB-C29E9E2A7E80} + WinExe + Novetus.Bootstrapper + NovetusBootstrapper + v4.8.1 + 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 e1b12d8..95d5a23 100644 --- a/Novetus/Novetus.Bootstrapper/Novetus.Bootstrapper.csproj +++ b/Novetus/Novetus.Bootstrapper/Novetus.Bootstrapper.csproj @@ -18,7 +18,7 @@ full false bin\Debug\ - TRACE;DEBUG;BASICLAUNCHER;NOVETUS_APPS + TRACE;DEBUG;BASICLAUNCHER;NOVETUS_APPS;NET4 prompt 4 diff --git a/Novetus/Novetus.Bootstrapper/Properties/Resources.Designer.cs b/Novetus/Novetus.Bootstrapper/Properties/Resources.Designer.cs index adeffeb..1b1338f 100644 --- a/Novetus/Novetus.Bootstrapper/Properties/Resources.Designer.cs +++ b/Novetus/Novetus.Bootstrapper/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace Novetus.Bootstrapper.Properties { // 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", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/Novetus/Novetus.Bootstrapper/Properties/Settings.Designer.cs b/Novetus/Novetus.Bootstrapper/Properties/Settings.Designer.cs index 9d6e5ca..f579b53 100644 --- a/Novetus/Novetus.Bootstrapper/Properties/Settings.Designer.cs +++ b/Novetus/Novetus.Bootstrapper/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace Novetus.Bootstrapper.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.2.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/Novetus/Novetus.Bootstrapper/app.config b/Novetus/Novetus.Bootstrapper/app.config new file mode 100644 index 0000000..eca069e --- /dev/null +++ b/Novetus/Novetus.Bootstrapper/app.config @@ -0,0 +1,3 @@ + + + diff --git a/Novetus/Novetus.ClientScriptTester/Novetus.ClientScriptTester.Net481.csproj b/Novetus/Novetus.ClientScriptTester/Novetus.ClientScriptTester.Net481.csproj new file mode 100644 index 0000000..f289c5f --- /dev/null +++ b/Novetus/Novetus.ClientScriptTester/Novetus.ClientScriptTester.Net481.csproj @@ -0,0 +1,109 @@ + + + + + Debug + AnyCPU + {83B08607-65B8-4F9C-8D0F-AB1C8EEFFAE0} + WinExe + Novetus.ClientScriptTester + ClientScriptTester + v4.0 + 512 + + + AnyCPU + true + full + false + bin\Debug\ + TRACE;DEBUG;TESTER;NOVETUS_APPS;NET481 + prompt + 4 + + + AnyCPU + pdbonly + true + bin\Release\ + TRACE;TESTER;NOVETUS_APPS;NET481 + prompt + 4 + + + NovetusIcon.ico + + + app.manifest + + + + + + + + + + + + + + + + + + + + + + Form + + + ClientScriptTestForm.cs + + + + + ClientScriptTestForm.cs + + + ResXFileCodeGenerator + Resources.Designer.cs + Designer + + + True + Resources.resx + + + + + 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 778216c..43718c9 100644 --- a/Novetus/Novetus.ClientScriptTester/Novetus.ClientScriptTester.csproj +++ b/Novetus/Novetus.ClientScriptTester/Novetus.ClientScriptTester.csproj @@ -26,7 +26,7 @@ pdbonly true bin\Release\ - TRACE + TRACE;TESTER;NOVETUS_APPS;NET4 prompt 4 diff --git a/Novetus/Novetus.Net481.sln b/Novetus/Novetus.Net481.sln new file mode 100644 index 0000000..f0d9c9e --- /dev/null +++ b/Novetus/Novetus.Net481.sln @@ -0,0 +1,45 @@ + +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", "G:\Projects\GitHub\Novetus\Novetus_src\Novetus\Novetus.Bootstrapper\Novetus.Bootstrapper.Net481.csproj", "{8D030E72-BBF0-42E2-9DFB-C29E9E2A7E80}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Novetus.Launcher.Net481", "G:\Projects\GitHub\Novetus\Novetus_src\Novetus\NovetusLauncher\Novetus.Launcher.Net481.csproj", "{78EE2921-681F-411A-90F2-773A5CE96B7E}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Novetus.URI.Net481", "G:\Projects\GitHub\Novetus\Novetus_src\Novetus\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 + G:\Projects\GitHub\Novetus\Novetus_src\Novetus\NovetusCore\NovetusCore.projitems*{78ee2921-681f-411a-90f2-773a5ce96b7e}*SharedItemsImports = 4 + G:\Projects\GitHub\Novetus\Novetus_src\Novetus\NovetusCore\NovetusCore.projitems*{8d030e72-bbf0-42e2-9dfb-c29e9e2a7e80}*SharedItemsImports = 4 + G:\Projects\GitHub\Novetus\Novetus_src\Novetus\NovetusCore\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/Novetus.ReleasePreparer.Net481.csproj b/Novetus/Novetus.ReleasePreparer/Novetus.ReleasePreparer.Net481.csproj new file mode 100644 index 0000000..ff4481a --- /dev/null +++ b/Novetus/Novetus.ReleasePreparer/Novetus.ReleasePreparer.Net481.csproj @@ -0,0 +1,70 @@ + + + + + Debug + AnyCPU + {64A99062-3C1C-4D2E-99E4-D6D92443AC98} + Exe + Novetus.ReleasePreparer + ReleasePreparer + v4.0 + 512 + false + + + AnyCPU + true + full + false + bin\Debug\ + TRACE;DEBUG;PREPARER;NET481 + prompt + 4 + + + AnyCPU + pdbonly + true + bin\Release\ + TRACE;PREPARER;NET481 + prompt + 4 + + + NovetusIcon.ico + + + + + + + + + + + + + INIFile.cs + + + + + + + + + + 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.ReleasePreparer/Novetus.ReleasePreparer.csproj b/Novetus/Novetus.ReleasePreparer/Novetus.ReleasePreparer.csproj index 4a6b59d..96a5651 100644 --- a/Novetus/Novetus.ReleasePreparer/Novetus.ReleasePreparer.csproj +++ b/Novetus/Novetus.ReleasePreparer/Novetus.ReleasePreparer.csproj @@ -27,7 +27,7 @@ pdbonly true bin\Release\ - TRACE;PREPARER + TRACE;PREPARER;NET4 prompt 4 diff --git a/Novetus/Novetus.Tools.Net481.sln b/Novetus/Novetus.Tools.Net481.sln new file mode 100644 index 0000000..ffc0ea5 --- /dev/null +++ b/Novetus/Novetus.Tools.Net481.sln @@ -0,0 +1,43 @@ + +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.ClientScriptTester", "Novetus.ClientScriptTester\Novetus.ClientScriptTester.csproj", "{83B08607-65B8-4F9C-8D0F-AB1C8EEFFAE0}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Novetus.ReleasePreparer", "Novetus.ReleasePreparer\Novetus.ReleasePreparer.csproj", "{64A99062-3C1C-4D2E-99E4-D6D92443AC98}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + 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 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {66CA6CE5-670E-48AA-A2DA-9347371D4CA0} + EndGlobalSection +EndGlobal diff --git a/Novetus/NovetusCore/StorageAndFunctions/Util.cs b/Novetus/NovetusCore/StorageAndFunctions/Util.cs index dbc514c..693bb1d 100644 --- a/Novetus/NovetusCore/StorageAndFunctions/Util.cs +++ b/Novetus/NovetusCore/StorageAndFunctions/Util.cs @@ -562,7 +562,7 @@ public static class Util var tcs = new TaskCompletionSource(); new System.Threading.Timer(_ => tcs.SetResult(null)).Change(milliseconds, -1); return tcs.Task; -#elif NET6_0_OR_GREATER +#elif NET481 return Task.Delay(milliseconds); #endif } diff --git a/Novetus/NovetusLauncher/Novetus.Launcher.Net481.csproj b/Novetus/NovetusLauncher/Novetus.Launcher.Net481.csproj new file mode 100644 index 0000000..1e55d4e --- /dev/null +++ b/Novetus/NovetusLauncher/Novetus.Launcher.Net481.csproj @@ -0,0 +1,437 @@ + + + + {78EE2921-681F-411A-90F2-773A5CE96B7E} + Debug + AnyCPU + WinExe + NovetusLauncher + Novetus + v4.8.1 + + + 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 + + + + + + + ..\packages\DotNetZip.1.16.0\lib\net40\DotNetZip.dll + + + + ..\packages\Mono.Nat.1.2.24.0\lib\net40\Mono.Nat.dll + + + ..\packages\NLog.5.0.5\lib\net35\NLog.dll + + + + + + + + 3.5 + + + + 3.5 + + + + + + + + + + + + + 3.5 + + + + + + + + + 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 9f791dc..c44437a 100644 --- a/Novetus/NovetusLauncher/Novetus.Launcher.csproj +++ b/Novetus/NovetusLauncher/Novetus.Launcher.csproj @@ -52,7 +52,7 @@ Full False True - DEBUG;TRACE;LAUNCHER;NOVETUS_APPS + DEBUG;TRACE;LAUNCHER;NOVETUS_APPS;NET4 obj\ @@ -61,7 +61,7 @@ None True True - TRACE;LAUNCHER;NOVETUS_APPS + TRACE;LAUNCHER;NOVETUS_APPS;NET4 obj\ Project diff --git a/Novetus/NovetusLauncher/Properties/Resources.Designer.cs b/Novetus/NovetusLauncher/Properties/Resources.Designer.cs index 6c9aec0..37946e7 100644 --- a/Novetus/NovetusLauncher/Properties/Resources.Designer.cs +++ b/Novetus/NovetusLauncher/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace NovetusLauncher.Properties { // 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", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] public class Resources { diff --git a/Novetus/NovetusLauncher/app.config b/Novetus/NovetusLauncher/app.config index c3517cc..8103af1 100644 --- a/Novetus/NovetusLauncher/app.config +++ b/Novetus/NovetusLauncher/app.config @@ -1,19 +1,19 @@ - + - + - - + + - - + + - + diff --git a/Novetus/NovetusURI/App.config b/Novetus/NovetusURI/App.config index 5ad9b05..e60cfaa 100644 --- a/Novetus/NovetusURI/App.config +++ b/Novetus/NovetusURI/App.config @@ -1,19 +1,19 @@ - + - + - - + + - - + + - + diff --git a/Novetus/NovetusURI/Novetus.URI.Net481.csproj b/Novetus/NovetusURI/Novetus.URI.Net481.csproj new file mode 100644 index 0000000..82f63d7 --- /dev/null +++ b/Novetus/NovetusURI/Novetus.URI.Net481.csproj @@ -0,0 +1,189 @@ + + + + + Debug + AnyCPU + {917B30DE-F2C0-4955-B3B9-5BF90C3D01E9} + WinExe + Properties + NovetusURI + NovetusURI + v4.8.1 + 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 + + + + ..\packages\Mono.Nat.1.2.24.0\lib\net40\Mono.Nat.dll + + + ..\packages\NLog.5.0.5\lib\net35\NLog.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 2ab552a..6d03684 100644 --- a/Novetus/NovetusURI/Novetus.URI.csproj +++ b/Novetus/NovetusURI/Novetus.URI.csproj @@ -22,7 +22,7 @@ full false bin\Debug\ - TRACE;DEBUG;URI;NOVETUS_APPS + TRACE;DEBUG;URI;NOVETUS_APPS;NET4 none 4 4096 diff --git a/Novetus/NovetusURI/Properties/Resources.Designer.cs b/Novetus/NovetusURI/Properties/Resources.Designer.cs index 5f6c063..9b3268f 100644 --- a/Novetus/NovetusURI/Properties/Resources.Designer.cs +++ b/Novetus/NovetusURI/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace NovetusURI.Properties { // 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.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/Novetus/NovetusURI/Properties/Settings.Designer.cs b/Novetus/NovetusURI/Properties/Settings.Designer.cs index acc55a8..9392135 100644 --- a/Novetus/NovetusURI/Properties/Settings.Designer.cs +++ b/Novetus/NovetusURI/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace NovetusURI.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.2.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/Novetus_SolutionLoader.bat b/Novetus_SolutionLoader.bat index 7ff9721..05bb5ed 100644 --- a/Novetus_SolutionLoader.bat +++ b/Novetus_SolutionLoader.bat @@ -1,35 +1,28 @@ @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" -rd /s /q "%cd%\Novetus\Novetus.Bootstrapper\bin_net6" -rd /s /q "%cd%\Novetus\Novetus.Bootstrapper\obj_net6" echo Cleaning Novetus.ClientScriptTester rd /s /q "%cd%\Novetus\Novetus.ClientScriptTester\bin" rd /s /q "%cd%\Novetus\Novetus.ClientScriptTester\obj" -rd /s /q "%cd%\Novetus\Novetus.ClientScriptTester\bin_net6" -rd /s /q "%cd%\Novetus\Novetus.ClientScriptTester\obj_net6" echo Cleaning Novetus.ReleasePreparer rd /s /q "%cd%\Novetus\Novetus.ReleasePreparer\bin" rd /s /q "%cd%\Novetus\Novetus.ReleasePreparer\obj" -rd /s /q "%cd%\Novetus\Novetus.ReleasePreparer\bin_net6" -rd /s /q "%cd%\Novetus\Novetus.ReleasePreparer\obj_net6" echo Cleaning NovetusLauncher rd /s /q "%cd%\Novetus\NovetusLauncher\bin" rd /s /q "%cd%\Novetus\NovetusLauncher\obj" -rd /s /q "%cd%\Novetus\NovetusLauncher\bin_net6" -rd /s /q "%cd%\Novetus\NovetusLauncher\obj_net6" echo Cleaning NovetusURI rd /s /q "%cd%\Novetus\NovetusURI\bin" rd /s /q "%cd%\Novetus\NovetusURI\obj" -rd /s /q "%cd%\Novetus\NovetusURI\bin_net6" -rd /s /q "%cd%\Novetus\NovetusURI\obj_net6" goto MENU :MENU @@ -38,13 +31,13 @@ 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 6) -ECHO 4 - Novetus.Tools (.NET 6) +ECHO 3 - Novetus (.NET Framework 4.8.1) +ECHO 4 - Novetus.Tools (.NET Framework 4.8.1) 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.Net6.sln" -IF %M%==4 start "" "%cd%\Novetus\Novetus.Tools.Net6.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