Skip to content

Commit

Permalink
Merge branch 'travis-test'
Browse files Browse the repository at this point in the history
  • Loading branch information
rafntor committed Apr 23, 2019
2 parents d0e72eb + c026525 commit 2d4b423
Show file tree
Hide file tree
Showing 122 changed files with 6,480 additions and 933 deletions.
21 changes: 21 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
os: windows
language: shell

script:
- choco install nuget.commandline
- nuget restore src/bdhero.sln
- dotnet build src/bdhero.sln
- cd artifacts && 7z a Portable Portable && cd ..
- ls -l
- ls -l artifacts

deploy:
provider: releases
api_key:
secure: RtDDG08wA6zo4yxrZZwGHxAELvsn1Scq+PdxRHvlz2MUFriUWKbpN6/1d9FKlZE/7CPUyT8PTwLgsJQU8eHv1tlT+QGHc1JtMAEWb4XkibNpQ0VoSUm3u8St7JfWxLfQxHkkmy5rdvPzT1fqz50Vxu8Sn8eUwJnFfpyQk+hNkZGX3r6dD5mMsXWAbBCsfJWmLwGTmFVlPY/TjdsAYwLHP3ZH+oKkAp2OyY1kI0+8loDtCecAp5koMjqaaLp2AwQohcYxYRwA+VRGdHzo5LjsKG184FGcPif9K69NarwMm98LVCG7MxSK2m/jzGgLSf88Oe22MJQiQHBI+qO25iC1oHN9JzWv4iJZ0/V/LgA7eMT/3cmGad84ChNc/s+q325qLhyMSkQX4g6TZmPB6ia3RseaVxCoq6wNN/pncxGa7XTGS12YDaNEjz+leSNzdmo9M1PRtSHQlC3gYNiLppL+uLXGESXHVu5FwaOgc2TQcsAeXS7ySVQy05VEmTJwaGNP59LGF6QrPKcEi8oPeylUbnXEPUSie7KJPWK8BzkiyiS8hQUpl6sqouWIKhnh6dz961AaOn5fOOclZ1Bt305c2/wQUVgJE4qYond2wE0RwKbTprFQuvY7sRN3/R4hD4WluTSK/5ta4Lhd/1WlUEA3A+4UZ5uX/eruLjMWzSIpZjY=
file: artifacts/Portable.7z
skip_cleanup: true
on:
branch: master
tags: true

2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# BDHero

