From 766aea9ce99b0540d9922be134323d8f2403e773 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Manuel=20Nieto=20S=C3=A1nchez?= Date: Sun, 24 Feb 2019 20:57:40 +0100 Subject: [PATCH] Removed GPU install Lots of fixes --- Source/Deployer.Lumia.Console/App.config | 6 +-- .../Deployer.Lumia.Console.csproj | 7 ++- Source/Deployer.Lumia.Gui/App.config | 12 ++--- .../Deployer.Lumia.Gui.csproj | 3 +- Source/Deployer.Lumia.Gui/Locator.cs | 4 +- .../Properties/Resources.Designer.cs | 44 ++++++++----------- .../Deployer.Lumia.Gui/Resources.Designer.cs | 9 +++- Source/Deployer.Lumia.Gui/Resources.resx | 9 +++- .../ViewModels/AdvancedViewModel.cs | 2 +- .../ViewModels/DeploymentViewModel.cs | 9 ++-- .../ViewModels/DualBootViewModel.cs | 2 +- .../ViewModels/WimPickViewModel.cs | 2 +- .../Views/Parts/AdvancedPart.xaml | 2 +- .../ContainerConfigurator.cs | 4 +- .../Deployer.Lumia.NetFx.csproj | 3 +- .../Properties/SharedAssemblyInfo.cs | 2 +- Source/Deployer.Lumia.NetFx/TestPhone.cs | 1 - Source/DeployerPlatform | 2 +- 18 files changed, 66 insertions(+), 57 deletions(-) diff --git a/Source/Deployer.Lumia.Console/App.config b/Source/Deployer.Lumia.Console/App.config index 731f6de..8d23437 100644 --- a/Source/Deployer.Lumia.Console/App.config +++ b/Source/Deployer.Lumia.Console/App.config @@ -1,6 +1,6 @@ - + - + - \ No newline at end of file + diff --git a/Source/Deployer.Lumia.Console/Deployer.Lumia.Console.csproj b/Source/Deployer.Lumia.Console/Deployer.Lumia.Console.csproj index 86c0ed4..4f1128b 100644 --- a/Source/Deployer.Lumia.Console/Deployer.Lumia.Console.csproj +++ b/Source/Deployer.Lumia.Console/Deployer.Lumia.Console.csproj @@ -8,10 +8,11 @@ Exe Deployment.Console WoaDeployer - v4.6.1 + v4.6.2 512 true true + AnyCPU @@ -87,7 +88,9 @@ Core\Developer Menu\ui\boot.ums.waiting.bmpx PreserveNewest - + + Designer + diff --git a/Source/Deployer.Lumia.Gui/App.config b/Source/Deployer.Lumia.Gui/App.config index ab889c8..f88cc7a 100644 --- a/Source/Deployer.Lumia.Gui/App.config +++ b/Source/Deployer.Lumia.Gui/App.config @@ -1,17 +1,17 @@ - + - -
+ +
- + - + 18 @@ -21,4 +21,4 @@ - \ No newline at end of file + diff --git a/Source/Deployer.Lumia.Gui/Deployer.Lumia.Gui.csproj b/Source/Deployer.Lumia.Gui/Deployer.Lumia.Gui.csproj index d2a449f..7cc2f39 100644 --- a/Source/Deployer.Lumia.Gui/Deployer.Lumia.Gui.csproj +++ b/Source/Deployer.Lumia.Gui/Deployer.Lumia.Gui.csproj @@ -8,12 +8,13 @@ WinExe Deployer.Lumia.Gui WOA Deployer - v4.6.1 + v4.6.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 true true + AnyCPU diff --git a/Source/Deployer.Lumia.Gui/Locator.cs b/Source/Deployer.Lumia.Gui/Locator.cs index be19dd8..ffad61e 100644 --- a/Source/Deployer.Lumia.Gui/Locator.cs +++ b/Source/Deployer.Lumia.Gui/Locator.cs @@ -37,7 +37,7 @@ public Locator() container.Configure(x => { - x.ConfigureForTesting(optionsProvider); + x.Configure(optionsProvider); x.Export().As(); x.ExportFactory(() => new BehaviorSubject(double.NaN)) .As>() @@ -50,7 +50,7 @@ public Locator() x.Export().ByInterfaces().As().Lifestyle.Singleton(); x.Export(); x.ExportFactory(() => viewService).As(); - x.Export().As(); + x.Export().As(); x.Export().As(); x.Export().As(); x.ExportFactory(() => DialogCoordinator.Instance).As(); diff --git a/Source/Deployer.Lumia.Gui/Properties/Resources.Designer.cs b/Source/Deployer.Lumia.Gui/Properties/Resources.Designer.cs index d8efbf5..9620505 100644 --- a/Source/Deployer.Lumia.Gui/Properties/Resources.Designer.cs +++ b/Source/Deployer.Lumia.Gui/Properties/Resources.Designer.cs @@ -8,10 +8,10 @@ // //------------------------------------------------------------------------------ -namespace Deployer.Lumia.Gui.Properties -{ - - +namespace Deployer.Lumia.Gui.Properties { + using System; + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -19,51 +19,43 @@ namespace Deployer.Lumia.Gui.Properties // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources - { - + internal class Resources { + private static global::System.Resources.ResourceManager resourceMan; - + private static global::System.Globalization.CultureInfo resourceCulture; - + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() - { + internal Resources() { } - + /// /// Returns the cached ResourceManager instance used by this class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager - { - get - { - if ((resourceMan == null)) - { + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Deployer.Lumia.Gui.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; } } - + /// /// Overrides the current thread's CurrentUICulture property for all /// resource lookups using this strongly typed resource class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture - { - get - { + internal static global::System.Globalization.CultureInfo Culture { + get { return resourceCulture; } - set - { + set { resourceCulture = value; } } diff --git a/Source/Deployer.Lumia.Gui/Resources.Designer.cs b/Source/Deployer.Lumia.Gui/Resources.Designer.cs index 7794933..11e8d70 100644 --- a/Source/Deployer.Lumia.Gui/Resources.Designer.cs +++ b/Source/Deployer.Lumia.Gui/Resources.Designer.cs @@ -220,10 +220,15 @@ public static string WimFilesFilter { } /// - /// Looks up a localized string similar to Done! + /// Looks up a localized string similar to # Done! + /// ///Now, please, **eject the Phone safely** to avoid data corruption issues and reboot your Phone. ///After reboot, choose "Windows 10" in the Boot Menu to start the Windows 10 ARM Setup. - ///Enjoy!. + /// + ///## Support my work + ///If this tool has been useful for you, please, consider a donation to support my work using the [**♥ Donate**](https://github.com/WOA-Project/WOA-Deployer-Lumia/blob/master/Docs/Donations.md) button. Thanks 😊 + /// + ///Enjoy!!. /// public static string WindowsDeployedSuccessfully { get { diff --git a/Source/Deployer.Lumia.Gui/Resources.resx b/Source/Deployer.Lumia.Gui/Resources.resx index 9d90885..e623fa5 100644 --- a/Source/Deployer.Lumia.Gui/Resources.resx +++ b/Source/Deployer.Lumia.Gui/Resources.resx @@ -118,10 +118,15 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - Done! + # Done! + Now, please, **eject the Phone safely** to avoid data corruption issues and reboot your Phone. After reboot, choose "Windows 10" in the Boot Menu to start the Windows 10 ARM Setup. -Enjoy! + +## Support my work +If this tool has been useful for you, please, consider a donation to support my work using the [**♥ Donate**](https://github.com/WOA-Project/WOA-Deployer-Lumia/blob/master/Docs/Donations.md) button. Thanks 😊 + +Enjoy!! - This tool comes with no warranty. diff --git a/Source/Deployer.Lumia.Gui/ViewModels/AdvancedViewModel.cs b/Source/Deployer.Lumia.Gui/ViewModels/AdvancedViewModel.cs index 9db6515..bfa9b1c 100644 --- 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.autoDeployer = autoDeployer; InstallGpuWrapper = new CommandWrapper(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 index aa8f24b..8b28b9a 100644 --- 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(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.Finished, - Resources.WindowsDeployedSuccessfully); + await uiServices.Dialog.PickOptions(Resources.WindowsDeployedSuccessfully, new List true diff --git a/Source/Deployer.Lumia.NetFx/Properties/SharedAssemblyInfo.cs b/Source/Deployer.Lumia.NetFx/Properties/SharedAssemblyInfo.cs index 469f5e7..700da20 100644 --- 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 index db80365..01a1108 100644 --- 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 index 7d85467..18c6a4b 160000 --- a/Source/DeployerPlatform +++ b/Source/DeployerPlatform @@ -1 +1 @@ -Subproject commit 7d85467bd69e1be41fbb0bd3f2db550aa3a23ca4 +Subproject commit 18c6a4b0dc62d34ad60fd7753466657f87caf55f