Merge branch 'develop' into SDK/SqlDb

This commit is contained in:
Samuele Locatelli
2023-03-15 15:16:44 +01:00
3 changed files with 3 additions and 4 deletions
+1 -1
View File
@@ -125,7 +125,7 @@
<HintPath>..\packages\EgwProxy.OsaiCncLib.3.6.2205.2015\lib\EgwProxy.OsaiCncLib.XmlSerializers.dll</HintPath>
</Reference>
<Reference Include="EgwProxy.SqlDb, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\EgwProxy.SqlDb.3.6.2303.1513\lib\EgwProxy.SqlDb.dll</HintPath>
<HintPath>..\packages\EgwProxy.SqlDb.3.6.2303.1515\lib\EgwProxy.SqlDb.dll</HintPath>
</Reference>
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
+1 -2
View File
@@ -198,8 +198,7 @@ namespace IOB_WIN_NEXT
if (currSignLogRead.LastIdx > currSignLogSent.LastIdx)
{
// recupero i dati dal DB...
var data2send = dbProxy.MachSigLogGetNew((int)currSignLogSent.LastIdx);
//var data2send = dbProxy.MachSigLogGetNew(currSignLogSent.LastIdx);
var data2send = dbProxy.MachSigLogGetNew(currSignLogSent.LastIdx);
// se ho dati preparo invio
if (data2send != null && data2send.Count > 0)
{
+1 -1
View File
@@ -6,7 +6,7 @@
<package id="EgwProxy.Icoel" version="3.6.2210.1815" targetFramework="net462" />
<package id="EgwProxy.MultiCncLib" version="3.6.2207.1211" targetFramework="net462" />
<package id="EgwProxy.OsaiCncLib" version="3.6.2205.2015" targetFramework="net462" />
<package id="EgwProxy.SqlDb" version="3.6.2303.1513" targetFramework="net462" />
<package id="EgwProxy.SqlDb" version="3.6.2303.1515" targetFramework="net462" />
<package id="EntityFramework" version="6.4.4" targetFramework="net462" />
<package id="FluentFTP" version="41.0.0" targetFramework="net462" />
<package id="MapoSDK" version="6.14.2211.3016" targetFramework="net462" />