Neat change

SuperJMN · SuperJMN · commit 913a7cb63eee · 2019-02-14T14:01:08.000+01:00
diff --git a/Source/Deployer.Gui.Common/CommandWrapper.cs b/Source/Deployer.Gui.Common/CommandWrapper.cs
@@ -3,7 +3,7 @@
 using ReactiveUI;
 using Serilog;
 
-namespace Deployer.Gui.Core
+namespace Deployer.Gui.Common
 {
     public class CommandWrapper<T1, T2> : ReactiveObject
     {
@@ -23,7 +23,7 @@ public CommandWrapper(object parent, ReactiveCommand<T1, T2> command, IDialogSer
 
         private async Task HandleException(Exception e)
         {
-            Log.Error(e, "An error has ocurred");
+            Log.Error(e, "An error has occurred");
             Log.Information($"Error: {e.Message}");
             await dialogService.ShowAlert(parent, Resources.ErrorTitle, $"{e.Message}");   
         }
diff --git a/Source/Deployer.Gui.Common/Deployer.Gui.Common.csproj b/Source/Deployer.Gui.Common/Deployer.Gui.Common.csproj
@@ -48,11 +48,24 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="BusyButton.cs" />
+    <Compile Include="CommandWrapper.cs" />
+    <Compile Include="FilePickerMixin.cs" />
+    <Compile Include="FileTypeFilter.cs" />
+    <Compile Include="IBusyObject.cs" />
     <Compile Include="IconButton.cs" />
+    <Compile Include="IDialogService.cs" />
+    <Compile Include="IFilePicker.cs" />
     <Compile Include="ISettingsService.cs" />
+    <Compile Include="IViewService.cs" />
+    <Compile Include="Resources.Designer.cs">
+      <DependentUpon>Resources.resx</DependentUpon>
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+    </Compile>
     <Compile Include="Services\DialogService.cs" />
     <Compile Include="Services\FilePicker.cs" />
     <Compile Include="Services\ViewService.cs" />
+    <Compile Include="UIServices.cs" />
     <Compile Include="WimMetadataViewModel.cs" />
     <Page Include="Themes\Generic.xaml">
       <Generator>MSBuild:Compile</Generator>
@@ -77,6 +90,10 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <EmbeddedResource Include="Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -98,10 +115,6 @@
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>
   <ItemGroup>
-    <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\Deployer.csproj">
       <Project>{b0709401-1148-43b4-a06c-79173393dd98}</Project>
       <Name>Deployer</Name>
diff --git a/Source/Deployer.Gui.Common/FilePickerMixin.cs b/Source/Deployer.Gui.Common/FilePickerMixin.cs
@@ -4,7 +4,7 @@
 using System.Linq;
 using Serilog;
 
-namespace Deployer.Gui.Core
+namespace Deployer.Gui.Common
 {
     public static class FilePickerMixin
     {
diff --git a/Source/Deployer.Gui.Common/FileTypeFilter.cs b/Source/Deployer.Gui.Common/FileTypeFilter.cs
@@ -1,4 +1,4 @@
-﻿ namespace Deployer.Gui.Core
+﻿ namespace Deployer.Gui.Common
 {
     public class FileTypeFilter
     {
diff --git a/Source/Deployer.Gui.Common/IBusyObject.cs b/Source/Deployer.Gui.Common/IBusyObject.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Deployer.Gui.Core
+namespace Deployer.Gui.Common
 {
     public interface IBusy
     {
diff --git a/Source/Deployer.Gui.Common/IDialogService.cs b/Source/Deployer.Gui.Common/IDialogService.cs
@@ -1,6 +1,6 @@
 ﻿using System.Threading.Tasks;
 
-namespace Deployer.Gui.Core
+namespace Deployer.Gui.Common
 {
     public interface IDialogService
     {
diff --git a/Source/Deployer.Gui.Common/IFilePicker.cs b/Source/Deployer.Gui.Common/IFilePicker.cs
@@ -1,6 +1,6 @@
 ﻿using System.Collections.Generic;
 
-namespace Deployer.Gui.Core
+namespace Deployer.Gui.Common
 {
     public interface IFilePicker
     {
diff --git a/Source/Deployer.Gui.Common/IViewService.cs b/Source/Deployer.Gui.Common/IViewService.cs
@@ -1,6 +1,6 @@
 ﻿using System;
 
-namespace Deployer.Gui.Core
+namespace Deployer.Gui.Common
 {
     public interface IViewService
     {
diff --git a/Source/Deployer.Gui.Common/Resources.Designer.cs b/Source/Deployer.Gui.Common/Resources.Designer.cs
diff --git a/Source/Deployer.Gui.Common/Resources.resx b/Source/Deployer.Gui.Common/Resources.resx
diff --git a/Source/Deployer.Gui.Common/Services/DialogService.cs b/Source/Deployer.Gui.Common/Services/DialogService.cs
@@ -1,5 +1,4 @@
 ﻿using System.Threading.Tasks;
-using Deployer.Gui.Core;
 using MahApps.Metro.Controls.Dialogs;
 
 namespace Deployer.Gui.Common.Services
diff --git a/Source/Deployer.Gui.Common/Services/FilePicker.cs b/Source/Deployer.Gui.Common/Services/FilePicker.cs
@@ -1,7 +1,6 @@
 ﻿using System.Collections.Generic;
 using System.Linq;
 using System.Windows;
-using Deployer.Gui.Core;
 using Deployer.Utils;
 using Microsoft.Win32;
 
diff --git a/Source/Deployer.Gui.Common/Services/ViewService.cs b/Source/Deployer.Gui.Common/Services/ViewService.cs
@@ -1,7 +1,6 @@
 ﻿using System;
 using System.Collections.Generic;
 using System.Windows;
-using Deployer.Gui.Core;
 
 namespace Deployer.Gui.Common.Services
 {
diff --git a/Source/Deployer.Gui.Common/UIServices.cs b/Source/Deployer.Gui.Common/UIServices.cs
@@ -1,4 +1,4 @@
-namespace Deployer.Gui.Core
+namespace Deployer.Gui.Common
 {
     public class UIServices
     {
diff --git a/Source/Deployer.Gui.Core/Deployer.Gui.Core.csproj b/Source/Deployer.Gui.Core/Deployer.Gui.Core.csproj
diff --git a/Source/Deployer.Lumia.Gui/Deployer.Lumia.Gui.csproj b/Source/Deployer.Lumia.Gui/Deployer.Lumia.Gui.csproj
@@ -261,10 +261,6 @@
       <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>
diff --git a/Source/Deployer.Lumia.Gui/Locator.cs b/Source/Deployer.Lumia.Gui/Locator.cs
@@ -2,7 +2,6 @@
 using System.Reactive.Subjects;
 using Deployer.Gui.Common;
 using Deployer.Gui.Common.Services;
-using Deployer.Gui.Core;
 using Deployer.Lumia.Gui.Specifics;
 using Deployer.Lumia.Gui.ViewModels;
 using Deployer.Lumia.Gui.Views;
diff --git a/Source/Deployer.Lumia.Gui/Specifics/WpfMarkdownDisplayer.cs b/Source/Deployer.Lumia.Gui/Specifics/WpfMarkdownDisplayer.cs
@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using Deployer.Gui.Core;
+using Deployer.Gui.Common;
 using Deployer.Lumia.Gui.ViewModels;
 using Deployer.Tasks;
 
diff --git a/Source/Deployer.Lumia.Gui/ViewModels/AdvancedViewModel.cs b/Source/Deployer.Lumia.Gui/ViewModels/AdvancedViewModel.cs
@@ -3,7 +3,6 @@
 using System.Threading.Tasks;
 using ByteSizeLib;
 using Deployer.Gui.Common;
-using Deployer.Gui.Core;
 using ReactiveUI;
 
 namespace Deployer.Lumia.Gui.ViewModels
diff --git a/Source/Deployer.Lumia.Gui/ViewModels/DeploymentViewModel.cs b/Source/Deployer.Lumia.Gui/ViewModels/DeploymentViewModel.cs
@@ -2,7 +2,7 @@
 using System.Reactive;
 using System.Reactive.Linq;
 using System.Threading.Tasks;
-using Deployer.Gui.Core;
+using Deployer.Gui.Common;
 using ReactiveUI;
 
 namespace Deployer.Lumia.Gui.ViewModels
diff --git a/Source/Deployer.Lumia.Gui/ViewModels/DualBootViewModel.cs b/Source/Deployer.Lumia.Gui/ViewModels/DualBootViewModel.cs
@@ -3,7 +3,7 @@
 using System.Reactive.Linq;
 using System.Reactive.Subjects;
 using System.Threading.Tasks;
-using Deployer.Gui.Core;
+using Deployer.Gui.Common;
 using ReactiveUI;
 
 namespace Deployer.Lumia.Gui.ViewModels
diff --git a/Source/Deployer.Lumia.Gui/ViewModels/MainViewModel.cs b/Source/Deployer.Lumia.Gui/ViewModels/MainViewModel.cs
@@ -6,7 +6,7 @@
 using System.Reactive;
 using System.Reactive.Linq;
 using System.Threading;
-using Deployer.Gui.Core;
+using Deployer.Gui.Common;
 using DynamicData;
 using ReactiveUI;
 using Serilog.Events;
diff --git a/Source/Deployer.Lumia.Gui/ViewModels/WimPickViewModel.cs b/Source/Deployer.Lumia.Gui/ViewModels/WimPickViewModel.cs
@@ -7,7 +7,6 @@
 using System.Runtime.InteropServices;
 using Deployer.Exceptions;
 using Deployer.Gui.Common;
-using Deployer.Gui.Core;
 using Deployer.Services.Wim;
 using ReactiveUI;
 using Serilog;
diff --git a/Source/Deployer.Lumia.NetFx/ContainerConfigurator.cs b/Source/Deployer.Lumia.NetFx/ContainerConfigurator.cs
@@ -7,7 +7,6 @@
 using Deployer.Filesystem.FullFx;
 using Deployer.FileSystem;
 using Deployer.Lumia.NetFx.PhoneInfo;
-using Deployer.Raspberry;
 using Deployer.Services;
 using Deployer.Tasks;
 using Grace.DependencyInjection;
diff --git a/Source/Deployer.Raspberry.Gui/Deployer.Raspberry.Gui.csproj b/Source/Deployer.Raspberry.Gui/Deployer.Raspberry.Gui.csproj
@@ -332,10 +332,6 @@
       <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.NetFx\Deployer.NetFx.csproj">
       <Project>{fbedaf0e-e2ed-4005-8d83-f980fa67feb2}</Project>
       <Name>Deployer.NetFx</Name>
diff --git a/Source/Deployer.Raspberry.Gui/Locator.cs b/Source/Deployer.Raspberry.Gui/Locator.cs
@@ -6,7 +6,6 @@
 using Deployer.Filesystem.FullFx;
 using Deployer.Gui.Common;
 using Deployer.Gui.Common.Services;
-using Deployer.Gui.Core;
 using Deployer.Lumia.NetFx;
 using Deployer.Raspberry.Gui.Specifics;
 using Deployer.Raspberry.Gui.ViewModels;
diff --git a/Source/Deployer.Raspberry.Gui/Specifics/WpfMarkdownDisplayer.cs b/Source/Deployer.Raspberry.Gui/Specifics/WpfMarkdownDisplayer.cs
@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using Deployer.Gui.Core;
+using Deployer.Gui.Common;
 using Deployer.Raspberry.Gui.ViewModels;
 using Deployer.Tasks;
 
diff --git a/Source/Deployer.Raspberry.Gui/ViewModels/AdvancedViewModel.cs b/Source/Deployer.Raspberry.Gui/ViewModels/AdvancedViewModel.cs
@@ -2,7 +2,6 @@
 using System.Reactive.Linq;
 using ByteSizeLib;
 using Deployer.Gui.Common;
-using Deployer.Gui.Core;
 using ReactiveUI;
 
 namespace Deployer.Raspberry.Gui.ViewModels
diff --git a/Source/Deployer.Raspberry.Gui/ViewModels/DeploymentViewModel.cs b/Source/Deployer.Raspberry.Gui/ViewModels/DeploymentViewModel.cs
@@ -5,7 +5,7 @@
 using System.Reactive.Linq;
 using System.Threading.Tasks;
 using Deployer.FileSystem;
-using Deployer.Gui.Core;
+using Deployer.Gui.Common;
 using ReactiveUI;
 
 namespace Deployer.Raspberry.Gui.ViewModels
diff --git a/Source/Deployer.Raspberry.Gui/ViewModels/MainViewModel.cs b/Source/Deployer.Raspberry.Gui/ViewModels/MainViewModel.cs
@@ -6,7 +6,7 @@
 using System.Reactive;
 using System.Reactive.Linq;
 using System.Threading;
-using Deployer.Gui.Core;
+using Deployer.Gui.Common;
 using DynamicData;
 using ReactiveUI;
 using Serilog.Events;
diff --git a/Source/Deployer.Raspberry.Gui/ViewModels/WimPickViewModel.cs b/Source/Deployer.Raspberry.Gui/ViewModels/WimPickViewModel.cs
@@ -7,7 +7,6 @@
 using System.Runtime.InteropServices;
 using Deployer.Exceptions;
 using Deployer.Gui.Common;
-using Deployer.Gui.Core;
 using Deployer.Services.Wim;
 using ReactiveUI;
 using Serilog;
diff --git a/Source/Deployer/DeviceProvider.cs b/Source/Deployer/DeviceProvider.cs
@@ -1,4 +1,4 @@
-﻿namespace Deployer.Raspberry
+﻿namespace Deployer
 {
     public class DeviceProvider : IDeviceProvider
     {
diff --git a/Source/WoaDeployer for Raspberry.sln b/Source/WoaDeployer for Raspberry.sln
@@ -21,8 +21,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deployer.Raspberry.Gui", "D
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deployer.Gui.Common", "Deployer.Gui.Common\Deployer.Gui.Common.csproj", "{AD8EA86C-AF60-4CCF-9CAA-07BBF5E039EC}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Deployer.Gui.Core", "Deployer.Gui.Core\Deployer.Gui.Core.csproj", "{4DDBED8A-6445-4E59-9E64-6FA3B7419052}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Deployer.Tests", "Deployer.Tests\Deployer.Tests.csproj", "{6D253E1A-AB6A-470D-846B-C07EC8EB9089}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Lumia", "Lumia", "{EAF0E67A-0310-428F-BCA3-0287771B8561}"
@@ -73,10 +71,6 @@ Global
 		{AD8EA86C-AF60-4CCF-9CAA-07BBF5E039EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AD8EA86C-AF60-4CCF-9CAA-07BBF5E039EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AD8EA86C-AF60-4CCF-9CAA-07BBF5E039EC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4DDBED8A-6445-4E59-9E64-6FA3B7419052}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4DDBED8A-6445-4E59-9E64-6FA3B7419052}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4DDBED8A-6445-4E59-9E64-6FA3B7419052}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4DDBED8A-6445-4E59-9E64-6FA3B7419052}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6D253E1A-AB6A-470D-846B-C07EC8EB9089}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6D253E1A-AB6A-470D-846B-C07EC8EB9089}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6D253E1A-AB6A-470D-846B-C07EC8EB9089}.Release|Any CPU.ActiveCfg = Release|Any CPU

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`using ReactiveUI;`
`4`	`4`	`using Serilog;`
`5`	`5`
`6`		`-namespace Deployer.Gui.Core`
	`6`	`+namespace Deployer.Gui.Common`
`7`	`7`	`{`
`8`	`8`	`public class CommandWrapper<T1, T2> : ReactiveObject`
`9`	`9`	`{`
`@@ -23,7 +23,7 @@ public CommandWrapper(object parent, ReactiveCommand<T1, T2> command, IDialogSer`
`23`	`23`
`24`	`24`	`private async Task HandleException(Exception e)`
`25`	`25`	`{`
`26`		`- Log.Error(e, "An error has ocurred");`
	`26`	`+ Log.Error(e, "An error has occurred");`
`27`	`27`	`Log.Information($"Error: {e.Message}");`
`28`	`28`	`await dialogService.ShowAlert(parent, Resources.ErrorTitle, $"{e.Message}");`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`using System.Linq;`
`5`	`5`	`using Serilog;`
`6`	`6`
`7`		`-namespace Deployer.Gui.Core`
	`7`	`+namespace Deployer.Gui.Common`
`8`	`8`	`{`
`9`	`9`	`public static class FilePickerMixin`
`10`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`- namespace Deployer.Gui.Core`
	`1`	`+ namespace Deployer.Gui.Common`
`2`	`2`	`{`
`3`	`3`	`public class FileTypeFilter`
`4`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`
`3`		`-namespace Deployer.Gui.Core`
	`3`	`+namespace Deployer.Gui.Common`
`4`	`4`	`{`
`5`	`5`	`public interface IBusy`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using System.Threading.Tasks;`
`2`	`2`
`3`		`-namespace Deployer.Gui.Core`
	`3`	`+namespace Deployer.Gui.Common`
`4`	`4`	`{`
`5`	`5`	`public interface IDialogService`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using System.Collections.Generic;`
`2`	`2`
`3`		`-namespace Deployer.Gui.Core`
	`3`	`+namespace Deployer.Gui.Common`
`4`	`4`	`{`
`5`	`5`	`public interface IFilePicker`
`6`	`6`	`{`