Added License agreement for MCCI's USB drivers

Author: SuperJMN

Source/Deployer.Raspberry.Console/ConsoleMarkdownDialog.cs

@@ -0,0 +1,18 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Deployer;
+
+namespace Deployment.Console
+{
+    internal class ConsoleMarkdownDialog : IMarkdownDialog
+    {
+        public Task<Option> PickOptions(string markdown, IEnumerable<Option> options)
+        {
+            System.Console.WriteLine(
+@"By continuing you are accepting the following license below.
+If you decline it, press Control+C anytime during the deployment process.
+" + markdown);
+            return Task.FromResult(new Option("Accept", DialogValue.OK));
+        }
+    }
+}

Source/Deployer.Raspberry.Console/Deployer.Raspberry.Console.csproj

@@ -52,6 +52,7 @@
       <Link>Properties\SharedAssemblyInfo.cs</Link>
     </Compile>
     <Compile Include="ConsoleDisplayUpdater.cs" />
+    <Compile Include="ConsoleMarkdownDialog.cs" />
     <Compile Include="ConsoleMarkdownDisplayer.cs" />
     <Compile Include="Options\NonWindowsDeploymentCmdOptions.cs" />
     <Compile Include="Resources.Designer.cs">

Source/Deployer.Raspberry.Console/Program.cs

@@ -77,6 +77,7 @@ private static IWoaDeployer GetDeployer(WindowsDeploymentOptionsProvider op, int
             container.Configure(x =>
             {
                 x.Configure(op);
+                x.Export<ConsoleMarkdownDialog>().As<IMarkdownDialog>();
                 x.ExportFactory((ILowLevelApi lla) => new DeviceProvider() { Device = new RaspberryPi(lla, diskNumber)}).As<IDeviceProvider>().Lifestyle.Singleton();
                 x.Export<ConsoleMarkdownDisplayer>().As<IMarkdownDisplayer>();
                 x.ExportInstance(progress).As<IObserver<double>>();

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

@@ -86,10 +86,6 @@
     </Compile>
     <Compile Include="Specifics\SettingsService.cs" />
     <Compile Include="Specifics\WpfMarkdownDisplayer.cs" />
-    <Page Include="Views\MainWindow.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Compile Include="App.xaml.cs">
       <DependentUpon>App.xaml</DependentUpon>
       <SubType>Code</SubType>
@@ -98,15 +94,7 @@
     <Compile Include="ViewModels\WimPickViewModel.cs" />
     <Compile Include="Locator.cs" />
     <Compile Include="ViewModels\MainViewModel.cs" />
-    <Compile Include="Views\MainWindow.xaml.cs">
-      <DependentUpon>MainWindow.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Page Include="Views\Markdown.Styles.Default.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\MarkdownViewerWindow.xaml">
+    <Page Include="Views\MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
@@ -136,8 +124,8 @@
     </Page>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Views\MarkdownViewerWindow.xaml.cs">
-      <DependentUpon>MarkdownViewerWindow.xaml</DependentUpon>
+    <Compile Include="Views\MainWindow.xaml.cs">
+      <DependentUpon>MainWindow.xaml</DependentUpon>
     </Compile>
     <Compile Include="Views\Parts\AdvancedPart.xaml.cs">
       <DependentUpon>AdvancedPart.xaml</DependentUpon>

Source/Deployer.Raspberry.Gui/Locator.cs

@@ -25,7 +25,6 @@ public Locator()
             IObservable<LogEvent> logEvents = null;
 
             IViewService viewService = new ViewService();
-            viewService.Register("MarkdownViewer", typeof(MarkdownViewerWindow));
 
             Log.Logger = new LoggerConfiguration()
                 .WriteTo.RollingFile(@"Logs\Log-{Date}.txt")
@@ -50,7 +49,7 @@ public Locator()
                 x.Export<DeploymentViewModel>().ByInterfaces().As<DeploymentViewModel>().Lifestyle.Singleton();
                 x.Export<UIServices>();
                 x.ExportFactory(() => viewService).As<IViewService>();
-                x.Export<DialogService>().As<IDialogService>();
+                x.Export<Dialog>().ByInterfaces();
                 x.Export<FilePicker>().As<IFilePicker>();
                 x.Export<SettingsService>().As<ISettingsService>();
                 x.ExportFactory(() => DialogCoordinator.Instance).As<IDialogCoordinator>();

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

@@ -37,12 +37,12 @@ public DeploymentViewModel(IDeviceProvider deviceProvider,
                 .Select(metadata => metadata != null);
 
             FullInstallWrapper = new CommandWrapper<Unit, Unit>(this,
-                ReactiveCommand.CreateFromTask(Deploy, isSelectedWim), uiServices.DialogService);
+                ReactiveCommand.CreateFromTask(Deploy, isSelectedWim), uiServices.Dialog);
             IsBusyObservable = FullInstallWrapper.Command.IsExecuting;
             isBusy = IsBusyObservable.ToProperty(this, model => model.IsBusy);
 
             RefreshDisksCommandWrapper = new CommandWrapper<Unit, ICollection<Disk>>(this,
-                ReactiveCommand.CreateFromTask(lowLevelApi.GetDisks), uiServices.DialogService);
+                ReactiveCommand.CreateFromTask(lowLevelApi.GetDisks), uiServices.Dialog);
             disks = RefreshDisksCommandWrapper.Command
                 .Select(x => x.Select(disk => new DiskViewModel(disk)))
                 .ToProperty(this, x => x.Disks);
@@ -64,7 +64,7 @@ public DiskViewModel SelectedDisk
 
         private async Task Deploy()
         {
-            if (await uiServices.DialogService.ShowConfirmation(this, Resources.DeploymentConfirmationTitle, string.Format(Resources.DeploymentConfirmationMessage, SelectedDisk)) == DialogResult.No)
+            if (await uiServices.Dialog.ShowConfirmation(this, Resources.DeploymentConfirmationTitle, string.Format(Resources.DeploymentConfirmationMessage, SelectedDisk)) == DialogResult.No)
             {
                 return;               
             }
@@ -81,8 +81,10 @@ private async Task Deploy()
 
             await deployer.Deploy();
 
-            var messageViewModel = new MessageViewModel(Resources.WindowsDeployedSuccessfullyTitle, Resources.WindowsDeployedSuccessfully);
-            uiServices.ViewService.Show("MarkdownViewer", messageViewModel);
+            await uiServices.Dialog.PickOptions(Resources.WindowsDeployedSuccessfully, new List<Option>()
+            {
+                new Option("Close")
+            });
         }
 
         public CommandWrapper<Unit, Unit> FullInstallWrapper { get; set; }

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

@@ -15,7 +15,7 @@ public DiskViewModel(Disk disk)
         public uint Number => disk.Number + 1;
         public string FriendlyName => disk.FriendlyName;
         public ByteSize Size => disk.Size;
-        public bool IsUsualTarget => Size > ByteSize.FromGigaBytes(14) && Size < ByteSize.FromGigaBytes(200);
+        public bool IsUsualTarget => Size > ByteSize.FromGigaBytes(1) && Size < ByteSize.FromGigaBytes(200);
         public Disk Disk => disk;
 
         public override string ToString()

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

@@ -31,7 +31,7 @@ public WimPickViewModel(UIServices uiServices, ISettingsService settingsService)
             PickWimFileCommand.ThrownExceptions.Subscribe(e =>
             {
                 Log.Error(e, "WIM file error");
-                this.uiServices.DialogService.ShowAlert(this, Resources.InvalidWimFile, e.Message);
+                this.uiServices.Dialog.ShowAlert(this, Resources.InvalidWimFile, e.Message);
             });
 
             hasWimHelper = this.WhenAnyValue(model => model.WimMetadata, (WimMetadataViewModel x) => x != null)