microsoft
/
xbox-live-api
зеркало из https://github.com/microsoft/xbox-live-api.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Cleaning up macros (#282) 

* Cleaning up macros

* Fixing PR
This commit is contained in:
Jason Sandlin 2017-11-13 15:20:29 -08:00 коммит произвёл GitHub
Родитель f820c452f1
Коммит 83f75bfe89
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
40 изменённых файлов: 1311 добавлений и 1259 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

3
Build/Microsoft.Xbox.Services.110.XDK.WinRT/Microsoft.Xbox.Services.110.XDK.WinRT.vcxproj
Просмотреть файл

@ -124,7 +124,6 @@
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Clubs\clubs_service.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Clubs\clubs_service_impl.cpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Clubs\clubs_service_impl.h" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\Desktop\XboxLiveContext_Desktop.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\WinRT\XboxLiveContext_WinRT.cpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\WinRT\XboxLiveContext_WinRT.h" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\WinRT\pch.cpp" >
@ -133,6 +132,7 @@
</ClCompile>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\WinRT\pch.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\pch_common.h" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\xbox_live_context.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\xbox_live_context_impl.cpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\xbox_live_context_impl.h" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\EntertainmentProfile\WinRT\EntertainmentProfileListContainsItemResult_WinRT.cpp" />
@ -778,6 +778,7 @@
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\service_call_logging_config.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\user_context.cpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\user_context.h" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\user_context_xdk.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\utils.cpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\utils.h" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\utils_locales.cpp" />

115
Build/Microsoft.Xbox.Services.110.XDK.WinRT/Microsoft.Xbox.Services.110.XDK.WinRT.vcxproj.filters
Просмотреть файл

@ -133,15 +133,15 @@
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Clubs\clubs_service_impl.cpp">
<Filter>C++ Source\Services\Clubs</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\Desktop\XboxLiveContext_Desktop.cpp">
<Filter>C++ Source\Services\Common</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\WinRT\XboxLiveContext_WinRT.cpp">
<Filter>C++ Source\Services\Common\WinRT</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\WinRT\pch.cpp">
<Filter>C++ Source\Services\Common</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\xbox_live_context.cpp">
<Filter>C++ Source\Services\Common</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\xbox_live_context_impl.cpp">
<Filter>C++ Source\Services\Common</Filter>
</ClCompile>
@ -1273,6 +1273,9 @@
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\user_context.cpp">
<Filter>C++ Source\Shared</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\user_context_xdk.cpp">
<Filter>C++ Source\Shared</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\utils.cpp">
<Filter>C++ Source\Shared</Filter>
</ClCompile>
@ -2342,47 +2345,14 @@
</ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include="C++ Source\Services\Clubs\WinRT">
<UniqueIdentifier>{FFC1B215-A9A0-311B-B66E-73342A2B0521}</UniqueIdentifier>
<Filter Include="C++ Source\System">
<UniqueIdentifier>{D75844CD-55A8-3AB4-ABC1-4028BC89E81D}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\EntertainmentProfile\WinRT">
<UniqueIdentifier>{EEABD1E4-8870-321A-81AD-87423BDF6868}</UniqueIdentifier>
<Filter Include="C++ Source\Shared">
<UniqueIdentifier>{B682A27C-50BA-30B6-9573-26F7B62C7BD5}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Marketplace\WinRT">
<UniqueIdentifier>{4C47A1D9-B79E-335A-BF53-B293843954B9}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Misc\WinRT">
<UniqueIdentifier>{7AFE8ACD-0281-3A4B-9DBA-5858473AE2AE}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Common\WinRT">
<UniqueIdentifier>{038CAE7E-05AF-331C-B658-977DD2E76B65}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Achievements\WinRT">
<UniqueIdentifier>{5300601B-5D19-3DA5-8BF9-3D394A0CCE4F}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Privacy\WinRT">
<UniqueIdentifier>{1F48107E-7574-33AC-AD47-758133406AA2}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Leaderboard\WinRT">
<UniqueIdentifier>{6BBAEB81-C095-3A68-BA9A-9F254399F9D3}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Stats\Manager">
<UniqueIdentifier>{57A0A6E0-3E99-371E-952D-38DECAC4B717}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Stats\WinRT">
<UniqueIdentifier>{B5694E76-E2FA-3451-8387-701C5F3AD66D}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Shared\Logger">
<UniqueIdentifier>{D30FEB85-D0C6-32DE-B1BB-75623BAC93C3}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Shared\WinRT">
<UniqueIdentifier>{5C1BFE08-AE36-31F1-9696-DB526AD4D90E}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Social\Manager">
<UniqueIdentifier>{432888EB-664F-3B60-A937-CEC66EB64B1A}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Social\WinRT">
<UniqueIdentifier>{4FB2B169-B069-38ED-9ECE-FA4333EC6D3D}</UniqueIdentifier>
<Filter Include="C++ Source\Services">
<UniqueIdentifier>{66EEBBE9-943D-3582-8058-538D12E44C73}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Multiplayer\Manager">
<UniqueIdentifier>{93130BC3-2203-3733-B903-28CDDEEEF42A}</UniqueIdentifier>
@ -2390,27 +2360,69 @@
<Filter Include="C++ Source\Services\Multiplayer\WinRT">
<UniqueIdentifier>{CFE0BB67-2571-3F89-8826-2744B01FEE7D}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\TitleStorage\WinRT">
<UniqueIdentifier>{757C10D1-92D5-38B4-995A-EA73F4CF9C14}</UniqueIdentifier>
<Filter Include="C++ Source\Services\Social\Manager">
<UniqueIdentifier>{432888EB-664F-3B60-A937-CEC66EB64B1A}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Social\WinRT">
<UniqueIdentifier>{4FB2B169-B069-38ED-9ECE-FA4333EC6D3D}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Shared\Logger">
<UniqueIdentifier>{D30FEB85-D0C6-32DE-B1BB-75623BAC93C3}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Shared\WinRT">
<UniqueIdentifier>{5C1BFE08-AE36-31F1-9696-DB526AD4D90E}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Stats\Manager">
<UniqueIdentifier>{57A0A6E0-3E99-371E-952D-38DECAC4B717}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Stats\WinRT">
<UniqueIdentifier>{B5694E76-E2FA-3451-8387-701C5F3AD66D}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Marketplace\WinRT">
<UniqueIdentifier>{4C47A1D9-B79E-335A-BF53-B293843954B9}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\EntertainmentProfile\WinRT">
<UniqueIdentifier>{EEABD1E4-8870-321A-81AD-87423BDF6868}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Clubs\WinRT">
<UniqueIdentifier>{FFC1B215-A9A0-311B-B66E-73342A2B0521}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Common\WinRT">
<UniqueIdentifier>{038CAE7E-05AF-331C-B658-977DD2E76B65}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Achievements\WinRT">
<UniqueIdentifier>{5300601B-5D19-3DA5-8BF9-3D394A0CCE4F}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Misc\WinRT">
<UniqueIdentifier>{7AFE8ACD-0281-3A4B-9DBA-5858473AE2AE}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Privacy\WinRT">
<UniqueIdentifier>{1F48107E-7574-33AC-AD47-758133406AA2}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Leaderboard\WinRT">
<UniqueIdentifier>{6BBAEB81-C095-3A68-BA9A-9F254399F9D3}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\RTA\WinRT">
<UniqueIdentifier>{253DBB04-D90F-3EA6-AC9B-4D54664C1EC8}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\TitleStorage\WinRT">
<UniqueIdentifier>{757C10D1-92D5-38B4-995A-EA73F4CF9C14}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Social\Manager\WinRT">
<UniqueIdentifier>{4DA1880C-C4F4-3B20-BA51-0277E9CB333F}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Multiplayer\Manager\WinRT">
<UniqueIdentifier>{D345D0F4-C8AE-3FC9-8407-F16991A1B220}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Matchmaking\WinRT">
<UniqueIdentifier>{458043D0-B977-358F-AE22-DA2D1E406689}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Tournaments\WinRT">
<UniqueIdentifier>{65B87542-CA15-3C8C-85ED-FF0C33879C25}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Stats\Manager\WinRT">
<UniqueIdentifier>{765859F5-D852-3E9E-964C-318C91E48306}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Matchmaking\WinRT">
<UniqueIdentifier>{458043D0-B977-358F-AE22-DA2D1E406689}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\GameServerPlatform\WinRT">
<UniqueIdentifier>{855825D5-C60A-390C-A925-A947E172C2CD}</UniqueIdentifier>
</Filter>
@ -2423,15 +2435,6 @@
<Filter Include="C++ Source">
<UniqueIdentifier>{C156B2C1-D13C-31D8-8955-CFD94B05A781}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\System">
<UniqueIdentifier>{D75844CD-55A8-3AB4-ABC1-4028BC89E81D}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Shared">
<UniqueIdentifier>{B682A27C-50BA-30B6-9573-26F7B62C7BD5}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services">
<UniqueIdentifier>{66EEBBE9-943D-3582-8058-538D12E44C73}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Misc">
<UniqueIdentifier>{206338C2-9047-3AAE-B89B-A141CD0A774F}</UniqueIdentifier>
</Filter>

5
Build/Microsoft.Xbox.Services.140.UWP.Cpp/Microsoft.Xbox.Services.140.UWP.Cpp.vcxproj
Просмотреть файл

@ -149,16 +149,16 @@
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Clubs\clubs_service.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Clubs\clubs_service_impl.cpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Clubs\clubs_service_impl.h" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\Desktop\XboxLiveContext_Desktop.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\Desktop\pch.cpp" >
<PrecompiledHeader>Create</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
</ClCompile>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\Desktop\pch.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\pch_common.h" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\xbox_live_context.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\xbox_live_context_impl.cpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\xbox_live_context_impl.h" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Events\events_service.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Events\events_service_uwp.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\GameServerPlatform\allocation_result.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\GameServerPlatform\cluster_result.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\GameServerPlatform\game_server_image_set.cpp" />
@ -395,6 +395,7 @@
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\telemetry.h" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\user_context.cpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\user_context.h" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\user_context_cpp.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\utils.cpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\utils.h" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\utils_locales.cpp" />

27
Build/Microsoft.Xbox.Services.140.UWP.Cpp/Microsoft.Xbox.Services.140.UWP.Cpp.vcxproj.filters
Просмотреть файл

@ -70,16 +70,16 @@
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Clubs\clubs_service_impl.cpp">
<Filter>C++ Source\Services\Clubs</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\Desktop\XboxLiveContext_Desktop.cpp">
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\Desktop\pch.cpp">
<Filter>C++ Source\Services\Common</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\Desktop\pch.cpp">
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\xbox_live_context.cpp">
<Filter>C++ Source\Services\Common</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\xbox_live_context_impl.cpp">
<Filter>C++ Source\Services\Common</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Events\events_service.cpp">
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Events\events_service_uwp.cpp">
<Filter>C++ Source\Services\Events</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\GameServerPlatform\allocation_result.cpp">
@ -694,6 +694,9 @@
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\user_context.cpp">
<Filter>C++ Source\Shared</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\user_context_cpp.cpp">
<Filter>C++ Source\Shared</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\utils.cpp">
<Filter>C++ Source\Shared</Filter>
</ClCompile>
@ -977,6 +980,12 @@
</ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include="C++ Public Includes">
<UniqueIdentifier>{848B0C02-35A1-3A9D-81CC-513FF3F205BB}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source">
<UniqueIdentifier>{C156B2C1-D13C-31D8-8955-CFD94B05A781}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Misc">
<UniqueIdentifier>{206338C2-9047-3AAE-B89B-A141CD0A774F}</UniqueIdentifier>
</Filter>
@ -1028,15 +1037,15 @@
<Filter Include="C++ Source\Services\Social\Manager">
<UniqueIdentifier>{432888EB-664F-3B60-A937-CEC66EB64B1A}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Shared\Logger">
<UniqueIdentifier>{D30FEB85-D0C6-32DE-B1BB-75623BAC93C3}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Stats\Manager">
<UniqueIdentifier>{57A0A6E0-3E99-371E-952D-38DECAC4B717}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Multiplayer\Manager">
<UniqueIdentifier>{93130BC3-2203-3733-B903-28CDDEEEF42A}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Shared\Logger">
<UniqueIdentifier>{D30FEB85-D0C6-32DE-B1BB-75623BAC93C3}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\System">
<UniqueIdentifier>{D75844CD-55A8-3AB4-ABC1-4028BC89E81D}</UniqueIdentifier>
</Filter>
@ -1046,11 +1055,5 @@
<Filter Include="C++ Source\Services">
<UniqueIdentifier>{66EEBBE9-943D-3582-8058-538D12E44C73}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Public Includes">
<UniqueIdentifier>{848B0C02-35A1-3A9D-81CC-513FF3F205BB}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source">
<UniqueIdentifier>{C156B2C1-D13C-31D8-8955-CFD94B05A781}</UniqueIdentifier>
</Filter>
</ItemGroup>
</Project>

6
Build/Microsoft.Xbox.Services.140.UWP.WinRT/Microsoft.Xbox.Services.140.UWP.WinRT.vcxproj
Просмотреть файл

@ -216,7 +216,6 @@
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Clubs\clubs_service.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Clubs\clubs_service_impl.cpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Clubs\clubs_service_impl.h" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\Desktop\XboxLiveContext_Desktop.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\WinRT\XboxLiveContext_WinRT.cpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\WinRT\XboxLiveContext_WinRT.h" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\WinRT\pch.cpp" >
@ -225,11 +224,12 @@
</ClCompile>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\WinRT\pch.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\pch_common.h" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\xbox_live_context.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\xbox_live_context_impl.cpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\xbox_live_context_impl.h" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Events\events_service.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Events\WinRT\EventsService_WinRT.cpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Events\WinRT\EventsService_WinRT.h" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Events\events_service_uwp.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\GameServerPlatform\WinRT\AllocationResult_WinRT.cpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Services\GameServerPlatform\WinRT\AllocationResult_WinRT.h" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\GameServerPlatform\WinRT\ClusterResult_WinRT.cpp" />
@ -835,6 +835,8 @@
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\telemetry.h" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\user_context.cpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\user_context.h" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\user_context_cpp.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\user_context_winrt.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\utils.cpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\utils.h" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\utils_locales.cpp" />

186
Build/Microsoft.Xbox.Services.140.UWP.WinRT/Microsoft.Xbox.Services.140.UWP.WinRT.vcxproj.filters
Просмотреть файл

