WinGui: Switch HandBrake.Interop over to .NET Standard 2.0 and Project Style SDK.

7 files changed, 25 insertions, 448 deletions

diff --git a/win/CS/HandBrake.Interop/HandBrake.Interop.csproj b/win/CS/HandBrake.Interop/HandBrake.Interop.csproj
index a549e2434..328be68a5 100644
--- a/win/CS/HandBrake.Interop/HandBrake.Interop.csproj
+++ b/win/CS/HandBrake.Interop/HandBrake.Interop.csproj
@@ -1,209 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
-    <ProjectGuid>{087A2BA8-BAC2-4577-A46F-07FF9D420016}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>HandBrake.Interop</RootNamespace>
-    <AssemblyName>HandBrake.Interop</AssemblyName>
-    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation />
-    <TargetFrameworkProfile>
-    </TargetFrameworkProfile>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <Version>1.4.0</Version>
+    <Authors>HandBrake Team</Authors>
+    <Description>HandBrake is an open-source, GPL-licensed, multiplatform,video transcoder.</Description>
+    <Copyright>Copyright © 2003-2019 HandBrake Team</Copyright>
+    <PackageProjectUrl>https://handbrake.fr</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/HandBrake/HandBrake</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+    <PackageTags>Video Transcoder</PackageTags>
+    <Platforms>x64</Platforms>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <PlatformTarget>x64</PlatformTarget>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <UseVSHostingProcess>true</UseVSHostingProcess>
-    <Prefer32Bit>false</Prefer32Bit>
-    <CodeAnalysisRuleSet>..\HandBrake.ruleset</CodeAnalysisRuleSet>
-    <NoWarn>0649</NoWarn>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <PlatformTarget>x64</PlatformTarget>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <DebugSymbols>true</DebugSymbols>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Xml.Linq">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Attributes\DisplayName.cs" />
-    <Compile Include="Attributes\DisplayNameLocalized.cs" />
-    <Compile Include="Attributes\ShortName.cs" />
-    <Compile Include="Interop\EventArgs\EncodeCompletedEventArgs.cs" />
-    <Compile Include="Interop\EventArgs\EncodeProgressEventArgs.cs" />
-    <Compile Include="Interop\EventArgs\MessageLoggedEventArgs.cs" />
-    <Compile Include="Interop\EventArgs\ScanProgressEventArgs.cs" />
-    <Compile Include="Interop\HandBrakeEncoderHelpers.cs" />
-    <Compile Include="Interop\HandBrakeFilterHelpers.cs" />
-    <Compile Include="Interop\HandBrakeInstance.cs" />
-    <Compile Include="Interop\HandBrakeLanguagesHelper.cs" />
-    <Compile Include="Interop\HandBrakePresetService.cs" />
-    <Compile Include="Interop\HandBrakeUnitConversionHelpers.cs" />
-    <Compile Include="Interop\HandBrakeUtils.cs" />
-    <Compile Include="Interop\HbLib\HBDelegates.cs" />
-    <Compile Include="Interop\HbLib\HbFunctions.cs" />
-    <Compile Include="Interop\HbLib\hb_anamorphic_mode_t.cs" />
-    <Compile Include="Interop\HbLib\hb_container_s.cs" />
-    <Compile Include="Interop\HbLib\hb_encoder_s.cs" />
-    <Compile Include="Interop\HbLib\hb_error_code.cs" />
-    <Compile Include="Interop\HbLib\hb_filter_ids.cs" />
-    <Compile Include="Interop\HbLib\hb_geometry.cs" />
-    <Compile Include="Interop\HbLib\hb_image_s.cs" />
-    <Compile Include="Interop\HbLib\hb_mixdown_s.cs" />
-    <Compile Include="Interop\HbLib\hb_rate_s.cs" />
-    <Compile Include="Interop\HbLib\hb_subtitle.cs" />
-    <Compile Include="Interop\HbLib\iso639_lang_t.cs" />
-    <Compile Include="Interop\HbLib\NativeConstants.cs" />
-    <Compile Include="Interop\HbLib\Wrappers\HbFunctionsDirect.cs" />
-    <Compile Include="Interop\HbLib\Wrappers\Interfaces\IHbFunctions.cs" />
-    <Compile Include="Interop\Helpers\InteropUtilities.cs" />
-    <Compile Include="Interop\Helpers\NativeList.cs" />
-    <Compile Include="Interop\Helpers\Utilities.cs" />
-    <Compile Include="Interop\Interfaces\IEncodeInstance.cs" />
-    <Compile Include="Interop\Interfaces\IHandBrakeInstance.cs" />
-    <Compile Include="Interop\Json\Anamorphic\AnamorphicGeometry.cs" />
-    <Compile Include="Interop\Json\Anamorphic\DestSettings.cs" />
-    <Compile Include="Interop\Json\Encode\QSV.cs" />
-    <Compile Include="Interop\Json\Filters\PresetTune.cs" />
-    <Compile Include="Interop\Json\Presets\AudioList.cs" />
-    <Compile Include="Interop\Json\Presets\HBPreset.cs" />
-    <Compile Include="Interop\Json\Presets\PresetCategory.cs" />
-    <Compile Include="Interop\Json\Presets\PresetTransportContainer.cs" />
-    <Compile Include="Interop\Json\Queue\Task.cs" />
-    <Compile Include="Interop\Json\Scan\AudioAttributes.cs" />
-    <Compile Include="Interop\Json\Scan\SubtitleAttributes.cs" />
-    <Compile Include="Interop\Json\Shared\PAR.cs" />
-    <Compile Include="Interop\Json\Encode\Audio.cs" />
-    <Compile Include="Interop\Json\Encode\AudioTrack.cs" />
-    <Compile Include="Interop\Json\Encode\Chapter.cs" />
-    <Compile Include="Interop\Json\Encode\Destination.cs" />
-    <Compile Include="Interop\Json\Encode\Filters.cs" />
-    <Compile Include="Interop\Json\Encode\Filter.cs" />
-    <Compile Include="Interop\Json\Encode\JsonEncodeObject.cs" />
-    <Compile Include="Interop\Json\Encode\Metadata.cs" />
-    <Compile Include="Interop\Json\Encode\Mp4Options.cs" />
-    <Compile Include="Interop\Json\Encode\Range.cs" />
-    <Compile Include="Interop\Json\Encode\SubtitleSearch.cs" />
-    <Compile Include="Interop\Json\Encode\Source.cs" />
-    <Compile Include="Interop\Json\Encode\SubImport.cs" />
-    <Compile Include="Interop\Json\Encode\Subtitles.cs" />
-    <Compile Include="Interop\Json\Encode\SubtitleTrack.cs" />
-    <Compile Include="Interop\Json\Encode\Video.cs" />
-    <Compile Include="Interop\Factories\AnamorphicFactory.cs" />
-    <Compile Include="Interop\Json\State\TaskState.cs" />
-    <Compile Include="Interop\Model\Encoding\CombDetect.cs" />
-    <Compile Include="Interop\Model\Encoding\DeinterlaceFilter.cs" />
-    <Compile Include="Interop\Model\Encoding\Denoise.cs" />
-    <Compile Include="Interop\Model\Encoding\Detelecine.cs" />
-    <Compile Include="Interop\Model\Encoding\HBPresetTune.cs" />
-    <Compile Include="Interop\Model\Encoding\Sharpen.cs" />
-    <Compile Include="Interop\Model\PresetVersion.cs" />
-    <Compile Include="Interop\Model\Preview\RawPreviewData.cs" />
-    <Compile Include="Interop\Providers\HbFunctionsProvider.cs" />
-    <Compile Include="Interop\Providers\Interfaces\IHbFunctionsProvider.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Interop\Json\Scan\SourceAudioTrack.cs" />
-    <Compile Include="Interop\Json\Scan\SourceChapter.cs" />
-    <Compile Include="Interop\Json\Scan\Color.cs" />
-    <Compile Include="Interop\Json\Scan\Duration.cs" />
-    <Compile Include="Interop\Json\Scan\FrameRate.cs" />
-    <Compile Include="Interop\Json\Shared\Geometry.cs" />
-    <Compile Include="Interop\Json\Scan\JsonScanObject.cs" />
-    <Compile Include="Interop\Json\Scan\SourceMetadata.cs" />
-    <Compile Include="Interop\Json\Scan\SourceSubtitleTrack.cs" />
-    <Compile Include="Interop\Json\Scan\SourceTitle.cs" />
-    <Compile Include="Interop\Json\State\JsonState.cs" />
-    <Compile Include="Interop\Json\State\Scanning.cs" />
-    <Compile Include="Interop\Json\State\WorkDone.cs" />
-    <Compile Include="Interop\Json\State\Working.cs" />
-    <Compile Include="Interop\Model\BitrateLimits.cs" />
-    <Compile Include="Interop\Model\Cropping.cs" />
-    <Compile Include="Interop\Model\Encoding\Anamorphic.cs" />
-    <Compile Include="Interop\Model\Encoding\Container.cs" />
-    <Compile Include="Interop\Model\Encoding\HBAudioEncoder.cs" />
-    <Compile Include="Interop\Model\Encoding\HBContainer.cs" />
-    <Compile Include="Interop\Model\Encoding\HBMixdown.cs" />
-    <Compile Include="Interop\Model\Encoding\HBRate.cs" />
-    <Compile Include="Interop\Model\Encoding\HBVideoEncoder.cs" />
-    <Compile Include="Interop\Model\Encoding\PictureRotation.cs" />
-    <Compile Include="Interop\Model\Encoding\ScaleMethod.cs" />
-    <Compile Include="Interop\Model\Encoding\VideoEncoder.cs" />
-    <Compile Include="Interop\Model\Encoding\VideoEncodeRateType.cs" />
-    <Compile Include="Interop\Model\Language.cs" />
-    <Compile Include="Interop\Model\Preview\PreviewSettings.cs" />
-    <Compile Include="Interop\Model\RangeLimits.cs" />
-    <Compile Include="Interop\Model\Size.cs" />
-    <Compile Include="Interop\Model\SourceVideoInfo.cs" />
-    <Compile Include="Interop\Model\VideoQualityLimits.cs" />
-    <Compile Include="Model\HBConfiguration.cs" />
-    <Compile Include="Model\VideoScaler.cs" />
-    <Compile Include="Utilities\SystemInfo.cs" />
-    <Compile Include="Utilities\VersionHelper.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Utilities\CharCodesUtilities.cs" />
-    <Compile Include="Utilities\LanguageUtilities.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <AdditionalFiles Include="..\stylecop.json">
-      <Link>stylecop.json</Link>
-    </AdditionalFiles>
-    <None Include="app.config" />
-  </ItemGroup>
+
   <ItemGroup>
