From b64ea6479261fd81d870051f8f824b82263a8df4 Mon Sep 17 00:00:00 2001 From: Cyberboss Date: Mon, 4 Dec 2017 10:56:58 -0500 Subject: [PATCH] Changes Task.Factory.StartNew to Task.Run --- TGS.ControlPanel/ControlPanel/ServerPage.cs | 18 +++++++++--------- TGS.ControlPanel/ServerOpForm.cs | 2 +- TGS.ControlPanel/TestMergeManager.cs | 8 ++++---- TGS.Installer.UI/Main.cs | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/TGS.ControlPanel/ControlPanel/ServerPage.cs b/TGS.ControlPanel/ControlPanel/ServerPage.cs index 04c8821fc4..50a459c943 100644 --- a/TGS.ControlPanel/ControlPanel/ServerPage.cs +++ b/TGS.ControlPanel/ControlPanel/ServerPage.cs @@ -321,7 +321,7 @@ namespace TGS.ControlPanel { string res = null; var repo = Interface.GetComponent(); - var pulls = await Task.Factory.StartNew(() => repo.MergedPullRequests(out res)); + var pulls = await Task.Run(() => repo.MergedPullRequests(out res)); if (pulls == null) { @@ -338,7 +338,7 @@ namespace TGS.ControlPanel pullsRequests.Add(ghclient.PullRequest.Get(remoteOwner, remoteName, I.Number)); } - res = await Task.Factory.StartNew(() => repo.Update(true)); + res = await Task.Run(() => repo.Update(true)); if (res != null) { @@ -346,12 +346,12 @@ namespace TGS.ControlPanel return; } - await Task.Factory.StartNew(() => repo.GenerateChangelog(out res)); + await Task.Run(() => repo.GenerateChangelog(out res)); if (res != null) MessageBox.Show(res, "Error generating changelog"); - res = await Task.Factory.StartNew(() => repo.SynchronizePush()); + res = await Task.Run(() => repo.SynchronizePush()); if (res != null) MessageBox.Show(res, "Error synchronizing commits"); @@ -363,8 +363,8 @@ namespace TGS.ControlPanel if (I.Result.Merged) pulls.RemoveAll(x => x.Number == I.Result.Number); - var mergeResults = await Task.Factory.StartNew(() => repo.MergePullRequests(pulls, true)); - var compileStartResult = await Task.Factory.StartNew(() => Interface.GetComponent().Compile(true)); + var mergeResults = await Task.Run(() => repo.MergePullRequests(pulls, true)); + var compileStartResult = await Task.Run(() => Interface.GetComponent().Compile(true)); //Show any errors for (var I = 0; I < mergeResults.Count(); ++I) @@ -412,7 +412,7 @@ namespace TGS.ControlPanel { var repo = Interface.GetComponent(); - var res = await Task.Factory.StartNew(() => repo.Reset(true)); + var res = await Task.Run(() => repo.Reset(true)); if (res != null) { @@ -420,12 +420,12 @@ namespace TGS.ControlPanel return; } - await Task.Factory.StartNew(() => repo.GenerateChangelog(out res)); + await Task.Run(() => repo.GenerateChangelog(out res)); if (res != null) MessageBox.Show(res, "Error generating changelog"); - await Task.Factory.StartNew(() => Interface.GetComponent().Compile(false)); + await Task.Run(() => Interface.GetComponent().Compile(false)); if (res != null) MessageBox.Show(res, "Error starting compile!"); } diff --git a/TGS.ControlPanel/ServerOpForm.cs b/TGS.ControlPanel/ServerOpForm.cs index c8aba31166..19c083b0a5 100644 --- a/TGS.ControlPanel/ServerOpForm.cs +++ b/TGS.ControlPanel/ServerOpForm.cs @@ -23,7 +23,7 @@ namespace TGS.ControlPanel UseWaitCursor = true; try { - return Task.Factory.StartNew(action); + return Task.Run(action); } finally { diff --git a/TGS.ControlPanel/TestMergeManager.cs b/TGS.ControlPanel/TestMergeManager.cs index 2a8814523a..ac33d8fff7 100644 --- a/TGS.ControlPanel/TestMergeManager.cs +++ b/TGS.ControlPanel/TestMergeManager.cs @@ -93,7 +93,7 @@ namespace TGS.ControlPanel List pulls = null; //get started on this while we're processing here - var pullsRequest = Task.Factory.StartNew(() => pulls = repo.MergedPullRequests(out error)); + var pullsRequest = Task.Run(() => pulls = repo.MergedPullRequests(out error)); //Search for open PRs Enabled = false; @@ -276,11 +276,11 @@ namespace TGS.ControlPanel if (UpdateToRemoteRadioButton.Checked) { GenerateChangelog(repo); - error = await Task.Factory.StartNew(() => repo.SynchronizePush()); + error = await Task.Run(() => repo.SynchronizePush()); } //Merge the PRs, collect errors - var errors = await Task.Factory.StartNew(() => repo.MergePullRequests(pulls, false)); + var errors = await Task.Run(() => repo.MergePullRequests(pulls, false)); //Show any errors for (var I = 0; I < errors.Count(); ++I) @@ -298,7 +298,7 @@ namespace TGS.ControlPanel GenerateChangelog(repo); //Start the compile - var compileStarted = await Task.Factory.StartNew(() => currentInterface.GetComponent().Compile(pulls.Count == 1)); + var compileStarted = await Task.Run(() => currentInterface.GetComponent().Compile(pulls.Count == 1)); if (error != null) MessageBox.Show(String.Format("Error sychronizing repo: {0}", error)); diff --git a/TGS.Installer.UI/Main.cs b/TGS.Installer.UI/Main.cs index 2a9f7a0136..57e33887d4 100644 --- a/TGS.Installer.UI/Main.cs +++ b/TGS.Installer.UI/Main.cs @@ -387,7 +387,7 @@ namespace TGS.Installer.UI // Microsoft.Deployment.WindowsInstaller.Installer.SetInternalUI(InstallUIOptions.Silent); Microsoft.Deployment.WindowsInstaller.Installer.SetExternalUI(OnUIUpdate, InstallLogModes.Progress); - await Task.Factory.StartNew(() => Microsoft.Deployment.WindowsInstaller.Installer.InstallProduct(msipath, cl)); + await Task.Run(() => Microsoft.Deployment.WindowsInstaller.Installer.InstallProduct(msipath, cl)); if (cancelled) {