[![Build Status](https://travis-ci.com/rafntor/bdhero.svg?branch=master)](https://travis-ci.com/rafntor/bdhero) [![GPL Licence](https://badges.frapsoft.com/os/gpl/gpl.png?v=103)](https://opensource.org/licenses/GPL-3.0/)

An intelligent, automatic Blu-ray™ to MKV muxer and analysis tool.

![BDHero logo](http://i.bdhero.org/logo/v5/bdhero_gui_128x100_trim.png)
Expand Down
58 changes: 30 additions & 28 deletions src/BDHero.sln
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.28307.329
# Visual Studio Version 16
VisualStudioVersion = 16.0.28803.202
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BDHeroGUI", "Core\BDHeroGUI\BDHeroGUI.csproj", "{0A807DFE-9F38-418E-A811-649B9AD78102}"
ProjectSection(ProjectDependencies) = postProject
Expand Down Expand Up @@ -68,7 +68,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Packager", "Build\Packager\
{8DB79B29-2598-40EC-B57B-C8FCE7DA0F19} = {8DB79B29-2598-40EC-B57B-C8FCE7DA0F19}
{A673442D-599D-4332-BCFA-8EC02171EFC0} = {A673442D-599D-4332-BCFA-8EC02171EFC0}
{A15E3E31-D4C2-472C-9FF0-D90387C18311} = {A15E3E31-D4C2-472C-9FF0-D90387C18311}
{D98FBB34-9674-4CAC-99F1-4B788B78DC77} = {D98FBB34-9674-4CAC-99F1-4B788B78DC77}
{2D56D636-1D17-400A-8C0A-0272F1013DFC} = {2D56D636-1D17-400A-8C0A-0272F1013DFC}
{F39EA837-99DD-4453-AA1A-DE408D47A0A6} = {F39EA837-99DD-4453-AA1A-DE408D47A0A6}
{FE47953B-CF34-4328-8416-FB4E2CD2E2CA} = {FE47953B-CF34-4328-8416-FB4E2CD2E2CA}
Expand Down Expand Up @@ -124,8 +123,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UpdateLib", "Core\UpdateLib
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UpdaterTests", "Tests\Unit\UpdaterTests\UpdaterTests.csproj", "{C28A1DE0-08AA-4E5E-9450-2F86E7F59DB0}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UMGen", "Build\UMGen\UMGen.csproj", "{D98FBB34-9674-4CAC-99F1-4B788B78DC77}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuildUtils", "Build\BuildUtils\BuildUtils.csproj", "{B3694ACC-C425-4335-A865-B2685D5E429F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetTests", "Tests\Unit\DotNetTests\DotNetTests.csproj", "{899FA942-7A28-4228-B93D-012174419865}"
Expand All @@ -152,9 +149,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MkvToolNixUtils", "Librarie
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{40228CC1-B09D-411F-AB90-79A69A043F35}"
ProjectSection(SolutionItems) = preProject
..\.travis.yml = ..\.travis.yml
Build\Scripts\clean.bat = Build\Scripts\clean.bat
Build\Scripts\commit.bat = Build\Scripts\commit.bat
Build\Scripts\FFMpegDownload.ps1 = Build\Scripts\FFMpegDownload.ps1
Build\Scripts\markdowner = Build\Scripts\markdowner
Build\Scripts\markdowner.bat = Build\Scripts\markdowner.bat
Build\Scripts\MkvDownload.ps1 = Build\Scripts\MkvDownload.ps1
Expand All @@ -163,10 +160,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{4022
Build\Scripts\sign.bat = Build\Scripts\sign.bat
Build\Scripts\test.bat = Build\Scripts\test.bat
Build\Scripts\tools.bat = Build\Scripts\tools.bat
Build\Scripts\update.bat = Build\Scripts\update.bat
Build\Scripts\zip-src.bat = Build\Scripts\zip-src.bat
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WatTmdb", "Libraries\WatTmdb\WatTmdb.csproj", "{EFC11645-FAB4-4C30-A498-29F5ECDF77E8}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -639,26 +637,6 @@ Global
{C28A1DE0-08AA-4E5E-9450-2F86E7F59DB0}.XP Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{C28A1DE0-08AA-4E5E-9450-2F86E7F59DB0}.XP Debug|Win32.ActiveCfg = Debug|Any CPU
{C28A1DE0-08AA-4E5E-9450-2F86E7F59DB0}.XP Debug|x86.ActiveCfg = Debug|Any CPU
{D98FBB34-9674-4CAC-99F1-4B788B78DC77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D98FBB34-9674-4CAC-99F1-4B788B78DC77}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D98FBB34-9674-4CAC-99F1-4B788B78DC77}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{D98FBB34-9674-4CAC-99F1-4B788B78DC77}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{D98FBB34-9674-4CAC-99F1-4B788B78DC77}.Debug|Win32.ActiveCfg = Debug|x86
{D98FBB34-9674-4CAC-99F1-4B788B78DC77}.Debug|x86.ActiveCfg = Debug|x86
{D98FBB34-9674-4CAC-99F1-4B788B78DC77}.Debug|x86.Build.0 = Debug|x86
{D98FBB34-9674-4CAC-99F1-4B788B78DC77}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D98FBB34-9674-4CAC-99F1-4B788B78DC77}.Release|Any CPU.Build.0 = Release|Any CPU
{D98FBB34-9674-4CAC-99F1-4B788B78DC77}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{D98FBB34-9674-4CAC-99F1-4B788B78DC77}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{D98FBB34-9674-4CAC-99F1-4B788B78DC77}.Release|Win32.ActiveCfg = Release|x86
{D98FBB34-9674-4CAC-99F1-4B788B78DC77}.Release|x86.ActiveCfg = Release|x86
{D98FBB34-9674-4CAC-99F1-4B788B78DC77}.Release|x86.Build.0 = Release|x86
{D98FBB34-9674-4CAC-99F1-4B788B78DC77}.XP Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D98FBB34-9674-4CAC-99F1-4B788B78DC77}.XP Debug|Any CPU.Build.0 = Debug|Any CPU
{D98FBB34-9674-4CAC-99F1-4B788B78DC77}.XP Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{D98FBB34-9674-4CAC-99F1-4B788B78DC77}.XP Debug|Win32.ActiveCfg = Debug|x86
{D98FBB34-9674-4CAC-99F1-4B788B78DC77}.XP Debug|x86.ActiveCfg = Debug|x86
{D98FBB34-9674-4CAC-99F1-4B788B78DC77}.XP Debug|x86.Build.0 = Debug|x86
{B3694ACC-C425-4335-A865-B2685D5E429F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B3694ACC-C425-4335-A865-B2685D5E429F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B3694ACC-C425-4335-A865-B2685D5E429F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -873,6 +851,30 @@ Global
{EDCC6D0F-93A7-4D53-BF13-701307EBB2E7}.XP Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{EDCC6D0F-93A7-4D53-BF13-701307EBB2E7}.XP Debug|Win32.ActiveCfg = Debug|Any CPU
{EDCC6D0F-93A7-4D53-BF13-701307EBB2E7}.XP Debug|x86.ActiveCfg = Debug|Any CPU
{EFC11645-FAB4-4C30-A498-29F5ECDF77E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EFC11645-FAB4-4C30-A498-29F5ECDF77E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EFC11645-FAB4-4C30-A498-29F5ECDF77E8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{EFC11645-FAB4-4C30-A498-29F5ECDF77E8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{EFC11645-FAB4-4C30-A498-29F5ECDF77E8}.Debug|Win32.ActiveCfg = Debug|Any CPU
{EFC11645-FAB4-4C30-A498-29F5ECDF77E8}.Debug|Win32.Build.0 = Debug|Any CPU
{EFC11645-FAB4-4C30-A498-29F5ECDF77E8}.Debug|x86.ActiveCfg = Debug|Any CPU
{EFC11645-FAB4-4C30-A498-29F5ECDF77E8}.Debug|x86.Build.0 = Debug|Any CPU
{EFC11645-FAB4-4C30-A498-29F5ECDF77E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EFC11645-FAB4-4C30-A498-29F5ECDF77E8}.Release|Any CPU.Build.0 = Release|Any CPU
{EFC11645-FAB4-4C30-A498-29F5ECDF77E8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{EFC11645-FAB4-4C30-A498-29F5ECDF77E8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{EFC11645-FAB4-4C30-A498-29F5ECDF77E8}.Release|Win32.ActiveCfg = Release|Any CPU
{EFC11645-FAB4-4C30-A498-29F5ECDF77E8}.Release|Win32.Build.0 = Release|Any CPU
{EFC11645-FAB4-4C30-A498-29F5ECDF77E8}.Release|x86.ActiveCfg = Release|Any CPU
{EFC11645-FAB4-4C30-A498-29F5ECDF77E8}.Release|x86.Build.0 = Release|Any CPU
{EFC11645-FAB4-4C30-A498-29F5ECDF77E8}.XP Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EFC11645-FAB4-4C30-A498-29F5ECDF77E8}.XP Debug|Any CPU.Build.0 = Debug|Any CPU
{EFC11645-FAB4-4C30-A498-29F5ECDF77E8}.XP Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{EFC11645-FAB4-4C30-A498-29F5ECDF77E8}.XP Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{EFC11645-FAB4-4C30-A498-29F5ECDF77E8}.XP Debug|Win32.ActiveCfg = Debug|Any CPU
{EFC11645-FAB4-4C30-A498-29F5ECDF77E8}.XP Debug|Win32.Build.0 = Debug|Any CPU
{EFC11645-FAB4-4C30-A498-29F5ECDF77E8}.XP Debug|x86.ActiveCfg = Debug|Any CPU
{EFC11645-FAB4-4C30-A498-29F5ECDF77E8}.XP Debug|x86.Build.0 = Debug|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -904,7 +906,6 @@ Global
{E1F2C620-F968-4DD0-9A1D-B3070F9F4F3C} = {49210501-785D-4DCD-8C8F-53EB07EBA150}
{F39EA837-99DD-4453-AA1A-DE408D47A0A6} = {C1A6C1BA-8DD5-4AFA-B6FD-83FD55940A06}
{C28A1DE0-08AA-4E5E-9450-2F86E7F59DB0} = {4240C059-B3D4-4E00-B35F-D56D2B943AFE}
{D98FBB34-9674-4CAC-99F1-4B788B78DC77} = {49210501-785D-4DCD-8C8F-53EB07EBA150}
{B3694ACC-C425-4335-A865-B2685D5E429F} = {49210501-785D-4DCD-8C8F-53EB07EBA150}
{899FA942-7A28-4228-B93D-012174419865} = {4240C059-B3D4-4E00-B35F-D56D2B943AFE}
{CE53747F-D2E6-4E1E-9EF4-A0AE02671B1D} = {94E76990-53DB-430E-B933-991130369AEE}
Expand All @@ -918,6 +919,7 @@ Global
{FE47953B-CF34-4328-8416-FB4E2CD2E2CA} = {94E76990-53DB-430E-B933-991130369AEE}
{EDCC6D0F-93A7-4D53-BF13-701307EBB2E7} = {94E76990-53DB-430E-B933-991130369AEE}
{40228CC1-B09D-411F-AB90-79A69A043F35} = {49210501-785D-4DCD-8C8F-53EB07EBA150}
{EFC11645-FAB4-4C30-A498-29F5ECDF77E8} = {94E76990-53DB-430E-B933-991130369AEE}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {3D4AB2E6-1A87-4C5D-917F-8A9BDE8104D7}
Expand Down
6 changes: 3 additions & 3 deletions src/Build/Hasher/Hasher.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\..\packages\ILMerge.3.0.21\build\ILMerge.props" Condition="Exists('..\..\packages\ILMerge.3.0.21\build\ILMerge.props')" />
<Import Project="..\..\packages\ILMerge.3.0.29\build\ILMerge.props" Condition="Exists('..\..\packages\ILMerge.3.0.29\build\ILMerge.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
Expand Down Expand Up @@ -59,7 +59,7 @@
<HintPath>..\..\packages\Mono.Options.5.3.0.1\lib\net4-client\Mono.Options.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
<HintPath>..\..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Ninject, Version=3.3.4.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
<HintPath>..\..\packages\Ninject.3.3.4\lib\net45\Ninject.dll</HintPath>
Expand Down Expand Up @@ -109,7 +109,7 @@ $(ILMergeConsolePath) /v4 /ndebug /target:exe /wildcards /out:$(SolutionDir)Buil
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\..\packages\ILMerge.3.0.21\build\ILMerge.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\ILMerge.3.0.21\build\ILMerge.props'))" />
<Error Condition="!Exists('..\..\packages\ILMerge.3.0.29\build\ILMerge.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\ILMerge.3.0.29\build\ILMerge.props'))" />
</Target>
<!-- 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.
Expand Down
4 changes: 2 additions & 2 deletions src/Build/Hasher/packages.config
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="ILMerge" version="3.0.21" targetFramework="net452" />
<package id="ILMerge" version="3.0.29" targetFramework="net452" />
<package id="Mono.Options" version="5.3.0.1" targetFramework="net452" />
<package id="Newtonsoft.Json" version="12.0.1" targetFramework="net452" />
<package id="Newtonsoft.Json" version="12.0.2" targetFramework="net452" />
<package id="Ninject" version="3.3.4" targetFramework="net452" />
</packages>
4 changes: 2 additions & 2 deletions src/Build/Markdowner/Markdowner.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\..\packages\ILMerge.3.0.21\build\ILMerge.props" Condition="Exists('..\..\packages\ILMerge.3.0.21\build\ILMerge.props')" />
<Import Project="..\..\packages\ILMerge.3.0.29\build\ILMerge.props" Condition="Exists('..\..\packages\ILMerge.3.0.29\build\ILMerge.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down Expand Up @@ -93,7 +93,7 @@ $(ILMergeConsolePath) /v4 /ndebug /target:exe /wildcards /out:$(SolutionDir)Buil
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\..\packages\ILMerge.3.0.21\build\ILMerge.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\ILMerge.3.0.21\build\ILMerge.props'))" />
<Error Condition="!Exists('..\..\packages\ILMerge.3.0.29\build\ILMerge.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\ILMerge.3.0.29\build\ILMerge.props'))" />
</Target>
<!-- 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.
Expand Down
2 changes: 1 addition & 1 deletion src/Build/Markdowner/packages.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="ILMerge" version="3.0.21" targetFramework="net452" />
<package id="ILMerge" version="3.0.29" targetFramework="net452" />
<package id="MarkdownSharp" version="2.0.5" targetFramework="net452" />
<package id="Mono.Options" version="5.3.0.1" targetFramework="net452" />
</packages>
19 changes: 0 additions & 19 deletions src/Build/Scripts/FFMpegDownload.ps1

This file was deleted.

3 changes: 3 additions & 0 deletions src/Build/Scripts/MkvDownload.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ $VERSION = "31.0.0"
$SOURCE = "https://mkvtoolnix.download/windows/releases/$VERSION/mkvtoolnix-64-bit-$VERSION.7z"
$DESTFILE = "mkvtoolnix-$VERSION.7z"

# workaround ssl/tls error when invoked by travis
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12

if (test-path $DESTFILE)
{
write-host "mkvtoolnix already exist, skipping download"
Expand Down
7 changes: 0 additions & 7 deletions src/Build/Scripts/update.bat

This file was deleted.

94 changes: 0 additions & 94 deletions src/Build/UMGen/Program.cs

This file was deleted.

Loading

0 comments on commit 2d4b423

Please sign in to comment.