Merge pull request #1 from Microsoft/master (ff913122) · Commits · for microsoft in general / xbox / tunip3 / WindowsDevicePortalWrapper

Samples/SampleWdpClient.UniversalWindows/MainPage.xaml.cs

+7 −7

Original line number	Diff line number	Diff line
		@@ -113,9 +113,9 @@ namespace SampleWdpClient.UniversalWindows
		// remainder of this session.
		if (allowUntrusted)
		{
		await portal.GetRootDeviceCertificate(true);
		this.certificate = await portal.GetRootDeviceCertificateAsync(true);
		}
		await portal.Connect(manualCertificate: this.certificate);
		await portal.ConnectAsync(manualCertificate: this.certificate);
		}
		catch (Exception exception)
		{
		@@ -195,7 +195,7 @@ namespace SampleWdpClient.UniversalWindows

		try
		{
		IpConfiguration ipconfig = await portal.GetIpConfig();
		IpConfiguration ipconfig = await portal.GetIpConfigAsync();

		foreach (NetworkAdapterInfo adapterInfo in ipconfig.Adapters)
		{
		@@ -251,7 +251,7 @@ namespace SampleWdpClient.UniversalWindows

		try
		{
		WifiInterfaces wifiInterfaces = await portal.GetWifiInterfaces();
		WifiInterfaces wifiInterfaces = await portal.GetWifiInterfacesAsync();
		sb.AppendLine("WiFi Interfaces:");
		foreach (WifiInterface wifiInterface in wifiInterfaces.Interfaces)
		{
		@@ -260,7 +260,7 @@ namespace SampleWdpClient.UniversalWindows
		sb.Append(" GUID: ");
		sb.AppendLine(wifiInterface.Guid.ToString());

		WifiNetworks wifiNetworks = await portal.GetWifiNetworks(wifiInterface.Guid);
		WifiNetworks wifiNetworks = await portal.GetWifiNetworksAsync(wifiInterface.Guid);
		sb.AppendLine(" Networks:");
		foreach (WifiNetworkInfo network in wifiNetworks.AvailableNetworks)
		{
		@@ -394,7 +394,7 @@ namespace SampleWdpClient.UniversalWindows

		try
		{
		await portal.Reboot();
		await portal.RebootAsync();
		}
		catch (Exception ex)
		{
		@@ -438,7 +438,7 @@ namespace SampleWdpClient.UniversalWindows

		try
		{
		await portal.Shutdown();
		await portal.ShutdownAsync();
		}
		catch (Exception ex)
		{

Samples/SampleWdpClient/MainWindow.xaml.cs

+6 −6

Original line number	Diff line number	Diff line
		@@ -115,7 +115,7 @@ namespace SampleWdpClient
		}
		};

		await portal.Connect();
		await portal.ConnectAsync();

		this.MarshalUpdateCommandOutput(sb.ToString());
		});
		@@ -190,7 +190,7 @@ namespace SampleWdpClient

		try
		{
		IpConfiguration ipconfig = await portal.GetIpConfig();
		IpConfiguration ipconfig = await portal.GetIpConfigAsync();

		foreach (NetworkAdapterInfo adapterInfo in ipconfig.Adapters)
		{
		@@ -247,7 +247,7 @@ namespace SampleWdpClient

		try
		{
		WifiInterfaces wifiInterfaces = await portal.GetWifiInterfaces();
		WifiInterfaces wifiInterfaces = await portal.GetWifiInterfacesAsync();
		sb.AppendLine("WiFi Interfaces:");
		foreach (WifiInterface wifiInterface in wifiInterfaces.Interfaces)
		{
		@@ -256,7 +256,7 @@ namespace SampleWdpClient
		sb.Append(" GUID: ");
		sb.AppendLine(wifiInterface.Guid.ToString());

		WifiNetworks wifiNetworks = await portal.GetWifiNetworks(wifiInterface.Guid);
		WifiNetworks wifiNetworks = await portal.GetWifiNetworksAsync(wifiInterface.Guid);
		sb.AppendLine(" Networks:");
		foreach (WifiNetworkInfo network in wifiNetworks.AvailableNetworks)
		{
		@@ -387,7 +387,7 @@ namespace SampleWdpClient

		try
		{
		await this.portal.Reboot();
		await this.portal.RebootAsync();
		}
		catch(Exception ex)
		{
		@@ -432,7 +432,7 @@ namespace SampleWdpClient

		try
		{
		await this.portal.Shutdown();
		await this.portal.ShutdownAsync();
		}
		catch(Exception ex)
		{

Samples/XboxWdpDriver/Operations/AppOperation.cs

+4 −4

Original line number	Diff line number	Diff line
		@@ -65,7 +65,7 @@ namespace XboxWdpDriver
		{
		if (operationType.Equals("list"))
		{
		Task<AppPackages> packagesTask = portal.GetInstalledAppPackages();
		Task<AppPackages> packagesTask = portal.GetInstalledAppPackagesAsync();

		packagesTask.Wait();
		Console.WriteLine(packagesTask.Result);
		@@ -101,21 +101,21 @@ namespace XboxWdpDriver
		return;
		}

		Task launchTask = portal.LaunchApplication(aumid, packageFullName);
		Task launchTask = portal.LaunchApplicationAsync(aumid, packageFullName);
		launchTask.Wait();

		Console.WriteLine("Application launched.");
		}
		else if (operationType.Equals("terminate"))
		{
		Task terminateTask = portal.TerminateApplication(packageFullName);
		Task terminateTask = portal.TerminateApplicationAsync(packageFullName);
		terminateTask.Wait();

		Console.WriteLine("Application terminated.");
		}
		else if (operationType.Equals("uninstall"))
		{
		Task uninstallTask = portal.UninstallApplication(packageFullName);
		Task uninstallTask = portal.UninstallApplicationAsync(packageFullName);
		uninstallTask.Wait();

		Console.WriteLine("Application uninstalled.");

Samples/XboxWdpDriver/Operations/ConfigOperation.cs

+3 −3

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

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

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

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

		Console.WriteLine(setSettingTask.Result);

Samples/XboxWdpDriver/Operations/FiddlerOperation.cs

+3 −3

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

		Task fiddlerEnableTask = portal.EnableFiddlerTracing(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.DisableFiddlerTracing();
		Task fiddlerDisableTask = portal.DisableFiddlerTracingAsync();
		fiddlerDisableTask.Wait();
		Console.WriteLine("Fiddler disabled.");
		}
		@@ -85,7 +85,7 @@ namespace XboxWdpDriver

		if (parameters.HasFlag("reboot"))
		{
		Task rebootTask = portal.Reboot();
		Task rebootTask = portal.RebootAsync();
		rebootTask.Wait();
		Console.WriteLine("Console rebooting...");
		}