From 7cf0e78155c1611d2055175d4b37fb04414f55c7 Mon Sep 17 00:00:00 2001 From: sr55 Date: Sat, 1 Jun 2019 13:39:17 +0100 Subject: [PATCH] WinGui: Switch to SDK style cproj files. Switch to PackageReferences for NuGet Packages. --- .../HandBrake.Interop.csproj | 232 +---- .../HandBrake.Interop.nuspec | 25 - .../Properties/AssemblyInfo.cs | 47 - win/CS/HandBrake.Interop/packages.config | 5 - win/CS/HandBrake.sln | 8 +- win/CS/HandBrakeTools/HandBrakeTools.csproj | 10 +- win/CS/HandBrakeWPF/HandBrakeWPF.csproj | 831 +++--------------- win/CS/HandBrakeWPF/Installer/Installer64.nsi | 2 +- .../HandBrakeWPF/Installer/MakeNightly64.nsi | 2 +- win/CS/HandBrakeWPF/packages.config | 8 - win/CS/build.xml | 24 +- win/CS/doc/{COPYING => License.txt} | 15 +- 12 files changed, 200 insertions(+), 1009 deletions(-) delete mode 100644 win/CS/HandBrake.Interop/HandBrake.Interop.nuspec delete mode 100644 win/CS/HandBrake.Interop/Properties/AssemblyInfo.cs delete mode 100644 win/CS/HandBrake.Interop/packages.config delete mode 100644 win/CS/HandBrakeWPF/packages.config rename win/CS/doc/{COPYING => License.txt} (93%) diff --git a/win/CS/HandBrake.Interop/HandBrake.Interop.csproj b/win/CS/HandBrake.Interop/HandBrake.Interop.csproj index 733c81248..efc29219e 100644 --- a/win/CS/HandBrake.Interop/HandBrake.Interop.csproj +++ b/win/CS/HandBrake.Interop/HandBrake.Interop.csproj @@ -1,204 +1,50 @@ - - + - Debug - x64 - {087A2BA8-BAC2-4577-A46F-07FF9D420016} Library - Properties - HandBrake.Interop - HandBrake.Interop - v4.7.1 - 512 - - - - - + net471 + true + + + x64 + true + The HandBrake Team + https://handbrake.fr + + https://handbrake.fr/img/logo.png + https://github.com/HandBrake/HandBrake.git + Git + true + false + false + License.txt + 1.3.0 + Releasese notes for HandBrake are available on GitHub. + 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. + Copyright © 2003-2019 HandBrake Team + Video Transcoder - + + x64 - bin\Debug\ - TRACE;DEBUG - true - false - ..\HandBrake.ruleset - 0649 + bin\Debug - - x64 - bin\Release\ - DEBUG;TRACE - true - pdbonly - true - false + + bin\Release + - - ..\packages\gong-wpf-dragdrop.2.0.1\lib\net47\GongSolutions.WPF.DragDrop.dll - - - ..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll - - - - 3.5 - - - 3.5 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - True - True - Resources.resx - - - + + 12.0.2 + + - - stylecop.json - - - + + True + + - - - - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - - - $(TargetFrameworkSDKToolsDirectory)$(Platform)\ - - - - - - \ 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 index 12b5dbef4..000000000 --- a/win/CS/HandBrake.Interop/HandBrake.Interop.nuspec +++ /dev/null @@ -1,25 +0,0 @@ - - - - $id$ - $version$-Nightly - $title$ - $author$ - $author$ - https://github.com/HandBrake/HandBrake/blob/master/LICENSE - http://github.com/HandBrake/HandBrake - https://avatars1.githubusercontent.com/u/627269 - false - $description$ - Copyright © 2003-2019 HandBrake Team - Open-Source Video Transcoder - - - - - - - - - - \ 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 index 75448ee2a..000000000 --- a/win/CS/HandBrake.Interop/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,47 +0,0 @@ -// -------------------------------------------------------------------------------------------------------------------- -// -// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License. -// -// -// Assembly Info -// -// -// -------------------------------------------------------------------------------------------------------------------- - -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 index b63f76225..000000000 --- a/win/CS/HandBrake.Interop/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/win/CS/HandBrake.sln b/win/CS/HandBrake.sln index 4daa2858a..305c76f4c 100644 --- 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 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}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "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}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "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}" ProjectSection(SolutionItems) = preProject @@ -33,8 +33,8 @@ Global {DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Debug|x64.Build.0 = Debug|x64 {DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Release|x64.ActiveCfg = Release|x64 {DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Release|x64.Build.0 = Release|x64 - {3BAEBAC7-9042-4863-876F-C550ADCA66DC}.Debug|x64.ActiveCfg = Debug|Any CPU - {3BAEBAC7-9042-4863-876F-C550ADCA66DC}.Release|x64.ActiveCfg = Release|Any CPU + {3BAEBAC7-9042-4863-876F-C550ADCA66DC}.Debug|x64.ActiveCfg = Debug|x64 + {3BAEBAC7-9042-4863-876F-C550ADCA66DC}.Release|x64.ActiveCfg = Release|x64 {6E855245-E402-4C0F-BB0B-EEB63082F6AC}.Debug|x64.ActiveCfg = Debug|x64 {6E855245-E402-4C0F-BB0B-EEB63082F6AC}.Release|x64.ActiveCfg = Release|x64 {F8370F37-B226-4830-AEE7-6D7AE403E3D2}.Debug|x64.ActiveCfg = Debug|x64 diff --git a/win/CS/HandBrakeTools/HandBrakeTools.csproj b/win/CS/HandBrakeTools/HandBrakeTools.csproj index f8eac8fd9..992428fc1 100644 --- a/win/CS/HandBrakeTools/HandBrakeTools.csproj +++ b/win/CS/HandBrakeTools/HandBrakeTools.csproj @@ -3,7 +3,7 @@ Debug - AnyCPU + x64 {3BAEBAC7-9042-4863-876F-C550ADCA66DC} Exe Properties @@ -28,8 +28,8 @@ false true - - AnyCPU + + x64 true full false @@ -39,8 +39,8 @@ 4 false - - AnyCPU + + x64 pdbonly true bin\Release\ diff --git a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj index b81e5fce7..52f509724 100644 --- a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj +++ b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj @@ -1,737 +1,154 @@ - - + - Debug - x64 - {DADE66CB-0E12-4959-ADE5-0ACD31D27C59} WinExe - Properties - HandBrakeWPF - HandBrake - v4.7.1 - - - 512 - {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 4 - false - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - true - - + net471 + true + false + x64 + https://handbrake.fr + https://github.com/HandBrake/HandBrake.git + Git + false handbrakepineapple.ico + HandBrake - - true - bin\x64\Debug\ - DEBUG;TRACE - full - x64 - prompt - true - true - true - false - ..\HandBrake.ruleset - - - bin\x64\Release\ - TRACE - true - pdbonly - x64 - prompt - false - - - - app.manifest + + + bin\Debug - - false + + bin\release + + + + + + + + 3.2.0 + + + 3.2.0 + + + 2.0.1 + + + 12.0.2 + + + + - - ..\packages\Caliburn.Micro.Core.3.2.0\lib\net45\Caliburn.Micro.dll - - - ..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.dll - - - ..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll - - - ..\packages\gong-wpf-dragdrop.2.0.1\lib\net47\GongSolutions.WPF.DragDrop.dll - - - ..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll - - - ..\packages\Ookii.Dialogs.1.0\lib\net35\Ookii.Dialogs.Wpf.dll - True - - - - - - - - ..\packages\Caliburn.Micro.3.2.0\lib\net45\System.Windows.Interactivity.dll - - - - - 4.0 - - - - - - - - MSBuild:Compile - Designer - - - - - - - - - - - - - - AlertPanel.xaml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - True - True - Resources.resx - - - ResourcesTooltips.resx - True - True - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - SourceSelection.xaml - - - - - - - - - - - - - - ManagePresetView.xaml - - - AudioDefaultsView.xaml - - - MetaDataView.xaml - - - PopupWindowView.xaml - - - CountdownAlertView.xaml - - - - TimeSpanBox.xaml - - - Loading.xaml - - - NumberBox.xaml - - - - StatusPanel.xaml - - - - - - - - - - - - - - - - - - - - - - - - - - QueueSelectionView.xaml - - - MiniView.xaml - - - Embedded.xaml - - - ShellView.xaml - - - - - - - StaticPreviewView.xaml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - AboutView.xaml - - - App.xaml - Code - - - - SubtitlesDefaultsView.xaml - - - SummaryView.xaml - - - AudioView.xaml - - - AddPresetView.xaml - - - ChaptersView.xaml - - - FiltersView.xaml - - - SubtitlesView.xaml - - - ErrorView.xaml - - - LogView.xaml - - - QueueView.xaml - - - MainView.xaml - - - PictureSettingsView.xaml - - - OptionsView.xaml - - - VideoView.xaml - - - - Code - - - Designer - - - - - - - PublicResXFileCodeGenerator - ResourcesTooltips.Designer.cs - Designer - - - PublicResXFileCodeGenerator - Designer - Resources.Designer.cs - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - PreserveNewest - + - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - - - Designer - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - + - - + + + + + + + - - - - False - Microsoft .NET Framework 4.7.1 %28x86 and x64%29 - true - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - false - - - - - - - - + + + - - + + + - - + + + + + + + + + + + + + + + + + - - {087a2ba8-bac2-4577-a46f-07ff9d420016} - HandBrake.Interop - - - - - - - + + PreserveNewest + - - - - $(TargetFrameworkSDKToolsDirectory)$(Platform)\ - - \ No newline at end of file diff --git a/win/CS/HandBrakeWPF/Installer/Installer64.nsi b/win/CS/HandBrakeWPF/Installer/Installer64.nsi index 386244d4f..26b2ffe6b 100644 --- a/win/CS/HandBrakeWPF/Installer/Installer64.nsi +++ b/win/CS/HandBrakeWPF/Installer/Installer64.nsi @@ -39,7 +39,7 @@ ManifestDPIAware true ; Welcome page !insertmacro MUI_PAGE_WELCOME ; License page -!insertmacro MUI_PAGE_LICENSE "doc\COPYING" +!insertmacro MUI_PAGE_LICENSE "doc\license.txt" ; Directory page !insertmacro MUI_PAGE_DIRECTORY ; Instfiles page diff --git a/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi b/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi index a76dc0000..ab0baabe5 100644 --- a/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi +++ b/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi @@ -39,7 +39,7 @@ ManifestDPIAware true ; Welcome page !insertmacro MUI_PAGE_WELCOME ; License page -!insertmacro MUI_PAGE_LICENSE "doc\COPYING" +!insertmacro MUI_PAGE_LICENSE "doc\license.txt" ; Directory page !insertmacro MUI_PAGE_DIRECTORY ; Instfiles page diff --git a/win/CS/HandBrakeWPF/packages.config b/win/CS/HandBrakeWPF/packages.config deleted file mode 100644 index 9e910e9a4..000000000 --- a/win/CS/HandBrakeWPF/packages.config +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/win/CS/build.xml b/win/CS/build.xml index 716d17c2d..42c6b9638 100644 --- a/win/CS/build.xml +++ b/win/CS/build.xml @@ -58,21 +58,21 @@ - - - - - - + + + + + + - - - - - - + + + + + + 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 ecbc05937..a2e48d344 100644 --- 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. + -- 2.40.0