diff --git a/eDosStation/EntryBadge.xaml.cs b/eDosStation/EntryBadge.xaml.cs index 9d055c1..69ea323 100644 --- a/eDosStation/EntryBadge.xaml.cs +++ b/eDosStation/EntryBadge.xaml.cs @@ -577,8 +577,7 @@ namespace eDosStation dfReader.Badged += DFReader_Badged; dfReader.BadgeTO += DfReader_BadgeTO; ReaderTask = dfReader.Wait(PageTimeout); - - dfReader.WaitForBadge(); + //dfReader.WaitForBadge(); } else { diff --git a/eDosStation/eDosStation.csproj b/eDosStation/eDosStation.csproj index 15fdb0e..3b70e35 100644 --- a/eDosStation/eDosStation.csproj +++ b/eDosStation/eDosStation.csproj @@ -89,23 +89,23 @@ http://timestamp.digicert.com - - ..\packages\SharpDX.2.5.0\lib\net40\SharpDX.dll + + ..\packages\SharpDX.4.2.0\lib\net45\SharpDX.dll - - ..\packages\SharpDX.D3DCompiler.2.5.0\lib\net40\SharpDX.D3DCompiler.dll + + ..\packages\SharpDX.D3DCompiler.4.2.0\lib\net45\SharpDX.D3DCompiler.dll - - ..\packages\SharpDX.Direct2D1.2.5.0\lib\net40\SharpDX.Direct2D1.dll + + ..\packages\SharpDX.Direct2D1.4.2.0\lib\net45\SharpDX.Direct2D1.dll - - ..\packages\SharpDX.Direct3D10.2.5.0\lib\net40\SharpDX.Direct3D10.dll + + ..\packages\SharpDX.Direct3D10.4.2.0\lib\net45\SharpDX.Direct3D10.dll - - ..\packages\SharpDX.Direct3D9.2.5.0\lib\net40\SharpDX.Direct3D9.dll + + ..\packages\SharpDX.Direct3D9.4.2.0\lib\net45\SharpDX.Direct3D9.dll - - ..\packages\SharpDX.DXGI.2.5.0\lib\net40\SharpDX.DXGI.dll + + ..\packages\SharpDX.DXGI.4.2.0\lib\net45\SharpDX.DXGI.dll diff --git a/eDosStation/packages.config b/eDosStation/packages.config index add24ed..fbea87e 100644 --- a/eDosStation/packages.config +++ b/eDosStation/packages.config @@ -2,12 +2,12 @@ - - - - - - + + + + + + diff --git a/syncEdosLocal/App.Debug.config b/syncEdosLocal/App.Debug.config index aa7bba3..ec5b3b6 100644 --- a/syncEdosLocal/App.Debug.config +++ b/syncEdosLocal/App.Debug.config @@ -6,6 +6,7 @@ + \ No newline at end of file diff --git a/syncEdosLocal/App.Release.config b/syncEdosLocal/App.Release.config index e36bc80..19301e5 100644 --- a/syncEdosLocal/App.Release.config +++ b/syncEdosLocal/App.Release.config @@ -1,4 +1,7 @@  + + + \ No newline at end of file diff --git a/syncEdosLocal/App.config b/syncEdosLocal/App.config index de7f595..7eb2203 100644 --- a/syncEdosLocal/App.config +++ b/syncEdosLocal/App.config @@ -18,5 +18,6 @@ + diff --git a/syncEdosLocal/Program.cs b/syncEdosLocal/Program.cs index f17ffe2..240dbc2 100644 --- a/syncEdosLocal/Program.cs +++ b/syncEdosLocal/Program.cs @@ -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(); }