Fixed Lumia

Author: SuperJMN

Source/Deployer.Lumia.NetFx/ContainerConfigurator.cs

@@ -7,6 +7,7 @@
 using Deployer.Filesystem.FullFx;
 using Deployer.FileSystem;
 using Deployer.Lumia.NetFx.PhoneInfo;
+using Deployer.Raspberry;
 using Deployer.Services;
 using Deployer.Tasks;
 using Grace.DependencyInjection;
@@ -50,15 +51,16 @@ where type.GetTypeInfo().ImplementedInterfaces.Contains(typeof(IDeploymentTask))
             block.ExportInstance(taskTypes).As<IEnumerable<Type>>();
             block.Export<ScriptRunner>().As<IScriptRunner>();
             block.Export<InstanceBuilder>().As<IInstanceBuilder>();
-            
+            block.ExportFactory((IPhone p) => new DeviceProvider { Device = p }).As<IDeviceProvider>();
+
             block.Export<FileSystemOperations>().As<IFileSystemOperations>();
             block.Export<BcdInvokerFactory>().As<IBcdInvokerFactory>();
             block.Export<WindowsDeployer>().As<IWindowsDeployer>();
             block.Export<GitHubDownloader>().As<IGitHubDownloader>();
 
             WithRealPhone(block);
 
-            block.ExportFactory(() => AzureDevOpsClient.Create(new Uri("https://dev.azure.com"))).As<IAzureDevOpsBuildClient>();         
+            block.ExportFactory(() => AzureDevOpsClient.Create(new Uri("https://dev.azure.com"))).As<IAzureDevOpsBuildClient>();
 
             return block;
         }

Source/Deployer.Lumia/LumiaDisklayoutPreparer.cs

@@ -29,10 +29,14 @@ public LumiaDisklayoutPreparer(IWindowsOptionsProvider optionsProvider,  IEnumer
 
         public async Task Prepare(Disk disk)
         {
+            Log.Information("Preparing partitions for Windows deployment...");
+
             await phone.RemoveExistingWindowsPartitions();
             var options = optionsProvider.Options;
             await AllocateSpace(options.SizeReservedForWindows);
             await CreatePartitions();
+
+            Log.Information("Partition layout ready");
         }
 
         private async Task AllocateSpace(ByteSize requiredSize)

…rce/Deployer.Raspberry/DeviceProvider.cs Source/Deployer/DeviceProvider.csSource/Deployer.Raspberry/DeviceProvider.cs renamed to Source/Deployer/DeviceProvider.cs Source/Deployer.Raspberry/DeviceProvider.cs renamed to Source/Deployer/DeviceProvider.cs

@@ -1,4 +1,4 @@
-namespace Deployer.Raspberry
+namespace Deployer
 {
     public interface IDeviceProvider
     {

Source/Deployer/IDeviceProvider.cs

@@ -6,20 +6,20 @@ namespace Deployer.Tasks
     [TaskDescription("Deploying Windows")]
     public class DeployWindows : IDeploymentTask
     {
-        private readonly IDevice device;
+        private readonly IDeviceProvider deviceProvider;
         private readonly IDisklayoutPreparer preparer;
         private readonly IWindowsDeployer windowsDeployer;
 
-        public DeployWindows(IDevice device, IDisklayoutPreparer preparer, IWindowsDeployer windowsDeployer)
+        public DeployWindows(IDeviceProvider deviceProvider, IDisklayoutPreparer preparer, IWindowsDeployer windowsDeployer)
         {
-            this.device = device;
+            this.deviceProvider = deviceProvider;
             this.preparer = preparer;
             this.windowsDeployer = windowsDeployer;
         }
 
         public async Task Execute()
         {
-            await preparer.Prepare(await device.GetDeviceDisk());
+            await preparer.Prepare(await deviceProvider.Device.GetDeviceDisk());
             await windowsDeployer.Deploy();
         }
     }

Source/Deployer/Tasks/DeployWindows.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Threading.Tasks;
 using Deployer.FileSystem;
-using Deployer.Raspberry;
 using Deployer.Services;
 using Serilog;