Merge from master

WOA-Project · Feb 24, 2019 · c69d6c0 · c69d6c0
2 parents 99e7d24 + 766aea9
commit c69d6c0
Show file tree

Hide file tree

Showing 16 changed files with 51 additions and 51 deletions.
diff --git a/Source/Deployer.Lumia.Console/App.config b/Source/Deployer.Lumia.Console/App.config
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
     </startup>
-</configuration>
+</configuration>
diff --git a/Source/Deployer.Lumia.Console/Deployer.Lumia.Console.csproj b/Source/Deployer.Lumia.Console/Deployer.Lumia.Console.csproj
@@ -8,10 +8,11 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>Deployment.Console</RootNamespace>
     <AssemblyName>WoaDeployer</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Deterministic>true</Deterministic>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -96,6 +97,9 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="App.config" />
+    <None Include="App.config">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="CommandLineParser">

diff --git a/Source/Deployer.Lumia.Gui/App.config b/Source/Deployer.Lumia.Gui/App.config
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <configSections>
-        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
-            <section name="Deployer.Lumia.Gui.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+            <section name="Deployer.Lumia.Gui.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
         </sectionGroup>
     </configSections>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
     </startup>
     <userSettings>
         <Deployer.Lumia.Gui.Properties.Settings>
             <setting name="WimFolder" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="SizeReservedForWindows" serializeAs="String">
                 <value>18</value>
@@ -21,4 +21,4 @@
             </setting>
         </Deployer.Lumia.Gui.Properties.Settings>
     </userSettings>
-</configuration>
+</configuration>
diff --git a/Source/Deployer.Lumia.Gui/Deployer.Lumia.Gui.csproj b/Source/Deployer.Lumia.Gui/Deployer.Lumia.Gui.csproj
@@ -8,12 +8,13 @@
     <OutputType>WinExe</OutputType>
     <RootNamespace>Deployer.Lumia.Gui</RootNamespace>
     <AssemblyName>WOA Deployer</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Deterministic>true</Deterministic>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>

diff --git a/Source/Deployer.Lumia.Gui/Locator.cs b/Source/Deployer.Lumia.Gui/Locator.cs
@@ -51,7 +51,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>().As<IDialog>();
                 x.Export<FilePicker>().As<IFilePicker>();
                 x.Export<SettingsService>().As<ISettingsService>();
                 x.ExportFactory(() => DialogCoordinator.Instance).As<IDialogCoordinator>();

diff --git a/Source/Deployer.Lumia.Gui/Properties/Resources.Designer.cs b/Source/Deployer.Lumia.Gui/Properties/Resources.Designer.cs
diff --git a/Source/Deployer.Lumia.Gui/ViewModels/AdvancedViewModel.cs b/Source/Deployer.Lumia.Gui/ViewModels/AdvancedViewModel.cs
@@ -22,7 +22,7 @@ public AdvancedViewModel(UIServices uiServices, ISettingsService settingsService
             this.settingsService = settingsService;
             this.wapDeployer = wapDeployer;
             InstallGpuWrapper = new CommandWrapper<Unit, Unit>(this,
-                ReactiveCommand.CreateFromTask(InstallGpu), uiServices.DialogService);
+                ReactiveCommand.CreateFromTask(InstallGpu), uiServices.Dialog);
 
             sizeReservedForWindows =
                 this.WhenAnyValue(x => x.GbsReservedForWindows, ByteSize.FromGigaBytes)

diff --git a/Source/Deployer.Lumia.Gui/ViewModels/DeploymentViewModel.cs b/Source/Deployer.Lumia.Gui/ViewModels/DeploymentViewModel.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Reactive;
 using System.Reactive.Linq;
 using System.Threading.Tasks;
@@ -31,7 +32,7 @@ public DeploymentViewModel(
                 .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;
             isBusyHelper = IsBusyObservable.ToProperty(this, model => model.IsBusy);
         }
@@ -52,8 +53,10 @@ private async Task Deploy()
 
             await deployer.Deploy();
 
