Merge from master

WOA-Project · Feb 25, 2019 · 7b11d28 · 7b11d28
2 parents c69d6c0 + 51838e3
commit 7b11d28
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/Source/Deployer.Lumia.Gui/ViewModels/DeploymentViewModel.cs b/Source/Deployer.Lumia.Gui/ViewModels/DeploymentViewModel.cs
@@ -5,6 +5,7 @@
 using System.Threading.Tasks;
 using Deployer.Gui.Common;
 using ReactiveUI;
+using Serilog;
 
 namespace Deployer.Lumia.Gui.ViewModels
 {
@@ -53,6 +54,8 @@ private async Task Deploy()
 
             await deployer.Deploy();
 
+            Log.Information("Deployment successful");
+
             await uiServices.Dialog.PickOptions(Resources.WindowsDeployedSuccessfully, new List<Option>()
             {
                 new Option("Close")

diff --git a/Source/Deployer.Lumia.Gui/ViewModels/DualBootViewModel.cs b/Source/Deployer.Lumia.Gui/ViewModels/DualBootViewModel.cs
@@ -5,6 +5,7 @@
 using System.Threading.Tasks;
 using Deployer.Gui.Common;
 using ReactiveUI;
+using Serilog;
 
 namespace Deployer.Lumia.Gui.ViewModels
 {
@@ -91,11 +92,13 @@ public bool IsUpdated
         private async Task EnableDualBoot()
         {
             await phone.EnableDualBoot(true);
+            Log.Information("Dual Boot enabled");
         }
 
         private async Task DisableDualBoot()
         {
             await phone.EnableDualBoot(false);
+            Log.Information("Dual Boot disabled");
         }
 
         private async Task<DualBootStatus> GetStatus()

diff --git a/Source/Deployer.Lumia/WoaDeployer.cs b/Source/Deployer.Lumia/WoaDeployer.cs
@@ -32,9 +32,8 @@ public async Task Deploy()
             var phoneModel = await phone.GetModel();
             Log.Verbose("{Model detected}", phoneModel);
             var path = dict[phoneModel];
-
-            Log.Information("Starting deployment");
-            await scriptRunner.Run(parser.Parse(File.ReadAllText(path)));
+
+            await scriptRunner.Run(parser.Parse(File.ReadAllText(path)));            
         }
 
         public async Task InstallGpu()