2102 GDK QFE2 (#562)

* 2102 GDK QFE2

Custom.props

@@ -11,9 +11,7 @@
     </Otherwise>
   </Choose>
 
-  <PropertyGroup Label="Version">
-    <VersionMajor>1</VersionMajor>
-    <VersionMinor>0</VersionMinor>
+  <PropertyGroup>
     <VS_AndroidHome Condition="'$(VS_AndroidHome)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Android SDK Tools@Path)</VS_AndroidHome>
     <VS_AndroidHome Condition="'$(VS_AndroidHome)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Android SDK Tools@Path)</VS_AndroidHome>
   </PropertyGroup>

External/Xal/Source/Xal/Include/Xal/xal_types.h

@@ -63,6 +63,7 @@ extern "C"
 #define E_XAL_NODEFAULTUSER                 MAKE_E_HC(0x5111L) // 0x89235111
 #define E_XAL_FAILEDTORESOLVE               MAKE_E_HC(0x5112L) // 0x89235112
 #define E_XAL_NOACCOUNTPROVIDER             MAKE_E_HC(0x5113L) // 0x89235113
+#define E_XAL_MISMATCHEDTITLEANDCLIENTIDS   MAKE_E_HC(0x5114L) // 0x89235114
 
 // E_XAL_INTERNAL_* values should never be returned to callers of XAL.
 #define E_XAL_INTERNAL_SWITCHUSER           MAKE_E_HC(0x5171L) // 0x89235171

Include/cpprestinclude/cpprest/asyncrt_utils.h

@@ -594,7 +594,7 @@ public:
     void set_length(int length) { m_length = length; }
 
 private:
-    static const utility::string_t c_allowed_chars;
+    static const utility::char_t* c_allowed_chars;
     std::mt19937 m_random;
     int m_length;
 };

Include/cpprestinclude/cpprest/details/asyncrt_utils.hpp

@@ -1047,11 +1047,11 @@ utility::seconds __cdecl timespan::xml_duration_to_seconds(const utility::string
     return utility::seconds(numSecs);
 }
 
-const utility::string_t nonce_generator::c_allowed_chars(_XPLATSTR("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"));
+const utility::char_t * nonce_generator::c_allowed_chars = _XPLATSTR("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789");
 
 utility::string_t nonce_generator::generate()
 {
-    std::uniform_int_distribution<> distr(0, static_cast<int>(c_allowed_chars.length() - 1));
+    std::uniform_int_distribution<> distr(0, static_cast<int>(ustrlen(c_allowed_chars) - 1));
     utility::string_t result;
     result.reserve(length());
     std::generate_n(std::back_inserter(result), length(), [&]() { return c_allowed_chars[distr(m_random)]; } );

Include/cpprestinclude/cpprest/details/basic_types.h

@@ -56,6 +56,7 @@ typedef std::wstringstream stringstream_t;
 #define ucout std::wcout
 #define ucin std::wcin
 #define ucerr std::wcerr
+#define ustrlen wcslen
 #else
 //
 // On POSIX platforms, all strings are narrow
@@ -73,6 +74,7 @@ typedef std::stringstream stringstream_t;
 #define ucout std::cout
 #define ucin std::cin
 #define ucerr std::cerr
+#define ustrlen strlen
 #endif // endif _UTF16_STRINGS
 
 #ifndef _TURN_OFF_PLATFORM_STRING

Include/xsapi-cpp/impl/http_call.hpp

@@ -307,12 +307,14 @@ void http_call::set_request_body(
     _In_ const string_t& value
 )
 {
-    XblHttpCallRequestSetRequestBodyString(m_callHandle, Utils::StringFromStringT(value).c_str());
+    auto convertedValue = Utils::StringFromStringT(value);
+    XblHttpCallRequestSetRequestBodyString(m_callHandle, convertedValue.c_str());
 }
 
 void http_call::set_request_body( _In_ const web::json::value& value )
 {
-    XblHttpCallRequestSetRequestBodyString(m_callHandle, Utils::StringFromStringT(value.serialize()).c_str());
+    auto convertedValue = Utils::StringFromStringT(value.serialize());
+    XblHttpCallRequestSetRequestBodyString(m_callHandle, convertedValue.c_str());
 }
 
 void http_call::set_request_body(
@@ -331,10 +333,13 @@ void http_call::set_custom_header(
     _In_ const string_t& Value
 )
 {
+    const auto headerName = Utils::StringFromStringT(Name);
+    const auto headerValue = Utils::StringFromStringT(Value);
+
     XblHttpCallRequestSetHeader(
         m_callHandle, 
-        Utils::StringFromStringT(Name).c_str(), 
-        Utils::StringFromStringT(Value).c_str(), 
+        headerName.c_str(),
+        headerValue.c_str(),
         false
     );
 }

Source/Services/Multiplayer/multiplayer_service.cpp

@@ -647,7 +647,7 @@ HRESULT MultiplayerService::DeleteSearchHandle(
         m_xboxLiveContextSettings,
         "DELETE",
         XblHttpCall::BuildUrl("sessiondirectory", handleStr),
-        xbox_live_api::set_activity
+        xbox_live_api::delete_search_handle
     ));
 
     RETURN_HR_IF_FAILED(httpCall->SetXblServiceContractVersion(MULTIPLAYER_SERVICE_CONTRACT_VERSION));

Source/Services/MultiplayerActivity/multiplayer_activity_service.cpp

@@ -244,7 +244,7 @@ HRESULT MultiplayerActivityService::SetActivity(
         m_xboxLiveContextSettings,
         "PUT",
         XblHttpCall::BuildUrl(MPA_SERVICE_NAME, path.str()),
-        xbox_live_api::update_activity
+        xbox_live_api::set_activity
     ));
 
     RETURN_HR_IF_FAILED(httpCall->SetRequestBody(requestBody));

Source/Services/Notification/RTA/game_invite_subscription.cpp

