WinGui: Switch to SDK style cproj files. Switch to PackageReferences for NuGet Packages.

diff --git a/win/CS/HandBrake.Interop/HandBrake.Interop.csproj b/win/CS/HandBrake.Interop/HandBrake.Interop.csproj
index 733c81248e0bf070d34350d27a6e36879e433810..efc29219eb13fa779476e9bd39cf69093d6db841 100644 (file)
--- a/win/CS/HandBrake.Interop/HandBrake.Interop.csproj
+++ b/win/CS/HandBrake.Interop/HandBrake.Interop.csproj
@@ -1,204 +1,50 @@
-<?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>net471</TargetFramework>
+    <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+    <ApplicationIcon />
+    <StartupObject />
+    <Platforms>x64</Platforms>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <Authors>The HandBrake Team</Authors>
+    <PackageProjectUrl>https://handbrake.fr</PackageProjectUrl>
+    <PackageLicenseExpression></PackageLicenseExpression>
+    <PackageIconUrl>https://handbrake.fr/img/logo.png</PackageIconUrl>
+    <RepositoryUrl>https://github.com/HandBrake/HandBrake.git</RepositoryUrl>
+    <RepositoryType>Git</RepositoryType>
+    <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
+    <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <PackageLicenseFile>License.txt</PackageLicenseFile>
+    <Version>1.3.0</Version>
+    <PackageReleaseNotes>Releasese notes for HandBrake are available on GitHub.</PackageReleaseNotes>
+    <Description>HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder.
+This package is a wrapper around hb.dll
+
+hb.dll is not provided and must be built separately.</Description>
+    <Copyright>Copyright © 2003-2019 HandBrake Team</Copyright>
+    <PackageTags>Video Transcoder</PackageTags>
   </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>
+    <OutputPath>bin\Debug</OutputPath>
   </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 Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <OutputPath>bin\Release</OutputPath>
   </PropertyGroup>
+
   <ItemGroup>
-    <Reference Include="GongSolutions.WPF.DragDrop, Version=2.0.0.0, Culture=neutral, PublicKeyToken=91f1945125b7a587, processorArchitecture=MSIL">
-      <HintPath>..\packages\gong-wpf-dragdrop.2.0.1\lib\net47\GongSolutions.WPF.DragDrop.dll</HintPath>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <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\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="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" />
+    <PackageReference Include="Newtonsoft.Json">
+      <Version>12.0.2</Version>
+    </PackageReference>
   </ItemGroup>
+
   <ItemGroup>
-    <AdditionalFiles Include="..\stylecop.json">
-      <Link>stylecop.json</Link>
-    </AdditionalFiles>
-    <None Include="app.config" />
-    <None Include="packages.config" />
+    <None Include="..\doc\License.txt">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
+    </None>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="HandBrake.Interop.nuspec" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </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

diff --git a/win/CS/HandBrake.Interop/HandBrake.Interop.nuspec b/win/CS/HandBrake.Interop/HandBrake.Interop.nuspec
deleted file mode 100644 (file)
index 12b5dbe..0000000
--- a/win/CS/HandBrake.Interop/HandBrake.Interop.nuspec
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
-  <metadata>
-    <id>$id$</id>
-    <version>$version$-Nightly</version>
-    <title>$title$</title>
-    <authors>$author$</authors>
-    <owners>$author$</owners>
-    <licenseUrl>https://github.com/HandBrake/HandBrake/blob/master/LICENSE</licenseUrl>
-    <projectUrl>http://github.com/HandBrake/HandBrake</projectUrl>
-    <iconUrl>https://avatars1.githubusercontent.com/u/627269</iconUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>$description$</description>
-    <copyright>Copyright © 2003-2019 HandBrake Team</copyright>
-    <tags>Open-Source Video Transcoder</tags>
-
-    <dependencies>
-      <dependency id="Newtonsoft.Json" version="11.0.2" />
-    </dependencies>
-  </metadata>
-
-  <files>
-    <file src="bin\Release\HandBrake.Interop.pdb" target="lib\net471" />
-  </files>
-</package>
\ No newline at end of file

diff --git a/win/CS/HandBrake.Interop/Properties/AssemblyInfo.cs b/win/CS/HandBrake.Interop/Properties/AssemblyInfo.cs
deleted file mode 100644 (file)
index 75448ee..0000000
--- 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.3.0.0")]
-[assembly: NeutralResourcesLanguage("")]

diff --git a/win/CS/HandBrake.Interop/packages.config b/win/CS/HandBrake.Interop/packages.config
deleted file mode 100644 (file)
index b63f762..0000000
--- a/win/CS/HandBrake.Interop/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="gong-wpf-dragdrop" version="2.0.1" targetFramework="net471" />
-  <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net471" />
-</packages>
\ No newline at end of file

diff --git a/win/CS/HandBrake.sln b/win/CS/HandBrake.sln
index 4daa2858ac3ecab4c1bf229802bb5245e18cf0f1..305c76f4c6e8c1dd1651e8ddaa9258dd8d79134a 100644 (file)
--- a/win/CS/HandBrake.sln
+++ b/win/CS/HandBrake.sln
@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16\r
 VisualStudioVersion = 16.0.28803.352\r
 MinimumVisualStudioVersion = 10.0.40219.1\r
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandBrake.Interop", "HandBrake.Interop\HandBrake.Interop.csproj", "{087A2BA8-BAC2-4577-A46F-07FF9D420016}"\r
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HandBrake.Interop", "HandBrake.Interop\HandBrake.Interop.csproj", "{087A2BA8-BAC2-4577-A46F-07FF9D420016}"\r
 EndProject\r
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandBrakeWPF", "HandBrakeWPF\HandBrakeWPF.csproj", "{DADE66CB-0E12-4959-ADE5-0ACD31D27C59}"\r
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HandBrakeWPF", "HandBrakeWPF\HandBrakeWPF.csproj", "{DADE66CB-0E12-4959-ADE5-0ACD31D27C59}"\r
 EndProject\r
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{5CB7BC74-449C-4E95-98AB-E1E4387E514B}"\r
        ProjectSection(SolutionItems) = preProject\r