@ -133,24 +133,24 @@
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Clubs\clubs_service_impl.cpp">
<Filter>C++ Source\Services\Clubs</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\Desktop\XboxLiveContext_Desktop.cpp">
<Filter>C++ Source\Services\Common</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\WinRT\XboxLiveContext_WinRT.cpp">
<Filter>C++ Source\Services\Common\WinRT</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\WinRT\pch.cpp">
<Filter>C++ Source\Services\Common</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\xbox_live_context.cpp">
<Filter>C++ Source\Services\Common</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\xbox_live_context_impl.cpp">
<Filter>C++ Source\Services\Common</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Events\events_service.cpp">
<Filter>C++ Source\Services\Events</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Events\WinRT\EventsService_WinRT.cpp">
<Filter>C++ Source\Services\Events\WinRT</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Events\events_service_uwp.cpp">
<Filter>C++ Source\Services\Events</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\GameServerPlatform\WinRT\AllocationResult_WinRT.cpp">
<Filter>C++ Source\Services\GameServerPlatform\WinRT</Filter>
</ClCompile>
@ -1210,6 +1210,12 @@
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\user_context.cpp">
<Filter>C++ Source\Shared</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\user_context_cpp.cpp">
<Filter>C++ Source\Shared</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\user_context_winrt.cpp">
<Filter>C++ Source\Shared</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\utils.cpp">
<Filter>C++ Source\Shared</Filter>
</ClCompile>
@ -2273,6 +2279,90 @@
</ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include="C++ Public Includes">
<UniqueIdentifier>{848B0C02-35A1-3A9D-81CC-513FF3F205BB}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source">
<UniqueIdentifier>{C156B2C1-D13C-31D8-8955-CFD94B05A781}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\System">
<UniqueIdentifier>{D75844CD-55A8-3AB4-ABC1-4028BC89E81D}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Shared">
<UniqueIdentifier>{B682A27C-50BA-30B6-9573-26F7B62C7BD5}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services">
<UniqueIdentifier>{66EEBBE9-943D-3582-8058-538D12E44C73}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\TitleStorage\WinRT">
<UniqueIdentifier>{757C10D1-92D5-38B4-995A-EA73F4CF9C14}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Stats\Manager\WinRT">
<UniqueIdentifier>{765859F5-D852-3E9E-964C-318C91E48306}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\RTA\WinRT">
<UniqueIdentifier>{253DBB04-D90F-3EA6-AC9B-4D54664C1EC8}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Presence\WinRT">
<UniqueIdentifier>{FD9E1975-DABA-36D3-9EBD-3C703AB30056}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\GameServerPlatform\WinRT">
<UniqueIdentifier>{855825D5-C60A-390C-A925-A947E172C2CD}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Social\Manager\WinRT">
<UniqueIdentifier>{4DA1880C-C4F4-3B20-BA51-0277E9CB333F}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Stats\Manager">
<UniqueIdentifier>{57A0A6E0-3E99-371E-952D-38DECAC4B717}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Stats\WinRT">
<UniqueIdentifier>{B5694E76-E2FA-3451-8387-701C5F3AD66D}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Shared\Logger">
<UniqueIdentifier>{D30FEB85-D0C6-32DE-B1BB-75623BAC93C3}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Shared\WinRT">
<UniqueIdentifier>{5C1BFE08-AE36-31F1-9696-DB526AD4D90E}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Social\Manager">
<UniqueIdentifier>{432888EB-664F-3B60-A937-CEC66EB64B1A}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Social\WinRT">
<UniqueIdentifier>{4FB2B169-B069-38ED-9ECE-FA4333EC6D3D}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Misc\WinRT">
<UniqueIdentifier>{7AFE8ACD-0281-3A4B-9DBA-5858473AE2AE}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Common\WinRT">
<UniqueIdentifier>{038CAE7E-05AF-331C-B658-977DD2E76B65}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\System\WinRT">
<UniqueIdentifier>{EE3999DA-6598-3BBC-A04F-84D57CCD29DC}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Achievements\WinRT">
<UniqueIdentifier>{5300601B-5D19-3DA5-8BF9-3D394A0CCE4F}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Privacy\WinRT">
<UniqueIdentifier>{1F48107E-7574-33AC-AD47-758133406AA2}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Leaderboard\WinRT">
<UniqueIdentifier>{6BBAEB81-C095-3A68-BA9A-9F254399F9D3}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Events\WinRT">
<UniqueIdentifier>{6E1C5BB3-AB9B-3EB7-BAC9-8CAB02BDEDA1}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Multiplayer\Manager\WinRT">
<UniqueIdentifier>{D345D0F4-C8AE-3FC9-8407-F16991A1B220}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Matchmaking\WinRT">
<UniqueIdentifier>{458043D0-B977-358F-AE22-DA2D1E406689}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Tournaments\WinRT">
<UniqueIdentifier>{65B87542-CA15-3C8C-85ED-FF0C33879C25}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Clubs\WinRT">
<UniqueIdentifier>{FFC1B215-A9A0-311B-B66E-73342A2B0521}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Misc">
<UniqueIdentifier>{206338C2-9047-3AAE-B89B-A141CD0A774F}</UniqueIdentifier>
</Filter>
@ -2321,95 +2411,11 @@
<Filter Include="C++ Source\Services\Events">
<UniqueIdentifier>{DBAE8D87-9A1F-319A-BC4F-6168F6F43654}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Stats\Manager\WinRT">
<UniqueIdentifier>{765859F5-D852-3E9E-964C-318C91E48306}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Presence\WinRT">
<UniqueIdentifier>{FD9E1975-DABA-36D3-9EBD-3C703AB30056}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Privacy\WinRT">
<UniqueIdentifier>{1F48107E-7574-33AC-AD47-758133406AA2}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\GameServerPlatform\WinRT">
<UniqueIdentifier>{855825D5-C60A-390C-A925-A947E172C2CD}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\RTA\WinRT">
<UniqueIdentifier>{253DBB04-D90F-3EA6-AC9B-4D54664C1EC8}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\TitleStorage\WinRT">
<UniqueIdentifier>{757C10D1-92D5-38B4-995A-EA73F4CF9C14}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Social\Manager\WinRT">
<UniqueIdentifier>{4DA1880C-C4F4-3B20-BA51-0277E9CB333F}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Multiplayer\Manager\WinRT">
<UniqueIdentifier>{D345D0F4-C8AE-3FC9-8407-F16991A1B220}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Tournaments\WinRT">
<UniqueIdentifier>{65B87542-CA15-3C8C-85ED-FF0C33879C25}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Matchmaking\WinRT">
<UniqueIdentifier>{458043D0-B977-358F-AE22-DA2D1E406689}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Leaderboard\WinRT">
<UniqueIdentifier>{6BBAEB81-C095-3A68-BA9A-9F254399F9D3}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\System\WinRT">
<UniqueIdentifier>{EE3999DA-6598-3BBC-A04F-84D57CCD29DC}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Misc\WinRT">
<UniqueIdentifier>{7AFE8ACD-0281-3A4B-9DBA-5858473AE2AE}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Common\WinRT">
<UniqueIdentifier>{038CAE7E-05AF-331C-B658-977DD2E76B65}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Achievements\WinRT">
<UniqueIdentifier>{5300601B-5D19-3DA5-8BF9-3D394A0CCE4F}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Shared\Logger">
<UniqueIdentifier>{D30FEB85-D0C6-32DE-B1BB-75623BAC93C3}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Shared\WinRT">
<UniqueIdentifier>{5C1BFE08-AE36-31F1-9696-DB526AD4D90E}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Stats\Manager">
<UniqueIdentifier>{57A0A6E0-3E99-371E-952D-38DECAC4B717}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Stats\WinRT">
<UniqueIdentifier>{B5694E76-E2FA-3451-8387-701C5F3AD66D}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Multiplayer\Manager">
<UniqueIdentifier>{93130BC3-2203-3733-B903-28CDDEEEF42A}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Multiplayer\WinRT">
<UniqueIdentifier>{CFE0BB67-2571-3F89-8826-2744B01FEE7D}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Social\Manager">
<UniqueIdentifier>{432888EB-664F-3B60-A937-CEC66EB64B1A}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Social\WinRT">
<UniqueIdentifier>{4FB2B169-B069-38ED-9ECE-FA4333EC6D3D}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Public Includes">
<UniqueIdentifier>{848B0C02-35A1-3A9D-81CC-513FF3F205BB}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source">
<UniqueIdentifier>{C156B2C1-D13C-31D8-8955-CFD94B05A781}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\System">
<UniqueIdentifier>{D75844CD-55A8-3AB4-ABC1-4028BC89E81D}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Shared">
<UniqueIdentifier>{B682A27C-50BA-30B6-9573-26F7B62C7BD5}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services">
<UniqueIdentifier>{66EEBBE9-943D-3582-8058-538D12E44C73}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Clubs\WinRT">
<UniqueIdentifier>{FFC1B215-A9A0-311B-B66E-73342A2B0521}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Events\WinRT">
<UniqueIdentifier>{6E1C5BB3-AB9B-3EB7-BAC9-8CAB02BDEDA1}</UniqueIdentifier>
</Filter>
</ItemGroup>
</Project>

3
Build/Microsoft.Xbox.Services.140.XDK.Cpp/Microsoft.Xbox.Services.140.XDK.Cpp.vcxproj
Просмотреть файл

@ -69,13 +69,13 @@
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Clubs\clubs_service.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Clubs\clubs_service_impl.cpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Clubs\clubs_service_impl.h" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\Desktop\XboxLiveContext_Desktop.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\Desktop\pch.cpp" >
<PrecompiledHeader>Create</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
</ClCompile>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\Desktop\pch.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\pch_common.h" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\xbox_live_context.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\xbox_live_context_impl.cpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\xbox_live_context_impl.h" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\EntertainmentProfile\entertainment_profile.cpp" />
@ -321,6 +321,7 @@
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\service_call_logging_config.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\user_context.cpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\user_context.h" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\user_context_xdk.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\utils.cpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\utils.h" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\utils_locales.cpp" />

61
Build/Microsoft.Xbox.Services.140.XDK.Cpp/Microsoft.Xbox.Services.140.XDK.Cpp.vcxproj.filters
Просмотреть файл

@ -70,10 +70,10 @@
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Clubs\clubs_service_impl.cpp">
<Filter>C++ Source\Services\Clubs</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\Desktop\XboxLiveContext_Desktop.cpp">
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\Desktop\pch.cpp">
<Filter>C++ Source\Services\Common</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\Desktop\pch.cpp">
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\xbox_live_context.cpp">
<Filter>C++ Source\Services\Common</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\xbox_live_context_impl.cpp">
@ -718,6 +718,9 @@
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\user_context.cpp">
<Filter>C++ Source\Shared</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\user_context_xdk.cpp">
<Filter>C++ Source\Shared</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\utils.cpp">
<Filter>C++ Source\Shared</Filter>
</ClCompile>
@ -977,6 +980,33 @@
</ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include="C++ Public Includes">
<UniqueIdentifier>{848B0C02-35A1-3A9D-81CC-513FF3F205BB}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source">
<UniqueIdentifier>{C156B2C1-D13C-31D8-8955-CFD94B05A781}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Stats\Manager">
<UniqueIdentifier>{57A0A6E0-3E99-371E-952D-38DECAC4B717}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Multiplayer\Manager">
<UniqueIdentifier>{93130BC3-2203-3733-B903-28CDDEEEF42A}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Shared\Logger">
<UniqueIdentifier>{D30FEB85-D0C6-32DE-B1BB-75623BAC93C3}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Social\Manager">
<UniqueIdentifier>{432888EB-664F-3B60-A937-CEC66EB64B1A}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\System">
<UniqueIdentifier>{D75844CD-55A8-3AB4-ABC1-4028BC89E81D}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Shared">
<UniqueIdentifier>{B682A27C-50BA-30B6-9573-26F7B62C7BD5}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services">
<UniqueIdentifier>{66EEBBE9-943D-3582-8058-538D12E44C73}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Misc">
<UniqueIdentifier>{206338C2-9047-3AAE-B89B-A141CD0A774F}</UniqueIdentifier>
</Filter>
@ -1028,33 +1058,6 @@
<Filter Include="C++ Source\Services\Marketplace">
<UniqueIdentifier>{E666A459-C521-327E-91C0-E95357F5268D}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Shared\Logger">
<UniqueIdentifier>{D30FEB85-D0C6-32DE-B1BB-75623BAC93C3}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Stats\Manager">
<UniqueIdentifier>{57A0A6E0-3E99-371E-952D-38DECAC4B717}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Social\Manager">
<UniqueIdentifier>{432888EB-664F-3B60-A937-CEC66EB64B1A}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Multiplayer\Manager">
<UniqueIdentifier>{93130BC3-2203-3733-B903-28CDDEEEF42A}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\System">
<UniqueIdentifier>{D75844CD-55A8-3AB4-ABC1-4028BC89E81D}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Shared">
<UniqueIdentifier>{B682A27C-50BA-30B6-9573-26F7B62C7BD5}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services">
<UniqueIdentifier>{66EEBBE9-943D-3582-8058-538D12E44C73}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Public Includes">
<UniqueIdentifier>{848B0C02-35A1-3A9D-81CC-513FF3F205BB}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source">
<UniqueIdentifier>{C156B2C1-D13C-31D8-8955-CFD94B05A781}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<None Include="..\..\Source\Shared\Logger\ERA_ETW.man">

5
Build/Microsoft.Xbox.Services.141.UWP.Cpp/Microsoft.Xbox.Services.141.UWP.Cpp.vcxproj
Просмотреть файл

@ -149,16 +149,16 @@
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Clubs\clubs_service.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Clubs\clubs_service_impl.cpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Clubs\clubs_service_impl.h" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\Desktop\XboxLiveContext_Desktop.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\Desktop\pch.cpp" >
<PrecompiledHeader>Create</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
</ClCompile>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\Desktop\pch.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\pch_common.h" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\xbox_live_context.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\xbox_live_context_impl.cpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\xbox_live_context_impl.h" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Events\events_service.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Events\events_service_uwp.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\GameServerPlatform\allocation_result.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\GameServerPlatform\cluster_result.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\GameServerPlatform\game_server_image_set.cpp" />
@ -395,6 +395,7 @@
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\telemetry.h" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\user_context.cpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\user_context.h" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\user_context_cpp.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\utils.cpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\utils.h" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\utils_locales.cpp" />

27
Build/Microsoft.Xbox.Services.141.UWP.Cpp/Microsoft.Xbox.Services.141.UWP.Cpp.vcxproj.filters
Просмотреть файл

@ -70,16 +70,16 @@
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Clubs\clubs_service_impl.cpp">
<Filter>C++ Source\Services\Clubs</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\Desktop\XboxLiveContext_Desktop.cpp">
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\Desktop\pch.cpp">
<Filter>C++ Source\Services\Common</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\Desktop\pch.cpp">
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\xbox_live_context.cpp">
<Filter>C++ Source\Services\Common</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\xbox_live_context_impl.cpp">
<Filter>C++ Source\Services\Common</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Events\events_service.cpp">
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Events\events_service_uwp.cpp">
<Filter>C++ Source\Services\Events</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\GameServerPlatform\allocation_result.cpp">
@ -694,6 +694,9 @@
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\user_context.cpp">
<Filter>C++ Source\Shared</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\user_context_cpp.cpp">
<Filter>C++ Source\Shared</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\utils.cpp">
<Filter>C++ Source\Shared</Filter>
</ClCompile>
@ -977,6 +980,12 @@
</ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include="C++ Public Includes">
<UniqueIdentifier>{848B0C02-35A1-3A9D-81CC-513FF3F205BB}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source">
<UniqueIdentifier>{C156B2C1-D13C-31D8-8955-CFD94B05A781}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Misc">
<UniqueIdentifier>{206338C2-9047-3AAE-B89B-A141CD0A774F}</UniqueIdentifier>
</Filter>
@ -1028,15 +1037,15 @@
<Filter Include="C++ Source\Services\Social\Manager">
<UniqueIdentifier>{432888EB-664F-3B60-A937-CEC66EB64B1A}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Shared\Logger">
<UniqueIdentifier>{D30FEB85-D0C6-32DE-B1BB-75623BAC93C3}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Stats\Manager">
<UniqueIdentifier>{57A0A6E0-3E99-371E-952D-38DECAC4B717}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Multiplayer\Manager">
<UniqueIdentifier>{93130BC3-2203-3733-B903-28CDDEEEF42A}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Shared\Logger">
<UniqueIdentifier>{D30FEB85-D0C6-32DE-B1BB-75623BAC93C3}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\System">
<UniqueIdentifier>{D75844CD-55A8-3AB4-ABC1-4028BC89E81D}</UniqueIdentifier>
</Filter>
@ -1046,11 +1055,5 @@
<Filter Include="C++ Source\Services">
<UniqueIdentifier>{66EEBBE9-943D-3582-8058-538D12E44C73}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Public Includes">
<UniqueIdentifier>{848B0C02-35A1-3A9D-81CC-513FF3F205BB}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source">
<UniqueIdentifier>{C156B2C1-D13C-31D8-8955-CFD94B05A781}</UniqueIdentifier>
</Filter>
</ItemGroup>
</Project>

3
Build/Microsoft.Xbox.Services.141.XDK.Cpp/Microsoft.Xbox.Services.141.XDK.Cpp.vcxproj
Просмотреть файл

@ -69,13 +69,13 @@
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Clubs\clubs_service.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Clubs\clubs_service_impl.cpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Clubs\clubs_service_impl.h" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\Desktop\XboxLiveContext_Desktop.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\Desktop\pch.cpp" >
<PrecompiledHeader>Create</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
</ClCompile>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\Desktop\pch.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\pch_common.h" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\xbox_live_context.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\xbox_live_context_impl.cpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\xbox_live_context_impl.h" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\EntertainmentProfile\entertainment_profile.cpp" />
@ -321,6 +321,7 @@
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\service_call_logging_config.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\user_context.cpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\user_context.h" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\user_context_xdk.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\utils.cpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\utils.h" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\utils_locales.cpp" />

61
Build/Microsoft.Xbox.Services.141.XDK.Cpp/Microsoft.Xbox.Services.141.XDK.Cpp.vcxproj.filters
Просмотреть файл

@ -70,10 +70,10 @@
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Clubs\clubs_service_impl.cpp">
<Filter>C++ Source\Services\Clubs</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\Desktop\XboxLiveContext_Desktop.cpp">
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\Desktop\pch.cpp">
<Filter>C++ Source\Services\Common</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\Desktop\pch.cpp">
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\xbox_live_context.cpp">
<Filter>C++ Source\Services\Common</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\xbox_live_context_impl.cpp">
@ -718,6 +718,9 @@
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\user_context.cpp">
<Filter>C++ Source\Shared</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\user_context_xdk.cpp">
<Filter>C++ Source\Shared</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\utils.cpp">
<Filter>C++ Source\Shared</Filter>
</ClCompile>
@ -977,6 +980,33 @@
</ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include="C++ Public Includes">
<UniqueIdentifier>{848B0C02-35A1-3A9D-81CC-513FF3F205BB}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source">
<UniqueIdentifier>{C156B2C1-D13C-31D8-8955-CFD94B05A781}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Stats\Manager">
<UniqueIdentifier>{57A0A6E0-3E99-371E-952D-38DECAC4B717}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Multiplayer\Manager">
<UniqueIdentifier>{93130BC3-2203-3733-B903-28CDDEEEF42A}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Shared\Logger">
<UniqueIdentifier>{D30FEB85-D0C6-32DE-B1BB-75623BAC93C3}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Social\Manager">
<UniqueIdentifier>{432888EB-664F-3B60-A937-CEC66EB64B1A}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\System">
<UniqueIdentifier>{D75844CD-55A8-3AB4-ABC1-4028BC89E81D}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Shared">
<UniqueIdentifier>{B682A27C-50BA-30B6-9573-26F7B62C7BD5}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services">
<UniqueIdentifier>{66EEBBE9-943D-3582-8058-538D12E44C73}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Misc">
<UniqueIdentifier>{206338C2-9047-3AAE-B89B-A141CD0A774F}</UniqueIdentifier>
</Filter>
@ -1028,33 +1058,6 @@
<Filter Include="C++ Source\Services\Marketplace">
<UniqueIdentifier>{E666A459-C521-327E-91C0-E95357F5268D}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Shared\Logger">
<UniqueIdentifier>{D30FEB85-D0C6-32DE-B1BB-75623BAC93C3}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Stats\Manager">
<UniqueIdentifier>{57A0A6E0-3E99-371E-952D-38DECAC4B717}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Social\Manager">
<UniqueIdentifier>{432888EB-664F-3B60-A937-CEC66EB64B1A}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Multiplayer\Manager">
<UniqueIdentifier>{93130BC3-2203-3733-B903-28CDDEEEF42A}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\System">
<UniqueIdentifier>{D75844CD-55A8-3AB4-ABC1-4028BC89E81D}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Shared">
<UniqueIdentifier>{B682A27C-50BA-30B6-9573-26F7B62C7BD5}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services">
<UniqueIdentifier>{66EEBBE9-943D-3582-8058-538D12E44C73}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Public Includes">
<UniqueIdentifier>{848B0C02-35A1-3A9D-81CC-513FF3F205BB}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source">
<UniqueIdentifier>{C156B2C1-D13C-31D8-8955-CFD94B05A781}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<None Include="..\..\Source\Shared\Logger\ERA_ETW.man">

