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

Fixing unit test build (#284)

This commit is contained in:
Jason Sandlin 2017-11-14 11:44:48 -08:00 коммит произвёл GitHub
Родитель 2410fd2d2b
Коммит 9484fcd67c
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
10 изменённых файлов: 221 добавлений и 217 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -908,6 +908,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\user_context_xdk.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\utils.cpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\utils.h" />

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

@ -1300,6 +1300,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\user_context_xdk.cpp">
<Filter>C++ Source\Shared</Filter>
</ClCompile>
@ -2630,56 +2636,14 @@
</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 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>
@ -2687,21 +2651,9 @@
<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>
<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>
@ -2714,29 +2666,44 @@
<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>
<Filter Include="C++ Source\Services\Matchmaking\WinRT">
<UniqueIdentifier>{458043D0-B977-358F-AE22-DA2D1E406689}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Social\WinRT">
<UniqueIdentifier>{4FB2B169-B069-38ED-9ECE-FA4333EC6D3D}</UniqueIdentifier>
<Filter Include="C++ Source\Services\Social\Manager\WinRT">
<UniqueIdentifier>{4DA1880C-C4F4-3B20-BA51-0277E9CB333F}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Shared\Logger">
<UniqueIdentifier>{D30FEB85-D0C6-32DE-B1BB-75623BAC93C3}</UniqueIdentifier>
<Filter Include="C++ Source\Services\Stats\Manager\WinRT">
<UniqueIdentifier>{765859F5-D852-3E9E-964C-318C91E48306}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Shared\WinRT">
<UniqueIdentifier>{5C1BFE08-AE36-31F1-9696-DB526AD4D90E}</UniqueIdentifier>
<Filter Include="C++ Source\Services\Privacy\WinRT">
<UniqueIdentifier>{1F48107E-7574-33AC-AD47-758133406AA2}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Stats\Manager">
<UniqueIdentifier>{57A0A6E0-3E99-371E-952D-38DECAC4B717}</UniqueIdentifier>
<Filter Include="C++ Source\Services\Misc\WinRT">
<UniqueIdentifier>{7AFE8ACD-0281-3A4B-9DBA-5858473AE2AE}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Stats\WinRT">
<UniqueIdentifier>{B5694E76-E2FA-3451-8387-701C5F3AD66D}</UniqueIdentifier>
<Filter Include="C++ Source\Services\Leaderboard\WinRT">
<UniqueIdentifier>{6BBAEB81-C095-3A68-BA9A-9F254399F9D3}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Multiplayer\Manager">
<UniqueIdentifier>{93130BC3-2203-3733-B903-28CDDEEEF42A}</UniqueIdentifier>
<Filter Include="C++ Source\Services\Presence\WinRT">
<UniqueIdentifier>{FD9E1975-DABA-36D3-9EBD-3C703AB30056}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Multiplayer\WinRT">
<UniqueIdentifier>{CFE0BB67-2571-3F89-8826-2744B01FEE7D}</UniqueIdentifier>
<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\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\Services\Misc">
<UniqueIdentifier>{206338C2-9047-3AAE-B89B-A141CD0A774F}</UniqueIdentifier>
@ -2792,5 +2759,44 @@
<Filter Include="C++ Source\Services\Events">
<UniqueIdentifier>{DBAE8D87-9A1F-319A-BC4F-6168F6F43654}</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\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\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++ 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\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>
</ItemGroup>
</Project>

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

@ -998,6 +998,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\user_context_xdk.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\utils.cpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\Source\Shared\utils.h" />

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

@ -1300,6 +1300,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\user_context_xdk.cpp">
<Filter>C++ Source\Shared</Filter>
</ClCompile>
@ -2624,39 +2630,6 @@
</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>
@ -2669,20 +2642,29 @@
<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 Include="C++ Source\Services\Events\WinRT">
<UniqueIdentifier>{6E1C5BB3-AB9B-3EB7-BAC9-8CAB02BDEDA1}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Marketplace\WinRT">
<UniqueIdentifier>{4C47A1D9-B79E-335A-BF53-B293843954B9}</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\EntertainmentProfile\WinRT">
<UniqueIdentifier>{EEABD1E4-8870-321A-81AD-87423BDF6868}</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\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 Include="C++ Source\Services\Privacy\WinRT">
<UniqueIdentifier>{1F48107E-7574-33AC-AD47-758133406AA2}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Achievements\WinRT">
<UniqueIdentifier>{5300601B-5D19-3DA5-8BF9-3D394A0CCE4F}</UniqueIdentifier>
@ -2693,11 +2675,26 @@
<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\Misc\WinRT">
<UniqueIdentifier>{7AFE8ACD-0281-3A4B-9DBA-5858473AE2AE}</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\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 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>
@ -2705,8 +2702,11 @@
<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 Include="C++ Source\Services\Social\Manager\WinRT">
<UniqueIdentifier>{4DA1880C-C4F4-3B20-BA51-0277E9CB333F}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Stats\Manager\WinRT">
<UniqueIdentifier>{765859F5-D852-3E9E-964C-318C91E48306}</UniqueIdentifier>
</Filter>
<Filter Include="C++ Source\Services\Multiplayer\Manager">
<UniqueIdentifier>{93130BC3-2203-3733-B903-28CDDEEEF42A}</UniqueIdentifier>
@ -2786,5 +2786,11 @@
<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>
</ItemGroup>
</Project>

95
Tests/UnitTests/Mocks/MockHttpCall.cpp
Просмотреть файл

@ -38,61 +38,56 @@ MockHttpCall::get_response(
return pplx::task_from_result(ResultValue);
}
#if TV_API
/// <summary>
/// Attach the Xbox Live token, sign the request, send the request to the service, and return the response.
/// </summary>
pplx::task<std::shared_ptr<http_call_response>>
#if XSAPI_XDK_AUTH
pplx::task<std::shared_ptr<http_call_response>>
MockHttpCall::get_response_with_auth(
_In_ Windows::Xbox::System::User^ user,
_In_ http_call_response_body_type httpCallResponseBodyType,
_In_ bool allUsersAuthRequired
)
_In_ Windows::Xbox::System::User^ user,
_In_ http_call_response_body_type httpCallResponseBodyType,
_In_ bool allUsersAuthRequired
)
{
if (FAILED(ResultHR))
{
throw ResultHR;
}
CallCounter++;
return pplx::task_from_result(ResultValue);
if (FAILED(ResultHR))
{
throw ResultHR;
}
CallCounter++;
return pplx::task_from_result(ResultValue);
}
#elif UNIT_TEST_SERVICES || !XSAPI_CPP
pplx::task<std::shared_ptr<http_call_response>>
MockHttpCall::get_response_with_auth(
_In_ Microsoft::Xbox::Services::System::XboxLiveUser^ user,
_In_ http_call_response_body_type httpCallResponseBodyType,
_In_ bool allUsersAuthRequired
)
{
if (FAILED(ResultHR))
{
throw ResultHR;
}
CallCounter++;
return pplx::task_from_result(ResultValue);
}
#else
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,
_In_ bool allUsersAuthRequired
)
{
if (FAILED(ResultHR))
{
throw ResultHR;
}
CallCounter++;
return pplx::task_from_result(ResultValue);
}
#endif
#if XSAPI_NONXDK_CPP_AUTH
pplx::task<std::shared_ptr<http_call_response>>
MockHttpCall::get_response_with_auth(
_In_ std::shared_ptr<xbox::services::system::xbox_live_user> user,
_In_ http_call_response_body_type httpCallResponseBodyType,
_In_ bool allUsersAuthRequired
)
{
if (FAILED(ResultHR))
{
throw ResultHR;
}
CallCounter++;
return pplx::task_from_result(ResultValue);
}
#endif
#if XSAPI_NONXDK_WINRT_AUTH
pplx::task<std::shared_ptr<http_call_response>>
MockHttpCall::get_response_with_auth(
_In_ Microsoft::Xbox::Services::System::XboxLiveUser^ user,
_In_ http_call_response_body_type httpCallResponseBodyType,
_In_ bool allUsersAuthRequired
)
{
if (FAILED(ResultHR))
{
throw ResultHR;
}
CallCounter++;
return pplx::task_from_result(ResultValue);
}
#endif
pplx::task<std::shared_ptr<http_call_response>>
MockHttpCall::get_response(

53
Tests/UnitTests/Mocks/MockHttpCall.h
Просмотреть файл

@ -15,41 +15,30 @@ public:
_In_ http_call_response_body_type httpCallResponseBodyType
) override;
#if TV_API
/// <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_ Windows::Xbox::System::User^ user,
_In_ http_call_response_body_type httpCallResponseBodyType = http_call_response_body_type::json_body,
_In_ bool allUsersAuthRequired = false
) override;
#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>
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
/// <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
) override;
#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
) override;
#endif
#if XSAPI_NONXDK_CPP_AUTH
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
) 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
virtual pplx::task< std::shared_ptr<http_call_response> > get_response(
_In_ http_call_response_body_type httpCallResponseBodyType,
_In_ const web::http::http_request& httpRequest

2
Tests/UnitTests/Support/TAEF/UnitTestBase_winrt.cpp
Просмотреть файл

@ -27,7 +27,7 @@ XboxLiveUser^ SignInUserWithMocks_WinRT(const string_t& id)
VERIFY_NO_THROW(pplx::create_task(asyncOp).wait());
if (!id.empty())
{
user->GetUserImpl()->_Set_xbox_user_id(id);
user->_User_impl()->_Set_xbox_user_id(id);
}
return user;

22
Tests/UnitTests/Tests/Services/MultiplayerManagerTests.cpp
Просмотреть файл

@ -1226,7 +1226,7 @@ public:
InitializeManager(2);
auto xboxLiveContext = GetMockXboxLiveContext_WinRT();
auto xboxLiveContext2 = GetMockXboxLiveContext_WinRT();
xboxLiveContext2->User->GetUserImpl()->_Set_xbox_user_id(L"TestXboxUserId_2");
xboxLiveContext2->User->_User_impl()->_Set_xbox_user_id(L"TestXboxUserId_2");
Platform::Collections::Vector<Microsoft::Xbox::Services::XboxLiveContext^>^ xboxLiveContexts = ref new Platform::Collections::Vector<Microsoft::Xbox::Services::XboxLiveContext^>();
xboxLiveContexts->Append(xboxLiveContext);
@ -1730,7 +1730,7 @@ public:
InitializeManager(2);
auto xboxLiveContext = GetMockXboxLiveContext_WinRT();
auto xboxLiveContext2 = GetMockXboxLiveContext_WinRT();
xboxLiveContext2->User->GetUserImpl()->_Set_xbox_user_id(L"TestXboxUserId_2");
xboxLiveContext2->User->_User_impl()->_Set_xbox_user_id(L"TestXboxUserId_2");
Platform::Collections::Vector<Microsoft::Xbox::Services::XboxLiveContext^>^ xboxLiveContexts = ref new Platform::Collections::Vector<Microsoft::Xbox::Services::XboxLiveContext^>();
xboxLiveContexts->Append(xboxLiveContext);
@ -1773,9 +1773,9 @@ public:
InitializeManager(3);
auto xboxLiveContext = GetMockXboxLiveContext_WinRT();
auto xboxLiveContext2 = GetMockXboxLiveContext_WinRT();
xboxLiveContext2->User->GetUserImpl()->_Set_xbox_user_id(L"TestXboxUserId_2");
xboxLiveContext2->User->_User_impl()->_Set_xbox_user_id(L"TestXboxUserId_2");
auto xboxLiveContext3 = GetMockXboxLiveContext_WinRT();
xboxLiveContext3->User->GetUserImpl()->_Set_xbox_user_id(L"TestXboxUserId_3");
xboxLiveContext3->User->_User_impl()->_Set_xbox_user_id(L"TestXboxUserId_3");
Platform::Collections::Vector<Microsoft::Xbox::Services::XboxLiveContext^>^ xboxLiveContexts = ref new Platform::Collections::Vector<Microsoft::Xbox::Services::XboxLiveContext^>();
xboxLiveContexts->Append(xboxLiveContext);
@ -1845,13 +1845,13 @@ public:
InitializeManager(5);
auto xboxLiveContext = GetMockXboxLiveContext_WinRT();
auto xboxLiveContext2 = GetMockXboxLiveContext_WinRT();
xboxLiveContext2->User->GetUserImpl()->_Set_xbox_user_id(L"TestXboxUserId_2");
xboxLiveContext2->User->_User_impl()->_Set_xbox_user_id(L"TestXboxUserId_2");
auto xboxLiveContext3 = GetMockXboxLiveContext_WinRT();
xboxLiveContext3->User->GetUserImpl()->_Set_xbox_user_id(L"TestXboxUserId_3");
xboxLiveContext3->User->_User_impl()->_Set_xbox_user_id(L"TestXboxUserId_3");
auto xboxLiveContext4 = GetMockXboxLiveContext_WinRT();
xboxLiveContext4->User->GetUserImpl()->_Set_xbox_user_id(L"TestXboxUserId_4");
xboxLiveContext4->User->_User_impl()->_Set_xbox_user_id(L"TestXboxUserId_4");
auto xboxLiveContext5 = GetMockXboxLiveContext_WinRT();
xboxLiveContext5->User->GetUserImpl()->_Set_xbox_user_id(L"TestXboxUserId_5");
xboxLiveContext5->User->_User_impl()->_Set_xbox_user_id(L"TestXboxUserId_5");
Platform::Collections::Vector<Microsoft::Xbox::Services::XboxLiveContext^>^ xboxLiveContexts = ref new Platform::Collections::Vector<Microsoft::Xbox::Services::XboxLiveContext^>();
xboxLiveContexts->Append(xboxLiveContext);
@ -2985,7 +2985,7 @@ public:
InitializeManager(2);
auto xboxLiveContext = GetMockXboxLiveContext_WinRT();
auto xboxLiveContext2 = GetMockXboxLiveContext_WinRT();
xboxLiveContext2->User->GetUserImpl()->_Set_xbox_user_id(L"TestXboxUserId_2");
xboxLiveContext2->User->_User_impl()->_Set_xbox_user_id(L"TestXboxUserId_2");
AddLocalUserHelper(xboxLiveContext);
auto mpInstance = MultiplayerManager::SingletonInstance;
@ -3383,7 +3383,7 @@ public:
InitializeManager(2);
auto xboxLiveContext = GetMockXboxLiveContext_WinRT();
auto xboxLiveContext2 = GetMockXboxLiveContext_WinRT();
xboxLiveContext2->User->GetUserImpl()->_Set_xbox_user_id(L"TestXboxUserId_2");
xboxLiveContext2->User->_User_impl()->_Set_xbox_user_id(L"TestXboxUserId_2");
Platform::Collections::Vector<Microsoft::Xbox::Services::XboxLiveContext^>^ xboxLiveContexts = ref new Platform::Collections::Vector<Microsoft::Xbox::Services::XboxLiveContext^>();
xboxLiveContexts->Append(xboxLiveContext);
@ -3445,7 +3445,7 @@ public:
InitializeManager(2);
auto xboxLiveContext = GetMockXboxLiveContext_WinRT();
auto xboxLiveContext2 = GetMockXboxLiveContext_WinRT();
xboxLiveContext2->User->GetUserImpl()->_Set_xbox_user_id(L"TestXboxUserId_2");
xboxLiveContext2->User->_User_impl()->_Set_xbox_user_id(L"TestXboxUserId_2");
Platform::Collections::Vector<Microsoft::Xbox::Services::XboxLiveContext^>^ xboxLiveContexts = ref new Platform::Collections::Vector<Microsoft::Xbox::Services::XboxLiveContext^>();
xboxLiveContexts->Append(xboxLiveContext);

4
Tests/UnitTests/Tests/Services/SocialManagerTests.cpp
Просмотреть файл

@ -822,7 +822,7 @@ public:
m_mockXboxSystemFactory->reinit();
auto xboxLiveContext = GetMockXboxLiveContext_Cpp();
auto xboxLiveContext1 = GetMockXboxLiveContext_Cpp();
xboxLiveContext1->user()->GetUserImpl()->_Set_xbox_user_id(L"T0");
xboxLiveContext1->user()->_User_impl()->_Set_xbox_user_id(L"T0");
auto socialManagerInitializationStruct1 = Initialize(xboxLiveContext1, true);
auto socialManagerCppMock = std::dynamic_pointer_cast<MockSocialManager>(socialManagerInitializationStruct1.socialManager->GetCppObj());
@ -1005,7 +1005,7 @@ public:
SetMultipleClientWebSocketRTAAutoResponser(mockSockets, rtaConnectionIdJson, -1, false);
auto xboxLiveContext = GetMockXboxLiveContext_Cpp();
auto xboxLiveContext1 = GetMockXboxLiveContext_Cpp();
xboxLiveContext1->user()->GetUserImpl()->_Set_xbox_user_id(L"T0");
xboxLiveContext1->user()->_User_impl()->_Set_xbox_user_id(L"T0");
auto socialManagerInitializationStruct = Initialize(xboxLiveContext, false);
auto socialManagerInitializationStruct1 = Initialize(xboxLiveContext1, false);
auto socialManagerCppMock = std::dynamic_pointer_cast<MockSocialManager>(socialManagerInitializationStruct1.socialManager->GetCppObj());

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

@ -1171,7 +1171,8 @@ else()
source_group("C++ Source\\Shared\\WinRT" FILES ${XDK_WinRT_Shared_Source_Files})
source_group("C++ Source\\Services\\EntertainmentProfile\\WinRT" FILES ${EntertainmentProfile_WinRT_Source_Files})
source_group("C++ Source\\Services\\Marketplace\\WinRT" FILES ${Marketplace_WinRT_Source_Files})
endif()
endif()
else()
source_group("C++ Source\\System" FILES ${UWP_System_Source_Files})
source_group("C++ Source\\Shared" FILES ${Cpp_Shared_Source_Files})
@ -1183,7 +1184,7 @@ else()
source_group("C++ Source\\System" FILES ${Xal_System_Source_Files})
endif()
if( WINRT OR UNITTEST )
if( WINRT )
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})
@ -1192,6 +1193,8 @@ else()
endif()
if( UNITTEST )
source_group("C++ Source\\Shared" FILES ${Cpp_Shared_Source_Files})
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" FILES ${UWP_System_Source_Files})
source_group("C++ Source\\System\\WinRT" FILES ${System_WinRT_Source_Files})
@ -1293,6 +1296,7 @@ else()
if( UNITTEST )
list(APPEND
SOURCE_FILES
${Cpp_Shared_Source_Files}
${WinRT_Shared_Source_Files}
)