Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Master : Fix duplicate MediaInfo in core project until we will use th…
…e same MediaInfo for MP and TV side.
  • Loading branch information
Sebastiii committed Jun 14, 2017
1 parent 0890524 commit aacace8
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 1 deletion.
12 changes: 12 additions & 0 deletions TvEngine3/TVLibrary/TVLibrary/TVLibrary.csproj
Expand Up @@ -17,6 +17,8 @@
</UpgradeBackupLocation>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkProfile />
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down Expand Up @@ -253,7 +255,17 @@
<ItemGroup>
<Folder Include="Implementations\Analog\Components\Encoding\" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="..\..\..\Packages\MediaInfo.0.7.69\build\MediaInfo.targets" Condition="Exists('..\..\..\Packages\MediaInfo.0.7.69\build\MediaInfo.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<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\MediaInfo.0.7.69\build\MediaInfo.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\Packages\MediaInfo.0.7.69\build\MediaInfo.targets'))" />
</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.
<Target Name="BeforeBuild">
Expand Down
4 changes: 4 additions & 0 deletions TvEngine3/TVLibrary/TVLibrary/packages.config
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="MediaInfo" version="0.7.69" targetFramework="net40" />
</packages>
1 change: 0 additions & 1 deletion mediaportal/Core/packages.config
Expand Up @@ -26,7 +26,6 @@
<package id="BassRegistration" version="2.4.12.5" targetFramework="net40" />
<package id="ffmpeg" version="2.7.1" targetFramework="net40" />
<package id="MediaInfo" version="0.7.95" targetFramework="net40" />
<package id="MediaInfo" version="0.7.69" targetFramework="net40" />
<package id="MediaPortal.TagLib" version="2.1.0.2" targetFramework="net40" />
<package id="Sqlite" version="3.10.0" targetFramework="net40" />
<package id="System.Management.Automation" version="6.1.7601.17515" targetFramework="net40" />
Expand Down

0 comments on commit aacace8

Please sign in to comment.