Skip to content

Commit

Permalink
MP1-5042: Update sqlite to 3.33 (x86)
Browse files Browse the repository at this point in the history
  • Loading branch information
Azzuro committed Sep 7, 2020
1 parent 30bb9ab commit 0c099a8
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 3 deletions.
2 changes: 2 additions & 0 deletions mediaportal/Core/Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -1703,8 +1703,10 @@ xcopy "$(TargetDir)core.*" "$(SolutionDir)MediaPortal.Application\bin\$(Configur
<Error Condition="!Exists('..\..\Packages\BASSCombined.2.4.15\build\basscombined.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\Packages\BASSCombined.2.4.15\build\basscombined.targets'))" />
<Error Condition="!Exists('..\..\Packages\MediaInfo.Native.20.8.1\build\MediaInfo.Native.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\Packages\MediaInfo.Native.20.8.1\build\MediaInfo.Native.targets'))" />
<Error Condition="!Exists('..\..\Packages\FFmpeg.Win32.Static.4.1.1.1\build\FFmpeg.Win32.Static.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\Packages\FFmpeg.Win32.Static.4.1.1.1\build\FFmpeg.Win32.Static.targets'))" />
<Error Condition="!Exists('..\..\Packages\Sqlite.3.33.0\build\Sqlite.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\Packages\Sqlite.3.33.0\build\Sqlite.targets'))" />
</Target>
<Import Project="..\..\Packages\BASSCombined.2.4.15\build\basscombined.targets" Condition="Exists('..\..\Packages\BASSCombined.2.4.15\build\basscombined.targets')" />
<Import Project="..\..\Packages\MediaInfo.Native.20.8.1\build\MediaInfo.Native.targets" Condition="Exists('..\..\Packages\MediaInfo.Native.20.8.1\build\MediaInfo.Native.targets')" />
<Import Project="..\..\Packages\FFmpeg.Win32.Static.4.1.1.1\build\FFmpeg.Win32.Static.targets" Condition="Exists('..\..\Packages\FFmpeg.Win32.Static.4.1.1.1\build\FFmpeg.Win32.Static.targets')" />
<Import Project="..\..\Packages\Sqlite.3.33.0\build\Sqlite.targets" Condition="Exists('..\..\Packages\Sqlite.3.33.0\build\Sqlite.targets')" />
</Project>
2 changes: 1 addition & 1 deletion mediaportal/Core/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<package id="MediaPortal.TagLib" version="2.1.0.2" targetFramework="net40" />
<package id="MetadataExtractor" version="2.4.3" targetFramework="net40" />
<package id="NAudio" version="1.10.0" targetFramework="net40" />
<package id="Sqlite" version="3.21.0" targetFramework="net40" />
<package id="Sqlite" version="3.33.0" targetFramework="net40" />
<package id="System.Management.Automation" version="6.1.7601.17515" targetFramework="net40" />
<package id="XmpCore" version="6.1.10" targetFramework="net40" />
</packages>
2 changes: 1 addition & 1 deletion mediaportal/MediaPortal.Application/PostBuild.bat
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ xcopy %1\MPE\MpeMaker\bin\%2\MpeMaker.* . /Y /D

REM Nuget
xcopy %1\Databases\bin\%2\HtmlAgilityPack.* . /Y /D
xcopy %1\..\Packages\Sqlite.3.21.0\sqlite.dll . /Y /D
xcopy %1\..\Packages\Sqlite.3.33.0\sqlite.dll . /Y /D

REM MediaInfo -
REM - commented because provided on bin folder by nuget target setting during building.
Expand Down
2 changes: 1 addition & 1 deletion mediaportal/Setup/setup.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -588,7 +588,7 @@ Section "MediaPortal core files (required)" SecCore
File "${git_ROOT}\Packages\MediaInfo.Wrapper.20.8.0\lib\net40\MediaInfo.Wrapper.dll"
; NuGet binaries Sqlite
SetOutPath "$MPdir.Base\"
File "${git_ROOT}\Packages\Sqlite.3.21.0\Sqlite.dll"
File "${git_ROOT}\Packages\Sqlite.3.33.0\sqlite.dll"
; NuGet binaries EXIF
SetOutPath "$MPdir.Base\"
File "${git_ROOT}\Packages\MetadataExtractor.2.4.3\lib\net35\MetadataExtractor.dll"
Expand Down

0 comments on commit 0c099a8

Please sign in to comment.