diff --git a/Source/Deployer.Lumia.Console/CompositionRoot.cs b/Source/Deployer.Lumia.Console/CompositionRoot.cs index ad82f03..0c02b21 100644 --- a/Source/Deployer.Lumia.Console/CompositionRoot.cs +++ b/Source/Deployer.Lumia.Console/CompositionRoot.cs @@ -1,6 +1,5 @@ using Deployer.Console; using Deployer.Lumia.NetFx; -using Deployer.Tasks; using Grace.DependencyInjection; namespace Deployer.Lumia.Console @@ -14,8 +13,7 @@ public static DependencyInjectionContainer CreateContainer(WindowsDeploymentOpti container.Configure(x => { x.Configure(op); - x.Export().As(); - x.Export().As(); + x.Export().As(); x.ExportInstance(progress).As(); }); diff --git a/Source/Deployer.Lumia.Gui/CompositionRoot.cs b/Source/Deployer.Lumia.Gui/CompositionRoot.cs index a31d750..c46b1a5 100644 --- a/Source/Deployer.Lumia.Gui/CompositionRoot.cs +++ b/Source/Deployer.Lumia.Gui/CompositionRoot.cs @@ -34,7 +34,6 @@ public static DependencyInjectionContainer CreateContainer() container.Configure(x => { x.Configure(optionsProvider); - x.Export().As(); x.ExportFactory(() => new DownloadProgress()) .As() .Lifestyle.Singleton(); diff --git a/Source/Deployer.Lumia.Gui/Deployer.Lumia.Gui.csproj b/Source/Deployer.Lumia.Gui/Deployer.Lumia.Gui.csproj index bee6064..fa52c2c 100644 --- a/Source/Deployer.Lumia.Gui/Deployer.Lumia.Gui.csproj +++ b/Source/Deployer.Lumia.Gui/Deployer.Lumia.Gui.csproj @@ -83,7 +83,6 @@ Resources.resx - MSBuild:Compile Designer diff --git a/Source/Deployer.Lumia.Gui/Specifics/WpfMarkdownDisplayer.cs b/Source/Deployer.Lumia.Gui/Specifics/WpfMarkdownDisplayer.cs deleted file mode 100644 index 0ac17df..0000000 --- a/Source/Deployer.Lumia.Gui/Specifics/WpfMarkdownDisplayer.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.Threading.Tasks; -using Deployer.Gui; -using Deployer.Lumia.Gui.ViewModels; -using Deployer.Tasks; - -namespace Deployer.Lumia.Gui.Specifics -{ - public class WpfMarkdownDisplayer : IMarkdownDisplayer - { - private readonly UIServices services; - - public WpfMarkdownDisplayer(UIServices services) - { - this.services = services; - } - - public Task Display(string title, string message) - { - services.ViewService.Show("MarkdownViewer", new MessageViewModel(title, message)); - return Task.CompletedTask; - } - } -} \ No newline at end of file diff --git a/Source/Deployer.Lumia.NetFx/Properties/SharedAssemblyInfo.cs b/Source/Deployer.Lumia.NetFx/Properties/SharedAssemblyInfo.cs index 116d996..9d0e80d 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.2.1")] +[assembly: AssemblyVersion("2.3.0")] [assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Source/DeployerPlatform b/Source/DeployerPlatform index e568082..6e85466 160000 --- a/Source/DeployerPlatform +++ b/Source/DeployerPlatform @@ -1 +1 @@ -Subproject commit e568082428ab5908d4e1c70f6b29d3d1fd83d542 +Subproject commit 6e85466707eba9fa6c0e56f7bd26a4e9b2879fdf