WinGui: Decouple HandBrake.Worker from HandBrakeWPF project.

9 files changed, 6 insertions, 17 deletions

diff --git a/win/CS/HandBrake.Worker/HandBrake.Worker.csproj b/win/CS/HandBrake.Worker/HandBrake.Worker.csproj
index ab7dcfc8f..6a0e61039 100644
--- a/win/CS/HandBrake.Worker/HandBrake.Worker.csproj
+++ b/win/CS/HandBrake.Worker/HandBrake.Worker.csproj
@@ -22,7 +22,6 @@
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
     <FileVersion>1.4.0.0</FileVersion>
     <Version>1.4.0</Version>
-    <RuntimeIdentifiers>win7-x64</RuntimeIdentifiers>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
index 9fa6b1c3c..20a36a700 100644
--- a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
+++ b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
@@ -22,6 +22,7 @@
     <AssemblyName>HandBrake</AssemblyName>

     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>

     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>

+    <LangVersion>latest</LangVersion>

   </PropertyGroup>

 

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

@@ -49,12 +50,6 @@
 

   <ItemGroup>

     <ProjectReference Include="..\HandBrake.Interop\HandBrake.Interop.csproj" />

-    <ProjectReference Include="..\HandBrake.Worker\HandBrake.Worker.csproj">

-      <Private>true</Private>

-      <CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>

-      <IncludeAssets>*.json</IncludeAssets>

-      <ReferenceOutputAssembly>true</ReferenceOutputAssembly>

-    </ProjectReference>

   </ItemGroup>

 

   <ItemGroup>

diff --git a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj.DotSettings b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj.DotSettings
deleted file mode 100644
index c54c126d2..000000000
--- a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj.DotSettings
+++ /dev/null
@@ -1,2 +0,0 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp70</s:String></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/win/CS/HandBrakeWPF/Instance/RemoteInstance.cs b/win/CS/HandBrakeWPF/Instance/RemoteInstance.cs
index 14f88a221..e52360ba5 100644
--- a/win/CS/HandBrakeWPF/Instance/RemoteInstance.cs
+++ b/win/CS/HandBrakeWPF/Instance/RemoteInstance.cs
@@ -24,10 +24,10 @@ namespace HandBrakeWPF.Instance
     using HandBrake.Interop.Interop.Json.Encode;
     using HandBrake.Interop.Interop.Json.State;
     using HandBrake.Interop.Utilities;
-    using HandBrake.Worker.Routing.Commands;
 
     using HandBrakeWPF.Instance.Model;
     using HandBrakeWPF.Model.Options;
+    using HandBrakeWPF.Model.Worker;
     using HandBrakeWPF.Services.Interfaces;
     using HandBrakeWPF.Services.Logging.Interfaces;
     using HandBrakeWPF.Utilities;
diff --git a/win/CS/HandBrakeWPF/Services/Logging/EventArgs/LogEventArgs.cs b/win/CS/HandBrakeWPF/Services/Logging/EventArgs/LogEventArgs.cs
index 034d3cb90..efa5e2866 100644
--- a/win/CS/HandBrakeWPF/Services/Logging/EventArgs/LogEventArgs.cs
+++ b/win/CS/HandBrakeWPF/Services/Logging/EventArgs/LogEventArgs.cs
@@ -11,7 +11,7 @@ namespace HandBrakeWPF.Services.Logging.EventArgs
 {
     using System;
 
-    using HandBrake.Worker.Logging.Models;
+    using HandBrakeWPF.Model.Logging;
 
     /// <summary>
     /// The Message Logged Event Args
diff --git a/win/CS/HandBrakeWPF/Services/Logging/Interfaces/ILog.cs b/win/CS/HandBrakeWPF/Services/Logging/Interfaces/ILog.cs
index 551d49f5a..347b0d4d5 100644
--- a/win/CS/HandBrakeWPF/Services/Logging/Interfaces/ILog.cs
+++ b/win/CS/HandBrakeWPF/Services/Logging/Interfaces/ILog.cs
@@ -12,7 +12,7 @@ namespace HandBrakeWPF.Services.Logging.Interfaces
     using System;
     using System.Collections.Generic;
 
-    using HandBrake.Worker.Logging.Models;
+    using HandBrakeWPF.Model.Logging;
 
     using LogEventArgs = EventArgs.LogEventArgs;
 
diff --git a/win/CS/HandBrakeWPF/Services/Logging/LogService.cs b/win/CS/HandBrakeWPF/Services/Logging/LogService.cs
index 7abcf69a7..293e587e9 100644
--- a/win/CS/HandBrakeWPF/Services/Logging/LogService.cs
+++ b/win/CS/HandBrakeWPF/Services/Logging/LogService.cs
@@ -19,8 +19,7 @@ namespace HandBrakeWPF.Services.Logging
     using System.Linq;
     using System.Text;
 
-    using HandBrake.Worker.Logging.Models;
-
+    using HandBrakeWPF.Model.Logging;
     using HandBrakeWPF.Utilities;
 
     using ILog = Interfaces.ILog;
diff --git a/win/CS/HandBrakeWPF/Services/Queue/QueueService.cs b/win/CS/HandBrakeWPF/Services/Queue/QueueService.cs
index 7c9a92783..07a45aa51 100644
--- a/win/CS/HandBrakeWPF/Services/Queue/QueueService.cs
+++ b/win/CS/HandBrakeWPF/Services/Queue/QueueService.cs
@@ -21,7 +21,6 @@ namespace HandBrakeWPF.Services.Queue
     using HandBrake.Interop.Interop.Interfaces.Model;
     using HandBrake.Interop.Interop.Json.Queue;
     using HandBrake.Interop.Utilities;
-    using HandBrake.Worker.Routing.Commands;
 
     using HandBrakeWPF.Factories;
     using HandBrakeWPF.Helpers;
diff --git a/win/CS/HandBrakeWPF/ViewModels/LogViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/LogViewModel.cs
index 907b33a40..52693f67b 100644
--- a/win/CS/HandBrakeWPF/ViewModels/LogViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/LogViewModel.cs
@@ -19,8 +19,7 @@ namespace HandBrakeWPF.ViewModels
 

     using Caliburn.Micro;

 

-    using HandBrake.Worker.Logging.Models;

-

+    using HandBrakeWPF.Model.Logging;

     using HandBrakeWPF.Properties;

     using HandBrakeWPF.Services.Interfaces;

     using HandBrakeWPF.Services.Logging.EventArgs;