-            await uiServices.DialogService.ShowAlert(this, Resources.Done,
-                Resources.WindowsDeployedSuccessfully);
+            await uiServices.Dialog.PickOptions(Resources.WindowsDeployedSuccessfully, new List<Option>()
+            {
+                new Option("Close")
+            });
         }
 
         public CommandWrapper<Unit, Unit> FullInstallWrapper { get; set; }

diff --git a/Source/Deployer.Lumia.Gui/ViewModels/DualBootViewModel.cs b/Source/Deployer.Lumia.Gui/ViewModels/DualBootViewModel.cs
@@ -15,7 +15,7 @@ public class DualBootViewModel : ReactiveObject, IBusy
         private bool isEnabled;
         private bool isUpdated;
 
-        public DualBootViewModel(IPhone phone, IDialogService dialogService)
+        public DualBootViewModel(IPhone phone, IDialog dialogService)
         {
             this.phone = phone;
             var isChangingDualBoot = new Subject<bool>();

diff --git a/Source/Deployer.Lumia.Gui/ViewModels/WimPickViewModel.cs b/Source/Deployer.Lumia.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)

diff --git a/Source/Deployer.Lumia.Gui/Views/Parts/AdvancedPart.xaml b/Source/Deployer.Lumia.Gui/Views/Parts/AdvancedPart.xaml
@@ -10,7 +10,7 @@
              d:DesignHeight="450" d:DesignWidth="800" Padding="8"
              DataContext="{Binding Source={StaticResource Locator}, Path=AdvancedViewModel}" mah:DialogParticipation.Register="{Binding}">
     <StackPanel>
-        <GroupBox Header="GPU" Padding="20" Margin="0,20,0,0">
+        <GroupBox Visibility="Collapsed" Header="GPU" Padding="20" Margin="0,20,0,0">
             <HeaderedContentControl
                 HorizontalContentAlignment="Stretch">
                 <HeaderedContentControl.Header>

diff --git a/Source/Deployer.Lumia.NetFx/ContainerConfigurator.cs b/Source/Deployer.Lumia.NetFx/ContainerConfigurator.cs
@@ -4,9 +4,9 @@
 using System.Reflection;
 using Deployer.DevOpsBuildClient;
 using Deployer.Execution;
-using Deployer.Filesystem.FullFx;
 using Deployer.FileSystem;
 using Deployer.Lumia.NetFx.PhoneInfo;
+using Deployer.NetFx;
 using Deployer.Services;
 using Deployer.Tasks;
 using Grace.DependencyInjection;
@@ -55,7 +55,7 @@ where type.GetTypeInfo().ImplementedInterfaces.Contains(typeof(IDeploymentTask))
             block.Export<FileSystemOperations>().As<IFileSystemOperations>();
             block.Export<BcdInvokerFactory>().As<IBcdInvokerFactory>();
             block.Export<WindowsDeployer>().As<IWindowsDeployer>();
-            block.Export<GitHubDownloader>().As<IGitHubDownloader>();
+            block.Export<GitHubClient>().As<IGitHubClient>();
 
             WithRealPhone(block);
 

diff --git a/Source/Deployer.Lumia.NetFx/Deployer.Lumia.NetFx.csproj b/Source/Deployer.Lumia.NetFx/Deployer.Lumia.NetFx.csproj
@@ -9,9 +9,10 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Deployer.Lumia.NetFx</RootNamespace>
     <AssemblyName>Deployer.Lumia.NetFx</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/Source/Deployer.Lumia.NetFx/Properties/SharedAssemblyInfo.cs b/Source/Deployer.Lumia.NetFx/Properties/SharedAssemblyInfo.cs
@@ -27,5 +27,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.0")]
+[assembly: AssemblyVersion("2.0.1")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Source/Deployer.Lumia.NetFx/TestPhone.cs b/Source/Deployer.Lumia.NetFx/TestPhone.cs
@@ -1,7 +1,6 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Deployer.Exceptions;
-using Deployer.Filesystem.FullFx;
 using Deployer.FileSystem;
 
 namespace Deployer.Lumia.NetFx

diff --git a/Source/DeployerPlatform b/Source/DeployerPlatform