Absurd changes

Author: SuperJMN

Source/Deployer.Lumia/Phone.cs

@@ -137,7 +137,7 @@ public override async Task RemoveExistingWindowsPartitions()
             Log.Verbose("Cleanup of possible previous Windows 10 ARM64 installation...");
 
             await RemovePartition("Reserved", await (await GetDeviceDisk()).GetReservedPartition());
-            await RemovePartition("WoA ESP", await DeviceMixin.GetBootPartition(this));
+            await RemovePartition("WoA ESP", await this.GetBootPartition());
             var winVol = await GetWindowsVolume();
             await RemovePartition("WoA", winVol?.Partition);
         }

Source/Deployer.Lumia/AutoDeployer.cs Source/Deployer.Lumia/WoaDeployer.csSource/Deployer.Lumia/AutoDeployer.cs renamed to Source/Deployer.Lumia/WoaDeployer.cs

@@ -17,6 +17,16 @@ public class ImageFlasher : IImageFlasher
     {
         private readonly Regex percentRegex = new Regex(@"(\d*.\d*)%");
 
+        public string EtcherPath
+        {
+            get
+            {
+                var platformSuffix = Environment.Is64BitProcess ? "x64" : "x86";
+                var etcherPath = Path.Combine("Core", "Tools", "Etcher-Cli", platformSuffix, "Etcher");
+                return etcherPath;
+            }
+        }
+
         public async Task Flash(Disk disk, string imagePath, IObserver<double> progressObserver = null)
         {
             ISubject<string> outputSubject = new Subject<string>();
@@ -29,7 +39,7 @@ public async Task Flash(Disk disk, string imagePath, IObserver<double> progressO
                     {
                         if (!isValidating && CultureInfo.CurrentCulture.CompareInfo.IndexOf(s, "validating", 0, CompareOptions.IgnoreCase) != -1)
                         {
-                            Log.Verbose("Validating flashed image...");
+                            Log.Information("Validating flashed image...");
                             isValidating = true;
                         }
                     })
@@ -38,14 +48,9 @@ public async Task Flash(Disk disk, string imagePath, IObserver<double> progressO
                     .Subscribe(progressObserver);
             }
 
-            //etcher.exe -d \\.\PHYSICALDRIVE3 "..\Tutorial Googulator\gpt.zip" --yes
-            var gptSchemeImagePath = Path.Combine("Files", "Core", "Gpt.zip");
-
-            var platformSuffix = Environment.Is64BitProcess ? "x64" : "x86";
-            var etcherPath = Path.Combine("Files", "Tools", "Etcher-Cli", platformSuffix, "Etcher");
-            var args = $@"-d \\.\PHYSICALDRIVE{disk.Number} ""{gptSchemeImagePath}"" --yes --no-unmount";
-            Log.Verbose("We are about to run Etcher: {ExecName} {Parameters}", etcherPath, args);
-            var resultCode = await ProcessUtils.RunProcessAsync(etcherPath, args, outputObserver: outputSubject);
+            var args = $@"-d \\.\PHYSICALDRIVE{disk.Number} ""{imagePath}"" --yes --no-unmount";
+            Log.Verbose("We are about to run Etcher: {ExecName} {Parameters}", EtcherPath, args);
+            var resultCode = await ProcessUtils.RunProcessAsync(EtcherPath, args, outputObserver: outputSubject);
             if (resultCode != 0)
             {
                 throw new DeploymentException($"There has been a problem during deployment: Etcher exited with code {resultCode}.");
@@ -54,6 +59,7 @@ public async Task Flash(Disk disk, string imagePath, IObserver<double> progressO
             progressObserver?.OnNext(double.NaN);
 
             stdOutputSubscription?.Dispose();
+            await disk.LowLevelApi.UpdateStorageCache();
         }
 
         private double GetPercentage(string output)

Source/Deployer.NetFx/ImageFlasher.cs

@@ -82,7 +82,7 @@ public async Task<IList<Volume>> GetVolumes(Disk disk)
             return await volumes;
         }
 
-        private Task UpdateStorageCache()
+        public Task UpdateStorageCache()
         {
             ps.Commands.Clear();
             ps.AddCommand($@"Update-HostStorageCache");

Source/Deployer.NetFx/LowLevelApi.cs

@@ -300,6 +300,7 @@
   <ItemGroup>
     <None Include="..\Deployer.Raspberry\Core\Tools\Etcher-Cli\x64\etcher.exe">
       <Link>Core\Tools\Etcher-Cli\x64\etcher.exe</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
   <ItemGroup>
@@ -323,6 +324,7 @@
   <ItemGroup>
     <None Include="..\Deployer.Raspberry\Core\Tools\Etcher-Cli\x86\etcher.exe">
       <Link>Core\Tools\Etcher-Cli\x86\etcher.exe</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
   <ItemGroup>

Source/Deployer.Raspberry.Gui/Deployer.Raspberry.Gui.csproj

@@ -1,5 +1,9 @@
 using System;
+using System.Linq;
 using System.Reactive.Subjects;
+using System.Reflection;
+using Deployer.Execution;
+using Deployer.Filesystem.FullFx;
 using Deployer.Gui.Common;
 using Deployer.Gui.Common.Services;
 using Deployer.Gui.Core;

Source/Deployer.Raspberry.Gui/Locator.cs

@@ -1,6 +1,5 @@
 using System;
-using System.Reactive;
-using System.Threading.Tasks;
+using System.Reactive.Linq;
 using ByteSizeLib;
 using Deployer.Gui.Common;
 using Deployer.Gui.Core;
@@ -10,25 +9,20 @@ namespace Deployer.Raspberry.Gui.ViewModels
 {
     public class AdvancedViewModel : ReactiveObject, IBusy
     {
-        private readonly UIServices uiServices;
         private readonly ISettingsService settingsService;
-        private readonly IWoaDeployer autoDeployer;
-        public CommandWrapper<Unit, Unit> InstallGpuWrapper { get; set; }
 
         private readonly ObservableAsPropertyHelper<ByteSize> sizeReservedForWindows;
 
-        public AdvancedViewModel(UIServices uiServices, ISettingsService settingsService, IWoaDeployer autoDeployer)
+        public AdvancedViewModel(ISettingsService settingsService)
         {
-            this.uiServices = uiServices;
             this.settingsService = settingsService;
-            this.autoDeployer = autoDeployer;
-     
+
 
             sizeReservedForWindows =
                 this.WhenAnyValue(x => x.GbsReservedForWindows, ByteSize.FromGigaBytes)
                     .ToProperty(this, x => x.SizeReservedForWindows);
 
-            IsBusyObservable = InstallGpuWrapper.Command.IsExecuting;
+            IsBusyObservable = Observable.Return(false);
         }
 
         public ByteSize SizeReservedForWindows => sizeReservedForWindows.Value;
@@ -44,10 +38,6 @@ public double GbsReservedForWindows
             }
         }
 
-
-
-        public IObservable<bool> IsBusyObservable { get; }
-
         public bool UseCompactDeployment
         {
             get => settingsService.UseCompactDeployment;
@@ -58,5 +48,7 @@ public bool UseCompactDeployment
                 this.RaisePropertyChanged(nameof(UseCompactDeployment));
             }
         }
+
+        public IObservable<bool> IsBusyObservable { get; }
     }
 }