5
Build/Microsoft.Xbox.Services.UnitTest.140.TAEF/Microsoft.Xbox.Services.UnitTest.140.TAEF.vcxproj
Просмотреть файл

@ -239,7 +239,6 @@
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Clubs\clubs_service.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Clubs\clubs_service_impl.cpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Clubs\clubs_service_impl.h" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\Desktop\XboxLiveContext_Desktop.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\WinRT\XboxLiveContext_WinRT.cpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\WinRT\XboxLiveContext_WinRT.h" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\WinRT\pch.cpp" >
@ -248,6 +247,7 @@
</ClCompile>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\WinRT\pch.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\pch_common.h" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\xbox_live_context.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\xbox_live_context_impl.cpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\xbox_live_context_impl.h" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\EntertainmentProfile\WinRT\EntertainmentProfileListContainsItemResult_WinRT.cpp" />
@ -259,9 +259,9 @@
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\EntertainmentProfile\entertainment_profile.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\EntertainmentProfile\entertainment_profile_list_contains_item_result.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\EntertainmentProfile\entertainment_profile_list_xbox_one_pins.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Events\events_service.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Events\WinRT\EventsService_WinRT.cpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Events\WinRT\EventsService_WinRT.h" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Events\events_service_uwp.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\GameServerPlatform\WinRT\AllocationResult_WinRT.cpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Services\GameServerPlatform\WinRT\AllocationResult_WinRT.h" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\GameServerPlatform\WinRT\ClusterResult_WinRT.cpp" />
@ -908,6 +908,7 @@
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\telemetry.h" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\user_context.cpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\user_context.h" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\user_context_xdk.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\utils.cpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\utils.h" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\utils_locales.cpp" />

165
Build/Microsoft.Xbox.Services.UnitTest.140.TAEF/Microsoft.Xbox.Services.UnitTest.140.TAEF.vcxproj.filters
Просмотреть файл

@ -133,15 +133,15 @@
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Clubs\clubs_service_impl.cpp">
<Filter>C++ Source\Services\Clubs</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\Desktop\XboxLiveContext_Desktop.cpp">
<Filter>C++ Source\Services\Common</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\WinRT\XboxLiveContext_WinRT.cpp">
<Filter>C++ Source\Services\Common\WinRT</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\WinRT\pch.cpp">
<Filter>C++ Source\Services\Common</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\xbox_live_context.cpp">
<Filter>C++ Source\Services\Common</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\xbox_live_context_impl.cpp">
<Filter>C++ Source\Services\Common</Filter>
</ClCompile>
@ -163,12 +163,12 @@
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\EntertainmentProfile\entertainment_profile_list_xbox_one_pins.cpp">
<Filter>C++ Source\Services\EntertainmentProfile</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Events\events_service.cpp">
<Filter>C++ Source\Services\Events</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Events\WinRT\EventsService_WinRT.cpp">
<Filter>C++ Source\Services\Events\WinRT</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Events\events_service_uwp.cpp">
<Filter>C++ Source\Services\Events</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\GameServerPlatform\WinRT\AllocationResult_WinRT.cpp">
<Filter>C++ Source\Services\GameServerPlatform\WinRT</Filter>
</ClCompile>
@ -1300,6 +1300,9 @@
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\user_context.cpp">
<Filter>C++ Source\Shared</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\user_context_xdk.cpp">
<Filter>C++ Source\Shared</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\utils.cpp">
<Filter>C++ Source\Shared</Filter>
</ClCompile>
@ -2627,6 +2630,69 @@
</ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include="C++ Public Includes">
<UniqueIdentifier>{848B0C02-35A1-3A9D-81CC-513FF3F205BB}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source">
<UniqueIdentifier>{C156B2C1-D13C-31D8-8955-CFD94B05A781}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Multiplayer\Manager\WinRT">
<UniqueIdentifier>{D345D0F4-C8AE-3FC9-8407-F16991A1B220}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Tournaments\WinRT">
<UniqueIdentifier>{65B87542-CA15-3C8C-85ED-FF0C33879C25}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Matchmaking\WinRT">
<UniqueIdentifier>{458043D0-B977-358F-AE22-DA2D1E406689}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\GameServerPlatform\WinRT">
<UniqueIdentifier>{855825D5-C60A-390C-A925-A947E172C2CD}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\TitleStorage\WinRT">
<UniqueIdentifier>{757C10D1-92D5-38B4-995A-EA73F4CF9C14}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Social\Manager\WinRT">
<UniqueIdentifier>{4DA1880C-C4F4-3B20-BA51-0277E9CB333F}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Leaderboard\WinRT">
<UniqueIdentifier>{6BBAEB81-C095-3A68-BA9A-9F254399F9D3}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Stats\Manager\WinRT">
<UniqueIdentifier>{765859F5-D852-3E9E-964C-318C91E48306}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\System\WinRT">
<UniqueIdentifier>{EE3999DA-6598-3BBC-A04F-84D57CCD29DC}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Achievements\WinRT">
<UniqueIdentifier>{5300601B-5D19-3DA5-8BF9-3D394A0CCE4F}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Presence\WinRT">
<UniqueIdentifier>{FD9E1975-DABA-36D3-9EBD-3C703AB30056}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\RTA\WinRT">
<UniqueIdentifier>{253DBB04-D90F-3EA6-AC9B-4D54664C1EC8}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Misc\WinRT">
<UniqueIdentifier>{7AFE8ACD-0281-3A4B-9DBA-5858473AE2AE}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Common\WinRT">
<UniqueIdentifier>{038CAE7E-05AF-331C-B658-977DD2E76B65}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Privacy\WinRT">
<UniqueIdentifier>{1F48107E-7574-33AC-AD47-758133406AA2}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\EntertainmentProfile\WinRT">
<UniqueIdentifier>{EEABD1E4-8870-321A-81AD-87423BDF6868}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Marketplace\WinRT">
<UniqueIdentifier>{4C47A1D9-B79E-335A-BF53-B293843954B9}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Clubs\WinRT">
<UniqueIdentifier>{FFC1B215-A9A0-311B-B66E-73342A2B0521}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Events\WinRT">
<UniqueIdentifier>{6E1C5BB3-AB9B-3EB7-BAC9-8CAB02BDEDA1}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\UnitTests\Mocks">
<UniqueIdentifier>{1E689D5D-4DBF-3497-8559-2F8938249B32}</UniqueIdentifier>
</Filter>
@ -2636,29 +2702,17 @@
<Filter Include="C++ Source\UnitTests\Tests">
<UniqueIdentifier>{BC8F88B4-9047-369F-BBA9-4CB621FCBEF9}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Tournaments\WinRT">
<UniqueIdentifier>{65B87542-CA15-3C8C-85ED-FF0C33879C25}</UniqueIdentifier>
<Filter Include="C++ Source\System">
<UniqueIdentifier>{D75844CD-55A8-3AB4-ABC1-4028BC89E81D}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Clubs\WinRT">
<UniqueIdentifier>{FFC1B215-A9A0-311B-B66E-73342A2B0521}</UniqueIdentifier>
<Filter Include="C++ Source\Shared">
<UniqueIdentifier>{B682A27C-50BA-30B6-9573-26F7B62C7BD5}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\EntertainmentProfile\WinRT">
<UniqueIdentifier>{EEABD1E4-8870-321A-81AD-87423BDF6868}</UniqueIdentifier>
<Filter Include="C++ Source\Services">
<UniqueIdentifier>{66EEBBE9-943D-3582-8058-538D12E44C73}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Marketplace\WinRT">
<UniqueIdentifier>{4C47A1D9-B79E-335A-BF53-B293843954B9}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Events\WinRT">
<UniqueIdentifier>{6E1C5BB3-AB9B-3EB7-BAC9-8CAB02BDEDA1}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Multiplayer\Manager\WinRT">
<UniqueIdentifier>{D345D0F4-C8AE-3FC9-8407-F16991A1B220}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Multiplayer\Manager">
<UniqueIdentifier>{93130BC3-2203-3733-B903-28CDDEEEF42A}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Multiplayer\WinRT">
<UniqueIdentifier>{CFE0BB67-2571-3F89-8826-2744B01FEE7D}</UniqueIdentifier>
<Filter Include="C++ Source\UnitTests">
<UniqueIdentifier>{7CCBAB9C-7CFC-3491-849A-FC99896C14B4}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Social\Manager">
<UniqueIdentifier>{432888EB-664F-3B60-A937-CEC66EB64B1A}</UniqueIdentifier>
@ -2678,44 +2732,11 @@
<Filter Include="C++ Source\Services\Stats\WinRT">
<UniqueIdentifier>{B5694E76-E2FA-3451-8387-701C5F3AD66D}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\System\WinRT">
<UniqueIdentifier>{EE3999DA-6598-3BBC-A04F-84D57CCD29DC}</UniqueIdentifier>
<Filter Include="C++ Source\Services\Multiplayer\Manager">
<UniqueIdentifier>{93130BC3-2203-3733-B903-28CDDEEEF42A}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Common\WinRT">
<UniqueIdentifier>{038CAE7E-05AF-331C-B658-977DD2E76B65}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Achievements\WinRT">
<UniqueIdentifier>{5300601B-5D19-3DA5-8BF9-3D394A0CCE4F}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Misc\WinRT">
<UniqueIdentifier>{7AFE8ACD-0281-3A4B-9DBA-5858473AE2AE}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Privacy\WinRT">
<UniqueIdentifier>{1F48107E-7574-33AC-AD47-758133406AA2}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Presence\WinRT">
<UniqueIdentifier>{FD9E1975-DABA-36D3-9EBD-3C703AB30056}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Leaderboard\WinRT">
<UniqueIdentifier>{6BBAEB81-C095-3A68-BA9A-9F254399F9D3}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\TitleStorage\WinRT">
<UniqueIdentifier>{757C10D1-92D5-38B4-995A-EA73F4CF9C14}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\RTA\WinRT">
<UniqueIdentifier>{253DBB04-D90F-3EA6-AC9B-4D54664C1EC8}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\GameServerPlatform\WinRT">
<UniqueIdentifier>{855825D5-C60A-390C-A925-A947E172C2CD}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Stats\Manager\WinRT">
<UniqueIdentifier>{765859F5-D852-3E9E-964C-318C91E48306}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Matchmaking\WinRT">
<UniqueIdentifier>{458043D0-B977-358F-AE22-DA2D1E406689}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Social\Manager\WinRT">
<UniqueIdentifier>{4DA1880C-C4F4-3B20-BA51-0277E9CB333F}</UniqueIdentifier>
<Filter Include="C++ Source\Services\Multiplayer\WinRT">
<UniqueIdentifier>{CFE0BB67-2571-3F89-8826-2744B01FEE7D}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Misc">
<UniqueIdentifier>{206338C2-9047-3AAE-B89B-A141CD0A774F}</UniqueIdentifier>
@ -2771,23 +2792,5 @@
<Filter Include="C++ Source\Services\Events">
<UniqueIdentifier>{DBAE8D87-9A1F-319A-BC4F-6168F6F43654}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Public Includes">
<UniqueIdentifier>{848B0C02-35A1-3A9D-81CC-513FF3F205BB}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source">
<UniqueIdentifier>{C156B2C1-D13C-31D8-8955-CFD94B05A781}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\System">
<UniqueIdentifier>{D75844CD-55A8-3AB4-ABC1-4028BC89E81D}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Shared">
<UniqueIdentifier>{B682A27C-50BA-30B6-9573-26F7B62C7BD5}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services">
<UniqueIdentifier>{66EEBBE9-943D-3582-8058-538D12E44C73}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\UnitTests">
<UniqueIdentifier>{7CCBAB9C-7CFC-3491-849A-FC99896C14B4}</UniqueIdentifier>
</Filter>
</ItemGroup>
</Project>

5
Build/Microsoft.Xbox.Services.UnitTest.140.TE/Microsoft.Xbox.Services.UnitTest.140.TE.vcxproj
Просмотреть файл

@ -329,7 +329,6 @@
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Clubs\clubs_service.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Clubs\clubs_service_impl.cpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Clubs\clubs_service_impl.h" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\Desktop\XboxLiveContext_Desktop.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\WinRT\XboxLiveContext_WinRT.cpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\WinRT\XboxLiveContext_WinRT.h" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\WinRT\pch.cpp" >
@ -338,6 +337,7 @@
</ClCompile>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\WinRT\pch.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\pch_common.h" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\xbox_live_context.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\xbox_live_context_impl.cpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\xbox_live_context_impl.h" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\EntertainmentProfile\WinRT\EntertainmentProfileListContainsItemResult_WinRT.cpp" />
@ -349,9 +349,9 @@
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\EntertainmentProfile\entertainment_profile.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\EntertainmentProfile\entertainment_profile_list_contains_item_result.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\EntertainmentProfile\entertainment_profile_list_xbox_one_pins.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Events\events_service.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Events\WinRT\EventsService_WinRT.cpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Events\WinRT\EventsService_WinRT.h" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Events\events_service_uwp.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\GameServerPlatform\WinRT\AllocationResult_WinRT.cpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Services\GameServerPlatform\WinRT\AllocationResult_WinRT.h" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\GameServerPlatform\WinRT\ClusterResult_WinRT.cpp" />
@ -998,6 +998,7 @@
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\telemetry.h" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\user_context.cpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\user_context.h" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\user_context_xdk.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\utils.cpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\utils.h" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\utils_locales.cpp" />

231
Build/Microsoft.Xbox.Services.UnitTest.140.TE/Microsoft.Xbox.Services.UnitTest.140.TE.vcxproj.filters
Просмотреть файл