@@ -33,8 +33,8 @@ Global
                {DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Debug|x64.Build.0 = Debug|x64\r
                {DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Release|x64.ActiveCfg = Release|x64\r
                {DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Release|x64.Build.0 = Release|x64\r
-               {3BAEBAC7-9042-4863-876F-C550ADCA66DC}.Debug|x64.ActiveCfg = Debug|Any CPU\r
-               {3BAEBAC7-9042-4863-876F-C550ADCA66DC}.Release|x64.ActiveCfg = Release|Any CPU\r
+               {3BAEBAC7-9042-4863-876F-C550ADCA66DC}.Debug|x64.ActiveCfg = Debug|x64\r
+               {3BAEBAC7-9042-4863-876F-C550ADCA66DC}.Release|x64.ActiveCfg = Release|x64\r
                {6E855245-E402-4C0F-BB0B-EEB63082F6AC}.Debug|x64.ActiveCfg = Debug|x64\r
                {6E855245-E402-4C0F-BB0B-EEB63082F6AC}.Release|x64.ActiveCfg = Release|x64\r
                {F8370F37-B226-4830-AEE7-6D7AE403E3D2}.Debug|x64.ActiveCfg = Debug|x64\r

diff --git a/win/CS/HandBrakeTools/HandBrakeTools.csproj b/win/CS/HandBrakeTools/HandBrakeTools.csproj
index f8eac8fd9a9464458ea2a066bc2651e144daff27..992428fc1c6bd5c3ae3ee6affec2268dcd35765d 100644 (file)
--- a/win/CS/HandBrakeTools/HandBrakeTools.csproj
+++ b/win/CS/HandBrakeTools/HandBrakeTools.csproj
@@ -3,7 +3,7 @@
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
     <ProjectGuid>{3BAEBAC7-9042-4863-876F-C550ADCA66DC}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -28,8 +28,8 @@
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
+    <PlatformTarget>x64</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
@@ -39,8 +39,8 @@
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
+    <PlatformTarget>x64</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>

diff --git a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
index b81e5fce7ac357fa30b402b833d52d415e195f9a..52f509724112358003ef3db9fa9e20304c322fa3 100644 (file)
--- a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
+++ b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
@@ -1,737 +1,154 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">\r
   <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">x64</Platform>\r
-    <ProjectGuid>{DADE66CB-0E12-4959-ADE5-0ACD31D27C59}</ProjectGuid>\r
     <OutputType>WinExe</OutputType>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>HandBrakeWPF</RootNamespace>\r
-    <AssemblyName>HandBrake</AssemblyName>\r
-    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>\r
-    <TargetFrameworkProfile>\r
-    </TargetFrameworkProfile>\r
-    <FileAlignment>512</FileAlignment>\r
-    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>\r
-    <WarningLevel>4</WarningLevel>\r
-    <IsWebBootstrapper>false</IsWebBootstrapper>\r
-    <PublishUrl>publish\</PublishUrl>\r
-    <Install>true</Install>\r
-    <InstallFrom>Disk</InstallFrom>\r
-    <UpdateEnabled>false</UpdateEnabled>\r
-    <UpdateMode>Foreground</UpdateMode>\r
-    <UpdateInterval>7</UpdateInterval>\r
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>\r
-    <UpdatePeriodically>false</UpdatePeriodically>\r
-    <UpdateRequired>false</UpdateRequired>\r
-    <MapFileExtensions>true</MapFileExtensions>\r
-    <ApplicationRevision>0</ApplicationRevision>\r
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>\r
-    <UseApplicationTrust>false</UseApplicationTrust>\r
-    <BootstrapperEnabled>true</BootstrapperEnabled>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
+    <TargetFramework>net471</TargetFramework>\r
+    <UseWPF>true</UseWPF>\r
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>\r
+    <Platforms>x64</Platforms>\r
+    <PackageProjectUrl>https://handbrake.fr</PackageProjectUrl>\r
+    <RepositoryUrl>https://github.com/HandBrake/HandBrake.git</RepositoryUrl>\r
+    <RepositoryType>Git</RepositoryType>\r
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>\r
     <ApplicationIcon>handbrakepineapple.ico</ApplicationIcon>\r
+    <AssemblyName>HandBrake</AssemblyName>\r
   </PropertyGroup>\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <OutputPath>bin\x64\Debug\</OutputPath>\r
-    <DefineConstants>DEBUG;TRACE</DefineConstants>\r
-    <DebugType>full</DebugType>\r
-    <PlatformTarget>x64</PlatformTarget>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>\r
-    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>\r
-    <UseVSHostingProcess>true</UseVSHostingProcess>\r
-    <Prefer32Bit>false</Prefer32Bit>\r
-    <CodeAnalysisRuleSet>..\HandBrake.ruleset</CodeAnalysisRuleSet>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">\r
-    <OutputPath>bin\x64\Release\</OutputPath>\r
-    <DefineConstants>TRACE</DefineConstants>\r
-    <Optimize>true</Optimize>\r
-    <DebugType>pdbonly</DebugType>\r
-    <PlatformTarget>x64</PlatformTarget>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <Prefer32Bit>false</Prefer32Bit>\r
-  </PropertyGroup>\r
-  <PropertyGroup />\r
-  <PropertyGroup>\r
-    <ApplicationManifest>app.manifest</ApplicationManifest>\r
+  \r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
+    <OutputPath>bin\Debug</OutputPath>\r
   </PropertyGroup>\r
-  <PropertyGroup>\r
-    <SignAssembly>false</SignAssembly>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
+    <OutputPath>bin\release</OutputPath>\r
   </PropertyGroup>\r
+  \r
+  <ItemGroup>\r
+    <ProjectReference Include="..\HandBrake.Interop\HandBrake.Interop.csproj" />\r
+  </ItemGroup>\r
+\r
+  <ItemGroup>\r
+    <PackageReference Include="Caliburn.Micro">\r
+      <Version>3.2.0</Version>\r
+    </PackageReference>\r
+    <PackageReference Include="Caliburn.Micro.Core">\r
+      <Version>3.2.0</Version>\r
+    </PackageReference>\r
+    <PackageReference Include="gong-wpf-dragdrop">\r
+      <Version>2.0.1</Version>\r
+    </PackageReference>\r
+    <PackageReference Include="Newtonsoft.Json">\r
+      <Version>12.0.2</Version>\r
+    </PackageReference>\r
+    <PackageReference Include="Ookii.Dialogs" Version="1.0.0" />\r
+  </ItemGroup>\r
+\r
   <ItemGroup>\r
-    <Reference Include="Caliburn.Micro, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">\r
-      <HintPath>..\packages\Caliburn.Micro.Core.3.2.0\lib\net45\Caliburn.Micro.dll</HintPath>\r
-    </Reference>\r
-    <Reference Include="Caliburn.Micro.Platform, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">\r
-      <HintPath>..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.dll</HintPath>\r
-    </Reference>\r
-    <Reference Include="Caliburn.Micro.Platform.Core, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">\r
-      <HintPath>..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll</HintPath>\r
-    </Reference>\r
-    <Reference Include="GongSolutions.WPF.DragDrop, Version=2.0.0.0, Culture=neutral, PublicKeyToken=91f1945125b7a587, processorArchitecture=MSIL">\r
-      <HintPath>..\packages\gong-wpf-dragdrop.2.0.1\lib\net47\GongSolutions.WPF.DragDrop.dll</HintPath>\r
-    </Reference>\r
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">\r
-      <HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>\r
-    </Reference>\r
-    <Reference Include="Ookii.Dialogs.Wpf, Version=1.0.0.0, Culture=neutral, PublicKeyToken=0c15020868fd6249, processorArchitecture=MSIL">\r
-      <HintPath>..\packages\Ookii.Dialogs.1.0\lib\net35\Ookii.Dialogs.Wpf.dll</HintPath>\r
-      <Private>True</Private>\r
-    </Reference>\r
-    <Reference Include="PresentationFramework" />\r
     <Reference Include="PresentationFramework.Aero" />\r
-    <Reference Include="System" />\r
-    <Reference Include="System.Data" />\r
-    <Reference Include="System.Drawing" />\r
     <Reference Include="System.Management" />\r
     <Reference Include="System.Net.Http" />\r
-    <Reference Include="System.Runtime.Serialization" />\r
     <Reference Include="System.Windows.Forms" />\r
-    <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">\r
-      <HintPath>..\packages\Caliburn.Micro.3.2.0\lib\net45\System.Windows.Interactivity.dll</HintPath>\r
-    </Reference>\r
-    <Reference Include="System.Xml" />\r
-    <Reference Include="System.Core" />\r
-    <Reference Include="System.Xaml">\r
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>\r
-    </Reference>\r
-    <Reference Include="System.Xml.Linq" />\r
-    <Reference Include="WindowsBase" />\r
-    <Reference Include="PresentationCore" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <ApplicationDefinition Include="App.xaml">\r
-      <Generator>MSBuild:Compile</Generator>\r
-      <SubType>Designer</SubType>\r
-    </ApplicationDefinition>\r
-    <Compile Include="AttachedProperties\MenuItemExtensions.cs" />\r
-    <Compile Include="Collections\SerializableDictionary.cs" />\r
-    <Compile Include="Commands\InputBindingTrigger.cs" />\r
-    <Compile Include="Commands\Menu\QueueCommandParams.cs" />\r
-    <Compile Include="Commands\Menu\QueueCommands.cs" />\r
-    <Compile Include="Commands\OpenOptionsScreenCommand.cs" />\r
-    <Compile Include="Commands\PresetMenuSelectCommand.cs" />\r
-    <Compile Include="Commands\ProcessShortcutCommand.cs" />\r
-    <Compile Include="Commands\SourceMenuCommand.cs" />\r
-    <Compile Include="Constants.cs" />\r
-    <Compile Include="Controls\SplitButton\SplitMenuButton.cs" />\r
-    <Compile Include="Controls\AlertPanel.xaml.cs">\r
-      <DependentUpon>AlertPanel.xaml</DependentUpon>\r
-    </Compile>\r
-    <Compile Include="Converters\Audio\AudioMixdownListConverter.cs" />\r
-    <Compile Include="Converters\Audio\AudioMixdownConverter.cs" />\r
-    <Compile Include="Converters\Audio\AudioRateTypeConverter.cs" />\r
-    <Compile Include="Converters\Audio\AudioTrackDefaultBehaviourConverter.cs" />\r
-    <Compile Include="Converters\Audio\AudioBehaviourConverter.cs" />\r
-    <Compile Include="Converters\Filters\DenoisePresetConverter.cs" />\r
-    <Compile Include="Converters\Filters\SharpenTuneConverter.cs" />\r
-    <Compile Include="Converters\Filters\SharpenPresetConverter.cs" />\r
-    <Compile Include="Converters\LongToIntConverter.cs" />\r
-    <Compile Include="Converters\Options\FileSizeConverter.cs" />\r
-    <Compile Include="Converters\Options\LogLevelConverter.cs" />\r
-    <Compile Include="Converters\OptionTabConverter.cs" />\r
-    <Compile Include="Converters\PresetsMenuConverter.cs" />\r
-    <Compile Include="Converters\Queue\InlineQueueConverter.cs" />\r
-    <Compile Include="Converters\Queue\PictureSettingsDescConveter.cs" />\r
-    <Compile Include="Converters\Subtitles\CanBurnSubtitleConverter.cs" />\r
-    <Compile Include="Converters\Subtitles\SubtitleBurnInBehaviourConverter.cs" />\r
-    <Compile Include="Converters\Subtitles\SubtitleBehaviourConverter.cs" />\r
-    <Compile Include="Converters\Video\VideoOptionsTooltipConverter.cs" />\r
-    <Compile Include="Converters\Video\ScalingConverter.cs" />\r
-    <Compile Include="EventArgs\OutputFormatChangedEventArgs.cs" />\r
-    <Compile Include="EventArgs\QueueCompletedEventArgs.cs" />\r
-    <Compile Include="EventArgs\QueueProgressEventArgs.cs" />\r
-    <Compile Include="EventArgs\SettingChangedEventArgs.cs" />\r
-    <Compile Include="EventArgs\TabStatusEventArgs.cs" />\r
-    <Compile Include="Exceptions\GeneralApplicationException.cs" />\r
-    <Compile Include="Extensions\ListExtensions.cs" />\r
-    <Compile Include="Extensions\StringExtensions.cs" />\r
-    <Compile Include="Helpers\TreeViewHelper.cs" />\r
-    <Compile Include="Helpers\LogManager.cs" />\r
-    <Compile Include="Helpers\MP4Helper.cs" />\r
-    <Compile Include="Helpers\TimeSpanHelper.cs" />\r
-    <Compile Include="Helpers\Validate.cs" />\r
-    <Compile Include="Instance\HandBrakeInstanceManager.cs" />\r
-    <Compile Include="Instance\Model\ServerResponse.cs" />\r
-    <Compile Include="Instance\RemoteInstance.cs" />\r
-    <Compile Include="Model\AddQueueError.cs" />\r
-    <Compile Include="Model\Audio\AudioBehaviourTrack.cs" />\r
-    <Compile Include="Model\Audio\AudioTrackDefaultsMode.cs" />\r
-    <Compile Include="Model\Audio\AudioBehaviourModes.cs" />\r
-    <Compile Include="Model\Audio\AudioBehaviours.cs" />\r
-    <Compile Include="Model\DriveInformation.cs" />\r
-    <Compile Include="Model\Options\AutonameFileCollisionBehaviour.cs" />\r
-    <Compile Include="Model\Options\FileOverwriteBehaviour.cs" />\r
-    <Compile Include="Model\Filters\FilterTune.cs" />\r
-    <Compile Include="Model\Filters\FilterPreset.cs" />\r
-    <Compile Include="Model\InterfaceLanguage.cs" />\r
-    <Compile Include="Model\Picture\PresetPictureSettingsMode.cs" />\r
-    <Compile Include="Model\Subtitles\SubtitleBurnInBehaviourModes.cs" />\r
-    <Compile Include="Model\Subtitles\SubtitleBehaviourModes.cs" />\r
-    <Compile Include="Model\Subtitles\SubtitleBehaviours.cs" />\r
-    <Compile Include="Properties\Resources.Designer.cs">\r
-      <AutoGen>True</AutoGen>\r
-      <DesignTime>True</DesignTime>\r
-      <DependentUpon>Resources.resx</DependentUpon>\r
-    </Compile>\r
-    <Compile Include="Properties\ResourcesTooltips.Designer.cs">\r
-      <DependentUpon>ResourcesTooltips.resx</DependentUpon>\r
-      <AutoGen>True</AutoGen>\r
-      <DesignTime>True</DesignTime>\r
-    </Compile>\r
-    <Compile Include="Services\Encode\EncodeBase.cs" />\r
-    <Compile Include="Services\Encode\EventArgs\EncodeCompletedEventArgs.cs" />\r
-    <Compile Include="Services\Encode\EventArgs\EncodeProgressEventArgs.cs" />\r
-    <Compile Include="Services\Encode\Factories\EncodeTaskImportFactory.cs" />\r
-    <Compile Include="Services\Encode\Factories\EncodeTaskFactory.cs" />\r
-    <Compile Include="Services\Encode\Factories\QueueFactory.cs" />\r
-    <Compile Include="Services\Encode\Factories\VideoLevelFactory.cs" />\r
-    <Compile Include="Services\Encode\Factories\VideoPresetFactory.cs" />\r
-    <Compile Include="Services\Encode\Factories\VideoProfileFactory.cs" />\r
-    <Compile Include="Services\Encode\Factories\VideoTuneFactory.cs" />\r
-    <Compile Include="Services\Encode\Interfaces\IEncode.cs" />\r
-    <Compile Include="Services\Encode\LibEncode.cs" />\r
-    <Compile Include="Services\Encode\Model\EncodeTask.cs" />\r
-    <Compile Include="Services\Encode\Model\Models\AllowedPassthru.cs" />\r
-    <Compile Include="Services\Encode\Model\Models\AudioEncoder.cs" />\r
-    <Compile Include="Services\Encode\Model\Models\AudioEncoderRateType.cs" />\r
-    <Compile Include="Services\Encode\Model\Models\AudioTrack.cs" />\r
-    <Compile Include="Services\Encode\Model\Models\ChapterMarker.cs" />\r
-    <Compile Include="Services\Encode\Model\Models\DenoisePreset.cs" />\r
-    <Compile Include="Services\Encode\Model\Models\DenoiseTune.cs" />\r
-    <Compile Include="Services\Encode\Model\Models\FramerateMode.cs" />\r
-    <Compile Include="Services\Encode\Model\Models\MetaData.cs" />\r
-    <Compile Include="Services\Encode\Model\Models\OutputFormat.cs" />\r
-    <Compile Include="Services\Encode\Model\Models\PointToPointMode.cs" />\r
-    <Compile Include="Services\Encode\Model\Models\SubtitleTrack.cs" />\r
-    <Compile Include="Services\Encode\Model\Models\SubtitleType.cs" />\r
-    <Compile Include="Services\Encode\Model\Models\Video\VideoLevel.cs" />\r
-    <Compile Include="Services\Encode\Model\Models\Video\VideoPreset.cs" />\r
-    <Compile Include="Services\Encode\Model\Models\Video\VideoProfile.cs" />\r
-    <Compile Include="Services\Encode\Model\Models\Video\VideoTune.cs" />\r
-    <Compile Include="Services\Interfaces\INotifyIconService.cs" />\r
-    <Compile Include="Services\Logging\EventArgs\LogEventArgs.cs" />\r
-    <Compile Include="Services\Logging\Interfaces\ILog.cs" />\r
-    <Compile Include="Services\Logging\LogService.cs" />\r
-    <Compile Include="Services\Logging\Model\LogLevel.cs" />\r
-    <Compile Include="Services\Logging\Model\LogMessage.cs" />\r
-    <Compile Include="Services\Logging\Model\LogMessageType.cs" />\r
-    <Compile Include="Services\Presets\Factories\JsonPresetFactory.cs" />\r
-    <Compile Include="Services\Presets\Interfaces\IPresetObject.cs" />\r
-    <Compile Include="Services\Presets\Model\PresetDisplayCategory.cs" />\r
-    <Compile Include="Services\Queue\Interfaces\IQueueService.cs" />\r
-    <Compile Include="Helpers\FileHelper.cs" />\r
-    <Compile Include="Services\Presets\Model\Preset.cs" />\r
-    <Compile Include="Model\ScanMode.cs" />\r
-    <Compile Include="Factories\HBConfigurationFactory.cs" />\r
-    <Compile Include="Services\Presets\Interfaces\IPresetService.cs" />\r
-    <Compile Include="Services\Interfaces\IUserSettingService.cs" />\r
-    <Compile Include="Services\Presets\PresetService.cs" />\r
-    <Compile Include="Services\Queue\Model\QueueStats.cs" />\r
-    <Compile Include="Services\Queue\Model\QueueTaskContainer.cs" />\r
-    <Compile Include="Services\Queue\QueueService.cs" />\r
-    <Compile Include="Services\Queue\Model\QueueItemStatus.cs" />\r
-    <Compile Include="Services\Queue\Model\QueueTask.cs" />\r
-    <Compile Include="Services\Scan\EventArgs\ScanCompletedEventArgs.cs" />\r
-    <Compile Include="Services\Scan\EventArgs\ScanProgressEventArgs.cs" />\r
-    <Compile Include="Services\Scan\Factories\TitleFactory.cs" />\r
-    <Compile Include="Services\Scan\Interfaces\IScan.cs" />\r
-    <Compile Include="Services\Scan\LibScan.cs" />\r
-    <Compile Include="Services\Scan\Model\Audio.cs" />\r
-    <Compile Include="Services\Scan\Model\Chapter.cs" />\r
-    <Compile Include="Services\Scan\Model\Metadata.cs" />\r
-    <Compile Include="Services\Scan\Model\Source.cs" />\r
-    <Compile Include="Services\Scan\Model\Subtitle.cs" />\r
-    <Compile Include="Services\Scan\Model\Title.cs" />\r
-    <Compile Include="Services\NotifyIconService.cs" />\r
-    <Compile Include="Services\UserSettingService.cs" />\r
-    <Compile Include="Startup\StartupOptions.cs" />\r
-    <Compile Include="Utilities\AppcastReader.cs" />\r
-    <Compile Include="Utilities\BitmapUtilities.cs" />\r
-    <Compile Include="Utilities\DelayedActionProcessor.cs" />\r
-    <Compile Include="Utilities\DPIAwareness.cs" />\r
-    <Compile Include="Utilities\DriveUtilities.cs" />\r
-    <Compile Include="Utilities\EnumHelper.cs" />\r
-    <Compile Include="Utilities\ExtensionMethods.cs" />\r
-    <Compile Include="Utilities\GeneralUtilities.cs" />\r
-    <Compile Include="Utilities\HandBrakeApp.cs" />\r
-    <Compile Include="Utilities\Input\ChapterImporterCsv.cs" />\r
-    <Compile Include="Utilities\Input\ChapterImporterTxt.cs" />\r
-    <Compile Include="Utilities\Input\ChapterImporterXml.cs" />\r
-    <Compile Include="Utilities\InterfaceLanguageUtilities.cs" />\r
-    <Compile Include="Utilities\Interfaces\INotifyPropertyChangedEx.cs" />\r
-    <Compile Include="Utilities\Output\CsvHelper.cs" />\r
-    <Compile Include="Utilities\Portable.cs" />\r
-    <Compile Include="Utilities\DirectoryUtilities.cs" />\r
-    <Compile Include="Utilities\SystemInfo.cs" />\r
-    <Compile Include="Utilities\UwpDetect.cs" />\r
-    <Compile Include="Utilities\Win32.cs" />\r
-    <Compile Include="Utilities\Win7.cs" />\r
-    <Compile Include="ViewModelItems\Filters\DeblockFilter.cs" />\r
-    <Compile Include="ViewModelItems\Filters\DeinterlaceFilterItem.cs" />\r
-    <Compile Include="ViewModelItems\Filters\DenoiseItem.cs" />\r
-    <Compile Include="ViewModelItems\Filters\DetelecineItem.cs" />\r
-    <Compile Include="ViewModelItems\Filters\GrayscaleFilter.cs" />\r
-    <Compile Include="ViewModelItems\Filters\RotateFlipFilter.cs" />\r
-    <Compile Include="ViewModelItems\Filters\SharpenItem.cs" />\r
-    <Compile Include="ViewModels\Interfaces\IManagePresetViewModel.cs" />\r
-    <Compile Include="ViewModels\Interfaces\ISummaryViewModel.cs" />\r
-    <Compile Include="ViewModels\ManagePresetViewModel.cs" />\r
-    <Compile Include="ViewModels\AudioDefaultsViewModel.cs" />\r
-    <Compile Include="ViewModels\CountdownAlertViewModel.cs" />\r
-    <Compile Include="ViewModels\Interfaces\IAudioDefaultsViewModel.cs" />\r
-    <Compile Include="ViewModels\Interfaces\ICountdownAlertViewModel.cs" />\r
-    <Compile Include="Controls\SourceSelection.xaml.cs">\r
-      <DependentUpon>SourceSelection.xaml</DependentUpon>\r
-    </Compile>\r
-    <Compile Include="ViewModels\Interfaces\IMetaDataViewModel.cs" />\r
-    <Compile Include="ViewModels\Interfaces\IPopupWindowViewModel.cs" />\r
-    <Compile Include="ViewModels\Interfaces\IStaticPreviewViewModel.cs" />\r
-    <Compile Include="ViewModels\Interfaces\IMiniViewModel.cs" />\r
-    <Compile Include="ViewModels\Interfaces\ISubtitlesDefaultsViewModel.cs" />\r
-    <Compile Include="ViewModels\MetaDataViewModel.cs" />\r
-    <Compile Include="ViewModels\MiniViewModel.cs" />\r
-    <Compile Include="ViewModels\PopupWindowViewModel.cs" />\r
-    <Compile Include="ViewModels\StaticPreviewViewModel.cs" />\r
-    <Compile Include="ViewModels\SubtitlesDefaultsViewModel.cs" />\r
-    <Compile Include="ViewModels\SummaryViewModel.cs" />\r
-    <Compile Include="Views\ManagePresetView.xaml.cs">\r
-      <DependentUpon>ManagePresetView.xaml</DependentUpon>\r
-    </Compile>\r
-    <Compile Include="Views\AudioDefaultsView.xaml.cs">\r
-      <DependentUpon>AudioDefaultsView.xaml</DependentUpon>\r
-    </Compile>\r
-    <Compile Include="Views\MetaDataView.xaml.cs">\r
-      <DependentUpon>MetaDataView.xaml</DependentUpon>\r
-    </Compile>\r
-    <Compile Include="Views\PopupWindowView.xaml.cs">\r
-      <DependentUpon>PopupWindowView.xaml</DependentUpon>\r
-    </Compile>\r
-    <Compile Include="Views\CountdownAlertView.xaml.cs">\r
-      <DependentUpon>CountdownAlertView.xaml</DependentUpon>\r
-    </Compile>\r
-    <Compile Include="Controls\DropButton\DropButton.cs" />\r
-    <Compile Include="Controls\TimeSpanBox.xaml.cs">\r
-      <DependentUpon>TimeSpanBox.xaml</DependentUpon>\r
-    </Compile>\r
-    <Compile Include="Controls\Loading.xaml.cs">\r
-      <DependentUpon>Loading.xaml</DependentUpon>\r
-    </Compile>\r
-    <Compile Include="Controls\NumberBox.xaml.cs">\r
-      <DependentUpon>NumberBox.xaml</DependentUpon>\r
-    </Compile>\r
-    <Compile Include="Controls\RefireControl.cs" />\r
-    <Compile Include="Controls\StatusPanel.xaml.cs">\r
-      <DependentUpon>StatusPanel.xaml</DependentUpon>\r
-    </Compile>\r
-    <Compile Include="Converters\Audio\AudioEncoderConverter.cs" />\r
-    <Compile Include="Converters\Audio\AudioQueueDisplayConverter.cs" />\r
-    <Compile Include="Converters\BooleanToHiddenVisibilityConverter.cs" />\r
-    <Compile Include="Converters\InverseBooleanConverter.cs" />\r
-    <Compile Include="Converters\Options\OptionsTabConverter.cs" />\r
-    <Compile Include="Converters\Options\OptionsTabNameConverter.cs" />\r
-    <Compile Include="Converters\Subtitles\SubtitlesQueueDisplayConverter.cs" />\r
-    <Compile Include="Converters\Video\VideoEncoderConverter.cs" />\r
-    <Compile Include="Converters\Video\EncoderOptionsTooltipConverter.cs" />\r
-    <Compile Include="Helpers\GrayscaleImage.cs" />\r
-    <Compile Include="Helpers\PictureSize.cs" />\r
-    <Compile Include="Model\OptionsTab.cs" />\r
-    <Compile Include="Model\SelectionTitle.cs" />\r
-    <Compile Include="Model\ShellWindow.cs" />\r
-    <Compile Include="Model\SourceMenuItem.cs" />\r
-    <Compile Include="Model\UpdateCheckInformation.cs" />\r
-    <Compile Include="Model\DownloadStatus.cs" />\r
-    <Compile Include="Services\Interfaces\IUpdateService.cs" />\r
-    <Compile Include="Services\Interfaces\IPrePostActionService.cs" />\r
-    <Compile Include="Services\UpdateService.cs" />\r
-    <Compile Include="Services\PrePostActionService.cs" />\r
-    <Compile Include="ViewModels\Interfaces\IQueueSelectionViewModel.cs" />\r
-    <Compile Include="ViewModels\QueueSelectionViewModel.cs" />\r
-    <Compile Include="Views\QueueSelectionView.xaml.cs">\r
-      <DependentUpon>QueueSelectionView.xaml</DependentUpon>\r
-    </Compile>\r
-    <Compile Include="Views\MiniView.xaml.cs">\r
-      <DependentUpon>MiniView.xaml</DependentUpon>\r
-    </Compile>\r
-    <Compile Include="Views\Queue\Embedded.xaml.cs">\r
-      <DependentUpon>Embedded.xaml</DependentUpon>\r
-    </Compile>\r
-    <Compile Include="Views\ShellView.xaml.cs">\r
-      <DependentUpon>ShellView.xaml</DependentUpon>\r
-    </Compile>\r
-    <Compile Include="ViewModels\Interfaces\IShellViewModel.cs" />\r
-    <Compile Include="ViewModels\Interfaces\ITitleSpecificViewModel.cs" />\r
-    <Compile Include="ViewModels\ShellViewModel.cs" />\r
-    <Compile Include="ViewModels\TitleSpecificViewModel.cs" />\r
-    <Compile Include="Views\StaticPreviewView.xaml.cs">\r
-      <DependentUpon>StaticPreviewView.xaml</DependentUpon>\r
-    </Compile>\r
-    <Compile Include="Converters\AdvancedVisibilityConverter.cs" />\r
-    <Compile Include="Converters\BooleanConverter.cs" />\r
-    <Compile Include="Converters\BooleanToVisibilityConverter.cs" />\r
-    <Compile Include="Converters\QueueStatusToVisibilityConverter.cs" />\r
-    <Compile Include="Converters\EnumComboConverter.cs" />\r
-    <Compile Include="Converters\FullPathToFileNameConverter.cs" />\r
-    <Compile Include="Helpers\AutoNameHelper.cs" />\r
-    <Compile Include="Helpers\ListBoxHelper.cs" />\r
-    <Compile Include="Helpers\QueueRecoveryHelper.cs" />\r
-    <Compile Include="Services\ErrorService.cs" />\r
-    <Compile Include="Services\Interfaces\IErrorService.cs" />\r
-    <Compile Include="Startup\AppBootstrapper.cs" />\r
-    <Compile Include="UserSettingConstants.cs" />\r
-    <Compile Include="ViewModels\AboutViewModel.cs" />\r
-    <Compile Include="ViewModels\AddPresetViewModel.cs" />\r
-    <Compile Include="ViewModels\AudioViewModel.cs" />\r
-    <Compile Include="ViewModels\Interfaces\ITabInterface.cs" />\r
-    <Compile Include="ViewModels\VideoViewModel.cs" />\r
-    <Compile Include="ViewModels\FiltersViewModel.cs" />\r
-    <Compile Include="ViewModels\Interfaces\IFiltersViewModel.cs" />\r
-    <Compile Include="ViewModels\Interfaces\IVideoViewModel.cs" />\r
-    <Compile Include="ViewModels\SubtitlesViewModel.cs" />\r
-    <Compile Include="ViewModels\ChaptersViewModel.cs" />\r
-    <Compile Include="ViewModels\PictureSettingsViewModel.cs" />\r
-    <Compile Include="ViewModels\ErrorViewModel.cs" />\r
-    <Compile Include="ViewModels\Interfaces\ISubtitlesViewModel.cs" />\r
-    <Compile Include="ViewModels\Interfaces\IChaptersViewModel.cs" />\r
-    <Compile Include="ViewModels\Interfaces\IPictureSettingsViewModel.cs" />\r
-    <Compile Include="ViewModels\Interfaces\IAddPresetViewModel.cs" />\r
-    <Compile Include="ViewModels\Interfaces\IAudioViewModel.cs" />\r
-    <Compile Include="ViewModels\Interfaces\IQueueViewModel.cs" />\r
-    <Compile Include="ViewModels\Interfaces\IErrorViewModel.cs" />\r
-    <Compile Include="ViewModels\Interfaces\ILogViewModel.cs" />\r
-    <Compile Include="ViewModels\Interfaces\IAboutViewModel.cs" />\r
-    <Compile Include="ViewModels\Interfaces\IMainViewModel.cs" />\r
-    <Compile Include="ViewModels\Interfaces\IOptionsViewModel.cs" />\r
-    <Compile Include="ViewModels\Interfaces\IViewModelBase.cs" />\r
-    <Compile Include="ViewModels\LogViewModel.cs" />\r
-    <Compile Include="ViewModels\QueueViewModel.cs" />\r
-    <Compile Include="ViewModels\OptionsViewModel.cs" />\r
-    <Compile Include="ViewModels\ViewModelBase.cs" />\r
-    <Compile Include="Views\AboutView.xaml.cs">\r
-      <DependentUpon>AboutView.xaml</DependentUpon>\r
-    </Compile>\r
-    <Compile Include="App.xaml.cs">\r
-      <DependentUpon>App.xaml</DependentUpon>\r
-      <SubType>Code</SubType>\r
-    </Compile>\r
-    <Compile Include="ViewModels\MainViewModel.cs" />\r
-    <Compile Include="Views\SubtitlesDefaultsView.xaml.cs">\r
-      <DependentUpon>SubtitlesDefaultsView.xaml</DependentUpon>\r
-    </Compile>\r
-    <Compile Include="Views\SummaryView.xaml.cs">\r
-      <DependentUpon>SummaryView.xaml</DependentUpon>\r
-    </Compile>\r
-    <Compile Include="Views\AudioView.xaml.cs">\r
-      <DependentUpon>AudioView.xaml</DependentUpon>\r
-    </Compile>\r
-    <Compile Include="Views\AddPresetView.xaml.cs">\r
-      <DependentUpon>AddPresetView.xaml</DependentUpon>\r
-    </Compile>\r
-    <Compile Include="Views\ChaptersView.xaml.cs">\r
-      <DependentUpon>ChaptersView.xaml</DependentUpon>\r
-    </Compile>\r
-    <Compile Include="Views\FiltersView.xaml.cs">\r
-      <DependentUpon>FiltersView.xaml</DependentUpon>\r
-    </Compile>\r
-    <Compile Include="Views\SubtitlesView.xaml.cs">\r
-      <DependentUpon>SubtitlesView.xaml</DependentUpon>\r
-    </Compile>\r
-    <Compile Include="Views\ErrorView.xaml.cs">\r
-      <DependentUpon>ErrorView.xaml</DependentUpon>\r
-    </Compile>\r
-    <Compile Include="Views\LogView.xaml.cs">\r
-      <DependentUpon>LogView.xaml</DependentUpon>\r
-    </Compile>\r
-    <Compile Include="Views\QueueView.xaml.cs">\r
-      <DependentUpon>QueueView.xaml</DependentUpon>\r
-    </Compile>\r
-    <Compile Include="Views\MainView.xaml.cs">\r
-      <DependentUpon>MainView.xaml</DependentUpon>\r
-    </Compile>\r
-    <Compile Include="Views\PictureSettingsView.xaml.cs">\r
-      <DependentUpon>PictureSettingsView.xaml</DependentUpon>\r
-    </Compile>\r
-    <Compile Include="Views\OptionsView.xaml.cs">\r
-      <DependentUpon>OptionsView.xaml</DependentUpon>\r
-    </Compile>\r
-    <Compile Include="Views\VideoView.xaml.cs">\r
-      <DependentUpon>VideoView.xaml</DependentUpon>\r
-    </Compile>\r
   </ItemGroup>\r
-  <ItemGroup>\r
-    <Compile Include="Properties\AssemblyInfo.cs">\r
-      <SubType>Code</SubType>\r
-    </Compile>\r
-    <EmbeddedResource Include="Properties\Resources.de.resx">\r
-      <SubType>Designer</SubType>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Properties\Resources.fr.resx" />\r
-    <EmbeddedResource Include="Properties\Resources.zh.resx" />\r
-    <EmbeddedResource Include="Properties\ResourcesTooltips.de.resx" />\r
-    <EmbeddedResource Include="Properties\ResourcesTooltips.fr.resx" />\r
-    <EmbeddedResource Include="Properties\ResourcesTooltips.resx">\r
-      <Generator>PublicResXFileCodeGenerator</Generator>\r
-      <LastGenOutput>ResourcesTooltips.Designer.cs</LastGenOutput>\r
-      <SubType>Designer</SubType>\r
-    </EmbeddedResource>\r
-    <EmbeddedResource Include="Properties\Resources.resx">\r
-      <Generator>PublicResXFileCodeGenerator</Generator>\r
-      <SubType>Designer</SubType>\r
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>\r
-    </EmbeddedResource>\r
-    <None Include="app.config" />\r
-    <None Include="app.manifest" />\r
-    <None Include="Installer\Installer64.nsi" />\r
-    <None Include="Installer\MakeNightly64.nsi" />\r
-    <AppDesigner Include="Properties\" />\r
-    <EmbeddedResource Include="Properties\ResourcesTooltips.zh.resx" />\r
+\r
+  <ItemGroup>\r
+    <None Remove="defaultsettings.xml" />\r
+    <None Remove="handbrakepineapple.ico" />\r
+    <None Remove="public.key" />\r
+    <None Remove="Views\Images\ActivityWindow.png" />\r
+    <None Remove="Views\Images\ActivityWindow_small.png" />\r
+    <None Remove="Views\Images\add.png" />\r
+    <None Remove="Views\Images\add40.png" />\r
+    <None Remove="Views\Images\AddToQueue.png" />\r
+    <None Remove="Views\Images\AddToQueue_small.png" />\r
+    <None Remove="Views\Images\Advanced.png" />\r
+    <None Remove="Views\Images\Close.png" />\r
+    <None Remove="Views\Images\close64.png" />\r
+    <None Remove="Views\Images\close64_dark.png" />\r
+    <None Remove="Views\Images\Complete.png" />\r
+    <None Remove="Views\Images\copy.png" />\r
+    <None Remove="Views\Images\Disc.png" />\r
+    <None Remove="Views\Images\disc_small.png" />\r
+    <None Remove="Views\Images\ErrorX.png" />\r
+    <None Remove="Views\Images\file.png" />\r
+    <None Remove="Views\Images\File32.png" />\r
+    <None Remove="Views\Images\folder.png" />\r
+    <None Remove="Views\Images\folder32.png" />\r
+    <None Remove="Views\Images\information.png" />\r
+    <None Remove="Views\Images\information64.png" />\r
+    <None Remove="Views\Images\logo128.png" />\r
+    <None Remove="Views\Images\logo64.png" />\r
+    <None Remove="Views\Images\Movies.png" />\r
+    <None Remove="Views\Images\Movies_small.png" />\r
+    <None Remove="Views\Images\Options24.png" />\r
+    <None Remove="Views\Images\Output_Small.png" />\r
+    <None Remove="Views\Images\Pause.png" />\r
+    <None Remove="Views\Images\picture.png" />\r
+    <None Remove="Views\Images\picture_small.png" />\r
+    <None Remove="Views\Images\Play.png" />\r
+    <None Remove="Views\Images\Play_small.png" />\r
+    <None Remove="Views\Images\Preferences.png" />\r
+    <None Remove="Views\Images\Pref_Small.png" />\r
+    <None Remove="Views\Images\Presets2.png" />\r
+    <None Remove="Views\Images\Queue.png" />\r
+    <None Remove="Views\Images\Queue_Small.png" />\r
+    <None Remove="Views\Images\Refresh.ico" />\r
+    <None Remove="Views\Images\remove.png" />\r
+    <None Remove="Views\Images\stop.png" />\r
+    <None Remove="Views\Images\warningsmall.png" />\r
+    <None Remove="Views\Images\Working0.png" />\r
+  </ItemGroup>\r
+\r
+  <ItemGroup>\r
+    <EmbeddedResource Include="defaultsettings.xml" />\r
     <EmbeddedResource Include="public.key" />\r
-    <None Include="packages.config" />\r
-    <None Include="portable.ini.template">\r
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>\r
-    </None>\r
   </ItemGroup>\r
+\r
   <ItemGroup>\r
-    <Page Include="Controls\AlertPanel.xaml">\r
-      <Generator>MSBuild:Compile</Generator>\r
-      <SubType>Designer</SubType>\r
-    </Page>\r
-    <Page Include="Themes\Generic.xaml">\r
-      <SubType>Designer</SubType>\r
-      <Generator>MSBuild:Compile</Generator>\r
-    </Page>\r
-    <Page Include="Controls\SourceSelection.xaml">\r
-      <Generator>MSBuild:Compile</Generator>\r
-      <SubType>Designer</SubType>\r
-    </Page>\r
-    <Page Include="Views\ManagePresetView.xaml">\r
-      <Generator>MSBuild:Compile</Generator>\r
-      <SubType>Designer</SubType>\r
-    </Page>\r
-    <Page Include="Views\AudioDefaultsView.xaml">\r
-      <Generator>MSBuild:Compile</Generator>\r
-      <SubType>Designer</SubType>\r
-    </Page>\r
-    <Page Include="Views\MetaDataView.xaml">\r
-      <SubType>Designer</SubType>\r
-      <Generator>MSBuild:Compile</Generator>\r
-    </Page>\r
-    <Page Include="Views\PopupWindowView.xaml">\r
-      <Generator>MSBuild:Compile</Generator>\r
-      <SubType>Designer</SubType>\r
-    </Page>\r
-    <Page Include="Views\CountdownAlertView.xaml">\r
-      <SubType>Designer</SubType>\r
-      <Generator>MSBuild:Compile</Generator>\r
-    </Page>\r
-    <Page Include="Controls\TimeSpanBox.xaml">\r
-      <Generator>MSBuild:Compile</Generator>\r
-      <SubType>Designer</SubType>\r
-    </Page>\r
-    <Page Include="Controls\Loading.xaml">\r
-      <SubType>Designer</SubType>\r
-      <Generator>MSBuild:Compile</Generator>\r
-    </Page>\r
-    <Page Include="Controls\NumberBox.xaml">\r
-      <SubType>Designer</SubType>\r
-      <Generator>MSBuild:Compile</Generator>\r
-    </Page>\r
-    <Page Include="Controls\StatusPanel.xaml">\r
-      <SubType>Designer</SubType>\r
-      <Generator>MSBuild:Compile</Generator>\r
-    </Page>\r
-    <Page Include="Views\QueueSelectionView.xaml">\r
-      <Generator>MSBuild:Compile</Generator>\r
-      <SubType>Designer</SubType>\r
-    </Page>\r
-    <Page Include="Views\MiniView.xaml">\r
-      <Generator>MSBuild:Compile</Generator>\r
-      <SubType>Designer</SubType>\r
-    </Page>\r
-    <Page Include="Views\Queue\Embedded.xaml">\r
-      <Generator>MSBuild:Compile</Generator>\r
-      <SubType>Designer</SubType>\r
-    </Page>\r
-    <Page Include="Views\ShellView.xaml">\r
-      <SubType>Designer</SubType>\r
-      <Generator>MSBuild:Compile</Generator>\r
-    </Page>\r
-    <Page Include="Views\StaticPreviewView.xaml">\r
-      <SubType>Designer</SubType>\r
-      <Generator>MSBuild:Compile</Generator>\r
-    </Page>\r
-    <Page Include="Views\AboutView.xaml">\r
-      <SubType>Designer</SubType>\r
-      <Generator>MSBuild:Compile</Generator>\r
-    </Page>\r
-    <Page Include="Views\SubtitlesDefaultsView.xaml">\r
-      <Generator>MSBuild:Compile</Generator>\r
-      <SubType>Designer</SubType>\r
-    </Page>\r
-    <Page Include="Views\SummaryView.xaml">\r
-      <SubType>Designer</SubType>\r
-      <Generator>MSBuild:Compile</Generator>\r
-    </Page>\r
-    <Resource Include="Views\Styles\Styles.xaml">\r
-      <SubType>Designer</SubType>\r
-      <Generator>MSBuild:Compile</Generator>\r
-    </Resource>\r
-    <Page Include="Views\AudioView.xaml">\r
-      <SubType>Designer</SubType>\r
-      <Generator>MSBuild:Compile</Generator>\r
-    </Page>\r
-    <Page Include="Views\AddPresetView.xaml">\r
-      <Generator>MSBuild:Compile</Generator>\r
-      <SubType>Designer</SubType>\r
-    </Page>\r
-    <Page Include="Views\ChaptersView.xaml">\r
-      <Generator>MSBuild:Compile</Generator>\r
-      <SubType>Designer</SubType>\r
-    </Page>\r
-    <Page Include="Views\FiltersView.xaml">\r
-      <SubType>Designer</SubType>\r
-      <Generator>MSBuild:Compile</Generator>\r
-    </Page>\r
-    <Page Include="Views\SubtitlesView.xaml">\r
-      <Generator>MSBuild:Compile</Generator>\r
-      <SubType>Designer</SubType>\r
-    </Page>\r
-    <Page Include="Views\ErrorView.xaml">\r
-      <SubType>Designer</SubType>\r
-      <Generator>MSBuild:Compile</Generator>\r
-    </Page>\r
-    <Page Include="Views\LogView.xaml">\r
-      <SubType>Designer</SubType>\r
-      <Generator>MSBuild:Compile</Generator>\r
-    </Page>\r
-    <Page Include="Views\QueueView.xaml">\r
-      <Generator>MSBuild:Compile</Generator>\r
-      <SubType>Designer</SubType>\r
-    </Page>\r
-    <Page Include="Views\MainView.xaml">\r
-      <SubType>Designer</SubType>\r
-      <Generator>MSBuild:Compile</Generator>\r
-    </Page>\r
-    <Page Include="Views\PictureSettingsView.xaml">\r
-      <SubType>Designer</SubType>\r
-      <Generator>MSBuild:Compile</Generator>\r
-    </Page>\r
-    <Page Include="Views\OptionsView.xaml">\r
-      <SubType>Designer</SubType>\r
-      <Generator>MSBuild:Compile</Generator>\r
-    </Page>\r
-    <Page Include="Views\VideoView.xaml">\r
-      <SubType>Designer</SubType>\r
-      <Generator>MSBuild:Compile</Generator>\r
-    </Page>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <EmbeddedResource Include="defaultsettings.xml">\r
-      <SubType>Designer</SubType>\r
-    </EmbeddedResource>\r
-    <Resource Include="Views\Images\add40.png" />\r
-    <Resource Include="Views\Images\add.png" />\r
-    <Resource Include="Views\Images\remove.png" />\r
-    <Resource Include="Views\Images\information.png" />\r
-    <Resource Include="Views\Images\picture_small.png" />\r
-    <Resource Include="Views\Images\warningsmall.png" />\r
-    <Resource Include="Views\Images\Refresh.ico" />\r
-    <Resource Include="Views\Images\Complete.png" />\r
-    <Resource Include="Views\Images\Working0.png" />\r
     <Resource Include="handbrakepineapple.ico" />\r
-    <Resource Include="Views\Images\Close.png" />\r
-    <Resource Include="Views\Images\Options24.png" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
     <Resource Include="Views\Images\ActivityWindow.png" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
     <Resource Include="Views\Images\ActivityWindow_small.png" />\r
-    <Resource Include="Views\Images\copy.png" />\r
-    <Resource Include="Views\Images\disc_small.png" />\r
-    <Resource Include="Views\Images\Output_Small.png" />\r
-    <Resource Include="Views\Images\Pref_Small.png" />\r
-    <Resource Include="Views\Images\Queue.png" />\r
-    <Resource Include="Views\Images\Queue_Small.png" />\r
-    <Resource Include="Views\Images\stop.png" />\r
-    <Resource Include="Views\Images\Play_small.png" />\r
-    <Resource Include="Views\Images\Play.png" />\r
-    <Resource Include="Views\Images\picture.png" />\r
-    <Resource Include="Views\Images\Pause.png" />\r
-    <Resource Include="Views\Images\Movies.png" />\r
-    <Resource Include="Views\Images\logo64.png" />\r
-    <Resource Include="Views\Images\logo128.png" />\r
-    <Resource Include="Views\Images\Preferences.png" />\r
-    <Resource Include="Views\Images\folder.png" />\r
-    <Resource Include="Views\Images\ErrorX.png" />\r
-    <Resource Include="Views\Images\AddToQueue_small.png" />\r
+    <Resource Include="Views\Images\add.png" />\r
+    <Resource Include="Views\Images\add40.png" />\r
     <Resource Include="Views\Images\AddToQueue.png" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
+    <Resource Include="Views\Images\AddToQueue_small.png" />\r
     <Resource Include="Views\Images\Advanced.png" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
+    <Resource Include="Views\Images\Close.png" />\r
+    <Resource Include="Views\Images\close64.png" />\r
+    <Resource Include="Views\Images\close64_dark.png" />\r
+    <Resource Include="Views\Images\Complete.png" />\r
+    <Resource Include="Views\Images\copy.png" />\r
     <Resource Include="Views\Images\Disc.png" />\r
+    <Resource Include="Views\Images\disc_small.png" />\r
+    <Resource Include="Views\Images\ErrorX.png" />\r
     <Resource Include="Views\Images\file.png" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <BootstrapperPackage Include=".NETFramework,Version=v4.7.1">\r
-      <Visible>False</Visible>\r
-      <ProductName>Microsoft .NET Framework 4.7.1 %28x86 and x64%29</ProductName>\r
-      <Install>true</Install>\r
-    </BootstrapperPackage>\r
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">\r
-      <Visible>False</Visible>\r
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>\r
-      <Install>false</Install>\r
-    </BootstrapperPackage>\r
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">\r
-      <Visible>False</Visible>\r
-      <ProductName>.NET Framework 3.5 SP1</ProductName>\r
-      <Install>false</Install>\r
-    </BootstrapperPackage>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Resource Include="Views\Images\folder32.png" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
     <Resource Include="Views\Images\File32.png" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
+    <Resource Include="Views\Images\folder.png" />\r
+    <Resource Include="Views\Images\folder32.png" />\r
+    <Resource Include="Views\Images\information.png" />\r
     <Resource Include="Views\Images\information64.png" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
+    <Resource Include="Views\Images\logo128.png" />\r
+    <Resource Include="Views\Images\logo64.png" />\r
+    <Resource Include="Views\Images\Movies.png" />\r
     <Resource Include="Views\Images\Movies_small.png" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
+    <Resource Include="Views\Images\Options24.png" />\r
+    <Resource Include="Views\Images\Output_Small.png" />\r
+    <Resource Include="Views\Images\Pause.png" />\r
+    <Resource Include="Views\Images\picture.png" />\r
+    <Resource Include="Views\Images\picture_small.png" />\r
+    <Resource Include="Views\Images\Play.png" />\r
+    <Resource Include="Views\Images\Play_small.png" />\r
+    <Resource Include="Views\Images\Preferences.png" />\r
+    <Resource Include="Views\Images\Pref_Small.png" />\r
     <Resource Include="Views\Images\Presets2.png" />\r
+    <Resource Include="Views\Images\Queue.png" />\r
+    <Resource Include="Views\Images\Queue_Small.png" />\r
+    <Resource Include="Views\Images\Refresh.ico" />\r
+    <Resource Include="Views\Images\remove.png" />\r
+    <Resource Include="Views\Images\stop.png" />\r
+    <Resource Include="Views\Images\warningsmall.png" />\r
+    <Resource Include="Views\Images\Working0.png" />\r
   </ItemGroup>\r
+\r
   <ItemGroup>\r
-    <ProjectReference Include="..\HandBrake.Interop\HandBrake.Interop.csproj">\r
-      <Project>{087a2ba8-bac2-4577-a46f-07ff9d420016}</Project>\r
-      <Name>HandBrake.Interop</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Resource Include="Views\Images\close64.png" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Resource Include="Views\Images\close64_dark.png" />\r
+    <None Update="portable.ini.template">\r
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>\r
+    </None>\r
   </ItemGroup>\r
-  <ItemGroup />\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <PropertyGroup>\r
-    <TargetFrameworkSDKToolsDirectory Condition=" '$(Platform)' == 'x64'">$(TargetFrameworkSDKToolsDirectory)$(Platform)\</TargetFrameworkSDKToolsDirectory>\r
-  </PropertyGroup>\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
 </Project>
\ No newline at end of file

diff --git a/win/CS/HandBrakeWPF/Installer/Installer64.nsi b/win/CS/HandBrakeWPF/Installer/Installer64.nsi
index 386244d4fc324d6061c7bcfc28216447ff443b54..26b2ffe6b3afa48cc4dcb744b87bc270f9be68c8 100644 (file)
--- a/win/CS/HandBrakeWPF/Installer/Installer64.nsi
+++ b/win/CS/HandBrakeWPF/Installer/Installer64.nsi
@@ -39,7 +39,7 @@ ManifestDPIAware true
 ; Welcome page\r
 !insertmacro MUI_PAGE_WELCOME\r
 ; License page\r
-!insertmacro MUI_PAGE_LICENSE "doc\COPYING"\r
+!insertmacro MUI_PAGE_LICENSE "doc\license.txt"\r
 ; Directory page\r
 !insertmacro MUI_PAGE_DIRECTORY\r
 ; Instfiles page\r

diff --git a/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi b/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi
index a76dc00004fca8d34de3cd8f99a5e5331a2c73e0..ab0baabe56a8f75398d87b4b156ecb3794ced740 100644 (file)
--- a/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi
+++ b/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi
@@ -39,7 +39,7 @@ ManifestDPIAware true
 ; Welcome page\r
 !insertmacro MUI_PAGE_WELCOME\r
 ; License page\r
-!insertmacro MUI_PAGE_LICENSE "doc\COPYING"\r
+!insertmacro MUI_PAGE_LICENSE "doc\license.txt"\r
 ; Directory page\r
 !insertmacro MUI_PAGE_DIRECTORY\r
 ; Instfiles page\r

diff --git a/win/CS/HandBrakeWPF/packages.config b/win/CS/HandBrakeWPF/packages.config
deleted file mode 100644 (file)
index 9e910e9..0000000
--- a/win/CS/HandBrakeWPF/packages.config
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Caliburn.Micro" version="3.2.0" targetFramework="net471" />
-  <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net471" />
-  <package id="gong-wpf-dragdrop" version="2.0.1" targetFramework="net471" />
-  <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net471" />
-  <package id="Ookii.Dialogs" version="1.0" targetFramework="net46" />
-</packages>
\ No newline at end of file

diff --git a/win/CS/build.xml b/win/CS/build.xml
index 716d17c2d51f1285df0fbbd6bd112a6f716b98bb..42c6b96382c7bcbae718223edcf7431acc3e4b20 100644 (file)
--- a/win/CS/build.xml
+++ b/win/CS/build.xml
@@ -58,21 +58,21 @@
 \r
   <!-- Post Build Events -->\r
   <Target Name="NightlyPostBuild">\r
-    <Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\Installer\MakeNightly64.nsi $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release /Y" />\r
-    <Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\Installer\InstallerBackground.bmp $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release /Y" />\r
-    <Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\handbrakepineapple.ico $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release /Y" />\r
-    <Exec Command="xcopy $(MSBuildProjectDirectory)\doc $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release\doc /I /Y" />\r
-    <Exec Command="makensis $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release\MakeNightly64.nsi" />\r
-    <Exec Command="&quot;$(SignToolLocation)&quot; sign /sha1 $(SignThumbprint) $(SignTimestamp) $(SignTimestampServer) /v &quot;$(MSBuildProjectDirectory)\HandBrakeWPF\bin\$(Platform)\Release\*Win_GUI.exe&quot;"  Condition="'$(SignThumbprint)' != ''" />\r
+    <Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\Installer\MakeNightly64.nsi $(MSBuildProjectDirectory)\HandBrakeWPF\bin\Release /Y" />\r
+    <Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\Installer\InstallerBackground.bmp $(MSBuildProjectDirectory)\HandBrakeWPF\bin\Release /Y" />\r
+    <Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\handbrakepineapple.ico $(MSBuildProjectDirectory)\HandBrakeWPF\bin\Release /Y" />\r
+    <Exec Command="xcopy $(MSBuildProjectDirectory)\doc $(MSBuildProjectDirectory)\HandBrakeWPF\bin\Release\doc /I /Y" />\r
+    <Exec Command="makensis $(MSBuildProjectDirectory)\HandBrakeWPF\bin\Release\MakeNightly64.nsi" />\r
+    <Exec Command="&quot;$(SignToolLocation)&quot; sign /sha1 $(SignThumbprint) $(SignTimestamp) $(SignTimestampServer) /v &quot;$(MSBuildProjectDirectory)\HandBrakeWPF\bin\Release\*Win_GUI.exe&quot;"  Condition="'$(SignThumbprint)' != ''" />\r
   </Target>\r
 \r
   <Target Name="ReleasePostBuild">\r
-    <Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\Installer\Installer64.nsi $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release /Y" />\r
-    <Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\Installer\InstallerBackground.bmp $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release /Y" />\r
-    <Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\handbrakepineapple.ico $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release /Y" />\r
-    <Exec Command="xcopy $(MSBuildProjectDirectory)\doc $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release\doc /I /Y" />\r
-    <Exec Command="makensis $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release\Installer64.nsi" />\r
-    <Exec Command="&quot;$(SignToolLocation)&quot; sign /sha1 $(SignThumbprint) $(SignTimestamp) $(SignTimestampServer) /v &quot;$(MSBuildProjectDirectory)\HandBrakeWPF\bin\$(Platform)\Release\*Win_GUI.exe&quot;"  Condition="'$(SignThumbprint)' != ''" />\r
+    <Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\Installer\Installer64.nsi $(MSBuildProjectDirectory)\HandBrakeWPF\bin\Release /Y" />\r
+    <Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\Installer\InstallerBackground.bmp $(MSBuildProjectDirectory)\HandBrakeWPF\bin\Release /Y" />\r
+    <Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\handbrakepineapple.ico $(MSBuildProjectDirectory)\HandBrakeWPF\bin\Release /Y" />\r
+    <Exec Command="xcopy $(MSBuildProjectDirectory)\doc $(MSBuildProjectDirectory)\HandBrakeWPF\bin\Release\doc /I /Y" />\r
+    <Exec Command="makensis $(MSBuildProjectDirectory)\HandBrakeWPF\bin\Release\Installer64.nsi" />\r
+    <Exec Command="&quot;$(SignToolLocation)&quot; sign /sha1 $(SignThumbprint) $(SignTimestamp) $(SignTimestampServer) /v &quot;$(MSBuildProjectDirectory)\HandBrakeWPF\bin\Release\*Win_GUI.exe&quot;"  Condition="'$(SignThumbprint)' != ''" />\r
   </Target>\r
 \r
 </Project>\r

diff --git a/win/CS/doc/COPYING b/win/CS/doc/License.txt
similarity index 93%
rename from win/CS/doc/COPYING
rename to win/CS/doc/License.txt
index ecbc0593737be657aef92e3adcf3bcbd6fdb812e..a2e48d344611fc7061be2b1a9f0a8c067db74ddf 100644 (file)
--- a/win/CS/doc/COPYING
+++ b/win/CS/doc/License.txt
@@ -336,4 +336,17 @@ This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
 library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
\ No newline at end of file
+Public License instead of this License.
+
+-----------------------------------------------------------------------------------------
+
+The MIT License (MIT)
+
+Copyright (c) 2007 James Newton-King
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+