Auto Updates

Console and GUI are joined
WOA-Project · Feb 23, 2019 · 1ab6223 · 1ab6223
1 parent 289453a
commit 1ab6223
Show file tree

Hide file tree

Showing 18 changed files with 91 additions and 45 deletions.
diff --git a/Source/Deployer.Raspberry.Console/App.config b/Source/Deployer.Raspberry.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.Raspberry.Console/ConsoleDisplayUpdater.cs b/Source/Deployer.Raspberry.Console/ConsoleDisplayUpdater.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Linq;
 
-namespace Deployment.Console
+namespace Deployer.Raspberry.Console
 {
     public class ConsoleDisplayUpdater : IDisposable
     {

diff --git a/Source/Deployer.Raspberry.Console/ConsoleMarkdownDialog.cs b/Source/Deployer.Raspberry.Console/ConsoleMarkdownDialog.cs
@@ -1,8 +1,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Deployer;
 
-namespace Deployment.Console
+namespace Deployer.Raspberry.Console
 {
     internal class ConsoleMarkdownDialog : IMarkdownDialog
     {

diff --git a/Source/Deployer.Raspberry.Console/ConsoleMarkdownDisplayer.cs b/Source/Deployer.Raspberry.Console/ConsoleMarkdownDisplayer.cs
@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using Deployer.Tasks;
 
-namespace Deployment.Console
+namespace Deployer.Raspberry.Console
 {
     internal class ConsoleMarkdownDisplayer : IMarkdownDisplayer
     {

diff --git a/Source/Deployer.Raspberry.Console/Deployer.Raspberry.Console.csproj b/Source/Deployer.Raspberry.Console/Deployer.Raspberry.Console.csproj
@@ -5,13 +5,14 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{16500914-E053-433E-9B6A-27D4A5717130}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>Deployment.Console</RootNamespace>
-    <AssemblyName>WoaDeployer</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <OutputType>Library</OutputType>
+    <RootNamespace>Deployer.Raspberry.Console</RootNamespace>
+    <AssemblyName>Deployer.Raspberry.Console</AssemblyName>
+    <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>
@@ -34,8 +35,9 @@
     <WarningLevel>4</WarningLevel>
     <LangVersion>7.1</LangVersion>
   </PropertyGroup>
+  <PropertyGroup />
   <PropertyGroup>
-    <ApplicationManifest>app.manifest</ApplicationManifest>
+    <StartupObject />
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -117,7 +119,9 @@
       <Link>Core\Tools\Etcher-Cli\x86\node_modules\usb\src\binding\usb_bindings.node</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="App.config" />
+    <None Include="App.config">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="CommandLineParser">
@@ -133,7 +137,7 @@
       <Version>3.3.0</Version>
     </PackageReference>
     <PackageReference Include="System.Reactive">
-      <Version>4.1.2</Version>
+      <Version>4.1.3</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/Source/Deployer.Raspberry.Console/Options/NonWindowsDeploymentCmdOptions.cs b/Source/Deployer.Raspberry.Console/Options/NonWindowsDeploymentCmdOptions.cs
@@ -1,6 +1,6 @@
 using CommandLine;
 
-namespace Deployment.Console.Options
+namespace Deployer.Raspberry.Console.Options
 {
     [Verb("execute", HelpText = "Executes a script that doesn't deploy Windows")]
     public class NonWindowsDeploymentCmdOptions

diff --git a/Source/Deployer.Raspberry.Console/Options/WindowsDeploymentCmdOptions.cs b/Source/Deployer.Raspberry.Console/Options/WindowsDeploymentCmdOptions.cs
@@ -1,6 +1,6 @@
 using CommandLine;
 
-namespace Deployment.Console.Options
+namespace Deployer.Raspberry.Console.Options
 {
     [Verb("deploy", HelpText = "Executes a Windows deployment script")]
     public class WindowsDeploymentCmdOptions

diff --git a/Source/Deployer.Raspberry.Console/Program.cs b/Source/Deployer.Raspberry.Console/Program.cs
@@ -3,23 +3,20 @@
 using System.Linq;
 using System.Reactive.Subjects;
 using System.Threading.Tasks;
-using ByteSizeLib;
 using CommandLine;
-using Deployer;
 using Deployer.FileSystem;
 using Deployer.Lumia.NetFx;
-using Deployer.Raspberry;
+using Deployer.Raspberry.Console.Options;
 using Deployer.Tasks;
-using Deployment.Console.Options;
 using Grace.DependencyInjection;
 using Serilog;
 using Serilog.Events;
 
-namespace Deployment.Console
+namespace Deployer.Raspberry.Console
 {
-    internal static class Program
+    public static class Program
     {
-        private static async Task Main(string[] args)
+        public static async Task Main(string[] args)
         {
             ConfigureLogger();
 

diff --git a/Source/Deployer.Raspberry.Console/Resources.Designer.cs b/Source/Deployer.Raspberry.Console/Resources.Designer.cs
diff --git a/Source/Deployer.Raspberry.Gui/App.config b/Source/Deployer.Raspberry.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.Android.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.Android.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.Android.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.Android.Gui.Properties.Settings>
     </userSettings>
-</configuration>
+</configuration>
diff --git a/Source/Deployer.Raspberry.Gui/App.xaml b/Source/Deployer.Raspberry.Gui/App.xaml
@@ -2,9 +2,7 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:valueConverters="clr-namespace:ValueConverters;assembly=ValueConverters"
-             xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
-             xmlns:gui="clr-namespace:Deployer.Raspberry.Gui"
-             StartupUri="Views\MainWindow.xaml">
+             xmlns:gui="clr-namespace:Deployer.Raspberry.Gui">
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>

diff --git a/Source/Deployer.Raspberry.Gui/App.xaml.cs b/Source/Deployer.Raspberry.Gui/App.xaml.cs
@@ -1,15 +1,45 @@
-using System.Windows;
+using System.Linq;
+using System.Windows;
+using Deployer.Gui.Common;
+using Deployer.Raspberry.Console;
+using Deployer.Raspberry.Gui.Views;
+using Serilog;
+
 
 namespace Deployer.Raspberry.Gui
 {
     public partial class App
     {
         protected override void OnStartup(StartupEventArgs e)
         {
-            base.OnStartup(e);  
-            
+            base.OnStartup(e);
+
             MahApps.Metro.ThemeManager.IsAutomaticWindowsAppModeSettingSyncEnabled = true;
             MahApps.Metro.ThemeManager.SyncThemeWithWindowsAppModeSetting();
+
+            if (e.Args.Any())
+            {
+                LaunchConsole(e.Args);
+            }
+            else
+            {
+                LaunchGui();
+            }
+        }
+
+        private void LaunchGui()
+        {
+            var window = new MainWindow();
+            MainWindow = window;
+            window.Show();            
+        }
+
+        private void LaunchConsole(string[] args)
+        {
+            UpdateChecker.CheckForUpdates(AppProperties.GitHubBaseUrl);
+
+            ConsoleEmbedder.ExecuteInsideConsole(() => Program.Main(args).Wait());
+            Shutdown();
         }
     }
 }
diff --git a/Source/Deployer.Raspberry.Gui/AppProperties.cs b/Source/Deployer.Raspberry.Gui/AppProperties.cs
@@ -0,0 +1,7 @@
+namespace Deployer.Raspberry.Gui
+{
+    public class AppProperties
+    {
+        public const string GitHubBaseUrl = "https://github.com/WOA-Project/WOA-Deployer-Rpi";
+    }
+}
diff --git a/Source/Deployer.Raspberry.Gui/Deployer.Raspberry.Gui.csproj b/Source/Deployer.Raspberry.Gui/Deployer.Raspberry.Gui.csproj
@@ -7,13 +7,14 @@
     <ProjectGuid>{ED104C3D-4B45-4C45-82BD-B043E85F0FE8}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <RootNamespace>Deployer.Raspberry.Gui</RootNamespace>
-    <AssemblyName>WOA Deployer</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <AssemblyName>WoaDeployer</AssemblyName>
+    <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>
@@ -40,6 +41,9 @@
   <PropertyGroup>
     <ApplicationIcon>Assets\appicon.ico</ApplicationIcon>
   </PropertyGroup>
+  <PropertyGroup>
+    <StartupObject>Deployer.Raspberry.Gui.App</StartupObject>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -65,6 +69,7 @@
     <Compile Include="..\Deployer.Raspberry.NetFx\Properties\SharedAssemblyInfo.cs">
       <Link>Properties\SharedAssemblyInfo.cs</Link>
     </Compile>
+    <Compile Include="AppProperties.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
@@ -229,7 +234,7 @@
       <Version>1.0.0</Version>
     </PackageReference>
     <PackageReference Include="ReactiveUI.WPF">
-      <Version>9.9.1</Version>
+      <Version>9.11.1</Version>
     </PackageReference>
     <PackageReference Include="Serilog.Sinks.Observable">
       <Version>2.0.2</Version>
@@ -307,6 +312,10 @@
     </None>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\Deployer.Raspberry.Console\Deployer.Raspberry.Console.csproj">
+      <Project>{16500914-e053-433e-9b6a-27d4a5717130}</Project>
+      <Name>Deployer.Raspberry.Console</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Deployer.Raspberry.NetFx\Deployer.Raspberry.NetFx.csproj">
       <Project>{2abbf26a-2c87-4657-861e-08ec55dead77}</Project>
       <Name>Deployer.Raspberry.NetFx</Name>

diff --git a/Source/Deployer.Raspberry.Gui/Locator.cs b/Source/Deployer.Raspberry.Gui/Locator.cs
@@ -5,7 +5,6 @@
 using Deployer.Lumia.NetFx;
 using Deployer.Raspberry.Gui.Specifics;
 using Deployer.Raspberry.Gui.ViewModels;
-using Deployer.Raspberry.Gui.Views;
 using Deployer.Tasks;
 using Grace.DependencyInjection;
 using MahApps.Metro.Controls.Dialogs;
@@ -17,7 +16,7 @@ namespace Deployer.Raspberry.Gui
     public class Locator
     {
         private readonly DependencyInjectionContainer container;
-        
+
         public Locator()
         {
             container = new DependencyInjectionContainer();
@@ -32,6 +31,8 @@ public Locator()
                 .MinimumLevel.Verbose()
                 .CreateLogger();
 
+            UpdateChecker.CheckForUpdates(AppProperties.GitHubBaseUrl);
+
             var optionsProvider = new WindowsDeploymentOptionsProvider();
 
             container.Configure(x =>

diff --git a/Source/Deployer.Raspberry.NetFx/Deployer.Raspberry.NetFx.csproj b/Source/Deployer.Raspberry.NetFx/Deployer.Raspberry.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.Raspberry.NetFx/Properties/SharedAssemblyInfo.cs b/Source/Deployer.Raspberry.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.1.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Source/DeployerPlatform b/Source/DeployerPlatform