@ -133,15 +133,15 @@
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Clubs\clubs_service_impl.cpp">
<Filter>C++ Source\Services\Clubs</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\Desktop\XboxLiveContext_Desktop.cpp">
<Filter>C++ Source\Services\Common</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\WinRT\XboxLiveContext_WinRT.cpp">
<Filter>C++ Source\Services\Common\WinRT</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\WinRT\pch.cpp">
<Filter>C++ Source\Services\Common</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\xbox_live_context.cpp">
<Filter>C++ Source\Services\Common</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Common\xbox_live_context_impl.cpp">
<Filter>C++ Source\Services\Common</Filter>
</ClCompile>
@ -163,12 +163,12 @@
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\EntertainmentProfile\entertainment_profile_list_xbox_one_pins.cpp">
<Filter>C++ Source\Services\EntertainmentProfile</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Events\events_service.cpp">
<Filter>C++ Source\Services\Events</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Events\WinRT\EventsService_WinRT.cpp">
<Filter>C++ Source\Services\Events\WinRT</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\Events\events_service_uwp.cpp">
<Filter>C++ Source\Services\Events</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Services\GameServerPlatform\WinRT\AllocationResult_WinRT.cpp">
<Filter>C++ Source\Services\GameServerPlatform\WinRT</Filter>
</ClCompile>
@ -1300,6 +1300,9 @@
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\user_context.cpp">
<Filter>C++ Source\Shared</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\user_context_xdk.cpp">
<Filter>C++ Source\Shared</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\utils.cpp">
<Filter>C++ Source\Shared</Filter>
</ClCompile>
@ -2621,6 +2624,114 @@
</ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include="C++ Public Includes">
<UniqueIdentifier>{848B0C02-35A1-3A9D-81CC-513FF3F205BB}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source">
<UniqueIdentifier>{C156B2C1-D13C-31D8-8955-CFD94B05A781}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Clubs\WinRT">
<UniqueIdentifier>{FFC1B215-A9A0-311B-B66E-73342A2B0521}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\EntertainmentProfile\WinRT">
<UniqueIdentifier>{EEABD1E4-8870-321A-81AD-87423BDF6868}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Marketplace\WinRT">
<UniqueIdentifier>{4C47A1D9-B79E-335A-BF53-B293843954B9}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Events\WinRT">
<UniqueIdentifier>{6E1C5BB3-AB9B-3EB7-BAC9-8CAB02BDEDA1}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Multiplayer\Manager\WinRT">
<UniqueIdentifier>{D345D0F4-C8AE-3FC9-8407-F16991A1B220}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Tournaments\WinRT">
<UniqueIdentifier>{65B87542-CA15-3C8C-85ED-FF0C33879C25}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\UnitTests\Mocks">
<UniqueIdentifier>{1E689D5D-4DBF-3497-8559-2F8938249B32}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\UnitTests\Support">
<UniqueIdentifier>{C529C136-9E0C-3028-8598-931E84460027}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\UnitTests\Tests">
<UniqueIdentifier>{BC8F88B4-9047-369F-BBA9-4CB621FCBEF9}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\System">
<UniqueIdentifier>{D75844CD-55A8-3AB4-ABC1-4028BC89E81D}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Shared">
<UniqueIdentifier>{B682A27C-50BA-30B6-9573-26F7B62C7BD5}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services">
<UniqueIdentifier>{66EEBBE9-943D-3582-8058-538D12E44C73}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\UnitTests">
<UniqueIdentifier>{7CCBAB9C-7CFC-3491-849A-FC99896C14B4}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Social\Manager\WinRT">
<UniqueIdentifier>{4DA1880C-C4F4-3B20-BA51-0277E9CB333F}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Matchmaking\WinRT">
<UniqueIdentifier>{458043D0-B977-358F-AE22-DA2D1E406689}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Stats\Manager\WinRT">
<UniqueIdentifier>{765859F5-D852-3E9E-964C-318C91E48306}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\System\WinRT">
<UniqueIdentifier>{EE3999DA-6598-3BBC-A04F-84D57CCD29DC}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Misc\WinRT">
<UniqueIdentifier>{7AFE8ACD-0281-3A4B-9DBA-5858473AE2AE}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Achievements\WinRT">
<UniqueIdentifier>{5300601B-5D19-3DA5-8BF9-3D394A0CCE4F}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Leaderboard\WinRT">
<UniqueIdentifier>{6BBAEB81-C095-3A68-BA9A-9F254399F9D3}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Common\WinRT">
<UniqueIdentifier>{038CAE7E-05AF-331C-B658-977DD2E76B65}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Presence\WinRT">
<UniqueIdentifier>{FD9E1975-DABA-36D3-9EBD-3C703AB30056}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Privacy\WinRT">
<UniqueIdentifier>{1F48107E-7574-33AC-AD47-758133406AA2}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\RTA\WinRT">
<UniqueIdentifier>{253DBB04-D90F-3EA6-AC9B-4D54664C1EC8}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\TitleStorage\WinRT">
<UniqueIdentifier>{757C10D1-92D5-38B4-995A-EA73F4CF9C14}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\GameServerPlatform\WinRT">
<UniqueIdentifier>{855825D5-C60A-390C-A925-A947E172C2CD}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Multiplayer\Manager">
<UniqueIdentifier>{93130BC3-2203-3733-B903-28CDDEEEF42A}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Multiplayer\WinRT">
<UniqueIdentifier>{CFE0BB67-2571-3F89-8826-2744B01FEE7D}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Stats\Manager">
<UniqueIdentifier>{57A0A6E0-3E99-371E-952D-38DECAC4B717}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Stats\WinRT">
<UniqueIdentifier>{B5694E76-E2FA-3451-8387-701C5F3AD66D}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Shared\Logger">
<UniqueIdentifier>{D30FEB85-D0C6-32DE-B1BB-75623BAC93C3}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Shared\WinRT">
<UniqueIdentifier>{5C1BFE08-AE36-31F1-9696-DB526AD4D90E}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Social\Manager">
<UniqueIdentifier>{432888EB-664F-3B60-A937-CEC66EB64B1A}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Social\WinRT">
<UniqueIdentifier>{4FB2B169-B069-38ED-9ECE-FA4333EC6D3D}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Misc">
<UniqueIdentifier>{206338C2-9047-3AAE-B89B-A141CD0A774F}</UniqueIdentifier>
</Filter>
@ -2675,113 +2786,5 @@
<Filter Include="C++ Source\Services\Events">
<UniqueIdentifier>{DBAE8D87-9A1F-319A-BC4F-6168F6F43654}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Marketplace\WinRT">
<UniqueIdentifier>{4C47A1D9-B79E-335A-BF53-B293843954B9}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Clubs\WinRT">
<UniqueIdentifier>{FFC1B215-A9A0-311B-B66E-73342A2B0521}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Events\WinRT">
<UniqueIdentifier>{6E1C5BB3-AB9B-3EB7-BAC9-8CAB02BDEDA1}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Multiplayer\Manager\WinRT">
<UniqueIdentifier>{D345D0F4-C8AE-3FC9-8407-F16991A1B220}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Tournaments\WinRT">
<UniqueIdentifier>{65B87542-CA15-3C8C-85ED-FF0C33879C25}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\EntertainmentProfile\WinRT">
<UniqueIdentifier>{EEABD1E4-8870-321A-81AD-87423BDF6868}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\UnitTests\Mocks">
<UniqueIdentifier>{1E689D5D-4DBF-3497-8559-2F8938249B32}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\UnitTests\Support">
<UniqueIdentifier>{C529C136-9E0C-3028-8598-931E84460027}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\UnitTests\Tests">
<UniqueIdentifier>{BC8F88B4-9047-369F-BBA9-4CB621FCBEF9}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Stats\Manager\WinRT">
<UniqueIdentifier>{765859F5-D852-3E9E-964C-318C91E48306}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Social\Manager\WinRT">
<UniqueIdentifier>{4DA1880C-C4F4-3B20-BA51-0277E9CB333F}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Matchmaking\WinRT">
<UniqueIdentifier>{458043D0-B977-358F-AE22-DA2D1E406689}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Presence\WinRT">
<UniqueIdentifier>{FD9E1975-DABA-36D3-9EBD-3C703AB30056}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Leaderboard\WinRT">
<UniqueIdentifier>{6BBAEB81-C095-3A68-BA9A-9F254399F9D3}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Achievements\WinRT">
<UniqueIdentifier>{5300601B-5D19-3DA5-8BF9-3D394A0CCE4F}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Privacy\WinRT">
<UniqueIdentifier>{1F48107E-7574-33AC-AD47-758133406AA2}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\System\WinRT">
<UniqueIdentifier>{EE3999DA-6598-3BBC-A04F-84D57CCD29DC}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Misc\WinRT">
<UniqueIdentifier>{7AFE8ACD-0281-3A4B-9DBA-5858473AE2AE}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Common\WinRT">
<UniqueIdentifier>{038CAE7E-05AF-331C-B658-977DD2E76B65}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\GameServerPlatform\WinRT">
<UniqueIdentifier>{855825D5-C60A-390C-A925-A947E172C2CD}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\RTA\WinRT">
<UniqueIdentifier>{253DBB04-D90F-3EA6-AC9B-4D54664C1EC8}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\TitleStorage\WinRT">
<UniqueIdentifier>{757C10D1-92D5-38B4-995A-EA73F4CF9C14}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Shared\Logger">
<UniqueIdentifier>{D30FEB85-D0C6-32DE-B1BB-75623BAC93C3}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Shared\WinRT">
<UniqueIdentifier>{5C1BFE08-AE36-31F1-9696-DB526AD4D90E}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Stats\Manager">
<UniqueIdentifier>{57A0A6E0-3E99-371E-952D-38DECAC4B717}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Stats\WinRT">
<UniqueIdentifier>{B5694E76-E2FA-3451-8387-701C5F3AD66D}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Social\Manager">
<UniqueIdentifier>{432888EB-664F-3B60-A937-CEC66EB64B1A}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Social\WinRT">
<UniqueIdentifier>{4FB2B169-B069-38ED-9ECE-FA4333EC6D3D}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Multiplayer\Manager">
<UniqueIdentifier>{93130BC3-2203-3733-B903-28CDDEEEF42A}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Multiplayer\WinRT">
<UniqueIdentifier>{CFE0BB67-2571-3F89-8826-2744B01FEE7D}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Public Includes">
<UniqueIdentifier>{848B0C02-35A1-3A9D-81CC-513FF3F205BB}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source">
<UniqueIdentifier>{C156B2C1-D13C-31D8-8955-CFD94B05A781}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\System">
<UniqueIdentifier>{D75844CD-55A8-3AB4-ABC1-4028BC89E81D}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Shared">
<UniqueIdentifier>{B682A27C-50BA-30B6-9573-26F7B62C7BD5}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services">
<UniqueIdentifier>{66EEBBE9-943D-3582-8058-538D12E44C73}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\UnitTests">
<UniqueIdentifier>{7CCBAB9C-7CFC-3491-849A-FC99896C14B4}</UniqueIdentifier>
</Filter>
</ItemGroup>
</Project>

36
Include/xsapi/http_call.h
Просмотреть файл

@ -249,41 +249,30 @@ public:
_In_ http_call_response_body_type httpCallResponseBodyType = http_call_response_body_type::json_body
) = 0;
#if TV_API
/// <summary>
/// Attach the Xbox Live token, sign the request, send the request to the service, and return the response.
/// </summary>
#if XSAPI_XDK_AUTH
virtual pplx::task<std::shared_ptr<http_call_response>> get_response_with_auth(
_In_ Windows::Xbox::System::User^ user,
_In_ http_call_response_body_type httpCallResponseBodyType = http_call_response_body_type::json_body,
_In_ bool allUsersAuthRequired = false
) = 0;
#endif
#elif UNIT_TEST_SERVICES || !XSAPI_CPP
/// <summary>
/// Attach the Xbox Live token, sign the request, send the request to the service, and return the response.
/// </summary>
#if XSAPI_NONXDK_CPP_AUTH
virtual pplx::task<std::shared_ptr<http_call_response>> get_response_with_auth(
_In_ std::shared_ptr<system::xbox_live_user> user,
_In_ http_call_response_body_type httpCallResponseBodyType = http_call_response_body_type::json_body,
_In_ bool allUsersAuthRequired = false
) = 0;
#endif
#if XSAPI_NONXDK_WINRT_AUTH
virtual pplx::task<std::shared_ptr<http_call_response>> get_response_with_auth(
_In_ Microsoft::Xbox::Services::System::XboxLiveUser^ user,
_In_ http_call_response_body_type httpCallResponseBodyType = http_call_response_body_type::json_body,
_In_ bool allUsersAuthRequired = false
) = 0;
#else
/// <summary>
/// Attach the Xbox Live token, sign the request, send the request to the service, and return the response.
/// </summary>
virtual pplx::task<std::shared_ptr<http_call_response>> get_response_with_auth(
_In_ std::shared_ptr<xbox::services::system::xbox_live_user> user,
_In_ http_call_response_body_type httpCallResponseBodyType = http_call_response_body_type::json_body,
_In_ bool allUsersAuthRequired = false
) = 0;
#endif
/// <summary>
/// Send the request without authentication and get the response.
/// </summary>
@ -393,7 +382,6 @@ public:
_In_ bool allUsersAuthRequired = false
) = 0;
virtual ~http_call(){}
};

8
Include/xsapi/multiplayer_manager.h
Просмотреть файл

@ -5,6 +5,7 @@
#include <mutex>
#include "pplx/pplxtasks.h"
#include "xsapi/services.h"
#include "xsapi/types.h"
namespace xbox { namespace services {
@ -13,12 +14,6 @@ namespace xbox { namespace services {
}
}}
#if TV_API
typedef Windows::Xbox::System::User^ xbox_live_user_t;
#else
typedef std::shared_ptr<xbox::services::system::xbox_live_user> xbox_live_user_t;
#endif
#if XSAPI_CPP
typedef const void* context_t;
#else
@ -1595,7 +1590,6 @@ public:
return join_lobby(handleId, convert_user_vector_to_cppcx(users));
}
#endif
#endif
private:

7
Include/xsapi/social_manager.h
Просмотреть файл

