Release 2411.0.0

PlayFab · Nov 28, 2024 · 8b0b0c6 · 8b0b0c6
1 parent 3558184
commit 8b0b0c6
Show file tree

Hide file tree

Showing 156 changed files with 3,595 additions and 3,275 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -2,6 +2,6 @@
 [submodule "External/libHttpClient"]
 	path = External/libHttpClient
 	url = https://github.com/microsoft/libHttpClient.git
-[submodule "External/rapidjson"]
-	path = External/rapidjson
-	url = https://github.com/Tencent/rapidjson.git
+[submodule "External/nlohmann"]
+	path = External/nlohmann
+	url = https://github.com/nlohmann/json.git
diff --git a/Build/PlayFab.C.paths.props b/Build/PlayFab.C.paths.props
@@ -27,9 +27,9 @@
   </PropertyGroup>
   <Import Condition="'$(HCPathsImported)' != 'true'" Project="$(HCRoot)\Build\libHttpClient.paths.props" />
 
-  <!--RapidJSON paths-->
-  <PropertyGroup Label="RapidJson">
-    <RapidJsonRoot>$(PlayFabExternalDir)\rapidjson</RapidJsonRoot>
-    <RapidJsonIncludeDir>$(RapidJsonRoot)\include</RapidJsonIncludeDir>
+  <!--NLohmann paths-->
+  <PropertyGroup Label="NLohmann">
+    <NLohmannRoot>$(PlayFabExternalDir)\nlohmann</NLohmannRoot>
+    <NLohmannIncludeDir>$(NLohmannRoot)\include</NLohmannIncludeDir>
   </PropertyGroup>
 </Project>
diff --git a/Build/PlayFabCore.Android/CMakeLists.txt b/Build/PlayFabCore.Android/CMakeLists.txt
@@ -58,7 +58,7 @@ set(COMMON_INCLUDE_DIRS
     "${PATH_TO_SOURCE}/PlayFabCore/Include/Generated"
     "${PATH_TO_SOURCE}/PlayFabSharedInternal/Include"
     "${PATH_TO_SOURCE}/PlayFabSharedInternal/Include/Generated"
-    "${PATH_TO_ROOT}/External/rapidjson/include"
+    "${PATH_TO_ROOT}/External/nlohmann/include"
     "${PATH_TO_LHC}/Include"
 )
 
