Commit 43ad6e85 authored by Hirsch Singhal's avatar Hirsch Singhal
Browse files

Revert "Move HTTP Stream apis to public. Finish move of namespaces."

This reverts commit 2e715ff0.
parent 2e715ff0
Loading
Loading
Loading
Loading
+3 −4
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ using System;
using System.Threading.Tasks;
using Microsoft.Tools.WindowsDevicePortal;
using static Microsoft.Tools.WindowsDevicePortal.DevicePortal;
using static Microsoft.Tools.WindowsDevicePortal.XboxDevicePortal;

namespace XboxWdpDriver
{
@@ -47,7 +46,7 @@ namespace XboxWdpDriver
            // Determine if this is for all settings or a single setting.
            if (string.IsNullOrWhiteSpace(desiredSetting))
            {
                Task<XboxSettingList> getSettingsTask = portal.Xbox.GetXboxSettingsAsync();
                Task<XboxSettingList> getSettingsTask = portal.GetXboxSettingsAsync();
                getSettingsTask.Wait();

                Console.WriteLine(getSettingsTask.Result);
@@ -56,7 +55,7 @@ namespace XboxWdpDriver
            {
                if (string.IsNullOrWhiteSpace(desiredValue))
                {
                    Task<XboxSetting> getSettingTask = portal.Xbox.GetXboxSettingAsync(desiredSetting);
                    Task<XboxSetting> getSettingTask = portal.GetXboxSettingAsync(desiredSetting);
                    getSettingTask.Wait();

                    Console.WriteLine(getSettingTask.Result);
@@ -67,7 +66,7 @@ namespace XboxWdpDriver
                    setting.Name = desiredSetting;
                    setting.Value = desiredValue;

                    Task<XboxSetting> setSettingTask = portal.Xbox.UpdateXboxSettingAsync(setting);
                    Task<XboxSetting> setSettingTask = portal.UpdateXboxSettingAsync(setting);
                    setSettingTask.Wait();

                    Console.WriteLine(setSettingTask.Result);
+2 −2
Original line number Diff line number Diff line
@@ -65,13 +65,13 @@ namespace XboxWdpDriver
                        return;
                    }

                    Task fiddlerEnableTask = portal.Xbox.EnableFiddlerTracingAsync(proxyAddress, proxyPort, parameters.GetParameterValue("certpath"));
                    Task fiddlerEnableTask = portal.EnableFiddlerTracingAsync(proxyAddress, proxyPort, parameters.GetParameterValue("certpath"));
                    fiddlerEnableTask.Wait();
                    Console.WriteLine("Fiddler enabled.");
                }
                else if (string.Equals(state, "off", StringComparison.OrdinalIgnoreCase))
                {
                    Task fiddlerDisableTask = portal.Xbox.DisableFiddlerTracingAsync();
                    Task fiddlerDisableTask = portal.DisableFiddlerTracingAsync();
                    fiddlerDisableTask.Wait();
                    Console.WriteLine("Fiddler disabled.");
                }
+4 −5
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ using System.Threading;
using System.Threading.Tasks;
using Microsoft.Tools.WindowsDevicePortal;
using static Microsoft.Tools.WindowsDevicePortal.DevicePortal;
using static Microsoft.Tools.WindowsDevicePortal.XboxDevicePortal;

namespace XboxWdpDriver
{
@@ -172,7 +171,7 @@ namespace XboxWdpDriver
                        {
                            if (e.HResult == ErrorLogonFailureHresult)
                            {
                                Task<SmbInfo> smbTask = portal.Xbox.GetSmbShareInfoAsync();
                                Task<SmbInfo> smbTask = portal.GetSmbShareInfoAsync();
                                smbTask.Wait();

                                // Set the username/password for accessing the share.
@@ -206,14 +205,14 @@ namespace XboxWdpDriver
                        return;
                    }

                    Task registerTask = portal.Xbox.RegisterApplicationAsync(destinationFolderName);
                    Task registerTask = portal.RegisterApplicationAsync(destinationFolderName);
                    registerTask.Wait();

                    Console.WriteLine("Install complete.");
                }
                else if (!string.IsNullOrEmpty(registerPath))
                {
                    Task registerTask = portal.Xbox.RegisterApplicationAsync(registerPath);
                    Task registerTask = portal.RegisterApplicationAsync(registerPath);
                    registerTask.Wait();

                    Console.WriteLine("Registration complete.");
@@ -276,7 +275,7 @@ namespace XboxWdpDriver
        /// <param name="relativeDestination">The relative destination directory.</param>
        private void UploadDirectoryOverHttp(string folderPath, string relativeDestination)
        {
            Task uploadTask = this.portal.Xbox.UploadPackageFolderAsync(folderPath, relativeDestination);
            Task uploadTask = this.portal.UploadPackageFolderAsync(folderPath, relativeDestination);
            uploadTask.Wait();

            foreach (string subDir in Directory.GetDirectories(folderPath))
+2 −3
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ using System;
using System.Threading.Tasks;
using Microsoft.Tools.WindowsDevicePortal;
using static Microsoft.Tools.WindowsDevicePortal.DevicePortal;
using static Microsoft.Tools.WindowsDevicePortal.XboxDevicePortal;

namespace XboxWdpDriver
{
@@ -43,14 +42,14 @@ namespace XboxWdpDriver

            if (string.IsNullOrEmpty(desiredValue))
            {
                Task<Sandbox> getSandboxTask = portal.Xbox.GetXboxLiveSandboxAsync();
                Task<Sandbox> getSandboxTask = portal.GetXboxLiveSandboxAsync();
                getSandboxTask.Wait();

                Console.WriteLine(getSandboxTask.Result);
            }
            else
            {
                Task<Sandbox> setSandboxTask = portal.Xbox.SetXboxLiveSandboxAsync(desiredValue);
                Task<Sandbox> setSandboxTask = portal.SetXboxLiveSandboxAsync(desiredValue);
                setSandboxTask.Wait();

                Console.WriteLine("{0} -> {1}", setSandboxTask.Result, desiredValue);
+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ namespace XboxWdpDriver
            }
            else
            {
                Task<Stream> screenshotTask = portal.Xbox.TakeXboxScreenshotAsync();
                Task<Stream> screenshotTask = portal.TakeXboxScreenshotAsync();
                screenshotTask.Wait();

                using (var fileStream = new FileStream(filepath, FileMode.Create))
Loading