@ -8,6 +8,7 @@
#include "User_WinRT.h"
#endif
#include "xsapi/mem.h"
#include "xsapi/types.h"
namespace xbox { namespace services {
namespace system {
@ -15,12 +16,6 @@ namespace xbox { namespace services {
}
}}
#if TV_API
typedef Windows::Xbox::System::User^ xbox_live_user_t;
#else
typedef std::shared_ptr<xbox::services::system::xbox_live_user> xbox_live_user_t;
#endif
namespace xbox {
namespace services {

11
Include/xsapi/stats_manager.h
Просмотреть файл

@ -6,15 +6,10 @@
#include "xsapi/social.h"
#include "xsapi/user_statistics.h"
#include "xsapi/achievements.h"
#include "xsapi/types.h"
namespace xbox { namespace services { namespace stats { namespace manager {
#if TV_API
typedef Windows::Xbox::System::User^ xbox_live_user_t;
#else
typedef std::shared_ptr<xbox::services::system::xbox_live_user> xbox_live_user_t;
#endif
class stats_manager_impl;
static const uint8_t STAT_PRESENCE_CHARS_NUM = 64;
@ -119,8 +114,8 @@ private:
);
void set_name(
_In_ const string_t& name
);
_In_ const string_t& name
);
web::json::value serialize() const;

7
Include/xsapi/system.h
Просмотреть файл

@ -187,6 +187,8 @@ private:
friend class xsapi_memory;
};
#if XSAPI_NONXDK_CPP_AUTH || XSAPI_NONXDK_WINRT_AUTH
/// <summary>
/// Contains information about the authorization token and digital signature for an HTTP request by a user.
/// This class is returned as the result of a call to xbox_live_user.get_token_and_signature().
@ -316,8 +318,6 @@ private:
#endif
};
#if !TV_API
/// <summary>
/// Enumeration values that indicate the result status of sign in.
/// </summary>
@ -685,7 +685,8 @@ private:
std::shared_ptr<user_impl> m_user_impl;
};
#endif //!TV_API
#endif // XSAPI_NONXDK_CPP_AUTH || XSAPI_NONXDK_WINRT_AUTH
/// <summary>Enumeration values that indicate the result code from string verification.
/// These values are defined on the service side and should not be modified.

47
Include/xsapi/types.h
Просмотреть файл

@ -102,16 +102,43 @@ typedef std::chrono::system_clock chrono_clock_t;
typedef std::chrono::steady_clock chrono_clock_t;
#endif
// Forward declarations
// Forward declarations
namespace xbox {
namespace services {
class user_context;
class xbox_live_context_settings;
class local_config;
namespace system {
class xbox_live_user;
}
}
}
#if !XSAPI_CPP || UNIT_TEST_SERVICES
namespace Microsoft {
namespace Xbox {
namespace Services {
namespace System {
ref class XboxLiveUser;
}
}
}
}
#endif
#if TV_API
#define XSAPI_XDK_AUTH 1
#endif
#if TV_API && defined(XSAPI_CPPWINRT)
#define XSAPI_XDK_AUTH_WITH_CPPWINRT 1
#endif
#if !TV_API && XSAPI_CPP // Non-XDK C++
#define XSAPI_NONXDK_CPP_AUTH 1
#endif
#if !TV_API && (!XSAPI_CPP || UNIT_TEST_SERVICES) // Non-XDK WinRT
#define XSAPI_NONXDK_WINRT_AUTH 1
#endif
#if !TV_API
// SSL client certificate context
#ifdef _WIN32
@ -126,13 +153,23 @@ typedef boost::asio::ssl::context* cert_context;
#endif
#if UWP_API || UNIT_TEST_SERVICES
typedef Windows::System::User^ user_creation_context;
typedef Windows::System::User^ user_creation_context;
#else
typedef void* user_creation_context;
typedef void* user_creation_context;
#endif
#if !XSAPI_CPP || UNIT_TEST_SERVICES
#if TV_API
typedef Windows::Xbox::System::User^ XboxLiveUser_t;
#else
typedef Microsoft::Xbox::Services::System::XboxLiveUser^ XboxLiveUser_t;
#endif
#endif
#if TV_API
typedef Windows::Xbox::System::User^ xbox_live_user_t;
typedef Windows::Xbox::System::User^ xbox_live_user_t;
#else
typedef std::shared_ptr<xbox::services::system::xbox_live_user> xbox_live_user_t;
#endif
#if defined(XSAPI_CPPWINRT)
@ -145,7 +182,7 @@ inline Windows::Xbox::System::User^ convert_user_to_cppcx(_In_ const winrt::Wind
inline std::vector<Windows::Xbox::System::User^> convert_user_vector_to_cppcx(
_In_ const std::vector<winrt::Windows::Xbox::System::User>& users
)
)
{
std::vector<Windows::Xbox::System::User^> cppCxUsers;
for (winrt::Windows::Xbox::System::User u : users)

44
Include/xsapi/xbox_live_context.h
Просмотреть файл

@ -33,8 +33,9 @@ class xbox_live_context_server_impl;
/// </summary>
class xbox_live_context
{
public:
#if TV_API
public:
#if XSAPI_XDK_AUTH
/// <summary>
/// Creates an xbox_live_context from a Windows::Xbox::System::User^
/// </summary>
@ -46,8 +47,24 @@ public:
/// Returns the associated system User
/// </summary>
_XSAPIIMP Windows::Xbox::System::User^ user();
#endif // XSAPI_XDK_AUTH
#elif XSAPI_CPP
#if XSAPI_XDK_AUTH_WITH_CPPWINRT
_XSAPIIMP xbox_live_context(
_In_ winrt::Windows::Xbox::System::User user
) : xbox_live_context(convert_user_to_cppcx(user))
{
}
inline winrt::Windows::Xbox::System::User user_cppwinrt()
{
winrt::Windows::Xbox::System::User cppWinrtUser(nullptr);
winrt::copy_from_abi(cppWinrtUser, reinterpret_cast<winrt::ABI::Windows::Xbox::System::IUser*>(user()));
return cppWinrtUser;
}
#endif // XSAPI_XDK_AUTH_WITH_CPPWINRT
#if XSAPI_NONXDK_CPP_AUTH && !UNIT_TEST_SERVICES
/// <summary>
/// Creates an xbox_live_context from a xbox_live_user
/// </summary>
@ -59,8 +76,9 @@ public:
/// Returns the associated system User.
/// </summary>
_XSAPIIMP std::shared_ptr<system::xbox_live_user> user();
#endif // XSAPI_NONXDK_CPP_AUTH
#else
#if XSAPI_NONXDK_WINRT_AUTH
/// <summary>
/// Creates an xbox_live_context from a Microsoft::Xbox::Services::System::XboxLiveUser^
/// </summary>
@ -72,7 +90,7 @@ public:
/// Returns the associated system XboxLiveUser.
/// </summary>
_XSAPIIMP Microsoft::Xbox::Services::System::XboxLiveUser^ user();
#endif
#endif // XSAPI_NONXDK_WINRT_AUTH
/// <summary>
/// Returns the current user's Xbox Live User ID.
@ -198,23 +216,9 @@ public:
/// </summary>
_XSAPIIMP entertainment_profile::entertainment_profile_list_service& entertainment_profile_list_service();
#endif // TV_API || UNIT_TEST_SERVICES
#endif // !defined(XBOX_LIVE_CREATORS_SDK)
#if TV_API && defined(XSAPI_CPPWINRT)
_XSAPIIMP xbox_live_context(
_In_ winrt::Windows::Xbox::System::User user
) : xbox_live_context(convert_user_to_cppcx(user))
{
}
inline winrt::Windows::Xbox::System::User user_cppwinrt()
{
winrt::Windows::Xbox::System::User cppWinrtUser(nullptr);
winrt::copy_from_abi(cppWinrtUser, reinterpret_cast<winrt::ABI::Windows::Xbox::System::IUser*>(user()));
return cppWinrtUser;
}
#endif // TV_API && defined(XSAPI_CPPWINRT)
private:
std::shared_ptr<xbox::services::xbox_live_context_impl> m_xboxLiveContextImpl;
};

10
Source/Services/Common/Desktop/XboxLiveContext_Desktop.cpp → Source/Services/Common/xbox_live_context.cpp
Просмотреть файл

@ -12,8 +12,8 @@
#endif
NAMESPACE_MICROSOFT_XBOX_SERVICES_CPP_BEGIN
#if TV_API
#if XSAPI_XDK_AUTH
xbox_live_context::xbox_live_context(
_In_ Windows::Xbox::System::User^ user
)
@ -27,9 +27,9 @@ xbox_live_context::user()
{
return m_xboxLiveContextImpl->user();
}
#endif
#elif XSAPI_CPP
#if XSAPI_NONXDK_CPP_AUTH && !UNIT_TEST_SERVICES
xbox_live_context::xbox_live_context(
_In_ std::shared_ptr<system::xbox_live_user> user
)
@ -44,8 +44,9 @@ xbox_live_context::user()
{
return m_xboxLiveContextImpl->user();
}
#endif
#else
#if XSAPI_NONXDK_WINRT_AUTH
xbox_live_context::xbox_live_context(
_In_ Microsoft::Xbox::Services::System::XboxLiveUser^ user
)
@ -59,6 +60,7 @@ xbox_live_context::user()
{
return m_xboxLiveContextImpl->user();
}
#endif
const string_t& xbox_live_context::xbox_live_user_id()

78
Source/Services/Common/xbox_live_context_impl.cpp
Просмотреть файл

@ -16,8 +16,7 @@
NAMESPACE_MICROSOFT_XBOX_SERVICES_CPP_BEGIN
#if TV_API
#if XSAPI_XDK_AUTH
xbox_live_context_impl::xbox_live_context_impl(
_In_ Windows::Xbox::System::User^ user
) :
@ -32,9 +31,9 @@ xbox_live_context_impl::user()
{
return m_userContext->user();
}
#endif
#else
#if XSAPI_NONXDK_CPP_AUTH && !UNIT_TEST_SERVICES
xbox_live_context_impl::xbox_live_context_impl(
_In_ std::shared_ptr<system::xbox_live_user> user
) :
@ -45,14 +44,24 @@ xbox_live_context_impl::xbox_live_context_impl(
m_userContext = std::make_shared<xbox::services::user_context>(user);
}
#if XSAPI_CPP
std::shared_ptr<system::xbox_live_user>
xbox_live_context_impl::user()
{
return m_userContext->user();
}
#endif
#if XSAPI_NONXDK_WINRT_AUTH
xbox_live_context_impl::xbox_live_context_impl(
_In_ std::shared_ptr<system::xbox_live_user> user
) :
m_signInContext(0),
m_signOutContext(0)
{
user->_User_impl()->set_user_pointer(user);
m_userContext = std::make_shared<xbox::services::user_context>(user);
}
#else
xbox_live_context_impl::xbox_live_context_impl(
_In_ Microsoft::Xbox::Services::System::XboxLiveUser^ user
) :
@ -68,32 +77,23 @@ xbox_live_context_impl::user()
return m_userContext->user();
}
#endif
#endif
xbox_live_context_impl::~xbox_live_context_impl()
{
#if XSAPI_NONXDK_CPP_AUTH
if (m_userContext->user() != nullptr)
{
#if !TV_API && !UNIT_TEST_SERVICES
#if XSAPI_CPP
m_userContext->user()->_User_impl()->remove_sign_in_completed_handler(
auto userImpl = m_userContext->user()->_User_impl();
userImpl->remove_sign_in_completed_handler(
m_signInContext
);
m_userContext->user()->_User_impl()->remove_sign_out_completed_handler(
userImpl->remove_sign_out_completed_handler(
m_signOutContext
);
#else
m_userContext->user()->GetUserImpl()->remove_sign_in_completed_handler(
m_signInContext
);
m_userContext->user()->GetUserImpl()->remove_sign_out_completed_handler(
m_signOutContext
);
#endif
#endif
}
#endif
real_time_activity::real_time_activity_service_factory::get_singleton_instance()->remove_user_from_rta_map(m_userContext);
}
@ -104,7 +104,7 @@ void xbox_live_context_impl::init()
xbox_live_result<void> servicesConfigFileReadResult;
m_appConfig = xbox_live_app_config::get_app_config_singleton();
m_xboxLiveContextSettings = std::make_shared<xbox::services::xbox_live_context_settings>();
m_xboxLiveContextSettings = std::make_shared<xbox::services::xbox_live_context_settings>();
init_real_time_activity_service_instance();
#if UWP_API || TV_API
@ -143,7 +143,6 @@ m_xboxLiveContextSettings = std::make_shared<xbox::services::xbox_live_context_s
std::weak_ptr<xbox_live_context_impl> thisWeakPtr = shared_from_this();
m_profileService = xbox::services::social::profile_service(m_userContext, m_xboxLiveContextSettings, m_appConfig);
m_reputationService = xbox::services::social::reputation_service(m_userContext, m_xboxLiveContextSettings, m_appConfig);
m_leaderboardService = xbox::services::leaderboard::leaderboard_service(m_userContext, m_xboxLiveContextSettings, m_appConfig);
@ -161,7 +160,7 @@ m_xboxLiveContextSettings = std::make_shared<xbox::services::xbox_live_context_s
m_stringService = xbox::services::system::string_service(m_userContext, m_xboxLiveContextSettings, m_appConfig);
m_clubsService = xbox::services::clubs::clubs_service(m_userContext, m_xboxLiveContextSettings, m_appConfig);
#if UWP_API || XSAPI_U
#if (UWP_API || XSAPI_U)
m_eventsService = events::events_service(m_userContext, m_appConfig);
#endif
@ -171,7 +170,6 @@ m_xboxLiveContextSettings = std::make_shared<xbox::services::xbox_live_context_s
m_inventoryService = marketplace::inventory_service(m_userContext, m_xboxLiveContextSettings, m_appConfig);
m_entertainmentProfileService = entertainment_profile::entertainment_profile_list_service(m_userContext, m_xboxLiveContextSettings, m_appConfig);
#else
// Only start the presence writer on UAP
presence::presence_writer::get_presence_writer_singleton()->start_writer(m_presenceService._Impl());
@ -182,9 +180,10 @@ m_xboxLiveContextSettings = std::make_shared<xbox::services::xbox_live_context_s
m_appConfig
);
#if XSAPI_NONXDK_CPP_AUTH || XSAPI_NONXDK_WINRT_AUTH
if (m_userContext->user() != nullptr)
{
#if !TV_API && XSAPI_CPP
m_signInContext = m_userContext->user()->_User_impl()->add_sign_in_completed_handler(
[thisWeakPtr](const string_t& xboxUserId)
{
@ -205,32 +204,9 @@ m_xboxLiveContextSettings = std::make_shared<xbox::services::xbox_live_context_s
presence::presence_writer::get_presence_writer_singleton()->stop_writer(pThis->xbox_live_user_id());
}
});
#elif !TV_API
m_signInContext = m_userContext->user()->GetUserImpl()->add_sign_in_completed_handler(
[thisWeakPtr](const string_t& xboxUserId)
{
std::shared_ptr<xbox_live_context_impl> pThis(thisWeakPtr.lock());
if (pThis != nullptr && utils::str_icmp(pThis->xbox_live_user_id(), xboxUserId) == 0)
{
presence::presence_writer::get_presence_writer_singleton()->start_writer(pThis->m_presenceService._Impl());
}
});
m_signOutContext = m_userContext->user()->GetUserImpl()->add_sign_out_completed_handler(
[thisWeakPtr](const system::sign_out_completed_event_args& args)
{
UNREFERENCED_PARAMETER(args);
std::shared_ptr<xbox_live_context_impl> pThis(thisWeakPtr.lock());
if (pThis != nullptr)
{
pThis->real_time_activity_service()->_Close_websocket();
presence::presence_writer::get_presence_writer_singleton()->stop_writer(pThis->xbox_live_user_id());
}
});
#endif
}
#endif
#endif
}
std::shared_ptr<user_context> xbox_live_context_impl::user_context()
@ -358,7 +334,7 @@ xbox_live_context_impl::clubs_service()
return m_clubsService;
}
#if UWP_API || XSAPI_U
#if (UWP_API || XSAPI_U)
events::events_service&
xbox_live_context_impl::events_service()
{

51
Source/Services/Common/xbox_live_context_impl.h
Просмотреть файл

@ -5,14 +5,13 @@
#include <mutex>
#include "xsapi/services.h"
#if !TV_API
#if !XSAPI_CPP
#include "User_WinRT.h"
#else
#include "xsapi/system.h"
#if !XSAPI_CPP
#include "User_WinRT.h"
#else
#include "xsapi/system.h"
#endif
#endif
#endif
NAMESPACE_MICROSOFT_XBOX_SERVICES_CPP_BEGIN
@ -20,38 +19,22 @@ class xbox_live_context_impl : public std::enable_shared_from_this < xbox_live_c
{
public:
#if TV_API
xbox_live_context_impl(
_In_ Windows::Xbox::System::User^ user
);
/// <summary>
/// Returns the associated system User
/// </summary>
#if XSAPI_XDK_AUTH
xbox_live_context_impl(_In_ Windows::Xbox::System::User^ user);
Windows::Xbox::System::User^ user();
#endif
#else
xbox_live_context_impl(
_In_ std::shared_ptr<system::xbox_live_user> user
);
#if XSAPI_CPP
/// <summary>
/// Returns the associated system User.
/// </summary>
#if XSAPI_NONXDK_CPP_AUTH && !UNIT_TEST_SERVICES
xbox_live_context_impl(_In_ std::shared_ptr<system::xbox_live_user> user);
std::shared_ptr<system::xbox_live_user> user();
#endif
#else
xbox_live_context_impl(
_In_ Microsoft::Xbox::Services::System::XboxLiveUser^ user
);
/// <summary>
/// Returns the associated system XboxLiveUser.
/// </summary>
#if XSAPI_NONXDK_WINRT_AUTH
xbox_live_context_impl(_In_ std::shared_ptr<system::xbox_live_user> user); // also supports C++ class
xbox_live_context_impl(_In_ Microsoft::Xbox::Services::System::XboxLiveUser^ user);
Microsoft::Xbox::Services::System::XboxLiveUser^ user();
#endif
#endif
~xbox_live_context_impl();
/// <summary>
@ -159,7 +142,7 @@ public:
/// </summary>
clubs::clubs_service& clubs_service();
#if UWP_API || XSAPI_U
#if (UWP_API || XSAPI_U)
/// <summary>
/// A service used to write in game events.
/// </summary>
@ -209,7 +192,7 @@ private:
system::string_service m_stringService;
clubs::clubs_service m_clubsService;
#if UWP_API || XSAPI_U
#if (UWP_API || XSAPI_U)
events::events_service m_eventsService;
#endif
#if TV_API || UNIT_TEST_SERVICES

77
Source/Services/Events/events_service.cpp → Source/Services/Events/events_service_uwp.cpp
Просмотреть файл

@ -2,19 +2,15 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
#include "pch.h"
#if !UNIT_TEST_SERVICES
#if !UNIT_TEST_SERVICES && UWP_API
#include "xsapi/events.h"
#include "xbox_system_factory.h"
#include "utils.h"
#include "user_context.h"
#if XSAPI_A
#include "a/user_impl_a.h"
#include "a/java_interop.h"
#elif XSAPI_I
#include "xbox_cll.h"
#endif
#if UWP_API
#include "service_call_logger_data.h"
#include "service_call_logger.h"
#include <initguid.h>
#include <regex>
#include <debugapi.h>
@ -34,7 +30,6 @@ DEFINE_GUID(GUID_LOGGING_CHANNEL,
#define XBOX_LIVE_LOGGING_OPTIONS 0x0000800000000000
#define XBOX_LIVE_LOGGING_TAGS 0x00B00000
#endif
using namespace xbox::services::system;
@ -49,7 +44,6 @@ events_service::events_service(
m_appConfig(std::move(appConfig))
{
m_playSession = utils::create_guid(true).c_str();
#if UWP_API
m_loggingOptions = ref new LoggingOptions(XBOX_LIVE_LOGGING_OPTIONS);
m_loggingOptions->Tags = XBOX_LIVE_LOGGING_TAGS;
@ -63,7 +57,6 @@ events_service::events_service(
Guid(GUID_LOGGING_CHANNEL));
m_appInsightsKey = load_app_insights_key();
#endif
}
xbox_live_result<void>
@ -77,15 +70,11 @@ events_service::write_in_game_event(
_In_ const string_t& eventName,
_In_ const web::json::value& dimensions,
_In_ const web::json::value& measurements
)
)
{
try
{
#if XSAPI_CPP
if (!m_userContext->user() || !m_userContext->user()->is_signed_in())
#else
if (!m_userContext->user() || !m_userContext->user()->IsSignedIn)
#endif
if (!m_userContext->is_signed_in())
{
return xbox_live_result<void>(xbox_live_error_code::auth_user_not_signed_in, "User must be signed in to call this API");
}
@ -98,7 +87,6 @@ events_service::write_in_game_event(
return xbox_live_result<void>(xbox_live_error_code::invalid_argument, "Invalid event name");
}
#ifdef _WIN32
//Log service call
if (xbox::services::service_call_logger::get_singleton_instance()->is_enabled())
{
@ -115,72 +103,25 @@ events_service::write_in_game_event(
tracker->log(logData.to_string());
}
#endif
#if UWP_API
auto fields = create_logging_field(eventName, dimensions, measurements);
m_loggingChannel->LogEvent(ref new String(eventName.c_str()), fields, LoggingLevel::Critical, m_loggingOptions);
#elif XSAPI_U
stringstream_t ss;
ss << m_appConfig->title_id();
web::json::value eventData;
eventData[_T("baseType")] = web::json::value::string(_T("Microsoft.XboxLive.InGame"));
web::json::value baseData;
baseData[_T("name")] = web::json::value::string(eventName.c_str());
baseData[_T("serviceConfigId")] = web::json::value::string(m_appConfig->scid().c_str());
baseData[_T("playerSessionId")] = web::json::value::string(m_playSession.c_str());
baseData[_T("titleId")] = web::json::value::string(ss.str());
baseData[_T("userId")] = web::json::value::string(m_userContext->xbox_user_id().c_str());
baseData[_T("ver")] = web::json::value::number(1);
baseData[_T("properties")] = dimensions;
baseData[_T("measurements")] = measurements;
eventData[_T("baseData")] = baseData;
stringstream_t eventNameStream;
eventNameStream << "Microsoft.XboxLive.T" << ss.str() << "." << eventName;
#if XSAPI_A
std::shared_ptr<java_interop> interop = java_interop::get_java_interop_singleton();
if (interop)
{
interop->log_cll(m_userContext->xbox_user_id(), eventNameStream.str(), eventData.serialize());
}
#elif XSAPI_I
std::shared_ptr<xbox_cll> cll = xbox_cll::get_xbox_cll_singleton();
std::vector<string_t> ids = { m_userContext->xbox_user_id() };
DarwinCll* iCll = static_cast<DarwinCll*>(cll->raw_cll().get());
if (iCll)
{
iCll->log(eventNameStream.str(),
eventData.serialize(),
cll::Latency::LatencyRealtime,
cll::Persistence::PersistenceCritical,
cll::Sensitivity::SensitivityNone,
cll::SampleRate_NoSampling,
ids);
}
#endif
#endif
}
catch (const std::exception& e)
{
xbox_live_error_code err = utils::convert_exception_to_xbox_live_error_code();
return xbox_live_result<void>(err, e.what());
}
#if UWP_API
catch (Platform::Exception^ e)
{
xbox_live_error_code errc = static_cast<xbox_live_error_code>(e->HResult);
return xbox_live_result<void>(errc, utility::conversions::to_utf8string(e->Message->Data()));
}
#endif
return xbox_live_result<void>();
}
#if UWP_API
void events_service::add_common_logging_field(_In_ Windows::Foundation::Diagnostics::LoggingFields^ fields)
{
fields->AddString("serviceConfigId", ref new String(m_appConfig->scid().c_str()));
@ -335,6 +276,6 @@ string_t events_service::load_app_insights_key()
return result;
}
#endif
NAMESPACE_MICROSOFT_XBOX_SERVICES_EVENTS_CPP_END
#endif
#endif // !UNIT_TEST_SERVICES && UWP_API

137
Source/Shared/http_call_impl.cpp
Просмотреть файл

@ -69,47 +69,6 @@ http_call_impl::http_call_impl(
{
}
#if XSAPI_U
pplx::task<std::shared_ptr<http_call_response>>
http_call_impl::get_response(
_In_ std::shared_ptr<system::ecdsa> proofKey,
_In_ const system::signature_policy& signaturePolicy,
_In_ http_call_response_body_type httpCallResponseBodyType
)
{
m_httpCallData->request = get_default_request();
std::string body;
if (proofKey->pub_key().x.size() != 0 || proofKey->pub_key().y.size() != 0)
{
std::vector<unsigned char> bodyData;
if (m_httpCallData->requestBody.get_http_request_message_type() == http_request_message_type::vector_message)
{
bodyData = m_httpCallData->requestBody.request_message_vector();
}
else
{
body = utility::conversions::to_utf8string(m_httpCallData->requestBody.request_message_string());
bodyData.assign(body.begin(), body.end());
}
string_t signature = xbox::services::system::request_signer::sign_request(
*proofKey,
signaturePolicy,
utility::datetime::utc_now().to_interval(),
m_httpCallData->httpMethod,
utils::path_and_query_from_uri(m_httpCallData->request.request_uri()),
m_httpCallData->request.headers(),
bodyData
);
m_httpCallData->request.headers().add(_T("Signature"), signature);
}
return internal_get_response(m_httpCallData);
}
#endif
pplx::task<std::shared_ptr<http_call_response>>
http_call_impl::get_response(
_In_ http_call_response_body_type httpCallResponseBodyType
@ -133,37 +92,20 @@ http_call_impl::get_response(
return internal_get_response(m_httpCallData);
}
#if TV_API
pplx::task<std::shared_ptr<http_call_response>>
http_call_impl::get_response_with_auth(
#if XSAPI_XDK_AUTH // XDK
pplx::task<std::shared_ptr<http_call_response>> http_call_impl::get_response_with_auth(
_In_ Windows::Xbox::System::User^ user,
_In_ http_call_response_body_type httpCallResponseBodyType,
_In_ bool allUsersAuthRequired
)
{
auto userContext = std::make_shared<xbox::services::user_context>(user);
return get_response_with_auth(userContext, httpCallResponseBodyType, allUsersAuthRequired);
}
#elif UNIT_TEST_SERVICES || !XSAPI_CPP
pplx::task<std::shared_ptr<http_call_response>>
http_call_impl::get_response_with_auth(
_In_ Microsoft::Xbox::Services::System::XboxLiveUser^ user,
_In_ http_call_response_body_type httpCallResponseBodyType,
_In_ bool allUsersAuthRequired
)
{
auto userContext = std::make_shared<xbox::services::user_context>(user);
return get_response_with_auth(userContext, httpCallResponseBodyType, allUsersAuthRequired);
}
#else
pplx::task<std::shared_ptr<http_call_response>>
http_call_impl::get_response_with_auth(
#endif
#if XSAPI_NONXDK_CPP_AUTH
pplx::task<std::shared_ptr<http_call_response>> http_call_impl::get_response_with_auth(
_In_ std::shared_ptr<system::xbox_live_user> user,
_In_ http_call_response_body_type httpCallResponseBodyType,
_In_ bool allUsersAuthRequired
@ -172,9 +114,21 @@ http_call_impl::get_response_with_auth(
auto userContext = std::make_shared<xbox::services::user_context>(user);
return get_response_with_auth(userContext, httpCallResponseBodyType, allUsersAuthRequired);
}
#endif
#if XSAPI_NONXDK_WINRT_AUTH
pplx::task<std::shared_ptr<http_call_response>> http_call_impl::get_response_with_auth(
_In_ Microsoft::Xbox::Services::System::XboxLiveUser^ user,
_In_ http_call_response_body_type httpCallResponseBodyType,
_In_ bool allUsersAuthRequired
)
{
auto userContext = std::make_shared<xbox::services::user_context>(user);
return get_response_with_auth(userContext, httpCallResponseBodyType, allUsersAuthRequired);
}
#endif
pplx::task<std::shared_ptr<http_call_response>>
http_call_impl::get_response_with_auth(
_In_ const std::shared_ptr<user_context>& userContext,
@ -187,18 +141,13 @@ http_call_impl::get_response_with_auth(
m_httpCallData->request = get_default_request();
string_t fullUrl = m_httpCallData->serverName + m_httpCallData->request.request_uri().to_string();
#if !TV_API
#if XSAPI_CPP
if (!m_httpCallData->userContext->user() || !m_httpCallData->userContext->user()->is_signed_in())
#else
if (!userContext->user() || !userContext->user()->IsSignedIn)
#endif
if (!m_httpCallData->userContext->is_signed_in())
{
auto httpCallResponse = get_http_call_response(m_httpCallData, http_response());
handle_response_error(httpCallResponse, xbox_live_error_code::auth_user_not_signed_in, "User must be signed in to call this API", http_response());
return pplx::task_from_result<std::shared_ptr<http_call_response>>(httpCallResponse);
}
#endif
return _Internal_get_response_with_auth(
userContext,
@ -207,6 +156,7 @@ http_call_impl::get_response_with_auth(
);
}
#if XSAPI_U
pplx::task<std::shared_ptr<http_call_response>>
http_call_impl::get_response_with_auth(
@ -240,6 +190,49 @@ http_call_impl::get_response_with_auth(
}
#endif
#if XSAPI_U
pplx::task<std::shared_ptr<http_call_response>>
http_call_impl::get_response(
_In_ std::shared_ptr<system::ecdsa> proofKey,
_In_ const system::signature_policy& signaturePolicy,
_In_ http_call_response_body_type httpCallResponseBodyType
)
{
m_httpCallData->request = get_default_request();
std::string body;
if (proofKey->pub_key().x.size() != 0 || proofKey->pub_key().y.size() != 0)
{
std::vector<unsigned char> bodyData;
if (m_httpCallData->requestBody.get_http_request_message_type() == http_request_message_type::vector_message)
{
bodyData = m_httpCallData->requestBody.request_message_vector();
}
else
{
body = utility::conversions::to_utf8string(m_httpCallData->requestBody.request_message_string());
bodyData.assign(body.begin(), body.end());
}
string_t signature = xbox::services::system::request_signer::sign_request(
*proofKey,
signaturePolicy,
utility::datetime::utc_now().to_interval(),
m_httpCallData->httpMethod,
utils::path_and_query_from_uri(m_httpCallData->request.request_uri()),
m_httpCallData->request.headers(),
bodyData
);
m_httpCallData->request.headers().add(_T("Signature"), signature);
}
return internal_get_response(m_httpCallData);
}
#endif
pplx::task<std::shared_ptr<http_call_response>>
http_call_impl::_Internal_get_response_with_auth(
_In_ const std::shared_ptr<user_context>& userContext,

46
Source/Shared/http_call_impl.h
Просмотреть файл

@ -246,43 +246,41 @@ public:
_In_ xbox_live_api xboxLiveApi
);
#if XSAPI_U
pplx::task<std::shared_ptr<http_call_response>> get_response(
_In_ std::shared_ptr<xbox::services::system::ecdsa> proofKey,
_In_ const xbox::services::system::signature_policy& signaturePolicy,
_In_ http_call_response_body_type httpCallResponseBodyType
) override;
#endif
pplx::task< std::shared_ptr<http_call_response> > get_response(
_In_ http_call_response_body_type httpCallResponseBodyType
) override;
#if TV_API
#if XSAPI_XDK_AUTH
pplx::task<std::shared_ptr<http_call_response>> get_response_with_auth(
_In_ Windows::Xbox::System::User^ user,
_In_ http_call_response_body_type httpCallResponseBodyType = http_call_response_body_type::json_body,
_In_ bool allUsersAuthRequired = false
) override;
#endif
#elif UNIT_TEST_SERVICES || !XSAPI_CPP
virtual pplx::task<std::shared_ptr<http_call_response>> get_response_with_auth(
_In_ Microsoft::Xbox::Services::System::XboxLiveUser^ user,
_In_ http_call_response_body_type httpCallResponseBodyType = http_call_response_body_type::json_body,
_In_ bool allUsersAuthRequired = false
) override;
#else
#if XSAPI_NONXDK_CPP_AUTH
pplx::task<std::shared_ptr<http_call_response>> get_response_with_auth(
_In_ std::shared_ptr<system::xbox_live_user> user,
_In_ http_call_response_body_type httpCallResponseBodyType = http_call_response_body_type::json_body,
_In_ bool allUsersAuthRequired = false
) override;
#endif
#if XSAPI_NONXDK_WINRT_AUTH
virtual pplx::task<std::shared_ptr<http_call_response>> get_response_with_auth(
_In_ Microsoft::Xbox::Services::System::XboxLiveUser^ user,
_In_ http_call_response_body_type httpCallResponseBodyType = http_call_response_body_type::json_body,
_In_ bool allUsersAuthRequired = false
) override;
#endif
#if XSAPI_U
pplx::task<std::shared_ptr<http_call_response>> get_response(
_In_ std::shared_ptr<xbox::services::system::ecdsa> proofKey,
_In_ const xbox::services::system::signature_policy& signaturePolicy,
_In_ http_call_response_body_type httpCallResponseBodyType
) override;
#endif
pplx::task< std::shared_ptr<http_call_response> > get_response(
_In_ http_call_response_body_type httpCallResponseBodyType
) override;
pplx::task<std::shared_ptr<http_call_response>> get_response(
_In_ http_call_response_body_type httpCallResponseBodyType,

378
Source/Shared/user_context.cpp
Просмотреть файл

@ -19,384 +19,6 @@ using namespace xbox::services::system;
NAMESPACE_MICROSOFT_XBOX_SERVICES_CPP_BEGIN
// XDK's Windows.* user object
#if TV_API
user_context::user_context(_In_ Windows::Xbox::System::User^ user) :
m_user(user),
m_callerContextType(xbox::services::caller_context_type::title)
{
XSAPI_ASSERT(m_user != nullptr);
if (m_user == nullptr)
{
m_xboxUserId = string_t();
}
m_xboxUserId = m_user->XboxUserId->Data();
}
Windows::Xbox::System::User^ user_context::user() const
{
return m_user;
}
pplx::task<xbox_live_result<user_context_auth_result>> user_context::get_auth_result(
_In_ const string_t& httpMethod,
_In_ const string_t& url,
_In_ const string_t& headers,
_In_ const string_t& requestBodyString,
_In_ bool allUsersAuthRequired
)
{
auto platformHttp = ref new String(httpMethod.c_str());
auto platformUrl = ref new String(url.c_str());
auto platformHeaders = ref new String(headers.c_str());
auto platformRequestBody = ref new String(requestBodyString.c_str());
pplx::task<Windows::Xbox::System::GetTokenAndSignatureResult^> asyncTask;
if(allUsersAuthRequired)
{
if(platformRequestBody == nullptr)
{
asyncTask = pplx::create_task([this, platformHttp, platformUrl, platformHeaders]()
{
return m_user->GetTokenAndSignatureForAllUsersAsync(
platformHttp,
platformUrl,
platformHeaders
);
});
}
else
{
asyncTask = pplx::create_task([this, platformHttp, platformUrl, platformHeaders, platformRequestBody]()
{
return m_user->GetTokenAndSignatureForAllUsersAsync(
platformHttp,
platformUrl,
platformHeaders,
platformRequestBody
);
});
}
}
else
{
if(platformRequestBody == nullptr)
{
asyncTask = pplx::create_task([this, platformHttp, platformUrl, platformHeaders]()
{
return m_user->GetTokenAndSignatureAsync(
platformHttp,
platformUrl,
platformHeaders
);
});
}
else
{
asyncTask = pplx::create_task([this, platformHttp, platformUrl, platformHeaders, platformRequestBody]()
{
return m_user->GetTokenAndSignatureAsync(
platformHttp,
platformUrl,
platformHeaders,
platformRequestBody
);
});
}
}
return asyncTask
.then([](pplx::task<Windows::Xbox::System::GetTokenAndSignatureResult^> result)
{
try
{
auto tokenAndSig = result.get();
user_context_auth_result userContextResult( tokenAndSig->Token->ToString()->Data(), tokenAndSig->Signature->ToString()->Data() );
return xbox_live_result<user_context_auth_result>(userContextResult);
}
catch(Exception^ ex)
{
xbox_live_error_code err = utils::convert_exception_to_xbox_live_error_code();
return xbox_live_result<user_context_auth_result>(err, "Failed getting auth token");
}
}, pplx::task_continuation_context::use_arbitrary());
}
pplx::task<xbox_live_result<user_context_auth_result>> user_context::get_auth_result(
_In_ const string_t& httpMethod,
_In_ const string_t& url,
_In_ const string_t& headers,
_In_ const std::vector<unsigned char>& requestBody,
_In_ bool allUsersAuthRequired
)
{
auto byteArr = ref new Array<unsigned char, 1U>(static_cast<uint32_t>(requestBody.size()));
memcpy(&byteArr->Data[0], &requestBody[0], requestBody.size());
pplx::task<Windows::Xbox::System::GetTokenAndSignatureResult^> asyncTask;
if(allUsersAuthRequired)
{
asyncTask = pplx::create_task([this, httpMethod, url, headers, byteArr]()
{
return m_user->GetTokenAndSignatureForAllUsersAsync(
ref new String(httpMethod.c_str()),
ref new String(url.c_str()),
ref new String(headers.c_str()),
byteArr
);
});
}
else
{
asyncTask = pplx::create_task([this, httpMethod, url, headers, byteArr]()
{
return m_user->GetTokenAndSignatureAsync(
ref new String(httpMethod.c_str()),
ref new String(url.c_str()),
ref new String(headers.c_str()),
byteArr
);
});
}
return asyncTask
.then([](pplx::task<Windows::Xbox::System::GetTokenAndSignatureResult^> result)
{
try
{
auto tokenAndSig = result.get();
user_context_auth_result userContextResult( tokenAndSig->Token->ToString()->Data(), tokenAndSig->Signature->ToString()->Data() );
return xbox_live_result<user_context_auth_result>(userContextResult);
}
catch(Exception^ ex)
{
xbox_live_error_code err = utils::convert_exception_to_xbox_live_error_code();
return xbox_live_result<user_context_auth_result>(err, "Failed getting auth token");
}
}, pplx::task_continuation_context::use_arbitrary());
}
// Console OS will auto refresh tokens, we don't need to do anything here.
pplx::task<xbox_live_result<void>> user_context::refresh_token()
{
return pplx::task_from_result(xbox_live_result<void>());
}
#elif XSAPI_CPP
user_context::user_context(_In_ std::shared_ptr< xbox::services::system::xbox_live_user > user) :
m_user(user),
m_callerContextType(xbox::services::caller_context_type::title)
{
XSAPI_ASSERT(user != nullptr);
m_xboxUserId = m_user->xbox_user_id();
}
std::shared_ptr< xbox::services::system::xbox_live_user > user_context::user()
{
return m_user;
}
pplx::task<xbox_live_result<user_context_auth_result> >
user_context::get_auth_result(
_In_ const string_t& httpMethod,
_In_ const string_t& url,
_In_ const string_t& headers,
_In_ const string_t& requestBodyString,
_In_ bool allUsersAuthRequired
)
{
UNREFERENCED_PARAMETER(allUsersAuthRequired);
pplx::task<xbox_live_result<token_and_signature_result>> tokenTask;
if (tokenTask._GetImpl() == nullptr && m_user != nullptr)
{
tokenTask = m_user->get_token_and_signature(httpMethod, url, headers, requestBodyString);
}
return tokenTask
.then([](xbox_live_result<xbox::services::system::token_and_signature_result> xblResult)
{
const auto& tokenResult = xblResult.payload();
user_context_auth_result userContextResult(tokenResult.token(), tokenResult.signature());
return xbox_live_result<user_context_auth_result>(userContextResult, xblResult.err(), xblResult.err_message());
});
}
pplx::task<xbox_live_result<user_context_auth_result>> user_context::get_auth_result(
_In_ const string_t& httpMethod,
_In_ const string_t& url,
_In_ const string_t& headers,
_In_ const std::vector<unsigned char>& requestBodyArray,
_In_ bool allUsersAuthRequired
)
{
UNREFERENCED_PARAMETER(allUsersAuthRequired);
pplx::task<xbox_live_result<token_and_signature_result>> tokenTask;
if (tokenTask._GetImpl() == nullptr && m_user != nullptr)
{
tokenTask = m_user->get_token_and_signature_array(httpMethod, url, headers, requestBodyArray);
}
return tokenTask
.then([](xbox_live_result<xbox::services::system::token_and_signature_result> xblResult)
{
const auto& tokenResult = xblResult.payload();
user_context_auth_result userContextResult(tokenResult.token(), tokenResult.signature());
return xbox_live_result<user_context_auth_result>(userContextResult, xblResult.err(), xblResult.err_message());
});
}
pplx::task<xbox_live_result<void>> user_context::refresh_token()
{
auto authConfig = m_user->_User_impl()->get_auth_config();
return m_user->_User_impl()->internal_get_token_and_signature(
_T("GET"),
authConfig->xbox_live_endpoint(),
string_t(),
string_t(),
std::vector<unsigned char>(),
false,
true)
.then([](xbox_live_result<token_and_signature_result> result)
{
if (!result.err())
{
return xbox_live_result<void>();
}
else
{
return xbox_live_result<void>(result.err(), result.err_message());
}
});
}
#else
user_context::user_context(_In_ XboxLiveUser^ user) :
m_user(user),
m_callerContextType(xbox::services::caller_context_type::title)
{
XSAPI_ASSERT(m_user != nullptr);
m_xboxUserId = m_user->XboxUserId->Data();
}
user_context::user_context(_In_ std::shared_ptr<xbox_live_user> user) :
m_user(user_context::user_convert(user)),
m_callerContextType(xbox::services::caller_context_type::title)
{
XSAPI_ASSERT(m_user != nullptr);
m_xboxUserId = m_user->XboxUserId->Data();
}
XboxLiveUser^ user_context::user() const
{
return m_user;
}
pplx::task<xbox_live_result<user_context_auth_result>> user_context::get_auth_result(
_In_ const string_t& httpMethod,
_In_ const string_t& url,
_In_ const string_t& headers,
_In_ const string_t& requestBodyString,
_In_ bool allUsersAuthRequired
)
{
UNREFERENCED_PARAMETER(allUsersAuthRequired);
auto asyncTask = pplx::create_task([this, httpMethod, url, headers, requestBodyString]()
{
return m_user->GetTokenAndSignatureAsync(
ref new String(httpMethod.c_str()),
ref new String(url.c_str()),
ref new String(headers.c_str()),
ref new String(requestBodyString.c_str())
);
});
return asyncTask
.then([](pplx::task<GetTokenAndSignatureResult^> t)
{
try
{
GetTokenAndSignatureResult^ result = t.get();
user_context_auth_result userContextResult(result->Token->Data(), result->Signature->Data());
return xbox_live_result<user_context_auth_result>(userContextResult);
}
catch (Exception^ ex)
{
xbox_live_error_code err = xbox::services::utils::convert_exception_to_xbox_live_error_code();
return xbox_live_result<user_context_auth_result>(err, "Failed getting auth token");
}
}, pplx::task_continuation_context::use_arbitrary());
}
pplx::task<xbox_live_result<user_context_auth_result>> user_context::get_auth_result(
_In_ const string_t& httpMethod,
_In_ const string_t& url,
_In_ const string_t& headers,
_In_ const std::vector<unsigned char>& requestBody,
_In_ bool allUsersAuthRequired
)
{
UNREFERENCED_PARAMETER(allUsersAuthRequired);
Array<byte>^ byteArray = ref new Array<byte>(static_cast<uint32_t>(requestBody.size()));
memcpy(&byteArray->Data[0], &requestBody[0], requestBody.size());
auto asyncTask = pplx::create_task([this, httpMethod, url, headers, byteArray]()
{
return m_user->GetTokenAndSignatureArrayAsync(
ref new String(httpMethod.c_str()),
ref new String(url.c_str()),
ref new String(headers.c_str()),
byteArray
);
});
return asyncTask
.then([](pplx::task<GetTokenAndSignatureResult^> t)
{
try
{
GetTokenAndSignatureResult^ result = t.get();
user_context_auth_result userContextResult(result->Token->Data(), result->Signature->Data());
return xbox_live_result<user_context_auth_result>(userContextResult);
}
catch (Exception^ ex)
{
xbox_live_error_code err = xbox::services::utils::convert_exception_to_xbox_live_error_code();
return xbox_live_result<user_context_auth_result>(err, "Failed getting auth token");
}
});
}
pplx::task<xbox_live_result<void>> user_context::refresh_token()
{
auto authConfig = m_user->GetUserImpl()->get_auth_config();
return m_user->GetUserImpl()->internal_get_token_and_signature(
_T("GET"),
authConfig->xbox_live_endpoint(),
string_t(),
string_t(),
std::vector<unsigned char>(),
false,
true)
.then([](xbox_live_result<token_and_signature_result> result)
{
if (!result.err())
{
return xbox_live_result<void>();
}
else
{
return xbox_live_result<void>(result.err(), result.err_message());
}
});
}
#endif
const string_t&
user_context::caller_context() const
{

99
Source/Shared/user_context.h
Просмотреть файл

@ -4,29 +4,14 @@
#pragma once
#if !TV_API
#if !XSAPI_CPP
// This header is required for C++ Microsoft.* user object
#include "User_WinRT.h"
#else
#include "xsapi/system.h"
#endif
#endif
#if !XSAPI_CPP
#if TV_API
typedef Windows::Xbox::System::User^ XboxLiveUser_t;
#else
typedef Microsoft::Xbox::Services::System::XboxLiveUser^ XboxLiveUser_t;
#endif
#endif
#if TV_API
typedef Windows::Xbox::System::User^ xbox_live_user_t;
#else
typedef std::shared_ptr<xbox::services::system::xbox_live_user> xbox_live_user_t;
#if !XSAPI_CPP
// This header is required for C++ Microsoft.* user object
#include "User_WinRT.h"
#else
#include "xsapi/system.h"
#endif
#endif
#include "xsapi/types.h"
NAMESPACE_MICROSOFT_XBOX_SERVICES_CPP_BEGIN
@ -66,6 +51,8 @@ public:
caller_context_type caller_context_type() const;
void set_caller_context_type(xbox::services::caller_context_type context);
bool is_signed_in() const;
pplx::task<xbox::services::xbox_live_result<user_context_auth_result>> get_auth_result(
_In_ const string_t& httpMethod,
_In_ const string_t& url,
@ -93,52 +80,56 @@ public:
return user->xbox_user_id();
#endif
}
#if !XSAPI_CPP
#if TV_API
#if XSAPI_XDK_AUTH
public:
static Windows::Xbox::System::User^ user_convert(Windows::Xbox::System::User^ user)
{
return user;
}
#else
// XDK's Windows.* user object
public:
user_context(_In_ Windows::Xbox::System::User^ user);
Windows::Xbox::System::User^ user() const;
private:
Windows::Xbox::System::User^ m_user;
#endif
#if XSAPI_NONXDK_CPP_AUTH && !UNIT_TEST_SERVICES
// C++ Microsoft.* user object
public:
user_context(_In_ std::shared_ptr< xbox::services::system::xbox_live_user > user);
std::shared_ptr< xbox::services::system::xbox_live_user > user() const;
private:
std::shared_ptr< xbox::services::system::xbox_live_user > m_user;
#endif
#if XSAPI_NONXDK_WINRT_AUTH
static std::shared_ptr<xbox::services::system::xbox_live_user> user_convert(Microsoft::Xbox::Services::System::XboxLiveUser^ user)
{
return std::make_shared<xbox::services::system::xbox_live_user>(user->GetUserImpl());
return std::make_shared<xbox::services::system::xbox_live_user>(user->_User_impl());
}
static Microsoft::Xbox::Services::System::XboxLiveUser^ user_convert(std::shared_ptr<xbox::services::system::xbox_live_user> user)
{
return ref new Microsoft::Xbox::Services::System::XboxLiveUser(user->_User_impl());
}
#endif
// WinRT Microsoft.* user object
public:
user_context(_In_ std::shared_ptr< xbox::services::system::xbox_live_user > user);
user_context(_In_ Microsoft::Xbox::Services::System::XboxLiveUser^ user);
Microsoft::Xbox::Services::System::XboxLiveUser^ user() const;
private:
Microsoft::Xbox::Services::System::XboxLiveUser^ m_user;
#endif
#if TV_API
// XDK's Windows.* user object
public:
user_context(_In_ Windows::Xbox::System::User^ user);
Windows::Xbox::System::User^ user() const;
private:
Windows::Xbox::System::User^ m_user;
#elif XSAPI_CPP
// C++ Microsoft.* user object
public:
user_context(_In_ std::shared_ptr< xbox::services::system::xbox_live_user > user);
std::shared_ptr< xbox::services::system::xbox_live_user > user();
private:
std::shared_ptr< xbox::services::system::xbox_live_user > m_user;
#else
// WinRT Microsoft.* user object
public:
user_context(_In_ std::shared_ptr< xbox::services::system::xbox_live_user > user);
user_context(_In_ Microsoft::Xbox::Services::System::XboxLiveUser^ user);
Microsoft::Xbox::Services::System::XboxLiveUser^ user() const;
private:
Microsoft::Xbox::Services::System::XboxLiveUser^ m_user;
#endif
private:
string_t m_xboxUserId;

124
Source/Shared/user_context_cpp.cpp Normal file
Просмотреть файл

@ -0,0 +1,124 @@
// Copyright (c) Microsoft Corporation
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
#include "pch.h"
#include "xbox_system_factory.h"
#include "user_context.h"
#include "shared_macros.h"
#include "xsapi/system.h"
#include "xsapi/types.h"
#if defined __cplusplus_winrt
using namespace Platform;
using namespace Windows::Foundation::Collections;
#if !XSAPI_CPP
using namespace Microsoft::Xbox::Services::System;
#endif
#endif
using namespace xbox::services::system;
#if !XSAPI_WIN32 && !TV_API && XSAPI_CPP && !UNIT_TEST_SERVICES // Non-XDK C++
NAMESPACE_MICROSOFT_XBOX_SERVICES_CPP_BEGIN
user_context::user_context(_In_ std::shared_ptr< xbox::services::system::xbox_live_user > user) :
m_user(user),
m_callerContextType(xbox::services::caller_context_type::title)
{
XSAPI_ASSERT(user != nullptr);
m_xboxUserId = m_user->xbox_user_id();
}
std::shared_ptr< xbox::services::system::xbox_live_user > user_context::user() const
{
return m_user;
}
pplx::task<xbox_live_result<user_context_auth_result> >
user_context::get_auth_result(
_In_ const string_t& httpMethod,
_In_ const string_t& url,
_In_ const string_t& headers,
_In_ const string_t& requestBodyString,
_In_ bool allUsersAuthRequired
)
{
UNREFERENCED_PARAMETER(allUsersAuthRequired);
pplx::task<xbox_live_result<token_and_signature_result>> tokenTask;
if (tokenTask._GetImpl() == nullptr && m_user != nullptr)
{
tokenTask = m_user->get_token_and_signature(httpMethod, url, headers, requestBodyString);
}
return tokenTask
.then([](xbox_live_result<xbox::services::system::token_and_signature_result> xblResult)
{
const auto& tokenResult = xblResult.payload();
user_context_auth_result userContextResult(tokenResult.token(), tokenResult.signature());
return xbox_live_result<user_context_auth_result>(userContextResult, xblResult.err(), xblResult.err_message());
});
}
pplx::task<xbox_live_result<user_context_auth_result>> user_context::get_auth_result(
_In_ const string_t& httpMethod,
_In_ const string_t& url,
_In_ const string_t& headers,
_In_ const std::vector<unsigned char>& requestBodyArray,
_In_ bool allUsersAuthRequired
)
{
UNREFERENCED_PARAMETER(allUsersAuthRequired);
pplx::task<xbox_live_result<token_and_signature_result>> tokenTask;
if (tokenTask._GetImpl() == nullptr && m_user != nullptr)
{
tokenTask = m_user->get_token_and_signature_array(httpMethod, url, headers, requestBodyArray);
}
return tokenTask
.then([](xbox_live_result<xbox::services::system::token_and_signature_result> xblResult)
{
const auto& tokenResult = xblResult.payload();
user_context_auth_result userContextResult(tokenResult.token(), tokenResult.signature());
return xbox_live_result<user_context_auth_result>(userContextResult, xblResult.err(), xblResult.err_message());
});
}
pplx::task<xbox_live_result<void>> user_context::refresh_token()
{
auto authConfig = m_user->_User_impl()->get_auth_config();
return m_user->_User_impl()->internal_get_token_and_signature(
_T("GET"),
authConfig->xbox_live_endpoint(),
string_t(),
string_t(),
std::vector<unsigned char>(),
false,
true)
.then([](xbox_live_result<token_and_signature_result> result)
{
if (!result.err())
{
return xbox_live_result<void>();
}
else
{
return xbox_live_result<void>(result.err(), result.err_message());
}
});
}
bool user_context::is_signed_in() const
{
if (!user()) return false;
return user()->is_signed_in();
}
NAMESPACE_MICROSOFT_XBOX_SERVICES_CPP_END
#endif

155
Source/Shared/user_context_winrt.cpp Normal file
Просмотреть файл

@ -0,0 +1,155 @@
// Copyright (c) Microsoft Corporation
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
#include "pch.h"
#include "xbox_system_factory.h"
#include "user_context.h"
#include "shared_macros.h"
#if defined __cplusplus_winrt
using namespace Platform;
using namespace Windows::Foundation::Collections;
#if !XSAPI_CPP
using namespace Microsoft::Xbox::Services::System;
#endif
#endif
using namespace xbox::services::system;
#if !TV_API && !XSAPI_CPP // Non-XDK WinRT
NAMESPACE_MICROSOFT_XBOX_SERVICES_CPP_BEGIN
// XDK's Windows.* user object
user_context::user_context(_In_ XboxLiveUser^ user) :
m_user(user),
m_callerContextType(xbox::services::caller_context_type::title)
{
XSAPI_ASSERT(m_user != nullptr);
m_xboxUserId = m_user->XboxUserId->Data();
}
user_context::user_context(_In_ std::shared_ptr<xbox_live_user> user) :
m_user(user_context::user_convert(user)),
m_callerContextType(xbox::services::caller_context_type::title)
{
XSAPI_ASSERT(m_user != nullptr);
m_xboxUserId = m_user->XboxUserId->Data();
}
XboxLiveUser^ user_context::user() const
{
return m_user;
}
pplx::task<xbox_live_result<user_context_auth_result>> user_context::get_auth_result(
_In_ const string_t& httpMethod,
_In_ const string_t& url,
_In_ const string_t& headers,
_In_ const string_t& requestBodyString,
_In_ bool allUsersAuthRequired
)
{
UNREFERENCED_PARAMETER(allUsersAuthRequired);
auto asyncTask = pplx::create_task([this, httpMethod, url, headers, requestBodyString]()
{
return m_user->GetTokenAndSignatureAsync(
ref new String(httpMethod.c_str()),
ref new String(url.c_str()),
ref new String(headers.c_str()),
ref new String(requestBodyString.c_str())
);
});
return asyncTask
.then([](pplx::task<GetTokenAndSignatureResult^> t)
{
try
{
GetTokenAndSignatureResult^ result = t.get();
user_context_auth_result userContextResult(result->Token->Data(), result->Signature->Data());
return xbox_live_result<user_context_auth_result>(userContextResult);
}
catch (Exception^ ex)
{
xbox_live_error_code err = xbox::services::utils::convert_exception_to_xbox_live_error_code();
return xbox_live_result<user_context_auth_result>(err, "Failed getting auth token");
}
}, pplx::task_continuation_context::use_arbitrary());
}
pplx::task<xbox_live_result<user_context_auth_result>> user_context::get_auth_result(
_In_ const string_t& httpMethod,
_In_ const string_t& url,
_In_ const string_t& headers,
_In_ const std::vector<unsigned char>& requestBody,
_In_ bool allUsersAuthRequired
)
{
UNREFERENCED_PARAMETER(allUsersAuthRequired);
Array<byte>^ byteArray = ref new Array<byte>(static_cast<uint32_t>(requestBody.size()));
memcpy(&byteArray->Data[0], &requestBody[0], requestBody.size());
auto asyncTask = pplx::create_task([this, httpMethod, url, headers, byteArray]()
{
return m_user->GetTokenAndSignatureArrayAsync(
ref new String(httpMethod.c_str()),
ref new String(url.c_str()),
ref new String(headers.c_str()),
byteArray
);
});
return asyncTask
.then([](pplx::task<GetTokenAndSignatureResult^> t)
{
try
{
GetTokenAndSignatureResult^ result = t.get();
user_context_auth_result userContextResult(result->Token->Data(), result->Signature->Data());
return xbox_live_result<user_context_auth_result>(userContextResult);
}
catch (Exception^ ex)
{
xbox_live_error_code err = xbox::services::utils::convert_exception_to_xbox_live_error_code();
return xbox_live_result<user_context_auth_result>(err, "Failed getting auth token");
}
});
}
pplx::task<xbox_live_result<void>> user_context::refresh_token()
{
auto authConfig = m_user->_User_impl()->get_auth_config();
return m_user->_User_impl()->internal_get_token_and_signature(
_T("GET"),
authConfig->xbox_live_endpoint(),
string_t(),
string_t(),
std::vector<unsigned char>(),
false,
true)
.then([](xbox_live_result<token_and_signature_result> result)
{
if (!result.err())
{
return xbox_live_result<void>();
}
else
{
return xbox_live_result<void>(result.err(), result.err_message());
}
});
}
bool user_context::is_signed_in() const
{
if (!user()) return false;
return user()->IsSignedIn;
}
NAMESPACE_MICROSOFT_XBOX_SERVICES_CPP_END
#endif

194
Source/Shared/user_context_xdk.cpp Normal file
Просмотреть файл

@ -0,0 +1,194 @@
// Copyright (c) Microsoft Corporation
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
#include "pch.h"
#include "xbox_system_factory.h"
#include "user_context.h"
#include "shared_macros.h"
#if defined __cplusplus_winrt
using namespace Platform;
using namespace Windows::Foundation::Collections;
#if !XSAPI_CPP
using namespace Microsoft::Xbox::Services::System;
#endif
#endif
using namespace xbox::services::system;
// XDK's Windows.* user object
#if TV_API
NAMESPACE_MICROSOFT_XBOX_SERVICES_CPP_BEGIN
user_context::user_context(_In_ Windows::Xbox::System::User^ user) :
m_user(user),
m_callerContextType(xbox::services::caller_context_type::title)
{
XSAPI_ASSERT(m_user != nullptr);
if (m_user == nullptr)
{
m_xboxUserId = string_t();
}
m_xboxUserId = m_user->XboxUserId->Data();
}
Windows::Xbox::System::User^ user_context::user() const
{
return m_user;
}
pplx::task<xbox_live_result<user_context_auth_result>> user_context::get_auth_result(
_In_ const string_t& httpMethod,
_In_ const string_t& url,
_In_ const string_t& headers,
_In_ const string_t& requestBodyString,
_In_ bool allUsersAuthRequired
)
{
auto platformHttp = ref new String(httpMethod.c_str());
auto platformUrl = ref new String(url.c_str());
auto platformHeaders = ref new String(headers.c_str());
auto platformRequestBody = ref new String(requestBodyString.c_str());
pplx::task<Windows::Xbox::System::GetTokenAndSignatureResult^> asyncTask;
if(allUsersAuthRequired)
{
if(platformRequestBody == nullptr)
{
asyncTask = pplx::create_task([this, platformHttp, platformUrl, platformHeaders]()
{
return m_user->GetTokenAndSignatureForAllUsersAsync(
platformHttp,
platformUrl,
platformHeaders
);
});
}
else
{
asyncTask = pplx::create_task([this, platformHttp, platformUrl, platformHeaders, platformRequestBody]()
{
return m_user->GetTokenAndSignatureForAllUsersAsync(
platformHttp,
platformUrl,
platformHeaders,
platformRequestBody
);
});
}
}
else
{
if(platformRequestBody == nullptr)
{
asyncTask = pplx::create_task([this, platformHttp, platformUrl, platformHeaders]()
{
return m_user->GetTokenAndSignatureAsync(
platformHttp,
platformUrl,
platformHeaders
);
});
}
else
{
asyncTask = pplx::create_task([this, platformHttp, platformUrl, platformHeaders, platformRequestBody]()
{
return m_user->GetTokenAndSignatureAsync(
platformHttp,
platformUrl,
platformHeaders,
platformRequestBody
);
});
}
}
return asyncTask
.then([](pplx::task<Windows::Xbox::System::GetTokenAndSignatureResult^> result)
{
try
{
auto tokenAndSig = result.get();
user_context_auth_result userContextResult( tokenAndSig->Token->ToString()->Data(), tokenAndSig->Signature->ToString()->Data() );
return xbox_live_result<user_context_auth_result>(userContextResult);
}
catch(Exception^ ex)
{
xbox_live_error_code err = utils::convert_exception_to_xbox_live_error_code();
return xbox_live_result<user_context_auth_result>(err, "Failed getting auth token");
}
}, pplx::task_continuation_context::use_arbitrary());
}
pplx::task<xbox_live_result<user_context_auth_result>> user_context::get_auth_result(
_In_ const string_t& httpMethod,
_In_ const string_t& url,
_In_ const string_t& headers,
_In_ const std::vector<unsigned char>& requestBody,
_In_ bool allUsersAuthRequired
)
{
auto byteArr = ref new Array<unsigned char, 1U>(static_cast<uint32_t>(requestBody.size()));
memcpy(&byteArr->Data[0], &requestBody[0], requestBody.size());
pplx::task<Windows::Xbox::System::GetTokenAndSignatureResult^> asyncTask;
if(allUsersAuthRequired)
{
asyncTask = pplx::create_task([this, httpMethod, url, headers, byteArr]()
{
return m_user->GetTokenAndSignatureForAllUsersAsync(
ref new String(httpMethod.c_str()),
ref new String(url.c_str()),
ref new String(headers.c_str()),
byteArr
);
});
}
else
{
asyncTask = pplx::create_task([this, httpMethod, url, headers, byteArr]()
{
return m_user->GetTokenAndSignatureAsync(
ref new String(httpMethod.c_str()),
ref new String(url.c_str()),
ref new String(headers.c_str()),
byteArr
);
});
}
return asyncTask
.then([](pplx::task<Windows::Xbox::System::GetTokenAndSignatureResult^> result)
{
try
{
auto tokenAndSig = result.get();
user_context_auth_result userContextResult( tokenAndSig->Token->ToString()->Data(), tokenAndSig->Signature->ToString()->Data() );
return xbox_live_result<user_context_auth_result>(userContextResult);
}
catch(Exception^ ex)
{
xbox_live_error_code err = utils::convert_exception_to_xbox_live_error_code();
return xbox_live_result<user_context_auth_result>(err, "Failed getting auth token");
}
}, pplx::task_continuation_context::use_arbitrary());
}
// Console OS will auto refresh tokens, we don't need to do anything here.
pplx::task<xbox_live_result<void>> user_context::refresh_token()
{
return pplx::task_from_result(xbox_live_result<void>());
}
bool user_context::is_signed_in() const
{
if (!user()) return false;
return user()->IsSignedIn;
}
NAMESPACE_MICROSOFT_XBOX_SERVICES_CPP_END
#endif

4
Source/System/WinRT/User_WinRT.cpp
Просмотреть файл

@ -92,7 +92,7 @@ XboxLiveUser::SignInAsync(
{
xbox_live_context_settings::_Set_dispatcher(coreDispatcherObj);
auto task = GetUserImpl()->sign_in_impl(true, false)
auto task = _User_impl()->sign_in_impl(true, false)
.then([](xbox_live_result<sign_in_result> t)
{
THROW_IF_ERR(t);
@ -109,7 +109,7 @@ XboxLiveUser::SignInSilentlyAsync(
{
xbox_live_context_settings::_Set_dispatcher(coreDispatcherObj);
auto task = GetUserImpl()->sign_in_impl(false, false)
auto task = _User_impl()->sign_in_impl(false, false)
.then([](xbox_live_result<sign_in_result> t)
{
THROW_IF_ERR(t);

2
Source/System/WinRT/User_WinRT.h
Просмотреть файл

@ -211,7 +211,7 @@ public:
internal:
XboxLiveUser(std::shared_ptr<xbox::services::system::user_impl> user_impl);
std::shared_ptr<xbox::services::system::user_impl> GetUserImpl()
std::shared_ptr<xbox::services::system::user_impl> _User_impl()
{
return m_cppObj;
}

61
Source/System/auth_config.cpp
Просмотреть файл

@ -63,22 +63,6 @@ auth_config::auth_config(
m_xtokenComposition = { token_identity_type::u_token, token_identity_type::d_token, token_identity_type::t_token };
}
#if XSAPI_U
bool auth_config::use_win10_auth() const
{
#if UWP_API || XSAPI_U
return true;
#else
return false;
#endif
}
bool auth_config::use_compact_ticket() const
{
return m_useCompactTicket;
}
#endif
const string_t& auth_config::rps_ticket_service() const
{
std::lock_guard<std::mutex> lock(m_mutex);
@ -107,7 +91,36 @@ void auth_config::set_rps_ticket_policy(
m_rpsTicketPolicy = std::move(value);
}
const string_t& auth_config::xbox_live_endpoint() const
{
std::lock_guard<std::mutex> lock(m_mutex);
return m_xboxLiveEndpoint;
}
void auth_config::set_xbox_live_endpoint(
_In_ string_t value
)
{
std::lock_guard<std::mutex> lock(m_mutex);
m_xboxLiveEndpoint = std::move(value);
}
#if XSAPI_U
bool auth_config::use_win10_auth() const
{
#if UWP_API || XSAPI_U
return true;
#else
return false;
#endif
}
bool auth_config::use_compact_ticket() const
{
return m_useCompactTicket;
}
const string_t& auth_config::environment() const
{
std::lock_guard<std::mutex> lock(m_mutex);
@ -197,23 +210,7 @@ void auth_config::set_xbox_live_relying_party(
std::lock_guard<std::mutex> lock(m_mutex);
m_xboxLiveRelyingParty = std::move(value);
}
#endif
const string_t& auth_config::xbox_live_endpoint() const
{
std::lock_guard<std::mutex> lock(m_mutex);
return m_xboxLiveEndpoint;
}
void auth_config::set_xbox_live_endpoint(
_In_ string_t value
)
{
std::lock_guard<std::mutex> lock(m_mutex);
m_xboxLiveEndpoint = std::move(value);
}
#if XSAPI_U
const string_t& auth_config::x_token_endpoint() const
{
std::lock_guard<std::mutex> lock(m_mutex);

3
Source/System/user_impl.cpp
Просмотреть файл

@ -261,9 +261,8 @@ void user_impl::user_signed_out()
}
}
bool user_impl::is_signed_in()
bool user_impl::is_signed_in() const
{
std::lock_guard<std::mutex> lock(m_lock.get());
return m_isSignedIn;
}

15
Source/System/user_impl.h
Просмотреть файл

@ -36,26 +36,23 @@ public:
return pplx::task_from_exception<xbox::services::xbox_live_result<void>>(std::exception());
}
// IUser
const string_t& xbox_user_id() { return m_xboxUserId; }
const string_t& gamertag() { return m_gamertag; }
const string_t& age_group() { return m_ageGroup; }
const string_t& privileges() { return m_privileges; }
#if XSAPI_U
const string_t& user_settings_restrictions() { return m_userSettingsRestrictions; }
const string_t& user_enforcement_restrictions() { return m_userEnforcementRestrictions; }
const string_t& user_title_restrictions() { return m_userTitleRestrictions; }
virtual void clear_token_cache() = 0;
void set_sign_in_options(std::shared_ptr<xbox_sign_in_options> options) { m_signInOptions = options; }
#endif
const string_t& web_account_id() { return m_webAccountId; }
std::shared_ptr<auth_config> get_auth_config() { return m_authConfig; }
const user_creation_context creation_context() { return m_creationContext; }
#if XSAPI_U
void set_sign_in_options(std::shared_ptr<xbox_sign_in_options> options) { m_signInOptions = options; }
#endif
#if UNIT_TEST_SERVICES
void _Set_xbox_user_id(const string_t& xboxUserId) { m_xboxUserId = xboxUserId; }
#endif
@ -83,7 +80,7 @@ public:
_In_ const std::vector<unsigned char>& requestBodyArray
);
bool is_signed_in();
bool is_signed_in() const;
void set_user_pointer(_In_ std::shared_ptr<system::xbox_live_user> user);
void set_title_telemetry_session_id(_In_ const string_t& sessionId);
const string_t& title_telemetry_session_id();
@ -130,15 +127,13 @@ protected:
string_t m_userSettingsRestrictions;
string_t m_userEnforcementRestrictions;
string_t m_userTitleRestrictions;
std::shared_ptr<xbox_sign_in_options> m_signInOptions;
#endif
string_t m_webAccountId;
string_t m_cid;
string_t m_titleTelemetrySessionId;
bool m_isSignedIn;
user_creation_context m_creationContext;
#if XSAPI_U
std::shared_ptr<xbox_sign_in_options> m_signInOptions;
#endif
std::weak_ptr<system::xbox_live_user> m_weakUserPtr;
std::shared_ptr<auth_config> m_authConfig;

68
Utilities/CMake/CMakeLists.txt
Просмотреть файл

@ -156,7 +156,7 @@ else()
endif()
set(Common_Source_Files
../../Source/Services/Common/Desktop/XboxLiveContext_Desktop.cpp
../../Source/Services/Common/xbox_live_context.cpp
../../Source/Services/Common/xbox_live_context_impl.cpp
../../Source/Services/Common/pch_Common.h
../../Source/Services/Common/xbox_live_context_impl.h
@ -220,6 +220,18 @@ if( UNITTEST )
)
endif()
set(Cpp_Shared_Source_Files
../../Source/Shared/user_context_cpp.cpp
)
set(WinRT_Shared_Source_Files
../../Source/Shared/user_context_winrt.cpp
)
set(XDK_Shared_Source_Files
../../Source/Shared/user_context_xdk.cpp
)
set(Shared_Source_Files
../../Source/Shared/WinRT/Event_WinRT.cpp
../../Source/Shared/WinRT/Event_WinRT.h
@ -304,8 +316,8 @@ set(Achievements_Source_Files
../../Source/Services/Achievements/achievement_title_association.cpp
)
set(Events_Source_Files
../../Source/Services/Events/Events_service.cpp
set(UWP_Events_Source_Files
../../Source/Services/Events/events_service_uwp.cpp
)
set(Leaderboard_Source_Files
@ -1150,6 +1162,7 @@ else()
if( XDK OR UNITTEST )
message(STATUS "XDK source group")
source_group("C++ Source\\Shared" FILES ${XDK_Shared_Source_Files})
source_group("C++ Source\\Services\\EntertainmentProfile" FILES ${EntertainmentProfile_Source_Files})
source_group("C++ Source\\Services\\Marketplace" FILES ${Marketplace_Source_Files})
@ -1161,9 +1174,17 @@ else()
endif()
else()
source_group("C++ Source\\System" FILES ${UWP_System_Source_Files})
source_group("C++ Source\\Services\\Misc" FILES ${UWP_Source_Files})
source_group("C++ Source\\Services\\Events" FILES ${Events_Source_Files})
if( WINRT OR UNITTEST )
source_group("C++ Source\\Shared" FILES ${Cpp_Shared_Source_Files})
source_group("C++ Source\\Services\\Misc" FILES ${UWP_Source_Files})
source_group("C++ Source\\Services\\Events" FILES ${UWP_Events_Source_Files})
if( PCWIN32 )
source_group("C++ Source\\Shared" FILES ${Xal_Shared_Source_Files})
source_group("C++ Source\\System" FILES ${Xal_System_Source_Files})
endif()
if( WINRT OR UNITTEST )
source_group("C++ Source\\Shared" FILES ${WinRT_Shared_Source_Files})
source_group("C++ Source\\Shared\\WinRT" FILES ${UWP_Shared_WinRT_Source_Files})
source_group("C++ Source\\System\\WinRT" FILES ${System_WinRT_Source_Files})
source_group("C++ Source\\Services\\Events\\WinRT" FILES ${Events_WinRT_Source_Files})
@ -1174,7 +1195,7 @@ else()
source_group("C++ Source\\Shared\\WinRT" FILES ${UWP_Shared_WinRT_Source_Files})
source_group("C++ Source\\System" FILES ${UWP_System_Source_Files})
source_group("C++ Source\\System\\WinRT" FILES ${System_WinRT_Source_Files})
source_group("C++ Source\\Services\\Events" FILES ${Events_Source_Files})
source_group("C++ Source\\Services\\Events" FILES ${UWP_Events_Source_Files})
source_group("C++ Source\\Services\\Misc" FILES ${UWP_Source_Files})
source_group("C++ Source\\Services\\Events\\WinRT" FILES ${Events_WinRT_Source_Files})
endif()
@ -1258,6 +1279,7 @@ else()
SOURCE_FILES
${EntertainmentProfile_Source_Files}
${Marketplace_Source_Files}
${XDK_Shared_Source_Files}
)
if( WINRT OR UNITTEST )
@ -1268,30 +1290,40 @@ else()
${XDK_WinRT_Shared_Source_Files}
)
endif() # WINRT
else()
list(APPEND
SOURCE_FILES
${UWP_System_Source_Files}
${Events_Source_Files}
${UWP_Source_Files}
)
if( UNITTEST )
list(APPEND
${Cpp_Shared_Source_Files}
${WinRT_Shared_Source_Files}
)
endif()
else()
list(APPEND
SOURCE_FILES
${Cpp_Shared_Source_Files}
${UWP_System_Source_Files}
${UWP_Events_Source_Files}
${UWP_Source_Files}
)
if( WINRT OR UNITTEST )
if( WINRT OR UNITTEST )
list(APPEND
SOURCE_FILES
${WinRT_Shared_Source_Files}
${UWP_Shared_WinRT_Source_Files}
${Events_WinRT_Source_Files}
${System_WinRT_Source_Files}
)
endif()
endif()
endif() # XDK
endif() # XDK
if( UNITTEST )
list(APPEND
SOURCE_FILES
${UWP_System_Source_Files}
${Events_Source_Files}
${UWP_Events_Source_Files}
${UWP_Source_Files}
${Events_WinRT_Source_Files}
${UWP_Shared_WinRT_Source_Files}