-    <None Include="HandBrake.Interop.nuspec" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="gong-wpf-dragdrop">
-      <Version>2.0.1</Version>
-    </PackageReference>
-    <PackageReference Include="Newtonsoft.Json">
-      <Version>12.0.2</Version>
-    </PackageReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <TargetFrameworkSDKToolsDirectory Condition=" '$(Platform)' == 'x64'">$(TargetFrameworkSDKToolsDirectory)$(Platform)\</TargetFrameworkSDKToolsDirectory>
-  </PropertyGroup>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
+
+</Project>
diff --git a/win/CS/HandBrake.Interop/HandBrake.Interop.nuspec b/win/CS/HandBrake.Interop/HandBrake.Interop.nuspec
index 12b5dbef4..bd782ba72 100644
--- a/win/CS/HandBrake.Interop/HandBrake.Interop.nuspec
+++ b/win/CS/HandBrake.Interop/HandBrake.Interop.nuspec
@@ -15,7 +15,7 @@
     <tags>Open-Source Video Transcoder</tags>
 
     <dependencies>
-      <dependency id="Newtonsoft.Json" version="11.0.2" />
+      <dependency id="Newtonsoft.Json" version="12.0.2" />
     </dependencies>
   </metadata>
 
diff --git a/win/CS/HandBrake.Interop/Properties/AssemblyInfo.cs b/win/CS/HandBrake.Interop/Properties/AssemblyInfo.cs
deleted file mode 100644
index f693e1fec..000000000
--- a/win/CS/HandBrake.Interop/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="AssemblyInfo.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   Assembly Info
-// </summary>
-// <auto-generated/>
-// --------------------------------------------------------------------------------------------------------------------
-
-using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("HandBrake.Interop")]
-[assembly: AssemblyDescription("HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder.")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("HandBrake Team")]
-[assembly: AssemblyProduct("HandBrake")]
-[assembly: AssemblyCopyright("Copyright © 2003-2019 HandBrake Team")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("5e4e3f97-5252-41f6-aae9-3846f62cbc66")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// 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("1.4.0.0")]
-[assembly: NeutralResourcesLanguage("")]
diff --git a/win/CS/HandBrake.Interop/Properties/Resources.Designer.cs b/win/CS/HandBrake.Interop/Properties/Resources.Designer.cs
deleted file mode 100644
index bb3488fae..000000000
--- a/win/CS/HandBrake.Interop/Properties/Resources.Designer.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace HandBrake.Interop.Properties {
-    using System;
-    
-    
-    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // class via a tool like ResGen or Visual Studio.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources {
-        
-        private static global::System.Resources.ResourceManager resourceMan;
-        
-        private static global::System.Globalization.CultureInfo resourceCulture;
-        
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources() {
-        }
-        
-        /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("HandBrake.Interop.Properties.Resources", typeof(Resources).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-        
-        /// <summary>
-        ///   Overrides the current thread's CurrentUICulture property for all
-        ///   resource lookups using this strongly typed resource class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
-            get {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-    }
-}
diff --git a/win/CS/HandBrake.Interop/Properties/Resources.resx b/win/CS/HandBrake.Interop/Properties/Resources.resx
deleted file mode 100644
index 1af7de150..000000000
--- a/win/CS/HandBrake.Interop/Properties/Resources.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
\ No newline at end of file
diff --git a/win/CS/HandBrake.Interop/app.config b/win/CS/HandBrake.Interop/app.config
deleted file mode 100644
index 4a29a96b3..000000000
--- a/win/CS/HandBrake.Interop/app.config
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-  </configSections>
-  <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1"/>
-  </startup>
-</configuration>
diff --git a/win/CS/HandBrake.sln b/win/CS/HandBrake.sln
index 4daa2858a..4b805b521 100644
--- a/win/CS/HandBrake.sln
+++ b/win/CS/HandBrake.sln
@@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16

 VisualStudioVersion = 16.0.28803.352

 MinimumVisualStudioVersion = 10.0.40219.1

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandBrake.Interop", "HandBrake.Interop\HandBrake.Interop.csproj", "{087A2BA8-BAC2-4577-A46F-07FF9D420016}"

-EndProject

 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandBrakeWPF", "HandBrakeWPF\HandBrakeWPF.csproj", "{DADE66CB-0E12-4959-ADE5-0ACD31D27C59}"

 EndProject

 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{5CB7BC74-449C-4E95-98AB-E1E4387E514B}"

@@ -19,16 +17,14 @@ Project("{262852C6-CD72-467D-83FE-5EEB1973A190}") = "HandBrakeAppX", "HandBrakeA
 EndProject

 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandBrake.Worker", "HandBrake.Worker\HandBrake.Worker.csproj", "{F8370F37-B226-4830-AEE7-6D7AE403E3D2}"

 EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandBrake.Interop", "HandBrake.Interop\HandBrake.Interop.csproj", "{ED5C8D53-0988-4CEB-934A-6B1D840C6335}"

+EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

 		Debug|x64 = Debug|x64

 		Release|x64 = Release|x64

 	EndGlobalSection

 	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.Debug|x64.ActiveCfg = Debug|x64

-		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.Debug|x64.Build.0 = Debug|x64

-		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.Release|x64.ActiveCfg = Release|x64

-		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.Release|x64.Build.0 = Release|x64

 		{DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Debug|x64.ActiveCfg = Debug|x64

 		{DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Debug|x64.Build.0 = Debug|x64

 		{DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Release|x64.ActiveCfg = Release|x64

@@ -39,6 +35,10 @@ Global
 		{6E855245-E402-4C0F-BB0B-EEB63082F6AC}.Release|x64.ActiveCfg = Release|x64

 		{F8370F37-B226-4830-AEE7-6D7AE403E3D2}.Debug|x64.ActiveCfg = Debug|x64

 		{F8370F37-B226-4830-AEE7-6D7AE403E3D2}.Release|x64.ActiveCfg = Release|x64

+		{ED5C8D53-0988-4CEB-934A-6B1D840C6335}.Debug|x64.ActiveCfg = Debug|x64

+		{ED5C8D53-0988-4CEB-934A-6B1D840C6335}.Debug|x64.Build.0 = Debug|x64

+		{ED5C8D53-0988-4CEB-934A-6B1D840C6335}.Release|x64.ActiveCfg = Release|x64

+		{ED5C8D53-0988-4CEB-934A-6B1D840C6335}.Release|x64.Build.0 = Release|x64

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE