2104 GDK QFE2 (#569)

* Update to 2104 GDK QFE2

External/Xal/External/libHttpClient

@@ -1 +1 @@
-Subproject commit 7ebf7150ca64013b09bcb16f7bd0b855fe3a6fd0
+Subproject commit 0f43237a35cd2335b5503ffaaf240a368c938f3d

External/Xal/Source/Xal/Include/Xal/xal_version.h

@@ -20,6 +20,6 @@ extern "C"
 /// YYYYMMDD Date string describing the date the build was created
 /// rrr QFE number (000 indicates base release)
 /// </summary>
-#define XAL_VERSION "2021.04.20210319.000"
+#define XAL_VERSION "2021.04.20210518.001"
 
 }

Include/xsapi-c/notification_c.h

@@ -34,6 +34,7 @@ STDAPI XblNotificationSubscribeToNotificationsAsync(
 ) XBL_NOEXCEPT;
 #endif
 
+#if HC_PLATFORM == HC_PLATFORM_IOS || HC_PLATFORM == HC_PLATFORM_ANDROID || HC_PLATFORM == HC_PLATFORM_UWP
 /// <summary>
 /// Unsubscribes the title from push notifications.
 /// </summary>
@@ -44,4 +45,6 @@ STDAPI XblNotificationUnsubscribeFromNotificationsAsync(
     _In_ XblContextHandle xboxLiveContext,
     _In_ XAsyncBlock* asyncBlock
 ) XBL_NOEXCEPT;
+#endif
+
 }

Include/xsapi-cpp/impl/notification.hpp

@@ -191,7 +191,7 @@ pplx::task<xbox_live_result<void>> notification_service::unsubscribe_from_notifi
 
     return asyncWrapper->Task(hr);
 }
-#elif HC_PLATFORM == HC_PLATFORM_WIN32 && !XSAPI_UNIT_TESTS
+#elif (HC_PLATFORM == HC_PLATFORM_WIN32 || HC_PLATFORM_IS_EXTERNAL) && !XSAPI_UNIT_TESTS
 pplx::task<xbox_live_result<void>> notification_service::unsubscribe_from_notifications()
 {
     auto xblContext = m_xblContext;

Include/xsapi-cpp/notification_service.h

@@ -12,7 +12,7 @@
 NAMESPACE_MICROSOFT_XBOX_SERVICES_NOTIFICATION_CPP_BEGIN
 class xbox_live_context;
 
-#if HC_PLATFORM == HC_PLATFORM_WIN32
+#if HC_PLATFORM == HC_PLATFORM_WIN32 || HC_PLATFORM_IS_EXTERNAL
 class invite_notification_event_args
 {
 public:
@@ -79,7 +79,7 @@ public:
     inline ~notification_service();
 
     inline pplx::task<xbox_live_result<void>> subscribe_to_notifications(
-#if HC_PLATFORM == HC_PLATFORM_WIN32 && !XSAPI_UNIT_TESTS
+#if (HC_PLATFORM == HC_PLATFORM_WIN32 || HC_PLATFORM_IS_EXTERNAL) && !XSAPI_UNIT_TESTS
         _In_ const std::function<void(achievement_unlocked_notification_event_args&)>& achievementUnlockHandler,
         _In_ const std::function<void(invite_notification_event_args&)>& multiplayerInviteHandler
 #elif (HC_PLATFORM == HC_PLATFORM_IOS || HC_PLATFORM == HC_PLATFORM_ANDROID)
@@ -89,7 +89,7 @@ public:
 
     inline pplx::task<xbox_live_result<void>> unsubscribe_from_notifications();
 
-#if HC_PLATFORM == HC_PLATFORM_WIN32 && !XSAPI_UNIT_TESTS
+#if (HC_PLATFORM == HC_PLATFORM_WIN32 || HC_PLATFORM_IS_EXTERNAL) && !XSAPI_UNIT_TESTS
     inline std::function<void(invite_notification_event_args&)>& game_invite_handler();
 
     inline std::function<void(achievement_unlocked_notification_event_args&)>& achievement_unlock_handler();
@@ -98,7 +98,7 @@ public:
 private:
     XblContextHandle m_xblContext;
 
-#if HC_PLATFORM == HC_PLATFORM_WIN32 && !XSAPI_UNIT_TESTS
+#if (HC_PLATFORM == HC_PLATFORM_WIN32 || HC_PLATFORM_IS_EXTERNAL) && !XSAPI_UNIT_TESTS
     XblFunctionContext m_gameinviteFunctionContext;
     XblFunctionContext m_achievementUnlockFunctionContext;
 

Source/Services/Multiplayer/Manager/multiplayer_local_user_manager.cpp

@@ -184,7 +184,7 @@ MultiplayerLocalUserManager::AddUserToXboxLiveContextToMap(
             return innerWrapUserResult.Hresult();
         }
 
-        auto localUser = std::make_shared<MultiplayerLocalUser>(
+        auto localUser = MakeShared<MultiplayerLocalUser>(
             innerWrapUserResult.ExtractPayload(),
             xboxUserId,
             isPrimary

Source/Services/Notification/RTA/notification_subscription.cpp

@@ -297,8 +297,8 @@ Result<MultiplayerActivityInviteData> MultiplayerActivityInviteData::Deserialize
 
 AchievementUnlockEvent::AchievementUnlockEvent(AchievementUnlockEvent&& event) noexcept :
     m_achievementId(std::move(event.m_achievementId)),
-    m_achievementName(std::move(event.m_achievementName)),
     m_achievementDescription(std::move(event.m_achievementDescription)),
+    m_achievementName(std::move(event.m_achievementName)),
     m_achievementIconUri(std::move(event.m_achievementIconUri)),
     m_deepLink(event.m_deepLink)
 {
@@ -317,8 +317,8 @@ AchievementUnlockEvent::AchievementUnlockEvent(AchievementUnlockEvent&& event) n
 
 AchievementUnlockEvent::AchievementUnlockEvent(const AchievementUnlockEvent& event) :
     m_achievementId(event.m_achievementId),
-    m_achievementName(event.m_achievementName),
     m_achievementDescription(event.m_achievementDescription),
+    m_achievementName(event.m_achievementName),
     m_achievementIconUri(event.m_achievementIconUri),
     m_deepLink(event.m_deepLink)
 {

Source/Services/Social/Manager/social_graph.cpp

@@ -89,7 +89,7 @@ SocialGraph::SocialGraph(
     _In_ const TaskQueue& queue,
     _In_ std::shared_ptr<real_time_activity::RealTimeActivityManager> rtaManager
 ) noexcept : 
-    m_user{ std::make_shared<User>(std::move(localUser))},
+    m_user{ MakeShared<User>(std::move(localUser))},
     m_queue{ queue.DeriveWorkerQueue() },
     m_rtaManager{ std::move(rtaManager) }
 {

Source/Shared/build_version.h

@@ -9,4 +9,4 @@
 //*********************************************************
 #pragma once
  
-#define XBOX_SERVICES_API_VERSION_STRING "2021.04.20210317.0" 
+#define XBOX_SERVICES_API_VERSION_STRING "2021.04.20210526.2"