Revert "Revert Namespaces changes in Master" (463898fa) · Commits · for microsoft in general / xbox / tunip3 / WindowsDevicePortalWrapper

Samples/XboxWdpDriver/Operations/ConfigOperation.cs

+4 −3

Original line number	Diff line number	Diff line
		@@ -8,6 +8,7 @@ using System;
		using System.Threading.Tasks;
		using Microsoft.Tools.WindowsDevicePortal;
		using static Microsoft.Tools.WindowsDevicePortal.DevicePortal;
		using static Microsoft.Tools.WindowsDevicePortal.XboxDevicePortal;

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

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

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

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

		Console.WriteLine(setSettingTask.Result);

Samples/XboxWdpDriver/Operations/FiddlerOperation.cs

+2 −2

Original line number	Diff line number	Diff line
		@@ -65,13 +65,13 @@ namespace XboxWdpDriver
		return;
		}

		Task fiddlerEnableTask = portal.EnableFiddlerTracingAsync(proxyAddress, proxyPort, parameters.GetParameterValue("certpath"));
		Task fiddlerEnableTask = portal.Xbox.EnableFiddlerTracingAsync(proxyAddress, proxyPort, parameters.GetParameterValue("certpath"));
		fiddlerEnableTask.Wait();
		Console.WriteLine("Fiddler enabled.");
		}
		else if (string.Equals(state, "off", StringComparison.OrdinalIgnoreCase))
		{
		Task fiddlerDisableTask = portal.DisableFiddlerTracingAsync();
		Task fiddlerDisableTask = portal.Xbox.DisableFiddlerTracingAsync();
		fiddlerDisableTask.Wait();
		Console.WriteLine("Fiddler disabled.");
		}

Samples/XboxWdpDriver/Operations/InstallOperation.cs

+5 −4

Original line number	Diff line number	Diff line
		@@ -11,6 +11,7 @@ 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
		{
		@@ -171,7 +172,7 @@ namespace XboxWdpDriver
		{
		if (e.HResult == ErrorLogonFailureHresult)
		{
		Task<SmbInfo> smbTask = portal.GetSmbShareInfoAsync();
		Task<SmbInfo> smbTask = portal.Xbox.GetSmbShareInfoAsync();
		smbTask.Wait();

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

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

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

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

		foreach (string subDir in Directory.GetDirectories(folderPath))

Samples/XboxWdpDriver/Operations/SandboxOperation.cs

+3 −2

Original line number	Diff line number	Diff line
		@@ -8,6 +8,7 @@ using System;
		using System.Threading.Tasks;
		using Microsoft.Tools.WindowsDevicePortal;
		using static Microsoft.Tools.WindowsDevicePortal.DevicePortal;
		using static Microsoft.Tools.WindowsDevicePortal.XboxDevicePortal;

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

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

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

		Console.WriteLine("{0} -> {1}", setSandboxTask.Result, desiredValue);

Samples/XboxWdpDriver/Operations/ScreenshotOperation.cs

+1 −1

Original line number	Diff line number	Diff line
		@@ -53,7 +53,7 @@ namespace XboxWdpDriver
		}
		else
		{
		Task<Stream> screenshotTask = portal.TakeXboxScreenshotAsync();
		Task<Stream> screenshotTask = portal.Xbox.TakeXboxScreenshotAsync();
		screenshotTask.Wait();

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