summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--win/CS/HandBrake.Interop/HandBrake.Interop.csproj2
-rw-r--r--win/CS/HandBrake.Worker/HandBrake.Worker.csproj96
-rw-r--r--win/CS/HandBrake.Worker/Properties/AssemblyInfo.cs45
-rw-r--r--win/CS/HandBrake.sln4
-rw-r--r--win/CS/HandBrakeTools/App.config6
-rw-r--r--win/CS/HandBrakeTools/HandBrakeTools.csproj75
-rw-r--r--win/CS/HandBrakeTools/Program.cs101
-rw-r--r--win/CS/HandBrakeTools/Properties/AssemblyInfo.cs45
-rw-r--r--win/CS/HandBrakeWPF/HandBrakeWPF.csproj2
9 files changed, 27 insertions, 349 deletions
diff --git a/win/CS/HandBrake.Interop/HandBrake.Interop.csproj b/win/CS/HandBrake.Interop/HandBrake.Interop.csproj
index 077e37504..4034d02c7 100644
--- a/win/CS/HandBrake.Interop/HandBrake.Interop.csproj
+++ b/win/CS/HandBrake.Interop/HandBrake.Interop.csproj
@@ -19,7 +19,7 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
+ <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
</ItemGroup>
</Project>
diff --git a/win/CS/HandBrake.Worker/HandBrake.Worker.csproj b/win/CS/HandBrake.Worker/HandBrake.Worker.csproj
index f0ca5786d..705a494be 100644
--- a/win/CS/HandBrake.Worker/HandBrake.Worker.csproj
+++ b/win/CS/HandBrake.Worker/HandBrake.Worker.csproj
@@ -1,81 +1,35 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
+
<PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
- <ProjectGuid>{F8370F37-B226-4830-AEE7-6D7AE403E3D2}</ProjectGuid>
<OutputType>Exe</OutputType>
- <RootNamespace>HandBrake.Worker</RootNamespace>
- <AssemblyName>HandBrake.Worker</AssemblyName>
- <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
- <FileAlignment>512</FileAlignment>
- <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
- <TargetFrameworkProfile />
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
- <DebugSymbols>true</DebugSymbols>
- <OutputPath>bin\x64\Debug\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <DebugType>full</DebugType>
- <PlatformTarget>x64</PlatformTarget>
- <ErrorReport>prompt</ErrorReport>
- <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
- <Prefer32Bit>true</Prefer32Bit>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
- <OutputPath>bin\x64\Release\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
- <Optimize>true</Optimize>
- <DebugType>pdbonly</DebugType>
+ <TargetFramework>net48</TargetFramework>
+ <UseWPF>true</UseWPF>
+ <PackageId>HandBrake.Worker</PackageId>
+ <Authors>HandBrake Team</Authors>
+ <Company>HandBrake Team</Company>
+ <Product>HandBrake.Worker</Product>
+ <Copyright>Copyright © 2003-2020 HandBrake Team</Copyright>
+ <Description>HandBrake is an open-source, GPL-licensed, multiplatform,video transcoder.</Description>
+ <PackageProjectUrl>https://handbrake.fr</PackageProjectUrl>
+ <RepositoryUrl>https://github.com/HandBrake/HandBrake</RepositoryUrl>
+ <RepositoryType>git</RepositoryType>
+ <AssemblyVersion>1.4.0.0</AssemblyVersion>
+ <Platforms>x64</Platforms>
<PlatformTarget>x64</PlatformTarget>
- <ErrorReport>prompt</ErrorReport>
- <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
- <Prefer32Bit>true</Prefer32Bit>
- </PropertyGroup>
- <PropertyGroup>
<ApplicationIcon>handbrakepineapple.ico</ApplicationIcon>
+ <StartupObject />
+ <AssemblyName>HandBrake.Worker</AssemblyName>
+ <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+ <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
+ <RuntimeIdentifiers>win7-x64</RuntimeIdentifiers>
</PropertyGroup>
+
<ItemGroup>
- <Reference Include="System" />
- <Reference Include="System.Core" />
- <Reference Include="System.Xml.Linq" />
- <Reference Include="System.Data" />
- <Reference Include="System.Xml" />
- </ItemGroup>
- <ItemGroup>
- <Compile Include="Routing\ApiRouter.cs" />
- <Compile Include="HttpServer.cs" />
- <Compile Include="Logging\Interfaces\ILogHandler.cs" />
- <Compile Include="Logging\LogHandler.cs" />
- <Compile Include="Logging\Models\LogMessage.cs" />
- <Compile Include="Program.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="Routing\Commands\EncodeCommand.cs" />
- <Compile Include="Routing\Results\CommandResult.cs" />
- <Compile Include="Routing\Results\ConnectionResult.cs" />
- <Compile Include="Routing\Commands\InitCommand.cs" />
- <Compile Include="Utilities\HttpUtilities.cs" />
- <Compile Include="Watcher\InstanceWatcher.cs" />
- </ItemGroup>
- <ItemGroup>
- <None Include="App.config" />
- </ItemGroup>
- <ItemGroup>
- <PackageReference Include="Newtonsoft.Json">
- <Version>12.0.2</Version>
- <HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
- </PackageReference>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\HandBrake.Interop\HandBrake.Interop.csproj">
- <Project>{087a2ba8-bac2-4577-a46f-07ff9d420016}</Project>
- <Name>HandBrake.Interop</Name>
- </ProjectReference>
+ <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
</ItemGroup>
+
<ItemGroup>
- <Content Include="handbrakepineapple.ico" />
+ <ProjectReference Include="..\HandBrake.Interop\HandBrake.Interop.csproj" />
</ItemGroup>
- <ItemGroup />
- <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+
</Project> \ No newline at end of file
diff --git a/win/CS/HandBrake.Worker/Properties/AssemblyInfo.cs b/win/CS/HandBrake.Worker/Properties/AssemblyInfo.cs
deleted file mode 100644
index b8c30e38a..000000000
--- a/win/CS/HandBrake.Worker/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,45 +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.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.Worker")]
-[assembly: AssemblyDescription("HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder.")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("HandBrake Team")]
-[assembly: AssemblyProduct("HandBrake.Worker")]
-[assembly: AssemblyCopyright("Copyright © 2003-2020 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("f8370f37-b226-4830-aee7-6d7ae403e3d2")]
-
-// 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: AssemblyFileVersion("1.4.0.0")]
diff --git a/win/CS/HandBrake.sln b/win/CS/HandBrake.sln
index 0e81bcda7..ae7432bdb 100644
--- a/win/CS/HandBrake.sln
+++ b/win/CS/HandBrake.sln
@@ -9,8 +9,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
build.xml = build.xml
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandBrakeTools", "HandBrakeTools\HandBrakeTools.csproj", "{3BAEBAC7-9042-4863-876F-C550ADCA66DC}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandBrake.Worker", "HandBrake.Worker\HandBrake.Worker.csproj", "{F8370F37-B226-4830-AEE7-6D7AE403E3D2}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HandBrake.Interop", "HandBrake.Interop\HandBrake.Interop.csproj", "{ED5C8D53-0988-4CEB-934A-6B1D840C6335}"
@@ -25,8 +23,6 @@ Global
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {3BAEBAC7-9042-4863-876F-C550ADCA66DC}.Debug|x64.ActiveCfg = Debug|Any CPU
- {3BAEBAC7-9042-4863-876F-C550ADCA66DC}.Release|x64.ActiveCfg = Release|Any CPU
{F8370F37-B226-4830-AEE7-6D7AE403E3D2}.Debug|x64.ActiveCfg = Debug|x64
{F8370F37-B226-4830-AEE7-6D7AE403E3D2}.Debug|x64.Build.0 = Debug|x64
{F8370F37-B226-4830-AEE7-6D7AE403E3D2}.Release|x64.ActiveCfg = Release|x64
diff --git a/win/CS/HandBrakeTools/App.config b/win/CS/HandBrakeTools/App.config
deleted file mode 100644
index 4bfa00561..000000000
--- a/win/CS/HandBrakeTools/App.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
- <startup>
- <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
- </startup>
-</configuration>
diff --git a/win/CS/HandBrakeTools/HandBrakeTools.csproj b/win/CS/HandBrakeTools/HandBrakeTools.csproj
deleted file mode 100644
index 34eb016b5..000000000
--- a/win/CS/HandBrakeTools/HandBrakeTools.csproj
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <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>
- <ProjectGuid>{3BAEBAC7-9042-4863-876F-C550ADCA66DC}</ProjectGuid>
- <OutputType>Exe</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>HandBrakeTools</RootNamespace>
- <AssemblyName>HandBrakeTools</AssemblyName>
- <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
- <FileAlignment>512</FileAlignment>
- <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
- <PublishUrl>publish\</PublishUrl>
- <Install>true</Install>
- <InstallFrom>Disk</InstallFrom>
- <UpdateEnabled>false</UpdateEnabled>
- <UpdateMode>Foreground</UpdateMode>
- <UpdateInterval>7</UpdateInterval>
- <UpdateIntervalUnits>Days</UpdateIntervalUnits>
- <UpdatePeriodically>false</UpdatePeriodically>
- <UpdateRequired>false</UpdateRequired>
- <MapFileExtensions>true</MapFileExtensions>
- <ApplicationRevision>0</ApplicationRevision>
- <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
- <IsWebBootstrapper>false</IsWebBootstrapper>
- <UseApplicationTrust>false</UseApplicationTrust>
- <BootstrapperEnabled>true</BootstrapperEnabled>
- <TargetFrameworkProfile />
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <PlatformTarget>AnyCPU</PlatformTarget>
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>bin\Debug\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <Prefer32Bit>false</Prefer32Bit>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <PlatformTarget>AnyCPU</PlatformTarget>
- <DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
- <OutputPath>bin\Release\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- </PropertyGroup>
- <PropertyGroup>
- <SignAssembly>false</SignAssembly>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="System" />
- <Reference Include="System.Core" />
- <Reference Include="System.Xml" />
- </ItemGroup>
- <ItemGroup>
- <Compile Include="Program.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- </ItemGroup>
- <ItemGroup>
- <None Include="App.config" />
- </ItemGroup>
- <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
- <!-- 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>
- -->
-</Project> \ No newline at end of file
diff --git a/win/CS/HandBrakeTools/Program.cs b/win/CS/HandBrakeTools/Program.cs
deleted file mode 100644
index cbbc0e758..000000000
--- a/win/CS/HandBrakeTools/Program.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Program.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>
-// HandBrake Toolkit
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrakeTools
-{
- using System;
- using System.Diagnostics;
- using System.IO;
- using System.Security.Cryptography;
-
- public class Program
- {
- static void Main(string[] args)
- {
- if (args.Length == 0)
- {
- Console.WriteLine("Invalid Command. Either 'genkeys' or 'sign <filename>'");
- Console.Read();
- return;
- }
-
- string command = args[0];
- string file = args.Length > 1 ? args[1] : null;
- switch (command)
- {
- case "genkeys":
- GenKeyFiles();
- return;
- case "sign":
- string hash = SignDownload(file);
- Console.WriteLine(VerifyDownload(hash, file) ? "Passed Verification Test" : "Failed Verification Test");
- Console.WriteLine("Hash: " + hash);
- File.WriteAllText("file.hash", hash);
- return;
- }
-
- Console.WriteLine("Done.");
- Console.Read();
- }
-
- public static void GenKeyFiles()
- {
- RSACryptoServiceProvider provider = new RSACryptoServiceProvider { KeySize = 2048 };
-
- using (StreamWriter sw = new StreamWriter("private.key"))
- {
- sw.Write(provider.ToXmlString(true));
- }
-
- using (StreamWriter sw = new StreamWriter("public.key"))
- {
- sw.Write(provider.ToXmlString(false));
- }
- }
-
- public static string SignDownload(string updateFile)
- {
- RSACryptoServiceProvider provider = new RSACryptoServiceProvider();
- provider.FromXmlString(File.ReadAllText("private.key"));
- byte[] signedBytes = provider.SignData(File.ReadAllBytes(updateFile), "SHA256");
- return Convert.ToBase64String(signedBytes);
- }
-
- public static bool VerifyDownload(string signature, string updateFile)
- {
- // Sanity Checks
- if (!File.Exists(updateFile))
- {
- return false;
- }
-
- if (string.IsNullOrEmpty(signature))
- {
- return false;
- }
-
- // Fetch our Public Key
- string publicKey = File.ReadAllText("public.key");
-
- // Verify the file against the Signature.
- try
- {
- byte[] file = File.ReadAllBytes(updateFile);
- RSACryptoServiceProvider verifyProfider = new RSACryptoServiceProvider();
- verifyProfider.FromXmlString(publicKey);
- return verifyProfider.VerifyData(file, "SHA256", Convert.FromBase64String(signature));
- }
- catch (Exception e)
- {
- Debug.WriteLine(e);
- return false;
- }
- }
- }
-}
diff --git a/win/CS/HandBrakeTools/Properties/AssemblyInfo.cs b/win/CS/HandBrakeTools/Properties/AssemblyInfo.cs
deleted file mode 100644
index e03e9f5bd..000000000
--- a/win/CS/HandBrakeTools/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,45 +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;
-using System.Windows;
-
-// 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 Toolkit")]
-[assembly: AssemblyDescription("The toolkit app has utility classes for signing and building HandBrake")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("HandBrake Team")]
-[assembly: AssemblyProduct("HandBrake")]
-[assembly: AssemblyCopyright("Copyright © 2003-2020 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)]
-
-// 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.1.0.0")]
-[assembly: NeutralResourcesLanguage("")] \ No newline at end of file
diff --git a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
index 482d51061..37f80cece 100644
--- a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
+++ b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
@@ -44,7 +44,7 @@
<ItemGroup>
<PackageReference Include="Caliburn.Micro" Version="3.2.0" />
<PackageReference Include="gong-wpf-dragdrop" Version="2.2.0" />
- <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
+ <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="Ookii.Dialogs" Version="1.0.0" />
</ItemGroup>
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-15 11:57:59 +0000