Skip to content

Commit 032df75

Browse files
rozelegeof90
authored andcommitted
style(Async): Adding suffix to async static methods. (microsoft#552)
1 parent ea265bb commit 032df75

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

windows/CodePushUtils.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace CodePush.ReactNative
1010
{
1111
internal class CodePushUtils
1212
{
13-
internal async static Task<JObject> GetJObjectFromFile(StorageFile file)
13+
internal async static Task<JObject> GetJObjectFromFileAsync(StorageFile file)
1414
{
1515
string jsonString = await FileIO.ReadTextAsync(file);
1616
if (jsonString.Length == 0)

windows/FileUtils.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ namespace CodePush.ReactNative
66
{
77
internal class FileUtils
88
{
9-
internal async static Task MergeFolders(StorageFolder source, StorageFolder target)
9+
internal async static Task MergeFoldersAsync(StorageFolder source, StorageFolder target)
1010
{
1111
foreach (StorageFile sourceFile in await source.GetFilesAsync())
1212
{
@@ -16,7 +16,7 @@ internal async static Task MergeFolders(StorageFolder source, StorageFolder targ
1616
foreach (StorageFolder sourceDirectory in await source.GetFoldersAsync())
1717
{
1818
StorageFolder nextTargetSubDir = await target.CreateFolderAsync(sourceDirectory.Name, CreationCollisionOption.OpenIfExists);
19-
await MergeFolders(sourceDirectory, nextTargetSubDir);
19+
await MergeFoldersAsync(sourceDirectory, nextTargetSubDir);
2020
}
2121
}
2222
}

windows/UpdateManager.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,16 +67,16 @@ internal async Task DownloadPackageAsync(JObject updatePackage, string expectedB
6767
throw new InvalidDataException("Received a diff update, but there is no current version to diff against.");
6868
}
6969

70-
await UpdateUtils.CopyNecessaryFilesFromCurrentPackage(diffManifestFile, currentPackageFolder, newUpdateFolder);
70+
await UpdateUtils.CopyNecessaryFilesFromCurrentPackageAsync(diffManifestFile, currentPackageFolder, newUpdateFolder);
7171
await diffManifestFile.DeleteAsync();
7272
}
7373

74-
await FileUtils.MergeFolders(unzippedFolder, newUpdateFolder);
74+
await FileUtils.MergeFoldersAsync(unzippedFolder, newUpdateFolder);
7575
await unzippedFolder.DeleteAsync();
7676

7777
// For zip updates, we need to find the relative path to the jsBundle and save it in the
7878
// metadata so that we can find and run it easily the next time.
79-
string relativeBundlePath = await UpdateUtils.FindJSBundleInUpdateContents(newUpdateFolder, expectedBundleFileName);
79+
string relativeBundlePath = await UpdateUtils.FindJSBundleInUpdateContentsAsync(newUpdateFolder, expectedBundleFileName);
8080
if (relativeBundlePath == null)
8181
{
8282
throw new InvalidDataException("Update is invalid - A JS bundle file named \"" + expectedBundleFileName + "\" could not be found within the downloaded contents. Please check that you are releasing your CodePush updates using the exact same JS bundle file name that was shipped with your app's binary.");
@@ -149,7 +149,7 @@ internal async Task<JObject> GetPackageAsync(string packageHash)
149149
try
150150
{
151151
StorageFile packageFile = await packageFolder.GetFileAsync(CodePushConstants.PackageFileName);
152-
return await CodePushUtils.GetJObjectFromFile(packageFile);
152+
return await CodePushUtils.GetJObjectFromFileAsync(packageFile);
153153
}
154154
catch (IOException)
155155
{
@@ -258,7 +258,7 @@ private async Task<StorageFolder> GetCurrentPackageFolderAsync()
258258
private async Task<JObject> GetCurrentPackageInfoAsync()
259259
{
260260
StorageFile statusFile = await GetStatusFileAsync();
261-
return await CodePushUtils.GetJObjectFromFile(statusFile);
261+
return await CodePushUtils.GetJObjectFromFileAsync(statusFile);
262262
}
263263

264264
private async Task<StorageFile> GetDownloadFileAsync()

windows/UpdateUtils.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ namespace CodePush.ReactNative
88
{
99
internal class UpdateUtils
1010
{
11-
internal async static Task CopyNecessaryFilesFromCurrentPackage(StorageFile diffManifestFile, StorageFolder currentPackageFolder, StorageFolder newPackageFolder)
11+
internal async static Task CopyNecessaryFilesFromCurrentPackageAsync(StorageFile diffManifestFile, StorageFolder currentPackageFolder, StorageFolder newPackageFolder)
1212
{
13-
await FileUtils.MergeFolders(currentPackageFolder, newPackageFolder);
14-
JObject diffManifest = await CodePushUtils.GetJObjectFromFile(diffManifestFile);
13+
await FileUtils.MergeFoldersAsync(currentPackageFolder, newPackageFolder);
14+
JObject diffManifest = await CodePushUtils.GetJObjectFromFileAsync(diffManifestFile);
1515
var deletedFiles = (JArray)diffManifest["deletedFiles"];
1616
foreach (string fileNameToDelete in deletedFiles)
1717
{
@@ -20,7 +20,7 @@ internal async static Task CopyNecessaryFilesFromCurrentPackage(StorageFile diff
2020
}
2121
}
2222

23-
internal async static Task<string> FindJSBundleInUpdateContents(StorageFolder updateFolder, string expectedFileName)
23+
internal async static Task<string> FindJSBundleInUpdateContentsAsync(StorageFolder updateFolder, string expectedFileName)
2424
{
2525
foreach (StorageFile file in await updateFolder.GetFilesAsync())
2626
{
@@ -33,7 +33,7 @@ internal async static Task<string> FindJSBundleInUpdateContents(StorageFolder up
3333

3434
foreach (StorageFolder folder in await updateFolder.GetFoldersAsync())
3535
{
36-
string mainBundlePathInSubFolder = await FindJSBundleInUpdateContents(folder, expectedFileName);
36+
string mainBundlePathInSubFolder = await FindJSBundleInUpdateContentsAsync(folder, expectedFileName);
3737
if (mainBundlePathInSubFolder != null)
3838
{
3939
return Path.Combine(folder.Name, mainBundlePathInSubFolder);

0 commit comments

Comments
 (0)