luc/eDosStation
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

New build

Browse source
This commit is contained in:
Luc 2021-04-26 11:14:02 +02:00
parent 5263f4f32d
commit aa1c886a40
7 changed files with 27 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
eDosStation/EntryBadge.xaml.cs
View file

@ -577,8 +577,7 @@ namespace eDosStation
dfReader.Badged += DFReader_Badged;
dfReader.BadgeTO += DfReader_BadgeTO;
ReaderTask = dfReader.Wait(PageTimeout);
dfReader.WaitForBadge();
//dfReader.WaitForBadge();
}
else
{

24
eDosStation/eDosStation.csproj
View file

@ -89,23 +89,23 @@
<ManifestTimestampUrl>http://timestamp.digicert.com</ManifestTimestampUrl>
</PropertyGroup>
<ItemGroup>
<Reference Include="SharpDX, Version=2.5.0.0, Culture=neutral, PublicKeyToken=627a3d6d1956f55a, processorArchitecture=MSIL">
<HintPath>..\packages\SharpDX.2.5.0\lib\net40\SharpDX.dll</HintPath>
<Reference Include="SharpDX, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
<HintPath>..\packages\SharpDX.4.2.0\lib\net45\SharpDX.dll</HintPath>
</Reference>
<Reference Include="SharpDX.D3DCompiler, Version=2.5.0.0, Culture=neutral, PublicKeyToken=627a3d6d1956f55a, processorArchitecture=MSIL">
<HintPath>..\packages\SharpDX.D3DCompiler.2.5.0\lib\net40\SharpDX.D3DCompiler.dll</HintPath>
<Reference Include="SharpDX.D3DCompiler, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
<HintPath>..\packages\SharpDX.D3DCompiler.4.2.0\lib\net45\SharpDX.D3DCompiler.dll</HintPath>
</Reference>
<Reference Include="SharpDX.Direct2D1, Version=2.5.0.0, Culture=neutral, PublicKeyToken=627a3d6d1956f55a, processorArchitecture=MSIL">
<HintPath>..\packages\SharpDX.Direct2D1.2.5.0\lib\net40\SharpDX.Direct2D1.dll</HintPath>
<Reference Include="SharpDX.Direct2D1, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
<HintPath>..\packages\SharpDX.Direct2D1.4.2.0\lib\net45\SharpDX.Direct2D1.dll</HintPath>
</Reference>
<Reference Include="SharpDX.Direct3D10, Version=2.5.0.0, Culture=neutral, PublicKeyToken=627a3d6d1956f55a, processorArchitecture=MSIL">
<HintPath>..\packages\SharpDX.Direct3D10.2.5.0\lib\net40\SharpDX.Direct3D10.dll</HintPath>
<Reference Include="SharpDX.Direct3D10, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
<HintPath>..\packages\SharpDX.Direct3D10.4.2.0\lib\net45\SharpDX.Direct3D10.dll</HintPath>
</Reference>
<Reference Include="SharpDX.Direct3D9, Version=2.5.0.0, Culture=neutral, PublicKeyToken=627a3d6d1956f55a, processorArchitecture=MSIL">
<HintPath>..\packages\SharpDX.Direct3D9.2.5.0\lib\net40\SharpDX.Direct3D9.dll</HintPath>
<Reference Include="SharpDX.Direct3D9, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
<HintPath>..\packages\SharpDX.Direct3D9.4.2.0\lib\net45\SharpDX.Direct3D9.dll</HintPath>
</Reference>
<Reference Include="SharpDX.DXGI, Version=2.5.0.0, Culture=neutral, PublicKeyToken=627a3d6d1956f55a, processorArchitecture=MSIL">
<HintPath>..\packages\SharpDX.DXGI.2.5.0\lib\net40\SharpDX.DXGI.dll</HintPath>
<Reference Include="SharpDX.DXGI, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
<HintPath>..\packages\SharpDX.DXGI.4.2.0\lib\net45\SharpDX.DXGI.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" />

12
eDosStation/packages.config
View file

@ -2,12 +2,12 @@
<packages>
<package id="LSWDesfirePublic" version="1.3.0" targetFramework="net48" />
<package id="Microsoft.VisualStudio.SlowCheetah" version="3.2.26" targetFramework="net472" developmentDependency="true" />
<package id="SharpDX" version="2.5.0" targetFramework="net48" />
<package id="SharpDX.D3DCompiler" version="2.5.0" targetFramework="net48" />
<package id="SharpDX.Direct2D1" version="2.5.0" targetFramework="net48" />
<package id="SharpDX.Direct3D10" version="2.5.0" targetFramework="net48" />
<package id="SharpDX.Direct3D9" version="2.5.0" targetFramework="net48" />
<package id="SharpDX.DXGI" version="2.5.0" targetFramework="net48" />
<package id="SharpDX" version="4.2.0" targetFramework="net48" />
<package id="SharpDX.D3DCompiler" version="4.2.0" targetFramework="net48" />
<package id="SharpDX.Direct2D1" version="4.2.0" targetFramework="net48" />
<package id="SharpDX.Direct3D10" version="4.2.0" targetFramework="net48" />
<package id="SharpDX.Direct3D9" version="4.2.0" targetFramework="net48" />
<package id="SharpDX.DXGI" version="4.2.0" targetFramework="net48" />
<package id="Telerik.Windows.Controls.for.Wpf.Xaml" version="2021.1.325" targetFramework="net48" />
<package id="Telerik.Windows.Controls.GridView.for.Wpf.Xaml" version="2021.1.325" targetFramework="net48" />
<package id="Telerik.Windows.Controls.Input.for.Wpf.Xaml" version="2021.1.325" targetFramework="net48" />

1
syncEdosLocal/App.Debug.config
View file

@ -6,6 +6,7 @@
</connectionStrings>
<appSettings>
<add key="smtpServer" value="127.0.0.1" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
<add key="smtpPort" value="26" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
<add key="smtpFrom" value="lvandenb@sckcen.be" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
</appSettings>
</configuration>

3
syncEdosLocal/App.Release.config
View file

@ -1,4 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--For more information on using transformations see the web.config examples at http://go.microsoft.com/fwlink/?LinkId=214134. -->
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
<add key="smtpServer" value="192.168.113.120" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
<add key="smtpPort" value="25" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
<add key="smtpFrom" value="lvandenb@sckcen.be" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
</configuration>

1
syncEdosLocal/App.config
View file

@ -18,5 +18,6 @@
<appSettings>
<add key="smtpFrom" value="lvandenb@sckcen.be"/>
<add key="smtpServer" value="smtp.sckcen.be"/>
<add key="smtpPort" value="25"/>
</appSettings>
</configuration>

4
syncEdosLocal/Program.cs
View file

@ -307,6 +307,8 @@ namespace syncEdosLocal
var smtpFrom = System.Configuration.ConfigurationManager.AppSettings["smtpFrom"];
var smtpServer = System.Configuration.ConfigurationManager.AppSettings["smtpServer"];
int smtpPort = 25;
if (int.TryParse(System.Configuration.ConfigurationManager.AppSettings["smtpPort"], out int newSMTPPort)) smtpPort = newSMTPPort; ;
using (System.Net.Mail.MailMessage m = new System.Net.Mail.MailMessage())
{
m.From = new System.Net.Mail.MailAddress(smtpFrom);
@ -314,7 +316,7 @@ namespace syncEdosLocal
m.Subject = "SynceDosLocal " + (error ? "Error" : "No errors") + (warning ? " Warnings" : "");
m.IsBodyHtml = true;
m.Body = Bulker.htmlLog.ToString();
using (var mc = new System.Net.Mail.SmtpClient(smtpServer)) { mc.Port = 26; mc.Send(m); }
using (var mc = new System.Net.Mail.SmtpClient(smtpServer, smtpPort)) { mc.Send(m); }
}
spLog.CloseSplunkLog();
}