Skip to content

Breaking Change: Updating async methods to follow C# async naming conventions #188

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hpsin merged 2 commits into from
Oct 11, 2016
Merged

Breaking Change: Updating async methods to follow C# async naming conventions #188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d2a3ca8
Breaking Change: Updating async methods to follow C# async naming con…
hpsin Oct 11, 2016
d5ea264
Comment errors in async change
hpsin Oct 11, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions Samples/SampleWdpClient.UniversalWindows/MainPage.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,9 @@ private void ConnectToDevice_Click(object sender, RoutedEventArgs e)
// remainder of this session.
if (allowUntrusted)
{
this.certificate = 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)
{
Expand Down Expand Up @@ -195,7 +195,7 @@ private void GetIPConfig_Click(object sender, RoutedEventArgs e)

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

foreach (NetworkAdapterInfo adapterInfo in ipconfig.Adapters)
{
Expand Down Expand Up @@ -251,7 +251,7 @@ private void GetWifiInfo_Click(object sender, RoutedEventArgs e)

try
{
WifiInterfaces wifiInterfaces = await portal.GetWifiInterfaces();
WifiInterfaces wifiInterfaces = await portal.GetWifiInterfacesAsync();
sb.AppendLine("WiFi Interfaces:");
foreach (WifiInterface wifiInterface in wifiInterfaces.Interfaces)
{
Expand All @@ -260,7 +260,7 @@ private void GetWifiInfo_Click(object sender, RoutedEventArgs e)
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)
{
Expand Down Expand Up @@ -394,7 +394,7 @@ private void RebootDevice_Click(object sender, RoutedEventArgs e)

try
{
await portal.Reboot();
await portal.RebootAsync();
}
catch (Exception ex)
{
Expand Down Expand Up @@ -438,7 +438,7 @@ private void ShutdownDevice_Click(object sender, RoutedEventArgs e)

try
{
await portal.Shutdown();
await portal.ShutdownAsync();
}
catch (Exception ex)
{
Expand Down
12 changes: 6 additions & 6 deletions Samples/SampleWdpClient/MainWindow.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ private void ConnectToDevice_Click(object sender, RoutedEventArgs e)
}
};

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

this.MarshalUpdateCommandOutput(sb.ToString());
});
Expand Down Expand Up @@ -190,7 +190,7 @@ private void GetIPConfig_Click(object sender, RoutedEventArgs e)

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

foreach (NetworkAdapterInfo adapterInfo in ipconfig.Adapters)
{
Expand Down Expand Up @@ -247,7 +247,7 @@ private void GetWifiInfo_Click(object sender, RoutedEventArgs e)

try
{
WifiInterfaces wifiInterfaces = await portal.GetWifiInterfaces();
WifiInterfaces wifiInterfaces = await portal.GetWifiInterfacesAsync();
sb.AppendLine("WiFi Interfaces:");
foreach (WifiInterface wifiInterface in wifiInterfaces.Interfaces)
{
Expand All @@ -256,7 +256,7 @@ private void GetWifiInfo_Click(object sender, RoutedEventArgs e)
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)
{
Expand Down Expand Up @@ -387,7 +387,7 @@ private void RebootDevice_Click(object sender, RoutedEventArgs e)

try
{
await this.portal.Reboot();
await this.portal.RebootAsync();
}
catch(Exception ex)
{
Expand Down Expand Up @@ -432,7 +432,7 @@ private void ShutdownDevice_Click(object sender, RoutedEventArgs e)

try
{
await this.portal.Shutdown();
await this.portal.ShutdownAsync();
}
catch(Exception ex)
{
Expand Down
8 changes: 4 additions & 4 deletions Samples/XboxWdpDriver/Operations/AppOperation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public static void HandleOperation(DevicePortal portal, ParameterHelper paramete
{
if (operationType.Equals("list"))
{
Task<AppPackages> packagesTask = portal.GetInstalledAppPackages();
Task<AppPackages> packagesTask = portal.GetInstalledAppPackagesAsync();

packagesTask.Wait();
Console.WriteLine(packagesTask.Result);
Expand Down Expand Up @@ -101,21 +101,21 @@ public static void HandleOperation(DevicePortal portal, ParameterHelper paramete
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.");
Expand Down
6 changes: 3 additions & 3 deletions Samples/XboxWdpDriver/Operations/ConfigOperation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public static void HandleOperation(DevicePortal portal, ParameterHelper paramete
// 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);
Expand All @@ -55,7 +55,7 @@ public static void HandleOperation(DevicePortal portal, ParameterHelper paramete
{
if (string.IsNullOrWhiteSpace(desiredValue))
{
Task<XboxSetting> getSettingTask = portal.GetXboxSetting(desiredSetting);
Task<XboxSetting> getSettingTask = portal.GetXboxSettingAsync(desiredSetting);
getSettingTask.Wait();

Console.WriteLine(getSettingTask.Result);
Expand All @@ -66,7 +66,7 @@ public static void HandleOperation(DevicePortal portal, ParameterHelper paramete
setting.Name = desiredSetting;
setting.Value = desiredValue;

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

Console.WriteLine(setSettingTask.Result);
Expand Down
6 changes: 3 additions & 3 deletions Samples/XboxWdpDriver/Operations/FiddlerOperation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,13 @@ public static void HandleOperation(DevicePortal portal, ParameterHelper paramete
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.");
}
Expand All @@ -85,7 +85,7 @@ public static void HandleOperation(DevicePortal portal, ParameterHelper paramete

if (parameters.HasFlag("reboot"))
{
Task rebootTask = portal.Reboot();
Task rebootTask = portal.RebootAsync();
rebootTask.Wait();
Console.WriteLine("Console rebooting...");
}
Expand Down
12 changes: 6 additions & 6 deletions Samples/XboxWdpDriver/Operations/FileOperation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public static void HandleOperation(DevicePortal portal, ParameterHelper paramete
{
if (operationType.Equals("knownfolders"))
{
Task<KnownFolders> getKnownFoldersTask = portal.GetKnownFolders();
Task<KnownFolders> getKnownFoldersTask = portal.GetKnownFoldersAsync();

getKnownFoldersTask.Wait();
Console.WriteLine(getKnownFoldersTask.Result);
Expand All @@ -84,7 +84,7 @@ public static void HandleOperation(DevicePortal portal, ParameterHelper paramete

if (operationType.Equals("dir"))
{
Task<FolderContents> getDirectoryContents = portal.GetFolderContents(knownFolderId, subPath, packageFullName);
Task<FolderContents> getDirectoryContents = portal.GetFolderContentsAsync(knownFolderId, subPath, packageFullName);

getDirectoryContents.Wait();
Console.WriteLine(getDirectoryContents.Result);
Expand All @@ -101,7 +101,7 @@ public static void HandleOperation(DevicePortal portal, ParameterHelper paramete
return;
}

Task uploadFileTask = portal.UploadFile(knownFolderId, filepath, subPath, packageFullName);
Task uploadFileTask = portal.UploadFileAsync(knownFolderId, filepath, subPath, packageFullName);

uploadFileTask.Wait();
Console.WriteLine(string.Format("{0} uploaded.", filepath));
Expand Down Expand Up @@ -132,7 +132,7 @@ public static void HandleOperation(DevicePortal portal, ParameterHelper paramete

destination += "/" + filename;

Task<Stream> getFile = portal.GetFile(knownFolderId, filename, subPath, packageFullName);
Task<Stream> getFile = portal.GetFileAsync(knownFolderId, filename, subPath, packageFullName);

getFile.Wait();

Expand All @@ -155,14 +155,14 @@ public static void HandleOperation(DevicePortal portal, ParameterHelper paramete
return;
}

Task renameFileTask = portal.RenameFile(knownFolderId, filename, newfilename, subPath, packageFullName);
Task renameFileTask = portal.RenameFileAsync(knownFolderId, filename, newfilename, subPath, packageFullName);

renameFileTask.Wait();
Console.WriteLine(string.Format("Renamed {0} to {1}.", filename, newfilename));
}
else if (operationType.Equals("delete"))
{
Task deleteFileTask = portal.DeleteFile(knownFolderId, filename, subPath, packageFullName);
Task deleteFileTask = portal.DeleteFileAsync(knownFolderId, filename, subPath, packageFullName);

deleteFileTask.Wait();
Console.WriteLine(string.Format("Deleted {0}.", filename));
Expand Down
12 changes: 6 additions & 6 deletions Samples/XboxWdpDriver/Operations/InstallOperation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ public static void HandleOperation(DevicePortal portal, ParameterHelper paramete
if (!string.IsNullOrEmpty(appxFile))
{
operation.mreAppInstall.Reset();
Task installTask = portal.InstallApplication(null, appxFile, dependencies, certificate);
Task installTask = portal.InstallApplicationAsync(null, appxFile, dependencies, certificate);
operation.mreAppInstall.WaitOne();

if (operation.installResults.Status == ApplicationInstallStatus.Completed)
Expand All @@ -122,7 +122,7 @@ public static void HandleOperation(DevicePortal portal, ParameterHelper paramete
foreach (string dependency in dependencies)
{
operation.mreAppInstall.Reset();
Task installTask = portal.InstallApplication(null, dependency, new List<string>());
Task installTask = portal.InstallApplicationAsync(null, dependency, new List<string>());
operation.mreAppInstall.WaitOne();

if (operation.installResults.Status != ApplicationInstallStatus.Completed)
Expand Down Expand Up @@ -171,7 +171,7 @@ public static void HandleOperation(DevicePortal portal, ParameterHelper paramete
{
if (e.HResult == ErrorLogonFailureHresult)
{
Task<SmbInfo> smbTask = portal.GetSmbShareInfo();
Task<SmbInfo> smbTask = portal.GetSmbShareInfoAsync();
smbTask.Wait();

// Set the username/password for accessing the share.
Expand Down Expand Up @@ -205,14 +205,14 @@ public static void HandleOperation(DevicePortal portal, ParameterHelper paramete
return;
}

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

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

Console.WriteLine("Registration complete.");
Expand Down Expand Up @@ -275,7 +275,7 @@ protected virtual void Dispose(bool disposing)
/// <param name="relativeDestination">The relative destination directory.</param>
private void UploadDirectoryOverHttp(string folderPath, string relativeDestination)
{
Task uploadTask = this.portal.UploadPackageFolder(folderPath, relativeDestination);
Task uploadTask = this.portal.UploadPackageFolderAsync(folderPath, relativeDestination);
uploadTask.Wait();

foreach (string subDir in Directory.GetDirectories(folderPath))
Expand Down
6 changes: 3 additions & 3 deletions Samples/XboxWdpDriver/Operations/ListProcessesOperation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,19 +41,19 @@ public static void HandleOperation(DevicePortal portal, ParameterHelper paramete

portal.RunningProcessesMessageReceived += runningProcessesReceivedHandler;

Task startListeningForProcessesTask = portal.StartListeningForRunningProcesses();
Task startListeningForProcessesTask = portal.StartListeningForRunningProcessesAsync();
startListeningForProcessesTask.Wait();

runningProcessesReceived.WaitOne();

Task stopListeningForProcessesTask = portal.StopListeningForRunningProcesses();
Task stopListeningForProcessesTask = portal.StopListeningForRunningProcessesAsync();
stopListeningForProcessesTask.Wait();

portal.RunningProcessesMessageReceived -= runningProcessesReceivedHandler;
}
else
{
Task<DevicePortal.RunningProcesses> getRunningProcessesTask = portal.GetRunningProcesses();
Task<DevicePortal.RunningProcesses> getRunningProcessesTask = portal.GetRunningProcessesAsync();
runningProcesses = getRunningProcessesTask.Result;
}

Expand Down
6 changes: 3 additions & 3 deletions Samples/XboxWdpDriver/Operations/SandboxOperation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,21 +42,21 @@ public static void HandleOperation(DevicePortal portal, ParameterHelper paramete

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

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

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

if (parameters.HasFlag("reboot"))
{
Task rebootTask = portal.Reboot();
Task rebootTask = portal.RebootAsync();
rebootTask.Wait();
Console.WriteLine("Console rebooting...");
}
Expand Down
2 changes: 1 addition & 1 deletion Samples/XboxWdpDriver/Operations/ScreenshotOperation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public static void HandleOperation(DevicePortal portal, ParameterHelper paramete
}
else
{
Task<Stream> screenshotTask = portal.TakeXboxScreenshot();
Task<Stream> screenshotTask = portal.TakeXboxScreenshotAsync();
screenshotTask.Wait();

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