Update GWCA (#538)

Fix inventory bug

Daybreak.GWCA/CMakeLists.txt

@@ -2,17 +2,28 @@
 # project specific logic here.
 #
 
-project(Daybreak.GWCA)
+project(Daybreak.GWCA VERSION 1.0.0)
 
 if(CMAKE_SIZEOF_VOID_P EQUAL 8)
     message(FATAL_ERROR "You are configuring a 64bit build, this is not supported. Run cmake with `-A Win32`")
 endif()
 
+set(VERSION_MAJOR 0)
+set(VERSION_MINOR 9)
+set(VERSION_PATCH 9)
+set(VERSION_TWEAK 6)
+
+set(VERSION_RC "${CMAKE_CURRENT_BINARY_DIR}/version.rc")
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/version.rc.in" "${VERSION_RC}" @ONLY)
+
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_SOURCE_DIR}/bin")
+set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(Daybreak.GWCA_FOLDER "${CMAKE_CURRENT_LIST_DIR}/")
+set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+set(CMAKE_INSTALL_PREFIX ${PROJECT_SOURCE_DIR}/bin/install)
+add_compile_options(/MP /permissive-)
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake/")
 
 add_library(Daybreak.GWCA SHARED)
@@ -23,7 +34,8 @@ file(GLOB SOURCES
     "header/*.h*"
     "header/*/*.h")
 source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}" FILES ${SOURCES})
-target_sources(Daybreak.GWCA PRIVATE ${SOURCES})
+source_group("Generated Files" FILES ${VERSION_RC})
+target_sources(Daybreak.GWCA PRIVATE ${SOURCES} ${VERSION_RC})
 target_compile_features(Daybreak.GWCA PUBLIC cxx_std_17)
 target_compile_definitions(Daybreak.GWCA PRIVATE
     $<$<CONFIG:Debug>:BUILD_TYPE_DEBUG>

Daybreak.GWCA/version.rc.in

@@ -0,0 +1,34 @@
+#include <winver.h>
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION @VERSION_MAJOR@,@VERSION_MINOR@,@VERSION_PATCH@,@VERSION_TWEAK@
+ PRODUCTVERSION @VERSION_MAJOR@,@VERSION_MINOR@,@VERSION_PATCH@,@VERSION_TWEAK@
+ FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+#ifdef _DEBUG
+ FILEFLAGS VS_FF_DEBUG
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS VOS_NT_WINDOWS32
+ FILETYPE VFT_DLL
+ FILESUBTYPE VFT2_UNKNOWN
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", "gwdevhub"
+            VALUE "FileDescription", "Daybreak.GWCA"
+            VALUE "FileVersion", "@VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@.@VERSION_TWEAK@"
+            VALUE "InternalName", "Daybreak.GWCA"
+            VALUE "LegalCopyright", ""
+            VALUE "OriginalFilename", "Daybreak.GWCA.dll"
+            VALUE "ProductName", "Daybreak.GWCA"
+            VALUE "ProductVersion", "@VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@.@VERSION_TWEAK@"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 0x4B0
+    END
+END

Daybreak/Daybreak.csproj

@@ -11,7 +11,7 @@
     <LangVersion>preview</LangVersion>
     <ApplicationIcon>Daybreak.ico</ApplicationIcon>
     <IncludePackageReferencesDuringMarkupCompilation>true</IncludePackageReferencesDuringMarkupCompilation>
-    <Version>0.9.9.5</Version>
+    <Version>0.9.9.6</Version>
     <EnableWindowsTargeting>true</EnableWindowsTargeting>
     <UserSecretsId>cfb2a489-db80-448d-a969-80270f314c46</UserSecretsId>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
@@ -66,7 +66,7 @@
 
   <ItemGroup>
     <None Include="..\.editorconfig" Link=".editorconfig" />
-    <None Include="..\build\Daybreak.GWCA\$(Configuration)\Daybreak.GWCA.dll" Link="GWCA\Daybreak.GWCA.dll">
+    <None Include="..\Daybreak.GWCA\bin\$(Configuration)\Daybreak.GWCA.dll" Link="GWCA\Daybreak.GWCA.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>

Daybreak/Services/ApplicationLauncher/ApplicationLauncher.cs

@@ -177,7 +177,7 @@ public void RestartDaybreakAsNormalUser()
             "-password",
             $"\"{password}\"",
             "-character",
-            "\"\""
+            "\"Daybreak\""
         };
 
         var mods = this.modsManager.GetMods().Where(m => m.IsEnabled && m.IsInstalled).ToList();