Skip to content

Commit

Permalink
MP1-5225: Update SQLite to 3.47.0
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewjswan committed Nov 5, 2024
1 parent 6b7f4cd commit fec0d5c
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions mediaportal/Core/Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -1766,11 +1766,11 @@ xcopy "$(TargetDir)core.*" "$(SolutionDir)MediaPortal.Application\bin\$(Configur
<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\FFmpeg.Win64.Static.4.1.1.1\build\FFmpeg.Win64.Static.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\Packages\FFmpeg.Win64.Static.4.1.1.1\build\FFmpeg.Win64.Static.targets'))" />
<Error Condition="!Exists('..\..\Packages\MediaInfo.Native.21.9.1\build\MediaInfo.Native.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\Packages\MediaInfo.Native.21.9.1\build\MediaInfo.Native.targets'))" />
<Error Condition="!Exists('..\..\Packages\Sqlite.3.46.1\build\sqlite.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\Packages\Sqlite.3.46.1\build\sqlite.targets'))" />
<Error Condition="!Exists('..\..\Packages\Sqlite.3.47.0\build\sqlite.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\Packages\Sqlite.3.47.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\FFmpeg.Win64.Static.4.1.1.1\build\FFmpeg.Win64.Static.targets" Condition="Exists('..\..\Packages\FFmpeg.Win64.Static.4.1.1.1\build\FFmpeg.Win64.Static.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\MediaInfo.Native.21.9.1\build\MediaInfo.Native.targets" Condition="Exists('..\..\Packages\MediaInfo.Native.21.9.1\build\MediaInfo.Native.targets')" />
<Import Project="..\..\Packages\Sqlite.3.46.1\build\sqlite.targets" Condition="Exists('..\..\Packages\Sqlite.3.46.1\build\sqlite.targets')" />
<Import Project="..\..\Packages\Sqlite.3.47.0\build\sqlite.targets" Condition="Exists('..\..\Packages\Sqlite.3.47.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 @@ -15,7 +15,7 @@
<package id="SharpDX" version="4.2.0" targetFramework="net40" />
<package id="SharpDX.Direct3D9" version="4.2.0" targetFramework="net40" />
<package id="SharpDX.Mathematics" version="4.2.0" targetFramework="net40" />
<package id="Sqlite" version="3.46.1" targetFramework="net40" />
<package id="Sqlite" version="3.47.0" targetFramework="net40" />
<package id="System.Management.Automation" version="6.1.7601.17515" targetFramework="net40" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net40" />
<package id="UnidecodeSharpFork" version="1.0.1" targetFramework="net40" />
Expand Down
4 changes: 2 additions & 2 deletions mediaportal/MediaPortal.Application/PostBuild.bat
Original file line number Diff line number Diff line change
Expand Up @@ -185,9 +185,9 @@ xcopy %1\MPE\MpeMaker\bin\%2\MpeMaker.* . /Y /D
REM Nuget
xcopy %1\Databases\bin\%2\HtmlAgilityPack.* . /Y /D
if /I "%3" EQU "x64" (
xcopy %1\..\Packages\Sqlite.3.46.1\sqlite\x64\sqlite.dll . /Y /D
xcopy %1\..\Packages\Sqlite.3.47.0\sqlite\x64\sqlite.dll . /Y /D
) ELSE (
xcopy %1\..\Packages\Sqlite.3.46.1\sqlite\x86\sqlite.dll . /Y /D
xcopy %1\..\Packages\Sqlite.3.47.0\sqlite\x86\sqlite.dll . /Y /D
)

REM MediaInfo -
Expand Down
4 changes: 2 additions & 2 deletions mediaportal/Setup/setup.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -673,9 +673,9 @@ Section "MediaPortal core files (required)" SecCore
; NuGet binaries Sqlite
SetOutPath "$MPdir.Base\"
!if "${Architecture}" == "x64"
File "${git_ROOT}\Packages\Sqlite.3.46.1\sqlite\x64\sqlite.dll"
File "${git_ROOT}\Packages\Sqlite.3.47.0\sqlite\x64\sqlite.dll"
!else
File "${git_ROOT}\Packages\Sqlite.3.46.1\sqlite\x86\sqlite.dll"
File "${git_ROOT}\Packages\Sqlite.3.47.0\sqlite\x86\sqlite.dll"
!endif
; NuGet binaries EXIF
SetOutPath "$MPdir.Base\"
Expand Down

0 comments on commit fec0d5c

Please sign in to comment.