Fixed Lumia?

Author: SuperJMN

Source/Deployer.Lumia.Gui/Deployer.Lumia.Gui.csproj

@@ -226,32 +226,6 @@
       <Version>1.0.8</Version>
     </PackageReference>
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Deployer.Gui.Common\Deployer.Gui.Common.csproj">
-      <Project>{AD8EA86C-AF60-4CCF-9CAA-07BBF5E039EC}</Project>
-      <Name>Deployer.Gui.Common</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Deployer.Gui.Core\Deployer.Gui.Core.csproj">
-      <Project>{4DDBED8A-6445-4E59-9E64-6FA3B7419052}</Project>
-      <Name>Deployer.Gui.Core</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Deployer.Lumia.NetFx\Deployer.Lumia.NetFx.csproj">
-      <Project>{2ABBF26A-2C87-4657-861E-08EC55DEAD77}</Project>
-      <Name>Deployer.Lumia.NetFx</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Deployer.Lumia\Deployer.Lumia.csproj">
-      <Project>{20501832-13f5-4673-9d86-9e7e0c562027}</Project>
-      <Name>Deployer.Lumia</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Deployer.NetFx\Deployer.NetFx.csproj">
-      <Project>{FBEDAF0E-E2ED-4005-8D83-F980FA67FEB2}</Project>
-      <Name>Deployer.NetFx</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Deployer\Deployer.csproj">
-      <Project>{B0709401-1148-43B4-A06C-79173393DD98}</Project>
-      <Name>Deployer</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <Resource Include="Assets\950.png" />
     <Resource Include="Assets\950xl.png" />
@@ -283,5 +257,27 @@
   <ItemGroup>
     <Resource Include="Assets\heart.png" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Deployer.Gui.Common\Deployer.Gui.Common.csproj">
+      <Project>{ad8ea86c-af60-4ccf-9caa-07bbf5e039ec}</Project>
+      <Name>Deployer.Gui.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Deployer.Gui.Core\Deployer.Gui.Core.csproj">
+      <Project>{4ddbed8a-6445-4e59-9e64-6fa3b7419052}</Project>
+      <Name>Deployer.Gui.Core</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Deployer.Lumia.NetFx\Deployer.Lumia.NetFx.csproj">
+      <Project>{cfa21504-2cfd-468b-8458-bd9bd05bcf19}</Project>
+      <Name>Deployer.Lumia.NetFx</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Deployer.Lumia\Deployer.Lumia.csproj">
+      <Project>{f78af625-5811-4d00-b95d-0b2a331152fd}</Project>
+      <Name>Deployer.Lumia</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Deployer\Deployer.csproj">
+      <Project>{b0709401-1148-43b4-a06c-79173393dd98}</Project>
+      <Name>Deployer</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

Source/Deployer.Lumia.Gui/Locator.cs

@@ -38,7 +38,7 @@ public Locator()
 
             container.Configure(x =>
             {
-                x.Configure(optionsProvider);
+                x.ConfigureForTesting(optionsProvider);
                 x.Export<WpfMarkdownDisplayer>().As<IMarkdownDisplayer>();
                 x.ExportFactory(() => new BehaviorSubject<double>(double.NaN))
                     .As<IObserver<double>>()

Source/Deployer.Lumia.NetFx/ContainerConfigurator.cs

@@ -40,7 +40,7 @@ where type.GetTypeInfo().ImplementedInterfaces.Contains(typeof(IDeploymentTask))
             block.ExportFactory(Tokenizer.Create).As<Tokenizer<LangToken>>();
             block.Export<ScriptParser>().As<IScriptParser>();
             block.ExportFactory(() => installOptionsProvider).As<IWindowsOptionsProvider>();
-            
+            block.Export<LumiaDisklayoutPreparer>().As<IDisklayoutPreparer>();
             block.Export<PhoneInfoReader>().As<IPhoneInfoReader>();
             block.Export<WoaDeployer>().As<IWoaDeployer>();
             block.Export<Tooling>().As<ITooling>();

Source/Deployer.Raspberry.NetFx/ContainerConfigurator.cs

@@ -34,7 +34,7 @@ public static IExportRegistrationBlock WithCommon(this IExportRegistrationBlock
                             from type in a.ExportedTypes
                             where type.GetTypeInfo().ImplementedInterfaces.Contains(typeof(IDeploymentTask))
                             select type;
-            block.ExportAssemblies(Assemblies.AppDomainAssemblies).ByInterface<ISpaceAllocator<IDevice>>();
+            block.ExportAssemblies(Assemblies.AppDomainAssemblies).ByInterface<ISpaceAllocator<IPhone>>();
             block.Export<ZipExtractor>().As<IZipExtractor>();
             block.ExportFactory(Tokenizer.Create).As<Tokenizer<LangToken>>();
             block.Export<ScriptParser>().As<IScriptParser>();