diff --git a/source/Reloaded-II.sln b/source/Reloaded-II.sln index 4e7e783e..033e2edc 100644 --- a/source/Reloaded-II.sln +++ b/source/Reloaded-II.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.1.31911.260 +# Visual Studio Version 18 +VisualStudioVersion = 18.1.11304.174 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Reloaded.Mod.Launcher", "Reloaded.Mod.Launcher\Reloaded.Mod.Launcher.csproj", "{159EF9A3-1B08-45F8-97CA-8DD72BC91936}" ProjectSection(ProjectDependencies) = postProject @@ -11,15 +11,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Reloaded.Mod.Interfaces", " EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Reloaded.Mod.Loader", "Reloaded.Mod.Loader\Reloaded.Mod.Loader.csproj", "{CF3E2DC7-04F8-4878-97F4-1BCF950AC97D}" ProjectSection(ProjectDependencies) = postProject - {56DFC45C-49FB-4409-823E-EE54637F58A1} = {56DFC45C-49FB-4409-823E-EE54637F58A1} + {2874B768-225F-44F9-B4FA-C7AD381A2E4C} = {2874B768-225F-44F9-B4FA-C7AD381A2E4C} EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Reloaded.Mod.Loader.Tests", "Reloaded.Mod.Loader.Tests\Reloaded.Mod.Loader.Tests.csproj", "{305129E2-ED0F-45A5-BEBB-72202B002AF1}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Reloaded.Mod.Loader.IO", "Reloaded.Mod.Loader.IO\Reloaded.Mod.Loader.IO.csproj", "{82170607-827D-4F66-B01B-73B4CA47B473}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Reloaded.Mod.Loader.Bootstrapper", "Reloaded.Mod.Loader.Bootstrapper\Reloaded.Mod.Bootstrapper.vcxproj", "{56DFC45C-49FB-4409-823E-EE54637F58A1}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Reloaded.Mod.Loader.Server", "Reloaded.Mod.Loader.Server\Reloaded.Mod.Loader.Server.csproj", "{9D416472-B721-4DF6-8218-63853A17D8F6}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Testing", "Testing", "{C958AA4D-5985-4F2E-8209-9B6187FF3D85}" @@ -86,6 +84,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Reloaded.Mod.Installer.Lib" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Reloaded.Mod.Installer.Cli", "Reloaded.Mod.Installer.Cli\Reloaded.Mod.Installer.Cli.csproj", "{A5C8607B-C5C6-4EF5-A86D-1E9B79B1E7E5}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Reloaded.Mod.Loader.Bootstrapper", "Reloaded.Mod.Loader.Bootstrapper\Reloaded.Mod.Loader.Bootstrapper.vcxproj", "{2874B768-225F-44F9-B4FA-C7AD381A2E4C}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -176,22 +176,6 @@ Global {82170607-827D-4F66-B01B-73B4CA47B473}.Release-ModLoaderOnly|Any CPU.Build.0 = Release|Any CPU {82170607-827D-4F66-B01B-73B4CA47B473}.Release-ModLoaderOnly|X64+X86.ActiveCfg = Release|Any CPU {82170607-827D-4F66-B01B-73B4CA47B473}.Release-ModLoaderOnly|X64+X86.Build.0 = Release|Any CPU - {56DFC45C-49FB-4409-823E-EE54637F58A1}.Debug|Any CPU.ActiveCfg = Debug|x64 - {56DFC45C-49FB-4409-823E-EE54637F58A1}.Debug|Any CPU.Build.0 = Debug|x64 - {56DFC45C-49FB-4409-823E-EE54637F58A1}.Debug|X64+X86.ActiveCfg = Debug|x64 - {56DFC45C-49FB-4409-823E-EE54637F58A1}.Debug|X64+X86.Build.0 = Debug|x64 - {56DFC45C-49FB-4409-823E-EE54637F58A1}.Debug-ModLoaderOnly|Any CPU.ActiveCfg = Debug|x64 - {56DFC45C-49FB-4409-823E-EE54637F58A1}.Debug-ModLoaderOnly|Any CPU.Build.0 = Debug|x64 - {56DFC45C-49FB-4409-823E-EE54637F58A1}.Debug-ModLoaderOnly|X64+X86.ActiveCfg = Debug|x64 - {56DFC45C-49FB-4409-823E-EE54637F58A1}.Debug-ModLoaderOnly|X64+X86.Build.0 = Debug|x64 - {56DFC45C-49FB-4409-823E-EE54637F58A1}.Release|Any CPU.ActiveCfg = Release|x64 - {56DFC45C-49FB-4409-823E-EE54637F58A1}.Release|Any CPU.Build.0 = Release|x64 - {56DFC45C-49FB-4409-823E-EE54637F58A1}.Release|X64+X86.ActiveCfg = Release|x64 - {56DFC45C-49FB-4409-823E-EE54637F58A1}.Release|X64+X86.Build.0 = Release|x64 - {56DFC45C-49FB-4409-823E-EE54637F58A1}.Release-ModLoaderOnly|Any CPU.ActiveCfg = Release|x64 - {56DFC45C-49FB-4409-823E-EE54637F58A1}.Release-ModLoaderOnly|Any CPU.Build.0 = Release|x64 - {56DFC45C-49FB-4409-823E-EE54637F58A1}.Release-ModLoaderOnly|X64+X86.ActiveCfg = Release|x64 - {56DFC45C-49FB-4409-823E-EE54637F58A1}.Release-ModLoaderOnly|X64+X86.Build.0 = Release|x64 {9D416472-B721-4DF6-8218-63853A17D8F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9D416472-B721-4DF6-8218-63853A17D8F6}.Debug|Any CPU.Build.0 = Debug|Any CPU {9D416472-B721-4DF6-8218-63853A17D8F6}.Debug|X64+X86.ActiveCfg = Debug|Any CPU @@ -546,6 +530,22 @@ Global {A5C8607B-C5C6-4EF5-A86D-1E9B79B1E7E5}.Release-ModLoaderOnly|Any CPU.Build.0 = Debug|Any CPU {A5C8607B-C5C6-4EF5-A86D-1E9B79B1E7E5}.Release-ModLoaderOnly|X64+X86.ActiveCfg = Debug|Any CPU {A5C8607B-C5C6-4EF5-A86D-1E9B79B1E7E5}.Release-ModLoaderOnly|X64+X86.Build.0 = Debug|Any CPU + {2874B768-225F-44F9-B4FA-C7AD381A2E4C}.Debug|Any CPU.ActiveCfg = Debug|x64 + {2874B768-225F-44F9-B4FA-C7AD381A2E4C}.Debug|Any CPU.Build.0 = Debug|x64 + {2874B768-225F-44F9-B4FA-C7AD381A2E4C}.Debug|X64+X86.ActiveCfg = Debug|x64 + {2874B768-225F-44F9-B4FA-C7AD381A2E4C}.Debug|X64+X86.Build.0 = Debug|x64 + {2874B768-225F-44F9-B4FA-C7AD381A2E4C}.Debug-ModLoaderOnly|Any CPU.ActiveCfg = Debug|x64 + {2874B768-225F-44F9-B4FA-C7AD381A2E4C}.Debug-ModLoaderOnly|Any CPU.Build.0 = Debug|x64 + {2874B768-225F-44F9-B4FA-C7AD381A2E4C}.Debug-ModLoaderOnly|X64+X86.ActiveCfg = Debug|x64 + {2874B768-225F-44F9-B4FA-C7AD381A2E4C}.Debug-ModLoaderOnly|X64+X86.Build.0 = Debug|x64 + {2874B768-225F-44F9-B4FA-C7AD381A2E4C}.Release|Any CPU.ActiveCfg = Release|x64 + {2874B768-225F-44F9-B4FA-C7AD381A2E4C}.Release|Any CPU.Build.0 = Release|x64 + {2874B768-225F-44F9-B4FA-C7AD381A2E4C}.Release|X64+X86.ActiveCfg = Release|x64 + {2874B768-225F-44F9-B4FA-C7AD381A2E4C}.Release|X64+X86.Build.0 = Release|x64 + {2874B768-225F-44F9-B4FA-C7AD381A2E4C}.Release-ModLoaderOnly|Any CPU.ActiveCfg = Release|x64 + {2874B768-225F-44F9-B4FA-C7AD381A2E4C}.Release-ModLoaderOnly|Any CPU.Build.0 = Release|x64 + {2874B768-225F-44F9-B4FA-C7AD381A2E4C}.Release-ModLoaderOnly|X64+X86.ActiveCfg = Release|x64 + {2874B768-225F-44F9-B4FA-C7AD381A2E4C}.Release-ModLoaderOnly|X64+X86.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/source/Reloaded.Mod.Loader.Bootstrapper/Reloaded.Mod.Bootstrapper.vcxproj b/source/Reloaded.Mod.Loader.Bootstrapper/Reloaded.Mod.Loader.Bootstrapper.vcxproj similarity index 92% rename from source/Reloaded.Mod.Loader.Bootstrapper/Reloaded.Mod.Bootstrapper.vcxproj rename to source/Reloaded.Mod.Loader.Bootstrapper/Reloaded.Mod.Loader.Bootstrapper.vcxproj index 74130aa2..34b76602 100644 --- a/source/Reloaded.Mod.Loader.Bootstrapper/Reloaded.Mod.Bootstrapper.vcxproj +++ b/source/Reloaded.Mod.Loader.Bootstrapper/Reloaded.Mod.Loader.Bootstrapper.vcxproj @@ -1,275 +1,269 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - 16.0 - {56DFC45C-49FB-4409-823E-EE54637F58A1} - Win32Proj - ReloadedModBootstrapper - 10.0 - Reloaded.Mod.Loader.Bootstrapper - - - - DynamicLibrary - false - v142 - Unicode - - - DynamicLibrary - false - v142 - true - Unicode - - - DynamicLibrary - false - v142 - Unicode - - - DynamicLibrary - false - v142 - true - Unicode - - - - - - - - - - - - - - - - - - - - - true - ..\Output\Launcher\Loader\ - - - true - ..\Output\Launcher\Loader\ - - - false - ..\Output\Launcher\Loader\ - - - false - ..\Output\Launcher\Loader\ - - - - Use - Level3 - Disabled - true - WIN32;NDEBUG;RELOADEDMODBOOTSTRAPPER_EXPORTS;_WINDOWS;_USRDLL;NETHOST_USE_AS_STATIC;%(PreprocessorDefinitions) - true - pch.h - MultiThreadedDLL - true - 6262;26451;4099 - false - - - .\nethost\x86-libs;%(AdditionalLibraryDirectories) - %(AdditionalDependencies) - - - Windows - true - false - $(OutDir)\X86\Bootstrapper\$(TargetName)$(TargetExt) - $(OutDir)\X86\Bootstrapper\$(TargetName).pdb - %(DelayLoadDLLs) - - - exports.def - - - - - Use - Level3 - Disabled - true - NDEBUG;RELOADEDMODBOOTSTRAPPER_EXPORTS;_WINDOWS;_USRDLL;NETHOST_USE_AS_STATIC;%(PreprocessorDefinitions) - true - pch.h - MultiThreadedDLL - true - 6262;26451;4099 - false - - - .\nethost\x64-libs;%(AdditionalLibraryDirectories) - %(AdditionalDependencies) - - - Windows - true - false - $(OutDir)\X64\Bootstrapper\$(TargetName)$(TargetExt) - $(OutDir)\X64\Bootstrapper\$(TargetName).pdb - %(DelayLoadDLLs) - - - exports.def - - - - - Use - Level3 - MinSpace - true - true - true - WIN32;NDEBUG;RELOADEDMODBOOTSTRAPPER_EXPORTS;_WINDOWS;_USRDLL;NETHOST_USE_AS_STATIC;%(PreprocessorDefinitions) - true - pch.h - MultiThreadedDLL - true - 6262;26451;4099 - true - false - false - - - .\nethost\x86-libs;%(AdditionalLibraryDirectories) - %(AdditionalDependencies) - - - Windows - true - true - true - false - $(OutDir)\X86\Bootstrapper\$(TargetName)$(TargetExt) - $(OutDir)\X86\Bootstrapper\$(TargetName).pdb - %(DelayLoadDLLs) - /brepro %(AdditionalOptions) - exports.def - - - - - Use - Level3 - MinSpace - true - true - true - NDEBUG;RELOADEDMODBOOTSTRAPPER_EXPORTS;_WINDOWS;_USRDLL;NETHOST_USE_AS_STATIC;%(PreprocessorDefinitions) - true - pch.h - MultiThreadedDLL - true - 6262;26451;4099 - true - - - false - false - - - .\nethost\x64-libs;%(AdditionalLibraryDirectories) - %(AdditionalDependencies) - - - Windows - true - true - true - false - $(OutDir)\X64\Bootstrapper\$(TargetName)$(TargetExt) - $(OutDir)\X64\Bootstrapper\$(TargetName).pdb - %(DelayLoadDLLs) - /brepro %(AdditionalOptions) - exports.def - - - - - - - - - - - - - - - - - - - - - - - Create - Create - Create - Create - - - - - - - - true - true - false - false - - - true - true - false - false - - - - - - - - - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 18.0 + Win32Proj + {2874b768-225f-44f9-b4fa-c7ad381a2e4c} + ReloadedModBootstrapper + 10.0 + Reloaded.Mod.Loader.Bootstrapper + + + + DynamicLibrary + true + v142 + Unicode + + + DynamicLibrary + false + v142 + true + Unicode + + + DynamicLibrary + true + v142 + Unicode + + + DynamicLibrary + false + v142 + true + Unicode + + + + + + + + + + + + + + + + + + + + + true + ..\Output\Launcher\Loader\ + + + true + ..\Output\Launcher\Loader\ + + + false + ..\Output\Launcher\Loader\ + + + false + ..\Output\Launcher\Loader\ + + + + Level3 + true + WIN32;_DEBUG;RELOADEDMODBOOTSTRAPPER_EXPORTS;_WINDOWS;_USRDLL;NETHOST_USE_AS_STATIC;%(PreprocessorDefinitions) + true + Default + Use + pch.h + Disabled + MultiThreadedDLL + true + 6262;26451;4099 + false + + + .\nethost\x86-libs;%(AdditionalLibraryDirectories) + %(AdditionalDependencies) + + + Windows + true + false + $(OutDir)\X86\Bootstrapper\$(TargetName)$(TargetExt) + $(OutDir)\X86\Bootstrapper\$(TargetName).pdb + exports.def + + + + + Level3 + true + true + true + WIN32;NDEBUG;RELOADEDMODBOOTSTRAPPER_EXPORTS;_WINDOWS;_USRDLL;NETHOST_USE_AS_STATIC;%(PreprocessorDefinitions) + true + Default + Use + pch.h + MinSpace + MultiThreadedDLL + true + 6262;26451;4099 + true + false + false + + + .\nethost\x86-libs;%(AdditionalLibraryDirectories) + %(AdditionalDependencies) + + + Windows + true + false + true + true + $(OutDir)\X86\Bootstrapper\$(TargetName)$(TargetExt) + $(OutDir)\X86\Bootstrapper\$(TargetName).pdb + /brepro %(AdditionalOptions) + exports.def + + + + + Level3 + true + _DEBUG;RELOADEDMODBOOTSTRAPPER_EXPORTS;_WINDOWS;_USRDLL;NETHOST_USE_AS_STATIC;%(PreprocessorDefinitions) + true + stdcpp20 + Use + pch.h + Disabled + MultiThreadedDLL + true + 6262;26451;4099 + false + + + .\nethost\x64-libs;%(AdditionalLibraryDirectories) + %(AdditionalDependencies) + + + Windows + true + false + $(OutDir)\X64\Bootstrapper\$(TargetName)$(TargetExt) + $(OutDir)\X64\Bootstrapper\$(TargetName).pdb + exports.def + + + + + Level3 + true + true + true + NDEBUG;RELOADEDMODBOOTSTRAPPER_EXPORTS;_WINDOWS;_USRDLL;NETHOST_USE_AS_STATIC;%(PreprocessorDefinitions) + true + stdcpp20 + Use + pch.h + MinSpace + MultiThreadedDLL + true + 6262;26451;4099 + true + false + false + + + .\nethost\x64-libs;%(AdditionalLibraryDirectories) + %(AdditionalDependencies) + + + Windows + true + false + true + true + $(OutDir)\X64\Bootstrapper\$(TargetName)$(TargetExt) + $(OutDir)\X64\Bootstrapper\$(TargetName).pdb + /brepro %(AdditionalOptions) + exports.def + + + + + + + + + + + + + + + + + + + + + + + Create + Create + Create + Create + + + + + + + + + true + true + false + false + + + true + true + false + false + + + + + + + + + + + \ No newline at end of file diff --git a/source/Reloaded.Mod.Loader.Bootstrapper/Reloaded.Mod.Bootstrapper.vcxproj.filters b/source/Reloaded.Mod.Loader.Bootstrapper/Reloaded.Mod.Loader.Bootstrapper.vcxproj.filters similarity index 97% rename from source/Reloaded.Mod.Loader.Bootstrapper/Reloaded.Mod.Bootstrapper.vcxproj.filters rename to source/Reloaded.Mod.Loader.Bootstrapper/Reloaded.Mod.Loader.Bootstrapper.vcxproj.filters index 71dbfb60..a9aca22f 100644 --- a/source/Reloaded.Mod.Loader.Bootstrapper/Reloaded.Mod.Bootstrapper.vcxproj.filters +++ b/source/Reloaded.Mod.Loader.Bootstrapper/Reloaded.Mod.Loader.Bootstrapper.vcxproj.filters @@ -1,113 +1,113 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;ipp;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - {afb1b884-50ca-47ca-9b9c-8d0b39f3719c} - - - {df759a42-af6f-4b8d-8781-aafdcbf8ddf6} - - - {609e640f-9856-4ce2-b3f2-a6a7235c860c} - - - {4c4bb2b8-9685-4b64-9e37-876edd98b4f3} - - - {983af5d2-79ad-4ed3-a516-487073aafd86} - - - - - Header Files - - - Header Files\nethost - - - Header Files\core-setup - - - Header Files\core-setup - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files\nlohmann - - - Header Files - - - Header Files - - - Resource Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files\project-template - - - - - Source Files\project-template - - - - - Header Files\nethost\x86-libs - - - Header Files\nethost\x64-libs - - - - - Resource Files - - + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;ipp;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + {afb1b884-50ca-47ca-9b9c-8d0b39f3719c} + + + {df759a42-af6f-4b8d-8781-aafdcbf8ddf6} + + + {609e640f-9856-4ce2-b3f2-a6a7235c860c} + + + {4c4bb2b8-9685-4b64-9e37-876edd98b4f3} + + + {983af5d2-79ad-4ed3-a516-487073aafd86} + + + + + Header Files + + + Header Files\nethost + + + Header Files\core-setup + + + Header Files\core-setup + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files\nlohmann + + + Header Files + + + Header Files + + + Resource Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files\project-template + + + + + Source Files\project-template + + + + + Header Files\nethost\x86-libs + + + Header Files\nethost\x64-libs + + + + + Resource Files + + \ No newline at end of file