@@ -51,7 +51,7 @@ size_t GameInviteSubscription::RemoveHandler(
     std::lock_guard<std::mutex> lock{ m_mutex };
     m_mpaInviteHandlers.erase(token);
     m_mpsdInviteHandlers.erase(token);
-    return m_mpaInviteHandlers.size() + m_mpaInviteHandlers.size();
+    return m_mpaInviteHandlers.size() + m_mpsdInviteHandlers.size();
 }
 
 void GameInviteSubscription::OnEvent(

Source/Services/Notification/notification_service.cpp

@@ -177,10 +177,11 @@ HRESULT NotificationService::RegisterForNotificationsHelper(
         payload.AddMember("transportPath", JsonValue(AppConfig::Instance()->APNSEnvironment().c_str(), allocator).Move(), allocator);
 #elif HC_PLATFORM == HC_PLATFORM_ANDROID
         payload.AddMember("transport", "FCM", allocator);
-#elif HC_PLATFORM == HC_PLATFORM_WIN32 || HC_PLATFORM == HC_PLATFORM_GDK
+#elif HC_PLATFORM == HC_PLATFORM_WIN32 || HC_PLATFORM == HC_PLATFORM_GDK || HC_PLATFORM_IS_EXTERNAL
         payload.AddMember("transport", "RTA", allocator);
 #endif
-        payload.AddMember("locale", JsonValue(utils::get_locales().data(), allocator).Move(), allocator);
+        xsapi_internal_string locale = utils::get_locales();
+        payload.AddMember("locale", JsonValue(locale.c_str(), allocator).Move(), allocator);
         payload.AddMember("titleId", JsonValue(titleId.c_str(), allocator).Move(), allocator);
 
         if (!deviceName.empty())

Source/Services/RealTimeActivityManager/real_time_activity_connection.cpp

@@ -172,12 +172,15 @@ void Connection::Cleanup()
     m_unsubscribeAsyncContexts.clear();
     lock.unlock();
 
-    m_queue.Terminate(true);
-
-    for (auto& async : pendingAsyncContexts)
-    {
-        async.Complete(E_ABORT);
-    }
+    m_queue.Terminate(
+        false,
+        [pendingAsyncContexts = std::move(pendingAsyncContexts)]() {
+            for (auto& async : pendingAsyncContexts)
+            {
+                async.Complete(E_ABORT);
+            }
+        }
+    );
 }
 
 #if HC_PLATFORM == HC_PLATFORM_GDK

Source/Services/RealTimeActivityManager/real_time_activity_manager.cpp

@@ -81,6 +81,7 @@ HRESULT RealTimeActivityManager::RemoveSubscription(
             if (iter != sharedThis->m_rtaConnections.end() && iter->second->SubscriptionCount() == 0 && sharedThis->m_legacyActivations[xuid] == 0)
             {
                 LOGS_DEBUG << __FUNCTION__ << ": No remaining activations or subscriptions, tearing down connection";
+                iter->second->Cleanup();
                 sharedThis->m_rtaConnections.erase(iter);
 
                 // Maintain legacy behavior and raise Disconnected event even on intentional shutdown
@@ -173,7 +174,8 @@ void RealTimeActivityManager::Deactivate(
         if (m_titleActivated || connectionIter->second->SubscriptionCount() == 0)
         {
             LOGS_DEBUG << __FUNCTION__ << ": No remaining activations tearing down connection";
-            m_rtaConnections.erase(user.Xuid());
+            connectionIter->second->Cleanup();
+            m_rtaConnections.erase(connectionIter);
 
             // Maintain legacy behavior and raise Disconnected event even on intentional shutdown
             auto handlers{ m_stateChangedHandlers[user.Xuid()] };

Source/Shared/build_version.h

@@ -9,4 +9,4 @@
 //*********************************************************
 #pragma once
  
-#define XBOX_SERVICES_API_VERSION_STRING "2021.02.20210301.1"
+#define XBOX_SERVICES_API_VERSION_STRING "2021.02.20210318.2" 

Source/Shared/http_call_wrapper_internal.cpp

@@ -45,7 +45,7 @@ HRESULT HttpCall::SetHeader(
     return HCHttpCallRequestSetHeader(m_callHandle, key.data(), value.data(), allowTracing);
 }
 
-HRESULT HttpCall::SetRequestBody(xsapi_internal_vector<uint8_t>&& bytes)
+HRESULT HttpCall::SetRequestBody(const xsapi_internal_vector<uint8_t>& bytes)
 {
     assert(m_step == Step::Pending);
     return HCHttpCallRequestSetRequestBodyBytes(m_callHandle, bytes.data(), static_cast<uint32_t>(bytes.size()));
@@ -626,7 +626,7 @@ HRESULT XblHttpCall::SetHeader(
     return HttpCall::SetHeader(key, value, allowTracing);
 }
 
-HRESULT XblHttpCall::SetRequestBody(xsapi_internal_vector<uint8_t>&& bytes)
+HRESULT XblHttpCall::SetRequestBody(const xsapi_internal_vector<uint8_t>& bytes)
 {
     m_requestBody = bytes;
     return HttpCall::SetRequestBody(xsapi_internal_vector<uint8_t>{ bytes });
@@ -646,7 +646,8 @@ HRESULT XblHttpCall::SetRequestBody(_In_z_ const char* requestBodyString)
 
 HRESULT XblHttpCall::SetRequestBody(const xsapi_internal_string& bodyString)
 {
-    return SetRequestBody(xsapi_internal_vector<uint8_t>{ bodyString.begin(), bodyString.end() });
+    m_requestBody = xsapi_internal_vector<uint8_t>{ bodyString.begin(), bodyString.end() };
+    return HttpCall::SetRequestBody(bodyString);
 }
 
 HRESULT XblHttpCall::SetRequestBody(const JsonValue& bodyJson)

Source/Shared/http_call_wrapper_internal.h

@@ -62,6 +62,7 @@ enum class xbox_live_api
     get_quota,
     get_quota_for_session_storage,
     get_search_handles,
+    delete_search_handle,
     get_session_host_allocation_status,
     get_sessions,
     get_single_user_statistics,
@@ -100,7 +101,6 @@ enum class xbox_live_api
     xbox_one_pins_contains_item,
     xbox_one_pins_remove_item,
     post_recent_players,
-    update_activity,
     get_activity_batch,
     delete_activity,
     mpa_send_invites
@@ -128,7 +128,7 @@ public:
     );
 
     virtual HRESULT SetTracing(bool traceCall);
-    virtual HRESULT SetRequestBody(xsapi_internal_vector<uint8_t>&& bytes);
+    virtual HRESULT SetRequestBody(const xsapi_internal_vector<uint8_t>& bytes);
     virtual HRESULT SetRequestBody(_In_reads_bytes_(requestBodySize) const uint8_t* requestBodyBytes, _In_ uint32_t requestBodySize);
     virtual HRESULT SetRequestBody(const xsapi_internal_string& bodyString);
     virtual HRESULT SetRequestBody(const JsonValue& bodyJson);
@@ -228,7 +228,7 @@ public:
     void SetLongHttpCall(_In_ bool longHttpCall);
     HRESULT SetXblServiceContractVersion(uint32_t contractVersion);
 
-    HRESULT SetRequestBody(xsapi_internal_vector<uint8_t>&& bytes) override;
+    HRESULT SetRequestBody(const xsapi_internal_vector<uint8_t>& bytes) override;
     HRESULT SetRequestBody(_In_reads_bytes_(requestBodySize) const uint8_t* requestBodyBytes, _In_ uint32_t requestBodySize) override;
     HRESULT SetRequestBody(const xsapi_internal_string& bodyString) override;
     HRESULT SetRequestBody(const JsonValue& bodyJson) override;

Source/Shared/user.cpp

@@ -406,7 +406,7 @@ Result<String> User::GetGamertagComponent(
     {
         size_t size = XalUserGetGamertagSize(m_handle, component);
 
-        std::vector<char> gamertagComponent(size, char{});
+        Vector<char> gamertagComponent(size, char{});
         auto hr = XalUserGetGamertag(m_handle, component, size, &gamertagComponent[0], nullptr);
         if (SUCCEEDED(hr))
         {

Source/Shared/xsapi_utils.cpp

@@ -22,11 +22,15 @@
 #include "Logger/log_hc_output.h"
 #include "global_state.h"
 
+#ifndef _XTIME_TICKS_PER_TIME_T
+#define _XTIME_TICKS_PER_TIME_T 10000000LL
+#endif
+
 NAMESPACE_MICROSOFT_XBOX_SERVICES_CPP_BEGIN
 
 #define MAKE_HTTP_HRESULT(code) MAKE_HRESULT(1, 0x019, code)
 
-static const std::string _sdaPrefix = "AAAAAAAA";
+static char const * _sdaPrefix = "AAAAAAAA";
 
 static const uint64_t _msTicks = static_cast<uint64_t>(10000);
 static const uint64_t _secondTicks = 1000*_msTicks;
@@ -825,7 +829,7 @@ utils::format_secure_device_address(String deviceAddress)
     // MPSD will base64 decode a non-valid SDA and the hashed value will be used
     // as the device token. The SDA can then be parsed by the title while 
     // deserializing the MPSD session to retrieve the connectionAddress.
-    formattedDeviceAddress = _sdaPrefix.c_str() + deviceAddress;
+    formattedDeviceAddress = _sdaPrefix + deviceAddress;
 #endif
 
     Vector<unsigned char> input(formattedDeviceAddress.c_str(), formattedDeviceAddress.c_str() + formattedDeviceAddress.size());
@@ -852,9 +856,9 @@ utils::parse_secure_device_address(String secureDeviceAddress)
 
     String deviceAddress = formattedDeviceAddress;
 #if !(HC_PLATFORM == HC_PLATFORM_XDK || HC_PLATFORM == HC_PLATFORM_UWP)
-    if (deviceAddress.find(_sdaPrefix.c_str()) == 0)
+    if (deviceAddress.find(_sdaPrefix) == 0)
     {
-        deviceAddress = deviceAddress.substr(_sdaPrefix.length());
+        deviceAddress = deviceAddress.substr(strlen(_sdaPrefix));
     }
 #endif
 

Tests/ApiExplorer/APIExplorer.Shared.vcxitems.filters

@@ -253,7 +253,9 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)APIs\apis_xblc_achievements_progress_notification.cpp">
       <Filter>APIs</Filter>
     </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)Shared\mem_hook.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)Shared\mem_hook.cpp">
+      <Filter>Shared</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Shared">

Tests/ApiExplorer/Shared/mem_hook.cpp

@@ -117,7 +117,7 @@ std::vector<std::string> ApiRunerMemHook::GetStackLogLine()
     GetStackTrace(stackInfo);
 
     std::vector<std::string> logs;
-    logs.reserve(stackInfo.stackSize);
+    logs.reserve(static_cast<size_t>(stackInfo.stackSize));
     for (int i = 0; i < stackInfo.stackSize; i++)
     {
         char sz[1024];
@@ -403,6 +403,12 @@ bool ApiRunerMemHook::IsStackInXSAPI(StackInfo& stackInfo)
             return false;
         }
 
+        bool foundTestCodeFirst = IsStackFramesInsideTestCode(&stackInfo);
+        if (foundTestCodeFirst)
+        {
+            return false;
+        }
+
         return true;
     }
 #else
@@ -414,7 +420,7 @@ bool ApiRunerMemHook::IsStackInXSAPI(StackInfo& stackInfo)
 
 void ApiRunerMemHook::GetStackTrace(StackInfo &stackInfo)
 {
-#if HC_PLATFORM == HC_PLATFORM_WIN32 || (HC_PLATFORM == HC_PLATFORM_GDK && !WINAPI_PARTITION_GAMES)
+#if HC_PLATFORM == HC_PLATFORM_WIN32 || HC_PLATFORM == HC_PLATFORM_GDK
     void* stack[TRACE_MAX_STACK_FRAMES] = { 0 };
     WORD numberOfFrames = CaptureStackBackTrace(0, TRACE_MAX_STACK_FRAMES, stack, NULL);
     stackInfo.stackSize = numberOfFrames < 64 ? numberOfFrames : 64;
@@ -454,6 +460,20 @@ void ApiRunerMemHook::GetStackTrace(StackInfo &stackInfo)
 }
 
 #if HC_PLATFORM == HC_PLATFORM_WIN32 || HC_PLATFORM == HC_PLATFORM_GDK
+bool ApiRunerMemHook::IsStackFramesInsideTestCode(StackInfo* pStackInfo)
+{
+    for (int i = 0; i < pStackInfo->stackSize; i++)
+    {
+        if (pStackInfo->isInXsapi[i])
+            return false;
+
+        const char* found = stristr(pStackInfo->szFileNames[i], "\\apiexplorer\\");
+        if (found != nullptr)
+            return true;
+    }
+    return false;
+}
+
 bool ApiRunerMemHook::IsStackFramesInsideCallback(StackInfo* pStackInfo)
 {
     for (int i = 0; i < pStackInfo->stackSize; i++)

Tests/ApiExplorer/Shared/mem_hook.h

@@ -40,6 +40,7 @@ public:
     void GetStackTrace(StackInfo &stackInfo);
 
 #if HC_PLATFORM == HC_PLATFORM_WIN32 || HC_PLATFORM == HC_PLATFORM_GDK
+    bool IsStackFramesInsideTestCode(StackInfo* pStackInfo);
     bool IsStackFramesInsideCallback(StackInfo* pStackInfo);
 #endif
 

Utilities/VSOBuildScripts/gdkDownloadBuild.ps1

@@ -0,0 +1,46 @@
+$destPath = $args[0]
+$url = $args[1]
+
+if( $url )
+{
+    if ($url -is [uri]) 
+    {
+        $url = $url.ToString()
+    }
+    if ($url.IndexOf('?') -ge 0) 
+    {
+        $query = ($url -split '\?')[1]
+        $query = $query.Split('#')[0]
+        foreach ($q in ($query -split '&')) 
+        {
+            $kv = $($q + '=') -split '='
+            $varName  = [uri]::UnescapeDataString($kv[0]).Trim()
+            $varValue = [uri]::UnescapeDataString($kv[1])
+            New-Variable -Name $varname -Value $varValue -Force
+        }
+    }
+
+    Write-Host "`$buildId = $buildId"
+    Write-Host "`$destPath = $destPath"
+
+    # az login if needed
+    az config set extension.use_dynamic_install=yes_without_prompt
+    $account = az account show
+    if( !$account )
+    {
+        [Console]::ResetColor()
+        az login
+    }
+    
+    az pipelines runs artifact download --run-id $buildId --path $destPath\gdk --artifact-name XSAPI_Combined_Full_Build_PipelineArtifacts_GDK2019_Debug
+    az pipelines runs artifact download --run-id $buildId --path $destPath\gdk --artifact-name XSAPI_Combined_Full_Build_PipelineArtifacts_GDK2019_Release
+    az pipelines runs artifact download --run-id $buildId --path $destPath\gdk --artifact-name XSAPI_Combined_Full_Build_PipelineArtifacts_GDK2017_Debug
+    az pipelines runs artifact download --run-id $buildId --path $destPath\gdk --artifact-name XSAPI_Combined_Full_Build_PipelineArtifacts_GDK2017_Release
+}
+else
+{
+    Write-Warning "gdkDownloadBuild.ps1 `"destPath`" `"buildURL`""
+    Write-Warning ""
+    Write-Warning "Example:"
+    Write-Warning ".\gdkDownloadBuild.ps1 c:\test `"https://microsoft.visualstudio.com/Xbox.Services/_build/results?buildId=30866009&view=logs&j=19f53634-0cc9-5f8f-beda-93fbd1295bdf&t=aa6975a6-c137-5e34-3a5f-3ba934582e17&l=66`""
+}

Utilities/VSOBuildScripts/gdkDownloadDocs.ps1

@@ -0,0 +1,43 @@
+$destPath = $args[0]
+$url = $args[1]
+
+if( $url )
+{
+    if ($url -is [uri]) 
+    {
+        $url = $url.ToString()
+    }
+    if ($url.IndexOf('?') -ge 0) 
+    {
+        $query = ($url -split '\?')[1]
+        $query = $query.Split('#')[0]
+        foreach ($q in ($query -split '&')) 
+        {
+            $kv = $($q + '=') -split '='
+            $varName  = [uri]::UnescapeDataString($kv[0]).Trim()
+            $varValue = [uri]::UnescapeDataString($kv[1])
+            New-Variable -Name $varname -Value $varValue -Force
+        }
+    }
+
+    Write-Host "`$buildId = $buildId"
+    Write-Host "`$destPath = $destPath"
+
+    # az login if needed
+    az config set extension.use_dynamic_install=yes_without_prompt
+    $account = az account show
+    if( !$account )
+    {
+        [Console]::ResetColor()
+        az login
+    }
+
+    az pipelines runs artifact download --run-id $buildId --path $destPath\docs --artifact-name XSAPI_Combined_Full_Build_PipelineArtifacts_GDK2019_Docs
+}
+else
+{
+    Write-Warning "gdkDownloadDocs.ps1 `"destPath`" `"buildURL`""
+    Write-Warning ""
+    Write-Warning "Example:"
+    Write-Warning ".\gdkDownloadDocs.ps1 c:\test `"https://microsoft.visualstudio.com/Xbox.Services/_build/results?buildId=30866009&view=logs&j=19f53634-0cc9-5f8f-beda-93fbd1295bdf&t=aa6975a6-c137-5e34-3a5f-3ba934582e17&l=66`""
+}

Utilities/VSOBuildScripts/gdkVpackUpdate.ps1

@@ -0,0 +1,72 @@
+$destOSPath = $args[0]
+$url = $args[1]
+
+if( $url )
+{
+    if ($url -is [uri]) 
+    {
+        $url = $url.ToString()
+    }
+    if ($url.IndexOf('?') -ge 0) 
+    {
+        $query = ($url -split '\?')[1]
+        $query = $query.Split('#')[0]
+        foreach ($q in ($query -split '&')) 
+        {
+            $kv = $($q + '=') -split '='
+            $varName  = [uri]::UnescapeDataString($kv[0]).Trim()
+            $varValue = [uri]::UnescapeDataString($kv[1])
+            New-Variable -Name $varname -Value $varValue -Force
+        }
+    }
+
+    $destPathTemp = Join-Path -Path $destOSPath -ChildPath "\obj\xsapi-vpack-temp"    
+    $destPathXsapi = Join-Path -Path $destOSPath -ChildPath "\src\xbox\devex\vs\extensionSdks\xsapi\c"
+    Write-Host ""
+    Write-Host "`$buildId = $buildId"
+    Write-Host "`$destOSPath = $destOSPath"
+    Write-Host "`$destPathTemp: $destPathTemp"
+    Write-Host "`$destPathXsapi: $destPathXsapi"
+    
+    Remove-Item -LiteralPath $destPathTemp -Force -Recurse
+    
+    # az login if needed
+    az config set extension.use_dynamic_install=yes_without_prompt
+    $account = az account show
+    if( !$account )
+    {
+        [Console]::ResetColor()
+        az login
+    }
+
+    az pipelines runs artifact download --run-id $buildId --path $destPathTemp --artifact-name XSAPI_Combined_Full_Build_PipelineArtifacts_GDK2019_VPack_Debug
+    az pipelines runs artifact download --run-id $buildId --path $destPathTemp --artifact-name XSAPI_Combined_Full_Build_PipelineArtifacts_GDK2019_VPack_Release
+    az pipelines runs artifact download --run-id $buildId --path $destPathTemp --artifact-name XSAPI_Combined_Full_Build_PipelineArtifacts_GDK2017_VPack_Debug
+    az pipelines runs artifact download --run-id $buildId --path $destPathTemp --artifact-name XSAPI_Combined_Full_Build_PipelineArtifacts_GDK2017_VPack_Release
+    
+    $srcPath17D = Join-Path -Path $destPathTemp -ChildPath "\XSAPI.Debug.Gaming.Desktop.x64.VS2017.man"
+    $srcPath17R = Join-Path -Path $destPathTemp -ChildPath "\XSAPI.Release.Gaming.Desktop.x64.VS2017.man"
+    $srcPath19D = Join-Path -Path $destPathTemp -ChildPath "\XSAPI.Debug.Gaming.Desktop.x64.VS2019.man"
+    $srcPath19R = Join-Path -Path $destPathTemp -ChildPath "\XSAPI.Release.Gaming.Desktop.x64.VS2019.man"    
+    $srcPathInclude = Join-Path -Path $destPathTemp -ChildPath "\include\*"
+
+    $destPath17D = Join-Path -Path $destPathXsapi -ChildPath "\vpackDebug2017\"
+    $destPath17R = Join-Path -Path $destPathXsapi -ChildPath "\vpackRelease2017\"
+    $destPath19D = Join-Path -Path $destPathXsapi -ChildPath "\vpackDebug2019\"
+    $destPath19R = Join-Path -Path $destPathXsapi -ChildPath "\vpackRelease2019\"
+    $destPathInclude = Join-Path -Path $destPathXsapi -ChildPath "\xdkbuild\include\"
+
+    Copy-Item $srcPath17D -Destination $destPath17D
+    Copy-Item $srcPath17R -Destination $destPath17R
+    Copy-Item $srcPath19D -Destination $destPath19D
+    Copy-Item $srcPath19R -Destination $destPath19R
+    Copy-Item $srcPathInclude -Destination $destPathInclude  -Recurse -Force
+}
+else
+{
+    Write-Warning "gdkVpackUpdate.ps1 `"OSPath`" `"buildURL`""
+    Write-Warning ""
+    Write-Warning "Example:"
+    Write-Warning ".\gdkVpackUpdate.ps1 d:\os `"https://microsoft.visualstudio.com/xsapi/_build/results?buildId=30866009`""
+}
+

Utilities/VSOBuildScripts/postBuildScript.cmd

@@ -2,26 +2,32 @@ if "%1" == "local" goto testlocal
 goto start
 
 :testlocal
-set TFS_DropLocation=c:\scratch\tfsdrop
-mkdir %TFS_DropLocation%
-set TFS_VersionNumber=1701.10000
-set TFS_SourcesDirectory=%CD%\..\..
+set BUILD_BINARIESDIRECTORY=%CD%\..\..\Bins
+set BUILD_SOURCESDIRECTORY=%CD%\..\..
+
 goto serializeForPostbuild
 
 :start
-if "%XES_SERIALPOSTBUILDREADY%" == "True" goto serializeForPostbuild
-goto done
+
+rem if "%XES_SERIALPOSTBUILDREADY%" == "True" goto serializeForPostbuild
+rem goto done
 :serializeForPostbuild
 
 echo Running postBuildScript.cmd
 echo on
 
-if "%BUILD_DEFINITIONNAME%" == "XSAPI_Rolling" goto finalize
+set
+
+set SDK_DROP_LOCATION=%BUILD_BINARIESDIRECTORY%\SDK
+rmdir /s /q %SDK_DROP_LOCATION%
+mkdir %SDK_DROP_LOCATION%
+
+if "%BUILD_DEFINITIONNAME%" == "XSAPI_Combined_Rolling_Build" goto finalize
 
 setlocal
-call %TFS_SourcesDirectory%\Utilities\VSOBuildScripts\setBuildVersion.cmd
+call %BUILD_SOURCESDIRECTORY%\Utilities\VSOBuildScripts\setBuildVersion.cmd
 
-rem format release numbers
+REM ------------------- VERSION SETUP BEGIN -------------------
 for /f "tokens=2 delims==" %%G in ('wmic os get localdatetime /value') do set datetime=%%G
 set DATETIME_YEAR=%datetime:~0,4%
 set DATETIME_MONTH=%datetime:~4,2%
@@ -38,235 +44,233 @@ set NUGET_VERSION_NUMBER=%SDK_RELEASE_YEAR%.%SDK_RELEASE_MONTH%.%SDK_POINT_NAME_
 set MINOR_VERSION_NUMBER=%SDK_POINT_NAME_YEAR%%SDK_POINT_NAME_MONTH%%SDK_POINT_NAME_DAY%%SDK_POINT_NAME_VER%
 if "%NUGET_EXE%" == "" set NUGET_EXE=%AGENT_TOOLSDIRECTORY%\NuGet\4.6.2\x64\nuget.exe
 
-set
+REM goto skipCopy
 
-xcopy %TFS_SourcesDirectory%\Utilities\Nuget\* %TFS_DropLocation%\Nuget\ /s /e /q /y
-rem goto skipCopy
-robocopy /NJS /NJH /MT:16 /S /NP %TFS_SourcesDirectory%\Include %TFS_DropLocation%\Include
-robocopy /NJS /NJH /MT:16 /S /NP %TFS_SourcesDirectory%\External\cpprestsdk\Release\include %TFS_DropLocation%\include
-robocopy /NJS /NJH /MT:16 /S /NP %TFS_SourcesDirectory%\External\xal\External\libHttpClient\Include %TFS_DropLocation%\include
-robocopy /NJS /NJH /MT:16 /S /NP %TFS_SourcesDirectory%\External\xal\Source\Xal\Include %TFS_DropLocation%\include
-robocopy /NJS /NJH /MT:16 /S /NP %TFS_SourcesDirectory%\External\xal\Source\XalExtra\Include %TFS_DropLocation%\include
-rmdir /s /q %TFS_DropLocation%\include\json_cpp
+xcopy %BUILD_SOURCESDIRECTORY%\Utilities\Nuget\* %SDK_DROP_LOCATION%\Nuget\ /s /e /q /y
+robocopy /NJS /NJH /MT:16 /S /NP %BUILD_SOURCESDIRECTORY%\Include %SDK_DROP_LOCATION%\Include
+robocopy /NJS /NJH /MT:16 /S /NP %BUILD_SOURCESDIRECTORY%\External\xal\External\libHttpClient\Include %SDK_DROP_LOCATION%\include
+robocopy /NJS /NJH /MT:16 /S /NP %BUILD_SOURCESDIRECTORY%\External\xal\Source\Xal\Include %SDK_DROP_LOCATION%\include
+robocopy /NJS /NJH /MT:16 /S /NP %BUILD_SOURCESDIRECTORY%\External\xal\Source\XalExtra\Include %SDK_DROP_LOCATION%\include
+rmdir /s /q %SDK_DROP_LOCATION%\include\json_cpp
 
-rem setup folders for XDK drop
-set XDK_BINARIES_DROP=%TFS_DropLocation%\xdkservicesapi
-set UWP_BUILD_SHARE=%TFS_DropLocation%
-set XDK_BUILD_SHARE=%TFS_DropLocation%
+REM ------------------- XDK BEGIN -------------------
+set SDK_DROP_LOCATION_XDK=%SDK_DROP_LOCATION%\XDK
+set UWP_BINARIES=%BUILD_BINARIESDIRECTORY%
+set XDK_BINARIES=%BUILD_BINARIESDIRECTORY%
 
-set XDK_BIN_BUILD_SHARE_RELEA=%XDK_BUILD_SHARE%\Release\x64
-set XDK_BIN_BUILD_SHARE_DEBUG=%XDK_BUILD_SHARE%\Debug\x64
+set XDK_BIN_BUILD_SHARE_RELEA=%XDK_BINARIES%\Release\x64
+set XDK_BIN_BUILD_SHARE_DEBUG=%XDK_BINARIES%\Debug\x64
 
-mkdir %XDK_BINARIES_DROP%
+mkdir %SDK_DROP_LOCATION_XDK%
 
-rem copy NuGetPackages to build output folder
+mkdir %SDK_DROP_LOCATION_XDK%
+mkdir %SDK_DROP_LOCATION_XDK%\SourceDist
+mkdir %SDK_DROP_LOCATION_XDK%\cpp\binaries\release\v140
+mkdir %SDK_DROP_LOCATION_XDK%\cpp\binaries\debug\v140
 
-rem copy includes to build output folder
-robocopy /NJS /NJH /MT:16 /S /NP %XDK_BUILD_SHARE%\Include %XDK_BINARIES_DROP%\cpp\include
+robocopy /NJS /NJH /MT:16 /S /NP %SDK_DROP_LOCATION%\Include %SDK_DROP_LOCATION_XDK%\cpp\include
 
-rem copy binaries to build output folder
-mkdir %XDK_BINARIES_DROP%
-mkdir %XDK_BINARIES_DROP%\SourceDist
-mkdir %XDK_BINARIES_DROP%\cpp\binaries\release\v140
-mkdir %XDK_BINARIES_DROP%\cpp\binaries\debug\v140
+copy %BUILD_SOURCESDIRECTORY%\Utilities\VSOBuildScripts\XDK\Readme.txt %SDK_DROP_LOCATION_XDK%\SourceDist\Readme.txt
+%BUILD_SOURCESDIRECTORY%\Utilities\VSOBuildScripts\FindAndReplace.exe %SDK_DROP_LOCATION_XDK%\SourceDist\Readme.txt GITCOMMIT %BUILD_SOURCEVERSION%
+%BUILD_SOURCESDIRECTORY%\Utilities\VSOBuildScripts\FindAndReplace.exe %SDK_DROP_LOCATION_XDK%\SourceDist\Readme.txt VERSION %NUGET_VERSION_NUMBER%
 
-copy %TFS_SourcesDirectory%\Utilities\VSOBuildScripts\XDK\Readme.txt %XDK_BINARIES_DROP%\SourceDist\Readme.txt
-%TFS_SourcesDirectory%\Utilities\VSOBuildScripts\FindAndReplace.exe %XDK_BINARIES_DROP%\SourceDist\Readme.txt GITCOMMIT %BUILD_SOURCEVERSION%
-%TFS_SourcesDirectory%\Utilities\VSOBuildScripts\FindAndReplace.exe %XDK_BINARIES_DROP%\SourceDist\Readme.txt VERSION %NUGET_VERSION_NUMBER%
+echo set MAJOR_VERSION=%SDK_RELEASE_NAME% > %SDK_DROP_LOCATION_XDK%\setver.cmd
+echo set MINOR_VERSION=%MINOR_VERSION_NUMBER% >> %SDK_DROP_LOCATION_XDK%\setver.cmd
 
-echo set MAJOR_VERSION=%SDK_RELEASE_NAME% > %XDK_BINARIES_DROP%\setver.cmd
-echo set MINOR_VERSION=%MINOR_VERSION_NUMBER% >> %XDK_BINARIES_DROP%\setver.cmd
+copy %XDK_BIN_BUILD_SHARE_RELEA%\Microsoft.Xbox.Services.140.XDK.Cpp\Microsoft.Xbox.Services.140.XDK.Cpp.lib %SDK_DROP_LOCATION_XDK%\cpp\binaries\release\v140\Microsoft.Xbox.Services.140.XDK.Cpp.lib.remove
+copy %XDK_BIN_BUILD_SHARE_DEBUG%\Microsoft.Xbox.Services.140.XDK.Cpp\Microsoft.Xbox.Services.140.XDK.Cpp.lib %SDK_DROP_LOCATION_XDK%\cpp\binaries\debug\v140\Microsoft.Xbox.Services.140.XDK.Cpp.lib.remove
+copy %XDK_BIN_BUILD_SHARE_RELEA%\Microsoft.Xbox.Services.140.XDK.Cpp\Microsoft.Xbox.Services.140.XDK.Cpp.pdb %SDK_DROP_LOCATION_XDK%\cpp\binaries\release\v140\Microsoft.Xbox.Services.140.XDK.Cpp.pdb
+copy %XDK_BIN_BUILD_SHARE_DEBUG%\Microsoft.Xbox.Services.140.XDK.Cpp\Microsoft.Xbox.Services.140.XDK.Cpp.pdb %SDK_DROP_LOCATION_XDK%\cpp\binaries\debug\v140\Microsoft.Xbox.Services.140.XDK.Cpp.pdb
 
+copy %XDK_BIN_BUILD_SHARE_RELEA%\libHttpClient.140.XDK.C\libHttpClient.140.XDK.C.lib %SDK_DROP_LOCATION_XDK%\cpp\binaries\release\v140\libHttpClient.140.XDK.C.lib.remove
+copy %XDK_BIN_BUILD_SHARE_DEBUG%\libHttpClient.140.XDK.C\libHttpClient.140.XDK.C.lib %SDK_DROP_LOCATION_XDK%\cpp\binaries\debug\v140\libHttpClient.140.XDK.C.lib.remove
+copy %XDK_BIN_BUILD_SHARE_RELEA%\libHttpClient.140.XDK.C\libHttpClient.140.XDK.C.pdb %SDK_DROP_LOCATION_XDK%\cpp\binaries\release\v140
+copy %XDK_BIN_BUILD_SHARE_DEBUG%\libHttpClient.140.XDK.C\libHttpClient.140.XDK.C.pdb %SDK_DROP_LOCATION_XDK%\cpp\binaries\debug\v140
 
-copy %XDK_BIN_BUILD_SHARE_RELEA%\Microsoft.Xbox.Services.140.XDK.Cpp\Microsoft.Xbox.Services.140.XDK.Cpp.lib %XDK_BINARIES_DROP%\cpp\binaries\release\v140\Microsoft.Xbox.Services.140.XDK.Cpp.lib.remove
-copy %XDK_BIN_BUILD_SHARE_DEBUG%\Microsoft.Xbox.Services.140.XDK.Cpp\Microsoft.Xbox.Services.140.XDK.Cpp.lib %XDK_BINARIES_DROP%\cpp\binaries\debug\v140\Microsoft.Xbox.Services.140.XDK.Cpp.lib.remove
-copy %XDK_BIN_BUILD_SHARE_RELEA%\Microsoft.Xbox.Services.140.XDK.Cpp\Microsoft.Xbox.Services.140.XDK.Cpp.pdb %XDK_BINARIES_DROP%\cpp\binaries\release\v140\Microsoft.Xbox.Services.140.XDK.Cpp.pdb
-copy %XDK_BIN_BUILD_SHARE_DEBUG%\Microsoft.Xbox.Services.140.XDK.Cpp\Microsoft.Xbox.Services.140.XDK.Cpp.pdb %XDK_BINARIES_DROP%\cpp\binaries\debug\v140\Microsoft.Xbox.Services.140.XDK.Cpp.pdb
+copy %XDK_BIN_BUILD_SHARE_RELEA%\casablanca140.Xbox\casablanca140.xbox.lib %SDK_DROP_LOCATION_XDK%\cpp\binaries\release\v140\casablanca140.xbox.lib.remove
+copy %XDK_BIN_BUILD_SHARE_DEBUG%\casablanca140.Xbox\casablanca140.xbox.lib %SDK_DROP_LOCATION_XDK%\cpp\binaries\debug\v140\casablanca140.xbox.lib.remove
+copy %XDK_BIN_BUILD_SHARE_RELEA%\casablanca140.Xbox\casablanca140.xbox.pdb %SDK_DROP_LOCATION_XDK%\cpp\binaries\release\v140\casablanca140.xbox.pdb
+copy %XDK_BIN_BUILD_SHARE_DEBUG%\casablanca140.Xbox\casablanca140.xbox.pdb %SDK_DROP_LOCATION_XDK%\cpp\binaries\debug\v140\casablanca140.xbox.pdb
 
-copy %XDK_BIN_BUILD_SHARE_RELEA%\libHttpClient.140.XDK.C\libHttpClient.140.XDK.C.lib %XDK_BINARIES_DROP%\cpp\binaries\release\v140\libHttpClient.140.XDK.C.lib.remove
-copy %XDK_BIN_BUILD_SHARE_DEBUG%\libHttpClient.140.XDK.C\libHttpClient.140.XDK.C.lib %XDK_BINARIES_DROP%\cpp\binaries\debug\v140\libHttpClient.140.XDK.C.lib.remove
-copy %XDK_BIN_BUILD_SHARE_RELEA%\libHttpClient.140.XDK.C\libHttpClient.140.XDK.C.pdb %XDK_BINARIES_DROP%\cpp\binaries\release\v140
-copy %XDK_BIN_BUILD_SHARE_DEBUG%\libHttpClient.140.XDK.C\libHttpClient.140.XDK.C.pdb %XDK_BINARIES_DROP%\cpp\binaries\debug\v140
-
-copy %XDK_BIN_BUILD_SHARE_RELEA%\casablanca140.Xbox\casablanca140.xbox.lib %XDK_BINARIES_DROP%\cpp\binaries\release\v140\casablanca140.xbox.lib.remove
-copy %XDK_BIN_BUILD_SHARE_DEBUG%\casablanca140.Xbox\casablanca140.xbox.lib %XDK_BINARIES_DROP%\cpp\binaries\debug\v140\casablanca140.xbox.lib.remove
-copy %XDK_BIN_BUILD_SHARE_RELEA%\casablanca140.Xbox\casablanca140.xbox.pdb %XDK_BINARIES_DROP%\cpp\binaries\release\v140\casablanca140.xbox.pdb
-copy %XDK_BIN_BUILD_SHARE_DEBUG%\casablanca140.Xbox\casablanca140.xbox.pdb %XDK_BINARIES_DROP%\cpp\binaries\debug\v140\casablanca140.xbox.pdb
-
-rem laying out the 141 binaries
-set PATH_XDK_DROP_BIN=%XDK_BINARIES_DROP%\cpp
+set PATH_XDK_DROP_BIN=%SDK_DROP_LOCATION_XDK%\cpp
 
 mkdir %PATH_XDK_DROP_BIN%\binaries\release\v141
 mkdir %PATH_XDK_DROP_BIN%\binaries\debug\v141
 
 set TYPE=release
-copy %TFS_DropLocation%\%TYPE%\x64\Microsoft.Xbox.Services.141.XDK.Cpp\Microsoft.Xbox.Services.141.XDK.Cpp.pdb %PATH_XDK_DROP_BIN%\binaries\%TYPE%\v141
-copy %TFS_DropLocation%\%TYPE%\x64\Microsoft.Xbox.Services.141.XDK.Cpp\Microsoft.Xbox.Services.141.XDK.Cpp.lib %PATH_XDK_DROP_BIN%\binaries\%TYPE%\v141\Microsoft.Xbox.Services.141.XDK.Cpp.lib.remove
-copy %TFS_DropLocation%\%TYPE%\x64\casablanca141.Xbox\casablanca141.xbox.pdb %PATH_XDK_DROP_BIN%\binaries\%TYPE%\v141
-copy %TFS_DropLocation%\%TYPE%\x64\casablanca141.Xbox\casablanca141.xbox.lib %PATH_XDK_DROP_BIN%\binaries\%TYPE%\v141\casablanca141.xbox.lib.remove
-copy %TFS_DropLocation%\%TYPE%\x64\libHttpClient.141.XDK.C\libHttpClient.141.XDK.C.pdb %PATH_XDK_DROP_BIN%\binaries\%TYPE%\v141
-copy %TFS_DropLocation%\%TYPE%\x64\libHttpClient.141.XDK.C\libHttpClient.141.XDK.C.lib %PATH_XDK_DROP_BIN%\binaries\%TYPE%\v141\libHttpClient.141.XDK.C.lib.remove
+copy %BUILD_BINARIESDIRECTORY%\%TYPE%\x64\Microsoft.Xbox.Services.141.XDK.Cpp\Microsoft.Xbox.Services.141.XDK.Cpp.pdb %PATH_XDK_DROP_BIN%\binaries\%TYPE%\v141
+copy %BUILD_BINARIESDIRECTORY%\%TYPE%\x64\Microsoft.Xbox.Services.141.XDK.Cpp\Microsoft.Xbox.Services.141.XDK.Cpp.lib %PATH_XDK_DROP_BIN%\binaries\%TYPE%\v141\Microsoft.Xbox.Services.141.XDK.Cpp.lib.remove
+copy %BUILD_BINARIESDIRECTORY%\%TYPE%\x64\casablanca141.Xbox\casablanca141.xbox.pdb %PATH_XDK_DROP_BIN%\binaries\%TYPE%\v141
+copy %BUILD_BINARIESDIRECTORY%\%TYPE%\x64\casablanca141.Xbox\casablanca141.xbox.lib %PATH_XDK_DROP_BIN%\binaries\%TYPE%\v141\casablanca141.xbox.lib.remove
+copy %BUILD_BINARIESDIRECTORY%\%TYPE%\x64\libHttpClient.141.XDK.C\libHttpClient.141.XDK.C.pdb %PATH_XDK_DROP_BIN%\binaries\%TYPE%\v141
+copy %BUILD_BINARIESDIRECTORY%\%TYPE%\x64\libHttpClient.141.XDK.C\libHttpClient.141.XDK.C.lib %PATH_XDK_DROP_BIN%\binaries\%TYPE%\v141\libHttpClient.141.XDK.C.lib.remove
 
 set TYPE=debug
-copy %TFS_DropLocation%\%TYPE%\x64\Microsoft.Xbox.Services.141.XDK.Cpp\Microsoft.Xbox.Services.141.XDK.Cpp.pdb %PATH_XDK_DROP_BIN%\binaries\%TYPE%\v141
-copy %TFS_DropLocation%\%TYPE%\x64\Microsoft.Xbox.Services.141.XDK.Cpp\Microsoft.Xbox.Services.141.XDK.Cpp.lib %PATH_XDK_DROP_BIN%\binaries\%TYPE%\v141\Microsoft.Xbox.Services.141.XDK.Cpp.lib.remove
-copy %TFS_DropLocation%\%TYPE%\x64\casablanca141.Xbox\casablanca141.xbox.pdb %PATH_XDK_DROP_BIN%\binaries\%TYPE%\v141
-copy %TFS_DropLocation%\%TYPE%\x64\casablanca141.Xbox\casablanca141.xbox.lib %PATH_XDK_DROP_BIN%\binaries\%TYPE%\v141\casablanca141.xbox.lib.remove
-copy %TFS_DropLocation%\%TYPE%\x64\libHttpClient.141.XDK.C\libHttpClient.141.XDK.C.pdb %PATH_XDK_DROP_BIN%\binaries\%TYPE%\v141
-copy %TFS_DropLocation%\%TYPE%\x64\libHttpClient.141.XDK.C\libHttpClient.141.XDK.C.lib %PATH_XDK_DROP_BIN%\binaries\%TYPE%\v141\libHttpClient.141.XDK.C.lib.remove
+copy %BUILD_BINARIESDIRECTORY%\%TYPE%\x64\Microsoft.Xbox.Services.141.XDK.Cpp\Microsoft.Xbox.Services.141.XDK.Cpp.pdb %PATH_XDK_DROP_BIN%\binaries\%TYPE%\v141
+copy %BUILD_BINARIESDIRECTORY%\%TYPE%\x64\Microsoft.Xbox.Services.141.XDK.Cpp\Microsoft.Xbox.Services.141.XDK.Cpp.lib %PATH_XDK_DROP_BIN%\binaries\%TYPE%\v141\Microsoft.Xbox.Services.141.XDK.Cpp.lib.remove
+copy %BUILD_BINARIESDIRECTORY%\%TYPE%\x64\casablanca141.Xbox\casablanca141.xbox.pdb %PATH_XDK_DROP_BIN%\binaries\%TYPE%\v141
+copy %BUILD_BINARIESDIRECTORY%\%TYPE%\x64\casablanca141.Xbox\casablanca141.xbox.lib %PATH_XDK_DROP_BIN%\binaries\%TYPE%\v141\casablanca141.xbox.lib.remove
+copy %BUILD_BINARIESDIRECTORY%\%TYPE%\x64\libHttpClient.141.XDK.C\libHttpClient.141.XDK.C.pdb %PATH_XDK_DROP_BIN%\binaries\%TYPE%\v141
+copy %BUILD_BINARIESDIRECTORY%\%TYPE%\x64\libHttpClient.141.XDK.C\libHttpClient.141.XDK.C.lib %PATH_XDK_DROP_BIN%\binaries\%TYPE%\v141\libHttpClient.141.XDK.C.lib.remove
 
+REM ------------------- GDK BEGIN -------------------
+set SDK_DROP_LOCATION_GDK=%SDK_DROP_LOCATION%\GDK
+set SDK_DROP_LOCATION_GDK_BIN=%SDK_DROP_LOCATION_GDK%\c
+mkdir %SDK_DROP_LOCATION_GDK%
+mkdir %SDK_DROP_LOCATION_GDK_BIN%
+mkdir %SDK_DROP_LOCATION_GDK_BIN%\include
+mkdir %SDK_DROP_LOCATION_GDK_BIN%\binaries\GSDKXboxExtensionSDKs\release\v141
+mkdir %SDK_DROP_LOCATION_GDK_BIN%\binaries\GSDKXboxExtensionSDKs\debug\v141
+mkdir %SDK_DROP_LOCATION_GDK_BIN%\binaries\GSDKXboxExtensionSDKs\release\v142
+mkdir %SDK_DROP_LOCATION_GDK_BIN%\binaries\GSDKXboxExtensionSDKs\debug\v142
+mkdir %SDK_DROP_LOCATION_GDK_BIN%\binaries\GSDKDesktopExtensionSDKs\release\v141
+mkdir %SDK_DROP_LOCATION_GDK_BIN%\binaries\GSDKDesktopExtensionSDKs\debug\v141
+mkdir %SDK_DROP_LOCATION_GDK_BIN%\binaries\GSDKDesktopExtensionSDKs\release\v142
+mkdir %SDK_DROP_LOCATION_GDK_BIN%\binaries\GSDKDesktopExtensionSDKs\debug\v142
 
+copy %BUILD_SOURCESDIRECTORY%\Utilities\GDK\Xbox.Services.API.C.props %SDK_DROP_LOCATION_GDK_BIN%
 
-rem setup folders for GDK drop
-set PATH_GDK_DROP=%TFS_DropLocation%\gdk-drop
-set PATH_GDK_DROP_BIN=%PATH_GDK_DROP%\c
-mkdir %PATH_GDK_DROP%
-mkdir %PATH_GDK_DROP_BIN%
-mkdir %PATH_GDK_DROP_BIN%\include
-mkdir %PATH_GDK_DROP_BIN%\binaries\GSDKXboxExtensionSDKs\release\v141
-mkdir %PATH_GDK_DROP_BIN%\binaries\GSDKXboxExtensionSDKs\debug\v141
-mkdir %PATH_GDK_DROP_BIN%\binaries\GSDKXboxExtensionSDKs\release\v142
-mkdir %PATH_GDK_DROP_BIN%\binaries\GSDKXboxExtensionSDKs\debug\v142
-mkdir %PATH_GDK_DROP_BIN%\binaries\GSDKDesktopExtensionSDKs\release\v141
-mkdir %PATH_GDK_DROP_BIN%\binaries\GSDKDesktopExtensionSDKs\debug\v141
-mkdir %PATH_GDK_DROP_BIN%\binaries\GSDKDesktopExtensionSDKs\release\v142
-mkdir %PATH_GDK_DROP_BIN%\binaries\GSDKDesktopExtensionSDKs\debug\v142
-
-copy %TFS_SourcesDirectory%\Utilities\GDK\Xbox.Services.API.C.props %PATH_GDK_DROP_BIN%
-
-robocopy /NJS /NJH /MT:16 /S /NP %TFS_DropLocation%\Include %PATH_GDK_DROP_BIN%\include
-mkdir %PATH_GDK_DROP_BIN%\include\cpprest
-mkdir %PATH_GDK_DROP_BIN%\include\cpprest\details
-mkdir %PATH_GDK_DROP_BIN%\include\pplx
-copy %TFS_SourcesDirectory%\ThirdPartyNotices.txt %PATH_GDK_DROP_BIN%\include\xsapi-cpp
-copy %TFS_SourcesDirectory%\ThirdPartyNotices.txt %PATH_GDK_DROP_BIN%\include\xsapi-c
-copy %TFS_SourcesDirectory%\External\xal\External\libHttpClient\ThirdPartyNotices.txt %PATH_GDK_DROP_BIN%\include\httpClient
-copy %TFS_SourcesDirectory%\ThirdPartyNotices.txt %PATH_GDK_DROP_BIN%\include\cpprest
-copy %TFS_SourcesDirectory%\ThirdPartyNotices.txt %PATH_GDK_DROP_BIN%\include\pplx
-copy %TFS_DropLocation%\include\cpprestinclude\cpprest\astreambuf.h %PATH_GDK_DROP_BIN%\include\cpprest\astreambuf.h
-copy %TFS_DropLocation%\include\cpprestinclude\cpprest\asyncrt_utils.h %PATH_GDK_DROP_BIN%\include\cpprest\asyncrt_utils.h
-copy %TFS_DropLocation%\include\cpprestinclude\cpprest\base_uri.h %PATH_GDK_DROP_BIN%\include\cpprest\base_uri.h
-copy %TFS_DropLocation%\include\cpprestinclude\cpprest\containerstream.h %PATH_GDK_DROP_BIN%\include\cpprest\containerstream.h
-copy %TFS_DropLocation%\include\cpprestinclude\cpprest\http_headers.h %PATH_GDK_DROP_BIN%\include\cpprest\http_headers.h
-copy %TFS_DropLocation%\include\cpprestinclude\cpprest\http_msg.h %PATH_GDK_DROP_BIN%\include\cpprest\http_msg.h
-copy %TFS_DropLocation%\include\cpprestinclude\cpprest\json.h %PATH_GDK_DROP_BIN%\include\cpprest\json.h
-copy %TFS_DropLocation%\include\cpprestinclude\cpprest\streams.h %PATH_GDK_DROP_BIN%\include\cpprest\streams.h
-copy %TFS_DropLocation%\include\cpprestinclude\cpprest\uri.h %PATH_GDK_DROP_BIN%\include\cpprest\uri.h
-copy %TFS_DropLocation%\include\cpprestinclude\cpprest\uri_builder.h %PATH_GDK_DROP_BIN%\include\cpprest\uri_builder.h
-copy %TFS_DropLocation%\include\cpprestinclude\cpprest\details\basic_types.h %PATH_GDK_DROP_BIN%\include\cpprest\details\basic_types.h
-copy %TFS_DropLocation%\include\cpprestinclude\cpprest\details\cpprest_compat.h %PATH_GDK_DROP_BIN%\include\cpprest\details\cpprest_compat.h
-copy %TFS_DropLocation%\include\cpprestinclude\cpprest\details\http_constants.dat %PATH_GDK_DROP_BIN%\include\cpprest\details\http_constants.dat
-copy %TFS_DropLocation%\include\cpprestinclude\cpprest\details\SafeInt3.hpp %PATH_GDK_DROP_BIN%\include\cpprest\details\SafeInt3.hpp
-copy %TFS_DropLocation%\include\cpprestinclude\cpprest\details\uri_parser.h %PATH_GDK_DROP_BIN%\include\cpprest\details\uri_parser.h
-copy %TFS_DropLocation%\include\cpprestinclude\pplx\pplxtasks.140.h %PATH_GDK_DROP_BIN%\include\pplx\pplxtasks.140.h
-copy %TFS_DropLocation%\include\cpprestinclude\pplx\pplxtasks.h %PATH_GDK_DROP_BIN%\include\pplx\pplxtasks.h
-rmdir /s /q %PATH_GDK_DROP_BIN%\include\cpprestinclude
-rmdir /s /q %PATH_GDK_DROP_BIN%\Include\XalExtra
-del %PATH_GDK_DROP_BIN%\include\Xal\xal_android.h
-del %PATH_GDK_DROP_BIN%\include\Xal\xal_internal_telemetry.h
-del %PATH_GDK_DROP_BIN%\include\Xal\xal_internal_web_account.h
-del %PATH_GDK_DROP_BIN%\include\Xal\xal_ios.h
-del %PATH_GDK_DROP_BIN%\include\Xal\xal_apple.h
-del %PATH_GDK_DROP_BIN%\include\Xal\xal_generic.h
-del %PATH_GDK_DROP_BIN%\include\Xal\xal_platform.h
-del %PATH_GDK_DROP_BIN%\include\Xal\xal_platform_types.h
-del %PATH_GDK_DROP_BIN%\include\Xal\xal_uwp.h
-del %PATH_GDK_DROP_BIN%\include\Xal\xal_uwp_user.h
-del %PATH_GDK_DROP_BIN%\include\Xal\xal_version.h
-del %PATH_GDK_DROP_BIN%\include\Xal\xal_win32.h
-del %PATH_GDK_DROP_BIN%\include\Xal\xal_xdk.h
-del %PATH_GDK_DROP_BIN%\include\Xal\xal_grts*.h
-del %PATH_GDK_DROP_BIN%\include\async.h
-del %PATH_GDK_DROP_BIN%\include\asyncProvider.h
-del %PATH_GDK_DROP_BIN%\include\asyncQueue.h
-del %PATH_GDK_DROP_BIN%\include\asyncQueueEx.h
+robocopy /NJS /NJH /MT:16 /S /NP %SDK_DROP_LOCATION%\Include %SDK_DROP_LOCATION_GDK_BIN%\include
+mkdir %SDK_DROP_LOCATION_GDK_BIN%\include\cpprest
+mkdir %SDK_DROP_LOCATION_GDK_BIN%\include\cpprest\details
+mkdir %SDK_DROP_LOCATION_GDK_BIN%\include\pplx
+copy %BUILD_SOURCESDIRECTORY%\ThirdPartyNotices.txt %SDK_DROP_LOCATION_GDK_BIN%\include\xsapi-cpp
+copy %BUILD_SOURCESDIRECTORY%\ThirdPartyNotices.txt %SDK_DROP_LOCATION_GDK_BIN%\include\xsapi-c
+copy %BUILD_SOURCESDIRECTORY%\External\xal\External\libHttpClient\ThirdPartyNotices.txt %SDK_DROP_LOCATION_GDK_BIN%\include\httpClient
+copy %BUILD_SOURCESDIRECTORY%\ThirdPartyNotices.txt %SDK_DROP_LOCATION_GDK_BIN%\include\cpprest
+copy %BUILD_SOURCESDIRECTORY%\ThirdPartyNotices.txt %SDK_DROP_LOCATION_GDK_BIN%\include\pplx
+copy %SDK_DROP_LOCATION%\include\cpprestinclude\cpprest\astreambuf.h %SDK_DROP_LOCATION_GDK_BIN%\include\cpprest\astreambuf.h
+copy %SDK_DROP_LOCATION%\include\cpprestinclude\cpprest\asyncrt_utils.h %SDK_DROP_LOCATION_GDK_BIN%\include\cpprest\asyncrt_utils.h
+copy %SDK_DROP_LOCATION%\include\cpprestinclude\cpprest\base_uri.h %SDK_DROP_LOCATION_GDK_BIN%\include\cpprest\base_uri.h
+copy %SDK_DROP_LOCATION%\include\cpprestinclude\cpprest\containerstream.h %SDK_DROP_LOCATION_GDK_BIN%\include\cpprest\containerstream.h
+copy %SDK_DROP_LOCATION%\include\cpprestinclude\cpprest\http_headers.h %SDK_DROP_LOCATION_GDK_BIN%\include\cpprest\http_headers.h
+copy %SDK_DROP_LOCATION%\include\cpprestinclude\cpprest\http_msg.h %SDK_DROP_LOCATION_GDK_BIN%\include\cpprest\http_msg.h
+copy %SDK_DROP_LOCATION%\include\cpprestinclude\cpprest\json.h %SDK_DROP_LOCATION_GDK_BIN%\include\cpprest\json.h
+copy %SDK_DROP_LOCATION%\include\cpprestinclude\cpprest\streams.h %SDK_DROP_LOCATION_GDK_BIN%\include\cpprest\streams.h
+copy %SDK_DROP_LOCATION%\include\cpprestinclude\cpprest\uri.h %SDK_DROP_LOCATION_GDK_BIN%\include\cpprest\uri.h
+copy %SDK_DROP_LOCATION%\include\cpprestinclude\cpprest\uri_builder.h %SDK_DROP_LOCATION_GDK_BIN%\include\cpprest\uri_builder.h
+copy %SDK_DROP_LOCATION%\include\cpprestinclude\cpprest\details\basic_types.h %SDK_DROP_LOCATION_GDK_BIN%\include\cpprest\details\basic_types.h
+copy %SDK_DROP_LOCATION%\include\cpprestinclude\cpprest\details\cpprest_compat.h %SDK_DROP_LOCATION_GDK_BIN%\include\cpprest\details\cpprest_compat.h
+copy %SDK_DROP_LOCATION%\include\cpprestinclude\cpprest\details\http_constants.dat %SDK_DROP_LOCATION_GDK_BIN%\include\cpprest\details\http_constants.dat
+copy %SDK_DROP_LOCATION%\include\cpprestinclude\cpprest\details\SafeInt3.hpp %SDK_DROP_LOCATION_GDK_BIN%\include\cpprest\details\SafeInt3.hpp
+copy %SDK_DROP_LOCATION%\include\cpprestinclude\cpprest\details\uri_parser.h %SDK_DROP_LOCATION_GDK_BIN%\include\cpprest\details\uri_parser.h
+copy %SDK_DROP_LOCATION%\include\cpprestinclude\pplx\pplxtasks.140.h %SDK_DROP_LOCATION_GDK_BIN%\include\pplx\pplxtasks.140.h
+copy %SDK_DROP_LOCATION%\include\cpprestinclude\pplx\pplxtasks.h %SDK_DROP_LOCATION_GDK_BIN%\include\pplx\pplxtasks.h
+rmdir /s /q %SDK_DROP_LOCATION_GDK_BIN%\include\cpprestinclude
+rmdir /s /q %SDK_DROP_LOCATION_GDK_BIN%\Include\XalExtra
+del %SDK_DROP_LOCATION_GDK_BIN%\include\Xal\xal_android.h
+del %SDK_DROP_LOCATION_GDK_BIN%\include\Xal\xal_internal_telemetry.h
+del %SDK_DROP_LOCATION_GDK_BIN%\include\Xal\xal_internal_web_account.h
+del %SDK_DROP_LOCATION_GDK_BIN%\include\Xal\xal_ios.h
+del %SDK_DROP_LOCATION_GDK_BIN%\include\Xal\xal_apple.h
+del %SDK_DROP_LOCATION_GDK_BIN%\include\Xal\xal_generic.h
+del %SDK_DROP_LOCATION_GDK_BIN%\include\Xal\xal_platform.h
+del %SDK_DROP_LOCATION_GDK_BIN%\include\Xal\xal_platform_types.h
+del %SDK_DROP_LOCATION_GDK_BIN%\include\Xal\xal_uwp.h
+del %SDK_DROP_LOCATION_GDK_BIN%\include\Xal\xal_uwp_user.h
+del %SDK_DROP_LOCATION_GDK_BIN%\include\Xal\xal_version.h
+del %SDK_DROP_LOCATION_GDK_BIN%\include\Xal\xal_win32.h
+del %SDK_DROP_LOCATION_GDK_BIN%\include\Xal\xal_xdk.h
+del %SDK_DROP_LOCATION_GDK_BIN%\include\Xal\xal_grts*.h
+del %SDK_DROP_LOCATION_GDK_BIN%\include\async.h
+del %SDK_DROP_LOCATION_GDK_BIN%\include\asyncProvider.h
+del %SDK_DROP_LOCATION_GDK_BIN%\include\asyncQueue.h
+del %SDK_DROP_LOCATION_GDK_BIN%\include\asyncQueueEx.h
+del %SDK_DROP_LOCATION_GDK_BIN%\include\XAsync.h
+del %SDK_DROP_LOCATION_GDK_BIN%\include\XAsyncProvider.h
+del %SDK_DROP_LOCATION_GDK_BIN%\include\XTaskQueue.h
+del %SDK_DROP_LOCATION_GDK_BIN%\include\Xal\grts_base\grts_account_manager.h
+del %SDK_DROP_LOCATION_GDK_BIN%\include\Xal\grts_base\impersonation_ctx.h
+del %SDK_DROP_LOCATION_GDK_BIN%\include\Xal\grts_base\nt_user_context.h
+del %SDK_DROP_LOCATION_GDK_BIN%\include\Xal\xal_internal_types.h
 
 set PLAT=Gaming.Xbox.x64
 set PLAT_LAYOUT_NAME=GSDKXboxExtensionSDKs
 set TYPE=release
-copy %TFS_DropLocation%\%TYPE%\%PLAT%\Microsoft.Xbox.Services.141.GDK.C\Microsoft.Xbox.Services.141.GDK.C.pdb %PATH_GDK_DROP_BIN%\binaries\%PLAT_LAYOUT_NAME%\%TYPE%\v141
-copy %TFS_DropLocation%\%TYPE%\%PLAT%\Microsoft.Xbox.Services.141.GDK.C\Microsoft.Xbox.Services.141.GDK.C.lib %PATH_GDK_DROP_BIN%\binaries\%PLAT_LAYOUT_NAME%\%TYPE%\v141\Microsoft.Xbox.Services.141.GDK.C.lib.remove
-copy %TFS_DropLocation%\%TYPE%\%PLAT%\Microsoft.Xbox.Services.142.GDK.C\Microsoft.Xbox.Services.142.GDK.C.pdb %PATH_GDK_DROP_BIN%\binaries\%PLAT_LAYOUT_NAME%\%TYPE%\v142
-copy %TFS_DropLocation%\%TYPE%\%PLAT%\Microsoft.Xbox.Services.142.GDK.C\Microsoft.Xbox.Services.142.GDK.C.lib %PATH_GDK_DROP_BIN%\binaries\%PLAT_LAYOUT_NAME%\%TYPE%\v142\Microsoft.Xbox.Services.142.GDK.C.lib.remove
-copy %TFS_DropLocation%\%TYPE%\%PLAT%\libHttpClient.141.GDK.C\libHttpClient.141.GDK.C.pdb %PATH_GDK_DROP_BIN%\binaries\%PLAT_LAYOUT_NAME%\%TYPE%\v141
-copy %TFS_DropLocation%\%TYPE%\%PLAT%\libHttpClient.141.GDK.C\libHttpClient.141.GDK.C.lib %PATH_GDK_DROP_BIN%\binaries\%PLAT_LAYOUT_NAME%\%TYPE%\v141\libHttpClient.141.GDK.C.lib.remove
-copy %TFS_DropLocation%\%TYPE%\%PLAT%\libHttpClient.142.GDK.C\libHttpClient.142.GDK.C.pdb %PATH_GDK_DROP_BIN%\binaries\%PLAT_LAYOUT_NAME%\%TYPE%\v142
-copy %TFS_DropLocation%\%TYPE%\%PLAT%\libHttpClient.142.GDK.C\libHttpClient.142.GDK.C.lib %PATH_GDK_DROP_BIN%\binaries\%PLAT_LAYOUT_NAME%\%TYPE%\v142\libHttpClient.141.GDK.C.lib.remove
+copy %BUILD_BINARIESDIRECTORY%\%TYPE%\%PLAT%\Microsoft.Xbox.Services.141.GDK.C\Microsoft.Xbox.Services.141.GDK.C.pdb %SDK_DROP_LOCATION_GDK_BIN%\binaries\%PLAT_LAYOUT_NAME%\%TYPE%\v141
+copy %BUILD_BINARIESDIRECTORY%\%TYPE%\%PLAT%\Microsoft.Xbox.Services.141.GDK.C\Microsoft.Xbox.Services.141.GDK.C.lib %SDK_DROP_LOCATION_GDK_BIN%\binaries\%PLAT_LAYOUT_NAME%\%TYPE%\v141\Microsoft.Xbox.Services.141.GDK.C.lib.remove
+copy %BUILD_BINARIESDIRECTORY%\%TYPE%\%PLAT%\Microsoft.Xbox.Services.142.GDK.C\Microsoft.Xbox.Services.142.GDK.C.pdb %SDK_DROP_LOCATION_GDK_BIN%\binaries\%PLAT_LAYOUT_NAME%\%TYPE%\v142
+copy %BUILD_BINARIESDIRECTORY%\%TYPE%\%PLAT%\Microsoft.Xbox.Services.142.GDK.C\Microsoft.Xbox.Services.142.GDK.C.lib %SDK_DROP_LOCATION_GDK_BIN%\binaries\%PLAT_LAYOUT_NAME%\%TYPE%\v142\Microsoft.Xbox.Services.142.GDK.C.lib.remove
+copy %BUILD_BINARIESDIRECTORY%\%TYPE%\%PLAT%\libHttpClient.141.GDK.C\libHttpClient.141.GDK.C.pdb %SDK_DROP_LOCATION_GDK_BIN%\binaries\%PLAT_LAYOUT_NAME%\%TYPE%\v141
+copy %BUILD_BINARIESDIRECTORY%\%TYPE%\%PLAT%\libHttpClient.141.GDK.C\libHttpClient.141.GDK.C.lib %SDK_DROP_LOCATION_GDK_BIN%\binaries\%PLAT_LAYOUT_NAME%\%TYPE%\v141\libHttpClient.141.GDK.C.lib.remove
+copy %BUILD_BINARIESDIRECTORY%\%TYPE%\%PLAT%\libHttpClient.142.GDK.C\libHttpClient.142.GDK.C.pdb %SDK_DROP_LOCATION_GDK_BIN%\binaries\%PLAT_LAYOUT_NAME%\%TYPE%\v142
+copy %BUILD_BINARIESDIRECTORY%\%TYPE%\%PLAT%\libHttpClient.142.GDK.C\libHttpClient.142.GDK.C.lib %SDK_DROP_LOCATION_GDK_BIN%\binaries\%PLAT_LAYOUT_NAME%\%TYPE%\v142\libHttpClient.141.GDK.C.lib.remove
 
 set TYPE=debug
-copy %TFS_DropLocation%\%TYPE%\%PLAT%\Microsoft.Xbox.Services.141.GDK.C\Microsoft.Xbox.Services.141.GDK.C.pdb %PATH_GDK_DROP_BIN%\binaries\%PLAT_LAYOUT_NAME%\%TYPE%\v141
-copy %TFS_DropLocation%\%TYPE%\%PLAT%\Microsoft.Xbox.Services.141.GDK.C\Microsoft.Xbox.Services.141.GDK.C.lib %PATH_GDK_DROP_BIN%\binaries\%PLAT_LAYOUT_NAME%\%TYPE%\v141\Microsoft.Xbox.Services.141.GDK.C.lib.remove
-copy %TFS_DropLocation%\%TYPE%\%PLAT%\Microsoft.Xbox.Services.142.GDK.C\Microsoft.Xbox.Services.142.GDK.C.pdb %PATH_GDK_DROP_BIN%\binaries\%PLAT_LAYOUT_NAME%\%TYPE%\v142
-copy %TFS_DropLocation%\%TYPE%\%PLAT%\Microsoft.Xbox.Services.142.GDK.C\Microsoft.Xbox.Services.142.GDK.C.lib %PATH_GDK_DROP_BIN%\binaries\%PLAT_LAYOUT_NAME%\%TYPE%\v142\Microsoft.Xbox.Services.142.GDK.C.lib.remove
-copy %TFS_DropLocation%\%TYPE%\%PLAT%\libHttpClient.141.GDK.C\libHttpClient.141.GDK.C.pdb %PATH_GDK_DROP_BIN%\binaries\%PLAT_LAYOUT_NAME%\%TYPE%\v141
-copy %TFS_DropLocation%\%TYPE%\%PLAT%\libHttpClient.141.GDK.C\libHttpClient.141.GDK.C.lib %PATH_GDK_DROP_BIN%\binaries\%PLAT_LAYOUT_NAME%\%TYPE%\v141\libHttpClient.141.GDK.C.lib.remove
-copy %TFS_DropLocation%\%TYPE%\%PLAT%\libHttpClient.142.GDK.C\libHttpClient.142.GDK.C.pdb %PATH_GDK_DROP_BIN%\binaries\%PLAT_LAYOUT_NAME%\%TYPE%\v142
-copy %TFS_DropLocation%\%TYPE%\%PLAT%\libHttpClient.142.GDK.C\libHttpClient.142.GDK.C.lib %PATH_GDK_DROP_BIN%\binaries\%PLAT_LAYOUT_NAME%\%TYPE%\v142\libHttpClient.142.GDK.C.lib.remove
+copy %BUILD_BINARIESDIRECTORY%\%TYPE%\%PLAT%\Microsoft.Xbox.Services.141.GDK.C\Microsoft.Xbox.Services.141.GDK.C.pdb %SDK_DROP_LOCATION_GDK_BIN%\binaries\%PLAT_LAYOUT_NAME%\%TYPE%\v141
+copy %BUILD_BINARIESDIRECTORY%\%TYPE%\%PLAT%\Microsoft.Xbox.Services.141.GDK.C\Microsoft.Xbox.Services.141.GDK.C.lib %SDK_DROP_LOCATION_GDK_BIN%\binaries\%PLAT_LAYOUT_NAME%\%TYPE%\v141\Microsoft.Xbox.Services.141.GDK.C.lib.remove
+copy %BUILD_BINARIESDIRECTORY%\%TYPE%\%PLAT%\Microsoft.Xbox.Services.142.GDK.C\Microsoft.Xbox.Services.142.GDK.C.pdb %SDK_DROP_LOCATION_GDK_BIN%\binaries\%PLAT_LAYOUT_NAME%\%TYPE%\v142
+copy %BUILD_BINARIESDIRECTORY%\%TYPE%\%PLAT%\Microsoft.Xbox.Services.142.GDK.C\Microsoft.Xbox.Services.142.GDK.C.lib %SDK_DROP_LOCATION_GDK_BIN%\binaries\%PLAT_LAYOUT_NAME%\%TYPE%\v142\Microsoft.Xbox.Services.142.GDK.C.lib.remove
+copy %BUILD_BINARIESDIRECTORY%\%TYPE%\%PLAT%\libHttpClient.141.GDK.C\libHttpClient.141.GDK.C.pdb %SDK_DROP_LOCATION_GDK_BIN%\binaries\%PLAT_LAYOUT_NAME%\%TYPE%\v141
+copy %BUILD_BINARIESDIRECTORY%\%TYPE%\%PLAT%\libHttpClient.141.GDK.C\libHttpClient.141.GDK.C.lib %SDK_DROP_LOCATION_GDK_BIN%\binaries\%PLAT_LAYOUT_NAME%\%TYPE%\v141\libHttpClient.141.GDK.C.lib.remove
+copy %BUILD_BINARIESDIRECTORY%\%TYPE%\%PLAT%\libHttpClient.142.GDK.C\libHttpClient.142.GDK.C.pdb %SDK_DROP_LOCATION_GDK_BIN%\binaries\%PLAT_LAYOUT_NAME%\%TYPE%\v142
+copy %BUILD_BINARIESDIRECTORY%\%TYPE%\%PLAT%\libHttpClient.142.GDK.C\libHttpClient.142.GDK.C.lib %SDK_DROP_LOCATION_GDK_BIN%\binaries\%PLAT_LAYOUT_NAME%\%TYPE%\v142\libHttpClient.142.GDK.C.lib.remove
 
 set PLAT=Gaming.Desktop.x64
 set PLAT_LAYOUT_NAME=GSDKDesktopExtensionSDKs
 set TYPE=release
-copy %TFS_DropLocation%\%TYPE%\%PLAT%\Microsoft.Xbox.Services.141.GDK.C\Microsoft.Xbox.Services.141.GDK.C.pdb %PATH_GDK_DROP_BIN%\binaries\%PLAT_LAYOUT_NAME%\%TYPE%\v141
-copy %TFS_DropLocation%\%TYPE%\%PLAT%\Microsoft.Xbox.Services.141.GDK.C\Microsoft.Xbox.Services.141.GDK.C.lib %PATH_GDK_DROP_BIN%\binaries\%PLAT_LAYOUT_NAME%\%TYPE%\v141\Microsoft.Xbox.Services.141.GDK.C.lib.remove
-copy %TFS_DropLocation%\%TYPE%\%PLAT%\Microsoft.Xbox.Services.142.GDK.C\Microsoft.Xbox.Services.142.GDK.C.pdb %PATH_GDK_DROP_BIN%\binaries\%PLAT_LAYOUT_NAME%\%TYPE%\v142
-copy %TFS_DropLocation%\%TYPE%\%PLAT%\Microsoft.Xbox.Services.142.GDK.C\Microsoft.Xbox.Services.142.GDK.C.lib %PATH_GDK_DROP_BIN%\binaries\%PLAT_LAYOUT_NAME%\%TYPE%\v142\Microsoft.Xbox.Services.142.GDK.C.lib.remove
-copy %TFS_DropLocation%\%TYPE%\%PLAT%\libHttpClient.141.GDK.C\libHttpClient.141.GDK.C.pdb %PATH_GDK_DROP_BIN%\binaries\%PLAT_LAYOUT_NAME%\%TYPE%\v141
-copy %TFS_DropLocation%\%TYPE%\%PLAT%\libHttpClient.141.GDK.C\libHttpClient.141.GDK.C.lib %PATH_GDK_DROP_BIN%\binaries\%PLAT_LAYOUT_NAME%\%TYPE%\v141\libHttpClient.141.GDK.C.lib.remove
-copy %TFS_DropLocation%\%TYPE%\%PLAT%\libHttpClient.142.GDK.C\libHttpClient.142.GDK.C.pdb %PATH_GDK_DROP_BIN%\binaries\%PLAT_LAYOUT_NAME%\%TYPE%\v142
-copy %TFS_DropLocation%\%TYPE%\%PLAT%\libHttpClient.142.GDK.C\libHttpClient.142.GDK.C.lib %PATH_GDK_DROP_BIN%\binaries\%PLAT_LAYOUT_NAME%\%TYPE%\v142\libHttpClient.142.GDK.C.lib.remove
+copy %BUILD_BINARIESDIRECTORY%\%TYPE%\%PLAT%\Microsoft.Xbox.Services.141.GDK.C\Microsoft.Xbox.Services.141.GDK.C.pdb %SDK_DROP_LOCATION_GDK_BIN%\binaries\%PLAT_LAYOUT_NAME%\%TYPE%\v141
+copy %BUILD_BINARIESDIRECTORY%\%TYPE%\%PLAT%\Microsoft.Xbox.Services.141.GDK.C\Microsoft.Xbox.Services.141.GDK.C.lib %SDK_DROP_LOCATION_GDK_BIN%\binaries\%PLAT_LAYOUT_NAME%\%TYPE%\v141\Microsoft.Xbox.Services.141.GDK.C.lib.remove
+copy %BUILD_BINARIESDIRECTORY%\%TYPE%\%PLAT%\Microsoft.Xbox.Services.142.GDK.C\Microsoft.Xbox.Services.142.GDK.C.pdb %SDK_DROP_LOCATION_GDK_BIN%\binaries\%PLAT_LAYOUT_NAME%\%TYPE%\v142
+copy %BUILD_BINARIESDIRECTORY%\%TYPE%\%PLAT%\Microsoft.Xbox.Services.142.GDK.C\Microsoft.Xbox.Services.142.GDK.C.lib %SDK_DROP_LOCATION_GDK_BIN%\binaries\%PLAT_LAYOUT_NAME%\%TYPE%\v142\Microsoft.Xbox.Services.142.GDK.C.lib.remove
+copy %BUILD_BINARIESDIRECTORY%\%TYPE%\%PLAT%\libHttpClient.141.GDK.C\libHttpClient.141.GDK.C.pdb %SDK_DROP_LOCATION_GDK_BIN%\binaries\%PLAT_LAYOUT_NAME%\%TYPE%\v141
+copy %BUILD_BINARIESDIRECTORY%\%TYPE%\%PLAT%\libHttpClient.141.GDK.C\libHttpClient.141.GDK.C.lib %SDK_DROP_LOCATION_GDK_BIN%\binaries\%PLAT_LAYOUT_NAME%\%TYPE%\v141\libHttpClient.141.GDK.C.lib.remove
+copy %BUILD_BINARIESDIRECTORY%\%TYPE%\%PLAT%\libHttpClient.142.GDK.C\libHttpClient.142.GDK.C.pdb %SDK_DROP_LOCATION_GDK_BIN%\binaries\%PLAT_LAYOUT_NAME%\%TYPE%\v142
+copy %BUILD_BINARIESDIRECTORY%\%TYPE%\%PLAT%\libHttpClient.142.GDK.C\libHttpClient.142.GDK.C.lib %SDK_DROP_LOCATION_GDK_BIN%\binaries\%PLAT_LAYOUT_NAME%\%TYPE%\v142\libHttpClient.142.GDK.C.lib.remove
 
 set TYPE=debug
-copy %TFS_DropLocation%\%TYPE%\%PLAT%\Microsoft.Xbox.Services.141.GDK.C\Microsoft.Xbox.Services.141.GDK.C.pdb %PATH_GDK_DROP_BIN%\binaries\%PLAT_LAYOUT_NAME%\%TYPE%\v141
-copy %TFS_DropLocation%\%TYPE%\%PLAT%\Microsoft.Xbox.Services.141.GDK.C\Microsoft.Xbox.Services.141.GDK.C.lib %PATH_GDK_DROP_BIN%\binaries\%PLAT_LAYOUT_NAME%\%TYPE%\v141\Microsoft.Xbox.Services.141.GDK.C.lib.remove
-copy %TFS_DropLocation%\%TYPE%\%PLAT%\Microsoft.Xbox.Services.142.GDK.C\Microsoft.Xbox.Services.142.GDK.C.pdb %PATH_GDK_DROP_BIN%\binaries\%PLAT_LAYOUT_NAME%\%TYPE%\v142
-copy %TFS_DropLocation%\%TYPE%\%PLAT%\Microsoft.Xbox.Services.142.GDK.C\Microsoft.Xbox.Services.142.GDK.C.lib %PATH_GDK_DROP_BIN%\binaries\%PLAT_LAYOUT_NAME%\%TYPE%\v142\Microsoft.Xbox.Services.142.GDK.C.lib.remove
-copy %TFS_DropLocation%\%TYPE%\%PLAT%\libHttpClient.141.GDK.C\libHttpClient.141.GDK.C.pdb %PATH_GDK_DROP_BIN%\binaries\%PLAT_LAYOUT_NAME%\%TYPE%\v141
-copy %TFS_DropLocation%\%TYPE%\%PLAT%\libHttpClient.141.GDK.C\libHttpClient.141.GDK.C.lib %PATH_GDK_DROP_BIN%\binaries\%PLAT_LAYOUT_NAME%\%TYPE%\v141\libHttpClient.141.GDK.C.lib.remove
-copy %TFS_DropLocation%\%TYPE%\%PLAT%\libHttpClient.142.GDK.C\libHttpClient.142.GDK.C.pdb %PATH_GDK_DROP_BIN%\binaries\%PLAT_LAYOUT_NAME%\%TYPE%\v142
-copy %TFS_DropLocation%\%TYPE%\%PLAT%\libHttpClient.142.GDK.C\libHttpClient.142.GDK.C.lib %PATH_GDK_DROP_BIN%\binaries\%PLAT_LAYOUT_NAME%\%TYPE%\v142\libHttpClient.142.GDK.C.lib.remove
+copy %BUILD_BINARIESDIRECTORY%\%TYPE%\%PLAT%\Microsoft.Xbox.Services.141.GDK.C\Microsoft.Xbox.Services.141.GDK.C.pdb %SDK_DROP_LOCATION_GDK_BIN%\binaries\%PLAT_LAYOUT_NAME%\%TYPE%\v141
+copy %BUILD_BINARIESDIRECTORY%\%TYPE%\%PLAT%\Microsoft.Xbox.Services.141.GDK.C\Microsoft.Xbox.Services.141.GDK.C.lib %SDK_DROP_LOCATION_GDK_BIN%\binaries\%PLAT_LAYOUT_NAME%\%TYPE%\v141\Microsoft.Xbox.Services.141.GDK.C.lib.remove
+copy %BUILD_BINARIESDIRECTORY%\%TYPE%\%PLAT%\Microsoft.Xbox.Services.142.GDK.C\Microsoft.Xbox.Services.142.GDK.C.pdb %SDK_DROP_LOCATION_GDK_BIN%\binaries\%PLAT_LAYOUT_NAME%\%TYPE%\v142
+copy %BUILD_BINARIESDIRECTORY%\%TYPE%\%PLAT%\Microsoft.Xbox.Services.142.GDK.C\Microsoft.Xbox.Services.142.GDK.C.lib %SDK_DROP_LOCATION_GDK_BIN%\binaries\%PLAT_LAYOUT_NAME%\%TYPE%\v142\Microsoft.Xbox.Services.142.GDK.C.lib.remove
+copy %BUILD_BINARIESDIRECTORY%\%TYPE%\%PLAT%\libHttpClient.141.GDK.C\libHttpClient.141.GDK.C.pdb %SDK_DROP_LOCATION_GDK_BIN%\binaries\%PLAT_LAYOUT_NAME%\%TYPE%\v141
+copy %BUILD_BINARIESDIRECTORY%\%TYPE%\%PLAT%\libHttpClient.141.GDK.C\libHttpClient.141.GDK.C.lib %SDK_DROP_LOCATION_GDK_BIN%\binaries\%PLAT_LAYOUT_NAME%\%TYPE%\v141\libHttpClient.141.GDK.C.lib.remove
+copy %BUILD_BINARIESDIRECTORY%\%TYPE%\%PLAT%\libHttpClient.142.GDK.C\libHttpClient.142.GDK.C.pdb %SDK_DROP_LOCATION_GDK_BIN%\binaries\%PLAT_LAYOUT_NAME%\%TYPE%\v142
+copy %BUILD_BINARIESDIRECTORY%\%TYPE%\%PLAT%\libHttpClient.142.GDK.C\libHttpClient.142.GDK.C.lib %SDK_DROP_LOCATION_GDK_BIN%\binaries\%PLAT_LAYOUT_NAME%\%TYPE%\v142\libHttpClient.142.GDK.C.lib.remove
 
 set BUILD_TOOLS=%BUILD_STAGINGDIRECTORY%\sdk.buildtools\buildMachine
 
-copy %BUILD_TOOLS%\GdkCopyHeaders.cmd %PATH_GDK_DROP%
-copy %BUILD_TOOLS%\VPackLogReader.exe %PATH_GDK_DROP%
-copy %BUILD_TOOLS%\GdkCreateVPack.cmd %PATH_GDK_DROP%
-copy %BUILD_TOOLS%\GdkFormatKML.cmd %PATH_GDK_DROP%
-copy %BUILD_TOOLS%\GdkCopyOutputToLocal.cmd %PATH_GDK_DROP%
-copy %TFS_SourcesDirectory%\Utilities\VSOBuildScripts\setBuildVersion.cmd %PATH_GDK_DROP%
-copy %TFS_SourcesDirectory%\Utilities\VSOBuildScripts\ReadSDKVerHeader.exe %PATH_GDK_DROP%
-copy %TFS_SourcesDirectory%\Source\Shared\build_version.h %PATH_GDK_DROP%
+copy %BUILD_TOOLS%\GdkCopyHeaders.cmd %SDK_DROP_LOCATION_GDK%
+copy %BUILD_TOOLS%\VPackLogReader.exe %SDK_DROP_LOCATION_GDK%
+copy %BUILD_TOOLS%\GdkCreateVPack.cmd %SDK_DROP_LOCATION_GDK%
+copy %BUILD_TOOLS%\GdkFormatKML.cmd %SDK_DROP_LOCATION_GDK%
+copy %BUILD_TOOLS%\GdkCopyOutputToLocal.cmd %SDK_DROP_LOCATION_GDK%
+copy %BUILD_SOURCESDIRECTORY%\Utilities\VSOBuildScripts\setBuildVersion.cmd %SDK_DROP_LOCATION_GDK%
+copy %BUILD_SOURCESDIRECTORY%\Utilities\VSOBuildScripts\ReadSDKVerHeader.exe %SDK_DROP_LOCATION_GDK%
+copy %BUILD_SOURCESDIRECTORY%\Source\Shared\build_version.h %SDK_DROP_LOCATION_GDK%
 
-set BUILD_INFO_PATH=%PATH_GDK_DROP%\build_info.txt
-set BUILD_INFO_BODY="%TFS_DROPLOCATION%    https://microsoft.visualstudio.com/Xbox.Services/_build/index?buildId=%BUILD_BUILDID%&_a=summary"
+set BUILD_INFO_PATH=%SDK_DROP_LOCATION_GDK%\build_info.txt
+set BUILD_INFO_BODY="%SDK_DROP_LOCATION%    https://microsoft.visualstudio.com/Xbox.Services/_build/index?buildId=%BUILD_BUILDID%&_a=summary"
 del %BUILD_INFO_PATH%
 echo %BUILD_INFO_BODY% > %BUILD_INFO_PATH%
 
-rem setup folders for GDK docs
-set PATH_GDK_DOCS=%TFS_DropLocation%\gdk-docs
+REM ------------------- GDK DOCS BEGIN-------------------
+set PATH_GDK_DOCS=%SDK_DROP_LOCATION%\GDK-Docs
 set PATH_GDK_DOCS_DROP=%PATH_GDK_DOCS%\docs
 mkdir %PATH_GDK_DOCS%
+rmdir /s /q %PATH_GDK_DOCS%
 mkdir %PATH_GDK_DOCS_DROP%
-call %BUILD_TOOLS%\Noggin\GenerateReferenceDocs.cmd %TFS_DropLocation%\include %PATH_GDK_DOCS_DROP%
+call %BUILD_TOOLS%\Noggin\GenerateReferenceDocs.cmd %SDK_DROP_LOCATION%\include %PATH_GDK_DOCS_DROP%
 copy %BUILD_TOOLS%\Noggin\CopyReferenceDocsToDocsRepo.cmd %PATH_GDK_DOCS%
 
 
-rem create unity package
-REM set UNITY_ASSET_DEST=%TFS_DropLocation%\unity
-REM set UNITY_ASSET_SRC=%TFS_SourcesDirectory%\Utilities\IDXboxUnityAssetLayout
+REM ------------------- UNITY BEGIN-------------------
+REM set SDK_DROP_LOCATION_UNITY=%SDK_DROP_LOCATION%\unity
+REM set UNITY_ASSET_SRC=%BUILD_SOURCESDIRECTORY%\Utilities\IDXboxUnityAssetLayout
 
 REM set TYPE=x64
-REM copy %UWP_BUILD_SHARE%\Release\%TYPE%\Microsoft.Xbox.Services.141.UWP.WinRT\Microsoft.Xbox.Services.dll %UNITY_ASSET_SRC%\Assets\XboxServicesAPI\Binaries\%TYPE%
-REM copy %UWP_BUILD_SHARE%\Release\%TYPE%\Microsoft.Xbox.Services.141.UWP.WinRT\Microsoft.Xbox.Services.winmd %UNITY_ASSET_SRC%\Assets\XboxServicesAPI\Binaries\WinMD
+REM copy %UWP_BINARIES%\Release\%TYPE%\Microsoft.Xbox.Services.141.UWP.WinRT\Microsoft.Xbox.Services.dll %UNITY_ASSET_SRC%\Assets\XboxServicesAPI\Binaries\%TYPE%
+REM copy %UWP_BINARIES%\Release\%TYPE%\Microsoft.Xbox.Services.141.UWP.WinRT\Microsoft.Xbox.Services.winmd %UNITY_ASSET_SRC%\Assets\XboxServicesAPI\Binaries\WinMD
 REM set TYPE=ARM
-REM copy %UWP_BUILD_SHARE%\Release\%TYPE%\Microsoft.Xbox.Services.141.UWP.WinRT\Microsoft.Xbox.Services.dll %UNITY_ASSET_SRC%\Assets\XboxServicesAPI\Binaries\%TYPE%
+REM copy %UWP_BINARIES%\Release\%TYPE%\Microsoft.Xbox.Services.141.UWP.WinRT\Microsoft.Xbox.Services.dll %UNITY_ASSET_SRC%\Assets\XboxServicesAPI\Binaries\%TYPE%
 REM set TYPE=x86
-REM copy %UWP_BUILD_SHARE%\Release\%TYPE%\Microsoft.Xbox.Services.141.UWP.WinRT\Microsoft.Xbox.Services.dll %UNITY_ASSET_SRC%\Assets\XboxServicesAPI\Binaries\%TYPE%
+REM copy %UWP_BINARIES%\Release\%TYPE%\Microsoft.Xbox.Services.141.UWP.WinRT\Microsoft.Xbox.Services.dll %UNITY_ASSET_SRC%\Assets\XboxServicesAPI\Binaries\%TYPE%
 
 REM set UNITY_PACKAGE_NAME=%UNITY_ASSET_SRC%\XboxServicesAPI-%SDK_RELEASE_NAME%-%MINOR_VERSION_NUMBER%.unitypackage
 REM "C:\Program Files\Unity\Editor\Unity.exe" -ea SilentlyContinue -batchmode -logFile "%UNITY_ASSET_SRC%\unity.log" -projectPath "%UNITY_ASSET_SRC%" -exportPackage "Assets\XboxServicesAPI" "%UNITY_PACKAGE_NAME%" -quit
 
-mkdir %UNITY_ASSET_DEST%
-robocopy /NJS /NJH /MT:16 /S /NP %UNITY_ASSET_SRC% %UNITY_ASSET_DEST%
+rem mkdir %SDK_DROP_LOCATION_UNITY%
+rem robocopy /NJS /NJH /MT:16 /S /NP %UNITY_ASSET_SRC% %SDK_DROP_LOCATION_UNITY%
 
 if "%1" == "local" goto skipMavenPublish
 
@@ -274,31 +278,30 @@ REM -------------------ANDROID BEGIN-------------------
 set JAVA_HOME="C:\Program Files\Android\jdk\microsoft_dist_openjdk_1.8.0.25"
 if "%ANDROID_HOME%" == "" set ANDROID_HOME=C:\Program Files (x86)\Android\android-sdk
 rem If we eventually want to include native libs/headers in the maven artifact we can re-enable this
-rem call %TFS_SourcesDirectory%\Java\com.microsoft.xboxlive\gradlew.bat --project-dir=%TFS_SourcesDirectory%\Java\com.microsoft.xboxlive copyNdkLibsToAAR -PInputAar=%TFS_BinariesDirectory%\Release\x86\com.microsoft.xboxlive\com.microsoft.xboxlive.aar -POutDir=%TFS_BinariesDirectory%\Release\x86\com.microsoft.xboxlive\ndklibs --info
-call %TFS_SourcesDirectory%\Java\com.microsoft.xboxlive\gradlew.bat  --project-dir=%TFS_SourcesDirectory%\Java\com.microsoft.xboxlive publish -PInputAar=%TFS_DropLocation%\Release\x86\com.microsoft.xboxlive\com.microsoft.xboxlive.aar --info
-call %TFS_SourcesDirectory%\external\xal\external\libHttpClient\Build\libHttpClient.141.Android.Java\gradlew.bat  --project-dir=%TFS_SourcesDirectory%\external\xal\external\libHttpClient\Build\libHttpClient.141.Android.Java publish -PInputAar=%TFS_DropLocation%\Release\x86\libHttpClient.141.Android.Java\libHttpClient.aar --info
-call %TFS_SourcesDirectory%\external\xal\source\XalAndroidJava\gradlew.bat  --project-dir=%TFS_SourcesDirectory%\external\xal\source\XalAndroidJava publish -PaarPath=%TFS_DropLocation%\Release\x86\XalAndroidJava\XalAndroidJava.aar --info
+rem call %BUILD_SOURCESDIRECTORY%\Java\com.microsoft.xboxlive\gradlew.bat --project-dir=%BUILD_SOURCESDIRECTORY%\Java\com.microsoft.xboxlive copyNdkLibsToAAR -PInputAar=%TFS_BinariesDirectory%\Release\x86\com.microsoft.xboxlive\com.microsoft.xboxlive.aar -POutDir=%TFS_BinariesDirectory%\Release\x86\com.microsoft.xboxlive\ndklibs --info
+call %BUILD_SOURCESDIRECTORY%\Java\com.microsoft.xboxlive\gradlew.bat  --project-dir=%BUILD_SOURCESDIRECTORY%\Java\com.microsoft.xboxlive publish -PInputAar=%SDK_DROP_LOCATION%\Release\x86\com.microsoft.xboxlive\com.microsoft.xboxlive.aar --info
+call %BUILD_SOURCESDIRECTORY%\external\xal\external\libHttpClient\Build\libHttpClient.141.Android.Java\gradlew.bat  --project-dir=%BUILD_SOURCESDIRECTORY%\external\xal\external\libHttpClient\Build\libHttpClient.141.Android.Java publish -PInputAar=%SDK_DROP_LOCATION%\Release\x86\libHttpClient.141.Android.Java\libHttpClient.aar --info
+call %BUILD_SOURCESDIRECTORY%\external\xal\source\XalAndroidJava\gradlew.bat  --project-dir=%BUILD_SOURCESDIRECTORY%\external\xal\source\XalAndroidJava publish -PaarPath=%SDK_DROP_LOCATION%\Release\x86\XalAndroidJava\XalAndroidJava.aar --info
 
 rem Copy Maven output
-xcopy %TFS_SourcesDirectory%\Java\com.microsoft.xboxlive\build\Maven\ %TFS_DropLocation%\Maven\ /s /e /q /y
-xcopy %TFS_SourcesDirectory%\external\xal\external\libHttpClient\Build\libHttpClient.141.Android.Java\build\Maven\ %TFS_DropLocation%\Maven\ /s /e /q /y
-xcopy %TFS_SourcesDirectory%\external\xal\source\XalAndroidJava\build\Maven\ %TFS_DropLocation%\Maven\ /s /e /q /y
+xcopy %BUILD_SOURCESDIRECTORY%\Java\com.microsoft.xboxlive\build\Maven\ %SDK_DROP_LOCATION%\Maven\ /s /e /q /y
+xcopy %BUILD_SOURCESDIRECTORY%\external\xal\external\libHttpClient\Build\libHttpClient.141.Android.Java\build\Maven\ %SDK_DROP_LOCATION%\Maven\ /s /e /q /y
+xcopy %BUILD_SOURCESDIRECTORY%\external\xal\source\XalAndroidJava\build\Maven\ %SDK_DROP_LOCATION%\Maven\ /s /e /q /y
 
 rem Copy native android libs and headers
-xcopy %TFS_DropLocation%\Include\* %TFS_DropLocation%\Maven\ndk\include\ /s /e /q /y
-rmdir /s /q %TFS_DropLocation%\Maven\ndk\include\cpprest
-rmdir /s /q %TFS_DropLocation%\Maven\ndk\include\pplx
-rmdir /s /q %TFS_DropLocation%\Maven\ndk\include\XalExtra\Win32
-for /R %TFS_DropLocation%\Release\x86\ %%f in (*.a) do xcopy %%f %TFS_DropLocation%\Maven\ndk\libs\Release\x86\
-for /R %TFS_DropLocation%\Release\x64\ %%f in (*.a) do xcopy %%f %TFS_DropLocation%\Maven\ndk\libs\Release\x64\
-for /R %TFS_DropLocation%\Release\arm\ %%f in (*.a) do xcopy %%f %TFS_DropLocation%\Maven\ndk\libs\Release\arm\
-for /R %TFS_DropLocation%\Release\arm64\ %%f in (*.a) do xcopy %%f %TFS_DropLocation%\Maven\ndk\libs\Release\arm64\
-for /R %TFS_DropLocation%\Debug\x86\ %%f in (*.a) do xcopy %%f %TFS_DropLocation%\Maven\ndk\libs\Debug\x86\
-for /R %TFS_DropLocation%\Debug\x64\ %%f in (*.a) do xcopy %%f %TFS_DropLocation%\Maven\ndk\libs\Debug\x64\
-for /R %TFS_DropLocation%\Debug\arm\ %%f in (*.a) do xcopy %%f %TFS_DropLocation%\Maven\ndk\libs\Debug\arm\
-for /R %TFS_DropLocation%\Debug\arm64\ %%f in (*.a) do xcopy %%f %TFS_DropLocation%\Maven\ndk\libs\Debug\arm64\
-xcopy %TFS_SourcesDirectory%\Build\xsapi.android.props %TFS_DropLocation%\Maven\ndk\
-REM -------------------ANDROID END-------------------
+xcopy %SDK_DROP_LOCATION%\Include\* %SDK_DROP_LOCATION%\Maven\ndk\include\ /s /e /q /y
+rmdir /s /q %SDK_DROP_LOCATION%\Maven\ndk\include\cpprest
+rmdir /s /q %SDK_DROP_LOCATION%\Maven\ndk\include\pplx
+rmdir /s /q %SDK_DROP_LOCATION%\Maven\ndk\include\XalExtra\Win32
+for /R %SDK_DROP_LOCATION%\Release\x86\ %%f in (*.a) do xcopy %%f %SDK_DROP_LOCATION%\Maven\ndk\libs\Release\x86\
+for /R %SDK_DROP_LOCATION%\Release\x64\ %%f in (*.a) do xcopy %%f %SDK_DROP_LOCATION%\Maven\ndk\libs\Release\x64\
+for /R %SDK_DROP_LOCATION%\Release\arm\ %%f in (*.a) do xcopy %%f %SDK_DROP_LOCATION%\Maven\ndk\libs\Release\arm\
+for /R %SDK_DROP_LOCATION%\Release\arm64\ %%f in (*.a) do xcopy %%f %SDK_DROP_LOCATION%\Maven\ndk\libs\Release\arm64\
+for /R %SDK_DROP_LOCATION%\Debug\x86\ %%f in (*.a) do xcopy %%f %SDK_DROP_LOCATION%\Maven\ndk\libs\Debug\x86\
+for /R %SDK_DROP_LOCATION%\Debug\x64\ %%f in (*.a) do xcopy %%f %SDK_DROP_LOCATION%\Maven\ndk\libs\Debug\x64\
+for /R %SDK_DROP_LOCATION%\Debug\arm\ %%f in (*.a) do xcopy %%f %SDK_DROP_LOCATION%\Maven\ndk\libs\Debug\arm\
+for /R %SDK_DROP_LOCATION%\Debug\arm64\ %%f in (*.a) do xcopy %%f %SDK_DROP_LOCATION%\Maven\ndk\libs\Debug\arm64\
+xcopy %BUILD_SOURCESDIRECTORY%\Build\xsapi.android.props %SDK_DROP_LOCATION%\Maven\ndk\
 
 :skipMavenPublish
 @echo on
@@ -307,36 +310,36 @@ if "%skipNuget%" == "1" goto skipNuget
 if "%1" == "local" goto skipNuget
 rem :skipCopy
 
-rem Nuget packages currently not needed by any partner. Always skip generation until we have a need for these
+REM Skipping nuget packages creation until needed
 goto skipNuget
 
+REM -------------------NUGET PACKAGE BEGIN-------------------
 rem create Cpp.Win32 nuget package
-rmdir /s /q %TFS_DropLocation%\include\winrt
-rmdir /s /q %TFS_DropLocation%\include\cppwinrt
-%NUGET_EXE% pack %TFS_DropLocation%\Nuget\Microsoft.Xbox.Live.SDK.Cpp.Win32.nuspec -BasePath %TFS_DropLocation% -OutputDirectory %TFS_DropLocation% -Verbosity normal -version %NUGET_VERSION_NUMBER%
-%NUGET_EXE% pack %TFS_DropLocation%\Nuget\Microsoft.Xbox.Live.SDK.Cpp.Win32.v141.x64.nuspec -BasePath %TFS_DropLocation% -OutputDirectory %TFS_DropLocation% -Verbosity normal -version %NUGET_VERSION_NUMBER% 
-%NUGET_EXE% pack %TFS_DropLocation%\Nuget\Microsoft.Xbox.Live.SDK.Cpp.Win32.v141.x86.nuspec -BasePath %TFS_DropLocation% -OutputDirectory %TFS_DropLocation% -Verbosity normal -version %NUGET_VERSION_NUMBER% 
+rmdir /s /q %SDK_DROP_LOCATION%\include\winrt
+rmdir /s /q %SDK_DROP_LOCATION%\include\cppwinrt
+%NUGET_EXE% pack %SDK_DROP_LOCATION%\Nuget\Microsoft.Xbox.Live.SDK.Cpp.Win32.nuspec -BasePath %SDK_DROP_LOCATION% -OutputDirectory %SDK_DROP_LOCATION% -Verbosity normal -version %NUGET_VERSION_NUMBER%
+%NUGET_EXE% pack %SDK_DROP_LOCATION%\Nuget\Microsoft.Xbox.Live.SDK.Cpp.Win32.v141.x64.nuspec -BasePath %SDK_DROP_LOCATION% -OutputDirectory %SDK_DROP_LOCATION% -Verbosity normal -version %NUGET_VERSION_NUMBER% 
+%NUGET_EXE% pack %SDK_DROP_LOCATION%\Nuget\Microsoft.Xbox.Live.SDK.Cpp.Win32.v141.x86.nuspec -BasePath %SDK_DROP_LOCATION% -OutputDirectory %SDK_DROP_LOCATION% -Verbosity normal -version %NUGET_VERSION_NUMBER% 
 
 rem create Cpp.UWP nuget package
-%NUGET_EXE% pack %TFS_DropLocation%\Nuget\Microsoft.Xbox.Live.SDK.Cpp.UWP.nuspec -BasePath %TFS_DropLocation% -OutputDirectory %TFS_DropLocation% -Verbosity normal -version %NUGET_VERSION_NUMBER%
-%NUGET_EXE% pack %TFS_DropLocation%\Nuget\Microsoft.Xbox.Live.SDK.Cpp.UWP.v140.ARM.nuspec -BasePath %TFS_DropLocation% -OutputDirectory %TFS_DropLocation% -Verbosity normal -version %NUGET_VERSION_NUMBER%
-%NUGET_EXE% pack %TFS_DropLocation%\Nuget\Microsoft.Xbox.Live.SDK.Cpp.UWP.v140.x64.nuspec -BasePath %TFS_DropLocation% -OutputDirectory %TFS_DropLocation% -Verbosity normal -version %NUGET_VERSION_NUMBER% 
-%NUGET_EXE% pack %TFS_DropLocation%\Nuget\Microsoft.Xbox.Live.SDK.Cpp.UWP.v140.x86.nuspec -BasePath %TFS_DropLocation% -OutputDirectory %TFS_DropLocation% -Verbosity normal -version %NUGET_VERSION_NUMBER% 
-%NUGET_EXE% pack %TFS_DropLocation%\Nuget\Microsoft.Xbox.Live.SDK.Cpp.UWP.v141.ARM.nuspec -BasePath %TFS_DropLocation% -OutputDirectory %TFS_DropLocation% -Verbosity normal -version %NUGET_VERSION_NUMBER%
-%NUGET_EXE% pack %TFS_DropLocation%\Nuget\Microsoft.Xbox.Live.SDK.Cpp.UWP.v141.x64.nuspec -BasePath %TFS_DropLocation% -OutputDirectory %TFS_DropLocation% -Verbosity normal -version %NUGET_VERSION_NUMBER% 
-%NUGET_EXE% pack %TFS_DropLocation%\Nuget\Microsoft.Xbox.Live.SDK.Cpp.UWP.v141.x86.nuspec -BasePath %TFS_DropLocation% -OutputDirectory %TFS_DropLocation% -Verbosity normal -version %NUGET_VERSION_NUMBER% 
-
+%NUGET_EXE% pack %SDK_DROP_LOCATION%\Nuget\Microsoft.Xbox.Live.SDK.Cpp.UWP.nuspec -BasePath %SDK_DROP_LOCATION% -OutputDirectory %SDK_DROP_LOCATION% -Verbosity normal -version %NUGET_VERSION_NUMBER%
+%NUGET_EXE% pack %SDK_DROP_LOCATION%\Nuget\Microsoft.Xbox.Live.SDK.Cpp.UWP.v140.ARM.nuspec -BasePath %SDK_DROP_LOCATION% -OutputDirectory %SDK_DROP_LOCATION% -Verbosity normal -version %NUGET_VERSION_NUMBER%
+%NUGET_EXE% pack %SDK_DROP_LOCATION%\Nuget\Microsoft.Xbox.Live.SDK.Cpp.UWP.v140.x64.nuspec -BasePath %SDK_DROP_LOCATION% -OutputDirectory %SDK_DROP_LOCATION% -Verbosity normal -version %NUGET_VERSION_NUMBER% 
+%NUGET_EXE% pack %SDK_DROP_LOCATION%\Nuget\Microsoft.Xbox.Live.SDK.Cpp.UWP.v140.x86.nuspec -BasePath %SDK_DROP_LOCATION% -OutputDirectory %SDK_DROP_LOCATION% -Verbosity normal -version %NUGET_VERSION_NUMBER% 
+%NUGET_EXE% pack %SDK_DROP_LOCATION%\Nuget\Microsoft.Xbox.Live.SDK.Cpp.UWP.v141.ARM.nuspec -BasePath %SDK_DROP_LOCATION% -OutputDirectory %SDK_DROP_LOCATION% -Verbosity normal -version %NUGET_VERSION_NUMBER%
+%NUGET_EXE% pack %SDK_DROP_LOCATION%\Nuget\Microsoft.Xbox.Live.SDK.Cpp.UWP.v141.x64.nuspec -BasePath %SDK_DROP_LOCATION% -OutputDirectory %SDK_DROP_LOCATION% -Verbosity normal -version %NUGET_VERSION_NUMBER% 
+%NUGET_EXE% pack %SDK_DROP_LOCATION%\Nuget\Microsoft.Xbox.Live.SDK.Cpp.UWP.v141.x86.nuspec -BasePath %SDK_DROP_LOCATION% -OutputDirectory %SDK_DROP_LOCATION% -Verbosity normal -version %NUGET_VERSION_NUMBER% 
 
 rmdir /s /q %WINSDK_OUTPUT_DEST%
 
 rem create Cpp.XDK nuget package
-%NUGET_EXE% pack %TFS_DropLocation%\Nuget\Microsoft.Xbox.Live.SDK.Cpp.XboxOneXDK.nuspec -BasePath %TFS_DropLocation% -OutputDirectory %TFS_DropLocation% -Verbosity normal -version %NUGET_VERSION_NUMBER%
+%NUGET_EXE% pack %SDK_DROP_LOCATION%\Nuget\Microsoft.Xbox.Live.SDK.Cpp.XboxOneXDK.nuspec -BasePath %SDK_DROP_LOCATION% -OutputDirectory %SDK_DROP_LOCATION% -Verbosity normal -version %NUGET_VERSION_NUMBER%
 
-
-mkdir %TFS_DropLocation%\NuGetBinaries\%BUILDCONFIGURATION%\%BUILDPLATFORM%
-move %TFS_DropLocation%\*.nupkg %TFS_DropLocation%\NuGetBinaries\%BUILDCONFIGURATION%\%BUILDPLATFORM%
+mkdir %SDK_DROP_LOCATION%\NuGetBinaries\%BUILDCONFIGURATION%\%BUILDPLATFORM%
+move %SDK_DROP_LOCATION%\*.nupkg %SDK_DROP_LOCATION%\NuGetBinaries\%BUILDCONFIGURATION%\%BUILDPLATFORM%
 :skipNuget
 
+REM -------------------DONE-------------------
 :finalize
 
 echo.
@@ -346,15 +349,3 @@ endlocal
 
 :done
 exit /b
-
-:GetTarget  
-@echo off & setlocal
-set gt=%temp%\_.vbs
-echo set WshShell = WScript.CreateObject("WScript.Shell")>%gt%
-echo set Lnk = WshShell.CreateShortcut(WScript.Arguments.Unnamed(0))>>%gt%
-echo wscript.Echo Lnk.TargetPath>>%gt%
-set script=cscript //nologo %gt%
-For /f "delims=" %%a in ( '%script% "%~1"' ) do set target=%%a
-del %gt%
-endlocal & set %~2=%target%
-exit /b

Utilities/VSOBuildScripts/postBuildScriptVPack.cmd

@@ -0,0 +1,44 @@
+if "%1" == "local" goto testlocal
+goto start
+
+:testlocal
+set BUILD_BINARIESDIRECTORY=%CD%\..\..\Bins
+set BUILD_SOURCESDIRECTORY=%CD%\..\..
+
+goto serializeForPostbuild
+
+:start
+
+rem if "%XES_SERIALPOSTBUILDREADY%" == "True" goto serializeForPostbuild
+rem goto done
+:serializeForPostbuild
+
+echo Running postBuildScriptVPack.cmd
+echo on
+
+set
+
+set SDK_DROP_LOCATION=%BUILD_BINARIESDIRECTORY%\SDK
+mkdir %SDK_DROP_LOCATION%
+
+if "%BUILD_DEFINITIONNAME%" == "XSAPI_Combined_Rolling_Build" goto finalize
+
+REM ------------------- GDK BEGIN -------------------
+set SDK_DROP_LOCATION_GDK=%SDK_DROP_LOCATION%\GDK
+set SDK_DROP_LOCATION_GDK_VPACK=%SDK_DROP_LOCATION%\GDK-VPack
+mkdir %SDK_DROP_LOCATION_GDK_VPACK%
+mkdir %SDK_DROP_LOCATION_GDK_VPACK%\include
+
+robocopy /NJS /NJH /MT:16 /S /NP %SDK_DROP_LOCATION_GDK%\c\include %SDK_DROP_LOCATION_GDK_VPACK%\include
+copy %XES_VPACKMANIFESTDIRECTORY%\%XES_VPACKMANIFESTNAME% %SDK_DROP_LOCATION_GDK_VPACK%
+
+REM -------------------DONE-------------------
+:finalize
+
+echo.
+echo Done postBuildScriptVPack.cmd
+echo.
+endlocal
+
+:done
+exit /b