mirror of
https://github.com/PredatH0r/ChanSort.git
synced 2026-05-07 06:27:40 +02:00
- fixed Nuget hell: (auto) binding redirects to prevent compiler warning flood and ensure unit tests to be runnable
- put file name in Sqlite connect string in quotes - improvements to Mediatek Philips 120+125/Sony serializer (physically reorder XML nodes, use flags stored in Java serialized blob) - selecting a RefList changed the current working directory, which prevented .ini files to be found by loaders
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<Import Project="..\Solution.props" />
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net48</TargetFramework>
|
||||
<OutputType>Library</OutputType>
|
||||
@@ -30,12 +31,8 @@
|
||||
<ProjectReference Include="..\ChanSort.Api\ChanSort.Api.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.Data.Sqlite" Version="8.0.13" />
|
||||
<PackageReference Include="Microsoft.Data.Sqlite.Core" Version="8.0.13" />
|
||||
<PackageReference Include="Microsoft.Data.Sqlite" Version="9.0.5" />
|
||||
<PackageReference Include="Microsoft.Data.Sqlite.Core" Version="9.0.5" />
|
||||
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
|
||||
<PackageReference Include="System.Buffers" Version="4.6.0" />
|
||||
<PackageReference Include="System.Memory" Version="4.6.0" />
|
||||
<PackageReference Include="System.Numerics.Vectors" Version="4.6.0" />
|
||||
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.0" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
@@ -53,7 +53,7 @@ namespace ChanSort.Loader.Toshiba
|
||||
else
|
||||
workingDir = Path.GetDirectoryName(this.FileName);
|
||||
|
||||
var sysDataConnString = $"Data Source={this.workingDir + FILE_dvbSysData_db};Pooling=false";
|
||||
var sysDataConnString = $"Data Source=\"{this.workingDir + FILE_dvbSysData_db}\";Pooling=false";
|
||||
using (var conn = new SqliteConnection(sysDataConnString))
|
||||
{
|
||||
conn.Open();
|
||||
@@ -63,7 +63,7 @@ namespace ChanSort.Loader.Toshiba
|
||||
ReadTransponders(cmd);
|
||||
}
|
||||
|
||||
var mainDataConnString = $"Data Source={this.workingDir + FILE_dvbMainData_db};Pooling=False";
|
||||
var mainDataConnString = $"Data Source=\"{this.workingDir + FILE_dvbMainData_db}\";Pooling=False";
|
||||
using (var conn = new SqliteConnection(mainDataConnString))
|
||||
{
|
||||
conn.Open();
|
||||
@@ -71,7 +71,7 @@ namespace ChanSort.Loader.Toshiba
|
||||
ReadCryptInfo(cmd);
|
||||
}
|
||||
|
||||
var channelConnString = $"Data Source={this.workingDir + FILE_chmgt_db};Pooling=False";
|
||||
var channelConnString = $"Data Source=\"{this.workingDir + FILE_chmgt_db}\";Pooling=False";
|
||||
using (var conn = new SqliteConnection(channelConnString))
|
||||
{
|
||||
conn.Open();
|
||||
@@ -260,7 +260,7 @@ namespace ChanSort.Loader.Toshiba
|
||||
|
||||
public override void Save()
|
||||
{
|
||||
var channelConnString = $"Data Source={this.workingDir + FILE_chmgt_db};Pooling=False";
|
||||
var channelConnString = $"Data Source=\"{this.workingDir + FILE_chmgt_db}\";Pooling=False";
|
||||
using (var conn = new SqliteConnection(channelConnString))
|
||||
{
|
||||
conn.Open();
|
||||
|
||||
@@ -67,7 +67,7 @@ namespace ChanSort.Loader.Toshiba
|
||||
#region Load()
|
||||
public override void Load()
|
||||
{
|
||||
string sysDataConnString = $"Data Source={this.FileName};Pooling=False";
|
||||
string sysDataConnString = $"Data Source=\"{this.FileName}\";Pooling=False";
|
||||
using var conn = new SqliteConnection(sysDataConnString);
|
||||
conn.Open();
|
||||
|
||||
@@ -208,7 +208,7 @@ left outer join ChanDataTable ac on ac.handle=a.m_channel_no
|
||||
#region Save()
|
||||
public override void Save()
|
||||
{
|
||||
string channelConnString = $"Data Source={this.FileName};Pooling=False";
|
||||
string channelConnString = $"Data Source=\"{this.FileName}\";Pooling=False";
|
||||
using (var conn = new SqliteConnection(channelConnString))
|
||||
{
|
||||
conn.Open();
|
||||
|
||||
@@ -1,15 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<configuration>
|
||||
<runtime>
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
</runtime>
|
||||
</configuration>
|
||||
Reference in New Issue
Block a user