Source/Deployer.Raspberry.Gui/ViewModels/AdvancedViewModel.cs

@@ -21,10 +21,10 @@ public class DeploymentViewModel : ReactiveObject, IBusy
         private DiskViewModel selectedDisk;
         private readonly ObservableAsPropertyHelper<IEnumerable<DiskViewModel>> disks;
 
-        public DeploymentViewModel(
+        public DeploymentViewModel(IDeviceProvider deviceProvider,
             IWindowsOptionsProvider optionsProvider,
             IWoaDeployer deployer, UIServices uiServices, AdvancedViewModel advancedViewModel,
-            WimPickViewModel wimPickViewModel, ILowLevelApi lowLevel)
+            WimPickViewModel wimPickViewModel, ILowLevelApi lowLevelApi)
         {
             this.optionsProvider = optionsProvider;
             this.deployer = deployer;
@@ -41,12 +41,14 @@ public DeploymentViewModel(
             isBusy = IsBusyObservable.ToProperty(this, model => model.IsBusy);
 
             RefreshDisksCommandWrapper = new CommandWrapper<Unit, ICollection<Disk>>(this,
-                ReactiveCommand.CreateFromTask(lowLevel.GetDisks), uiServices.DialogService);
+                ReactiveCommand.CreateFromTask(lowLevelApi.GetDisks), uiServices.DialogService);
             disks = RefreshDisksCommandWrapper.Command
                 .Select(x => x
                     .Where(y => !y.IsBoot && !y.IsSystem && !y.IsOffline)
                     .Select(disk => new DiskViewModel(disk)))
                 .ToProperty(this, x => x.Disks);
+
+            this.WhenAnyValue(x => x.SelectedDisk).Where(x => x != null).Subscribe(x => deviceProvider.Device = new RaspberryPi(lowLevelApi, x.Disk));
         }
 
         public IEnumerable<DiskViewModel> Disks => disks.Value;
@@ -81,5 +83,5 @@ await uiServices.DialogService.ShowAlert(this, Resources.Finished,
 
         public CommandWrapper<Unit, Unit> FullInstallWrapper { get; set; }
         public IObservable<bool> IsBusyObservable { get; }
-    }
+    }    
 }

Source/Deployer.Raspberry.Gui/ViewModels/DeploymentViewModel.cs

@@ -15,6 +15,8 @@
     <DockPanel>
         <Button DockPanel.Dock="Bottom" Margin="15" HorizontalAlignment="Center" Content="Close" Click="OnClick" />
         <FlowDocumentScrollViewer Margin="10"
+                                  FontFamily="Arial"
+                                  FontSize="20"
                                   Document="{Binding Text, Converter={StaticResource TextToFlowDocumentConverter}}" />
     </DockPanel>
 </mah:MetroWindow>

Source/Deployer.Raspberry.Gui/Views/MarkdownViewerWindow.xaml

@@ -45,6 +45,10 @@ where type.GetTypeInfo().ImplementedInterfaces.Contains(typeof(IDeploymentTask))
             block.Export<BcdInvokerFactory>().As<IBcdInvokerFactory>();
             block.Export<WindowsDeployer>().As<IWindowsDeployer>();
             block.Export<GitHubDownloader>().As<IGitHubDownloader>();
+            block.Export<DeviceProvider>().As<IDeviceProvider>().Lifestyle.Singleton();
+            block.Export<RaspberryDisklayoutPreparer>().As<IDisklayoutPreparer>();
+            block.Export<ImageFlasher>().As<IImageFlasher>();
+            block.Export<DismImageService>().As<IWindowsImageService>();
 
             block.ExportFactory(() => AzureDevOpsClient.Create(new Uri("https://dev.azure.com"))).As<IAzureDevOpsBuildClient>();