@@ -111,7 +111,7 @@ get_linux_flags(FLAGS FLAGS_DEBUG FLAGS_RELEASE)
 
 include("../PlayFabSharedInternal.CMake/TargetSetFlags.cmake")
 target_set_flags(
-    "PlayFabCore.Android" 
+    "PlayFabCore.Android"
     "${FLAGS}"
     "${FLAGS_DEBUG}"
     "${FLAGS_RELEASE}"

diff --git a/Build/PlayFabCore.Apple/PlayFabCore.Apple.xcodeproj/project.pbxproj b/Build/PlayFabCore.Apple/PlayFabCore.Apple.xcodeproj/project.pbxproj
@@ -1167,7 +1167,7 @@
 				GENERATE_INFOPLIST_FILE = YES;
 				HEADER_SEARCH_PATHS = (
 					"$(SRCROOT)/../../../libHttpClient/Include",
-					"$(SRCROOT)/../../External/rapidjson/include",
+					"$(SRCROOT)/../../External/nlohmann/include",
 					"$(SRCROOT)/../../Source/PlayFabSharedInternal/Include",
 					"$(SRCROOT)/../../Source/PlayFabSharedInternal/Include/Generated",
 					"$(SRCROOT)/../../Source/PlayFabSharedInternal/Source",
@@ -1216,7 +1216,7 @@
 				GENERATE_INFOPLIST_FILE = YES;
 				HEADER_SEARCH_PATHS = (
 					"$(SRCROOT)/../../../libHttpClient/Include",
-					"$(SRCROOT)/../../External/rapidjson/include",
+					"$(SRCROOT)/../../External/nlohmann/include",
 					"$(SRCROOT)/../../Source/PlayFabSharedInternal/Include",
 					"$(SRCROOT)/../../Source/PlayFabSharedInternal/Include/Generated",
 					"$(SRCROOT)/../../Source/PlayFabSharedInternal/Source",
@@ -1406,7 +1406,7 @@
 				GENERATE_INFOPLIST_FILE = YES;
 				HEADER_SEARCH_PATHS = (
 					"$(SRCROOT)/../../../libHttpClient/Include",
-					"$(SRCROOT)/../../External/rapidjson/include",
+					"$(SRCROOT)/../../External/nlohmann/include",
 					"$(SRCROOT)/../../Source/PlayFabSharedInternal/Include",
 					"$(SRCROOT)/../../Source/PlayFabSharedInternal/Include/Generated",
 					"$(SRCROOT)/../../Source/PlayFabSharedInternal/Source",
@@ -1456,7 +1456,7 @@
 				GENERATE_INFOPLIST_FILE = YES;
 				HEADER_SEARCH_PATHS = (
 					"$(SRCROOT)/../../../libHttpClient/Include",
-					"$(SRCROOT)/../../External/rapidjson/include",
+					"$(SRCROOT)/../../External/nlohmann/include",
 					"$(SRCROOT)/../../Source/PlayFabSharedInternal/Include",
 					"$(SRCROOT)/../../Source/PlayFabSharedInternal/Include/Generated",
 					"$(SRCROOT)/../../Source/PlayFabSharedInternal/Source",

diff --git a/Build/PlayFabCore.GDK/PlayFabCore.GDK.vcxproj b/Build/PlayFabCore.GDK/PlayFabCore.GDK.vcxproj
@@ -25,6 +25,14 @@
     <Link>
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(Console_SdkLibPath)</AdditionalLibraryDirectories>
       <AdditionalDependencies>%(AdditionalDependencies);Appnotify.lib</AdditionalDependencies>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Gaming.Desktop.x64'">/profile /opt:ref /opt:icf %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Gaming.Desktop.x64'">/profile /opt:ref /opt:icf %(AdditionalOptions)</AdditionalOptions>
     </Link>
+    <ClCompile>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Gaming.Desktop.x64'">/Zi %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <ClCompile>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Gaming.Desktop.x64'">/Zi %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
   </ItemDefinitionGroup>
 </Project>
diff --git a/Build/PlayFabCore.Linux/CMakeLists.txt b/Build/PlayFabCore.Linux/CMakeLists.txt
@@ -58,8 +58,7 @@ set(COMMON_INCLUDE_DIRS
     "${PATH_TO_SOURCE}/PlayFabServices/Include/Generated"
     "${PATH_TO_SOURCE}/PlayFabSharedInternal/Include"
     "${PATH_TO_SOURCE}/PlayFabSharedInternal/Include/Generated"
-    "${PATH_TO_ROOT}/External/rapidjson/include/rapidjson"
-    "${PATH_TO_ROOT}/External/rapidjson/include"
+    "${PATH_TO_ROOT}/External/nlohmann/include"
     "${PATH_TO_LHC}/Include"
     )
 
@@ -73,11 +72,13 @@ set(PLAYFAB_SHARED_INTERNAL_BINARY_PATH
 )
 message(STATUS "PLAYFAB_SHARED_INTERNAL_BINARY_PATH: ${PLAYFAB_SHARED_INTERNAL_BINARY_PATH}")
 
+# Removing -D_DEBUG flag due to a crash that's happening on Debug,
+# The crash seems to be related with RTTI symbols not being loaded despite we're including the -frtti flag
 message(STATUS "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
 if (CMAKE_BUILD_TYPE STREQUAL "Debug")
-    add_definitions("-DDBG -D_DBG -DDEBUG -D_DEBUG")
+    add_definitions("-DDBG -D_DBG -DDEBUG")
 endif()
-    
+
 #########################
 ### Set up shared lib ###
 #########################
@@ -94,7 +95,7 @@ add_library(
     "${PATH_TO_SOURCE}/PlayFabCore/Source/Platform/Generic/LocalStorage_Generic.h"
     )
 
-target_link_libraries("${PROJECT_NAME}" 
+target_link_libraries("${PROJECT_NAME}"
     PRIVATE ${PLAYFAB_SHARED_INTERNAL_BINARY_PATH}
     PRIVATE ${LIBHTTPCLIENT_BINARY_PATH}
 )

diff --git a/Build/PlayFabCore.Linux/PlayFabCore_Linux.bash b/Build/PlayFabCore.Linux/PlayFabCore_Linux.bash
@@ -44,4 +44,4 @@ log "LHC_PATH = ${LHC_PATH}"
 
 # make PlayFabCore
 sudo cmake -S "$SCRIPT_DIR" -B "$SCRIPT_DIR"/../../Int/CMake/PlayFabCore.Linux -D CMAKE_BUILD_TYPE=$CONFIGURATION -D LHC_PATH=$LHC_PATH
-sudo make -C "$SCRIPT_DIR"/../../Int/CMake/PlayFabCore.Linux
+sudo make VERBOSE=1 -C "$SCRIPT_DIR"/../../Int/CMake/PlayFabCore.Linux
diff --git a/Build/PlayFabCore.Win32/PlayFabCore.Win32.vcxproj b/Build/PlayFabCore.Win32/PlayFabCore.Win32.vcxproj
@@ -6,6 +6,70 @@
     <PlatformToolset>v143</PlatformToolset>
     <WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
+    <Link>
+      <AdditionalOptions>/profile /opt:ref /opt:icf %(AdditionalOptions)</AdditionalOptions>
+    </Link>
+    <ClCompile>
+      <AdditionalOptions>/Zi %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+    <Link>
+      <AdditionalOptions>/profile /opt:ref /opt:icf %(AdditionalOptions)</AdditionalOptions>
+    </Link>
+    <ClCompile>
+      <AdditionalOptions>/Zi %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <Link>
+      <AdditionalOptions>/profile /opt:ref /opt:icf %(AdditionalOptions)</AdditionalOptions>
+    </Link>
+    <ClCompile>
+      <AdditionalOptions>/Zi %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <Link>
+      <AdditionalOptions>/profile /opt:ref /opt:icf %(AdditionalOptions)</AdditionalOptions>
+    </Link>
+    <ClCompile>
+      <AdditionalOptions>/Zi %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Link>
+      <AdditionalOptions>/profile /opt:ref /opt:icf %(AdditionalOptions)</AdditionalOptions>
+    </Link>
+    <ClCompile>
+      <AdditionalOptions>/Zi %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Link>
+      <AdditionalOptions>/profile /opt:ref /opt:icf %(AdditionalOptions)</AdditionalOptions>
+    </Link>
+    <ClCompile>
+      <AdditionalOptions>/Zi %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Link>
+      <AdditionalOptions>/profile /opt:ref /opt:icf %(AdditionalOptions)</AdditionalOptions>
+    </Link>
+    <ClCompile>
+      <AdditionalOptions>/Zi %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Link>
+      <AdditionalOptions>/profile /opt:ref /opt:icf %(AdditionalOptions)</AdditionalOptions>
+    </Link>
+    <ClCompile>
+      <AdditionalOptions>/Zi %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\Source\PlayFabCore\Source\Platform\Generic\LocalStorage_Generic.cpp" />
     <ClCompile Include="..\..\Source\PlayFabCore\Source\Platform\Generic\Platform_Generic.cpp" />

diff --git a/Build/PlayFabServices.Android/CMakeLists.txt b/Build/PlayFabServices.Android/CMakeLists.txt
@@ -60,15 +60,15 @@ set(COMMON_INCLUDE_DIRS
     "${PATH_TO_SOURCE}/PlayFabServices/Include/Generated"
     "${PATH_TO_SOURCE}/PlayFabSharedInternal/Include"
     "${PATH_TO_SOURCE}/PlayFabSharedInternal/Include/Generated"
-    "${PATH_TO_ROOT}/External/rapidjson/include"
+    "${PATH_TO_ROOT}/External/nlohmann/include"
     "${PATH_TO_LHC}/Include"
 )
 
 #########################
 ### Set up shared lib ###
 #########################
 
-# We'll usually want to build for full, but adding a case here if we want to build just for x84_64 or arm8 
+# We'll usually want to build for full, but adding a case here if we want to build just for x84_64 or arm8
 # TODO: Full flavor should just trigger the other two flavors. Weird that it creates a full directory. Something to look into.
 # IF (EXISTS "${PATH_TO_ROOT}/Out/Android/PlayFabCore.Android/intermediates/cmake/full${CMAKE_BUILD_TYPE}")
 #     add_subdirectory("../PlayFabCore.Android" ${PATH_TO_ROOT}/Out/Android/PlayFabCore.Android/intermediates/cmake/full${CMAKE_BUILD_TYPE}/obj/${ANDROID_ABI})

diff --git a/Build/PlayFabServices.Apple/PlayFabServices.Apple.xcodeproj/project.pbxproj b/Build/PlayFabServices.Apple/PlayFabServices.Apple.xcodeproj/project.pbxproj
@@ -1704,7 +1704,7 @@
 				GENERATE_INFOPLIST_FILE = YES;
 				HEADER_SEARCH_PATHS = (
 					"$(SRCROOT)/../../../libHttpClient/Include",
-					"$(SRCROOT)/../../External/rapidjson/include",
+					"$(SRCROOT)/../../External/nlohmann/include",
 					"$(SRCROOT)/../../Source/PlayFabSharedInternal/Include",
 					"$(SRCROOT)/../../Source/PlayFabSharedInternal/Include/Generated",
 					"$(SRCROOT)/../../Source/PlayFabCore/Include",
@@ -1750,7 +1750,7 @@
 				GENERATE_INFOPLIST_FILE = YES;
 				HEADER_SEARCH_PATHS = (
 					"$(SRCROOT)/../../../libHttpClient/Include",
-					"$(SRCROOT)/../../External/rapidjson/include",
+					"$(SRCROOT)/../../External/nlohmann/include",
 					"$(SRCROOT)/../../Source/PlayFabSharedInternal/Include",
 					"$(SRCROOT)/../../Source/PlayFabSharedInternal/Include/Generated",
 					"$(SRCROOT)/../../Source/PlayFabCore/Include",
@@ -1797,7 +1797,7 @@
 				GENERATE_INFOPLIST_FILE = YES;
 				HEADER_SEARCH_PATHS = (
 					"$(SRCROOT)/../../../libHttpClient/Include",
-					"$(SRCROOT)/../../External/rapidjson/include",
+					"$(SRCROOT)/../../External/nlohmann/include",
 					"$(SRCROOT)/../../Source/PlayFabSharedInternal/Include",
 					"$(SRCROOT)/../../Source/PlayFabSharedInternal/Include/Generated",
 					"$(SRCROOT)/../../Source/PlayFabCore/Include",
@@ -1846,7 +1846,7 @@
 				GENERATE_INFOPLIST_FILE = YES;
 				HEADER_SEARCH_PATHS = (
 					"$(SRCROOT)/../../../libHttpClient/Include",
-					"$(SRCROOT)/../../External/rapidjson/include",
+					"$(SRCROOT)/../../External/nlohmann/include",
 					"$(SRCROOT)/../../Source/PlayFabSharedInternal/Include",
 					"$(SRCROOT)/../../Source/PlayFabSharedInternal/Include/Generated",
 					"$(SRCROOT)/../../Source/PlayFabCore/Include",

diff --git a/Build/PlayFabServices.GDK/PlayFabServices.GDK.vcxproj b/Build/PlayFabServices.GDK/PlayFabServices.GDK.vcxproj
@@ -7,6 +7,22 @@
     <GDKExtLibNames>;</GDKExtLibNames>
     <WindowsTargetPlatformVersion>10.0.26100.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Gaming.Desktop.x64'">
+    <Link>
+      <AdditionalOptions>/profile /opt:ref /opt:icf %(AdditionalOptions)</AdditionalOptions>
+    </Link>
+    <ClCompile>
+      <AdditionalOptions>/Zi %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Gaming.Desktop.x64'">
+    <Link>
+      <AdditionalOptions>/profile /opt:ref /opt:icf %(AdditionalOptions)</AdditionalOptions>
+    </Link>
+    <ClCompile>
+      <AdditionalOptions>/Zi %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\Source\PlayFabServices\Source\GDK\AccountManagementXTokenAPIs.cpp" />
     <ClCompile Include="..\..\Source\PlayFabServices\Source\GDK\FriendsXTokenAPIs.cpp" />

diff --git a/Build/PlayFabServices.Linux/CMakeLists.txt b/Build/PlayFabServices.Linux/CMakeLists.txt
@@ -61,8 +61,7 @@ set(COMMON_INCLUDE_DIRS
     "${PATH_TO_SOURCE}/PlayFabServices/Include/Generated"
     "${PATH_TO_SOURCE}/PlayFabSharedInternal/Include"
     "${PATH_TO_SOURCE}/PlayFabSharedInternal/Include/Generated"
-    "${PATH_TO_ROOT}/External/rapidjson/include/rapidjson"
-    "${PATH_TO_ROOT}/External/rapidjson/include"
+    "${PATH_TO_ROOT}/External/nlohmann/include"
     "${PATH_TO_LHC}/Include"
     )
 
@@ -83,20 +82,22 @@ message(STATUS "PLAYFAB_CORE_BINARY_PATH: ${PLAYFAB_CORE_BINARY_PATH}")
 
 message(STATUS "PROJECT_NAME: ${PROJECT_NAME}")
 
+# Removing -D_DEBUG flag due to a crash that's happening on Debug,
+# The crash seems to be related with RTTI symbols not being loaded despite we're including the -frtti flag
 message(STATUS "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
 if (CMAKE_BUILD_TYPE STREQUAL "Debug")
-    add_definitions("-DDBG -D_DBG -DDEBUG -D_DEBUG")
+    add_definitions("-DDBG -D_DBG -DDEBUG")
 endif()
 
 # make ${PROJECT_NAME}.so
 add_library(
     "${PROJECT_NAME}"
     SHARED
     "${SERVICE_WRAPPER_SOURCE_FILES}"
-    "${COMMON_SOURCE_FILES}" 
+    "${COMMON_SOURCE_FILES}"
     )
 
-target_link_libraries("${PROJECT_NAME}" 
+target_link_libraries("${PROJECT_NAME}"
     PRIVATE ${PLAYFAB_CORE_BINARY_PATH}
     PRIVATE ${PLAYFAB_SHARED_INTERNAL_BINARY_PATH}
     PRIVATE ${LIBHTTPCLIENT_BINARY_PATH}

diff --git a/Build/PlayFabServices.Linux/PlayFabServices_Linux.bash b/Build/PlayFabServices.Linux/PlayFabServices_Linux.bash
@@ -88,7 +88,7 @@ if [ "$BUILD_PF_CORE" = true ]; then
     bash "$SCRIPT_DIR"/../PlayFabCore.Linux/PlayFabCore_Linux.bash -c "$CONFIGURATION" -lhc "$LHC_PATH"
 fi
 
-log "#### Building PlayFabServices ####" 
+log "#### Building PlayFabServices ####"
 log "CONFIGURATION = ${CONFIGURATION}"
 log "LHC_PATH = ${LHC_PATH}"
 log "BUILD_LHC = ${BUILD_LHC}"
@@ -97,4 +97,4 @@ log "BUILD_PF_CORE = ${BUILD_PF_CORE}"
 
 # make PlayFabServices
 sudo cmake -S "$SCRIPT_DIR" -B "$SCRIPT_DIR"/../../Int/CMake/PlayFabServices.Linux -D CMAKE_BUILD_TYPE=$CONFIGURATION -D LHC_PATH=$LHC_PATH
-sudo make -C "$SCRIPT_DIR"/../../Int/CMake/PlayFabServices.Linux
+sudo make VERBOSE=1 -C "$SCRIPT_DIR"/../../Int/CMake/PlayFabServices.Linux